From e6e4ef4021410b8c11f5f4f355a075d49571925c Mon Sep 17 00:00:00 2001 From: Abdiel Kavash <19243993+AbdielKavash@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:40:00 -0600 Subject: Advanced Muffler Hatch improvements (#825) * Advanced Muffler Hatch improvements. * Without an air filter, performance degrades to the level of a basic muffler, not to zero. --- src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/item') diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java index 7989187a7e..e82e6f1b44 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java @@ -88,6 +88,10 @@ public class ItemAirFilter extends Item { return true; } + public static final long getFilterMaxDamage(final ItemStack aStack) { + return aStack.getItemDamage() == 0 ? 50 : 2500; + } + public static final long getFilterDamage(final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { @@ -119,7 +123,7 @@ public class ItemAirFilter extends Item { createNBT(stack); } double currentDamage = getFilterDamage(stack); - double meta = stack.getItemDamage() == 0 ? 50 : 2500; + double meta = getFilterMaxDamage(stack); double durabilitypercent = currentDamage / meta; return durabilitypercent; } @@ -127,7 +131,7 @@ public class ItemAirFilter extends Item { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { list.add(EnumChatFormatting.GRAY + "An Air filter for Atmospheric Reconditioning."); - int maxDamage = (stack.getItemDamage() == 0 ? 50 : 2500); + long maxDamage = getFilterMaxDamage(stack); list.add(EnumChatFormatting.GRAY + "" + (maxDamage - getFilterDamage(stack)) + "/" + maxDamage + " uses left."); super.addInformation(stack, player, list, bool); } -- cgit