diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 9c5ff65..afe6ea5 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -6,13 +6,14 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: setup go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.22"
           cache: false # only caches go projects, not general go pkgs
+
       - name: get go cache env
         id: go-cache-env
         run: |
@@ -25,7 +26,7 @@ jobs:
           echo "$EOF" >> $GITHUB_ENV
 
       - name: cache go
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{env.GOMODCACHE}}
@@ -35,44 +36,46 @@ jobs:
       - name: install yajsv
         run: go install github.com/neilpa/yajsv@v1.4.1
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
+
+      - name: get cache week
+        id: week
+        run: echo "value=$(date +%Y-%U)" >> $GITHUB_OUTPUT
 
       - name: cache schemas
-        uses: actions/cache@v3
+        id: cache-schemas
+        uses: actions/cache@v4
         with:
-          path: | 
-            schemas/
-          key: ${{ runner.os }}-schemas
+          path: schemas/
+          key: ${{ runner.os }}-schemas-${{ steps.week.outputs.value }}
 
-      - name: fetch Schemas
+      - name: fetch schemas
+        if: steps.cache-schemas.outputs.cache-hit != 'true'
         run: |
-          curl -o schemas/advancement.json https://json.schemastore.org/minecraft-advancement.json
-          curl -o schemas/tag.json https://json.schemastore.org/minecraft-tag.json
-          curl -o schemas/recipe.json https://json.schemastore.org/minecraft-recipe.json
-          # Disabled due to older version. downloaded and edited manually
-          #curl -o schemas/pack-mcmeta.json https://json.schemastore.org/minecraft-pack-mcmeta.json
-          
+          curl -fsSL -o schemas/advancement.json https://json.schemastore.org/minecraft-advancement.json
+          curl -fsSL -o schemas/tag.json https://json.schemastore.org/minecraft-tag.json
+          curl -fsSL -o schemas/recipe.json https://json.schemastore.org/minecraft-recipe.json
+          # pack-mcmeta.json is maintained locally (schemastore version is outdated)
 
       - name: Verify pack.mcmeta
-        run: |
-          yajsv -s schemas/pack-mcmeta.json -q "BoxedDataPack/pack.mcmeta"
+        run: yajsv -s schemas/pack-mcmeta.json -q "BoxedDataPack/pack.mcmeta"
 
       - name: Verify Advancements
         run: |
-          python -c 'from glob import glob;globfile = open("globs.txt", "w");globfile.writelines(filename + "\n" for filename in glob("BoxedDataPack/data/*/advancements/**/*.json", recursive=True));globfile.close()'
+          python3 -c 'from glob import glob;open("globs.txt","w").writelines(f+"\n" for f in glob("BoxedDataPack/data/*/advancements/**/*.json",recursive=True))'
           yajsv -s schemas/advancement.json -q -l globs.txt
           rm globs.txt
 
       - name: Verify Tags
         run: |
-          python -c 'from glob import glob;globfile = open("globs.txt", "w");globfile.writelines(filename + "\n" for filename in glob("BoxedDataPack/data/*/tags/**/*.json", recursive=True));globfile.close()'
+          python3 -c 'from glob import glob;open("globs.txt","w").writelines(f+"\n" for f in glob("BoxedDataPack/data/*/tags/**/*.json",recursive=True))'
           yajsv -s schemas/tag.json -q -l globs.txt
           rm globs.txt
 
       - name: Verify Recipes
         run: |
-          python -c 'from glob import glob;globfile = open("globs.txt", "w");globfile.writelines(filename + "\n" for filename in glob("BoxedDataPack/data/*/recipes/**/*.json", recursive=True));globfile.close()'
+          python3 -c 'from glob import glob;open("globs.txt","w").writelines(f+"\n" for f in glob("BoxedDataPack/data/*/recipes/**/*.json",recursive=True))'
           yajsv -s schemas/recipe.json -q -l globs.txt
           rm globs.txt
diff --git a/BoxedDataPack/data/bentobox/advancements/building/all_slabs.json b/BoxedDataPack/data/bentobox/advancements/building/all_slabs.json
index 441004b..53ec0b0 100644
--- a/BoxedDataPack/data/bentobox/advancements/building/all_slabs.json
+++ b/BoxedDataPack/data/bentobox/advancements/building/all_slabs.json
@@ -591,6 +591,78 @@
           }
         ]
       }
+    },
+    "cherry": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:cherry_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "bamboo": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "bamboo_mosaic": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_mosaic_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "tuff_brick": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tuff_brick_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "polished_tuff": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:polished_tuff_slab"
+            ]
+          }
+        ]
+      }
+    },
+    "resin_brick": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:resin_brick_slab"
+            ]
+          }
+        ]
+      }
     }
   }
 }
diff --git a/BoxedDataPack/data/bentobox/advancements/building/all_stairs.json b/BoxedDataPack/data/bentobox/advancements/building/all_stairs.json
index ede873b..ad6ef96 100644
--- a/BoxedDataPack/data/bentobox/advancements/building/all_stairs.json
+++ b/BoxedDataPack/data/bentobox/advancements/building/all_stairs.json
@@ -552,6 +552,78 @@
           }
         ]
       }
+    },
+    "cherry": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:cherry_stairs"
+            ]
+          }
+        ]
+      }
+    },
+    "bamboo": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_stairs"
+            ]
+          }
+        ]
+      }
+    },
+    "bamboo_mosaic": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:bamboo_mosaic_stairs"
+            ]
+          }
+        ]
+      }
+    },
+    "tuff_brick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tuff_brick_stairs"
+            ]
+          }
+        ]
+      }
+    },
+    "polished_tuff": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:polished_tuff_stairs"
+            ]
+          }
+        ]
+      }
+    },
+    "resin_brick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:resin_brick_stairs"
+            ]
+          }
+        ]
+      }
     }
   },
   "rewards": {
diff --git a/BoxedDataPack/data/bentobox/advancements/building/all_walls.json b/BoxedDataPack/data/bentobox/advancements/building/all_walls.json
index 55a4845..c0ee33f 100644
--- a/BoxedDataPack/data/bentobox/advancements/building/all_walls.json
+++ b/BoxedDataPack/data/bentobox/advancements/building/all_walls.json
@@ -272,6 +272,54 @@
           }
         ]
       }
+    },
+    "tuff": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tuff_wall"
+            ]
+          }
+        ]
+      }
+    },
+    "polished_tuff": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:polished_tuff_wall"
+            ]
+          }
+        ]
+      }
+    },
+    "tuff_brick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:tuff_brick_wall"
+            ]
+          }
+        ]
+      }
+    },
+    "resin_brick": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:resin_brick_wall"
+            ]
+          }
+        ]
+      }
     }
   },
   "rewards": {
diff --git a/BoxedDataPack/data/bentobox/advancements/building/copper_bulb.json b/BoxedDataPack/data/bentobox/advancements/building/copper_bulb.json
new file mode 100644
index 0000000..92000e2
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/building/copper_bulb.json
@@ -0,0 +1,25 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:copper_bulb"
+    },
+    "title": "Copper Illuminated",
+    "description": "Obtain a copper bulb",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:building/copper_block",
+  "criteria": {
+    "copper_bulb": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:copper_bulb"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/building/crafter.json b/BoxedDataPack/data/bentobox/advancements/building/crafter.json
new file mode 100644
index 0000000..7dc5f12
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/building/crafter.json
@@ -0,0 +1,30 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:crafter"
+    },
+    "title": "Auto-Crafter",
+    "description": "Place a crafter",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:building/root",
+  "criteria": {
+    "crafter": {
+      "trigger": "minecraft:placed_block",
+      "conditions": {
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:crafter"
+                ]
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/combat/bogged.json b/BoxedDataPack/data/bentobox/advancements/combat/bogged.json
new file mode 100644
index 0000000..2b6b06f
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/combat/bogged.json
@@ -0,0 +1,21 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:bone"
+    },
+    "title": "Bogged Down",
+    "description": "Kill a bogged",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:combat/root",
+  "criteria": {
+    "bogged": {
+      "trigger": "minecraft:player_killed_entity",
+      "conditions": {
+        "entity": {
+          "type": "minecraft:bogged"
+        }
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/combat/breeze.json b/BoxedDataPack/data/bentobox/advancements/combat/breeze.json
new file mode 100644
index 0000000..9ea54d6
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/combat/breeze.json
@@ -0,0 +1,21 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:breeze_rod"
+    },
+    "title": "Trial by Combat",
+    "description": "Kill a breeze",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:combat/mace",
+  "criteria": {
+    "breeze": {
+      "trigger": "minecraft:player_killed_entity",
+      "conditions": {
+        "entity": {
+          "type": "minecraft:breeze"
+        }
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/combat/mace.json b/BoxedDataPack/data/bentobox/advancements/combat/mace.json
new file mode 100644
index 0000000..e875101
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/combat/mace.json
@@ -0,0 +1,25 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:mace"
+    },
+    "title": "Heavy Hitter",
+    "description": "Craft a mace",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:combat/root",
+  "criteria": {
+    "mace": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:mace"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/combat/perfect_crossbow.json b/BoxedDataPack/data/bentobox/advancements/combat/perfect_crossbow.json
index b179394..8cfa5e1 100644
--- a/BoxedDataPack/data/bentobox/advancements/combat/perfect_crossbow.json
+++ b/BoxedDataPack/data/bentobox/advancements/combat/perfect_crossbow.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "crossbow",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Deadeye",
     "description": "Create a perfect crossbow",
@@ -23,19 +23,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "quick_charge",
+                "enchantment": "minecraft:quick_charge",
                 "levels": 3
               },
               {
-                "enchantment": "piercing",
+                "enchantment": "minecraft:piercing",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -53,19 +53,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "quick_charge",
+                "enchantment": "minecraft:quick_charge",
                 "levels": 3
               },
               {
-                "enchantment": "multishot",
+                "enchantment": "minecraft:multishot",
                 "levels": 1
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
diff --git a/BoxedDataPack/data/bentobox/advancements/exploration/biomes_explore_all.json b/BoxedDataPack/data/bentobox/advancements/exploration/biomes_explore_all.json
index 1aa7897..6b1db65 100644
--- a/BoxedDataPack/data/bentobox/advancements/exploration/biomes_explore_all.json
+++ b/BoxedDataPack/data/bentobox/advancements/exploration/biomes_explore_all.json
@@ -847,6 +847,38 @@
           }
         ]
       }
+    },
+    "cherry_grove": {
+      "trigger": "location",
+      "conditions": {
+        "player": [
+          {
+            "condition": "entity_properties",
+            "predicate": {
+              "location": {
+                "biome": "cherry_grove"
+              }
+            },
+            "entity": "this"
+          }
+        ]
+      }
+    },
+    "pale_garden": {
+      "trigger": "location",
+      "conditions": {
+        "player": [
+          {
+            "condition": "entity_properties",
+            "predicate": {
+              "location": {
+                "biome": "pale_garden"
+              }
+            },
+            "entity": "this"
+          }
+        ]
+      }
     }
   }
 }
