Skip to content

Commit ab6df54

Browse files
Mimic Vanilla durability system (#2712)
1 parent ed8bfef commit ab6df54

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@
4646
import net.minecraft.item.Item;
4747
import net.minecraft.item.ItemStack;
4848
import net.minecraft.nbt.NBTTagCompound;
49-
import net.minecraft.util.*;
49+
import net.minecraft.util.ActionResult;
50+
import net.minecraft.util.EnumActionResult;
51+
import net.minecraft.util.EnumFacing;
52+
import net.minecraft.util.EnumHand;
53+
import net.minecraft.util.NonNullList;
54+
import net.minecraft.util.SoundCategory;
55+
import net.minecraft.util.SoundEvent;
5056
import net.minecraft.util.math.BlockPos;
5157
import net.minecraft.util.math.RayTraceResult;
5258
import net.minecraft.world.IBlockAccess;
@@ -643,8 +649,7 @@ default AoESymmetrical getAoEDefinition(ItemStack stack) {
643649
default double definition$getDurabilityForDisplay(ItemStack stack) {
644650
int damage = stack.getItem().getDamage(stack);
645651
int maxDamage = stack.getItem().getMaxDamage(stack);
646-
if (damage == 0) return 1.0;
647-
return (double) (maxDamage - damage) / (double) maxDamage;
652+
return (double) damage / (double) maxDamage;
648653
}
649654

650655
@Nullable

src/main/java/gregtech/client/utils/ToolChargeBarRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ private static boolean renderDurabilityBar(ItemStack stack, IItemDurabilityManag
165165
boolean doDepletedColor = manager.doDamagedStateColors(stack);
166166
Color left = colors != null ? colors.getLeft() : colorBarLeftDurability;
167167
Color right = colors != null ? colors.getRight() : colorBarRightDurability;
168-
render(level, xPosition, yPosition, 0, true, left, right, doDepletedColor);
168+
render(1 - level, xPosition, yPosition, 0, true, left, right, doDepletedColor);
169169
return true;
170170
}
171171

172172
private static boolean renderDurabilityBar(double level, int xPosition, int yPosition) {
173-
render(level, xPosition, yPosition, 0, true, colorBarLeftDurability, colorBarRightDurability, true);
173+
render(1 - level, xPosition, yPosition, 0, true, colorBarLeftDurability, colorBarRightDurability, true);
174174
return true;
175175
}
176176

0 commit comments

Comments
 (0)