From 8127a34a1b1d00ec613f10b491662dc78415fef5 Mon Sep 17 00:00:00 2001
From: Me <135455255+IcarussOne@users.noreply.github.com>
Date: Mon, 13 Jan 2025 03:25:02 -0600
Subject: [PATCH] Remove default enchantments

---
 .../item/ItemTFIronwoodArmor.java             | 27 -------------------
 .../item/ItemTFIronwoodAxe.java               | 13 ---------
 .../item/ItemTFIronwoodPick.java              | 13 ---------
 .../item/ItemTFIronwoodShovel.java            | 13 ---------
 .../item/ItemTFIronwoodSword.java             | 13 ---------
 .../item/ItemTFSteeleafArmor.java             | 27 -------------------
 .../item/ItemTFSteeleafAxe.java               | 13 ---------
 .../item/ItemTFSteeleafPick.java              | 13 ---------
 .../item/ItemTFSteeleafShovel.java            | 13 ---------
 .../item/ItemTFSteeleafSword.java             | 13 ---------
 .../twilightforest/item/ItemTFYetiArmor.java  | 24 -----------------
 .../recipes/equipment/ironwood_axe.json       |  4 +--
 .../recipes/equipment/ironwood_boots.json     |  4 +--
 .../equipment/ironwood_chestplate.json        |  4 +--
 .../recipes/equipment/ironwood_helmet.json    |  4 +--
 .../recipes/equipment/ironwood_leggings.json  |  4 +--
 .../recipes/equipment/ironwood_pickaxe.json   |  4 +--
 .../recipes/equipment/ironwood_shovel.json    |  4 +--
 .../recipes/equipment/ironwood_sword.json     |  4 +--
 .../recipes/equipment/steeleaf_axe.json       |  4 +--
 .../recipes/equipment/steeleaf_boots.json     |  4 +--
 .../equipment/steeleaf_chestplate.json        |  4 +--
 .../recipes/equipment/steeleaf_helmet.json    |  4 +--
 .../recipes/equipment/steeleaf_leggings.json  |  4 +--
 .../recipes/equipment/steeleaf_pickaxe.json   |  4 +--
 .../recipes/equipment/steeleaf_shovel.json    |  4 +--
 .../recipes/equipment/steeleaf_sword.json     |  4 +--
 .../recipes/equipment/yeti_boots.json         |  4 +--
 .../recipes/equipment/yeti_chestplate.json    |  4 +--
 .../recipes/equipment/yeti_helmet.json        |  4 +--
 .../recipes/equipment/yeti_leggings.json      |  4 +--
 31 files changed, 20 insertions(+), 242 deletions(-)

diff --git a/src/main/java/twilightforest/item/ItemTFIronwoodArmor.java b/src/main/java/twilightforest/item/ItemTFIronwoodArmor.java
index 3e5b06f63f..f1170f7cc8 100644
--- a/src/main/java/twilightforest/item/ItemTFIronwoodArmor.java
+++ b/src/main/java/twilightforest/item/ItemTFIronwoodArmor.java
@@ -1,12 +1,9 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
-import net.minecraft.init.Enchantments;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.TwilightForestMod;
 import twilightforest.client.ModelRegisterCallback;
 
@@ -25,28 +22,4 @@ public String getArmorTexture(ItemStack itemstack, Entity entity, EntityEquipmen
 			return TwilightForestMod.ARMOR_DIR + "ironwood_1.png";
 		}
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			switch (this.armorType) {
-				case HEAD:
-					istack.addEnchantment(Enchantments.AQUA_AFFINITY, 1);
-					break;
-				case CHEST:
-					istack.addEnchantment(Enchantments.PROTECTION, 1);
-					break;
-				case LEGS:
-					istack.addEnchantment(Enchantments.PROTECTION, 1);
-					break;
-				case FEET:
-					istack.addEnchantment(Enchantments.FEATHER_FALLING, 1);
-					break;
-				default:
-					break;
-			}
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFIronwoodAxe.java b/src/main/java/twilightforest/item/ItemTFIronwoodAxe.java
index 0393ae9f41..f55340bd62 100644
--- a/src/main/java/twilightforest/item/ItemTFIronwoodAxe.java
+++ b/src/main/java/twilightforest/item/ItemTFIronwoodAxe.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemAxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFIronwoodAxe extends ItemAxe implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ protected ItemTFIronwoodAxe(Item.ToolMaterial material) {
 		super(material, 6F + material.getAttackDamage(), material.getEfficiency() * 0.05f - 3.4f);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.FORTUNE, 1);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFIronwoodPick.java b/src/main/java/twilightforest/item/ItemTFIronwoodPick.java