diff --git a/BoxedDataPack/data/bentobox/advancements/exploration/trial_chamber.json b/BoxedDataPack/data/bentobox/advancements/exploration/trial_chamber.json
new file mode 100644
index 0000000..61af00e
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/exploration/trial_chamber.json
@@ -0,0 +1,25 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:trial_key"
+    },
+    "title": "Trial and Error",
+    "description": "Obtain a trial key from a trial chamber",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:exploration/root",
+  "criteria": {
+    "trial_key": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:trial_key"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/forestry/perfect_axe.json b/BoxedDataPack/data/bentobox/advancements/forestry/perfect_axe.json
index f7f82de..11f2a7f 100644
--- a/BoxedDataPack/data/bentobox/advancements/forestry/perfect_axe.json
+++ b/BoxedDataPack/data/bentobox/advancements/forestry/perfect_axe.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "netherite_axe",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Master Lumberjack",
     "description": "Create a perfect axe",
@@ -23,23 +23,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "fortune",
+                "enchantment": "minecraft:fortune",
                 "levels": 3
               },
               {
-                "enchantment": "sharpness",
+                "enchantment": "minecraft:sharpness",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -57,23 +57,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "silk_touch",
+                "enchantment": "minecraft:silk_touch",
                 "levels": 1
               },
               {
-                "enchantment": "sharpness",
+                "enchantment": "minecraft:sharpness",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -91,23 +91,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "fortune",
+                "enchantment": "minecraft:fortune",
                 "levels": 3
               },
               {
-                "enchantment": "smite",
+                "enchantment": "minecraft:smite",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -125,23 +125,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "silk_touch",
+                "enchantment": "minecraft:silk_touch",
                 "levels": 1
               },
               {
-                "enchantment": "smite",
+                "enchantment": "minecraft:smite",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -159,23 +159,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "fortune",
+                "enchantment": "minecraft:fortune",
                 "levels": 3
               },
               {
-                "enchantment": "bane_of_arthropods",
+                "enchantment": "minecraft:bane_of_arthropods",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -193,23 +193,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "silk_touch",
+                "enchantment": "minecraft:silk_touch",
                 "levels": 1
               },
               {
-                "enchantment": "bane_of_arthropods",
+                "enchantment": "minecraft:bane_of_arthropods",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
diff --git a/BoxedDataPack/data/bentobox/advancements/livestock/armadillo.json b/BoxedDataPack/data/bentobox/advancements/livestock/armadillo.json
new file mode 100644
index 0000000..777a080
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/livestock/armadillo.json
@@ -0,0 +1,25 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:armadillo_scute"
+    },
+    "title": "Armadillo!",
+    "description": "Collect an armadillo scute",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:livestock/root",
+  "criteria": {
+    "armadillo_scute": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:armadillo_scute"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/livestock/wolf_armor.json b/BoxedDataPack/data/bentobox/advancements/livestock/wolf_armor.json
new file mode 100644
index 0000000..bb12ff6
--- /dev/null
+++ b/BoxedDataPack/data/bentobox/advancements/livestock/wolf_armor.json
@@ -0,0 +1,25 @@
+{
+  "display": {
+    "icon": {
+      "item": "minecraft:wolf_armor"
+    },
+    "title": "Man's Best Bodyguard",
+    "description": "Craft wolf armor",
+    "announce_to_chat": false
+  },
+  "parent": "bentobox:livestock/armadillo",
+  "criteria": {
+    "wolf_armor": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:wolf_armor"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/BoxedDataPack/data/bentobox/advancements/ocean/frost_walker.json b/BoxedDataPack/data/bentobox/advancements/ocean/frost_walker.json
index 61f0624..103b3ce 100644
--- a/BoxedDataPack/data/bentobox/advancements/ocean/frost_walker.json
+++ b/BoxedDataPack/data/bentobox/advancements/ocean/frost_walker.json
@@ -29,7 +29,7 @@
                   "tag": "bentobox:boots",
                   "enchantments": [
                     {
-                      "enchantment": "frost_walker"
+                      "enchantment": "minecraft:frost_walker"
                     }
                   ]
                 }
diff --git a/BoxedDataPack/data/bentobox/advancements/ocean/perfect_trident.json b/BoxedDataPack/data/bentobox/advancements/ocean/perfect_trident.json
index 4f04127..de51c45 100644
--- a/BoxedDataPack/data/bentobox/advancements/ocean/perfect_trident.json
+++ b/BoxedDataPack/data/bentobox/advancements/ocean/perfect_trident.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "trident",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Poseidon's Fury",
     "description": "Create a perfect trident",
@@ -23,23 +23,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "loyalty",
+                "enchantment": "minecraft:loyalty",
                 "levels": 3
               },
               {
-                "enchantment": "impaling",
+                "enchantment": "minecraft:impaling",
                 "levels": 5
               },
               {
-                "enchantment": "channeling",
+                "enchantment": "minecraft:channeling",
                 "levels": 1
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -57,19 +57,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "riptide",
+                "enchantment": "minecraft:riptide",
                 "levels": 3
               },
               {
-                "enchantment": "impaling",
+                "enchantment": "minecraft:impaling",
                 "levels": 5
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
diff --git a/BoxedDataPack/data/bentobox/advancements/ocean/tropical_aquarist.json b/BoxedDataPack/data/bentobox/advancements/ocean/tropical_aquarist.json
index 8e30631..fde55ab 100644
--- a/BoxedDataPack/data/bentobox/advancements/ocean/tropical_aquarist.json
+++ b/BoxedDataPack/data/bentobox/advancements/ocean/tropical_aquarist.json
@@ -19,7 +19,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:117506305}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 117506305}
+          }
         }
       }
     },
@@ -30,7 +32,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:117899265}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 117899265}
+          }
         }
       }
     },
@@ -41,7 +45,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:185008129}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 185008129}
+          }
         }
       }
     },
@@ -52,7 +58,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:117441793}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 117441793}
+          }
         }
       }
     },
@@ -63,7 +71,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:118161664}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 118161664}
+          }
         }
       }
     },
@@ -74,7 +84,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:65536}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 65536}
+          }
         }
       }
     },
@@ -85,7 +97,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:50726144}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 50726144}
+          }
         }
       }
     },
@@ -96,7 +110,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:67764993}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 67764993}
+          }
         }
       }
     },
@@ -107,7 +123,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:234882305}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 234882305}
+          }
         }
       }
     },
@@ -118,7 +136,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:67110144}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 67110144}
+          }
         }
       }
     },
@@ -129,7 +149,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:117441025}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 117441025}
+          }
         }
       }
     },
@@ -140,7 +162,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:16778497}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 16778497}
+          }
         }
       }
     },
@@ -151,7 +175,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:101253888}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 101253888}
+          }
         }
       }
     },
@@ -162,7 +188,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:50660352}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 50660352}
+          }
         }
       }
     },
@@ -173,7 +201,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:918529}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 918529}
+          }
         }
       }
     },
@@ -184,7 +214,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:235340288}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 235340288}
+          }
         }
       }
     },
@@ -195,7 +227,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:918273}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 918273}
+          }
         }
       }
     },
@@ -206,7 +240,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:67108865}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 67108865}
+          }
         }
       }
     },
@@ -217,7 +253,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:917504}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 917504}
+          }
         }
       }
     },
@@ -228,7 +266,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:459008}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 459008}
+          }
         }
       }
     },
@@ -239,7 +279,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:67699456}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 67699456}
+          }
         }
       }
     },
@@ -250,7 +292,9 @@
           "items": [
             "tropical_fish_bucket"
           ],
-          "nbt": "{BucketVariantTag:67371009}"
+          "predicates": {
+            "minecraft:bucket_entity_data": {"Variant": 67371009}
+          }
         }
       }
     }
