Block & Item Tag Audit

.gitignore

@@ -25,4 +25,3 @@ run-data
 
 repo
 /src/generated/resources/.cache/
-/CS_1.21.1_src.zip

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",

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"
   ]
 }

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"
   ]
 }

src/generated/resources/data/c/tags/item/ores/cobalt.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "creatingspace:crushed_cobalt_ore",
     "creatingspace:moon_cobalt_ore"
   ]
 }

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"
   ]
 }

src/generated/resources/data/c/tags/item/raw_materials.json

@@ -1,7 +1,6 @@
 {
   "values": [
     "creatingspace:raw_nickel",
-    "creatingspace:raw_aluminum",
     "creatingspace:raw_cobalt"
   ]
 }

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",

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": {

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",

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<Block> 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();

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<SequencedAssemblyItem> 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<SequencedAssemblyItem> 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<SequencedAssemblyItem> 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<Item> 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<SequencedAssemblyItem> 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,34 +412,34 @@ private static ItemEntry<SequencedAssemblyItem> 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();
 
 
     public static final ItemEntry<Item> ALUMINUM_NUGGET = REGISTRATE.item(
                     "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<Item> 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<SequencedAssemblyItem> registerSequencedEngineItem(Stri
 
     public static final ItemEntry<Item> 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<Item> COBALT_INGOT = REGISTRATE.item(