diff --git a/CHANGELOG.md b/CHANGELOG.md index d5493ffb..f2bcd378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,4 +8,5 @@ hi - 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..3c1a7a16 --- /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": "trailiertales:polished_calcite_wall_from_calcite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_calcite" + ] + ], + "rewards": { + "recipes": [ + "trailiertales: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..da933054 --- /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": "trailiertales:polished_calcite_wall_from_polished_calcite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_polished_calcite" + ] + ], + "rewards": { + "recipes": [ + "trailiertales: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..7908ceda --- /dev/null +++ b/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_calcite_stonecutting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "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..6dee50a9 --- /dev/null +++ b/src/main/generated/data/trailiertales/recipe/polished_calcite_wall_from_polished_calcite_stonecutting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "trailiertales:polished_calcite" + }, + "result": { + "count": 1, + "id": "trailiertales:polished_calcite_wall" + } +} \ No newline at end of file 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 0d44812c..08eebcc6 100644 --- a/src/main/java/net/frozenblock/trailiertales/datagen/recipe/TTRecipeProvider.java +++ b/src/main/java/net/frozenblock/trailiertales/datagen/recipe/TTRecipeProvider.java @@ -231,12 +231,14 @@ public void buildRecipes(RecipeOutput recipeOutput) { stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_SLAB, Blocks.CALCITE, 2); stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_STAIRS, Blocks.CALCITE); - stonecutterResultFromBase(recipeOutput, RecipeCategory.DECORATIONS, TTBlocks.CALCITE_WALL, Blocks.CALCITE); + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_WALL, Blocks.CALCITE); stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE, Blocks.CALCITE); stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_SLAB, Blocks.CALCITE, 2); stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_STAIRS, Blocks.CALCITE); + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_WALL, Blocks.CALCITE); stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_SLAB, TTBlocks.POLISHED_CALCITE, 2); stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_STAIRS, TTBlocks.POLISHED_CALCITE); + stonecutterResultFromBase(recipeOutput, RecipeCategory.BUILDING_BLOCKS, TTBlocks.POLISHED_CALCITE_WALL, TTBlocks.POLISHED_CALCITE); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, TTBlocks.CALCITE_BRICKS, 4) .define('#', Blocks.CALCITE)