diff --git a/BoxedDataPack/data/bentobox/tags/blocks/stripped_logs.json b/BoxedDataPack/data/bentobox/tags/blocks/stripped_logs.json
index e5b9662..5bb3ffa 100644
--- a/BoxedDataPack/data/bentobox/tags/blocks/stripped_logs.json
+++ b/BoxedDataPack/data/bentobox/tags/blocks/stripped_logs.json
@@ -1,13 +1,13 @@
 {
   "values": [
-    "stripped_oak_log",
-    "stripped_spruce_log",
-    "stripped_birch_log",
-    "stripped_jungle_log",
-    "stripped_acacia_log",
-    "stripped_dark_oak_log",
-    "stripped_crimson_stem",
-    "stripped_warped_stem",
-    "stripped_mangrove_log"
+    "minecraft:stripped_oak_log",
+    "minecraft:stripped_spruce_log",
+    "minecraft:stripped_birch_log",
+    "minecraft:stripped_jungle_log",
+    "minecraft:stripped_acacia_log",
+    "minecraft:stripped_dark_oak_log",
+    "minecraft:stripped_crimson_stem",
+    "minecraft:stripped_warped_stem",
+    "minecraft:stripped_mangrove_log"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/blocks/stripped_woods.json b/BoxedDataPack/data/bentobox/tags/blocks/stripped_woods.json
index 51f2ca8..2733862 100644
--- a/BoxedDataPack/data/bentobox/tags/blocks/stripped_woods.json
+++ b/BoxedDataPack/data/bentobox/tags/blocks/stripped_woods.json
@@ -1,13 +1,13 @@
 {
   "values": [
-    "stripped_oak_wood",
-    "stripped_spruce_wood",
-    "stripped_birch_wood",
-    "stripped_jungle_wood",
-    "stripped_acacia_wood",
-    "stripped_dark_oak_wood",
-    "stripped_crimson_hyphae",
-    "stripped_warped_hyphae",
-    "stripped_mangrove_wood"
+    "minecraft:stripped_oak_wood",
+    "minecraft:stripped_spruce_wood",
+    "minecraft:stripped_birch_wood",
+    "minecraft:stripped_jungle_wood",
+    "minecraft:stripped_acacia_wood",
+    "minecraft:stripped_dark_oak_wood",
+    "minecraft:stripped_crimson_hyphae",
+    "minecraft:stripped_warped_hyphae",
+    "minecraft:stripped_mangrove_wood"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/blocks/waxed_copper.json b/BoxedDataPack/data/bentobox/tags/blocks/waxed_copper.json
index ac86ead..db058e2 100644
--- a/BoxedDataPack/data/bentobox/tags/blocks/waxed_copper.json
+++ b/BoxedDataPack/data/bentobox/tags/blocks/waxed_copper.json
@@ -1,20 +1,20 @@
 {
   "values": [
-    "waxed_copper_block",
-    "waxed_exposed_copper",
-    "waxed_weathered_copper",
-    "waxed_oxidized_copper",
-    "waxed_cut_copper",
-    "waxed_exposed_cut_copper",
-    "waxed_weathered_cut_copper",
-    "waxed_oxidized_cut_copper",
-    "waxed_cut_copper_stairs",
-    "waxed_exposed_cut_copper_stairs",
-    "waxed_weathered_cut_copper_stairs",
-    "waxed_oxidized_cut_copper_stairs",
-    "waxed_cut_copper_slab",
-    "waxed_exposed_cut_copper_slab",
-    "waxed_weathered_cut_copper_slab",
-    "waxed_oxidized_cut_copper_slab"
+    "minecraft:waxed_copper_block",
+    "minecraft:waxed_exposed_copper",
+    "minecraft:waxed_weathered_copper",
+    "minecraft:waxed_oxidized_copper",
+    "minecraft:waxed_cut_copper",
+    "minecraft:waxed_exposed_cut_copper",
+    "minecraft:waxed_weathered_cut_copper",
+    "minecraft:waxed_oxidized_cut_copper",
+    "minecraft:waxed_cut_copper_stairs",
+    "minecraft:waxed_exposed_cut_copper_stairs",
+    "minecraft:waxed_weathered_cut_copper_stairs",
+    "minecraft:waxed_oxidized_cut_copper_stairs",
+    "minecraft:waxed_cut_copper_slab",
+    "minecraft:waxed_exposed_cut_copper_slab",
+    "minecraft:waxed_weathered_cut_copper_slab",
+    "minecraft:waxed_oxidized_cut_copper_slab"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/animals.json b/BoxedDataPack/data/bentobox/tags/entity_types/animals.json
index 3c98f5e..a41f83e 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/animals.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/animals.json
@@ -1,29 +1,29 @@
 {
   "values": [
-    "#axolotl_hunt_targets",
+    "#minecraft:axolotl_hunt_targets",
     "#bentobox:horses",
     "#bentobox:llamas",
-    "allay",
-    "axolotl",
-    "bat",
-    "bee",
-    "cat",
-    "chicken",
-    "cow",
-    "dolphin",
-    "fox",
-    "frog",
-    "goat",
-    "mooshroom",
-    "ocelot",
-    "panda",
-    "parrot",
-    "pig",
-    "polar_bear",
-    "rabbit",
-    "sheep",
-    "strider",
-    "turtle",
-    "wolf"
+    "minecraft:allay",
+    "minecraft:axolotl",
+    "minecraft:bat",
+    "minecraft:bee",
+    "minecraft:cat",
+    "minecraft:chicken",
+    "minecraft:cow",
+    "minecraft:dolphin",
+    "minecraft:fox",
+    "minecraft:frog",
+    "minecraft:goat",
+    "minecraft:mooshroom",
+    "minecraft:ocelot",
+    "minecraft:panda",
+    "minecraft:parrot",
+    "minecraft:pig",
+    "minecraft:polar_bear",
+    "minecraft:rabbit",
+    "minecraft:sheep",
+    "minecraft:strider",
+    "minecraft:turtle",
+    "minecraft:wolf"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/boats.json b/BoxedDataPack/data/bentobox/tags/entity_types/boats.json
index cab2445..00c1335 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/boats.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/boats.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "boat",
-    "chest_boat"
+    "minecraft:boat",
+    "minecraft:chest_boat"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/fish.json b/BoxedDataPack/data/bentobox/tags/entity_types/fish.json
index 5ad2169..ac1a7b7 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/fish.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/fish.json
@@ -1,8 +1,8 @@
 {
   "values": [
-    "cod",
-    "salmon",
-    "pufferfish",
-    "tropical_fish"
+    "minecraft:cod",
+    "minecraft:salmon",
+    "minecraft:pufferfish",
+    "minecraft:tropical_fish"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/horses.json b/BoxedDataPack/data/bentobox/tags/entity_types/horses.json
index 5e704b7..325b762 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/horses.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/horses.json
@@ -1,9 +1,9 @@
 {
   "values": [
-    "donkey",
-    "horse",
-    "mule",
-    "skeleton_horse",
-    "zombie_horse"
+    "minecraft:donkey",
+    "minecraft:horse",
+    "minecraft:mule",
+    "minecraft:skeleton_horse",
+    "minecraft:zombie_horse"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/hostile.json b/BoxedDataPack/data/bentobox/tags/entity_types/hostile.json
index 854e021..72adeda 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/hostile.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/hostile.json
@@ -1,32 +1,32 @@
 {
   "values": [
-    "#frog_food",
-    "#raiders",
-    "#skeletons",
-    "blaze",
-    "cave_spider",
-    "creeper",
-    "drowned",
-    "elder_guardian",
-    "ender_dragon",
-    "enderman",
-    "endermite",
-    "ghast",
-    "guardian",
-    "hoglin",
-    "husk",
-    "phantom",
-    "piglin",
-    "piglin_brute",
-    "shulker",
-    "silverfish",
-    "spider",
-    "vex",
-    "warden",
-    "wither",
-    "zoglin",
-    "zombie",
-    "zombie_villager",
-    "zombified_piglin"
+    "#minecraft:frog_food",
+    "#minecraft:raiders",
+    "#minecraft:skeletons",
+    "minecraft:blaze",
+    "minecraft:cave_spider",
+    "minecraft:creeper",
+    "minecraft:drowned",
+    "minecraft:elder_guardian",
+    "minecraft:ender_dragon",
+    "minecraft:enderman",
+    "minecraft:endermite",
+    "minecraft:ghast",
+    "minecraft:guardian",
+    "minecraft:hoglin",
+    "minecraft:husk",
+    "minecraft:phantom",
+    "minecraft:piglin",
+    "minecraft:piglin_brute",
+    "minecraft:shulker",
+    "minecraft:silverfish",
+    "minecraft:spider",
+    "minecraft:vex",
+    "minecraft:warden",
+    "minecraft:wither",
+    "minecraft:zoglin",
+    "minecraft:zombie",
+    "minecraft:zombie_villager",
+    "minecraft:zombified_piglin"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/leadable.json b/BoxedDataPack/data/bentobox/tags/entity_types/leadable.json
index 80e1047..2dd535f 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/leadable.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/leadable.json
@@ -1,9 +1,9 @@
 {
   "values": [
     "#bentobox:animals",
-    "hoglin",
-    "iron_golem",
-    "snow_golem",
-    "zoglin"
+    "minecraft:hoglin",
+    "minecraft:iron_golem",
+    "minecraft:snow_golem",
+    "minecraft:zoglin"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/llamas.json b/BoxedDataPack/data/bentobox/tags/entity_types/llamas.json
index dcc2b14..4560fcf 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/llamas.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/llamas.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "llama",
-    "trader_llama"
+    "minecraft:llama",
+    "minecraft:trader_llama"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/entity_types/villagers.json b/BoxedDataPack/data/bentobox/tags/entity_types/villagers.json
index e67df89..bb931d5 100644
--- a/BoxedDataPack/data/bentobox/tags/entity_types/villagers.json
+++ b/BoxedDataPack/data/bentobox/tags/entity_types/villagers.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "villager",
-    "wandering_trader"
+    "minecraft:villager",
+    "minecraft:wandering_trader"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/axes.json b/BoxedDataPack/data/bentobox/tags/items/axes.json
index fb20415..e3b99e0 100644
--- a/BoxedDataPack/data/bentobox/tags/items/axes.json
+++ b/BoxedDataPack/data/bentobox/tags/items/axes.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "wooden_axe",
-    "golden_axe",
-    "stone_axe",
-    "iron_axe",
-    "diamond_axe",
-    "netherite_axe"
+    "minecraft:wooden_axe",
+    "minecraft:golden_axe",
+    "minecraft:stone_axe",
+    "minecraft:iron_axe",
+    "minecraft:diamond_axe",
+    "minecraft:netherite_axe"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/black_dyes.json b/BoxedDataPack/data/bentobox/tags/items/black_dyes.json
index 89137c6..6b7bc42 100644
--- a/BoxedDataPack/data/bentobox/tags/items/black_dyes.json
+++ b/BoxedDataPack/data/bentobox/tags/items/black_dyes.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "black_dye",
-    "ink_sac"
+    "minecraft:black_dye",
+    "minecraft:ink_sac"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/boots.json b/BoxedDataPack/data/bentobox/tags/items/boots.json
index 4bdeda4..5357d18 100644
--- a/BoxedDataPack/data/bentobox/tags/items/boots.json
+++ b/BoxedDataPack/data/bentobox/tags/items/boots.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "leather_boots",
-    "chainmail_boots",
-    "iron_boots",
-    "golden_boots",
-    "diamond_boots",
-    "netherite_boots"
+    "minecraft:leather_boots",
+    "minecraft:chainmail_boots",
+    "minecraft:iron_boots",
+    "minecraft:golden_boots",
+    "minecraft:diamond_boots",
+    "minecraft:netherite_boots"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/bows.json b/BoxedDataPack/data/bentobox/tags/items/bows.json
index 205244e..b8dc1a4 100644
--- a/BoxedDataPack/data/bentobox/tags/items/bows.json
+++ b/BoxedDataPack/data/bentobox/tags/items/bows.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "bow",
-    "crossbow"
+    "minecraft:bow",
+    "minecraft:crossbow"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/chainmail_unlocks.json b/BoxedDataPack/data/bentobox/tags/items/chainmail_unlocks.json
index 23451bb..3368c29 100644
--- a/BoxedDataPack/data/bentobox/tags/items/chainmail_unlocks.json
+++ b/BoxedDataPack/data/bentobox/tags/items/chainmail_unlocks.json
@@ -1,7 +1,7 @@
 {
   "values": [
-    "iron_ingot",
-    "iron_nugget",
-    "chain"
+    "minecraft:iron_ingot",
+    "minecraft:iron_nugget",
+    "minecraft:chain"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/chests_and_barrels.json b/BoxedDataPack/data/bentobox/tags/items/chests_and_barrels.json
index 226041f..722c23a 100644
--- a/BoxedDataPack/data/bentobox/tags/items/chests_and_barrels.json
+++ b/BoxedDataPack/data/bentobox/tags/items/chests_and_barrels.json
@@ -1,7 +1,7 @@
 {
   "values": [
-    "chest",
-    "trapped_chest",
-    "barrel"
+    "minecraft:chest",
+    "minecraft:trapped_chest",
+    "minecraft:barrel"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/chiseled_stone.json b/BoxedDataPack/data/bentobox/tags/items/chiseled_stone.json
index 1f9219a..a092395 100644
--- a/BoxedDataPack/data/bentobox/tags/items/chiseled_stone.json
+++ b/BoxedDataPack/data/bentobox/tags/items/chiseled_stone.json
@@ -1,7 +1,7 @@
 {
   "values": [
-    "chiseled_stone_bricks",
-    "chiseled_polished_blackstone",
-    "chiseled_deepslate"
+    "minecraft:chiseled_stone_bricks",
+    "minecraft:chiseled_polished_blackstone",
+    "minecraft:chiseled_deepslate"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/concrete_powders.json b/BoxedDataPack/data/bentobox/tags/items/concrete_powders.json
index 690371b..3b7cb57 100644
--- a/BoxedDataPack/data/bentobox/tags/items/concrete_powders.json
+++ b/BoxedDataPack/data/bentobox/tags/items/concrete_powders.json
@@ -1,20 +1,20 @@
 {
   "values": [
-    "white_concrete_powder",
-    "orange_concrete_powder",
-    "magenta_concrete_powder",
-    "light_blue_concrete_powder",
-    "yellow_concrete_powder",
-    "lime_concrete_powder",
-    "pink_concrete_powder",
-    "gray_concrete_powder",
-    "light_gray_concrete_powder",
-    "cyan_concrete_powder",
-    "purple_concrete_powder",
-    "blue_concrete_powder",
-    "brown_concrete_powder",
-    "green_concrete_powder",
-    "red_concrete_powder",
-    "black_concrete_powder"
+    "minecraft:white_concrete_powder",
+    "minecraft:orange_concrete_powder",
+    "minecraft:magenta_concrete_powder",
+    "minecraft:light_blue_concrete_powder",
+    "minecraft:yellow_concrete_powder",
+    "minecraft:lime_concrete_powder",
+    "minecraft:pink_concrete_powder",
+    "minecraft:gray_concrete_powder",
+    "minecraft:light_gray_concrete_powder",
+    "minecraft:cyan_concrete_powder",
+    "minecraft:purple_concrete_powder",
+    "minecraft:blue_concrete_powder",
+    "minecraft:brown_concrete_powder",
+    "minecraft:green_concrete_powder",
+    "minecraft:red_concrete_powder",
+    "minecraft:black_concrete_powder"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/cooked_fish.json b/BoxedDataPack/data/bentobox/tags/items/cooked_fish.json
index 7ea3896..5308cd2 100644
--- a/BoxedDataPack/data/bentobox/tags/items/cooked_fish.json
+++ b/BoxedDataPack/data/bentobox/tags/items/cooked_fish.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "cooked_cod",
-    "cooked_salmon"
+    "minecraft:cooked_cod",
+    "minecraft:cooked_salmon"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/copper_ore_pieces.json b/BoxedDataPack/data/bentobox/tags/items/copper_ore_pieces.json
index ad891ca..e7452fc 100644
--- a/BoxedDataPack/data/bentobox/tags/items/copper_ore_pieces.json
+++ b/BoxedDataPack/data/bentobox/tags/items/copper_ore_pieces.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "copper_ingot",
-    "raw_copper"
+    "minecraft:copper_ingot",
+    "minecraft:raw_copper"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/copper_stage_0.json b/BoxedDataPack/data/bentobox/tags/items/copper_stage_0.json
index a7ad8a7..aa39f75 100644
--- a/BoxedDataPack/data/bentobox/tags/items/copper_stage_0.json
+++ b/BoxedDataPack/data/bentobox/tags/items/copper_stage_0.json
@@ -1,12 +1,12 @@
 {
   "values": [
-    "copper_block",
-    "waxed_copper_block",
-    "cut_copper",
-    "waxed_cut_copper",
-    "cut_copper_stairs",
-    "waxed_cut_copper_stairs",
-    "cut_copper_slab",
-    "waxed_cut_copper_slab"
+    "minecraft:copper_block",
+    "minecraft:waxed_copper_block",
+    "minecraft:cut_copper",
+    "minecraft:waxed_cut_copper",
+    "minecraft:cut_copper_stairs",
+    "minecraft:waxed_cut_copper_stairs",
+    "minecraft:cut_copper_slab",
+    "minecraft:waxed_cut_copper_slab"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/coral_blocks.json b/BoxedDataPack/data/bentobox/tags/items/coral_blocks.json
index eb654a8..df46269 100644
--- a/BoxedDataPack/data/bentobox/tags/items/coral_blocks.json
+++ b/BoxedDataPack/data/bentobox/tags/items/coral_blocks.json
@@ -1,9 +1,9 @@
 {
   "values": [
-    "tube_coral_block",
-    "brain_coral_block",
-    "bubble_coral_block",
-    "fire_coral_block",
-    "horn_coral_block"
+    "minecraft:tube_coral_block",
+    "minecraft:brain_coral_block",
+    "minecraft:bubble_coral_block",
+    "minecraft:fire_coral_block",
+    "minecraft:horn_coral_block"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/coral_fans.json b/BoxedDataPack/data/bentobox/tags/items/coral_fans.json
index 7306bbc..3800370 100644
--- a/BoxedDataPack/data/bentobox/tags/items/coral_fans.json
+++ b/BoxedDataPack/data/bentobox/tags/items/coral_fans.json
@@ -1,9 +1,9 @@
 {
   "values": [
-    "tube_coral_fan",
-    "brain_coral_fan",
-    "bubble_coral_fan",
-    "fire_coral_fan",
-    "horn_coral_fan"
+    "minecraft:tube_coral_fan",
+    "minecraft:brain_coral_fan",
+    "minecraft:bubble_coral_fan",
+    "minecraft:fire_coral_fan",
+    "minecraft:horn_coral_fan"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/corals.json b/BoxedDataPack/data/bentobox/tags/items/corals.json
index eb3f125..ac9f5b1 100644
--- a/BoxedDataPack/data/bentobox/tags/items/corals.json
+++ b/BoxedDataPack/data/bentobox/tags/items/corals.json
@@ -1,9 +1,9 @@
 {
   "values": [
-    "tube_coral",
-    "brain_coral",
-    "bubble_coral",
-    "fire_coral",
-    "horn_coral"
+    "minecraft:tube_coral",
+    "minecraft:brain_coral",
+    "minecraft:bubble_coral",
+    "minecraft:fire_coral",
+    "minecraft:horn_coral"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/creeper_heads.json b/BoxedDataPack/data/bentobox/tags/items/creeper_heads.json
index 608d6c0..c790620 100644
--- a/BoxedDataPack/data/bentobox/tags/items/creeper_heads.json
+++ b/BoxedDataPack/data/bentobox/tags/items/creeper_heads.json
@@ -1,7 +1,7 @@
 {
   "values": [
-    "skeleton_skull",
-    "zombie_head",
-    "creeper_head"
+    "minecraft:skeleton_skull",
+    "minecraft:zombie_head",
+    "minecraft:creeper_head"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/cut_copper_slab.json b/BoxedDataPack/data/bentobox/tags/items/cut_copper_slab.json
index 3535457..7fab395 100644
--- a/BoxedDataPack/data/bentobox/tags/items/cut_copper_slab.json
+++ b/BoxedDataPack/data/bentobox/tags/items/cut_copper_slab.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "cut_copper_slab",
-    "waxed_cut_copper_slab"
+    "minecraft:cut_copper_slab",
+    "minecraft:waxed_cut_copper_slab"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/cut_copper_stairs.json b/BoxedDataPack/data/bentobox/tags/items/cut_copper_stairs.json
index 2f2c02e..3c3d63a 100644
--- a/BoxedDataPack/data/bentobox/tags/items/cut_copper_stairs.json
+++ b/BoxedDataPack/data/bentobox/tags/items/cut_copper_stairs.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "cut_copper_stairs",
-    "waxed_cut_copper_stairs"
+    "minecraft:cut_copper_stairs",
+    "minecraft:waxed_cut_copper_stairs"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/dead_corals.json b/BoxedDataPack/data/bentobox/tags/items/dead_corals.json
index f69c59c..72f96c2 100644
--- a/BoxedDataPack/data/bentobox/tags/items/dead_corals.json
+++ b/BoxedDataPack/data/bentobox/tags/items/dead_corals.json
@@ -1,19 +1,19 @@
 {
   "values": [
-    "dead_tube_coral",
-    "dead_brain_coral",
-    "dead_bubble_coral",
-    "dead_fire_coral",
-    "dead_horn_coral",
-    "dead_tube_coral_fan",
-    "dead_brain_coral_fan",
-    "dead_bubble_coral_fan",
-    "dead_fire_coral_fan",
-    "dead_horn_coral_fan",
-    "dead_tube_coral_block",
-    "dead_brain_coral_block",
-    "dead_bubble_coral_block",
-    "dead_fire_coral_block",
-    "dead_horn_coral_block"
+    "minecraft:dead_tube_coral",
+    "minecraft:dead_brain_coral",
+    "minecraft:dead_bubble_coral",
+    "minecraft:dead_fire_coral",
+    "minecraft:dead_horn_coral",
+    "minecraft:dead_tube_coral_fan",
+    "minecraft:dead_brain_coral_fan",
+    "minecraft:dead_bubble_coral_fan",
+    "minecraft:dead_fire_coral_fan",
+    "minecraft:dead_horn_coral_fan",
+    "minecraft:dead_tube_coral_block",
+    "minecraft:dead_brain_coral_block",
+    "minecraft:dead_bubble_coral_block",
+    "minecraft:dead_fire_coral_block",
+    "minecraft:dead_horn_coral_block"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/dyes.json b/BoxedDataPack/data/bentobox/tags/items/dyes.json
index 888b65a..488543b 100644
--- a/BoxedDataPack/data/bentobox/tags/items/dyes.json
+++ b/BoxedDataPack/data/bentobox/tags/items/dyes.json
@@ -1,20 +1,20 @@
 {
   "values": [
-    "red_dye",
-    "green_dye",
-    "purple_dye",
-    "cyan_dye",
-    "light_gray_dye",
-    "gray_dye",
-    "pink_dye",
-    "lime_dye",
-    "yellow_dye",
-    "light_blue_dye",
-    "magenta_dye",
-    "orange_dye",
-    "blue_dye",
-    "brown_dye",
-    "black_dye",
-    "white_dye"
+    "minecraft:red_dye",
+    "minecraft:green_dye",
+    "minecraft:purple_dye",
+    "minecraft:cyan_dye",
+    "minecraft:light_gray_dye",
+    "minecraft:gray_dye",
+    "minecraft:pink_dye",
+    "minecraft:lime_dye",
+    "minecraft:yellow_dye",
+    "minecraft:light_blue_dye",
+    "minecraft:magenta_dye",
+    "minecraft:orange_dye",
+    "minecraft:blue_dye",
+    "minecraft:brown_dye",
+    "minecraft:black_dye",
+    "minecraft:white_dye"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_slab.json b/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_slab.json
index 300e680..453efb1 100644
--- a/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_slab.json
+++ b/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_slab.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "exposed_cut_copper_slab",
-    "waxed_exposed_cut_copper_slab"
+    "minecraft:exposed_cut_copper_slab",
+    "minecraft:waxed_exposed_cut_copper_slab"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_stairs.json b/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_stairs.json
index 598770b..938bf6d 100644
--- a/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_stairs.json
+++ b/BoxedDataPack/data/bentobox/tags/items/exposed_cut_copper_stairs.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "exposed_cut_copper_stairs",
-    "waxed_exposed_cut_copper_stairs"
+    "minecraft:exposed_cut_copper_stairs",
+    "minecraft:waxed_exposed_cut_copper_stairs"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/fish_buckets.json b/BoxedDataPack/data/bentobox/tags/items/fish_buckets.json
index f640c02..dafc9dc 100644
--- a/BoxedDataPack/data/bentobox/tags/items/fish_buckets.json
+++ b/BoxedDataPack/data/bentobox/tags/items/fish_buckets.json
@@ -1,8 +1,8 @@
 {
   "values": [
-    "cod_bucket",
-    "salmon_bucket",
-    "pufferfish_bucket",
-    "tropical_fish_bucket"
+    "minecraft:cod_bucket",
+    "minecraft:salmon_bucket",
+    "minecraft:pufferfish_bucket",
+    "minecraft:tropical_fish_bucket"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/fungi.json b/BoxedDataPack/data/bentobox/tags/items/fungi.json
index 5d3dec9..248166d 100644
--- a/BoxedDataPack/data/bentobox/tags/items/fungi.json
+++ b/BoxedDataPack/data/bentobox/tags/items/fungi.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "crimson_fungus",
-    "warped_fungus"
+    "minecraft:crimson_fungus",
+    "minecraft:warped_fungus"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/glasses.json b/BoxedDataPack/data/bentobox/tags/items/glasses.json
index ebef4d9..5404d4b 100644
--- a/BoxedDataPack/data/bentobox/tags/items/glasses.json
+++ b/BoxedDataPack/data/bentobox/tags/items/glasses.json
@@ -1,21 +1,21 @@
 {
   "values": [
-    "glass",
-    "white_stained_glass",
-    "orange_stained_glass",
-    "magenta_stained_glass",
-    "light_blue_stained_glass",
-    "yellow_stained_glass",
-    "lime_stained_glass",
-    "pink_stained_glass",
-    "gray_stained_glass",
-    "light_gray_stained_glass",
-    "cyan_stained_glass",
-    "purple_stained_glass",
-    "blue_stained_glass",
-    "brown_stained_glass",
-    "green_stained_glass",
-    "red_stained_glass",
-    "black_stained_glass"
+    "minecraft:glass",
+    "minecraft:white_stained_glass",
+    "minecraft:orange_stained_glass",
+    "minecraft:magenta_stained_glass",
+    "minecraft:light_blue_stained_glass",
+    "minecraft:yellow_stained_glass",
+    "minecraft:lime_stained_glass",
+    "minecraft:pink_stained_glass",
+    "minecraft:gray_stained_glass",
+    "minecraft:light_gray_stained_glass",
+    "minecraft:cyan_stained_glass",
+    "minecraft:purple_stained_glass",
+    "minecraft:blue_stained_glass",
+    "minecraft:brown_stained_glass",
+    "minecraft:green_stained_glass",
+    "minecraft:red_stained_glass",
+    "minecraft:black_stained_glass"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/gold_nugget_sources.json b/BoxedDataPack/data/bentobox/tags/items/gold_nugget_sources.json
index 21be1bf..1bb0b9b 100644
--- a/BoxedDataPack/data/bentobox/tags/items/gold_nugget_sources.json
+++ b/BoxedDataPack/data/bentobox/tags/items/gold_nugget_sources.json
@@ -1,15 +1,15 @@
 {
   "values": [
-    "golden_pickaxe",
-    "golden_shovel",
-    "golden_axe",
-    "golden_hoe",
-    "golden_sword",
-    "golden_helmet",
-    "golden_chestplate",
-    "golden_leggings",
-    "golden_boots",
-    "golden_horse_armor",
-    "light_weighted_pressure_plate"
+    "minecraft:golden_pickaxe",
+    "minecraft:golden_shovel",
+    "minecraft:golden_axe",
+    "minecraft:golden_hoe",
+    "minecraft:golden_sword",
+    "minecraft:golden_helmet",
+    "minecraft:golden_chestplate",
+    "minecraft:golden_leggings",
+    "minecraft:golden_boots",
+    "minecraft:golden_horse_armor",
+    "minecraft:light_weighted_pressure_plate"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/gold_ore_pieces.json b/BoxedDataPack/data/bentobox/tags/items/gold_ore_pieces.json
index 883efb9..af03fbf 100644
--- a/BoxedDataPack/data/bentobox/tags/items/gold_ore_pieces.json
+++ b/BoxedDataPack/data/bentobox/tags/items/gold_ore_pieces.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "gold_ingot",
-    "raw_gold"
+    "minecraft:gold_ingot",
+    "minecraft:raw_gold"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/heads.json b/BoxedDataPack/data/bentobox/tags/items/heads.json
index 6c726bf..79485d8 100644
--- a/BoxedDataPack/data/bentobox/tags/items/heads.json
+++ b/BoxedDataPack/data/bentobox/tags/items/heads.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "skeleton_skull",
-    "wither_skeleton_skull",
-    "player_head",
-    "zombie_head",
-    "creeper_head",
-    "dragon_head"
+    "minecraft:skeleton_skull",
+    "minecraft:wither_skeleton_skull",
+    "minecraft:player_head",
+    "minecraft:zombie_head",
+    "minecraft:creeper_head",
+    "minecraft:dragon_head"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/hoes.json b/BoxedDataPack/data/bentobox/tags/items/hoes.json
index 040e5bf..9dc3890 100644
--- a/BoxedDataPack/data/bentobox/tags/items/hoes.json
+++ b/BoxedDataPack/data/bentobox/tags/items/hoes.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "wooden_hoe",
-    "golden_hoe",
-    "stone_hoe",
-    "iron_hoe",
-    "diamond_hoe",
-    "netherite_hoe"
+    "minecraft:wooden_hoe",
+    "minecraft:golden_hoe",
+    "minecraft:stone_hoe",
+    "minecraft:iron_hoe",
+    "minecraft:diamond_hoe",
+    "minecraft:netherite_hoe"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/horse_armors.json b/BoxedDataPack/data/bentobox/tags/items/horse_armors.json
index ac44bbf..46d7373 100644
--- a/BoxedDataPack/data/bentobox/tags/items/horse_armors.json
+++ b/BoxedDataPack/data/bentobox/tags/items/horse_armors.json
@@ -1,8 +1,8 @@
 {
   "values": [
-    "leather_horse_armor",
-    "iron_horse_armor",
-    "golden_horse_armor",
-    "diamond_horse_armor"
+    "minecraft:leather_horse_armor",
+    "minecraft:iron_horse_armor",
+    "minecraft:golden_horse_armor",
+    "minecraft:diamond_horse_armor"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/ices.json b/BoxedDataPack/data/bentobox/tags/items/ices.json
index 0f9c8f6..0ad9feb 100644
--- a/BoxedDataPack/data/bentobox/tags/items/ices.json
+++ b/BoxedDataPack/data/bentobox/tags/items/ices.json
@@ -1,7 +1,7 @@
 {
   "values": [
-    "ice",
-    "packed_ice",
-    "blue_ice"
+    "minecraft:ice",
+    "minecraft:packed_ice",
+    "minecraft:blue_ice"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/iron_armor.json b/BoxedDataPack/data/bentobox/tags/items/iron_armor.json
index 87d4c57..e909ac6 100644
--- a/BoxedDataPack/data/bentobox/tags/items/iron_armor.json
+++ b/BoxedDataPack/data/bentobox/tags/items/iron_armor.json
@@ -1,8 +1,8 @@
 {
   "values": [
-    "iron_helmet",
-    "iron_chestplate",
-    "iron_leggings",
-    "iron_boots"
+    "minecraft:iron_helmet",
+    "minecraft:iron_chestplate",
+    "minecraft:iron_leggings",
+    "minecraft:iron_boots"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/iron_nugget_sources.json b/BoxedDataPack/data/bentobox/tags/items/iron_nugget_sources.json
index 5d8b3d6..3eec5cb 100644
--- a/BoxedDataPack/data/bentobox/tags/items/iron_nugget_sources.json
+++ b/BoxedDataPack/data/bentobox/tags/items/iron_nugget_sources.json
@@ -1,27 +1,27 @@
 {
   "values": [
     "#bentobox:iron_armor",
-    "iron_pickaxe",
-    "iron_shovel",
-    "iron_axe",
-    "iron_hoe",
-    "iron_sword",
-    "iron_horse_armor",
-    "chainmail_helmet",
-    "chainmail_chestplate",
-    "chainmail_leggings",
-    "chainmail_boots",
-    "bucket",
-    "cauldron",
-    "heavy_weighted_pressure_plate",
-    "iron_trapdoor",
-    "iron_door",
-    "minecart",
-    "shears",
-    "hopper",
-    "shield",
-    "smithing_table",
-    "tripwire_hook",
-    "chain"
+    "minecraft:iron_pickaxe",
+    "minecraft:iron_shovel",
+    "minecraft:iron_axe",
+    "minecraft:iron_hoe",
+    "minecraft:iron_sword",
+    "minecraft:iron_horse_armor",
+    "minecraft:chainmail_helmet",
+    "minecraft:chainmail_chestplate",
+    "minecraft:chainmail_leggings",
+    "minecraft:chainmail_boots",
+    "minecraft:bucket",
+    "minecraft:cauldron",
+    "minecraft:heavy_weighted_pressure_plate",
+    "minecraft:iron_trapdoor",
+    "minecraft:iron_door",
+    "minecraft:minecart",
+    "minecraft:shears",
+    "minecraft:hopper",
+    "minecraft:shield",
+    "minecraft:smithing_table",
+    "minecraft:tripwire_hook",
+    "minecraft:chain"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/iron_ore_pieces.json b/BoxedDataPack/data/bentobox/tags/items/iron_ore_pieces.json
index e586167..17f30f9 100644
--- a/BoxedDataPack/data/bentobox/tags/items/iron_ore_pieces.json
+++ b/BoxedDataPack/data/bentobox/tags/items/iron_ore_pieces.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "iron_ingot",
-    "raw_iron"
+    "minecraft:iron_ingot",
+    "minecraft:raw_iron"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/lanterns.json b/BoxedDataPack/data/bentobox/tags/items/lanterns.json
index 9701549..5ef597c 100644
--- a/BoxedDataPack/data/bentobox/tags/items/lanterns.json
+++ b/BoxedDataPack/data/bentobox/tags/items/lanterns.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "lantern",
-    "soul_lantern"
+    "minecraft:lantern",
+    "minecraft:soul_lantern"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/leggings.json b/BoxedDataPack/data/bentobox/tags/items/leggings.json
index 44188e4..3211dde 100644
--- a/BoxedDataPack/data/bentobox/tags/items/leggings.json
+++ b/BoxedDataPack/data/bentobox/tags/items/leggings.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "leather_leggings",
-    "chainmail_leggings",
-    "iron_leggings",
-    "golden_leggings",
-    "diamond_leggings",
-    "netherite_leggings"
+    "minecraft:leather_leggings",
+    "minecraft:chainmail_leggings",
+    "minecraft:iron_leggings",
+    "minecraft:golden_leggings",
+    "minecraft:diamond_leggings",
+    "minecraft:netherite_leggings"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/mushroom_blocks.json b/BoxedDataPack/data/bentobox/tags/items/mushroom_blocks.json
index d18a7d0..05b1c3d 100644
--- a/BoxedDataPack/data/bentobox/tags/items/mushroom_blocks.json
+++ b/BoxedDataPack/data/bentobox/tags/items/mushroom_blocks.json
@@ -1,7 +1,7 @@
 {
   "values": [
-    "brown_mushroom_block",
-    "red_mushroom_block",
-    "mushroom_stem"
+    "minecraft:brown_mushroom_block",
+    "minecraft:red_mushroom_block",
+    "minecraft:mushroom_stem"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/netherite_gear.json b/BoxedDataPack/data/bentobox/tags/items/netherite_gear.json
index b16357d..4d7202c 100644
--- a/BoxedDataPack/data/bentobox/tags/items/netherite_gear.json
+++ b/BoxedDataPack/data/bentobox/tags/items/netherite_gear.json
@@ -1,13 +1,13 @@
 {
   "values": [
-    "netherite_axe",
-    "netherite_hoe",
-    "netherite_pickaxe",
-    "netherite_shovel",
-    "netherite_sword",
-    "netherite_helmet",
-    "netherite_chestplate",
-    "netherite_leggings",
-    "netherite_boots"
+    "minecraft:netherite_axe",
+    "minecraft:netherite_hoe",
+    "minecraft:netherite_pickaxe",
+    "minecraft:netherite_shovel",
+    "minecraft:netherite_sword",
+    "minecraft:netherite_helmet",
+    "minecraft:netherite_chestplate",
+    "minecraft:netherite_leggings",
+    "minecraft:netherite_boots"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/normal_logs.json b/BoxedDataPack/data/bentobox/tags/items/normal_logs.json
index b55a963..b1d0de7 100644
--- a/BoxedDataPack/data/bentobox/tags/items/normal_logs.json
+++ b/BoxedDataPack/data/bentobox/tags/items/normal_logs.json
@@ -1,13 +1,15 @@
 {
   "values": [
-    "oak_log",
-    "birch_log",
-    "spruce_log",
-    "jungle_log",
-    "acacia_log",
-    "dark_oak_log",
-    "mangrove_log",
-    "crimson_stem",
-    "warped_stem"
+    "minecraft:oak_log",
+    "minecraft:birch_log",
+    "minecraft:spruce_log",
+    "minecraft:jungle_log",
+    "minecraft:acacia_log",
+    "minecraft:dark_oak_log",
+    "minecraft:mangrove_log",
+    "minecraft:crimson_stem",
+    "minecraft:warped_stem",
+    "minecraft:cherry_log",
+    "minecraft:bamboo_block"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/overworld_gold_ores.json b/BoxedDataPack/data/bentobox/tags/items/overworld_gold_ores.json
index 5d9b8a6..f0fd020 100644
--- a/BoxedDataPack/data/bentobox/tags/items/overworld_gold_ores.json
+++ b/BoxedDataPack/data/bentobox/tags/items/overworld_gold_ores.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "gold_ore",
-    "deepslate_gold_ore"
+    "minecraft:gold_ore",
+    "minecraft:deepslate_gold_ore"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/oxidized_copper.json b/BoxedDataPack/data/bentobox/tags/items/oxidized_copper.json
index f5b5e7f..69af730 100644
--- a/BoxedDataPack/data/bentobox/tags/items/oxidized_copper.json
+++ b/BoxedDataPack/data/bentobox/tags/items/oxidized_copper.json
@@ -2,9 +2,9 @@
   "values": [
     "#bentobox:oxidized_cut_copper_slab",
     "#bentobox:oxidized_cut_copper_stairs",
-    "oxidized_copper",
-    "oxidized_cut_copper",
-    "waxed_oxidized_copper",
-    "waxed_oxidized_cut_copper"
+    "minecraft:oxidized_copper",
+    "minecraft:oxidized_cut_copper",
+    "minecraft:waxed_oxidized_copper",
+    "minecraft:waxed_oxidized_cut_copper"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_slab.json b/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_slab.json
index 6a91f84..37623de 100644
--- a/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_slab.json
+++ b/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_slab.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "oxidized_cut_copper_slab",
-    "waxed_oxidized_cut_copper_slab"
+    "minecraft:oxidized_cut_copper_slab",
+    "minecraft:waxed_oxidized_cut_copper_slab"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_stairs.json b/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_stairs.json
index 6dd6433..8ce69b0 100644
--- a/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_stairs.json
+++ b/BoxedDataPack/data/bentobox/tags/items/oxidized_cut_copper_stairs.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "oxidized_cut_copper_stairs",
-    "waxed_oxidized_cut_copper_stairs"
+    "minecraft:oxidized_cut_copper_stairs",
+    "minecraft:waxed_oxidized_cut_copper_stairs"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/seeds.json b/BoxedDataPack/data/bentobox/tags/items/seeds.json
index 33e41cf..11e1291 100644
--- a/BoxedDataPack/data/bentobox/tags/items/seeds.json
+++ b/BoxedDataPack/data/bentobox/tags/items/seeds.json
@@ -1,8 +1,8 @@
 {
   "values": [
-    "wheat_seeds",
-    "pumpkin_seeds",
-    "melon_seeds",
-    "beetroot_seeds"
+    "minecraft:wheat_seeds",
+    "minecraft:pumpkin_seeds",
+    "minecraft:melon_seeds",
+    "minecraft:beetroot_seeds"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/shovels.json b/BoxedDataPack/data/bentobox/tags/items/shovels.json
index 657880f..3beb7b5 100644
--- a/BoxedDataPack/data/bentobox/tags/items/shovels.json
+++ b/BoxedDataPack/data/bentobox/tags/items/shovels.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "wooden_shovel",
-    "golden_shovel",
-    "stone_shovel",
-    "iron_shovel",
-    "diamond_shovel",
-    "netherite_shovel"
+    "minecraft:wooden_shovel",
+    "minecraft:golden_shovel",
+    "minecraft:stone_shovel",
+    "minecraft:iron_shovel",
+    "minecraft:diamond_shovel",
+    "minecraft:netherite_shovel"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/shulker_boxes.json b/BoxedDataPack/data/bentobox/tags/items/shulker_boxes.json
index 476688b..736908f 100644
--- a/BoxedDataPack/data/bentobox/tags/items/shulker_boxes.json
+++ b/BoxedDataPack/data/bentobox/tags/items/shulker_boxes.json
@@ -1,21 +1,21 @@
 {
   "values": [
-    "shulker_box",
-    "white_shulker_box",
-    "orange_shulker_box",
-    "magenta_shulker_box",
-    "light_blue_shulker_box",
-    "yellow_shulker_box",
-    "lime_shulker_box",
-    "pink_shulker_box",
-    "gray_shulker_box",
-    "light_gray_shulker_box",
-    "cyan_shulker_box",
-    "purple_shulker_box",
-    "blue_shulker_box",
-    "brown_shulker_box",
-    "green_shulker_box",
-    "red_shulker_box",
-    "black_shulker_box"
+    "minecraft:shulker_box",
+    "minecraft:white_shulker_box",
+    "minecraft:orange_shulker_box",
+    "minecraft:magenta_shulker_box",
+    "minecraft:light_blue_shulker_box",
+    "minecraft:yellow_shulker_box",
+    "minecraft:lime_shulker_box",
+    "minecraft:pink_shulker_box",
+    "minecraft:gray_shulker_box",
+    "minecraft:light_gray_shulker_box",
+    "minecraft:cyan_shulker_box",
+    "minecraft:purple_shulker_box",
+    "minecraft:blue_shulker_box",
+    "minecraft:brown_shulker_box",
+    "minecraft:green_shulker_box",
+    "minecraft:red_shulker_box",
+    "minecraft:black_shulker_box"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/swords.json b/BoxedDataPack/data/bentobox/tags/items/swords.json
index 2a85dda..5473ed8 100644
--- a/BoxedDataPack/data/bentobox/tags/items/swords.json
+++ b/BoxedDataPack/data/bentobox/tags/items/swords.json
@@ -1,10 +1,10 @@
 {
   "values": [
-    "wooden_sword",
-    "golden_sword",
-    "stone_sword",
-    "iron_sword",
-    "diamond_sword",
-    "netherite_sword"
+    "minecraft:wooden_sword",
+    "minecraft:golden_sword",
+    "minecraft:stone_sword",
+    "minecraft:iron_sword",
+    "minecraft:diamond_sword",
+    "minecraft:netherite_sword"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/torches.json b/BoxedDataPack/data/bentobox/tags/items/torches.json
index a9b9bde..4ccb031 100644
--- a/BoxedDataPack/data/bentobox/tags/items/torches.json
+++ b/BoxedDataPack/data/bentobox/tags/items/torches.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "torch",
-    "soul_torch"
+    "minecraft:torch",
+    "minecraft:soul_torch"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/uncooked_meats.json b/BoxedDataPack/data/bentobox/tags/items/uncooked_meats.json
index 09e6ec0..495c296 100644
--- a/BoxedDataPack/data/bentobox/tags/items/uncooked_meats.json
+++ b/BoxedDataPack/data/bentobox/tags/items/uncooked_meats.json
@@ -1,9 +1,9 @@
 {
   "values": [
-    "porkchop",
-    "beef",
-    "chicken",
-    "rabbit",
-    "mutton"
+    "minecraft:porkchop",
+    "minecraft:beef",
+    "minecraft:chicken",
+    "minecraft:rabbit",
+    "minecraft:mutton"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_slab.json b/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_slab.json
index 46e38a0..2c0071f 100644
--- a/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_slab.json
+++ b/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_slab.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "weathered_cut_copper_slab",
-    "waxed_weathered_cut_copper_slab"
+    "minecraft:weathered_cut_copper_slab",
+    "minecraft:waxed_weathered_cut_copper_slab"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_stairs.json b/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_stairs.json
index 497bbca..94119c7 100644
--- a/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_stairs.json
+++ b/BoxedDataPack/data/bentobox/tags/items/weathered_cut_copper_stairs.json
@@ -1,6 +1,6 @@
 {
   "values": [
-    "weathered_cut_copper_stairs",
-    "waxed_weathered_cut_copper_stairs"
+    "minecraft:weathered_cut_copper_stairs",
+    "minecraft:waxed_weathered_cut_copper_stairs"
   ]
 }
diff --git a/BoxedDataPack/data/bentobox/tags/items/woods.json b/BoxedDataPack/data/bentobox/tags/items/woods.json
index 0d1be82..9934246 100644
--- a/BoxedDataPack/data/bentobox/tags/items/woods.json
+++ b/BoxedDataPack/data/bentobox/tags/items/woods.json
@@ -1,13 +1,14 @@
 {
   "values": [
-    "oak_wood",
-    "spruce_wood",
-    "birch_wood",
-    "jungle_wood",
-    "acacia_wood",
-    "dark_oak_wood",
-    "crimson_hyphae",
-    "warped_hyphae",
-    "mangrove_wood"
+    "minecraft:oak_wood",
+    "minecraft:spruce_wood",
+    "minecraft:birch_wood",
+    "minecraft:jungle_wood",
+    "minecraft:acacia_wood",
+    "minecraft:dark_oak_wood",
+    "minecraft:crimson_hyphae",
+    "minecraft:warped_hyphae",
+    "minecraft:mangrove_wood",
+    "minecraft:cherry_wood"
   ]
 }
diff --git a/BoxedDataPack/data/minecraft/advancements/husbandry/silk_touch_nest.json b/BoxedDataPack/data/minecraft/advancements/husbandry/silk_touch_nest.json
index a247087..047206b 100644
--- a/BoxedDataPack/data/minecraft/advancements/husbandry/silk_touch_nest.json
+++ b/BoxedDataPack/data/minecraft/advancements/husbandry/silk_touch_nest.json
@@ -16,7 +16,7 @@
         "item": {
           "enchantments": [
             {
-              "enchantment": "silk_touch",
+              "enchantment": "minecraft:silk_touch",
               "levels": {
                 "min": 1
               }
diff --git a/BoxedDataPack/data/minecraft/advancements/nether/soul_speed.json b/BoxedDataPack/data/minecraft/advancements/nether/soul_speed.json
index ab97bc5..3f97b94 100644
--- a/BoxedDataPack/data/minecraft/advancements/nether/soul_speed.json
+++ b/BoxedDataPack/data/minecraft/advancements/nether/soul_speed.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "golden_boots",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Soul Assistance",
     "description": "Wear down your soles with Soul Speed",
@@ -24,7 +24,7 @@
               "tag": "bentobox:boots",
               "enchantments": [
                 {
-                  "enchantment": "soul_speed"
+                  "enchantment": "minecraft:soul_speed"
                 }
               ]
             }
diff --git a/BoxedDataPack/data/minecraft/advancements/story/all_enchantments.json b/BoxedDataPack/data/minecraft/advancements/story/all_enchantments.json
index 6b03279..0040e6b 100644
--- a/BoxedDataPack/data/minecraft/advancements/story/all_enchantments.json
+++ b/BoxedDataPack/data/minecraft/advancements/story/all_enchantments.json
@@ -19,7 +19,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "aqua_affinity"
+                "enchantment": "minecraft:aqua_affinity"
               }
             ]
           }
@@ -33,7 +33,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "bane_of_arthropods"
+                "enchantment": "minecraft:bane_of_arthropods"
               }
             ]
           }
@@ -47,7 +47,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "binding_curse"
+                "enchantment": "minecraft:binding_curse"
               }
             ]
           }
@@ -61,7 +61,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "blast_protection"
+                "enchantment": "minecraft:blast_protection"
               }
             ]
           }
@@ -75,7 +75,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "channeling"
+                "enchantment": "minecraft:channeling"
               }
             ]
           }
@@ -89,7 +89,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "depth_strider"
+                "enchantment": "minecraft:depth_strider"
               }
             ]
           }
@@ -103,7 +103,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "efficiency"
+                "enchantment": "minecraft:efficiency"
               }
             ]
           }
@@ -117,7 +117,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "feather_falling"
+                "enchantment": "minecraft:feather_falling"
               }
             ]
           }
@@ -131,7 +131,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "fire_aspect"
+                "enchantment": "minecraft:fire_aspect"
               }
             ]
           }
@@ -145,7 +145,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "fire_protection"
+                "enchantment": "minecraft:fire_protection"
               }
             ]
           }
@@ -159,7 +159,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "flame"
+                "enchantment": "minecraft:flame"
               }
             ]
           }
@@ -173,7 +173,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "fortune"
+                "enchantment": "minecraft:fortune"
               }
             ]
           }
@@ -187,7 +187,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "frost_walker"
+                "enchantment": "minecraft:frost_walker"
               }
             ]
           }
@@ -201,7 +201,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "impaling"
+                "enchantment": "minecraft:impaling"
               }
             ]
           }
@@ -215,7 +215,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "infinity"
+                "enchantment": "minecraft:infinity"
               }
             ]
           }
@@ -229,7 +229,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "knockback"
+                "enchantment": "minecraft:knockback"
               }
             ]
           }
@@ -243,7 +243,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "looting"
+                "enchantment": "minecraft:looting"
               }
             ]
           }
@@ -257,7 +257,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "loyalty"
+                "enchantment": "minecraft:loyalty"
               }
             ]
           }
@@ -271,7 +271,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "luck_of_the_sea"
+                "enchantment": "minecraft:luck_of_the_sea"
               }
             ]
           }
@@ -285,7 +285,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "lure"
+                "enchantment": "minecraft:lure"
               }
             ]
           }
@@ -299,7 +299,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "mending"
+                "enchantment": "minecraft:mending"
               }
             ]
           }
@@ -313,7 +313,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "multishot"
+                "enchantment": "minecraft:multishot"
               }
             ]
           }
@@ -327,7 +327,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "piercing"
+                "enchantment": "minecraft:piercing"
               }
             ]
           }
