diff options
| author | miozune <miozune@gmail.com> | 2023-02-05 19:28:52 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-05 11:28:52 +0100 |
| commit | 527a5ef507975200f96680459bb30b953f128247 (patch) | |
| tree | 7a47821fc476d988b4928bb686a2dfd821cbe0e4 /src/main/java/gregtech | |
| parent | 87d9c661960db58dbf5213fbb6b420944681b85f (diff) | |
| download | GT5-Unofficial-527a5ef507975200f96680459bb30b953f128247.tar.gz GT5-Unofficial-527a5ef507975200f96680459bb30b953f128247.tar.bz2 GT5-Unofficial-527a5ef507975200f96680459bb30b953f128247.zip | |
Fix tooltip for spray can and lighter when full (#1716)
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Lighter.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java | 2 |
2 files changed, 2 insertions, 2 deletions
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<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> 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<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> 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); |