From b2510546a8322b4fac83048f7c154c9b85e72f46 Mon Sep 17 00:00:00 2001
From: Yasin <a.piri@hotmail.de>
Date: Wed, 8 May 2024 19:58:29 +0200
Subject: hideEmptyTooltips -> ui tab

---
 .../de/hysky/skyblocker/config/categories/GeneralCategory.java     | 7 -------
 .../hysky/skyblocker/config/categories/UIAndVisualsCategory.java   | 7 +++++++
 .../java/de/hysky/skyblocker/config/configs/GeneralConfig.java     | 3 ---
 .../de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java     | 3 +++
 src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java   | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
index 69182506..1477d669 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java
@@ -31,13 +31,6 @@ public class GeneralCategory {
                                 newValue -> config.general.acceptReparty = newValue)
                         .controller(ConfigUtils::createBooleanController)
                         .build())
-                .option(Option.<Boolean>createBuilder()
-                        .name(Text.translatable("skyblocker.config.general.hideEmptyTooltips"))
-                        .binding(defaults.general.hideEmptyTooltips,
-                                () -> config.general.hideEmptyTooltips,
-                                newValue -> config.general.hideEmptyTooltips = newValue)
-                        .controller(ConfigUtils::createBooleanController)
-                        .build())
 
                 //Shortcuts
                 .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 fd638198..460a250d 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
@@ -43,6 +43,13 @@ public class UIAndVisualsCategory {
                                 newValue -> config.uiAndVisuals.backpackPreviewWithoutShift = newValue)
                         .controller(ConfigUtils::createBooleanController)
                         .build())
+                .option(Option.<Boolean>createBuilder()
+                        .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.hideEmptyTooltips"))
+                        .binding(defaults.uiAndVisuals.hideEmptyTooltips,
+                                () -> config.uiAndVisuals.hideEmptyTooltips,
+                                newValue -> config.uiAndVisuals.hideEmptyTooltips = newValue)
+                        .controller(ConfigUtils::createBooleanController)
+                        .build())
                 .option(Option.<Boolean>createBuilder()
                         .name(Text.translatable("skyblocker.config.userInterfaceAndVisuals.fancyCraftingTable"))
                         .binding(defaults.uiAndVisuals.fancyCraftingTable,
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
index 2a8e31df..56e110b6 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java
@@ -21,9 +21,6 @@ public class GeneralConfig {
     @SerialEntry
     public boolean acceptReparty = true;
 
-    @SerialEntry
-    public boolean hideEmptyTooltips = true;
-
     @SerialEntry
     public Shortcuts shortcuts = new Shortcuts();
 
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 9facd21d..8c96ec57 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java
@@ -17,6 +17,9 @@ public class UIAndVisualsConfig {
     @SerialEntry
     public boolean backpackPreviewWithoutShift = false;
 
+    @SerialEntry
+    public boolean hideEmptyTooltips = true;
+
     @SerialEntry
     public boolean fancyCraftingTable = true;
 
diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java
index 46207669..631a1ed8 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java
@@ -120,7 +120,7 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
         if (!Utils.isOnSkyblock()) return;
 
         // Hide Empty Tooltips
-        if (SkyblockerConfigManager.get().general.hideEmptyTooltips && stack.getName().getString().equals(" ")) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && stack.getName().getString().equals(" ")) {
             ci.cancel();
         }
 
@@ -185,7 +185,7 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen
         ContainerSolver currentSolver = SkyblockerMod.getInstance().containerSolverManager.getCurrentSolver();
 
         // Prevent clicks on filler items
-        if (SkyblockerConfigManager.get().general.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) &&
+        if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) &&
                 // Allow clicks in Ultrasequencer and Superpairs
                 (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helper.experiments.enableUltrasequencerSolver)) {
             ci.cancel();
-- 
cgit