@@ -341,7 +341,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "power"
+                "enchantment": "minecraft:power"
               }
             ]
           }
@@ -355,7 +355,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "projectile_protection"
+                "enchantment": "minecraft:projectile_protection"
               }
             ]
           }
@@ -369,7 +369,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "protection"
+                "enchantment": "minecraft:protection"
               }
             ]
           }
@@ -383,7 +383,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "punch"
+                "enchantment": "minecraft:punch"
               }
             ]
           }
@@ -397,7 +397,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "quick_charge"
+                "enchantment": "minecraft:quick_charge"
               }
             ]
           }
@@ -411,7 +411,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "respiration"
+                "enchantment": "minecraft:respiration"
               }
             ]
           }
@@ -425,7 +425,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "riptide"
+                "enchantment": "minecraft:riptide"
               }
             ]
           }
@@ -439,7 +439,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "sharpness"
+                "enchantment": "minecraft:sharpness"
               }
             ]
           }
@@ -453,7 +453,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "silk_touch"
+                "enchantment": "minecraft:silk_touch"
               }
             ]
           }
@@ -467,7 +467,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "smite"
+                "enchantment": "minecraft:smite"
               }
             ]
           }
@@ -481,21 +481,21 @@
           {
             "enchantments": [
               {
-                "enchantment": "soul_speed"
+                "enchantment": "minecraft:soul_speed"
               }
             ]
           }
         ]
       }
     },