index 5b2be13095..c74edf15b3 100644
--- a/src/main/java/twilightforest/item/ItemTFIronwoodPick.java
+++ b/src/main/java/twilightforest/item/ItemTFIronwoodPick.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPickaxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFIronwoodPick extends ItemPickaxe implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ protected ItemTFIronwoodPick(Item.ToolMaterial material) {
 		super(material);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.EFFICIENCY, 1);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFIronwoodShovel.java b/src/main/java/twilightforest/item/ItemTFIronwoodShovel.java
index f5a6e16f7f..a87953360b 100644
--- a/src/main/java/twilightforest/item/ItemTFIronwoodShovel.java
+++ b/src/main/java/twilightforest/item/ItemTFIronwoodShovel.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemSpade;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFIronwoodShovel extends ItemSpade implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ public ItemTFIronwoodShovel(Item.ToolMaterial toolMaterial) {
 		super(toolMaterial);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.UNBREAKING, 1);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFIronwoodSword.java b/src/main/java/twilightforest/item/ItemTFIronwoodSword.java
index 46ebd7c507..cdd4c5976f 100644
--- a/src/main/java/twilightforest/item/ItemTFIronwoodSword.java
+++ b/src/main/java/twilightforest/item/ItemTFIronwoodSword.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFIronwoodSword extends ItemSword implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ public ItemTFIronwoodSword(Item.ToolMaterial material) {
 		super(material);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.KNOCKBACK, 1);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFSteeleafArmor.java b/src/main/java/twilightforest/item/ItemTFSteeleafArmor.java
index d6c570158c..cfdbea7942 100644
--- a/src/main/java/twilightforest/item/ItemTFSteeleafArmor.java
+++ b/src/main/java/twilightforest/item/ItemTFSteeleafArmor.java
@@ -1,13 +1,10 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
-import net.minecraft.init.Enchantments;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.TwilightForestMod;
 import twilightforest.client.ModelRegisterCallback;
 
@@ -26,28 +23,4 @@ public String getArmorTexture(ItemStack itemstack, Entity entity, EntityEquipmen
 			return TwilightForestMod.ARMOR_DIR + "steeleaf_1.png";
 		}
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			switch (this.armorType) {
-				case HEAD:
-					istack.addEnchantment(Enchantments.PROJECTILE_PROTECTION, 2);
-					break;
-				case CHEST:
-					istack.addEnchantment(Enchantments.BLAST_PROTECTION, 2);
-					break;
-				case LEGS:
-					istack.addEnchantment(Enchantments.FIRE_PROTECTION, 2);
-					break;
-				case FEET:
-					istack.addEnchantment(Enchantments.FEATHER_FALLING, 2);
-					break;
-				default:
-					break;
-			}
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFSteeleafAxe.java b/src/main/java/twilightforest/item/ItemTFSteeleafAxe.java
index 5f2ab6583a..9f3a3de87b 100644
--- a/src/main/java/twilightforest/item/ItemTFSteeleafAxe.java
+++ b/src/main/java/twilightforest/item/ItemTFSteeleafAxe.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemAxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFSteeleafAxe extends ItemAxe implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ protected ItemTFSteeleafAxe(Item.ToolMaterial material) {
 		super(material, 6F + material.getAttackDamage(), material.getEfficiency() * 0.05f - 3.4f);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.EFFICIENCY, 2);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFSteeleafPick.java b/src/main/java/twilightforest/item/ItemTFSteeleafPick.java
