From 6340779eaaf140acb9b690a7664a4d3bb4dbd664 Mon Sep 17 00:00:00 2001 From: kalwantspizza Date: Tue, 28 Jul 2026 07:22:38 -0400 Subject: [PATCH 1/3] Block & Item Tag Audit --- .gitignore | 1 - .../data/c/tags/block/storage_blocks.json | 2 ++ .../data/c/tags/item/crushed_raw_cobalt.json | 5 ---- .../c/tags/item/crushed_raw_materials.json | 5 ---- .../resources/data/c/tags/item/ingots.json | 1 - .../resources/data/c/tags/item/nuggets.json | 2 -- .../data/c/tags/item/ores/cobalt.json | 1 - .../resources/data/c/tags/item/plates.json | 2 -- .../data/c/tags/item/raw_materials.json | 1 - .../data/c/tags/item/storage_blocks.json | 2 ++ .../recipe/crafting/aluminum_nugget.json | 2 +- .../minecraft/tags/block/needs_iron_tool.json | 1 - .../init/ingameobject/BlockInit.java | 5 +++- .../init/ingameobject/ItemInit.java | 30 +++++++++---------- 14 files changed, 24 insertions(+), 36 deletions(-) delete mode 100644 src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json delete mode 100644 src/generated/resources/data/c/tags/item/crushed_raw_materials.json diff --git a/.gitignore b/.gitignore index baa48412..31f825e3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ run-data repo /src/generated/resources/.cache/ -/CS_1.21.1_src.zip diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index d0130cc6..cf7cad4c 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -2,6 +2,8 @@ "values": [ "creatingspace:raw_nickel_block", "creatingspace:nickel_block", + "creatingspace:raw_cobalt_block", + "creatingspace:raw_aluminum_block", "creatingspace:aluminum_block", "creatingspace:cobalt_block", "creatingspace:copronickel_block", diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json b/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json deleted file mode 100644 index 09691f5b..00000000 --- a/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "creatingspace:crushed_cobalt_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials.json deleted file mode 100644 index 09691f5b..00000000 --- a/src/generated/resources/data/c/tags/item/crushed_raw_materials.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "creatingspace:crushed_cobalt_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ingots.json b/src/generated/resources/data/c/tags/item/ingots.json index 99f0eacf..8e8c16fc 100644 --- a/src/generated/resources/data/c/tags/item/ingots.json +++ b/src/generated/resources/data/c/tags/item/ingots.json @@ -6,7 +6,6 @@ "creatingspace:inconel_ingot", "creatingspace:hastelloy_ingot", "creatingspace:nickel_ingot", - "creatingspace:aluminum_ingot", "creatingspace:cobalt_ingot" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/nuggets.json b/src/generated/resources/data/c/tags/item/nuggets.json index 0ccbb828..cbf2c9d6 100644 --- a/src/generated/resources/data/c/tags/item/nuggets.json +++ b/src/generated/resources/data/c/tags/item/nuggets.json @@ -5,8 +5,6 @@ "creatingspace:monel_nugget", "creatingspace:inconel_nugget", "creatingspace:hastelloy_nugget", - "creatingspace:nickel_nugget", - "creatingspace:aluminum_nugget", "creatingspace:cobalt_nugget" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/cobalt.json b/src/generated/resources/data/c/tags/item/ores/cobalt.json index 7edfcf02..8c832abc 100644 --- a/src/generated/resources/data/c/tags/item/ores/cobalt.json +++ b/src/generated/resources/data/c/tags/item/ores/cobalt.json @@ -1,6 +1,5 @@ { "values": [ - "creatingspace:crushed_cobalt_ore", "creatingspace:moon_cobalt_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/plates.json b/src/generated/resources/data/c/tags/item/plates.json index 786d9748..04ed7279 100644 --- a/src/generated/resources/data/c/tags/item/plates.json +++ b/src/generated/resources/data/c/tags/item/plates.json @@ -5,8 +5,6 @@ "creatingspace:monel_sheet", "creatingspace:inconel_sheet", "creatingspace:hastelloy_sheet", - "creatingspace:nickel_sheet", - "creatingspace:aluminum_sheet", "creatingspace:cobalt_sheet" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/raw_materials.json b/src/generated/resources/data/c/tags/item/raw_materials.json index 31423b0d..5ede8498 100644 --- a/src/generated/resources/data/c/tags/item/raw_materials.json +++ b/src/generated/resources/data/c/tags/item/raw_materials.json @@ -1,7 +1,6 @@ { "values": [ "creatingspace:raw_nickel", - "creatingspace:raw_aluminum", "creatingspace:raw_cobalt" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json index d0130cc6..cf7cad4c 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -2,6 +2,8 @@ "values": [ "creatingspace:raw_nickel_block", "creatingspace:nickel_block", + "creatingspace:raw_cobalt_block", + "creatingspace:raw_aluminum_block", "creatingspace:aluminum_block", "creatingspace:cobalt_block", "creatingspace:copronickel_block", diff --git a/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json b/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json index a8e75db5..b064b7e5 100644 --- a/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json +++ b/src/generated/resources/data/creatingspace/recipe/crafting/aluminum_nugget.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "c:ingots/aluminum" + "tag": "c:nuggets/aluminum" } ], "result": { diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index 9ab6e147..a2147206 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -6,7 +6,6 @@ "creatingspace:raw_nickel_block", "creatingspace:nickel_block", "creatingspace:moon_aluminum_ore", - "creatingspace:raw_aluminum_block", "creatingspace:aluminum_block", "creatingspace:cobalt_block", "creatingspace:copronickel_block", diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java index 0bcb746f..74db2932 100644 --- a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java +++ b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java @@ -633,6 +633,7 @@ public class BlockInit { .initialProperties(() -> Blocks.RAW_IRON_BLOCK) .tag(BlockTags.NEEDS_DIAMOND_TOOL) .transform(TagGen.pickaxeOnly()) + .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_cobalt"))) .recipe((c, p) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) @@ -643,6 +644,7 @@ public class BlockInit { .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) .item() + .tag(Tags.Items.STORAGE_BLOCKS) .tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_cobalt"))) .transform(customItemModel("raw_cobalt_block")) .register(); @@ -669,8 +671,8 @@ public class BlockInit { public static final BlockEntry RAW_ALUMINUM_BLOCK = REGISTRATE.block( "raw_aluminum_block", Block::new) .initialProperties(() -> Blocks.RAW_IRON_BLOCK) - .tag(BlockTags.NEEDS_IRON_TOOL) .transform(TagGen.pickaxeOnly()) + .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_aluminum"))) .recipe((c, p) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) @@ -681,6 +683,7 @@ public class BlockInit { .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) .item() + .tag(Tags.Items.STORAGE_BLOCKS) .tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_aluminum"))) .transform(customItemModel("raw_aluminum_block")) .register(); diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java index 8714c38f..d4b3fb88 100644 --- a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java +++ b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java @@ -18,6 +18,7 @@ import com.simibubi.create.content.equipment.armor.BaseArmorItem; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.util.entry.ItemEntry; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; @@ -334,7 +335,7 @@ private static ItemEntry registerSequencedEngineItem(Stri "raw_nickel",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/raw_nickel")) + .requires(CommonMetal.NICKEL.rawStorageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block"))) .tag(commonItemTag("raw_materials/nickel"), commonItemTag("raw_materials"),commonItemTag("ores/nickel")) @@ -356,14 +357,14 @@ private static ItemEntry registerSequencedEngineItem(Stri "nickel_ingot",Item::new) .recipe((c,p) -> { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) - .define('#', commonItemTag("nuggets/nickel")) + .define('#', CommonMetal.NICKEL.nuggets) .pattern("###") .pattern("###") .pattern("###") .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_nuggets")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/nickel")) + .requires(CommonMetal.NICKEL.storageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block")); }) @@ -375,17 +376,17 @@ private static ItemEntry registerSequencedEngineItem(Stri "nickel_nugget",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("ingots/nickel")) + .requires(CommonMetal.NICKEL.ingots) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) - .tag(commonItemTag("nuggets/nickel"), commonItemTag("nuggets")) + .tag(CommonMetal.NICKEL.nuggets) .register(); public static final ItemEntry NICKEL_SHEET = REGISTRATE.item( "nickel_sheet",Item::new) - .tag(commonItemTag("plates/nickel"), commonItemTag("plates")) + .tag(CommonMetal.NICKEL.plates) .register(); //aluminium @@ -394,10 +395,10 @@ private static ItemEntry registerSequencedEngineItem(Stri "raw_aluminum",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/raw_aluminum")) + .requires(CommonMetal.ALUMINUM.rawStorageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block"))) - .tag(commonItemTag("raw_materials/aluminum"), commonItemTag("raw_materials")) + .tag(CommonMetal.ALUMINUM.rawOres) .register(); @@ -411,18 +412,18 @@ private static ItemEntry registerSequencedEngineItem(Stri "aluminum_ingot",Item::new) .recipe((c,p) -> { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) - .define('#', commonItemTag("nuggets/aluminum")) + .define('#', CommonMetal.ALUMINUM.nuggets) .pattern("###") .pattern("###") .pattern("###") .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_nuggets")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/aluminum")) + .requires(CommonMetal.ALUMINUM.storageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block")); }) - .tag(commonItemTag("ingots/aluminum"), commonItemTag("ingots")) + .tag(CommonMetal.ALUMINUM.ingots) .register(); @@ -430,15 +431,15 @@ private static ItemEntry registerSequencedEngineItem(Stri "aluminum_nugget",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("ingots/aluminum")) + .requires(CommonMetal.ALUMINUM.nuggets) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) - .tag(commonItemTag("nuggets/aluminum"), commonItemTag("nuggets")) + .tag(CommonMetal.ALUMINUM.nuggets) .register(); public static final ItemEntry ALUMINUM_SHEET = REGISTRATE.item( "aluminum_sheet",Item::new) - .tag(commonItemTag("plates/aluminum"), commonItemTag("plates")) + .tag(CommonMetal.ALUMINUM.plates) .register(); //cobalt @@ -455,7 +456,6 @@ private static ItemEntry registerSequencedEngineItem(Stri public static final ItemEntry CRUSHED_COBALT_ORE = REGISTRATE.item( "crushed_cobalt_ore",Item::new) - .tag(commonItemTag("crushed_raw_cobalt"), commonItemTag("crushed_raw_materials"), commonItemTag("ores/cobalt")) .register(); public static final ItemEntry COBALT_INGOT = REGISTRATE.item( From 3fd270f915248359cb018c549d69ad73b21c9f99 Mon Sep 17 00:00:00 2001 From: kalwantspizza Date: Tue, 28 Jul 2026 09:41:16 -0400 Subject: [PATCH 2/3] Block & Item Tag Audit - redone --- .gitignore | 1 - .../data/c/tags/block/storage_blocks.json | 2 ++ .../data/c/tags/item/crushed_raw_cobalt.json | 5 ---- .../c/tags/item/crushed_raw_materials.json | 5 ---- .../data/c/tags/item/ores/cobalt.json | 1 - .../data/c/tags/item/storage_blocks.json | 2 ++ .../minecraft/tags/block/needs_iron_tool.json | 1 - .../init/ingameobject/BlockInit.java | 5 +++- .../init/ingameobject/ItemInit.java | 30 +++++++++---------- 9 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json delete mode 100644 src/generated/resources/data/c/tags/item/crushed_raw_materials.json diff --git a/.gitignore b/.gitignore index baa48412..31f825e3 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ run-data repo /src/generated/resources/.cache/ -/CS_1.21.1_src.zip diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index d0130cc6..cf7cad4c 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -2,6 +2,8 @@ "values": [ "creatingspace:raw_nickel_block", "creatingspace:nickel_block", + "creatingspace:raw_cobalt_block", + "creatingspace:raw_aluminum_block", "creatingspace:aluminum_block", "creatingspace:cobalt_block", "creatingspace:copronickel_block", diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json b/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json deleted file mode 100644 index 09691f5b..00000000 --- a/src/generated/resources/data/c/tags/item/crushed_raw_cobalt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "creatingspace:crushed_cobalt_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/crushed_raw_materials.json b/src/generated/resources/data/c/tags/item/crushed_raw_materials.json deleted file mode 100644 index 09691f5b..00000000 --- a/src/generated/resources/data/c/tags/item/crushed_raw_materials.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "creatingspace:crushed_cobalt_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores/cobalt.json b/src/generated/resources/data/c/tags/item/ores/cobalt.json index 7edfcf02..8c832abc 100644 --- a/src/generated/resources/data/c/tags/item/ores/cobalt.json +++ b/src/generated/resources/data/c/tags/item/ores/cobalt.json @@ -1,6 +1,5 @@ { "values": [ - "creatingspace:crushed_cobalt_ore", "creatingspace:moon_cobalt_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json index d0130cc6..cf7cad4c 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -2,6 +2,8 @@ "values": [ "creatingspace:raw_nickel_block", "creatingspace:nickel_block", + "creatingspace:raw_cobalt_block", + "creatingspace:raw_aluminum_block", "creatingspace:aluminum_block", "creatingspace:cobalt_block", "creatingspace:copronickel_block", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json index 9ab6e147..a2147206 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json @@ -6,7 +6,6 @@ "creatingspace:raw_nickel_block", "creatingspace:nickel_block", "creatingspace:moon_aluminum_ore", - "creatingspace:raw_aluminum_block", "creatingspace:aluminum_block", "creatingspace:cobalt_block", "creatingspace:copronickel_block", diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java index 0bcb746f..74db2932 100644 --- a/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java +++ b/src/main/java/com/rae/creatingspace/init/ingameobject/BlockInit.java @@ -633,6 +633,7 @@ public class BlockInit { .initialProperties(() -> Blocks.RAW_IRON_BLOCK) .tag(BlockTags.NEEDS_DIAMOND_TOOL) .transform(TagGen.pickaxeOnly()) + .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_cobalt"))) .recipe((c, p) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) @@ -643,6 +644,7 @@ public class BlockInit { .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) .item() + .tag(Tags.Items.STORAGE_BLOCKS) .tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_cobalt"))) .transform(customItemModel("raw_cobalt_block")) .register(); @@ -669,8 +671,8 @@ public class BlockInit { public static final BlockEntry RAW_ALUMINUM_BLOCK = REGISTRATE.block( "raw_aluminum_block", Block::new) .initialProperties(() -> Blocks.RAW_IRON_BLOCK) - .tag(BlockTags.NEEDS_IRON_TOOL) .transform(TagGen.pickaxeOnly()) + .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_aluminum"))) .recipe((c, p) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) @@ -681,6 +683,7 @@ public class BlockInit { .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) .item() + .tag(Tags.Items.STORAGE_BLOCKS) .tag(TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath("c", "storage_blocks/raw_aluminum"))) .transform(customItemModel("raw_aluminum_block")) .register(); diff --git a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java index 8714c38f..3897105f 100644 --- a/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java +++ b/src/main/java/com/rae/creatingspace/init/ingameobject/ItemInit.java @@ -18,6 +18,7 @@ import com.simibubi.create.content.equipment.armor.BaseArmorItem; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.util.entry.ItemEntry; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; @@ -334,7 +335,7 @@ private static ItemEntry registerSequencedEngineItem(Stri "raw_nickel",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/raw_nickel")) + .requires(CommonMetal.NICKEL.rawStorageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block"))) .tag(commonItemTag("raw_materials/nickel"), commonItemTag("raw_materials"),commonItemTag("ores/nickel")) @@ -356,14 +357,14 @@ private static ItemEntry registerSequencedEngineItem(Stri "nickel_ingot",Item::new) .recipe((c,p) -> { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) - .define('#', commonItemTag("nuggets/nickel")) + .define('#', CommonMetal.NICKEL.nuggets) .pattern("###") .pattern("###") .pattern("###") .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_nuggets")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/nickel")) + .requires(CommonMetal.NICKEL.storageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block")); }) @@ -375,17 +376,17 @@ private static ItemEntry registerSequencedEngineItem(Stri "nickel_nugget",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("ingots/nickel")) + .requires(CommonMetal.NICKEL.ingots) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) - .tag(commonItemTag("nuggets/nickel"), commonItemTag("nuggets")) + .tag(CommonMetal.NICKEL.nuggets, commonItemTag("nuggets")) .register(); public static final ItemEntry NICKEL_SHEET = REGISTRATE.item( "nickel_sheet",Item::new) - .tag(commonItemTag("plates/nickel"), commonItemTag("plates")) + .tag(CommonMetal.NICKEL.plates, commonItemTag("plates")) .register(); //aluminium @@ -394,10 +395,10 @@ private static ItemEntry registerSequencedEngineItem(Stri "raw_aluminum",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/raw_aluminum")) + .requires(CommonMetal.ALUMINUM.rawStorageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block"))) - .tag(commonItemTag("raw_materials/aluminum"), commonItemTag("raw_materials")) + .tag(CommonMetal.ALUMINUM.rawOres, commonItemTag("raw_materials")) .register(); @@ -411,18 +412,18 @@ private static ItemEntry registerSequencedEngineItem(Stri "aluminum_ingot",Item::new) .recipe((c,p) -> { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, c.get(), 1) - .define('#', commonItemTag("nuggets/aluminum")) + .define('#', CommonMetal.ALUMINUM.nuggets) .pattern("###") .pattern("###") .pattern("###") .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_nuggets")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("storage_blocks/aluminum")) + .requires(CommonMetal.ALUMINUM.storageBlocks.items()) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName() + "_from_block")); }) - .tag(commonItemTag("ingots/aluminum"), commonItemTag("ingots")) + .tag(CommonMetal.ALUMINUM.ingots, commonItemTag("ingots")) .register(); @@ -430,15 +431,15 @@ private static ItemEntry registerSequencedEngineItem(Stri "aluminum_nugget",Item::new) .recipe((c,p) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, c.get(), 9) - .requires(commonItemTag("ingots/aluminum")) + .requires(CommonMetal.ALUMINUM.ingots) .unlockedBy("has_" + c.getName(), has(c.get())) .save(p, resource("crafting/" + c.getName()))) - .tag(commonItemTag("nuggets/aluminum"), commonItemTag("nuggets")) + .tag(CommonMetal.ALUMINUM.nuggets, commonItemTag("nuggets")) .register(); public static final ItemEntry ALUMINUM_SHEET = REGISTRATE.item( "aluminum_sheet",Item::new) - .tag(commonItemTag("plates/aluminum"), commonItemTag("plates")) + .tag(CommonMetal.ALUMINUM.plates, commonItemTag("plates")) .register(); //cobalt @@ -455,7 +456,6 @@ private static ItemEntry registerSequencedEngineItem(Stri public static final ItemEntry CRUSHED_COBALT_ORE = REGISTRATE.item( "crushed_cobalt_ore",Item::new) - .tag(commonItemTag("crushed_raw_cobalt"), commonItemTag("crushed_raw_materials"), commonItemTag("ores/cobalt")) .register(); public static final ItemEntry COBALT_INGOT = REGISTRATE.item( From 0fbefcc0f9735b328c5a6f582b393e38429ee111 Mon Sep 17 00:00:00 2001 From: kalwantspizza Date: Tue, 28 Jul 2026 21:28:44 -0400 Subject: [PATCH 3/3] Blueprint Duplication fix. Was only giving a single blueprint back instead of 2. --- .../recipe/engine_recipe/duplicate_blueprint.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json b/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json index e644abcb..c21d8d0e 100644 --- a/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json +++ b/src/main/resources/data/creatingspace/recipe/engine_recipe/duplicate_blueprint.json @@ -10,7 +10,8 @@ "loops": 1, "results": [ { - "id": "creatingspace:engine_blueprint" + "id": "creatingspace:engine_blueprint", + "count": 2 } ], "sequence": [