-    "sweeping": {
+    "sweeping_edge": {
       "trigger": "inventory_changed",
       "conditions": {
         "items": [
           {
             "enchantments": [
               {
-                "enchantment": "sweeping"
+                "enchantment": "minecraft:sweeping_edge"
               }
             ]
           }
@@ -509,7 +509,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "swift_sneak"
+                "enchantment": "minecraft:swift_sneak"
               }
             ]
           }
@@ -523,7 +523,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "thorns"
+                "enchantment": "minecraft:thorns"
               }
             ]
           }
@@ -537,7 +537,7 @@
           {
             "enchantments": [
               {
-                "enchantment": "unbreaking"
+                "enchantment": "minecraft:unbreaking"
               }
             ]
           }
@@ -551,7 +551,49 @@
           {
             "enchantments": [
               {
-                "enchantment": "vanishing_curse"
+                "enchantment": "minecraft:vanishing_curse"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "wind_burst": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:wind_burst"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "breach": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:breach"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "density": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "enchantments": [
+              {
+                "enchantment": "minecraft:density"
               }
             ]
           }
@@ -565,7 +607,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "aqua_affinity"
+                "enchantment": "minecraft:aqua_affinity"
               }
             ]
           }
@@ -579,7 +621,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "bane_of_arthropods"
+                "enchantment": "minecraft:bane_of_arthropods"
               }
             ]
           }
