From 6e6dc44a5e9c78942d7e9c1e49f0e42951d1e167 Mon Sep 17 00:00:00 2001 From: MoriyaShiine <45156123+MoriyaShiine@users.noreply.github.com> Date: Mon, 29 Apr 2019 21:53:22 -0500 Subject: [PATCH] fix armor... again (#2898) --- .../armor/manasteel/ItemManasteelArmor.java | 14 +------------- .../armor/terrasteel/ItemTerrasteelArmor.java | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 4db95c2ae..2a1498135 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; -import com.google.common.collect.Multimap; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; @@ -19,8 +18,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemArmor; @@ -88,16 +85,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan @Override public int getArmorDisplay(EntityPlayer player, @Nonnull ItemStack armor, int slot) { - return damageReduceAmount; - } - - @Override - public Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - Multimap attrib = super.getAttributeModifiers(slot, stack); - // Remove these or else vanilla will double count it and ISpecialArmor - attrib.removeAll(SharedMonsterAttributes.ARMOR.getName()); - attrib.removeAll(SharedMonsterAttributes.ARMOR_TOUGHNESS.getName()); - return attrib; + return 0; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 3b98293f4..2ea9b66b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -60,7 +60,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { Multimap multimap = super.getAttributeModifiers(slot, stack); UUID uuid = new UUID((getTranslationKey(stack) + slot.toString()).hashCode(), 0); if (slot == armorType) { - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) damageReduceAmount / 20, 0)); } return multimap; }