Tag fixes

- Use new tag structure for multiloader compatible tags, supporting both reference and inclusions. Fixes #224. - Fix compat recipes to use the correct method of specifying conditions.
alcatrazEscapee · Jul 20, 2022 · 0edaa92 · 0edaa92
1 parent 43c323c
commit 0edaa92
Show file tree

Hide file tree

Showing 98 changed files with 647 additions and 476 deletions.
diff --git a/Common/src/main/resources/data/minecraft/loot_tables/blocks/grass.json b/Common/src/main/resources/data/minecraft/loot_tables/blocks/grass.json
@@ -16,7 +16,7 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "tag": "minecraft:shears"
+                    "tag": "notreepunching:shears"
                   }
                 }
               ]

diff --git a/Common/src/main/resources/data/minecraft/loot_tables/blocks/tall_grass.json b/Common/src/main/resources/data/minecraft/loot_tables/blocks/tall_grass.json
@@ -16,7 +16,7 @@
                 {
                   "condition": "minecraft:match_tool",
                   "predicate": {
-                    "tag": "forge:shears"
+                    "tag": "notreepunching:shears"
                   }
                 }
               ]

diff --git a/Common/src/main/resources/data/minecraft/tags/items/stone_crafting_materials.json b/Common/src/main/resources/data/minecraft/tags/items/stone_crafting_materials.json
@@ -2,6 +2,6 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "#notreepunching:cobblestone"
+    "#notreepunching:h/cobblestone"
   ]
 }
diff --git a/Common/src/main/resources/data/minecraft/tags/items/stone_tool_materials.json b/Common/src/main/resources/data/minecraft/tags/items/stone_tool_materials.json
@@ -2,6 +2,6 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "#notreepunching:cobblestone"
+    "#notreepunching:h/cobblestone"
   ]
 }
diff --git a/Common/src/main/resources/data/notreepunching/advancements/diamond_knife.json b/Common/src/main/resources/data/notreepunching/advancements/diamond_knife.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:gems/diamond"
+            "tag": "notreepunching:diamond_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/diamond_mattock.json b/Common/src/main/resources/data/notreepunching/advancements/diamond_mattock.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:gems/diamond"
+            "tag": "notreepunching:diamond_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/diamond_saw.json b/Common/src/main/resources/data/notreepunching/advancements/diamond_saw.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:gems/diamond"
+            "tag": "notreepunching:diamond_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/gold_knife.json b/Common/src/main/resources/data/notreepunching/advancements/gold_knife.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/gold"
+            "tag": "notreepunching:gold_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/gold_mattock.json b/Common/src/main/resources/data/notreepunching/advancements/gold_mattock.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/gold"
+            "tag": "notreepunching:gold_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/gold_saw.json b/Common/src/main/resources/data/notreepunching/advancements/gold_saw.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/gold"
+            "tag": "notreepunching:gold_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/iron_knife.json b/Common/src/main/resources/data/notreepunching/advancements/iron_knife.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/iron"
+            "tag": "notreepunching:iron_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/iron_mattock.json b/Common/src/main/resources/data/notreepunching/advancements/iron_mattock.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/iron"
+            "tag": "notreepunching:iron_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/advancements/iron_saw.json b/Common/src/main/resources/data/notreepunching/advancements/iron_saw.json
@@ -7,7 +7,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/iron"
+            "tag": "notreepunching:iron_ingots"
           }
         ]
       }

