Merge pull request #2 from OKTW-Network/1.21

1.21.1
OKTW-Network · Sep 3, 2024 · 347a275 · 347a275
2 parents d4d99e7 + 2b242f4
commit 347a275
Show file tree

Hide file tree

Showing 239 changed files with 318 additions and 148 deletions.
diff --git a/...ecipes/bamboo_slab_from_bamboo_block.json → ...recipe/bamboo_slab_from_bamboo_block.json b/...ecipes/bamboo_slab_from_bamboo_block.json → ...recipe/bamboo_slab_from_bamboo_block.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:bamboo_blocks"
+            "items": "#minecraft:bamboo_blocks"
           }
         ]
       }

diff --git a/...ents/recipes/chest_from_bamboo_block.json → ...ement/recipe/chest_from_bamboo_block.json b/...ents/recipes/chest_from_bamboo_block.json → ...ement/recipe/chest_from_bamboo_block.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:bamboo_blocks"
+            "items": "#minecraft:bamboo_blocks"
           }
         ]
       }

diff --git a/.../advancements/recipes/chest_from_log.json → ...cp/advancement/recipe/chest_from_log.json b/.../advancements/recipes/chest_from_log.json → ...cp/advancement/recipe/chest_from_log.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:logs"
+            "items": "#minecraft:logs"
           }
         ]
       }

diff --git a/...cipes/clean_glass_from_stained_glass.json → ...ecipe/clean_glass_from_stained_glass.json b/...cipes/clean_glass_from_stained_glass.json → ...ecipe/clean_glass_from_stained_glass.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "ezrcp:stained_glass"
+            "items": "#ezrcp:stained_glass"
           }
         ]
       }

diff --git a/...n_glass_pane_from_stained_glass_pane.json → ...n_glass_pane_from_stained_glass_pane.json b/...n_glass_pane_from_stained_glass_pane.json → ...n_glass_pane_from_stained_glass_pane.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "ezrcp:stained_glass_panes"
+            "items": "#ezrcp:stained_glass_panes"
           }
         ]
       }

diff --git a/...nts/recipes/ladder_from_bamboo_block.json → ...ment/recipe/ladder_from_bamboo_block.json b/...nts/recipes/ladder_from_bamboo_block.json → ...ment/recipe/ladder_from_bamboo_block.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:bamboo_blocks"
+            "items": "#minecraft:bamboo_blocks"
           }
         ]
       }

diff --git a/...advancements/recipes/ladder_from_log.json → ...p/advancement/recipe/ladder_from_log.json b/...advancements/recipes/ladder_from_log.json → ...p/advancement/recipe/ladder_from_log.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:logs"
+            "items": "#minecraft:logs"
           }
         ]
       }

diff --git a/...ancements/recipes/ladder_from_planks.json → ...dvancement/recipe/ladder_from_planks.json b/...ancements/recipes/ladder_from_planks.json → ...dvancement/recipe/ladder_from_planks.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:planks"
+            "items": "#minecraft:planks"
           }
         ]
       }