@@ -593,7 +635,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "binding_curse"
+                "enchantment": "minecraft:binding_curse"
               }
             ]
           }
@@ -607,7 +649,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "blast_protection"
+                "enchantment": "minecraft:blast_protection"
               }
             ]
           }
@@ -621,7 +663,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "channeling"
+                "enchantment": "minecraft:channeling"
               }
             ]
           }
@@ -635,7 +677,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "depth_strider"
+                "enchantment": "minecraft:depth_strider"
               }
             ]
           }
@@ -649,7 +691,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "efficiency"
+                "enchantment": "minecraft:efficiency"
               }
             ]
           }
@@ -663,7 +705,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "feather_falling"
+                "enchantment": "minecraft:feather_falling"
               }
             ]
           }
@@ -677,7 +719,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "fire_aspect"
+                "enchantment": "minecraft:fire_aspect"
               }
             ]
           }
@@ -691,7 +733,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "fire_protection"
+                "enchantment": "minecraft:fire_protection"
               }
             ]
           }
@@ -705,7 +747,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "flame"
+                "enchantment": "minecraft:flame"
               }
             ]
           }
@@ -719,7 +761,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "fortune"
+                "enchantment": "minecraft:fortune"
               }
             ]
           }
@@ -733,7 +775,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "frost_walker"
+                "enchantment": "minecraft:frost_walker"
               }
             ]
           }
