Fix broken tags and recipes, runs datagen

Signed-off-by: Noaaan <[email protected]>

src/main/generated/data/c/tags/item/storage_blocks/adamantite.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:adamantite_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/aquarium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:aquarium_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/banglum.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:banglum_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/bronze.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:bronze_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/carmot.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:carmot_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/celestium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:celestium_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/durasteel.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:durasteel_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/hallowed.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:hallowed_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/kyber.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:kyber_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/manganese.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:manganese_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/metallurgium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:metallurgium_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/midas_gold.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:midas_gold_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/morkite.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:morkite_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/mythril.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:mythril_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/orichalcum.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:orichalcum_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/osmium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:osmium_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/palladium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:palladium_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/platinum.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:platinum_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/prometheum.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:prometheum_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/quadrillum.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:quadrillum_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/runite.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:runite_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/silver.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:silver_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/star_platinum.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:star_platinum_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/starrite.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:starrite_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/steel.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:steel_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/stormyx.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:stormyx_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/tin.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:tin_block"
+  ]
+}

src/main/generated/data/c/tags/item/storage_blocks/unobtainium.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "mythicmetals:unobtainium_block"
+  ]
+}

src/main/java/nourl/mythicmetals/data/MythicItemTagProvider.java

@@ -44,14 +44,18 @@ protected void configure(RegistryWrapper.WrapperLookup arg) {
             if (blockSet.getStorageBlock() != null) {
                 var string = "storage_blocks/" + name;
                 var modTag = MythicMetalsData.createModItemTag(string);
-                var commonTag = ConventionalItemTags.STORAGE_BLOCKS;
+                var commonTag = MythicMetalsData.createCommonItemTag(string);
+                var commonBlocksTag = ConventionalItemTags.STORAGE_BLOCKS;
                 getOrCreateTagBuilder(modTag).add(blockSet.getStorageBlock().asItem());
-                getOrCreateTagBuilder(commonTag).addTag(modTag);
+                getOrCreateTagBuilder(commonTag).add(blockSet.getStorageBlock().asItem());
+                getOrCreateTagBuilder(commonBlocksTag).addTag(modTag);
                 if (blockSet.getOreStorageBlock() != null) {
                     string = "storage_blocks/raw_" + name;
                     modTag = MythicMetalsData.createModItemTag(string);
-                    getOrCreateTagBuilder(modTag).add(blockSet.getOreStorageBlock().asItem());
-                    getOrCreateTagBuilder(commonTag).addTag(modTag);
+                    getOrCreateTagBuilder(modTag)
+                        .add(blockSet.getOreStorageBlock().asItem());
+                    getOrCreateTagBuilder(commonBlocksTag)
+                        .addTag(modTag);
                 }
             }
         });

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_bronze_from_ingots.json

@@ -2,11 +2,11 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:copper_ingots",
+      "tag": "c:ingots/copper",
       "count": 2
     },
 	{
-      "tag": "c:tin_ingots"
+      "tag": "c:ingots/tin"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_bronze_from_ores.json

@@ -2,11 +2,11 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "minecraft:copper_ores",
+      "tag": "minecraft:ores/copper",
       "count": 2
     },
 	{
-      "tag": "c:tin_ores"
+      "tag": "c:ores/tin"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_celestium_from_ingots.json

@@ -5,7 +5,7 @@
       "item": "mythicmetals:starrite"
     },
     {
-      "tag": "c:platinum_ingots"
+      "tag": "c:ingots/platinum"
     },
     {
       "item": "mythicmetals:carmot_ingot"

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_celestium_from_ores.json

@@ -2,19 +2,19 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "mythicmetals:starrite_ores"
+      "tag": "mythicmetals:ores/starrite"
     },
     {
-      "tag": "c:platinum_ores"
+      "tag": "c:ores/platinum"
     },
     {
-      "tag": "mythicmetals:carmot_ores"
+      "tag": "mythicmetals:ores/carmot"
     },
 	{
-      "tag": "mythicmetals:kyber_ores"
+      "tag": "mythicmetals:ores/kyber"
     },
     {
-      "tag": "mythicmetals:unobtainium_ores"
+      "tag": "mythicmetals:ores/unobtainium"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_celestium_from_raw_ores.json

@@ -5,7 +5,7 @@
       "item": "mythicmetals:starrite"
     },
 	{
-      "tag": "c:raw_platinum_ores"
+      "tag": "c:ores/raw_platinum"
     },
     {
       "item": "mythicmetals:raw_carmot"

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_durasteel_from_ingots.json

@@ -5,7 +5,7 @@
       "item": "mythicmetals:quadrillum_ingot"
     },
 	{
-      "tag": "c:manganese_ingots"
+      "tag": "c:ingots/manganese"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_durasteel_from_ores.json

@@ -2,10 +2,10 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "mythicmetals:quadrillum_ores"
+      "tag": "mythicmetals:ores/quadrillum"
     },
 	{
-      "tag": "c:manganese_ores"
+      "tag": "c:ores/manganese"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_durasteel_from_raw_ores.json

@@ -5,7 +5,7 @@
       "item": "mythicmetals:raw_quadrillum"
     },
 	{
-      "tag": "c:raw_manganese_ores"
+      "tag": "c:ores/raw_manganese"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_hallowed_from_ingots.json

@@ -2,13 +2,13 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:adamantite_ingots"
+      "tag": "c:ingots/adamantite"
     },
 	{
-      "tag": "c:mythril_ingots"
+      "tag": "c:ingots/mythril"
     },
 	{
-      "tag": "c:orichalcum_ingots"
+      "tag": "c:ingots/orichalcum"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_hallowed_from_ores.json

@@ -2,13 +2,13 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:adamantite_ores"
+      "tag": "c:ores/adamantite"
     },
 	{
-      "tag": "c:mythril_ores"
+      "tag": "c:ores/mythril"
     },
 	{
-      "tag": "c:orichalcum_ores"
+      "tag": "c:ores/orichalcum"
     }
   ],
   "output": {

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_hallowed_from_raw_ores.json

@@ -5,7 +5,7 @@
       "item": "mythicmetals:raw_adamantite"
     },
 	{
-      "tag": "c:raw_mythril_ores"
+      "tag": "c:ores/raw_mythril"
     },
 	{
       "item": "mythicmetals:raw_orichalcum"

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_metallurgium_from_ingots.json

@@ -2,16 +2,16 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:adamantite_ingots"
+      "tag": "c:ingots/adamantite"
     },
 	{
-      "tag": "c:mythril_ingots"
+      "tag": "c:ingots/mythril"
     },
 	{
-      "tag": "c:orichalcum_ingots"
+      "tag": "c:ingots/orichalcum"
     },
 	{
-      "tag": "c:palladium_ingots"
+      "tag": "c:ingots/palladium"
     },
 	{
 	  "item": "mythicmetals:unobtainium"

src/main/resources/data/mythicmetals/recipe/alloy_forge/alloy_metallurgium_from_ingots_alt.json

@@ -2,10 +2,10 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "mythicmetals:hallowed_ingots"
+      "tag": "mythicmetals:ingots/hallowed"
     },
 	{
-      "tag": "c:palladium_ingots"
+      "tag": "c:ingots/palladium"
     },
 	{
 	  "item": "mythicmetals:unobtainium"