Merge pull request #93 from TacoMonkey11/master

optimize Dwarven HUD & add draggable config

2 files changed, 98 insertions, 25 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
index a75ab412..6d4bf812 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,10 +1,12 @@
 package me.xmrvizzy.skyblocker.skyblock.dwarven;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.text.LiteralTextContent;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
@@ -13,13 +15,16 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class DwarvenHud {
 
 
     public static MinecraftClient client = MinecraftClient.getInstance();
+    public static List<Commission> commissionList = new ArrayList<>();
 
-    public static final List<Pattern> COMMISSIONS = List.of(
+
+    public static final List<Pattern> COMMISSIONS = Stream.of(
             "(?:Titanium|Mithril|Hard Stone) Miner",
             "(?:Ice Walker|Goblin|Goblin Raid|Automaton|Sludge|Team Treasurite Member|Yog|Boss Corleone|Thyst) Slayer",
             "(?:Lava Springs|Cliffside Veins|Rampart's Quarry|Upper Mines|Royal Mines) Mithril",
@@ -32,33 +37,47 @@ public class DwarvenHud {
             "(?:Ruby|Amber|Sapphire|Jade|Amethyst|Topaz) Gemstone Collector",
             "(?:Amber|Sapphire|Jade|Amethyst|Topaz) Crystal Hunter",
             "Chest Looter"
-            ).stream().map(s -> Pattern.compile("^.*(" + s + "): (\\d+\\.?\\d*%|DONE)"))
+            ).map(s -> Pattern.compile("^.*(" + s + "): (\\d+\\.?\\d*%|DONE)"))
             .collect(Collectors.toList());
-    public static void init(){
+    public static void init() {
+        ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
+                .then(ClientCommandManager.literal("hud")
+                        .then(ClientCommandManager.literal("dwarven")
+                                .executes(context -> {
+                                    client.send(() -> client.setScreen(new DwarvenHudConfigScreen(Text.of("Dwarven HUD Config"))));
+                                    return 1;
+                                })))));
+
         HudRenderCallback.EVENT.register((matrixStack, tickDelta) -> {
-            if (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled) {
-                int hudX = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x;
-                int hudY = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y;
-                List<Commission> commissions = new ArrayList<>();
-                client.getNetworkHandler().getPlayerList().forEach(playerListEntry -> {
-                    if (playerListEntry.getDisplayName() != null) {
-                        for (Pattern pattern : COMMISSIONS) {
-                            Matcher matcher = pattern.matcher(playerListEntry.getDisplayName().getString());
-                            if (matcher.find()) {
-                                commissions.add(new Commission(matcher.group(1), matcher.group(2)));
-                            }
+            if (!SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled || client.player == null || commissionList.isEmpty()) return;
+            render(matrixStack, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y, commissionList);
+        });
+    }
 
-                        }
-                    }
-                });
-                if (commissions.size() > 0){
-                    if (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground)
-                        DrawableHelper.fill(matrixStack, hudX, hudY, hudX + 200, hudY + (20 * commissions.size()), 0x64000000);
-                    int y = 0;
-                    for (Commission commission : commissions) {
-                        client.textRenderer.drawWithShadow(matrixStack, Text.literal(commission.commission).styled(style -> style.withColor(Formatting.AQUA)).append(Text.literal(": " + commission.progression).styled(style -> style.withColor(Formatting.GREEN))), hudX + 5, hudY + y + 5, 0xFFFFFFFF);
-                        y += 20;
+    public static void render(MatrixStack matrixStack, int hudX, int hudY, List<Commission> commissions) {
+        if (commissions.size() > 0){
+            if (SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground)
+                DrawableHelper.fill(matrixStack, hudX, hudY, hudX + 200, hudY + (20 * commissions.size()), 0x64000000);
+            int y = 0;
+            for (Commission commission : commissions) {
+                client.textRenderer.drawWithShadow(matrixStack, Text.literal(commission.commission).styled(style -> style.withColor(Formatting.AQUA)).append(Text.literal(": " + commission.progression).styled(style -> style.withColor(Formatting.GREEN))), hudX + 5, hudY + y + 5, 0xFFFFFFFF);
+                y += 20;
+            }
+        }
+    }
+
+    public static void update() {
+        commissionList = new ArrayList<>();
+        if (client.player == null || !SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled) return;
+
+        client.getNetworkHandler().getPlayerList().forEach(playerListEntry -> {
+            if (playerListEntry.getDisplayName() != null) {
+                for (Pattern pattern : COMMISSIONS) {
+                    Matcher matcher = pattern.matcher(playerListEntry.getDisplayName().getString());
+                    if (matcher.find()) {
+                        commissionList.add(new Commission(matcher.group(1), matcher.group(2)));
                     }
+
                 }
             }
         });
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
new file mode 100644
index 00000000..7dcb2b3b
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -0,0 +1,54 @@
+package me.xmrvizzy.skyblocker.skyblock.dwarven;
+
+import me.shedaniel.autoconfig.AutoConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.RenderUtils;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+
+import java.awt.*;
+import java.util.List;
+
+public class DwarvenHudConfigScreen extends Screen {
+
+    private int hudX = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x;
+    private int hudY = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y;
+    protected DwarvenHudConfigScreen(Text title) {
+        super(title);
+    }
+
+    @Override
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        super.render(matrices, mouseX, mouseY, delta);
+        renderBackground(matrices);
+        DwarvenHud.render(matrices, hudX, hudY, List.of(new DwarvenHud.Commission("Test Commission 1", "1%"), new DwarvenHud.Commission("Test Commission 2", "2%")));
+        drawCenteredText(matrices, textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB());
+    }
+
+    @Override
+    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
+        if (RenderUtils.pointExistsInArea((int) mouseX, (int) mouseY, hudX, hudY, hudX + 200, hudY + 40) && button == 0) {
+            hudX = (int) Math.max(Math.min(mouseX - 100, this.width - 200), 0);
+            hudY = (int) Math.max(Math.min(mouseY - 20, this.height - 40), 0);
+        }
+        return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+    }
+
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (button == 1) {
+            hudX = this.width / 2 - 100;
+            hudY = this.height / 2 - 20;
+        }
+        return super.mouseClicked(mouseX, mouseY, button);
+    }
+
+    @Override
+    public void close() {
+        SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x = hudX;
+        SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y = hudY;
+        AutoConfig.getConfigHolder(SkyblockerConfig.class).save();
+        super.close();
+    }
+}