@@ -747,7 +789,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "impaling"
+                "enchantment": "minecraft:impaling"
               }
             ]
           }
@@ -761,7 +803,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "infinity"
+                "enchantment": "minecraft:infinity"
               }
             ]
           }
@@ -775,7 +817,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "knockback"
+                "enchantment": "minecraft:knockback"
               }
             ]
           }
@@ -789,7 +831,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "looting"
+                "enchantment": "minecraft:looting"
               }
             ]
           }
@@ -803,7 +845,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "loyalty"
+                "enchantment": "minecraft:loyalty"
               }
             ]
           }
@@ -817,7 +859,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "luck_of_the_sea"
+                "enchantment": "minecraft:luck_of_the_sea"
               }
             ]
           }
@@ -831,7 +873,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "lure"
+                "enchantment": "minecraft:lure"
               }
             ]
           }
@@ -845,7 +887,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "mending"
+                "enchantment": "minecraft:mending"
               }
             ]
           }
@@ -859,7 +901,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "multishot"
+                "enchantment": "minecraft:multishot"
               }
             ]
           }
@@ -873,7 +915,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "piercing"
+                "enchantment": "minecraft:piercing"
               }
             ]
           }
@@ -887,7 +929,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "power"
+                "enchantment": "minecraft:power"
               }
             ]
           }
@@ -901,7 +943,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "projectile_protection"
+                "enchantment": "minecraft:projectile_protection"
               }
             ]
           }
@@ -915,7 +957,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "protection"
+                "enchantment": "minecraft:protection"
               }
             ]
           }
@@ -929,7 +971,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "punch"
+                "enchantment": "minecraft:punch"
               }
             ]
           }
@@ -943,7 +985,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "quick_charge"
+                "enchantment": "minecraft:quick_charge"
               }
             ]
           }
@@ -957,7 +999,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "respiration"
+                "enchantment": "minecraft:respiration"
               }
             ]
           }
@@ -971,7 +1013,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "riptide"
+                "enchantment": "minecraft:riptide"
               }
             ]
           }
@@ -985,7 +1027,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "sharpness"
+                "enchantment": "minecraft:sharpness"
               }
             ]
           }
@@ -999,7 +1041,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "silk_touch"
+                "enchantment": "minecraft:silk_touch"
               }
             ]
           }
@@ -1013,7 +1055,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "smite"
+                "enchantment": "minecraft:smite"
               }
             ]
           }
@@ -1027,21 +1069,21 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "soul_speed"
+                "enchantment": "minecraft:soul_speed"
               }
             ]
           }
         ]
       }
     },
-    "sweeping_book": {
+    "sweeping_edge_book": {
       "trigger": "inventory_changed",
       "conditions": {
         "items": [
           {
             "stored_enchantments": [
               {
-                "enchantment": "sweeping"
+                "enchantment": "minecraft:sweeping_edge"
               }
             ]
           }
@@ -1055,7 +1097,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "swift_sneak"
+                "enchantment": "minecraft:swift_sneak"
               }
             ]
           }
@@ -1069,7 +1111,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "thorns"
+                "enchantment": "minecraft:thorns"
               }
             ]
           }
@@ -1083,7 +1125,7 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "unbreaking"
+                "enchantment": "minecraft:unbreaking"
               }
             ]
           }
