diff options
author | Martin Robertz <dream-master@gmx.net> | 2021-11-27 20:49:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-27 20:49:49 +0100 |
commit | 225764a6f34a2259009c27cc09bb1f39b5ba143e (patch) | |
tree | c409e20a16084d6340ebce6701e6330b5389a288 /src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java | |
parent | 3c21a8ffe1880801fb08670c33d73cb3f99af4d0 (diff) | |
parent | 7abed4ed651076f7c8a1338c0dc1dbca4c42247f (diff) | |
download | GT5-Unofficial-225764a6f34a2259009c27cc09bb1f39b5ba143e.tar.gz GT5-Unofficial-225764a6f34a2259009c27cc09bb1f39b5ba143e.tar.bz2 GT5-Unofficial-225764a6f34a2259009c27cc09bb1f39b5ba143e.zip |
Merge pull request #45 from bombcar/master
fix catalyst durability bar
Diffstat (limited to 'src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java')
-rw-r--r-- | src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java index c3c51983e3..32a63e8684 100644 --- a/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java +++ b/src/Java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java @@ -240,8 +240,8 @@ public class ItemAgrichemBase extends Item { createCatalystNBT(aStack); } double currentDamage = getCatalystDamage(aStack); - double durabilitypercent = currentDamage / 100; - return durabilitypercent; + double durabilitypercent = currentDamage / getCatalystMaxDamage(aStack); + return durabilitypercent; } else { return 1D; @@ -264,10 +264,7 @@ public class ItemAgrichemBase 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){ @@ -276,7 +273,7 @@ public class ItemAgrichemBase 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); |