diff --git a/...ipes/restore_from_slab/acacia_planks.json → ...cipe/restore_from_slab/acacia_planks.json b/...ipes/restore_from_slab/acacia_planks.json → ...cipe/restore_from_slab/acacia_planks.json
diff --git a/...s/recipes/restore_from_slab/andesite.json → ...nt/recipe/restore_from_slab/andesite.json b/...s/recipes/restore_from_slab/andesite.json → ...nt/recipe/restore_from_slab/andesite.json
diff --git a/...ipes/restore_from_slab/bamboo_mosaic.json → ...cipe/restore_from_slab/bamboo_mosaic.json b/...ipes/restore_from_slab/bamboo_mosaic.json → ...cipe/restore_from_slab/bamboo_mosaic.json
diff --git a/...ipes/restore_from_slab/bamboo_planks.json → ...cipe/restore_from_slab/bamboo_planks.json b/...ipes/restore_from_slab/bamboo_planks.json → ...cipe/restore_from_slab/bamboo_planks.json
diff --git a/...cipes/restore_from_slab/birch_planks.json → ...ecipe/restore_from_slab/birch_planks.json b/...cipes/restore_from_slab/birch_planks.json → ...ecipe/restore_from_slab/birch_planks.json
diff --git a/...recipes/restore_from_slab/blackstone.json → .../recipe/restore_from_slab/blackstone.json b/...recipes/restore_from_slab/blackstone.json → .../recipe/restore_from_slab/blackstone.json
diff --git a/...nts/recipes/restore_from_slab/bricks.json → ...ment/recipe/restore_from_slab/bricks.json b/...nts/recipes/restore_from_slab/bricks.json → ...ment/recipe/restore_from_slab/bricks.json
diff --git a/...ipes/restore_from_slab/cherry_planks.json → ...cipe/restore_from_slab/cherry_planks.json b/...ipes/restore_from_slab/cherry_planks.json → ...cipe/restore_from_slab/cherry_planks.json
diff --git a/.../restore_from_slab/cobbled_deepslate.json → .../restore_from_slab/cobbled_deepslate.json b/.../restore_from_slab/cobbled_deepslate.json → .../restore_from_slab/cobbled_deepslate.json
diff --git a/...ecipes/restore_from_slab/cobblestone.json → ...recipe/restore_from_slab/cobblestone.json b/...ecipes/restore_from_slab/cobblestone.json → ...recipe/restore_from_slab/cobblestone.json
diff --git a/...pes/restore_from_slab/crimson_planks.json → ...ipe/restore_from_slab/crimson_planks.json b/...pes/restore_from_slab/crimson_planks.json → ...ipe/restore_from_slab/crimson_planks.json
diff --git a/...recipes/restore_from_slab/cut_copper.json → .../recipe/restore_from_slab/cut_copper.json b/...recipes/restore_from_slab/cut_copper.json → .../recipe/restore_from_slab/cut_copper.json
diff --git a/.../restore_from_slab/cut_red_sandstone.json → .../restore_from_slab/cut_red_sandstone.json b/.../restore_from_slab/cut_red_sandstone.json → .../restore_from_slab/cut_red_sandstone.json
diff --git a/...ipes/restore_from_slab/cut_sandstone.json → ...cipe/restore_from_slab/cut_sandstone.json b/...ipes/restore_from_slab/cut_sandstone.json → ...cipe/restore_from_slab/cut_sandstone.json
diff --git a/...es/restore_from_slab/dark_oak_planks.json → ...pe/restore_from_slab/dark_oak_planks.json b/...es/restore_from_slab/dark_oak_planks.json → ...pe/restore_from_slab/dark_oak_planks.json
diff --git a/...es/restore_from_slab/dark_prismarine.json → ...pe/restore_from_slab/dark_prismarine.json b/...es/restore_from_slab/dark_prismarine.json → ...pe/restore_from_slab/dark_prismarine.json
diff --git a/...s/restore_from_slab/deepslate_bricks.json → ...e/restore_from_slab/deepslate_bricks.json b/...s/restore_from_slab/deepslate_bricks.json → ...e/restore_from_slab/deepslate_bricks.json
diff --git a/...es/restore_from_slab/deepslate_tiles.json → ...pe/restore_from_slab/deepslate_tiles.json b/...es/restore_from_slab/deepslate_tiles.json → ...pe/restore_from_slab/deepslate_tiles.json
diff --git a/...ts/recipes/restore_from_slab/diorite.json → ...ent/recipe/restore_from_slab/diorite.json b/...ts/recipes/restore_from_slab/diorite.json → ...ent/recipe/restore_from_slab/diorite.json
diff --git a/...s/restore_from_slab/end_stone_bricks.json → ...e/restore_from_slab/end_stone_bricks.json b/...s/restore_from_slab/end_stone_bricks.json → ...e/restore_from_slab/end_stone_bricks.json
diff --git a/...restore_from_slab/exposed_cut_copper.json → ...restore_from_slab/exposed_cut_copper.json b/...restore_from_slab/exposed_cut_copper.json → ...restore_from_slab/exposed_cut_copper.json
diff --git a/...ts/recipes/restore_from_slab/granite.json → ...ent/recipe/restore_from_slab/granite.json b/...ts/recipes/restore_from_slab/granite.json → ...ent/recipe/restore_from_slab/granite.json
diff --git a/...ipes/restore_from_slab/jungle_planks.json → ...cipe/restore_from_slab/jungle_planks.json b/...ipes/restore_from_slab/jungle_planks.json → ...cipe/restore_from_slab/jungle_planks.json
diff --git a/...es/restore_from_slab/mangrove_planks.json → ...pe/restore_from_slab/mangrove_planks.json b/...es/restore_from_slab/mangrove_planks.json → ...pe/restore_from_slab/mangrove_planks.json
diff --git a/...restore_from_slab/mossy_stone_bricks.json → ...restore_from_slab/mossy_stone_bricks.json b/...restore_from_slab/mossy_stone_bricks.json → ...restore_from_slab/mossy_stone_bricks.json
diff --git a/...recipes/restore_from_slab/mud_bricks.json → .../recipe/restore_from_slab/mud_bricks.json b/...recipes/restore_from_slab/mud_bricks.json → .../recipe/restore_from_slab/mud_bricks.json
diff --git a/...ipes/restore_from_slab/nether_bricks.json → ...cipe/restore_from_slab/nether_bricks.json b/...ipes/restore_from_slab/nether_bricks.json → ...cipe/restore_from_slab/nether_bricks.json
diff --git a/...recipes/restore_from_slab/oak_planks.json → .../recipe/restore_from_slab/oak_planks.json b/...recipes/restore_from_slab/oak_planks.json → .../recipe/restore_from_slab/oak_planks.json
diff --git a/...estore_from_slab/oxidized_cut_copper.json → ...estore_from_slab/oxidized_cut_copper.json b/...estore_from_slab/oxidized_cut_copper.json → ...estore_from_slab/oxidized_cut_copper.json
diff --git a/.../restore_from_slab/polished_andesite.json → .../restore_from_slab/polished_andesite.json b/.../restore_from_slab/polished_andesite.json → .../restore_from_slab/polished_andesite.json
diff --git a/...estore_from_slab/polished_blackstone.json → ...estore_from_slab/polished_blackstone.json b/...estore_from_slab/polished_blackstone.json → ...estore_from_slab/polished_blackstone.json
diff --git a/...from_slab/polished_blackstone_bricks.json → ...from_slab/polished_blackstone_bricks.json b/...from_slab/polished_blackstone_bricks.json → ...from_slab/polished_blackstone_bricks.json
diff --git a/...restore_from_slab/polished_deepslate.json → ...restore_from_slab/polished_deepslate.json b/...restore_from_slab/polished_deepslate.json → ...restore_from_slab/polished_deepslate.json
diff --git a/...s/restore_from_slab/polished_diorite.json → ...e/restore_from_slab/polished_diorite.json b/...s/restore_from_slab/polished_diorite.json → ...e/restore_from_slab/polished_diorite.json
diff --git a/...s/restore_from_slab/polished_granite.json → ...e/restore_from_slab/polished_granite.json b/...s/restore_from_slab/polished_granite.json → ...e/restore_from_slab/polished_granite.json
diff --git a/data/ezrcp/advancement/recipe/restore_from_slab/polished_tuff.json b/data/ezrcp/advancement/recipe/restore_from_slab/polished_tuff.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_slab": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:polished_tuff_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "ezrcp:restore_from_slab/polished_tuff"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_slab",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "ezrcp:restore_from_slab/polished_tuff"
+    ]
+  }
+}
diff --git a/...recipes/restore_from_slab/prismarine.json → .../recipe/restore_from_slab/prismarine.json b/...recipes/restore_from_slab/prismarine.json → .../recipe/restore_from_slab/prismarine.json
diff --git a/.../restore_from_slab/prismarine_bricks.json → .../restore_from_slab/prismarine_bricks.json b/.../restore_from_slab/prismarine_bricks.json → .../restore_from_slab/prismarine_bricks.json
diff --git a/...cipes/restore_from_slab/purpur_block.json → ...ecipe/restore_from_slab/purpur_block.json b/...cipes/restore_from_slab/purpur_block.json → ...ecipe/restore_from_slab/purpur_block.json
diff --git a/...cipes/restore_from_slab/quartz_block.json → ...ecipe/restore_from_slab/quartz_block.json b/...cipes/restore_from_slab/quartz_block.json → ...ecipe/restore_from_slab/quartz_block.json
diff --git a/.../restore_from_slab/red_nether_bricks.json → .../restore_from_slab/red_nether_bricks.json b/.../restore_from_slab/red_nether_bricks.json → .../restore_from_slab/red_nether_bricks.json
diff --git a/...ipes/restore_from_slab/red_sandstone.json → ...cipe/restore_from_slab/red_sandstone.json b/...ipes/restore_from_slab/red_sandstone.json → ...cipe/restore_from_slab/red_sandstone.json
diff --git a/.../recipes/restore_from_slab/sandstone.json → ...t/recipe/restore_from_slab/sandstone.json b/.../recipes/restore_from_slab/sandstone.json → ...t/recipe/restore_from_slab/sandstone.json
diff --git a/...ipes/restore_from_slab/smooth_quartz.json → ...cipe/restore_from_slab/smooth_quartz.json b/...ipes/restore_from_slab/smooth_quartz.json → ...cipe/restore_from_slab/smooth_quartz.json
diff --git a/...store_from_slab/smooth_red_sandstone.json → ...store_from_slab/smooth_red_sandstone.json b/...store_from_slab/smooth_red_sandstone.json → ...store_from_slab/smooth_red_sandstone.json
diff --git a/...s/restore_from_slab/smooth_sandstone.json → ...e/restore_from_slab/smooth_sandstone.json b/...s/restore_from_slab/smooth_sandstone.json → ...e/restore_from_slab/smooth_sandstone.json
diff --git a/...cipes/restore_from_slab/smooth_stone.json → ...ecipe/restore_from_slab/smooth_stone.json b/...cipes/restore_from_slab/smooth_stone.json → ...ecipe/restore_from_slab/smooth_stone.json
diff --git a/...ipes/restore_from_slab/spruce_planks.json → ...cipe/restore_from_slab/spruce_planks.json b/...ipes/restore_from_slab/spruce_planks.json → ...cipe/restore_from_slab/spruce_planks.json
diff --git a/...ents/recipes/restore_from_slab/stone.json → ...ement/recipe/restore_from_slab/stone.json b/...ents/recipes/restore_from_slab/stone.json → ...ement/recipe/restore_from_slab/stone.json
diff --git a/...cipes/restore_from_slab/stone_bricks.json → ...ecipe/restore_from_slab/stone_bricks.json b/...cipes/restore_from_slab/stone_bricks.json → ...ecipe/restore_from_slab/stone_bricks.json
diff --git a/data/ezrcp/advancement/recipe/restore_from_slab/tuff.json b/data/ezrcp/advancement/recipe/restore_from_slab/tuff.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_slab": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tuff_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "ezrcp:restore_from_slab/tuff"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_slab",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "ezrcp:restore_from_slab/tuff"
+    ]
+  }
+}
diff --git a/data/ezrcp/advancement/recipe/restore_from_slab/tuff_bricks.json b/data/ezrcp/advancement/recipe/restore_from_slab/tuff_bricks.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_slab": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tuff_brick_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "ezrcp:restore_from_slab/tuff_bricks"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_slab",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "ezrcp:restore_from_slab/tuff_bricks"
+    ]
+  }
+}
diff --git a/...ipes/restore_from_slab/warped_planks.json → ...cipe/restore_from_slab/warped_planks.json b/...ipes/restore_from_slab/warped_planks.json → ...cipe/restore_from_slab/warped_planks.json
diff --git a/...s/restore_from_slab/waxed_cut_copper.json → ...e/restore_from_slab/waxed_cut_copper.json b/...s/restore_from_slab/waxed_cut_copper.json → ...e/restore_from_slab/waxed_cut_copper.json
diff --git a/...e_from_slab/waxed_exposed_cut_copper.json → ...e_from_slab/waxed_exposed_cut_copper.json b/...e_from_slab/waxed_exposed_cut_copper.json → ...e_from_slab/waxed_exposed_cut_copper.json
diff --git a/..._from_slab/waxed_oxidized_cut_copper.json → ..._from_slab/waxed_oxidized_cut_copper.json b/..._from_slab/waxed_oxidized_cut_copper.json → ..._from_slab/waxed_oxidized_cut_copper.json
diff --git a/...from_slab/waxed_weathered_cut_copper.json → ...from_slab/waxed_weathered_cut_copper.json b/...from_slab/waxed_weathered_cut_copper.json → ...from_slab/waxed_weathered_cut_copper.json
diff --git a/...store_from_slab/weathered_cut_copper.json → ...store_from_slab/weathered_cut_copper.json b/...store_from_slab/weathered_cut_copper.json → ...store_from_slab/weathered_cut_copper.json
diff --git a/...ecipes/restore_glass_from_glass_pane.json → ...recipe/restore_glass_from_glass_pane.json b/...ecipes/restore_glass_from_glass_pane.json → ...recipe/restore_glass_from_glass_pane.json
diff --git a/..._glass_from_stained_glass_pane/black.json → ..._glass_from_stained_glass_pane/black.json b/..._glass_from_stained_glass_pane/black.json → ..._glass_from_stained_glass_pane/black.json
diff --git a/...d_glass_from_stained_glass_pane/blue.json → ...d_glass_from_stained_glass_pane/blue.json b/...d_glass_from_stained_glass_pane/blue.json → ...d_glass_from_stained_glass_pane/blue.json
diff --git a/..._glass_from_stained_glass_pane/brown.json → ..._glass_from_stained_glass_pane/brown.json b/..._glass_from_stained_glass_pane/brown.json → ..._glass_from_stained_glass_pane/brown.json
diff --git a/...d_glass_from_stained_glass_pane/cyan.json → ...d_glass_from_stained_glass_pane/cyan.json b/...d_glass_from_stained_glass_pane/cyan.json → ...d_glass_from_stained_glass_pane/cyan.json
diff --git a/...d_glass_from_stained_glass_pane/gray.json → ...d_glass_from_stained_glass_pane/gray.json b/...d_glass_from_stained_glass_pane/gray.json → ...d_glass_from_stained_glass_pane/gray.json
diff --git a/..._glass_from_stained_glass_pane/green.json → ..._glass_from_stained_glass_pane/green.json b/..._glass_from_stained_glass_pane/green.json → ..._glass_from_stained_glass_pane/green.json
diff --git a/...s_from_stained_glass_pane/light_blue.json → ...s_from_stained_glass_pane/light_blue.json b/...s_from_stained_glass_pane/light_blue.json → ...s_from_stained_glass_pane/light_blue.json
diff --git a/...s_from_stained_glass_pane/light_gray.json → ...s_from_stained_glass_pane/light_gray.json b/...s_from_stained_glass_pane/light_gray.json → ...s_from_stained_glass_pane/light_gray.json
diff --git a/...d_glass_from_stained_glass_pane/lime.json → ...d_glass_from_stained_glass_pane/lime.json b/...d_glass_from_stained_glass_pane/lime.json → ...d_glass_from_stained_glass_pane/lime.json
diff --git a/...lass_from_stained_glass_pane/magenta.json → ...lass_from_stained_glass_pane/magenta.json b/...lass_from_stained_glass_pane/magenta.json → ...lass_from_stained_glass_pane/magenta.json
diff --git a/...glass_from_stained_glass_pane/orange.json → ...glass_from_stained_glass_pane/orange.json b/...glass_from_stained_glass_pane/orange.json → ...glass_from_stained_glass_pane/orange.json
diff --git a/...d_glass_from_stained_glass_pane/pink.json → ...d_glass_from_stained_glass_pane/pink.json b/...d_glass_from_stained_glass_pane/pink.json → ...d_glass_from_stained_glass_pane/pink.json
diff --git a/...glass_from_stained_glass_pane/purple.json → ...glass_from_stained_glass_pane/purple.json b/...glass_from_stained_glass_pane/purple.json → ...glass_from_stained_glass_pane/purple.json
diff --git a/...ed_glass_from_stained_glass_pane/red.json → ...ed_glass_from_stained_glass_pane/red.json b/...ed_glass_from_stained_glass_pane/red.json → ...ed_glass_from_stained_glass_pane/red.json
diff --git a/..._glass_from_stained_glass_pane/white.json → ..._glass_from_stained_glass_pane/white.json b/..._glass_from_stained_glass_pane/white.json → ..._glass_from_stained_glass_pane/white.json
diff --git a/...glass_from_stained_glass_pane/yellow.json → ...glass_from_stained_glass_pane/yellow.json b/...glass_from_stained_glass_pane/yellow.json → ...glass_from_stained_glass_pane/yellow.json
diff --git a/...recipes/simplified_carrot_on_a_stick.json → .../recipe/simplified_carrot_on_a_stick.json b/...recipes/simplified_carrot_on_a_stick.json → .../recipe/simplified_carrot_on_a_stick.json
diff --git a/...cements/recipes/simplified_dispenser.json → ...ancement/recipe/simplified_dispenser.json b/...cements/recipes/simplified_dispenser.json → ...ancement/recipe/simplified_dispenser.json
diff --git a/...vancements/recipes/simplified_hopper.json → ...advancement/recipe/simplified_hopper.json b/...vancements/recipes/simplified_hopper.json → ...advancement/recipe/simplified_hopper.json
diff --git a/...cipes/simplified_minecart_with_chest.json → ...ecipe/simplified_minecart_with_chest.json b/...cipes/simplified_minecart_with_chest.json → ...ecipe/simplified_minecart_with_chest.json
diff --git a/...pes/simplified_minecart_with_furnace.json → ...ipe/simplified_minecart_with_furnace.json b/...pes/simplified_minecart_with_furnace.json → ...ipe/simplified_minecart_with_furnace.json
diff --git a/...ipes/simplified_minecart_with_hopper.json → ...cipe/simplified_minecart_with_hopper.json b/...ipes/simplified_minecart_with_hopper.json → ...cipe/simplified_minecart_with_hopper.json
diff --git a/...recipes/simplified_minecart_with_tnt.json → .../recipe/simplified_minecart_with_tnt.json b/...recipes/simplified_minecart_with_tnt.json → .../recipe/simplified_minecart_with_tnt.json
diff --git a/...nts/recipes/simplified_redstone_lamp.json → ...ment/recipe/simplified_redstone_lamp.json b/...nts/recipes/simplified_redstone_lamp.json → ...ment/recipe/simplified_redstone_lamp.json
diff --git a/...ncements/recipes/simplified_repeater.json → ...vancement/recipe/simplified_repeater.json b/...ncements/recipes/simplified_repeater.json → ...vancement/recipe/simplified_repeater.json
diff --git a/...nts/recipes/simplified_trapped_chest.json → ...ment/recipe/simplified_trapped_chest.json b/...nts/recipes/simplified_trapped_chest.json → ...ment/recipe/simplified_trapped_chest.json
diff --git a/.../simplified_warped_fungus_on_a_stick.json → .../simplified_warped_fungus_on_a_stick.json b/.../simplified_warped_fungus_on_a_stick.json → .../simplified_warped_fungus_on_a_stick.json
diff --git a/...nts/recipes/simplified_writable_book.json → ...ment/recipe/simplified_writable_book.json b/...nts/recipes/simplified_writable_book.json → ...ment/recipe/simplified_writable_book.json
diff --git a/...ts/recipes/slab_from_log/acacia_slab.json → ...ent/recipe/slab_from_log/acacia_slab.json b/...ts/recipes/slab_from_log/acacia_slab.json → ...ent/recipe/slab_from_log/acacia_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:acacia_logs"
+            "items": "#minecraft:acacia_logs"
           }
         ]
       }

