diff --git a/CHANGELOG.md b/CHANGELOG.md index e253cd44..f2bcd378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ Thank you! Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED hi ----------------- -- Added 27 new rooms for the Catacombs. -- Chains new generate more commonly in Catacombs. +- Added 42 new rooms for Catacombs. +- Chains now generate more commonly in Catacombs. - Fixed a vanilla bug where Powered Rails, Activator Rails, and Detector Rails wouldn't rotate properly in structure generation. - Cracked and Chiseled Purpur Blocks can now be broken faster with a pickaxe. ([#10](https://github.com/FrozenBlock/TrailierTales/issues/10)) - Fixed a crash where modded boats that aren't implemented the same way as vanilla cause a crash. ([#9](https://github.com/FrozenBlock/TrailierTales/issues/9)) +- Fixed the Polished Calcite Wall not being craftable with a Stonecutter. ([#11](https://github.com/FrozenBlock/TrailierTales/issues/11)) - Removed the leftover `TRAILIER TALES` subtitle from the main menu. diff --git a/src/main/generated/data/trailiertales/advancement/recipes/decorations/calcite_wall_from_calcite_stonecutting.json b/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/calcite_wall_from_calcite_stonecutting.json similarity index 100% rename from src/main/generated/data/trailiertales/advancement/recipes/decorations/calcite_wall_from_calcite_stonecutting.json rename to src/main/generated/data/trailiertales/advancement/recipes/building_blocks/calcite_wall_from_calcite_stonecutting.json diff --git a/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/polished_calcite_wall_from_calcite_stonecutting.json b/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/polished_calcite_wall_from_calcite_stonecutting.json new file mode 100644 index 00000000..22e61295 --- /dev/null +++ b/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/polished_calcite_wall_from_calcite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_calcite": { + "conditions": { + "items": [ + { + "items": "minecraft:calcite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_calcite_wall_from_calcite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_calcite" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_calcite_wall_from_calcite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/polished_calcite_wall_from_polished_calcite_stonecutting.json b/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/polished_calcite_wall_from_polished_calcite_stonecutting.json new file mode 100644 index 00000000..bb4855c9 --- /dev/null +++ b/src/main/generated/data/trailiertales/advancement/recipes/building_blocks/polished_calcite_wall_from_polished_calcite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_calcite": { + "conditions": { + "items": [ + { + "items": "trailiertales:polished_calcite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_calcite_wall_from_polished_calcite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_polished_calcite" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_calcite_wall_from_polished_calcite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_calcite_stonecutting.json b/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_calcite_stonecutting.json new file mode 100644 index 00000000..af286c1e --- /dev/null +++ b/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_calcite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:calcite", + "result": { + "count": 1, + "id": "trailiertales:polished_calcite_wall" + } +} \ No newline at end of file diff --git a/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_polished_calcite_stonecutting.json b/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_polished_calcite_stonecutting.json new file mode 100644 index 00000000..3bd96e41 --- /dev/null +++ b/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_polished_calcite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "trailiertales:polished_calcite", + "result": { + "count": 1, + "id": "trailiertales:polished_calcite_wall" + } +} \ No newline at end of file diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json index 0ada8a31..daff222c 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json @@ -792,6 +792,15 @@ }, "weight": 2 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/corridor_pit", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -999,6 +1008,15 @@ }, "weight": 2 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/hallway", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -1116,6 +1134,15 @@ }, "weight": 2 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/layered4", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -1164,7 +1191,7 @@ { "element": { "element_type": "minecraft:single_pool_element", - "location": "trailiertales:catacombs/tomb/mob_delivery", + "location": "trailiertales:catacombs/tomb/mob_delivery1", "processors": "trailiertales:catacombs_mineshaft", "projection": "rigid" }, @@ -1173,7 +1200,34 @@ { "element": { "element_type": "minecraft:single_pool_element", - "location": "trailiertales:catacombs/tomb/mob_drop", + "location": "trailiertales:catacombs/tomb/mob_delivery2", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/mob_delivery3", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/mob_drop1", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/mob_drop2", "processors": "trailiertales:catacombs_tomb", "projection": "rigid" }, @@ -1278,6 +1332,15 @@ }, "weight": 2 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/ritual_flood", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -1449,6 +1512,15 @@ }, "weight": 2 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/small_fancy_tomb11", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -1584,6 +1656,15 @@ }, "weight": 2 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/tomb/waterworks", + "processors": "trailiertales:catacombs_tomb", + "projection": "rigid" + }, + "weight": 2 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -1602,6 +1683,15 @@ }, "weight": 1 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/corridor/gallery", + "processors": "trailiertales:catacombs_corridor", + "projection": "rigid" + }, + "weight": 1 + }, { "element": { "element_type": "minecraft:single_pool_element", diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json index 8f5605f5..45b6fcbc 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json @@ -4,7 +4,7 @@ "element": { "element_type": "minecraft:empty_pool_element" }, - "weight": 60 + "weight": 75 }, { "element": { @@ -26,7 +26,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 2 }, { "element": { @@ -37,7 +37,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 3 }, { "element": { @@ -48,7 +48,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 4 }, { "element": { @@ -59,7 +59,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 5 } ], "fallback": "minecraft:empty" diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json index 055ddc29..9e1a455d 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json @@ -4,7 +4,7 @@ "element": { "element_type": "minecraft:empty_pool_element" }, - "weight": 60 + "weight": 75 }, { "element": { @@ -15,7 +15,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 12 } ], "fallback": "minecraft:empty" diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json index 2f45a671..543b8e4d 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json @@ -4,7 +4,7 @@ "element": { "element_type": "minecraft:empty_pool_element" }, - "weight": 60 + "weight": 75 }, { "element": { @@ -15,7 +15,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 6 }, { "element": { @@ -26,7 +26,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 6 } ], "fallback": "minecraft:empty" diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json index 1f201a8d..1dfbd30c 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json @@ -4,7 +4,7 @@ "element": { "element_type": "minecraft:empty_pool_element" }, - "weight": 60 + "weight": 75 }, { "element": { @@ -15,7 +15,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 4 }, { "element": { @@ -26,7 +26,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 4 }, { "element": { @@ -37,7 +37,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 4 } ], "fallback": "minecraft:empty" diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_4.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_4.json index 1f5977b8..e73f8c6c 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_4.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_4.json @@ -4,7 +4,7 @@ "element": { "element_type": "minecraft:empty_pool_element" }, - "weight": 60 + "weight": 75 }, { "element": { @@ -26,7 +26,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 2 }, { "element": { @@ -37,7 +37,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 4 }, { "element": { @@ -48,7 +48,7 @@ }, "projection": "rigid" }, - "weight": 1 + "weight": 4 } ], "fallback": "minecraft:empty" diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/small_room.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/small_room.json index bf14b4de..f0429374 100644 --- a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/small_room.json +++ b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/small_room.json @@ -234,6 +234,42 @@ }, "weight": 1 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/generic20", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/generic21", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/generic22", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/generic23", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -270,6 +306,15 @@ }, "weight": 1 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/mine3", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, { "element": { "element_type": "minecraft:single_pool_element", @@ -369,6 +414,24 @@ }, "weight": 1 }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/terracotta", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "trailiertales:catacombs/room/tnt_lever", + "processors": "trailiertales:catacombs_small_room", + "projection": "rigid" + }, + "weight": 1 + }, { "element": { "element_type": "minecraft:single_pool_element", diff --git a/src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java b/src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java index 9e9e2a40..3f857f6a 100644 --- a/src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java +++ b/src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java @@ -6,7 +6,7 @@ public class TTPreLoadConstants { public static final String MOD_ID = "trailiertales"; - public static final boolean STRUCTURE_BUILDING_MODE = false; // Only enable this while building structures. + public static final boolean STRUCTURE_BUILDING_MODE = true; // Only enable this while building structures. @Contract(pure = true) public static @NotNull Path configPath(String name, boolean json5) { diff --git a/src/main/java/net/frozenblock/trailiertales/datagen/recipe/TTRecipeProvider.java b/src/main/java/net/frozenblock/trailiertales/datagen/recipe/TTRecipeProvider.java index 67dd4254..0ec268e8 100644 --- a/src/main/java/net/frozenblock/trailiertales/datagen/recipe/TTRecipeProvider.java +++ b/src/main/java/net/frozenblock/trailiertales/datagen/recipe/TTRecipeProvider.java @@ -240,12 +240,14 @@ public void buildRecipes() { stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_SLAB, Blocks.CALCITE, 2); stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_STAIRS, Blocks.CALCITE); - stonecutterResultFromBase(RecipeCategory.DECORATIONS, TTBlocks.CALCITE_WALL, Blocks.CALCITE); + stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_WALL, Blocks.CALCITE); stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE, Blocks.CALCITE); stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_SLAB, Blocks.CALCITE, 2); stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_STAIRS, Blocks.CALCITE); + stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_WALL, Blocks.CALCITE); stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_SLAB, TTBlocks.POLISHED_CALCITE, 2); stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_STAIRS, TTBlocks.POLISHED_CALCITE); + stonecutterResultFromBase(RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_WALL, TTBlocks.POLISHED_CALCITE); this.shaped(RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_BRICKS, 4) .define('#', Blocks.CALCITE) diff --git a/src/main/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java b/src/main/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java index 22c9bb11..24a88124 100644 --- a/src/main/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java +++ b/src/main/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java @@ -265,6 +265,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext