From 30befc896ccdc34ee1bf05d265e849c849c8e450 Mon Sep 17 00:00:00 2001 From: Zoko061602 <32712367+Zoko061602@users.noreply.github.com> Date: Sat, 14 Mar 2020 13:01:08 +0100 Subject: [PATCH] Fixed Armor again --- .../crazypants/enderio/item/darksteel/IDarkSteelItem.java | 2 +- .../crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java | 4 ++-- .../enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java index b78b1303..af00e740 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java +++ b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java @@ -4,7 +4,7 @@ public interface IDarkSteelItem { int getIngotsRequiredForFullRepair(); - public interface IEndSteelItem extends IDarkSteelItem{ + public interface IEndSteelItem extends IDarkSteelItem { } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 68c59c1c..576b9c69 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -293,7 +293,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override @Method(modid = "Thaumcraft") public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) { - if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) { + if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) { return 0; } return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0; @@ -318,7 +318,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte @Override @Method(modid = "Forestry") public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { - if(armor == null || armor.getItem() != DarkSteelItems.itemDarkSteelHelmet) { + if(armor == null || DarkSteelItems.isArmorPart(armor.getItem(), 0)) { return false; } return NaturalistEyeUpgrade.isUpgradeEquipped(player); diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java index 2dd938d9..d1cd1214 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java @@ -67,7 +67,7 @@ public class ApiaristArmorUpgrade extends AbstractUpgrade { @Override public boolean hasUpgrade(ItemStack stack) { - return super.hasUpgrade(stack) && stack.getItem() instanceof ItemDarkSteelArmor; + return super.hasUpgrade(stack) && DarkSteelItems.isArmorPart(stack.getItem(), slot); } @Override