diff --git a/...nts/recipes/slab_from_log/birch_slab.json → ...ment/recipe/slab_from_log/birch_slab.json b/...nts/recipes/slab_from_log/birch_slab.json → ...ment/recipe/slab_from_log/birch_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:birch_logs"
+            "items": "#minecraft:birch_logs"
           }
         ]
       }

diff --git a/...ts/recipes/slab_from_log/cherry_slab.json → ...ent/recipe/slab_from_log/cherry_slab.json b/...ts/recipes/slab_from_log/cherry_slab.json → ...ent/recipe/slab_from_log/cherry_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:cherry_logs"
+            "items": "#minecraft:cherry_logs"
           }
         ]
       }

diff --git a/...s/recipes/slab_from_log/crimson_slab.json → ...nt/recipe/slab_from_log/crimson_slab.json b/...s/recipes/slab_from_log/crimson_slab.json → ...nt/recipe/slab_from_log/crimson_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:crimson_stems"
+            "items": "#minecraft:crimson_stems"
           }
         ]
       }

diff --git a/.../recipes/slab_from_log/dark_oak_slab.json → ...t/recipe/slab_from_log/dark_oak_slab.json b/.../recipes/slab_from_log/dark_oak_slab.json → ...t/recipe/slab_from_log/dark_oak_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:dark_oak_logs"
+            "items": "#minecraft:dark_oak_logs"
           }
         ]
       }

