diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
5 files changed, 12 insertions, 12 deletions
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 @@ -44,6 +44,13 @@ public class UIAndVisualsCategory { .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, () -> config.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 @@ -22,9 +22,6 @@ public class GeneralConfig { public boolean acceptReparty = true; @SerialEntry - public boolean hideEmptyTooltips = true; - - @SerialEntry public Shortcuts shortcuts = new Shortcuts(); @SerialEntry 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 @@ -18,6 +18,9 @@ public class UIAndVisualsConfig { public boolean backpackPreviewWithoutShift = false; @SerialEntry + public boolean hideEmptyTooltips = true; + + @SerialEntry public boolean fancyCraftingTable = true; @SerialEntry 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(); |