Fix oversight from PR #2712 where the non tool (wrenches, hammers, etc) but usable items (spray cans, lighters, etc) weren't accounted for

Author: Zorbatron

src/main/java/gregtech/api/items/metaitem/stats/IItemDurabilityManager.java

@@ -9,7 +9,7 @@
 
 public interface IItemDurabilityManager extends IItemComponent {
 
-    /** The durability remaining on this item (double from 0 to 1). */
+    /** The durability remaining on this item (double from 0 to 1 as the durability is used up). */
     double getDurabilityForDisplay(ItemStack itemStack);
 
     /** The first and last colors of a gradient. Default to Green durability gradient (null Pair). */

src/main/java/gregtech/api/items/toolitem/IGTTool.java

@@ -649,7 +649,7 @@ default AoESymmetrical getAoEDefinition(ItemStack stack) {
     default double definition$getDurabilityForDisplay(ItemStack stack) {
         int damage = stack.getItem().getDamage(stack);
         int maxDamage = stack.getItem().getMaxDamage(stack);
-        return (double) damage / (double) maxDamage;
+        return GTUtility.calculateDurabilityFromDamageTaken(damage, maxDamage);
     }
 
     @Nullable

src/main/java/gregtech/api/util/GTUtility.java

@@ -1023,4 +1023,26 @@ public static int combineRGB(@Range(from = 0, to = 255) int r, @Range(from = 0,
         }
         return map.get(key.toWildcard());
     }
+
+    /**
+     * Calculate the percentage of durability
+     * 
+     * @param damageTaken   how many points of durability damage the item has
+     * @param maxDurability the maximum durability the item can have
+     * @return 0 = full durability, 1 = zero durability
+     */
+    public static double calculateDurabilityFromDamageTaken(int damageTaken, int maxDurability) {
+        return (double) damageTaken / maxDurability;
+    }
+
+    /**
+     * Calculate the percentage of durability
+     * 
+     * @param remainingDurability how much durability out of the maximum the item has left
+     * @param maxDurability       the maximum durability the item can have
+     * @return 0 = full durability, 1 = zero durability
+     */
+    public static double calculateDurabilityFromRemaining(int remainingDurability, int maxDurability) {
+        return (double) (maxDurability - remainingDurability) / maxDurability;
+    }
 }

src/main/java/gregtech/common/items/armor/PowerlessJetpack.java

@@ -283,10 +283,11 @@ public Behaviour(int internalCapacity) {
         public double getDurabilityForDisplay(@NotNull ItemStack itemStack) {
             IFluidHandlerItem fluidHandlerItem = itemStack
                     .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
-            if (fluidHandlerItem == null) return 0;
+            if (fluidHandlerItem == null) return 1.0d;
             IFluidTankProperties fluidTankProperties = fluidHandlerItem.getTankProperties()[0];
             FluidStack fluidStack = fluidTankProperties.getContents();
-            return fluidStack == null ? 0 : (double) fluidStack.amount / (double) fluidTankProperties.getCapacity();
+            return fluidStack == null ? 1.0d :
+                    GTUtility.calculateDurabilityFromRemaining(fluidStack.amount, fluidTankProperties.getCapacity());
         }
 
         @Nullable

src/main/java/gregtech/common/items/behaviors/AbstractMaterialPartBehavior.java

@@ -8,6 +8,7 @@
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.Materials;
 import gregtech.api.unification.material.properties.PropertyKey;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.LocalizationUtils;
 
 import net.minecraft.client.resources.I18n;
@@ -89,7 +90,6 @@ public int getItemStackColor(ItemStack itemStack, int tintIndex) {
 
     @Override
     public double getDurabilityForDisplay(ItemStack itemStack) {
-        int maxDurability = getPartMaxDurability(itemStack);
-        return (double) (maxDurability - getPartDamage(itemStack)) / (double) maxDurability;
+        return GTUtility.calculateDurabilityFromDamageTaken(getPartDamage(itemStack), getPartMaxDurability(itemStack));
     }
 }

src/main/java/gregtech/common/items/behaviors/FoamSprayerBehavior.java

@@ -8,6 +8,7 @@
 import gregtech.api.items.metaitem.stats.ISubItemHandler;
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.unification.material.Materials;
+import gregtech.api.util.GTUtility;
 import gregtech.api.util.GradientUtil;
 import gregtech.common.blocks.BlockFrame;
 import gregtech.common.blocks.MetaBlocks;
@@ -90,7 +91,8 @@ public double getDurabilityForDisplay(ItemStack itemStack) {
         if (fluidHandlerItem == null) return 0;
         IFluidTankProperties fluidTankProperties = fluidHandlerItem.getTankProperties()[0];
         FluidStack fluidStack = fluidTankProperties.getContents();
-        return fluidStack == null ? 0 : (double) fluidStack.amount / (double) fluidTankProperties.getCapacity();
+        return fluidStack == null ? 0 :
+                GTUtility.calculateDurabilityFromRemaining(fluidStack.amount, fluidTankProperties.getCapacity());
     }
 
     @Nullable

src/main/java/gregtech/common/items/behaviors/LighterBehaviour.java

@@ -227,13 +227,14 @@ public double getDurabilityForDisplay(ItemStack itemStack) {
             IFluidHandlerItem fluidHandlerItem = itemStack
                     .getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null);
             if (fluidHandlerItem == null) return 0.0;
-            IFluidTankProperties properties = fluidHandlerItem.getTankProperties()[0];
-            FluidStack fluidStack = properties.getContents();
-            return fluidStack == null ? 0.0 : (double) fluidStack.amount / (double) properties.getCapacity();
+            IFluidTankProperties fluidTankProperties = fluidHandlerItem.getTankProperties()[0];
+            FluidStack fluidStack = fluidTankProperties.getContents();
+            return fluidStack == null ? 0.0 :
+                    GTUtility.calculateDurabilityFromRemaining(fluidStack.amount, fluidTankProperties.getCapacity());
         }
         if (hasMultipleUses) {
             // Matchbox
-            return (double) getUsesLeft(itemStack) / (double) maxUses;
+            return GTUtility.calculateDurabilityFromRemaining(getUsesLeft(itemStack), maxUses);
         }
         // no durability for Match
         return 0.0;

src/main/java/gregtech/common/items/behaviors/spray/DurabilitySprayBehavior.java

@@ -34,12 +34,12 @@ public class DurabilitySprayBehavior extends AbstractSprayBehavior implements II
     private final Pair<Color, Color> durabilityBarColors;
     @NotNull
     private final ItemStack replacementStack;
-    public final int totalUses;
+    public final int maxUses;
 
-    public DurabilitySprayBehavior(@NotNull ItemStack replacementStack, int totalUses, @Nullable EnumDyeColor color) {
+    public DurabilitySprayBehavior(@NotNull ItemStack replacementStack, int maxUses, @Nullable EnumDyeColor color) {
         this.color = color;
         this.replacementStack = replacementStack;
-        this.totalUses = totalUses;
+        this.maxUses = maxUses;
         this.durabilityBarColors = GradientUtil.getGradient(color == null ? 0x969696 : color.colorValue, 10);
     }
 
@@ -75,7 +75,7 @@ public EnumActionResult useFromToolbelt(@NotNull EntityPlayer player, @NotNull W
 
     public void useItemDurability(@NotNull EntityPlayer player, @NotNull EnumHand hand, @NotNull ItemStack stack,
                                   @NotNull ItemStack replacementStack) {
-        int usesLeft = getUsesLeft(stack, totalUses);
+        int usesLeft = getUsesLeft(stack);
         if (!player.capabilities.isCreativeMode) {
             if (--usesLeft <= 0) {
                 if (replacementStack.isEmpty()) {
@@ -92,10 +92,10 @@ public void useItemDurability(@NotNull EntityPlayer player, @NotNull EnumHand ha
         }
     }
 
-    protected static int getUsesLeft(@NotNull ItemStack stack, int defaultUsesLeft) {
+    protected int getUsesLeft(@NotNull ItemStack stack) {
         NBTTagCompound tagCompound = stack.getTagCompound();
         if (tagCompound == null || !tagCompound.hasKey(NBT_KEY, Constants.NBT.TAG_INT)) {
-            return defaultUsesLeft;
+            return maxUses;
         }
 
         return tagCompound.getInteger(NBT_KEY);
@@ -107,7 +107,7 @@ protected static void setUsesLeft(@NotNull ItemStack itemStack, int usesLeft) {
 
     @Override
     public void addInformation(ItemStack itemStack, List<String> lines) {
-        int remainingUses = getUsesLeft(itemStack, totalUses);
+        int remainingUses = getUsesLeft(itemStack);
         EnumDyeColor color = getColor();
 
         if (color != null) {
@@ -125,7 +125,7 @@ public void addInformation(ItemStack itemStack, List<String> lines) {
 
     @Override
     public double getDurabilityForDisplay(ItemStack itemStack) {
-        return (double) getUsesLeft(itemStack, totalUses) / totalUses;
+        return GTUtility.calculateDurabilityFromRemaining(getUsesLeft(itemStack), maxUses);
     }
 
     @Nullable