diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7d0c6a..baf4643 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,10 +28,10 @@ jobs:
       - name: mc-publish
         uses: Kir-Antipov/mc-publish@v3.3.0
         with:
-          curseforge-id: 657831
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           modrinth-id: iRE67WIn
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          curseforge-id: 657831
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
           files-primary: build/libs/!(*-@(javadoc|sources)).jar
           version-type: release
           loaders: neoforge
diff --git a/gradle.properties b/gradle.properties
index 34a44bf..d1ce215 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ mod_name=Piglin Proliferation
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT for code, CC BY-NC-SA 4.0 for assets
 # The mod version. See https://semver.org/
-mod_version=2.0.5
+mod_version=2.0.6
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
diff --git a/src/main/java/tallestred/piglinproliferation/common/items/BucklerItem.java b/src/main/java/tallestred/piglinproliferation/common/items/BucklerItem.java
index cc2ee6c..5d9a0af 100644
--- a/src/main/java/tallestred/piglinproliferation/common/items/BucklerItem.java
+++ b/src/main/java/tallestred/piglinproliferation/common/items/BucklerItem.java
@@ -203,7 +203,7 @@ public int getUseDuration(ItemStack pStack, LivingEntity entity) {
         return 10;
     }
 
-    @SuppressWarnings("deprecation") //In Minecraft, deprecated methods can be overridden but not called.
+
     @Override
     public int getEnchantmentValue() {
         return 1;
diff --git a/src/main/resources/data/minecraft/tags/blocks/campfires.json b/src/main/resources/data/minecraft/tags/block/campfires.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/campfires.json
rename to src/main/resources/data/minecraft/tags/block/campfires.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
rename to src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_wood_tool.json b/src/main/resources/data/minecraft/tags/block/needs_wood_tool.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/needs_wood_tool.json
rename to src/main/resources/data/minecraft/tags/block/needs_wood_tool.json
diff --git a/src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json b/src/main/resources/data/minecraft/tags/block/piglin_repellents.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/blocks/piglin_repellents.json
rename to src/main/resources/data/minecraft/tags/block/piglin_repellents.json
diff --git a/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json b/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json
new file mode 100644
index 0000000..2379488
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/enchantment/non_treasure.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "piglinproliferation:bang",
+    "piglinproliferation:turning"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/item/enchantable/durability.json b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json
new file mode 100644
index 0000000..0623655
--- /dev/null
+++ b/src/main/resources/data/minecraft/tags/item/enchantable/durability.json
@@ -0,0 +1,6 @@
+{
+  "replace": "none",
+  "values": [
+   "piglinproliferation:buckler"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/items/noteblock_top_instruments.json b/src/main/resources/data/minecraft/tags/item/noteblock_top_instruments.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/items/noteblock_top_instruments.json
rename to src/main/resources/data/minecraft/tags/item/noteblock_top_instruments.json
diff --git a/src/main/resources/data/minecraft/tags/items/skulls.json b/src/main/resources/data/minecraft/tags/item/skulls.json
similarity index 100%
rename from src/main/resources/data/minecraft/tags/items/skulls.json
rename to src/main/resources/data/minecraft/tags/item/skulls.json