diff --git a/...ts/recipes/slab_from_log/jungle_slab.json → ...ent/recipe/slab_from_log/jungle_slab.json b/...ts/recipes/slab_from_log/jungle_slab.json → ...ent/recipe/slab_from_log/jungle_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:jungle_logs"
+            "items": "#minecraft:jungle_logs"
           }
         ]
       }

diff --git a/.../recipes/slab_from_log/mangrove_slab.json → ...t/recipe/slab_from_log/mangrove_slab.json b/.../recipes/slab_from_log/mangrove_slab.json → ...t/recipe/slab_from_log/mangrove_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:mangrove_logs"
+            "items": "#minecraft:mangrove_logs"
           }
         ]
       }

diff --git a/...ments/recipes/slab_from_log/oak_slab.json → ...cement/recipe/slab_from_log/oak_slab.json b/...ments/recipes/slab_from_log/oak_slab.json → ...cement/recipe/slab_from_log/oak_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:oak_logs"
+            "items": "#minecraft:oak_logs"
           }
         ]
       }

diff --git a/...ts/recipes/slab_from_log/spruce_slab.json → ...ent/recipe/slab_from_log/spruce_slab.json b/...ts/recipes/slab_from_log/spruce_slab.json → ...ent/recipe/slab_from_log/spruce_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:spruce_logs"
+            "items": "#minecraft:spruce_logs"
           }
         ]
       }