diff --git a/Common/src/main/resources/data/notreepunching/recipes/diamond_knife.json b/Common/src/main/resources/data/notreepunching/recipes/diamond_knife.json
@@ -10,7 +10,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:gems/diamond"
+      "tag": "notreepunching:diamond_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/diamond_mattock.json b/Common/src/main/resources/data/notreepunching/recipes/diamond_mattock.json
@@ -11,7 +11,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:gems/diamond"
+      "tag": "notreepunching:diamond_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/diamond_saw.json b/Common/src/main/resources/data/notreepunching/recipes/diamond_saw.json
@@ -11,7 +11,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:gems/diamond"
+      "tag": "notreepunching:diamond_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/gold_knife.json b/Common/src/main/resources/data/notreepunching/recipes/gold_knife.json
@@ -10,7 +10,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:ingots/gold"
+      "tag": "notreepunching:gold_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/gold_mattock.json b/Common/src/main/resources/data/notreepunching/recipes/gold_mattock.json
@@ -11,7 +11,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:ingots/gold"
+      "tag": "notreepunching:gold_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/gold_saw.json b/Common/src/main/resources/data/notreepunching/recipes/gold_saw.json
@@ -11,7 +11,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:ingots/gold"
+      "tag": "notreepunching:gold_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/iron_knife.json b/Common/src/main/resources/data/notreepunching/recipes/iron_knife.json
@@ -10,7 +10,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:ingots/iron"
+      "tag": "notreepunching:iron_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/iron_mattock.json b/Common/src/main/resources/data/notreepunching/recipes/iron_mattock.json
@@ -11,7 +11,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:ingots/iron"
+      "tag": "notreepunching:iron_ingots"
     }
   },
   "result": {

diff --git a/Common/src/main/resources/data/notreepunching/recipes/iron_saw.json b/Common/src/main/resources/data/notreepunching/recipes/iron_saw.json
@@ -11,7 +11,7 @@
       "tag": "notreepunching:sticks"
     },
     "I": {
-      "tag": "forge:ingots/iron"
+      "tag": "notreepunching:iron_ingots"
     }
   },
   "result": {

diff --git a/...treepunching/tags/blocks/cobblestone.json → ...eepunching/tags/blocks/h/cobblestone.json b/...treepunching/tags/blocks/cobblestone.json → ...eepunching/tags/blocks/h/cobblestone.json
@@ -2,8 +2,8 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "notreepunching:granite_cobblestone",
     "notreepunching:andesite_cobblestone",
+    "notreepunching:granite_cobblestone",
     "notreepunching:diorite_cobblestone"
   ]
 }
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/diamond_ingots.json b/Common/src/main/resources/data/notreepunching/tags/items/diamond_ingots.json
@@ -0,0 +1,15 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": false,
+  "values": [
+    "minecraft:diamond",
+    {
+      "id": "#c:diamonds",
+      "required": false
+    },
+    {
+      "id": "#forge:ingots/diamond",
+      "required": false
+    }
+  ]
+}
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/gold_ingots.json b/Common/src/main/resources/data/notreepunching/tags/items/gold_ingots.json
@@ -0,0 +1,15 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": false,
+  "values": [
+    "minecraft:gold_ingot",
+    {
+      "id": "#c:gold_ingots",
+      "required": false
+    },
+    {
+      "id": "#forge:ingots/gold",
+      "required": false
+    }
+  ]
+}
diff --git a/...otreepunching/tags/items/cobblestone.json → ...reepunching/tags/items/h/cobblestone.json b/...otreepunching/tags/items/cobblestone.json → ...reepunching/tags/items/h/cobblestone.json
@@ -2,8 +2,8 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "notreepunching:granite_cobblestone",
     "notreepunching:andesite_cobblestone",
+    "notreepunching:granite_cobblestone",
     "notreepunching:diorite_cobblestone"
   ]
 }
diff --git a/...s/data/forge/tags/items/tools/knives.json → ...a/notreepunching/tags/items/h/knives.json b/...s/data/forge/tags/items/tools/knives.json → ...a/notreepunching/tags/items/h/knives.json
@@ -5,6 +5,7 @@
     "notreepunching:iron_knife",
     "notreepunching:gold_knife",
     "notreepunching:diamond_knife",
-    "notreepunching:netherite_knife"
+    "notreepunching:netherite_knife",
+    "notreepunching:flint_knife"
   ]
 }
