From a60f1c76f1a6517006ef4905574d27ce34db802a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 25 Jun 2015 11:57:06 +0200 Subject: [PATCH] Should fix tablet durability/energy bar being inverted, closes #1241. Also always show bar for hover boots. --- src/main/scala/li/cil/oc/common/item/HoverBoots.scala | 2 ++ src/main/scala/li/cil/oc/common/item/Tablet.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/item/HoverBoots.scala b/src/main/scala/li/cil/oc/common/item/HoverBoots.scala index 694f4de2b..9f32b8981 100644 --- a/src/main/scala/li/cil/oc/common/item/HoverBoots.scala +++ b/src/main/scala/li/cil/oc/common/item/HoverBoots.scala @@ -61,6 +61,8 @@ class HoverBoots extends ItemArmor(ItemArmor.ArmorMaterial.DIAMOND, 0, 3) with t else null } + override def showDurabilityBar(stack: ItemStack): Boolean = true + override def getDurabilityForDisplay(stack: ItemStack): Double = { val data = new HoverBootsData(stack) 1 - data.charge / Settings.get.bufferHoverBoots diff --git a/src/main/scala/li/cil/oc/common/item/Tablet.scala b/src/main/scala/li/cil/oc/common/item/Tablet.scala index 9731f683a..edc3070f6 100644 --- a/src/main/scala/li/cil/oc/common/item/Tablet.scala +++ b/src/main/scala/li/cil/oc/common/item/Tablet.scala @@ -92,7 +92,7 @@ class Tablet(val parent: Delegator) extends traits.Delegate with CustomModel wit if (stack.hasTagCompound) { val data = new TabletData() data.load(stack.getTagCompound) - data.energy / data.maxEnergy + 1 - data.energy / data.maxEnergy } else 1.0 }