Misc fixes and changes

7 files changed, 16 insertions, 18 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 04cfaea3..36ac4472 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -193,9 +193,8 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         @ConfigEntry.Gui.Tooltip
         public NameSorting nameSorting = NameSorting.DEFAULT;
-        
     }
-    
+
     public enum NameSorting {
     	DEFAULT,
         ALPHABETICAL;
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 8f8afb3a..c1274e1e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHud.java
@@ -89,6 +89,7 @@ public class DwarvenHud {
 
     public static void renderSimple(DrawContext context, int hudX, int hudY, List<Commission> commissions) {
         HudCommsWidget.INSTANCE.updateData(commissions, false);
+        HudCommsWidget.INSTANCE.update();
         HudCommsWidget.INSTANCE.setX(hudX);
         HudCommsWidget.INSTANCE.setY(hudY);
         HudCommsWidget.INSTANCE.render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
@@ -96,6 +97,7 @@ public class DwarvenHud {
 
     public static void renderFancy(DrawContext context, int hudX, int hudY, List<Commission> commissions) {
         HudCommsWidget.INSTANCE.updateData(commissions, true);
+        HudCommsWidget.INSTANCE.update();
         HudCommsWidget.INSTANCE.setX(hudX);
         HudCommsWidget.INSTANCE.setY(hudY);
         HudCommsWidget.INSTANCE.render(context, SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.enableBackground);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/TabHud.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/TabHud.java
index 6d90b269..8f18e367 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/TabHud.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/TabHud.java
@@ -10,8 +10,8 @@ import net.minecraft.client.util.InputUtil;
 
 public class TabHud {
 
-    public static KeyBinding playerTgl;
-    public static KeyBinding genericTgl;
+    public static KeyBinding toggleB;
+    public static KeyBinding toggleA;
     // public static KeyBinding mapTgl;
     public static KeyBinding defaultTgl;
 
@@ -19,21 +19,16 @@ public class TabHud {
 
     public static void init() {
 
-        playerTgl = KeyBindingHelper.registerKeyBinding(
-                new KeyBinding("key.skyblocker.playerTgl",
+        toggleB = KeyBindingHelper.registerKeyBinding(
+                new KeyBinding("key.skyblocker.toggleB",
                         InputUtil.Type.KEYSYM,
                         GLFW.GLFW_KEY_B,
                         "key.categories.skyblocker"));
-        genericTgl = KeyBindingHelper.registerKeyBinding(
-                new KeyBinding("key.skyblocker.genericTgl",
+        toggleA = KeyBindingHelper.registerKeyBinding(
+                new KeyBinding("key.skyblocker.toggleA",
                         InputUtil.Type.KEYSYM,
                         GLFW.GLFW_KEY_N,
                         "key.categories.skyblocker"));
-        // mapTgl = KeyBindingHelper.registerKeyBinding(
-        //         new KeyBinding("key.tabhud.mapTgl",
-        //                 InputUtil.Type.KEYSYM,
-        //                 GLFW.GLFW_KEY_LEFT_ALT,
-        //                 "key.categories.skyblocker"));
         defaultTgl = KeyBindingHelper.registerKeyBinding(
                 new KeyBinding("key.skyblocker.defaultTgl",
                         InputUtil.Type.KEYSYM,
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PipelineStage.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PipelineStage.java
index e560058c..47b9e96e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PipelineStage.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screenbuilder/pipeline/PipelineStage.java
@@ -6,6 +6,8 @@ import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.Widget;
 
 public abstract class PipelineStage {
 
+    // TODO for all subclasses: error checking, use enums instead of strings
+
     protected ArrayList<Widget> primary = null;
     protected ArrayList<Widget> secondary = null;
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
index 2673e1df..3d6ce64d 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
@@ -41,9 +41,9 @@ public class Screen {
 
     public static Screen getCorrect(int w, int h, Text footer) {
 
-        if (TabHud.genericTgl.isPressed()) {
+        if (TabHud.toggleA.isPressed()) {
             return Screen.correctGenericScrn(w, h, footer);
-        } else if (TabHud.playerTgl.isPressed()) {
+        } else if (TabHud.toggleB.isPressed()) {
             return Screen.correctPlayerScrn(w, h, footer);
         } else {
             return Screen.correctMainScrn(w, h, footer);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java
index 5b880514..b7f58763 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonBuffWidget.java
@@ -17,7 +17,7 @@ public class DungeonBuffWidget extends Widget {
     private static final MutableText TITLE = Text.literal("Dungeon Buffs").formatted(Formatting.DARK_PURPLE,
             Formatting.BOLD);
 
-    public DungeonBuffWidget(String footertext) {
+    public DungeonBuffWidget() {
         super(TITLE, Formatting.DARK_PURPLE.getColorValue());
     }
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java
index 04327365..31370dc6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java
@@ -21,8 +21,6 @@ public class PlayerListWidget extends Widget {
     private static final MutableText TITLE = Text.literal("Players").formatted(Formatting.GREEN,
             Formatting.BOLD);
 
-    private final ArrayList<PlayerListEntry> list = new ArrayList<>();
-
     public PlayerListWidget() {
         super(TITLE, Formatting.GREEN.getColorValue());
 
@@ -30,6 +28,8 @@ public class PlayerListWidget extends Widget {
 
     @Override
     public void updateContent() {
+        ArrayList<PlayerListEntry> list = new ArrayList<>();
+
         // hard cap to 4x20 entries.
         // 5x20 is too wide (and not possible in theory. in reality however...)
         int listlen = Math.min(PlayerListMgr.getSize(), 160);