block tags, item tags & recipes added to data generation

- woodcutting and other external mod recipes are missing for now - changed some tags - beige to colorless - mushrooms, caps & stems moved to forge - recipes with sticks are now using forge:rods/wooden tag
cech12 · Apr 28, 2020 · aa6f32f · aa6f32f
1 parent 2136cbd
commit aa6f32f
Show file tree

Hide file tree

Showing 250 changed files with 1,043 additions and 353 deletions.
diff --git a/..._woodcutter/tags/items/allowed_items.json → ..._woodcutter/tags/items/allowed_items.json b/..._woodcutter/tags/items/allowed_items.json → ..._woodcutter/tags/items/allowed_items.json
diff --git a/...ipes/building_blocks/mushroom_planks.json → ...hroom_wood/colorless/mushroom_planks.json b/...ipes/building_blocks/mushroom_planks.json → ...hroom_wood/colorless/mushroom_planks.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "extendedmushrooms:mushroom_wood/beige/mushroom_planks"
+      "extendedmushrooms:mushroom_wood/colorless/mushroom_planks"
     ]
   },
   "criteria": {
@@ -11,15 +11,15 @@
       "conditions": {
         "items": [
           {
-            "tag": "extendedmushrooms:mushroom_stems/beige"
+            "tag": "forge:mushroom_stems/colorless"
           }
         ]
       }
     },
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_planks"
+        "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_planks"
       }
     }
   },

diff --git a/...ecipes/building_blocks/mushroom_slab.json → ...ushroom_wood/colorless/mushroom_slab.json b/...ecipes/building_blocks/mushroom_slab.json → ...ushroom_wood/colorless/mushroom_slab.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "extendedmushrooms:mushroom_wood/beige/mushroom_slab"
+      "extendedmushrooms:mushroom_wood/colorless/mushroom_slab"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_slab"
+        "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_slab"
       }
     }
   },

diff --git a/...recipes/redstone/mushroom_fence_gate.json → ...hroom_wood/colorless/mushroom_stairs.json b/...recipes/redstone/mushroom_fence_gate.json → ...hroom_wood/colorless/mushroom_stairs.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "extendedmushrooms:mushroom_wood/beige/mushroom_fence_gate"
+      "extendedmushrooms:mushroom_wood/colorless/mushroom_stairs"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_fence_gate"
+        "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_stairs"
       }
     }
   },

diff --git a/...es/building_blocks/glowshroom_planks.json → ...om_wood/glowshroom/glowshroom_planks.json b/...es/building_blocks/glowshroom_planks.json → ...om_wood/glowshroom/glowshroom_planks.json
@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "extendedmushrooms:mushroom_stems/glowshroom"
+            "tag": "forge:mushroom_stems/glowshroom"
           }
         ]
       }

diff --git a/...ipes/building_blocks/glowshroom_slab.json → ...room_wood/glowshroom/glowshroom_slab.json b/...ipes/building_blocks/glowshroom_slab.json → ...room_wood/glowshroom/glowshroom_slab.json
diff --git a/...es/building_blocks/glowshroom_stairs.json → ...om_wood/glowshroom/glowshroom_stairs.json b/...es/building_blocks/glowshroom_stairs.json → ...om_wood/glowshroom/glowshroom_stairs.json
diff --git a/...ing_blocks/poisonous_mushroom_planks.json → ...s_mushroom/poisonous_mushroom_planks.json b/...ing_blocks/poisonous_mushroom_planks.json → ...s_mushroom/poisonous_mushroom_planks.json
@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "extendedmushrooms:mushroom_stems/poisonous_mushroom"
+            "tag": "forge:mushroom_stems/green"
           }
         ]
       }

diff --git a/...lding_blocks/poisonous_mushroom_slab.json → ...ous_mushroom/poisonous_mushroom_slab.json b/...lding_blocks/poisonous_mushroom_slab.json → ...ous_mushroom/poisonous_mushroom_slab.json
diff --git a/...ing_blocks/poisonous_mushroom_stairs.json → ...s_mushroom/poisonous_mushroom_stairs.json b/...ing_blocks/poisonous_mushroom_stairs.json → ...s_mushroom/poisonous_mushroom_stairs.json
diff --git a/...nts/recipes/decorations/brown_banner.json → ...ions/mushroom_cap/brown/brown_banner.json b/...nts/recipes/decorations/brown_banner.json → ...ions/mushroom_cap/brown/brown_banner.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_brown_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:brown_mushroom_block"
+            "tag": "forge:mushroom_caps/brown"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_brown_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...ements/recipes/decorations/brown_bed.json → ...rations/mushroom_cap/brown/brown_bed.json b/...ements/recipes/decorations/brown_bed.json → ...rations/mushroom_cap/brown/brown_bed.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_brown_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:brown_mushroom_block"
+            "tag": "forge:mushroom_caps/brown"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_brown_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...es/decorations/brown_mushroom_carpet.json → ...room_cap/brown/brown_mushroom_carpet.json b/...es/decorations/brown_mushroom_carpet.json → ...room_cap/brown/brown_mushroom_carpet.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_brown_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:brown_mushroom_block"
+            "tag": "forge:mushroom_caps/brown"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_brown_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...ents/recipes/decorations/blue_banner.json → .../mushroom_cap/glowshroom/blue_banner.json b/...ents/recipes/decorations/blue_banner.json → .../mushroom_cap/glowshroom/blue_banner.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_blue_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "extendedmushrooms:glowshroom_cap"
+            "tag": "forge:mushroom_caps/glowshroom"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_blue_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...cements/recipes/decorations/blue_bed.json → ...ons/mushroom_cap/glowshroom/blue_bed.json b/...cements/recipes/decorations/blue_bed.json → ...ons/mushroom_cap/glowshroom/blue_bed.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_blue_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "extendedmushrooms:glowshroom_cap"
+            "tag": "forge:mushroom_caps/glowshroom"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_blue_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...es/decorations/glowshroom_cap_carpet.json → ...cap/glowshroom/glowshroom_cap_carpet.json b/...es/decorations/glowshroom_cap_carpet.json → ...cap/glowshroom/glowshroom_cap_carpet.json
@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "item": "extendedmushrooms:glowshroom_cap"
+            "tag": "forge:mushroom_caps/glowshroom"
           }
         ]
       }

