Add new "tab-menu-like" style options to dwarven mines HUD.

4 files changed, 99 insertions, 20 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index ae96a8f7..089f67c8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -277,11 +277,29 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class DwarvenHud {
         public boolean enabled = true;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        @ConfigEntry.Gui.Tooltip(count = 3)
+        public Style style = Style.SIMPLE;
         public boolean enableBackground = true;
         public int x = 10;
         public int y = 10;
     }
 
+    public enum Style {
+        SIMPLE,
+        FANCY,
+        CLASSIC;
+
+        @Override
+		public String toString() {
+            return switch (this) {
+                case SIMPLE -> "Simple";
+                case FANCY -> "Fancy";
+                case CLASSIC -> "Classic";
+            };
+        }
+    }
+
     public static class Messages {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         public ChatFilterResult hideAbility = ChatFilterResult.PASS;
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 86fe58fe..9f1e783c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -1,6 +1,7 @@
 package me.xmrvizzy.skyblocker.skyblock.dwarven;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CommsWidget;
 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;
@@ -55,17 +56,49 @@ public class DwarvenHud {
     }
 
     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;
-            }
+        if (commissions.size() <= 0) {
+            return;
+        }
+
+        switch(SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.style) {
+            case SIMPLE -> renderSimple(matrixStack, hudX, hudY, commissions);
+            case FANCY -> renderFancy(matrixStack, hudX, hudY, commissions);
+            case CLASSIC -> renderClassic(matrixStack, hudX, hudY, commissions);
+        }
+    }
+
+    public static void renderClassic(MatrixStack matrixStack, int hudX, int hudY, List<Commission> commissions) {
+        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 renderSimple(MatrixStack matrixStack, int hudX, int hudY, List<Commission> commissions) {
+        CommsWidget cw = new CommsWidget(commissions, false);
+        cw.setX(hudX);
+        cw.setY(hudY);
+        cw.render(matrixStack, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
+    }
+
+    public static void renderFancy(MatrixStack matrixStack, int hudX, int hudY, List<Commission> commissions) {
+        CommsWidget cw = new CommsWidget(commissions, true);
+        cw.setX(hudX);
+        cw.setY(hudY);
+        cw.render(matrixStack, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
+    }
+
     public static void update() {
         commissionList = new ArrayList<>();
         if (client.player == null || !SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enabled) return;
@@ -83,13 +116,7 @@ public class DwarvenHud {
         });
     }
 
-    public static class Commission{
-        final String commission;
-        final String progression;
+    // steamroller tactics to get visibility from outside classes
+    public static record Commission(String commission, String progression){}
 
-        public Commission(String commission, String progression){
-            this.commission = commission;
-            this.progression = progression;
-        }
-    }
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java
index ef86b8f0..120c53d8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java
@@ -4,10 +4,12 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.util.Ico;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.util.StrMan;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.Component;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.ProgressComponent;
-
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
@@ -46,6 +48,32 @@ public class CommsWidget extends Widget {
         this.pack();
     }
 
+    // for the dwarven hud
+    public CommsWidget(List<Commission> commissions, boolean isFancy) {
+        super(TITLE, Formatting.AQUA.getColorValue());
+        for (Commission comm : commissions) {
+
+            Text c = Text.literal(comm.commission());
+
+            float p = 100f;
+            if (!comm.progression().contains("DONE")) {
+                p = Float.parseFloat(comm.progression().substring(0, comm.progression().length() - 1));
+            }
+
+            Component comp;
+            if (isFancy) {
+                comp = new ProgressComponent(Ico.BOOK, c, p, pcntToCol(p));
+            } else {
+                comp = new PlainTextComponent(
+                        Text.literal(comm.commission() + ": ")
+                                .append(Text.literal(comm.progression()).formatted(Formatting.GREEN)));
+            }
+            this.addComponent(comp);
+        }
+        this.pack();
+
+    }
+
     private int pcntToCol(float pcnt) {
         return MathHelper.hsvToRgb(pcnt / 300f, 0.9f, 0.9f);
     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java
index 1fdad37a..63a72563 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java
@@ -73,10 +73,16 @@ public abstract class Widget {
     }
 
     public final void render(MatrixStack ms) {
+        this.render(ms, true);
+    }
+
+    public final void render(MatrixStack ms, boolean hasBG) {
 
-        DrawableHelper.fill(ms, x + 1, y, x + w - 1, y + h, COL_BG_BOX);
-        DrawableHelper.fill(ms, x, y + 1, x + 1, y + h - 1, COL_BG_BOX);
-        DrawableHelper.fill(ms, x + w - 1, y + 1, x + w, y + h - 1, COL_BG_BOX);
+        if (hasBG) {
+            DrawableHelper.fill(ms, x + 1, y, x + w - 1, y + h, COL_BG_BOX);
+            DrawableHelper.fill(ms, x, y + 1, x + 1, y + h - 1, COL_BG_BOX);
+            DrawableHelper.fill(ms, x + w - 1, y + 1, x + w, y + h - 1, COL_BG_BOX);
+        }
 
         int strHeightHalf = Widget.txtRend.fontHeight / 2;
         int strAreaWidth = Widget.txtRend.getWidth(title) + 4;