From 3d7dc85f5d0079143af1240f81ad8fa449fddb4d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 Dec 2019 16:40:35 -0600 Subject: [PATCH] Fix mana mirror counting as a tool --- .../vazkii/botania/common/item/ItemManaMirror.java | 10 +++++++--- src/main/java/vazkii/botania/common/item/ModItems.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 80fbf0bbe..06db325c5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -51,9 +51,13 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public int getDamage(ItemStack stack) { - float mana = getMana(stack); - return 1000 - (int) (mana / TilePool.MAX_MANA * 1000); + public boolean showDurabilityBar(ItemStack stack) { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) { + return 1 - getManaFractionForDisplay(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index fced67334..f7d26bfa0 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -555,7 +555,7 @@ public final class ModItems { register(r, new ItemHorn(unstackable()), LibItemNames.GRASS_HORN); register(r, new ItemHorn(unstackable()), LibItemNames.LEAVES_HORN); register(r, new ItemHorn(unstackable()), LibItemNames.SNOW_HORN); - register(r, new ItemManaMirror(unstackable().defaultMaxDamage(1000).setNoRepair()), LibItemNames.MANA_MIRROR); + register(r, new ItemManaMirror(unstackable()), LibItemNames.MANA_MIRROR); register(r, new ItemManasteelHelm(unstackable()), LibItemNames.MANASTEEL_HELM); register(r, new ItemManasteelHelmRevealing(unstackable()), LibItemNames.MANASTEEL_HELM_R); register(r, new ItemManasteelArmor(EquipmentSlotType.CHEST, unstackable()), LibItemNames.MANASTEEL_CHEST);