diff --git a/...ts/recipes/slab_from_log/warped_slab.json → ...ent/recipe/slab_from_log/warped_slab.json b/...ts/recipes/slab_from_log/warped_slab.json → ...ent/recipe/slab_from_log/warped_slab.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:warped_stems"
+            "items": "#minecraft:warped_stems"
           }
         ]
       }

diff --git a/...ents/recipes/stick_from_bamboo_block.json → ...ement/recipe/stick_from_bamboo_block.json b/...ents/recipes/stick_from_bamboo_block.json → ...ement/recipe/stick_from_bamboo_block.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:bamboo_blocks"
+            "items": "#minecraft:bamboo_blocks"
           }
         ]
       }

diff --git a/.../advancements/recipes/stick_from_log.json → ...cp/advancement/recipe/stick_from_log.json b/.../advancements/recipes/stick_from_log.json → ...cp/advancement/recipe/stick_from_log.json
@@ -6,7 +6,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "minecraft:logs"
+            "items": "#minecraft:logs"
           }
         ]
       }

diff --git a/...ecipes/bamboo_slab_from_bamboo_block.json → ...recipe/bamboo_slab_from_bamboo_block.json b/...ecipes/bamboo_slab_from_bamboo_block.json → ...recipe/bamboo_slab_from_bamboo_block.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "minecraft:bamboo_slab",
+    "id": "minecraft:bamboo_slab",
     "count": 12
   }
 }
