From c7a0260b3c759303f7ad8c5036fdf1078f3504c0 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sun, 22 Jun 2025 12:11:00 +0200 Subject: [PATCH] fix: correct cobblestone fragment crafting recipe --- .../recipes/building_blocks/andesite_from_splitter.json | 4 ++-- ...one_from_splitter.json => cobblestone_from_splitter.json} | 4 ++-- .../recipes/building_blocks/diorite_from_splitter.json | 4 ++-- .../recipes/building_blocks/end_stone_from_splitter.json | 4 ++-- .../recipes/building_blocks/granite_from_splitter.json | 4 ++-- .../recipes/building_blocks/ice_from_splitter.json | 4 ++-- .../recipes/building_blocks/netherrack_from_splitter.json | 4 ++-- .../recipes/building_blocks/red_sandstone_from_splitter.json | 4 ++-- .../recipes/building_blocks/sandstone_from_splitter.json | 4 ++-- .../recipes/building_blocks/soul_soil_from_splitter.json | 4 ++-- ...one_from_splitter.json => cobblestone_from_splitter.json} | 2 +- .../java/eu/midnightdust/motschen/rocks/datagen/Recipes.java | 5 +++-- 12 files changed, 24 insertions(+), 23 deletions(-) rename src/main/generated/data/rocks/advancement/recipes/building_blocks/{stone_from_splitter.json => cobblestone_from_splitter.json} (84%) rename src/main/generated/data/rocks/recipe/{stone_from_splitter.json => cobblestone_from_splitter.json} (88%) diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/andesite_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/andesite_from_splitter.json index 1d85205..6faec00 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/andesite_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/andesite_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:andesite_from_splitter" + "recipe": "rocks:andesite_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:andesite_from_splitter" + "rocks:andesite_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/stone_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/cobblestone_from_splitter.json similarity index 84% rename from src/main/generated/data/rocks/advancement/recipes/building_blocks/stone_from_splitter.json rename to src/main/generated/data/rocks/advancement/recipes/building_blocks/cobblestone_from_splitter.json index a121c19..254b957 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/stone_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/cobblestone_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:stone_from_splitter" + "recipe": "rocks:cobblestone_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:stone_from_splitter" + "rocks:cobblestone_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/diorite_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/diorite_from_splitter.json index 97422b8..831c90e 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/diorite_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/diorite_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:diorite_from_splitter" + "recipe": "rocks:diorite_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:diorite_from_splitter" + "rocks:diorite_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/end_stone_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/end_stone_from_splitter.json index 950ada2..83315dc 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/end_stone_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/end_stone_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:end_stone_from_splitter" + "recipe": "rocks:end_stone_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:end_stone_from_splitter" + "rocks:end_stone_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/granite_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/granite_from_splitter.json index b9152e5..84416b9 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/granite_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/granite_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:granite_from_splitter" + "recipe": "rocks:granite_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:granite_from_splitter" + "rocks:granite_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/ice_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/ice_from_splitter.json index d3ecfb0..923f1f7 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/ice_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/ice_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:ice_from_splitter" + "recipe": "rocks:ice_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:ice_from_splitter" + "rocks:ice_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/netherrack_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/netherrack_from_splitter.json index 6692804..f84898f 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/netherrack_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/netherrack_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:netherrack_from_splitter" + "recipe": "rocks:netherrack_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:netherrack_from_splitter" + "rocks:netherrack_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/red_sandstone_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/red_sandstone_from_splitter.json index e145f54..740299b 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/red_sandstone_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/red_sandstone_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:red_sandstone_from_splitter" + "recipe": "rocks:red_sandstone_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:red_sandstone_from_splitter" + "rocks:red_sandstone_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/sandstone_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/sandstone_from_splitter.json index 97a6a38..6868a9a 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/sandstone_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/sandstone_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:sandstone_from_splitter" + "recipe": "rocks:sandstone_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:sandstone_from_splitter" + "rocks:sandstone_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/advancement/recipes/building_blocks/soul_soil_from_splitter.json b/src/main/generated/data/rocks/advancement/recipes/building_blocks/soul_soil_from_splitter.json index 49edbba..601075b 100644 --- a/src/main/generated/data/rocks/advancement/recipes/building_blocks/soul_soil_from_splitter.json +++ b/src/main/generated/data/rocks/advancement/recipes/building_blocks/soul_soil_from_splitter.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:soul_soil_from_splitter" + "recipe": "rocks:soul_soil_from_splitter" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:soul_soil_from_splitter" + "rocks:soul_soil_from_splitter" ] } } \ No newline at end of file diff --git a/src/main/generated/data/rocks/recipe/stone_from_splitter.json b/src/main/generated/data/rocks/recipe/cobblestone_from_splitter.json similarity index 88% rename from src/main/generated/data/rocks/recipe/stone_from_splitter.json rename to src/main/generated/data/rocks/recipe/cobblestone_from_splitter.json index c7fed2c..4fe72ec 100644 --- a/src/main/generated/data/rocks/recipe/stone_from_splitter.json +++ b/src/main/generated/data/rocks/recipe/cobblestone_from_splitter.json @@ -9,6 +9,6 @@ ], "result": { "count": 1, - "id": "minecraft:stone" + "id": "minecraft:cobblestone" } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java index 393717e..0c522a1 100644 --- a/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java +++ b/src/main/java/eu/midnightdust/motschen/rocks/datagen/Recipes.java @@ -39,11 +39,12 @@ public class Recipes extends FabricRecipeProvider { } private void generateCrafting(RecipeExporter exporter) { RocksMain.splittersByType.forEach(((rockType, splitter) -> { + Identifier stoneID = rockType.getFragment().getStoneId(); - ShapelessRecipeJsonBuilder.create(registries.getOrThrow(RegistryKeys.ITEM), RecipeCategory.BUILDING_BLOCKS, Registries.BLOCK.get(Identifier.ofVanilla(rockType.name().toLowerCase())).asItem()) + ShapelessRecipeJsonBuilder.create(registries.getOrThrow(RegistryKeys.ITEM), RecipeCategory.BUILDING_BLOCKS, Registries.BLOCK.get(stoneID).asItem()) .input(splitter, 4) .criterion(RecipeGenerator.hasItem(splitter), this.conditionsFromItem(splitter)) - .offerTo(exporter, rockType.name().toLowerCase()+"_from_splitter"); + .offerTo(exporter, stoneID.getPath()+"_from_splitter"); })); } }