common tags! (fix crafting/dyes on forge)

aesefficio · Sep 2, 2024 · c9b8eb0 · c9b8eb0
1 parent 532ee9d
commit c9b8eb0
Show file tree

Hide file tree

Showing 56 changed files with 382 additions and 79 deletions.
diff --git a/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf b/common/src/generated/resources/.cache/e2778987850117b7cc788cc2ae98d0c4537669cf
diff --git a/...nerated/resources/data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json b/...nerated/resources/data/interiors/recipes/crafting/chair/black_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:black_dyes"
+      "tag": "interiors:internal/dyes/black_dyes"
     }
   ],
   "result": {

diff --git a/...enerated/resources/data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json b/...enerated/resources/data/interiors/recipes/crafting/chair/blue_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:blue_dyes"
+      "tag": "interiors:internal/dyes/blue_dyes"
     }
   ],
   "result": {

diff --git a/...nerated/resources/data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json b/...nerated/resources/data/interiors/recipes/crafting/chair/brown_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:brown_dyes"
+      "tag": "interiors:internal/dyes/brown_dyes"
     }
   ],
   "result": {

diff --git a/...enerated/resources/data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json b/...enerated/resources/data/interiors/recipes/crafting/chair/cyan_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:cyan_dyes"
+      "tag": "interiors:internal/dyes/cyan_dyes"
     }
   ],
   "result": {

diff --git a/...enerated/resources/data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json b/...enerated/resources/data/interiors/recipes/crafting/chair/gray_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:gray_dyes"
+      "tag": "interiors:internal/dyes/gray_dyes"
     }
   ],
   "result": {

diff --git a/...nerated/resources/data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json b/...nerated/resources/data/interiors/recipes/crafting/chair/green_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:green_dyes"
+      "tag": "interiors:internal/dyes/green_dyes"
     }
   ],
   "result": {

diff --git a/...ed/resources/data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json b/...ed/resources/data/interiors/recipes/crafting/chair/light_blue_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:light_blue_dyes"
+      "tag": "interiors:internal/dyes/light_blue_dyes"
     }
   ],
   "result": {

diff --git a/...ed/resources/data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json b/...ed/resources/data/interiors/recipes/crafting/chair/light_gray_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:light_gray_dyes"
+      "tag": "interiors:internal/dyes/light_gray_dyes"
     }
   ],
   "result": {

diff --git a/...enerated/resources/data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json b/...enerated/resources/data/interiors/recipes/crafting/chair/lime_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:lime_dyes"
+      "tag": "interiors:internal/dyes/lime_dyes"
     }
   ],
   "result": {

diff --git a/...rated/resources/data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json b/...rated/resources/data/interiors/recipes/crafting/chair/magenta_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:magenta_dyes"
+      "tag": "interiors:internal/dyes/magenta_dyes"
     }
   ],
   "result": {

diff --git a/...erated/resources/data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json b/...erated/resources/data/interiors/recipes/crafting/chair/orange_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:orange_dyes"
+      "tag": "interiors:internal/dyes/orange_dyes"
     }
   ],
   "result": {

diff --git a/...enerated/resources/data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json b/...enerated/resources/data/interiors/recipes/crafting/chair/pink_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:pink_dyes"
+      "tag": "interiors:internal/dyes/pink_dyes"
     }
   ],
   "result": {

diff --git a/...erated/resources/data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json b/...erated/resources/data/interiors/recipes/crafting/chair/purple_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:purple_dyes"
+      "tag": "interiors:internal/dyes/purple_dyes"
     }
   ],
   "result": {

diff --git a/...generated/resources/data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json b/...generated/resources/data/interiors/recipes/crafting/chair/red_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:red_dyes"
+      "tag": "interiors:internal/dyes/red_dyes"
     }
   ],
   "result": {

diff --git a/...nerated/resources/data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json b/...nerated/resources/data/interiors/recipes/crafting/chair/white_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:white_dyes"
+      "tag": "interiors:internal/dyes/white_dyes"
     }
   ],
   "result": {

diff --git a/...erated/resources/data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json b/...erated/resources/data/interiors/recipes/crafting/chair/yellow_chair_from_other_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:chairs"
     },
     {
-      "tag": "c:yellow_dyes"
+      "tag": "interiors:internal/dyes/yellow_dyes"
     }
   ],
   "result": {

diff --git a/...data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json b/...data/interiors/recipes/crafting/floor_chair/black_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:black_dyes"
+      "tag": "interiors:internal/dyes/black_dyes"
     }
   ],
   "result": {

diff --git a/.../data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json b/.../data/interiors/recipes/crafting/floor_chair/blue_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:blue_dyes"
+      "tag": "interiors:internal/dyes/blue_dyes"
     }
   ],
   "result": {

diff --git a/...data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json b/...data/interiors/recipes/crafting/floor_chair/brown_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:brown_dyes"
+      "tag": "interiors:internal/dyes/brown_dyes"
     }
   ],
   "result": {

diff --git a/.../data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json b/.../data/interiors/recipes/crafting/floor_chair/cyan_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:cyan_dyes"
+      "tag": "interiors:internal/dyes/cyan_dyes"
     }
   ],
   "result": {

diff --git a/.../data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json b/.../data/interiors/recipes/crafting/floor_chair/gray_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:gray_dyes"
+      "tag": "interiors:internal/dyes/gray_dyes"
     }
   ],
   "result": {

diff --git a/...data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json b/...data/interiors/recipes/crafting/floor_chair/green_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:green_dyes"
+      "tag": "interiors:internal/dyes/green_dyes"
     }
   ],
   "result": {

diff --git a/...interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json b/...interiors/recipes/crafting/floor_chair/light_blue_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:light_blue_dyes"
+      "tag": "interiors:internal/dyes/light_blue_dyes"
     }
   ],
   "result": {

diff --git a/...interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json b/...interiors/recipes/crafting/floor_chair/light_gray_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:light_gray_dyes"
+      "tag": "interiors:internal/dyes/light_gray_dyes"
     }
   ],
   "result": {

diff --git a/.../data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json b/.../data/interiors/recipes/crafting/floor_chair/lime_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:lime_dyes"
+      "tag": "interiors:internal/dyes/lime_dyes"
     }
   ],
   "result": {

diff --git a/...ta/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json b/...ta/interiors/recipes/crafting/floor_chair/magenta_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:magenta_dyes"
+      "tag": "interiors:internal/dyes/magenta_dyes"
     }
   ],
   "result": {

diff --git a/...ata/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json b/...ata/interiors/recipes/crafting/floor_chair/orange_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:orange_dyes"
+      "tag": "interiors:internal/dyes/orange_dyes"
     }
   ],
   "result": {

diff --git a/.../data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json b/.../data/interiors/recipes/crafting/floor_chair/pink_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:pink_dyes"
+      "tag": "interiors:internal/dyes/pink_dyes"
     }
   ],
   "result": {

diff --git a/...ata/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json b/...ata/interiors/recipes/crafting/floor_chair/purple_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:purple_dyes"
+      "tag": "interiors:internal/dyes/purple_dyes"
     }
   ],
   "result": {

diff --git a/...s/data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json b/...s/data/interiors/recipes/crafting/floor_chair/red_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:red_dyes"
+      "tag": "interiors:internal/dyes/red_dyes"
     }
   ],
   "result": {

diff --git a/...data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json b/...data/interiors/recipes/crafting/floor_chair/white_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:white_dyes"
+      "tag": "interiors:internal/dyes/white_dyes"
     }
   ],
   "result": {

diff --git a/...ata/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json b/...ata/interiors/recipes/crafting/floor_chair/yellow_floor_chair_from_other_floor_chair.json
@@ -6,7 +6,7 @@
       "tag": "interiors:floor_chairs"
     },
     {
-      "tag": "c:yellow_dyes"
+      "tag": "interiors:internal/dyes/yellow_dyes"
     }
   ],
   "result": {

diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/black_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/black_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:black_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/black",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/blue_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/blue_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:blue_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/blue",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/brown_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/brown_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:brown_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/brown",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/cyan_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/cyan_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:cyan_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/cyan",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/gray_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/gray_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:gray_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/gray",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/green_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/green_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:green_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/green",
+      "required": false
+    }
+  ]
+}
diff --git a/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_blue_dyes.json b/common/src/generated/resources/data/interiors/tags/items/internal/dyes/light_blue_dyes.json
@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#c:light_blue_dyes",
+      "required": false
+    },
+    {
+      "id": "#forge:dyes/light_blue",
+      "required": false
+    }
+  ]
+}