aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-05-07 11:32:45 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-05-07 11:32:45 +0200
commit8716da49090362275e94d159b0dc7be4781f6451 (patch)
tree52f7aa2ddd4e62d525366081e4f01ebc7c980c5f /src/main/java
parent3e9677c0b944f306e9d59b7c47e492e883d1d551 (diff)
downloadSkyblocker-8716da49090362275e94d159b0dc7be4781f6451.tar.gz
Skyblocker-8716da49090362275e94d159b0dc7be4781f6451.tar.bz2
Skyblocker-8716da49090362275e94d159b0dc7be4781f6451.zip
Put fancy tab HUD config into its own section
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java15
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/PlayerListHudMixin.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java2
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java2
4 files changed, 14 insertions, 7 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