From edaa7c7e662bd53d9a290169dff47321ba7f2675 Mon Sep 17 00:00:00 2001 From: Kevin <92656833+kevinthegreat1@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:35:35 -0400 Subject: Fix Dwarven Hud (#617) --- .../skyblocker/skyblock/dwarven/DwarvenHud.java | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java index b4ffd409..3297ef5a 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/DwarvenHud.java @@ -43,8 +43,8 @@ public class DwarvenHud { "First Event", "(?:Ruby|Amber|Sapphire|Jade|Amethyst|Topaz) Gemstone Collector", "(?:Amber|Sapphire|Jade|Amethyst|Topaz) Crystal Hunter", - "Chest Looter").map(s -> Pattern.compile("(" + s + "): (\\d+\\.?\\d*%|DONE)")) - .collect(Collectors.toList()); + "Chest Looter").map(s -> Pattern.compile("(" + s + "): (\\d+\\.?\\d*%|DONE)") + ).collect(Collectors.toList()); public static final Pattern MITHRIL_PATTERN = Pattern.compile("Mithril Powder: [0-9,]+"); public static final Pattern GEMSTONE_PATTERN = Pattern.compile("Gemstone Powder: [0-9,]+"); @@ -52,10 +52,13 @@ public class DwarvenHud { ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker") .then(ClientCommandManager.literal("hud") .then(ClientCommandManager.literal("dwarven") - .executes(Scheduler.queueOpenScreenCommand(DwarvenHudConfigScreen::new)))))); + .executes(Scheduler.queueOpenScreenCommand(DwarvenHudConfigScreen::new)) + ) + ) + )); HudRenderCallback.EVENT.register((context, tickDelta) -> { - if ((!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) + if (!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder || client.options.playerListKey.isPressed() || client.player == null || (!Utils.isInDwarvenMines() && !Utils.isInCrystalHollows())) { @@ -103,24 +106,21 @@ public class DwarvenHud { percentage = 100f; } - context - .drawTextWithShadow(client.textRenderer, - Text.literal(commission.commission + ": ").formatted(Formatting.AQUA) - .append(Text.literal(commission.progression).formatted(Colors.hypixelProgressColor(percentage))), - comHudX + 5, comHudY + y + 5, 0xFFFFFFFF); + context.drawTextWithShadow(client.textRenderer, + Text.literal(commission.commission + ": ").formatted(Formatting.AQUA) + .append(Text.literal(commission.progression).formatted(Colors.hypixelProgressColor(percentage))), + comHudX + 5, comHudY + y + 5, 0xFFFFFFFF); y += 20; } } - if(SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) { + if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) { //render mithril powder then gemstone - context - .drawTextWithShadow(client.textRenderer, - Text.literal("Mithril: " + mithrilPowder).formatted(Formatting.AQUA), - powderHudX + 5, powderHudY + 5, 0xFFFFFFFF); - context - .drawTextWithShadow(client.textRenderer, - Text.literal("Gemstone: " + gemStonePowder).formatted(Formatting.DARK_PURPLE), - powderHudX + 5, powderHudY + 25, 0xFFFFFFFF); + context.drawTextWithShadow(client.textRenderer, + Text.literal("Mithril: " + mithrilPowder).formatted(Formatting.AQUA), + powderHudX + 5, powderHudY + 5, 0xFFFFFFFF); + context.drawTextWithShadow(client.textRenderer, + Text.literal("Gemstone: " + gemStonePowder).formatted(Formatting.DARK_PURPLE), + powderHudX + 5, powderHudY + 25, 0xFFFFFFFF); } } @@ -146,22 +146,22 @@ public class DwarvenHud { hcw.update(); hcw.setX(comHudX); hcw.setY(comHudY); - hcw.render(context, - SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + hcw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); } if (SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) { hpw.update(); hpw.setX(powderHudX); hpw.setY(powderHudY); - hpw.render(context, - SkyblockerConfigManager.get().general.tabHud.enableHudBackground); + hpw.render(context, SkyblockerConfigManager.get().general.tabHud.enableHudBackground); } } public static void update() { - if (client.player == null || client.getNetworkHandler() == null || (!SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder) - || (!Utils.isInCrystalHollows() && !Utils.isInDwarvenMines())) + if (client.player == null || client.getNetworkHandler() == null + || !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledCommissions && !SkyblockerConfigManager.get().locations.dwarvenMines.dwarvenHud.enabledPowder + || !Utils.isInCrystalHollows() && !Utils.isInDwarvenMines()) { return; + } commissionList = new ArrayList<>(); -- cgit