index 3ea4f5a41c..45071ea342 100644
--- a/src/main/java/twilightforest/item/ItemTFSteeleafPick.java
+++ b/src/main/java/twilightforest/item/ItemTFSteeleafPick.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPickaxe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFSteeleafPick extends ItemPickaxe implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ protected ItemTFSteeleafPick(Item.ToolMaterial material) {
 		super(material);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.FORTUNE, 2);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFSteeleafShovel.java b/src/main/java/twilightforest/item/ItemTFSteeleafShovel.java
index 24eafe7525..af5a32e694 100644
--- a/src/main/java/twilightforest/item/ItemTFSteeleafShovel.java
+++ b/src/main/java/twilightforest/item/ItemTFSteeleafShovel.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemSpade;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFSteeleafShovel extends ItemSpade implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ public ItemTFSteeleafShovel(Item.ToolMaterial toolMaterial) {
 		super(toolMaterial);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.EFFICIENCY, 2);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFSteeleafSword.java b/src/main/java/twilightforest/item/ItemTFSteeleafSword.java
index f366590ce1..8cffe44574 100644
--- a/src/main/java/twilightforest/item/ItemTFSteeleafSword.java
+++ b/src/main/java/twilightforest/item/ItemTFSteeleafSword.java
@@ -1,11 +1,7 @@
 package twilightforest.item;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Enchantments;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
-import net.minecraft.util.NonNullList;
 import twilightforest.client.ModelRegisterCallback;
 
 public class ItemTFSteeleafSword extends ItemSword implements ModelRegisterCallback {
@@ -14,13 +10,4 @@ public ItemTFSteeleafSword(Item.ToolMaterial material) {
 		super(material);
 		this.setCreativeTab(TFItems.creativeTab);
 	}
-
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			istack.addEnchantment(Enchantments.LOOTING, 2);
-			list.add(istack);
-		}
-	}
 }
diff --git a/src/main/java/twilightforest/item/ItemTFYetiArmor.java b/src/main/java/twilightforest/item/ItemTFYetiArmor.java
index 8fde2f7cb3..25a5cf0c49 100644
--- a/src/main/java/twilightforest/item/ItemTFYetiArmor.java
+++ b/src/main/java/twilightforest/item/ItemTFYetiArmor.java
@@ -2,15 +2,12 @@
 
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Enchantments;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -36,27 +33,6 @@ public String getArmorTexture(ItemStack itemstack, Entity entity, EntityEquipmen
 		}
 	}
 
-	@Override
-	public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
-		if (isInCreativeTab(tab)) {
-			ItemStack istack = new ItemStack(this);
-			switch (this.armorType) {
-				case HEAD:
-				case CHEST:
-				case LEGS:
-					istack.addEnchantment(Enchantments.PROTECTION, 2);
-					break;
-				case FEET:
-					istack.addEnchantment(Enchantments.PROTECTION, 2);
-					istack.addEnchantment(Enchantments.FEATHER_FALLING, 4);
-					break;
-				default:
-					break;
-			}
-			list.add(istack);
-		}
-	}
-
 	@SideOnly(Side.CLIENT)
 	@Override
 	public net.minecraft.client.model.ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, net.minecraft.client.model.ModelBiped _default) {
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_axe.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_axe.json
index f5b965d4ba..68a82dd41e 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_axe.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_axe.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:35s}]}",
-    "item": "twilightforest:ironwood_axe",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_axe"
   },
   "group": "ironwood_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_boots.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_boots.json
index e168e1355c..9eb4cc09c9 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_boots.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_boots.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:2s}]}",
-    "item": "twilightforest:ironwood_boots",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_boots"
   },
   "group": "ironwood_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_chestplate.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_chestplate.json
index d26a455313..5f40310be2 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_chestplate.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_chestplate.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:0s}]}",
-    "item": "twilightforest:ironwood_chestplate",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_chestplate"
   },
   "group": "ironwood_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_helmet.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_helmet.json
index 2c95d842a4..cd71be3e58 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_helmet.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_helmet.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:6s}]}",
-    "item": "twilightforest:ironwood_helmet",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_helmet"
   },
   "group": "ironwood_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_leggings.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_leggings.json
index 7623350b55..939c82e74e 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_leggings.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_leggings.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:0s}]}",
-    "item": "twilightforest:ironwood_leggings",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_leggings"
   },
   "group": "ironwood_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_pickaxe.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_pickaxe.json
