hideStatusEffectOverlay -> ui tab

6 files changed, 12 insertions, 11 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java
index e5dba84e..b2127e6b 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/MiscCategory.java
@@ -17,13 +17,6 @@ public class MiscCategory {
                 .name(Text.translatable("skyblocker.config.misc"))
 
                 //Uncategorized Options
-                .option(Option.<Boolean>createBuilder()
-                        .name(Text.translatable("skyblocker.config.misc.hideStatusEffectOverlay"))
-                        .binding(defaults.misc.hideStatusEffectOverlay,
-                                () -> config.misc.hideStatusEffectOverlay,
-                                newValue -> config.misc.hideStatusEffectOverlay = newValue)
-                        .controller(ConfigUtils::createBooleanController)
-                        .build())
 
                 //Discord RPC
                 .group(OptionGroup.createBuilder()
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
index 12edd0d1..c6936335 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
@@ -57,6 +57,13 @@ public class UIAndVisualsCategory {
                                 newValue -> config.uiAndVisuals.fancyCraftingTable = newValue)
                         .controller(ConfigUtils::createBooleanController)
                         .build())
+                .option(Option.<Boolean>createBuilder()
+                        .name(Text.translatable("skyblocker.config.uiAndVisuals.hideStatusEffectOverlay"))
+                        .binding(defaults.uiAndVisuals.hideStatusEffectOverlay,
+                                () -> config.uiAndVisuals.hideStatusEffectOverlay,
+                                newValue -> config.uiAndVisuals.hideStatusEffectOverlay = newValue)
+                        .controller(ConfigUtils::createBooleanController)
+                        .build())
 
                 //Chest Value FIXME change dropdown to color controller
                 .group(OptionGroup.createBuilder()
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java
index ed0857e0..919a26d8 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/MiscConfig.java
@@ -4,8 +4,6 @@ import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import net.minecraft.client.resource.language.I18n;
 
 public class MiscConfig {
-    @SerialEntry
-    public boolean hideStatusEffectOverlay = false;
 
     @SerialEntry
     public RichPresence richPresence = new RichPresence();
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
index 8c96ec57..267dde14 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
@@ -24,6 +24,9 @@ public class UIAndVisualsConfig {
     public boolean fancyCraftingTable = true;
 
     @SerialEntry
+    public boolean hideStatusEffectOverlay = false;
+
+    @SerialEntry
     public ChestValue chestValue = new ChestValue();
 
     @SerialEntry
diff --git a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java
index b0e26575..69f33aa0 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/AbstractInventoryScreenMixin.java
@@ -14,6 +14,6 @@ public class AbstractInventoryScreenMixin {
 
 	@Inject(method = "drawStatusEffects", at = @At("HEAD"), cancellable = true)
 	private void skyblocker$dontDrawStatusEffects(CallbackInfo ci) {
-		if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel();
+		if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.hideStatusEffectOverlay) ci.cancel();
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java
index 30f1626f..b939b401 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/InGameHudMixin.java
@@ -99,7 +99,7 @@ public abstract class InGameHudMixin {
 
     @Inject(method = "renderStatusEffectOverlay", at = @At("HEAD"), cancellable = true)
     private void skyblocker$dontRenderStatusEffects(CallbackInfo ci) {
-        if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().misc.hideStatusEffectOverlay) ci.cancel();
+        if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().uiAndVisuals.hideStatusEffectOverlay) ci.cancel();
     }
 
     @ModifyExpressionValue(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getAttackCooldownProgress(F)F"))