From ed9bd19c9bc02a702b397791f59927a2f0ebc664 Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 10:30:11 -0600 Subject: another one --- .../gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/item/chemistry') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index ed17f8547a..b9784f607a 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -177,7 +177,7 @@ public class ItemGenericChemBase extends Item { createCatalystNBT(aStack); } double currentDamage = getCatalystDamage(aStack); - double durabilitypercent = currentDamage / 100; + double durabilitypercent = currentDamage / getCatalystMaxDamage(aStack); return durabilitypercent; } else { -- cgit From 84cc741a3b243d46caccfd0b512a612d4e86a59f Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 10:32:21 -0600 Subject: similar for milling ball (what is a milling ball?) --- .../gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/item/chemistry') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index b9784f607a..c00267c880 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -169,7 +169,7 @@ public class ItemGenericChemBase extends Item { createMillingBallNBT(aStack); } double currentDamage = getMillingBallDamage(aStack); - double durabilitypercent = currentDamage / 100; + double durabilitypercent = currentDamage / getMillingBallMaxDamage(aStack); return durabilitypercent; } else if (ItemUtils.isCatalyst(aStack)) { -- cgit From b95f305b846186e1c52698a061365c595370dfbb Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 10:34:02 -0600 Subject: this is more appropriate I think --- .../gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/core/item/chemistry') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index c00267c880..a3e1917d0d 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -169,7 +169,7 @@ public class ItemGenericChemBase extends Item { createMillingBallNBT(aStack); } double currentDamage = getMillingBallDamage(aStack); - double durabilitypercent = currentDamage / getMillingBallMaxDamage(aStack); + double durabilitypercent = currentDamage / getMaxBallDurability(aStack); return durabilitypercent; } else if (ItemUtils.isCatalyst(aStack)) { -- cgit From 147049b97edef96990c94d997dd9c934b06eb68f Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 10:38:26 -0600 Subject: minor refactor --- .../core/item/chemistry/general/ItemGenericChemBase.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item/chemistry') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index a3e1917d0d..83dc1550cc 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -159,8 +159,6 @@ public class ItemGenericChemBase extends Item { public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName() + "." + stack.getItemDamage(); } - - @Override public double getDurabilityForDisplay(ItemStack aStack) { @@ -169,16 +167,14 @@ public class ItemGenericChemBase extends Item { createMillingBallNBT(aStack); } double currentDamage = getMillingBallDamage(aStack); - double durabilitypercent = currentDamage / getMaxBallDurability(aStack); - return durabilitypercent; + return currentDamage / getMaxBallDurability(aStack); } else if (ItemUtils.isCatalyst(aStack)) { if (aStack.getTagCompound() == null || aStack.getTagCompound().hasNoTags()){ createCatalystNBT(aStack); } double currentDamage = getCatalystDamage(aStack); - double durabilitypercent = currentDamage / getCatalystMaxDamage(aStack); - return durabilitypercent; + return currentDamage / getCatalystMaxDamage(aStack); } else { return 1D; -- cgit From c4d3b0592818da6c15b658733314056947cd0996 Mon Sep 17 00:00:00 2001 From: Tom Dickson Date: Wed, 24 Nov 2021 10:50:39 -0600 Subject: display red at 0 shouldn't be possible to get to zero but .... --- .../core/item/chemistry/general/ItemGenericChemBase.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/Java/gtPlusPlus/core/item/chemistry') diff --git a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java index 83dc1550cc..9a00b49342 100644 --- a/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java +++ b/src/Java/gtPlusPlus/core/item/chemistry/general/ItemGenericChemBase.java @@ -204,10 +204,7 @@ public class ItemGenericChemBase extends Item { aHasSpecialTooltips = true; } if (aHasSpecialTooltips) { - if (aDam > aDamageSegment * 4){ - durability = EnumChatFormatting.GRAY; - } - else if (aDam > aDamageSegment * 3){ + if (aDam > aDamageSegment * 3){ durability = EnumChatFormatting.GREEN; } else if (aDam > aDamageSegment * 2){ @@ -216,7 +213,7 @@ public class ItemGenericChemBase extends Item { else if (aDam > aDamageSegment){ durability = EnumChatFormatting.GOLD; } - else if (aDam > 0){ + else if (aDam >= 0){ durability = EnumChatFormatting.RED; } list.add(durability+""+(aDam)+EnumChatFormatting.GRAY+" / "+aMaxDamage); @@ -318,6 +315,4 @@ public class ItemGenericChemBase extends Item { public static int getMaxCatalystDurability(ItemStack aStack) { return 50; } - - } -- cgit