Skip to content

Fixed the armor hud crashing when durability text is enabled #6662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c8dhjp4tyv-bit wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −5
Open

Fixed the armor hud crashing when durability text is enabled #6662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/main/java/meteordevelopment/meteorclient/systems/hud/elements/ArmorHud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ public void render(HudRenderer renderer) {

double armorX, armorY;

boolean durabilityText = durability.get() != Durability.Bar && durability.get() != Durability.None;
TextRenderer textRenderer = TextRenderer.get();
if (durabilityText) textRenderer.begin(renderer.graphics, Hud.get().getTextScale());

for (int position = 0; position < 4; position++) {
ItemStack itemStack = armor[position];

Expand All @@ -165,27 +169,30 @@ public void render(HudRenderer renderer) {

renderer.item(itemStack, (int) armorX, (int) armorY, getScale(), (itemStack.isDamageableItem() && durability.get() == Durability.Bar));

if (itemStack.isDamageableItem() && durability.get() != Durability.Bar && durability.get() != Durability.None) {
if (durabilityText && itemStack.isDamageableItem()) {
String message = switch (durability.get()) {
case Total -> Integer.toString(itemStack.getMaxDamage() - itemStack.getDamageValue());
case Percentage ->
Integer.toString(Math.round(((itemStack.getMaxDamage() - itemStack.getDamageValue()) * 100f) / (float) itemStack.getMaxDamage()));
default -> "err";
};

double messageWidth = renderer.textWidth(message);
double messageWidth = textRenderer.getWidth(message, durabilityShadow.get());
double messageHeight = textRenderer.getHeight(durabilityShadow.get());

if (orientation.get() == Orientation.Vertical) {
armorX = x + 8 * getScale() - messageWidth / 2.0;
armorY = y + (18 * position * getScale()) + (18 * getScale() - renderer.textHeight());
armorY = y + (18 * position * getScale()) + (18 * getScale() - messageHeight);
} else {
armorX = x + 18 * position * getScale() + 8 * getScale() - messageWidth / 2.0;
armorY = y + (getHeight() - renderer.textHeight());
armorY = y + (getHeight() - messageHeight);
}

TextRenderer.get().render(message, armorX, armorY, durabilityColor.get(), durabilityShadow.get());
textRenderer.render(message, armorX, armorY, durabilityColor.get(), durabilityShadow.get());
}
}

if (durabilityText) textRenderer.end();
});
}

Expand Down
Loading