@@ -1097,7 +1139,49 @@
           {
             "stored_enchantments": [
               {
-                "enchantment": "vanishing_curse"
+                "enchantment": "minecraft:vanishing_curse"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "wind_burst_book": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "stored_enchantments": [
+              {
+                "enchantment": "minecraft:wind_burst"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "breach_book": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "stored_enchantments": [
+              {
+                "enchantment": "minecraft:breach"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "density_book": {
+      "trigger": "inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "stored_enchantments": [
+              {
+                "enchantment": "minecraft:density"
               }
             ]
           }
@@ -1243,8 +1327,8 @@
       "soul_speed_book"
     ],
     [
-      "sweeping",
-      "sweeping_book"
+      "sweeping_edge",
+      "sweeping_edge_book"
     ],
     [
       "swift_sneak",
@@ -1261,6 +1345,18 @@
     [
       "vanishing_curse",
       "vanishing_curse_book"
+    ],
+    [
+      "wind_burst",
+      "wind_burst_book"
+    ],
+    [
+      "breach",
+      "breach_book"
+    ],
+    [
+      "density",
+      "density_book"
     ]
   ]
 }
diff --git a/BoxedDataPack/data/minecraft/advancements/story/fire_aspect.json b/BoxedDataPack/data/minecraft/advancements/story/fire_aspect.json
index 6c2e53c..ae9e88b 100644
--- a/BoxedDataPack/data/minecraft/advancements/story/fire_aspect.json
+++ b/BoxedDataPack/data/minecraft/advancements/story/fire_aspect.json
@@ -19,7 +19,7 @@
             ],
             "enchantments": [
               {
-                "enchantment": "fire_aspect",
+                "enchantment": "minecraft:fire_aspect",
                 "levels": 2
               }
             ]
diff --git a/BoxedDataPack/data/minecraft/advancements/story/perfect_armor.json b/BoxedDataPack/data/minecraft/advancements/story/perfect_armor.json
index 42ddc7c..bac3281 100644
--- a/BoxedDataPack/data/minecraft/advancements/story/perfect_armor.json
+++ b/BoxedDataPack/data/minecraft/advancements/story/perfect_armor.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "netherite_helmet",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Master Armorer",
     "description": "Create a perfect suit of armor",
@@ -23,23 +23,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "aqua_affinity",
+                "enchantment": "minecraft:aqua_affinity",
                 "levels": 1
               },
               {
-                "enchantment": "protection",
+                "enchantment": "minecraft:protection",
                 "levels": 4
               },
               {
-                "enchantment": "respiration",
+                "enchantment": "minecraft:respiration",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -57,23 +57,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "aqua_affinity",
+                "enchantment": "minecraft:aqua_affinity",
                 "levels": 1
               },
               {
-                "enchantment": "projectile_protection",
+                "enchantment": "minecraft:projectile_protection",
                 "levels": 4
               },
               {
-                "enchantment": "respiration",
+                "enchantment": "minecraft:respiration",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -91,23 +91,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "aqua_affinity",
+                "enchantment": "minecraft:aqua_affinity",
                 "levels": 1
               },
               {
-                "enchantment": "blast_protection",
+                "enchantment": "minecraft:blast_protection",
                 "levels": 4
               },
               {
-                "enchantment": "respiration",
+                "enchantment": "minecraft:respiration",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -125,23 +125,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "aqua_affinity",
+                "enchantment": "minecraft:aqua_affinity",
                 "levels": 1
               },
               {
-                "enchantment": "fire_protection",
+                "enchantment": "minecraft:fire_protection",
                 "levels": 4
               },
               {
-                "enchantment": "respiration",
+                "enchantment": "minecraft:respiration",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -159,19 +159,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "protection",
+                "enchantment": "minecraft:protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "thorns",
+                "enchantment": "minecraft:thorns",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -189,19 +189,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "projectile_protection",
+                "enchantment": "minecraft:projectile_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "thorns",
+                "enchantment": "minecraft:thorns",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -219,19 +219,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "blast_protection",
+                "enchantment": "minecraft:blast_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "thorns",
+                "enchantment": "minecraft:thorns",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -249,19 +249,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "fire_protection",
+                "enchantment": "minecraft:fire_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "thorns",
+                "enchantment": "minecraft:thorns",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -279,19 +279,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "protection",
+                "enchantment": "minecraft:protection",
                 "levels": 4
               },
               {
-                "enchantment": "swift_sneak",
+                "enchantment": "minecraft:swift_sneak",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -309,19 +309,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "projectile_protection",
+                "enchantment": "minecraft:projectile_protection",
                 "levels": 4
               },
               {
-                "enchantment": "swift_sneak",
+                "enchantment": "minecraft:swift_sneak",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -339,19 +339,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "blast_protection",
+                "enchantment": "minecraft:blast_protection",
                 "levels": 4
               },
               {
-                "enchantment": "swift_sneak",
+                "enchantment": "minecraft:swift_sneak",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -369,19 +369,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "fire_protection",
+                "enchantment": "minecraft:fire_protection",
                 "levels": 4
               },
               {
-                "enchantment": "swift_sneak",
+                "enchantment": "minecraft:swift_sneak",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -399,27 +399,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "protection",
+                "enchantment": "minecraft:protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "depth_strider",
+                "enchantment": "minecraft:depth_strider",
                 "levels": 3
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -437,27 +437,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "projectile_protection",
+                "enchantment": "minecraft:projectile_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "depth_strider",
+                "enchantment": "minecraft:depth_strider",
                 "levels": 3
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -475,27 +475,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "blast_protection",
+                "enchantment": "minecraft:blast_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "depth_strider",
+                "enchantment": "minecraft:depth_strider",
                 "levels": 3
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -513,27 +513,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "fire_protection",
+                "enchantment": "minecraft:fire_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "depth_strider",
+                "enchantment": "minecraft:depth_strider",
                 "levels": 3
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -551,27 +551,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "protection",
+                "enchantment": "minecraft:protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "frost_walker",
+                "enchantment": "minecraft:frost_walker",
                 "levels": 2
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -589,27 +589,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "projectile_protection",
+                "enchantment": "minecraft:projectile_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "frost_walker",
+                "enchantment": "minecraft:frost_walker",
                 "levels": 2
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -627,27 +627,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "blast_protection",
+                "enchantment": "minecraft:blast_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "frost_walker",
+                "enchantment": "minecraft:frost_walker",
                 "levels": 2
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
@@ -665,27 +665,27 @@
             ],
             "enchantments": [
               {
-                "enchantment": "fire_protection",
+                "enchantment": "minecraft:fire_protection",
                 "levels": 4
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "frost_walker",
+                "enchantment": "minecraft:frost_walker",
                 "levels": 2
               },
               {
-                "enchantment": "feather_falling",
+                "enchantment": "minecraft:feather_falling",
                 "levels": 4
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "soul_speed",
+                "enchantment": "minecraft:soul_speed",
                 "levels": 3
               }
             ]
diff --git a/BoxedDataPack/data/minecraft/advancements/story/perfect_bow.json b/BoxedDataPack/data/minecraft/advancements/story/perfect_bow.json
index 9b03b13..827f3b2 100644
--- a/BoxedDataPack/data/minecraft/advancements/story/perfect_bow.json
+++ b/BoxedDataPack/data/minecraft/advancements/story/perfect_bow.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "bow",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Master Sniper",
     "description": "Create a perfect bow",
@@ -23,23 +23,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "power",
+                "enchantment": "minecraft:power",
                 "levels": 5
               },
               {
-                "enchantment": "punch",
+                "enchantment": "minecraft:punch",
                 "levels": 2
               },
               {
-                "enchantment": "flame",
+                "enchantment": "minecraft:flame",
                 "levels": 1
               },
               {
-                "enchantment": "infinity",
+                "enchantment": "minecraft:infinity",
                 "levels": 1
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               }
             ]
@@ -57,23 +57,23 @@
             ],
             "enchantments": [
               {
-                "enchantment": "power",
+                "enchantment": "minecraft:power",
                 "levels": 5
               },
               {
-                "enchantment": "punch",
+                "enchantment": "minecraft:punch",
                 "levels": 2
               },
               {
-                "enchantment": "flame",
+                "enchantment": "minecraft:flame",
                 "levels": 1
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               }
             ]
diff --git a/BoxedDataPack/data/minecraft/advancements/story/perfect_pickaxe.json b/BoxedDataPack/data/minecraft/advancements/story/perfect_pickaxe.json
index 61ac72c..bf3114c 100644
--- a/BoxedDataPack/data/minecraft/advancements/story/perfect_pickaxe.json
+++ b/BoxedDataPack/data/minecraft/advancements/story/perfect_pickaxe.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "netherite_pickaxe",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Master Miner",
     "description": "Create a perfect pickaxe",
@@ -23,19 +23,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "fortune",
+                "enchantment": "minecraft:fortune",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -53,19 +53,19 @@
             ],
             "enchantments": [
               {
-                "enchantment": "efficiency",
+                "enchantment": "minecraft:efficiency",
                 "levels": 5
               },
               {
-                "enchantment": "silk_touch",
+                "enchantment": "minecraft:silk_touch",
                 "levels": 1
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
diff --git a/BoxedDataPack/data/minecraft/advancements/story/perfect_sword.json b/BoxedDataPack/data/minecraft/advancements/story/perfect_sword.json
index daa10bf..8e4ccd9 100644
--- a/BoxedDataPack/data/minecraft/advancements/story/perfect_sword.json
+++ b/BoxedDataPack/data/minecraft/advancements/story/perfect_sword.json
@@ -2,7 +2,7 @@
   "display": {
     "icon": {
       "item": "netherite_sword",
-      "nbt": "{Enchantments:[{id:'lure'}]}"
+      "components": {"minecraft:enchantments": {"minecraft:lure": 1}}
     },
     "title": "Master Knight",
     "description": "Create a perfect sword",
@@ -23,31 +23,31 @@
             ],
             "enchantments": [
               {
-                "enchantment": "sharpness",
+                "enchantment": "minecraft:sharpness",
                 "levels": 5
               },
               {
-                "enchantment": "knockback",
+                "enchantment": "minecraft:knockback",
                 "levels": 2
               },
               {
-                "enchantment": "fire_aspect",
+                "enchantment": "minecraft:fire_aspect",
                 "levels": 2
               },
               {
-                "enchantment": "looting",
+                "enchantment": "minecraft:looting",
                 "levels": 3
               },
               {
-                "enchantment": "sweeping",
+                "enchantment": "minecraft:sweeping_edge",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -65,31 +65,31 @@
             ],
             "enchantments": [
               {
-                "enchantment": "smite",
+                "enchantment": "minecraft:smite",
                 "levels": 5
               },
               {
-                "enchantment": "knockback",
+                "enchantment": "minecraft:knockback",
                 "levels": 2
               },
               {
-                "enchantment": "fire_aspect",
+                "enchantment": "minecraft:fire_aspect",
                 "levels": 2
               },
               {
-                "enchantment": "looting",
+                "enchantment": "minecraft:looting",
                 "levels": 3
               },
               {
-                "enchantment": "sweeping",
+                "enchantment": "minecraft:sweeping_edge",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
@@ -107,31 +107,31 @@
             ],
             "enchantments": [
               {
-                "enchantment": "bane_of_arthropods",
+                "enchantment": "minecraft:bane_of_arthropods",
                 "levels": 5
               },
               {
-                "enchantment": "knockback",
+                "enchantment": "minecraft:knockback",
                 "levels": 2
               },
               {
-                "enchantment": "fire_aspect",
+                "enchantment": "minecraft:fire_aspect",
                 "levels": 2
               },
               {
-                "enchantment": "looting",
+                "enchantment": "minecraft:looting",
                 "levels": 3
               },
               {
-                "enchantment": "sweeping",
+                "enchantment": "minecraft:sweeping_edge",
                 "levels": 3
               },
               {
-                "enchantment": "unbreaking",
+                "enchantment": "minecraft:unbreaking",
                 "levels": 3
               },
               {
-                "enchantment": "mending",
+                "enchantment": "minecraft:mending",
                 "levels": 1
               }
             ]
diff --git a/BoxedDataPack/data/minecraft/tags/items/stone_tool_materials.json b/BoxedDataPack/data/minecraft/tags/items/stone_tool_materials.json
index 68fd7f7..20b7eaf 100644
--- a/BoxedDataPack/data/minecraft/tags/items/stone_tool_materials.json
+++ b/BoxedDataPack/data/minecraft/tags/items/stone_tool_materials.json
@@ -1,9 +1,9 @@
 {
   "values": [
-    "granite",
-    "andesite",
-    "diorite",
-    "tuff",
-    "calcite"
+    "minecraft:granite",
+    "minecraft:andesite",
+    "minecraft:diorite",
+    "minecraft:tuff",
+    "minecraft:calcite"
   ]
 }
diff --git a/BoxedDataPack/pack.mcmeta b/BoxedDataPack/pack.mcmeta
index c41e2dc..2228cdb 100644
--- a/BoxedDataPack/pack.mcmeta
+++ b/BoxedDataPack/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 15,
+    "pack_format": 71,
     "description": ""
   }
 }