From 527a5ef507975200f96680459bb30b953f128247 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 5 Feb 2023 19:28:52 +0900 Subject: Fix tooltip for spray can and lighter when full (#1716) --- src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java | 2 +- .../java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java index db10ecfa8e..b1357a0777 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java @@ -130,7 +130,7 @@ public class Behaviour_Lighter extends Behaviour_None { public List getAdditionalToolTips(GT_MetaBase_Item aItem, List aList, ItemStack aStack) { aList.add(this.mTooltip); NBTTagCompound tNBT = aStack.getTagCompound(); - long tFuelAmount = tNBT == null ? 0L + long tFuelAmount = tNBT == null ? this.mFuelAmount : GT_Utility.areStacksEqual(aStack, this.mFullLighter, true) ? this.mFuelAmount : tNBT.getLong("GT.LighterFuel"); aList.add(this.mTooltipUses + " " + tFuelAmount); diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java index a5a47ddb85..f5b4615a21 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java @@ -129,7 +129,7 @@ public class Behaviour_Spray_Color extends Behaviour_None { public List getAdditionalToolTips(GT_MetaBase_Item aItem, List aList, ItemStack aStack) { aList.add(this.mTooltip); NBTTagCompound tNBT = aStack.getTagCompound(); - long tRemainingPaint = tNBT == null ? 0L + long tRemainingPaint = tNBT == null ? this.mUses : GT_Utility.areStacksEqual(aStack, this.mFull, true) ? this.mUses : tNBT.getLong("GT.RemainingPaint"); aList.add(this.mTooltipUses + " " + tRemainingPaint); aList.add(this.mTooltipUnstackable); -- cgit