index 531c854cfc..72b4e0531f 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_pickaxe.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_pickaxe.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:32s}]}",
-    "item": "twilightforest:ironwood_pickaxe",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_pickaxe"
   },
   "group": "ironwood_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_shovel.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_shovel.json
index 0bab1f0226..0aa2232f8f 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_shovel.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_shovel.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:34s}]}",
-    "item": "twilightforest:ironwood_shovel",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_shovel"
   },
   "group": "ironwood_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_sword.json b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_sword.json
index 79e0b007ce..0002fcde4a 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_sword.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/ironwood_sword.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:1s,id:19s}]}",
-    "item": "twilightforest:ironwood_sword",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:ironwood_sword"
   },
   "group": "ironwood_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_axe.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_axe.json
index 513f86b7bd..2452b95c1c 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_axe.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_axe.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:32s}]}",
-    "item": "twilightforest:steeleaf_axe",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_axe"
   },
   "group": "steeleaf_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_boots.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_boots.json
index 33455aa1dc..65468c4996 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_boots.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_boots.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:2s}]}",
-    "item": "twilightforest:steeleaf_boots",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_boots"
   },
   "group": "steeleaf_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_chestplate.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_chestplate.json
index f8ce92eb17..fcfe0942b5 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_chestplate.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_chestplate.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:3s}]}",
-    "item": "twilightforest:steeleaf_chestplate",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_chestplate"
   },
   "group": "steeleaf_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_helmet.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_helmet.json
index 0cb2debcb8..163c95f842 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_helmet.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_helmet.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:4s}]}",
-    "item": "twilightforest:steeleaf_helmet",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_helmet"
   },
   "group": "steeleaf_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_leggings.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_leggings.json
index e331abdb49..317df1d0a4 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_leggings.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_leggings.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:1s}]}",
-    "item": "twilightforest:steeleaf_leggings",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_leggings"
   },
   "group": "steeleaf_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_pickaxe.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_pickaxe.json
index eb4bee6bbf..869d36ffdd 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_pickaxe.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_pickaxe.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:35s}]}",
-    "item": "twilightforest:steeleaf_pickaxe",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_pickaxe"
   },
   "group": "steeleaf_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_shovel.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_shovel.json
index 432ba046b1..e8ff0c2df8 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_shovel.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_shovel.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:32s}]}",
-    "item": "twilightforest:steeleaf_shovel",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_shovel"
   },
   "group": "steeleaf_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_sword.json b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_sword.json
index ffb1ca85bb..f0dedbbf8a 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_sword.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/steeleaf_sword.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:21s}]}",
-    "item": "twilightforest:steeleaf_sword",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:steeleaf_sword"
   },
   "group": "steeleaf_tool",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_boots.json b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_boots.json
index 23ab5a83e8..b7d63a2ad4 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_boots.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_boots.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:0s},{lvl:4s,id:2s}]}",
-    "item": "twilightforest:yeti_boots",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:yeti_boots"
   },
   "group": "yeti_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_chestplate.json b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_chestplate.json
index 29b5e7dd47..6dfca1d6fe 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_chestplate.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_chestplate.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:0s}]}",
-    "item": "twilightforest:yeti_chestplate",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:yeti_chestplate"
   },
   "group": "yeti_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_helmet.json b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_helmet.json
index a0b8fca931..9a7c16cb6d 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_helmet.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_helmet.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:0s}]}",
-    "item": "twilightforest:yeti_helmet",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:yeti_helmet"
   },
   "group": "yeti_armor",
   "pattern": [
diff --git a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_leggings.json b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_leggings.json
index baa9a8fcfd..b9bdb19cd7 100644
--- a/src/main/resources/assets/twilightforest/recipes/equipment/yeti_leggings.json
+++ b/src/main/resources/assets/twilightforest/recipes/equipment/yeti_leggings.json
@@ -1,8 +1,6 @@
 {
   "result": {
-    "nbt": "{ench:[{lvl:2s,id:0s}]}",
-    "item": "twilightforest:yeti_leggings",
-    "type": "minecraft:item_nbt"
+    "item": "twilightforest:yeti_leggings"
   },
   "group": "yeti_armor",
   "pattern": [