diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_black.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_black.png index 14119b8..41d61c8 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_black.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_black.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_blue.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_blue.png index b4b17ea..f229713 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_blue.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_blue.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_brown.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_brown.png index d63491f..915c90c 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_brown.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_brown.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_cyan.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_cyan.png index be16a9b..e63a1be 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_cyan.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_cyan.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_gray.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_gray.png index 661398e..6911bab 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_gray.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_gray.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_green.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_green.png index 7ff85bc..0b41b0b 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_green.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_green.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_light_blue.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_light_blue.png index f9fc188..09b8ff1 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_light_blue.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_light_blue.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_light_gray.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_light_gray.png index 19ed9c3..b9a0492 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_light_gray.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_light_gray.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_lime.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_lime.png index 9743fa5..8612d97 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_lime.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_lime.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_magenta.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_magenta.png index add9761..dbef1df 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_magenta.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_magenta.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_orange.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_orange.png index 5fb3096..2f45e52 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_orange.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_orange.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_pink.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_pink.png index 141eae6..9b604fc 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_pink.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_pink.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_purple.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_purple.png index 79f00d8..c4cdbf6 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_purple.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_purple.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_red.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_red.png index 780d9c8..a66c6fe 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_red.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_red.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_white.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_white.png index bf5aefd..1d59d3e 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_white.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_white.png differ diff --git a/bin/main/assets/backrooms/textures/block/checkered/checkered_yellow.png b/bin/main/assets/backrooms/textures/block/checkered/checkered_yellow.png index 993f9f9..bc266d0 100644 Binary files a/bin/main/assets/backrooms/textures/block/checkered/checkered_yellow.png and b/bin/main/assets/backrooms/textures/block/checkered/checkered_yellow.png differ diff --git a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png index d5afea9..b9ffdbd 100644 Binary files a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png and b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png differ diff --git a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png index 2fcf081..5c48a84 100644 Binary files a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png and b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png differ diff --git a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png index 9ab5500..19b2edf 100644 Binary files a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png and b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png differ diff --git a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png index b01c1dd..c7a24a0 100644 Binary files a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png and b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png differ diff --git a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png index 0e36a10..8d03321 100644 Binary files a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png and b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png differ diff --git a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png index 03a8180..f0e534b 100644 Binary files a/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png and b/bin/main/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png differ diff --git a/bin/main/data/backrooms/advancements/backrooms.json b/bin/main/data/backrooms/advancements/backrooms.json index 1e5ebe8..318f679 100644 --- a/bin/main/data/backrooms/advancements/backrooms.json +++ b/bin/main/data/backrooms/advancements/backrooms.json @@ -19,7 +19,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0" + "dimension": "backrooms:level_0" } } }, diff --git a/bin/main/data/backrooms/advancements/level_0.json b/bin/main/data/backrooms/advancements/level_0.json index d2fffd0..48702ed 100644 --- a/bin/main/data/backrooms/advancements/level_0.json +++ b/bin/main/data/backrooms/advancements/level_0.json @@ -18,7 +18,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0" + "dimension": "backrooms:level_0" } } }, diff --git a/bin/main/data/backrooms/advancements/level_0_dotted.json b/bin/main/data/backrooms/advancements/level_0_dotted.json index 8353286..2104671 100644 --- a/bin/main/data/backrooms/advancements/level_0_dotted.json +++ b/bin/main/data/backrooms/advancements/level_0_dotted.json @@ -18,7 +18,7 @@ "level0dotted": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0dotted" + "dimension": "backrooms:level_0_dotted" } } }, diff --git a/bin/main/data/backrooms/advancements/level_0_red.json b/bin/main/data/backrooms/advancements/level_0_red.json index 6010166..df0948a 100644 --- a/bin/main/data/backrooms/advancements/level_0_red.json +++ b/bin/main/data/backrooms/advancements/level_0_red.json @@ -18,7 +18,7 @@ "level0red": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0red" + "dimension": "backrooms:level_0_red" } } }, diff --git a/bin/main/data/backrooms/advancements/level_1.json b/bin/main/data/backrooms/advancements/level_1.json index 978bb27..1cc761a 100644 --- a/bin/main/data/backrooms/advancements/level_1.json +++ b/bin/main/data/backrooms/advancements/level_1.json @@ -18,7 +18,7 @@ "level1": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level1" + "dimension": "backrooms:level_1" } } }, diff --git a/bin/main/data/backrooms/advancements/level_2.json b/bin/main/data/backrooms/advancements/level_2.json index e2c13d3..71f0c4c 100644 --- a/bin/main/data/backrooms/advancements/level_2.json +++ b/bin/main/data/backrooms/advancements/level_2.json @@ -18,7 +18,7 @@ "level2": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level2" + "dimension": "backrooms:level_2" } } }, diff --git a/bin/main/data/backrooms/advancements/level_3.json b/bin/main/data/backrooms/advancements/level_3.json index 36f0079..8c350e3 100644 --- a/bin/main/data/backrooms/advancements/level_3.json +++ b/bin/main/data/backrooms/advancements/level_3.json @@ -18,7 +18,7 @@ "level3": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level3" + "dimension": "backrooms:level_3" } } }, diff --git a/bin/main/data/backrooms/advancements/root_backrooms.json b/bin/main/data/backrooms/advancements/root_backrooms.json index 533d7b9..422d17d 100644 --- a/bin/main/data/backrooms/advancements/root_backrooms.json +++ b/bin/main/data/backrooms/advancements/root_backrooms.json @@ -19,7 +19,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0" + "dimension": "backrooms:level_0" } } }, diff --git a/bin/main/data/backrooms/advancements/timewaster.json b/bin/main/data/backrooms/advancements/timewaster.json index 776e859..98f916f 100644 --- a/bin/main/data/backrooms/advancements/timewaster.json +++ b/bin/main/data/backrooms/advancements/timewaster.json @@ -18,7 +18,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0", + "dimension": "backrooms:level_0", "position": { "y": 255 } @@ -27,7 +27,7 @@ "level1": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level1", + "dimension": "backrooms:level_1", "position": { "y": 255 } @@ -36,7 +36,7 @@ "level2": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level2", + "dimension": "backrooms:level_2", "position": { "y": 255 } @@ -45,7 +45,7 @@ "level3": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level3", + "dimension": "backrooms:level_3", "position": { "y": 255 } @@ -54,7 +54,7 @@ "level0dotted": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0dotted", + "dimension": "backrooms:level_0_dotted", "position": { "y": 255 } @@ -63,7 +63,7 @@ "level0red": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0red", + "dimension": "backrooms:level_0_red", "position": { "y": 255 } diff --git a/bin/main/data/backrooms/loot_tables/chests/level3.json b/bin/main/data/backrooms/loot_tables/chests/level3.json index 4bfe271..71b63cb 100644 --- a/bin/main/data/backrooms/loot_tables/chests/level3.json +++ b/bin/main/data/backrooms/loot_tables/chests/level3.json @@ -96,6 +96,21 @@ "name": "minecraft:golden_sword", "weight": 3 }, + { + "type": "item", + "name": "minecraft:iron_pickaxe", + "weight": 2 + }, + { + "type": "item", + "name": "minecraft:gold_pickaxe", + "weight": 3 + }, + { + "type": "item", + "name": "backrooms:music_disc_pretzels_and_cheese", + "weight": 3 + }, { "type": "item", "name": "minecraft:golden_apple", diff --git a/bin/main/fabric.mod.json b/bin/main/fabric.mod.json index 94e240f..7ca49b2 100644 --- a/bin/main/fabric.mod.json +++ b/bin/main/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "backrooms", - "version": "1.0.1", + "version": "1.1.0", "name": "The Backrooms", "description": "The backrooms, endless mono yellow rooms to traverse.", diff --git a/bin/main/net/ludocrypt/backrooms/biome/Level0.class b/bin/main/net/ludocrypt/backrooms/biome/Level0.class index 5e853ae..6a7062c 100644 Binary files a/bin/main/net/ludocrypt/backrooms/biome/Level0.class and b/bin/main/net/ludocrypt/backrooms/biome/Level0.class differ diff --git a/bin/main/net/ludocrypt/backrooms/biome/Level0Red.class b/bin/main/net/ludocrypt/backrooms/biome/Level0Red.class index 704564e..3aadfda 100644 Binary files a/bin/main/net/ludocrypt/backrooms/biome/Level0Red.class and b/bin/main/net/ludocrypt/backrooms/biome/Level0Red.class differ diff --git a/bin/main/net/ludocrypt/backrooms/biome/Level1.class b/bin/main/net/ludocrypt/backrooms/biome/Level1.class index f07f307..a8ef26c 100644 Binary files a/bin/main/net/ludocrypt/backrooms/biome/Level1.class and b/bin/main/net/ludocrypt/backrooms/biome/Level1.class differ diff --git a/bin/main/net/ludocrypt/backrooms/biome/Level2.class b/bin/main/net/ludocrypt/backrooms/biome/Level2.class index 420d009..5ed67e8 100644 Binary files a/bin/main/net/ludocrypt/backrooms/biome/Level2.class and b/bin/main/net/ludocrypt/backrooms/biome/Level2.class differ diff --git a/bin/main/net/ludocrypt/backrooms/biome/Level3.class b/bin/main/net/ludocrypt/backrooms/biome/Level3.class index 4224c81..3dff18c 100644 Binary files a/bin/main/net/ludocrypt/backrooms/biome/Level3.class and b/bin/main/net/ludocrypt/backrooms/biome/Level3.class differ diff --git a/bin/main/net/ludocrypt/backrooms/blocks/Carpet.class b/bin/main/net/ludocrypt/backrooms/blocks/Carpet.class index d318672..3be37f9 100644 Binary files a/bin/main/net/ludocrypt/backrooms/blocks/Carpet.class and b/bin/main/net/ludocrypt/backrooms/blocks/Carpet.class differ diff --git a/bin/main/net/ludocrypt/backrooms/blocks/Tile.class b/bin/main/net/ludocrypt/backrooms/blocks/Tile.class index f5c50d0..612cd01 100644 Binary files a/bin/main/net/ludocrypt/backrooms/blocks/Tile.class and b/bin/main/net/ludocrypt/backrooms/blocks/Tile.class differ diff --git a/bin/main/net/ludocrypt/backrooms/blocks/TornWallpaper.class b/bin/main/net/ludocrypt/backrooms/blocks/TornWallpaper.class index 48e9779..f7e8d94 100644 Binary files a/bin/main/net/ludocrypt/backrooms/blocks/TornWallpaper.class and b/bin/main/net/ludocrypt/backrooms/blocks/TornWallpaper.class differ diff --git a/bin/main/net/ludocrypt/backrooms/blocks/Wallpaper.class b/bin/main/net/ludocrypt/backrooms/blocks/Wallpaper.class index 2083664..b7a07d7 100644 Binary files a/bin/main/net/ludocrypt/backrooms/blocks/Wallpaper.class and b/bin/main/net/ludocrypt/backrooms/blocks/Wallpaper.class differ diff --git a/bin/main/net/ludocrypt/backrooms/dimension/BackroomsPlacers.class b/bin/main/net/ludocrypt/backrooms/dimension/BackroomsPlacers.class index 68ebea1..3227511 100644 Binary files a/bin/main/net/ludocrypt/backrooms/dimension/BackroomsPlacers.class and b/bin/main/net/ludocrypt/backrooms/dimension/BackroomsPlacers.class differ diff --git a/bin/main/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.class b/bin/main/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.class index d16a591..9ac2f87 100644 Binary files a/bin/main/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.class and b/bin/main/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.class differ diff --git a/gradle.properties b/gradle.properties index e331d66..13b07f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.16.1+build.21 loader_version=0.9.0+build.204 # Mod Properties - mod_version = 1.1.0 + mod_version = 1.1.1 maven_group = net.ludocrypt archives_base_name = the-backrooms diff --git a/src/main/java/net/ludocrypt/backrooms/biome/Level0.java b/src/main/java/net/ludocrypt/backrooms/biome/Level0.java index a13179f..5fbead0 100644 --- a/src/main/java/net/ludocrypt/backrooms/biome/Level0.java +++ b/src/main/java/net/ludocrypt/backrooms/biome/Level0.java @@ -35,26 +35,9 @@ public Level0() { LevelsFeatureInit.LEVEL0ROOM.configure(FeatureConfig.DEFAULT) .createDecoratedFeature(LEVEL0PLACER.configure(DecoratorConfig.DEFAULT))); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMAN, 50, 2, 5)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ENDERMITE, 10, 3, 8)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.SILVERFISH, 50, 0, 2)); - this.addSpawn(SpawnGroup.CREATURE, new Biome.SpawnEntry(EntityType.ZOMBIE, 50, 4, 12)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 5, 0, 2)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2)); + } @Override diff --git a/src/main/java/net/ludocrypt/backrooms/biome/Level0Red.java b/src/main/java/net/ludocrypt/backrooms/biome/Level0Red.java index 910e9d8..d4fefeb 100644 --- a/src/main/java/net/ludocrypt/backrooms/biome/Level0Red.java +++ b/src/main/java/net/ludocrypt/backrooms/biome/Level0Red.java @@ -6,6 +6,8 @@ import net.ludocrypt.backrooms.features.LevelsFeatureInit; import net.ludocrypt.backrooms.features.decorators.Level0RedRoomDecorator; import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.gen.GenerationStep; @@ -32,6 +34,10 @@ public Level0Red() { this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS, LevelsFeatureInit.LEVEL0REDROOM.configure(FeatureConfig.DEFAULT) .createDecoratedFeature(LEVEL0REDPLACER.configure(DecoratorConfig.DEFAULT))); + + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 4, 0, 2)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2)); + } @Override diff --git a/src/main/java/net/ludocrypt/backrooms/biome/Level1.java b/src/main/java/net/ludocrypt/backrooms/biome/Level1.java index 6c6da8a..480140f 100644 --- a/src/main/java/net/ludocrypt/backrooms/biome/Level1.java +++ b/src/main/java/net/ludocrypt/backrooms/biome/Level1.java @@ -6,6 +6,8 @@ import net.ludocrypt.backrooms.features.LevelsFeatureInit; import net.ludocrypt.backrooms.features.decorators.Level1RoomDecorator; import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.gen.GenerationStep; @@ -32,6 +34,10 @@ public Level1() { this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS, LevelsFeatureInit.LEVEL1ROOM.configure(FeatureConfig.DEFAULT) .createDecoratedFeature(LEVEL1PLACER.configure(DecoratorConfig.DEFAULT))); + + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 4, 0, 2)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SILVERFISH, 4, 0, 3)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2)); } @Override diff --git a/src/main/java/net/ludocrypt/backrooms/biome/Level2.java b/src/main/java/net/ludocrypt/backrooms/biome/Level2.java index ea0a7da..383afc2 100644 --- a/src/main/java/net/ludocrypt/backrooms/biome/Level2.java +++ b/src/main/java/net/ludocrypt/backrooms/biome/Level2.java @@ -6,6 +6,8 @@ import net.ludocrypt.backrooms.features.LevelsFeatureInit; import net.ludocrypt.backrooms.features.decorators.Level2RoomDecorator; import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.gen.GenerationStep; @@ -32,6 +34,12 @@ public Level2() { this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS, LevelsFeatureInit.LEVEL2ROOM.configure(FeatureConfig.DEFAULT) .createDecoratedFeature(LEVEL2PLACER.configure(DecoratorConfig.DEFAULT))); + + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 2, 0, 2)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SILVERFISH, 2, 0, 3)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.VEX, 2, 0, 3)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2)); + } @Override diff --git a/src/main/java/net/ludocrypt/backrooms/biome/Level3.java b/src/main/java/net/ludocrypt/backrooms/biome/Level3.java index 934d9b1..90b42a6 100644 --- a/src/main/java/net/ludocrypt/backrooms/biome/Level3.java +++ b/src/main/java/net/ludocrypt/backrooms/biome/Level3.java @@ -6,6 +6,8 @@ import net.ludocrypt.backrooms.features.LevelsFeatureInit; import net.ludocrypt.backrooms.features.decorators.Level2RoomDecorator; import net.minecraft.block.BlockState; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeEffects; import net.minecraft.world.gen.GenerationStep; @@ -32,6 +34,11 @@ public Level3() { this.addFeature(GenerationStep.Feature.LOCAL_MODIFICATIONS, LevelsFeatureInit.LEVEL3ROOM.configure(FeatureConfig.DEFAULT) .createDecoratedFeature(LEVEL3PLACER.configure(DecoratorConfig.DEFAULT))); + + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.ENDERMAN, 2, 0, 2)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SILVERFISH, 2, 0, 3)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.VEX, 2, 0, 3)); + this.addSpawn(SpawnGroup.AMBIENT, new Biome.SpawnEntry(EntityType.SNOWBALL, 500, 0, 2)); } @Override diff --git a/src/main/java/net/ludocrypt/backrooms/blocks/Carpet.java b/src/main/java/net/ludocrypt/backrooms/blocks/Carpet.java index cad2386..a3e8b6c 100644 --- a/src/main/java/net/ludocrypt/backrooms/blocks/Carpet.java +++ b/src/main/java/net/ludocrypt/backrooms/blocks/Carpet.java @@ -63,43 +63,43 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt Item item = null; switch (k) { case 0: - item = Items.WHEAT_SEEDS; + item = Items.OAK_SAPLING; break; case 1: - item = Items.BEETROOT_SEEDS; + item = Items.OAK_SAPLING; break; case 2: - item = Items.OAK_SAPLING; + item = Items.BIRCH_SAPLING; break; case 3: item = Items.JUNGLE_SAPLING; break; case 4: - item = Items.BEETROOT_SEEDS; + item = Items.PUMPKIN_SEEDS; break; case 5: - item = Items.BEETROOT_SEEDS; + item = Items.PUMPKIN_SEEDS; break; case 6: - item = Items.WHEAT_SEEDS; + item = Items.PUMPKIN_SEEDS; break; case 7: - item = Items.BEETROOT_SEEDS; + item = Items.MELON_SEEDS; break; case 8: - item = Items.WHEAT_SEEDS; + item = Items.MELON_SEEDS; break; case 9: - item = Items.BEETROOT_SEEDS; + item = Items.MELON_SEEDS; break; case 10: - item = Items.WHEAT_SEEDS; + item = Items.MELON_SEEDS; break; case 11: - item = Items.BEETROOT_SEEDS; + item = Items.MELON_SEEDS; break; case 12: - item = Items.WHEAT_SEEDS; + item = Items.MELON_SEEDS; break; } ItemEntity entity = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 1.2, pos.getZ() + 0.5, diff --git a/src/main/java/net/ludocrypt/backrooms/blocks/Tile.java b/src/main/java/net/ludocrypt/backrooms/blocks/Tile.java index 202387e..ae2ab87 100644 --- a/src/main/java/net/ludocrypt/backrooms/blocks/Tile.java +++ b/src/main/java/net/ludocrypt/backrooms/blocks/Tile.java @@ -32,6 +32,6 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { if (ctx.getPlayerFacing() == Direction.EAST || ctx.getPlayerFacing() == Direction.WEST) { return (BlockState) this.getDefaultState().with(FACING, Direction.EAST).with(SINGLE, true); } - return (BlockState) this.getDefaultState().with(FACING, ctx.getPlayerFacing()).with(SINGLE, false); + return (BlockState) this.getDefaultState().with(FACING, ctx.getPlayerFacing().getOpposite()).with(SINGLE, false); } } diff --git a/src/main/java/net/ludocrypt/backrooms/blocks/TornWallpaper.java b/src/main/java/net/ludocrypt/backrooms/blocks/TornWallpaper.java index f1f51f1..9993d3b 100644 --- a/src/main/java/net/ludocrypt/backrooms/blocks/TornWallpaper.java +++ b/src/main/java/net/ludocrypt/backrooms/blocks/TornWallpaper.java @@ -12,6 +12,7 @@ import net.minecraft.block.Material; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.AxeItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -46,7 +47,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt BlockHitResult hit) { Random rand = world.random; ItemStack itemStack = player.getStackInHand(hand); - if (itemStack.getItem() == Items.SHEARS) { + if (itemStack.getItem() == Items.SHEARS || itemStack.getItem() instanceof AxeItem) { if (player instanceof ServerPlayerEntity && !player.isCreative()) { itemStack.damage(1, rand, (ServerPlayerEntity) player); } diff --git a/src/main/java/net/ludocrypt/backrooms/blocks/Wallpaper.java b/src/main/java/net/ludocrypt/backrooms/blocks/Wallpaper.java index bc13dc9..1168660 100644 --- a/src/main/java/net/ludocrypt/backrooms/blocks/Wallpaper.java +++ b/src/main/java/net/ludocrypt/backrooms/blocks/Wallpaper.java @@ -12,6 +12,7 @@ import net.minecraft.block.Material; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.server.network.ServerPlayerEntity; @@ -35,7 +36,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt BlockHitResult hit) { Random rand = world.random; ItemStack itemStack = player.getStackInHand(hand); - if (itemStack.getItem() == Items.SHEARS) { + if (itemStack.getItem() == Items.SHEARS || itemStack.getItem() instanceof AxeItem) { if (player instanceof ServerPlayerEntity && !player.isCreative()) { itemStack.damage(1, rand, (ServerPlayerEntity) player); } diff --git a/src/main/java/net/ludocrypt/backrooms/dimension/BackroomsPlacers.java b/src/main/java/net/ludocrypt/backrooms/dimension/BackroomsPlacers.java index 7125062..682269f 100644 --- a/src/main/java/net/ludocrypt/backrooms/dimension/BackroomsPlacers.java +++ b/src/main/java/net/ludocrypt/backrooms/dimension/BackroomsPlacers.java @@ -3,6 +3,7 @@ import net.fabricmc.fabric.api.dimension.v1.EntityPlacer; import net.minecraft.block.pattern.BlockPattern; import net.minecraft.util.math.Vec3d; +import net.minecraft.world.Heightmap; @SuppressWarnings("deprecation") public class BackroomsPlacers { @@ -10,29 +11,31 @@ public class BackroomsPlacers { public static final EntityPlacer LEVEL01 = (oldEntity, destination, portalDir, horizontalOffset, verticalOffset) -> { return new BlockPattern.TeleportTarget( - new Vec3d(oldEntity.getX() + ((destination.random.nextInt(200) - 100) * 16) + 3.5, 6, - oldEntity.getZ() + ((destination.random.nextInt(200) - 100) * 16) + 3.5), + new Vec3d(oldEntity.getX() + ((destination.random.nextInt(20) - 10) * 16) + 3.5, 6, + oldEntity.getZ() + ((destination.random.nextInt(20) - 10) * 16) + 3.5), oldEntity.getVelocity(), (int) oldEntity.yaw); }; - public static final EntityPlacer LEVEL2 = (oldEntity, destination, portalDir, horizontalOffset, - verticalOffset) -> { + public static final EntityPlacer LEVEL2 = (oldEntity, destination, portalDir, horizontalOffset, verticalOffset) -> { return new BlockPattern.TeleportTarget( - new Vec3d(oldEntity.getX() + ((destination.random.nextInt(200) - 100) * 16) + 3.5, 5, - oldEntity.getZ() + ((destination.random.nextInt(200) - 100) * 16) + 3.5), + new Vec3d(oldEntity.getX() + ((destination.random.nextInt(20) - 10) * 16) + 3.5, 5, + oldEntity.getZ() + ((destination.random.nextInt(20) - 10) * 16) + 3.5), oldEntity.getVelocity(), (int) oldEntity.yaw); }; - - public static final EntityPlacer LEVEL3 = (oldEntity, destination, portalDir, horizontalOffset, - verticalOffset) -> { + + public static final EntityPlacer LEVEL3 = (oldEntity, destination, portalDir, horizontalOffset, verticalOffset) -> { return new BlockPattern.TeleportTarget( - new Vec3d(oldEntity.getX() + ((destination.random.nextInt(200) - 100) * 16) + 3.5, 4, - oldEntity.getZ() + ((destination.random.nextInt(200) - 100) * 16) + 3.5), + new Vec3d(oldEntity.getX() + ((destination.random.nextInt(20) - 10) * 16) + 3.5, 4, + oldEntity.getZ() + ((destination.random.nextInt(20) - 10) * 16) + 3.5), oldEntity.getVelocity(), (int) oldEntity.yaw); }; public static final EntityPlacer HOME = (oldEntity, destination, portalDir, horizontalOffset, verticalOffset) -> { - return new BlockPattern.TeleportTarget(new Vec3d(destination.getSpawnPos().getX(), destination.getSpawnPos().getY(), destination.getSpawnPos().getZ()), + return new BlockPattern.TeleportTarget( + new Vec3d(destination.getSpawnPos().getX(), + destination.getTopY(Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, destination.getSpawnPos().getX(), + destination.getSpawnPos().getZ()), + destination.getSpawnPos().getZ()), oldEntity.getVelocity(), (int) oldEntity.yaw); }; } diff --git a/src/main/java/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.java b/src/main/java/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.java index b2d0c5f..f730e81 100644 --- a/src/main/java/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.java +++ b/src/main/java/net/ludocrypt/backrooms/mixin/MobSpawnLocationMixin.java @@ -23,7 +23,10 @@ private static void spawnEntitiesInChunk(SpawnGroup group, ServerWorld world, Ch SpawnHelper.Checker checker, SpawnHelper.Runner runner, CallbackInfo ci) { // No mobs allowed to spawn on roof - if (world.getRegistryKey() == BDimension.LEVEL0WORLD && pos.getY() > 255) { + if ((world.getRegistryKey() == BDimension.LEVEL0WORLD || world.getRegistryKey() == BDimension.LEVEL0DOTTEDWORLD + || world.getRegistryKey() == BDimension.LEVEL0REDWORLD + || world.getRegistryKey() == BDimension.LEVEL1WORLD || world.getRegistryKey() == BDimension.LEVEL2WORLD + || world.getRegistryKey() == BDimension.LEVEL3WORLD ) && pos.getY() > 255) { ci.cancel(); } } diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_black.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_black.png index 14119b8..41d61c8 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_black.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_black.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_blue.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_blue.png index b4b17ea..f229713 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_blue.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_blue.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_brown.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_brown.png index d63491f..915c90c 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_brown.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_brown.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_cyan.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_cyan.png index be16a9b..e63a1be 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_cyan.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_cyan.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_gray.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_gray.png index 661398e..6911bab 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_gray.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_gray.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_green.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_green.png index 7ff85bc..0b41b0b 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_green.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_green.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_blue.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_blue.png index f9fc188..09b8ff1 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_blue.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_blue.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_gray.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_gray.png index 19ed9c3..b9a0492 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_gray.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_light_gray.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_lime.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_lime.png index 9743fa5..8612d97 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_lime.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_lime.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_magenta.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_magenta.png index add9761..dbef1df 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_magenta.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_magenta.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_orange.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_orange.png index 5fb3096..2f45e52 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_orange.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_orange.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_pink.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_pink.png index 141eae6..9b604fc 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_pink.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_pink.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_purple.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_purple.png index 79f00d8..c4cdbf6 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_purple.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_purple.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_red.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_red.png index 780d9c8..a66c6fe 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_red.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_red.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_white.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_white.png index bf5aefd..1d59d3e 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_white.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_white.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_yellow.png b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_yellow.png index 993f9f9..bc266d0 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/checkered/checkered_yellow.png and b/src/main/resources/assets/backrooms/textures/block/checkered/checkered_yellow.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png index d5afea9..b9ffdbd 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png and b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet0.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png index 2fcf081..5c48a84 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png and b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet1.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png index 9ab5500..19b2edf 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png and b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet2.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png index b01c1dd..c7a24a0 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png and b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet3.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png index 0e36a10..8d03321 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png and b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet5.png differ diff --git a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png index 03a8180..f0e534b 100644 Binary files a/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png and b/src/main/resources/assets/backrooms/textures/block/moldy_carpet/moldy_carpet6.png differ diff --git a/src/main/resources/data/backrooms/advancements/backrooms.json b/src/main/resources/data/backrooms/advancements/backrooms.json index 1e5ebe8..318f679 100644 --- a/src/main/resources/data/backrooms/advancements/backrooms.json +++ b/src/main/resources/data/backrooms/advancements/backrooms.json @@ -19,7 +19,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0" + "dimension": "backrooms:level_0" } } }, diff --git a/src/main/resources/data/backrooms/advancements/level_0.json b/src/main/resources/data/backrooms/advancements/level_0.json index d2fffd0..48702ed 100644 --- a/src/main/resources/data/backrooms/advancements/level_0.json +++ b/src/main/resources/data/backrooms/advancements/level_0.json @@ -18,7 +18,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0" + "dimension": "backrooms:level_0" } } }, diff --git a/src/main/resources/data/backrooms/advancements/level_0_dotted.json b/src/main/resources/data/backrooms/advancements/level_0_dotted.json index 8353286..2104671 100644 --- a/src/main/resources/data/backrooms/advancements/level_0_dotted.json +++ b/src/main/resources/data/backrooms/advancements/level_0_dotted.json @@ -18,7 +18,7 @@ "level0dotted": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0dotted" + "dimension": "backrooms:level_0_dotted" } } }, diff --git a/src/main/resources/data/backrooms/advancements/level_0_red.json b/src/main/resources/data/backrooms/advancements/level_0_red.json index 6010166..df0948a 100644 --- a/src/main/resources/data/backrooms/advancements/level_0_red.json +++ b/src/main/resources/data/backrooms/advancements/level_0_red.json @@ -18,7 +18,7 @@ "level0red": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0red" + "dimension": "backrooms:level_0_red" } } }, diff --git a/src/main/resources/data/backrooms/advancements/level_1.json b/src/main/resources/data/backrooms/advancements/level_1.json index 978bb27..1cc761a 100644 --- a/src/main/resources/data/backrooms/advancements/level_1.json +++ b/src/main/resources/data/backrooms/advancements/level_1.json @@ -18,7 +18,7 @@ "level1": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level1" + "dimension": "backrooms:level_1" } } }, diff --git a/src/main/resources/data/backrooms/advancements/level_2.json b/src/main/resources/data/backrooms/advancements/level_2.json index e2c13d3..71f0c4c 100644 --- a/src/main/resources/data/backrooms/advancements/level_2.json +++ b/src/main/resources/data/backrooms/advancements/level_2.json @@ -18,7 +18,7 @@ "level2": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level2" + "dimension": "backrooms:level_2" } } }, diff --git a/src/main/resources/data/backrooms/advancements/level_3.json b/src/main/resources/data/backrooms/advancements/level_3.json index 36f0079..8c350e3 100644 --- a/src/main/resources/data/backrooms/advancements/level_3.json +++ b/src/main/resources/data/backrooms/advancements/level_3.json @@ -18,7 +18,7 @@ "level3": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level3" + "dimension": "backrooms:level_3" } } }, diff --git a/src/main/resources/data/backrooms/advancements/root_backrooms.json b/src/main/resources/data/backrooms/advancements/root_backrooms.json index 533d7b9..422d17d 100644 --- a/src/main/resources/data/backrooms/advancements/root_backrooms.json +++ b/src/main/resources/data/backrooms/advancements/root_backrooms.json @@ -19,7 +19,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0" + "dimension": "backrooms:level_0" } } }, diff --git a/src/main/resources/data/backrooms/advancements/timewaster.json b/src/main/resources/data/backrooms/advancements/timewaster.json index 776e859..98f916f 100644 --- a/src/main/resources/data/backrooms/advancements/timewaster.json +++ b/src/main/resources/data/backrooms/advancements/timewaster.json @@ -18,7 +18,7 @@ "level0": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0", + "dimension": "backrooms:level_0", "position": { "y": 255 } @@ -27,7 +27,7 @@ "level1": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level1", + "dimension": "backrooms:level_1", "position": { "y": 255 } @@ -36,7 +36,7 @@ "level2": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level2", + "dimension": "backrooms:level_2", "position": { "y": 255 } @@ -45,7 +45,7 @@ "level3": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level3", + "dimension": "backrooms:level_3", "position": { "y": 255 } @@ -54,7 +54,7 @@ "level0dotted": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0dotted", + "dimension": "backrooms:level_0_dotted", "position": { "y": 255 } @@ -63,7 +63,7 @@ "level0red": { "trigger": "minecraft:location", "conditions": { - "dimension": "backrooms:level0red", + "dimension": "backrooms:level_0_red", "position": { "y": 255 } diff --git a/src/main/resources/data/backrooms/loot_tables/chests/level3.json b/src/main/resources/data/backrooms/loot_tables/chests/level3.json index 4bfe271..71b63cb 100644 --- a/src/main/resources/data/backrooms/loot_tables/chests/level3.json +++ b/src/main/resources/data/backrooms/loot_tables/chests/level3.json @@ -96,6 +96,21 @@ "name": "minecraft:golden_sword", "weight": 3 }, + { + "type": "item", + "name": "minecraft:iron_pickaxe", + "weight": 2 + }, + { + "type": "item", + "name": "minecraft:gold_pickaxe", + "weight": 3 + }, + { + "type": "item", + "name": "backrooms:music_disc_pretzels_and_cheese", + "weight": 3 + }, { "type": "item", "name": "minecraft:golden_apple", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7ca49b2..2bc6d1c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "backrooms", - "version": "1.1.0", + "version": "1.1.1", "name": "The Backrooms", "description": "The backrooms, endless mono yellow rooms to traverse.",