Put fancy tab HUD config into its own section

6 files changed, 22 insertions, 13 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index f612ae08..e89c32bd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -127,10 +127,9 @@ public class SkyblockerConfig implements ConfigData {
         public boolean backpackPreviewWithoutShift = false;
         public boolean hideEmptyTooltips = true;
 
-        public boolean tabHudEnabled = true;
-        @ConfigEntry.BoundedDiscrete(min=10, max=200)
-        @ConfigEntry.Gui.Tooltip()
-        public int tabHudScale = 100;
+        @ConfigEntry.Category("tabHud")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public TabHudConf tabHud = new TabHudConf();
 
         @ConfigEntry.Gui.Excluded
         public String apiKey;
@@ -155,6 +154,14 @@ public class SkyblockerConfig implements ConfigData {
         public List<Integer> lockedSlots = new ArrayList<>();
     }
 
+    public static class TabHudConf {
+        public boolean tabHudEnabled = true;
+
+        @ConfigEntry.BoundedDiscrete(min=10, max=200)
+        @ConfigEntry.Gui.Tooltip()
+        public int tabHudScale = 100;
+    }
+
     public static class Bars {
         public boolean enableBars = true;
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
index f4089f83..bb2c0e0c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java
@@ -35,7 +35,7 @@ public class PlayerListHudMixin {
             CallbackInfo info) {
 
         if (!Utils.isOnSkyblock
-                || !SkyblockerConfig.get().general.tabHudEnabled
+                || !SkyblockerConfig.get().general.tabHud.tabHudEnabled
                 || TabHud.defaultTgl.isPressed()) {
             return;
         }
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 8edfbb56..cc16da8b 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
@@ -34,7 +34,7 @@ public class Screen {
     private int w, h;
 
     public Screen(int w, int h) {
-        float scale = SkyblockerConfig.get().general.tabHudScale / 100f;
+        float scale = SkyblockerConfig.get().general.tabHud.tabHudScale / 100f;
         this.w = (int) (w / scale);
         this.h = (int) (h / scale);
     }
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 b7e8f1e9..c0d3bf0e 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
@@ -85,7 +85,7 @@ public abstract class Widget {
         RenderSystem.enableDepthTest();
         ms.push();
 
-        float scale = SkyblockerConfig.get().general.tabHudScale / 100f;
+        float scale = SkyblockerConfig.get().general.tabHud.tabHudScale / 100f;
         ms.scale(scale, scale, 1);
 
         // move above other UI elements
diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json
index 1b6b75ac..4a84719c 100644
--- a/src/main/resources/assets/skyblocker/lang/de_de.json
+++ b/src/main/resources/assets/skyblocker/lang/de_de.json
@@ -4,9 +4,10 @@
     "text.autoconfig.skyblocker.title": "Skyblocker-Einstellungen",
     "text.autoconfig.skyblocker.category.general": "Allgemein",
     "text.autoconfig.skyblocker.option.general.bars": "Gesundheits-, Mana-, Verteidigungs- und XP-Balken",
-    "text.autoconfig.skyblocker.option.general.tabHudEnabled": "Schöneres Tab-HUD aktivieren",
-    "text.autoconfig.skyblocker.option.general.tabHudScale": "Skalierungsfaktor für schöners Tab-HUD",
-    "text.autoconfig.skyblocker.option.general.tabHudScale.@Tooltip": "Wert in %, relativ zur Skalierung des Vanilla-GUIs",
+    "text.autoconfig.skyblocker.option.general.tabHud": "Schöneres Tab-HUD",
+    "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Schöneres Tab-HUD aktivieren",
+    "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "Skalierungsfaktor für schöners Tab-HUD",
+    "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Wert in %, relativ zur Skalierung des Vanilla-GUIs",
     "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren",
     "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken",
 
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index ae1b2719..9e467505 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -23,9 +23,10 @@
   "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav",
   "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav",
   "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift",
-  "text.autoconfig.skyblocker.option.general.tabHudEnabled": "Enable fancy tab HUD",
-  "text.autoconfig.skyblocker.option.general.tabHudScale": "Scale factor of fancy tab HUD",
-  "text.autoconfig.skyblocker.option.general.tabHudScale.@Tooltip": "Value in %, relative to your vanilla GUI scale",
+  "text.autoconfig.skyblocker.option.general.tabHud": "Fancy tab HUD",
+  "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Enable fancy tab HUD",
+  "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "Scale factor of fancy tab HUD",
+  "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Value in %, relative to your vanilla GUI scale",
   "text.autoconfig.skyblocker.option.general.itemTooltip": "Item Tooltip",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Enable NPC Price",
   "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Enable Avg. BIN Price",