diff --git a/...ations/poisonous_mushroom_cap_carpet.json → ...shroom/poisonous_mushroom_cap_carpet.json b/...ations/poisonous_mushroom_cap_carpet.json → ...shroom/poisonous_mushroom_cap_carpet.json
@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "item": "extendedmushrooms:poisonous_mushroom_cap"
+            "tag": "forge:mushroom_caps/purple"
           }
         ]
       }

diff --git a/...ts/recipes/decorations/purple_banner.json → ...cap/poisonous_mushroom/purple_banner.json b/...ts/recipes/decorations/purple_banner.json → ...cap/poisonous_mushroom/purple_banner.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_purple_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "extendedmushrooms:poisonous_mushroom_cap"
+            "tag": "forge:mushroom_caps/purple"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_purple_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...ments/recipes/decorations/purple_bed.json → ...om_cap/poisonous_mushroom/purple_bed.json b/...ments/recipes/decorations/purple_bed.json → ...om_cap/poisonous_mushroom/purple_bed.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_purple_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "extendedmushrooms:poisonous_mushroom_cap"
+            "tag": "forge:mushroom_caps/purple"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_purple_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...ments/recipes/decorations/red_banner.json → ...orations/mushroom_cap/red/red_banner.json b/...ments/recipes/decorations/red_banner.json → ...orations/mushroom_cap/red/red_banner.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_red_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:red_mushroom_block"
+            "tag": "forge:mushroom_caps/red"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_red_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...ncements/recipes/decorations/red_bed.json → ...decorations/mushroom_cap/red/red_bed.json b/...ncements/recipes/decorations/red_bed.json → ...decorations/mushroom_cap/red/red_bed.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_red_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:red_mushroom_block"
+            "tag": "forge:mushroom_caps/red"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_red_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...ipes/decorations/red_mushroom_carpet.json → ...mushroom_cap/red/red_mushroom_carpet.json b/...ipes/decorations/red_mushroom_carpet.json → ...mushroom_cap/red/red_mushroom_carpet.json
@@ -6,12 +6,12 @@
     ]
   },
   "criteria": {
-    "has_red_wool": {
+    "has_cap": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
-            "item": "minecraft:red_mushroom_block"
+            "tag": "forge:mushroom_caps/red"
           }
         ]
       }
@@ -25,7 +25,7 @@
   },
   "requirements": [
     [
-      "has_red_wool",
+      "has_cap",
       "has_the_recipe"
     ]
   ]

diff --git a/...s/recipes/decorations/mushroom_fence.json → ...shroom_wood/colorless/mushroom_fence.json b/...s/recipes/decorations/mushroom_fence.json → ...shroom_wood/colorless/mushroom_fence.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "extendedmushrooms:mushroom_wood/beige/mushroom_fence"
+      "extendedmushrooms:mushroom_wood/colorless/mushroom_fence"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_fence"
+        "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_fence"
       }
     }
   },

diff --git a/...recipes/decorations/glowshroom_fence.json → ...oom_wood/glowshroom/glowshroom_fence.json b/...recipes/decorations/glowshroom_fence.json → ...oom_wood/glowshroom/glowshroom_fence.json
diff --git a/...decorations/poisonous_mushroom_fence.json → ...us_mushroom/poisonous_mushroom_fence.json b/...decorations/poisonous_mushroom_fence.json → ...us_mushroom/poisonous_mushroom_fence.json
diff --git a/...cements/recipes/decorations/oak_sign.json → ...cements/recipes/decorations/oak_sign.json b/...cements/recipes/decorations/oak_sign.json → ...cements/recipes/decorations/oak_sign.json
@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "extendedmushrooms:mushroom_wood/mushroom_oak_sign"
+      "extendedmushrooms:oak_sign"
     ]
   },
   "criteria": {
@@ -19,7 +19,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "extendedmushrooms:mushroom_wood/mushroom_oak_sign"
+        "recipe": "extendedmushrooms:oak_sign"
       }
     }
   },