From 232210940f78380807245f14e69ad836b68fa28b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 28 Jul 2015 04:53:53 +0200 Subject: [PATCH] Fixed weird damage handling vanilla does on armor. Whooops. --- .../ellpeck/actuallyadditions/items/ItemArmorAA.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java b/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java index 64f8ffb64..3e586335e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java @@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.ItemUtil; +import ellpeck.actuallyadditions.util.KeyUtil; import ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,6 +13,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; import java.util.List; @@ -28,6 +30,9 @@ public class ItemArmorAA extends ItemArmor implements INameableItem{ this.name = name; String texture = ModUtil.MOD_ID_LOWER+":textures/armor/"+textureBase; textures = new String[]{texture+"1.png", texture+"2.png"}; + + //Fixes vanilla's weird durability handling + this.setMaxDamage(material.getDurability(type)/10); } @Override @@ -44,7 +49,11 @@ public class ItemArmorAA extends ItemArmor implements INameableItem{ @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld){ - ItemUtil.addInformation(this, list, 1, ""); + if(KeyUtil.isShiftPressed()){ + list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+"."+this.getName()+".desc")); + list.add(StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".durability.desc") + ": " + (this.getMaxDamage()-this.getDamage(stack)) + "/" + this.getMaxDamage()); + } + else list.add(ItemUtil.shiftForInfo()); } @Override