diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index 60fce5026..592b17ea2 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -364,10 +364,10 @@ public class ItemDrill extends ItemEnergy implements INameableItem{ if(this.getEnergyStored(stack) >= use){ //Enchants the Drill depending on the Upgrades it has if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.SILK_TOUCH)) - stack.addEnchantment(Enchantment.silkTouch, 1); + ItemUtil.addEnchantment(stack, Enchantment.silkTouch, 1); else{ if(this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE)) - stack.addEnchantment(Enchantment.fortune, this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE_II) ? 3 : 1); + ItemUtil.addEnchantment(stack, Enchantment.fortune, this.getHasUpgrade(stack, ItemDrillUpgrade.UpgradeType.FORTUNE_II) ? 3 : 1); } //Breaks the Blocks diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemAxeFixedEnchants.java b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemAxeFixedEnchants.java index a167629b4..53b3de782 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemAxeFixedEnchants.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemAxeFixedEnchants.java @@ -79,7 +79,7 @@ public class ItemAxeFixedEnchants extends ItemAxeAA implements IToolTableRepairI @Override public void onCreated(ItemStack stack, World world, EntityPlayer player){ for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } @@ -87,7 +87,7 @@ public class ItemAxeFixedEnchants extends ItemAxeAA implements IToolTableRepairI public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ for(EnchantmentCombo combo : this.enchantments){ if(!ItemUtil.hasEnchantment(stack, combo.enchantment)){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } } @@ -98,7 +98,7 @@ public class ItemAxeFixedEnchants extends ItemAxeAA implements IToolTableRepairI public void getSubItems(Item item, CreativeTabs tab, List list){ ItemStack stack = new ItemStack(item); for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } list.add(stack); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemPickaxeFixedEnchants.java b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemPickaxeFixedEnchants.java index ae6c476e8..10939bb69 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemPickaxeFixedEnchants.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemPickaxeFixedEnchants.java @@ -79,7 +79,7 @@ public class ItemPickaxeFixedEnchants extends ItemPickaxeAA implements IToolTabl @Override public void onCreated(ItemStack stack, World world, EntityPlayer player){ for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } @@ -87,7 +87,7 @@ public class ItemPickaxeFixedEnchants extends ItemPickaxeAA implements IToolTabl public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ for(EnchantmentCombo combo : this.enchantments){ if(!ItemUtil.hasEnchantment(stack, combo.enchantment)){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } } @@ -98,7 +98,7 @@ public class ItemPickaxeFixedEnchants extends ItemPickaxeAA implements IToolTabl public void getSubItems(Item item, CreativeTabs tab, List list){ ItemStack stack = new ItemStack(item); for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } list.add(stack); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemShovelFixedEnchants.java b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemShovelFixedEnchants.java index afb4187ac..f431dabb3 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemShovelFixedEnchants.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemShovelFixedEnchants.java @@ -79,7 +79,7 @@ public class ItemShovelFixedEnchants extends ItemShovelAA implements IToolTableR @Override public void onCreated(ItemStack stack, World world, EntityPlayer player){ for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } @@ -87,7 +87,7 @@ public class ItemShovelFixedEnchants extends ItemShovelAA implements IToolTableR public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ for(EnchantmentCombo combo : this.enchantments){ if(!ItemUtil.hasEnchantment(stack, combo.enchantment)){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } } @@ -98,7 +98,7 @@ public class ItemShovelFixedEnchants extends ItemShovelAA implements IToolTableR public void getSubItems(Item item, CreativeTabs tab, List list){ ItemStack stack = new ItemStack(item); for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } list.add(stack); } diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemSwordFixedEnchants.java b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemSwordFixedEnchants.java index 434757c3a..6d3ef04ec 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemSwordFixedEnchants.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/table/ItemSwordFixedEnchants.java @@ -79,7 +79,7 @@ public class ItemSwordFixedEnchants extends ItemSwordAA implements IToolTableRep @Override public void onCreated(ItemStack stack, World world, EntityPlayer player){ for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } @@ -87,7 +87,7 @@ public class ItemSwordFixedEnchants extends ItemSwordAA implements IToolTableRep public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5){ for(EnchantmentCombo combo : this.enchantments){ if(!ItemUtil.hasEnchantment(stack, combo.enchantment)){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } } } @@ -98,7 +98,7 @@ public class ItemSwordFixedEnchants extends ItemSwordAA implements IToolTableRep public void getSubItems(Item item, CreativeTabs tab, List list){ ItemStack stack = new ItemStack(item); for(EnchantmentCombo combo : this.enchantments){ - stack.addEnchantment(combo.enchantment, combo.level); + ItemUtil.addEnchantment(stack, combo.enchantment, combo.level); } list.add(stack); } diff --git a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java index de07220c3..f256c9c52 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java @@ -81,6 +81,12 @@ public class ItemUtil{ return stack1 != null && stack2 != null && (stack1.isItemEqual(stack2) || (checkWildcard && stack1.getItem() == stack2.getItem() && (stack1.getItemDamage() == Util.WILDCARD || stack2.getItemDamage() == Util.WILDCARD))); } + public static void addEnchantment(ItemStack stack, Enchantment e, int level){ + if(!hasEnchantment(stack, e)){ + stack.addEnchantment(e, level); + } + } + public static void removeEnchantment(ItemStack stack, Enchantment e){ NBTTagList ench = stack.getEnchantmentTagList(); if(ench != null){