From 861357f31364c1abe9f09ae3f0ad3150256a2c31 Mon Sep 17 00:00:00 2001 From: Michael Brenan Date: Sat, 27 Feb 2016 23:31:22 -0600 Subject: [PATCH] Update ItemManaRing to also use durability bar instead of damage --- .../item/equipment/bauble/ItemManaRing.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index b0a5569d5..7e3fcc38c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -50,12 +50,6 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD par3List.add(new ItemStack(par1, 1, 10000)); } - @Override - public int getDamage(ItemStack stack) { - float mana = getMana(stack); - return 1000 - (int) (mana / getMaxMana(stack) * 1000); - } - @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; @@ -78,7 +72,6 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD @Override public void addMana(ItemStack stack, int mana) { setMana(stack, Math.min(getMana(stack) + mana, getMaxMana(stack))); - stack.setItemDamage(getDamage(stack)); } @Override @@ -111,4 +104,16 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD return (float) getMana(stack) / (float) getMaxMana(stack); } + @Override + public boolean showDurabilityBar(ItemStack stack) { + // For mana rings, always show the durability bar. + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) { + // As in ItemManaTablet, forge seems to have their durability swapped, hence the 1.0 - + return 1.0 - getManaFractionForDisplay(stack); + } + }