diff --git a/...data/forge/tags/items/tools/mattocks.json → ...notreepunching/tags/items/h/mattocks.json b/...data/forge/tags/items/tools/mattocks.json → ...notreepunching/tags/items/h/mattocks.json
diff --git a/...ces/data/forge/tags/items/tools/saws.json → ...ata/notreepunching/tags/items/h/saws.json b/...ces/data/forge/tags/items/tools/saws.json → ...ata/notreepunching/tags/items/h/saws.json
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/h/string.json b/Common/src/main/resources/data/notreepunching/tags/items/h/string.json
@@ -0,0 +1,7 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": false,
+  "values": [
+    "notreepunching:plant_string"
+  ]
+}
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/h/weak_saws.json b/Common/src/main/resources/data/notreepunching/tags/items/h/weak_saws.json
@@ -0,0 +1,7 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": false,
+  "values": [
+    "notreepunching:flint_axe"
+  ]
+}
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/iron_ingots.json b/Common/src/main/resources/data/notreepunching/tags/items/iron_ingots.json
@@ -0,0 +1,15 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": false,
+  "values": [
+    "minecraft:iron_ingot",
+    {
+      "id": "#c:iron_ingots",
+      "required": false
+    },
+    {
+      "id": "#forge:ingots/iron",
+      "required": false
+    }
+  ]
+}
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/knives.json b/Common/src/main/resources/data/notreepunching/tags/items/knives.json
@@ -2,10 +2,14 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "notreepunching:iron_knife",
-    "notreepunching:gold_knife",
-    "notreepunching:diamond_knife",
-    "notreepunching:netherite_knife",
-    "notreepunching:flint_knife"
+    "#notreepunching:h/knives",
+    {
+      "id": "#c:knives",
+      "required": false
+    },
+    {
+      "id": "#forge:tools/knives",
+      "required": false
+    }
   ]
 }
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/mattocks.json b/Common/src/main/resources/data/notreepunching/tags/items/mattocks.json
@@ -2,9 +2,14 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "notreepunching:iron_mattock",
-    "notreepunching:gold_mattock",
-    "notreepunching:diamond_mattock",
-    "notreepunching:netherite_mattock"
+    "#notreepunching:h/mattocks",
+    {
+      "id": "#c:mattocks",
+      "required": false
+    },
+    {
+      "id": "#forge:tools/mattocks",
+      "required": false
+    }
   ]
 }
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/saws.json b/Common/src/main/resources/data/notreepunching/tags/items/saws.json
@@ -2,9 +2,14 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
-    "notreepunching:iron_saw",
-    "notreepunching:gold_saw",
-    "notreepunching:diamond_saw",
-    "notreepunching:netherite_saw"
+    "#notreepunching:h/saws",
+    {
+      "id": "#c:saws",
+      "required": false
+    },
+    {
+      "id": "#forge:tools/saws",
+      "required": false
+    }
   ]
 }
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/shears.json b/Common/src/main/resources/data/notreepunching/tags/items/shears.json
@@ -0,0 +1,15 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "replace": false,
+  "values": [
+    "minecraft:shears",
+    {
+      "id": "#c:shears",
+      "required": false
+    },
+    {
+      "id": "#forge:shears",
+      "required": false
+    }
+  ]
+}
diff --git a/Common/src/main/resources/data/notreepunching/tags/items/sticks.json b/Common/src/main/resources/data/notreepunching/tags/items/sticks.json
@@ -2,10 +2,18 @@
   "__comment__": "This file was automatically created by mcresources",
   "replace": false,
   "values": [
+    "minecraft:stick",
     {
-      "id": "#forge:rods/wooden",
+      "id": "#c:wood_sticks",
+      "required": false
+    },
+    {
+      "id": "#c:wooden_rods",
       "required": false
     },
-    "minecraft:stick"
+    {
+      "id": "#forge:rods/wooden",
+      "required": false
+    }
   ]
 }