diff --git a/...zrcp/recipes/chest_from_bamboo_block.json → ...ezrcp/recipe/chest_from_bamboo_block.json b/...zrcp/recipes/chest_from_bamboo_block.json → ...ezrcp/recipe/chest_from_bamboo_block.json
@@ -9,11 +9,11 @@
   ],
   "key": {
     "#": {
-      "tag": "minecraft:logs"
+      "tag": "minecraft:bamboo_blocks"
     }
   },
   "result": {
-    "item": "minecraft:chest",
+    "id": "minecraft:chest",
     "count": 2
   }
 }
diff --git a/data/ezrcp/recipes/chest_from_log.json → data/ezrcp/recipe/chest_from_log.json b/data/ezrcp/recipes/chest_from_log.json → data/ezrcp/recipe/chest_from_log.json
@@ -13,7 +13,7 @@
     }
   },
   "result": {
-    "item": "minecraft:chest",
+    "id": "minecraft:chest",
     "count": 4
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/1.json → ...ipe/clean_glass_from_stained_glass/1.json b/...pes/clean_glass_from_stained_glass/1.json → ...ipe/clean_glass_from_stained_glass/1.json
@@ -11,7 +11,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 1
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/2.json → ...ipe/clean_glass_from_stained_glass/2.json b/...pes/clean_glass_from_stained_glass/2.json → ...ipe/clean_glass_from_stained_glass/2.json
@@ -14,7 +14,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 2
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/3.json → ...ipe/clean_glass_from_stained_glass/3.json b/...pes/clean_glass_from_stained_glass/3.json → ...ipe/clean_glass_from_stained_glass/3.json
@@ -17,7 +17,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 3
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/4.json → ...ipe/clean_glass_from_stained_glass/4.json b/...pes/clean_glass_from_stained_glass/4.json → ...ipe/clean_glass_from_stained_glass/4.json
@@ -20,7 +20,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 4
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/5.json → ...ipe/clean_glass_from_stained_glass/5.json b/...pes/clean_glass_from_stained_glass/5.json → ...ipe/clean_glass_from_stained_glass/5.json
@@ -23,7 +23,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 5
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/6.json → ...ipe/clean_glass_from_stained_glass/6.json b/...pes/clean_glass_from_stained_glass/6.json → ...ipe/clean_glass_from_stained_glass/6.json
@@ -26,7 +26,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 6
   }
 }
diff --git a/...pes/clean_glass_from_stained_glass/7.json → ...ipe/clean_glass_from_stained_glass/7.json b/...pes/clean_glass_from_stained_glass/7.json → ...ipe/clean_glass_from_stained_glass/7.json
@@ -29,7 +29,7 @@
     }
   ],
   "result": {
-    "item": "minecraft:glass",
+    "id": "minecraft:glass",
     "count": 7
   }
 }