From 62f0a4f39e410928d3aeaea847922f44335faeef Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 9 May 2024 22:07:05 +0100 Subject: fix conflicts with new config --- .../config/categories/UIAndVisualsCategory.java | 22 ++++++++++++++++++++++ .../config/configs/UIAndVisualsConfig.java | 11 +++++++++++ 2 files changed, 33 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 c6936335..a613ebf1 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -333,6 +333,28 @@ public class UIAndVisualsCategory { .build()) .build()) + //Input Calculator + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator")) + .collapsed(true) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled.@Tooltip"))) + .binding(defaults.uiAndVisuals.inputCalculator.enabled, + () -> config.uiAndVisuals.inputCalculator.enabled, + newValue -> config.uiAndVisuals.inputCalculator.enabled = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip"))) + .binding(defaults.uiAndVisuals.inputCalculator.requiresEquals, + () -> config.uiAndVisuals.inputCalculator.requiresEquals, + newValue -> config.uiAndVisuals.inputCalculator.requiresEquals = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .build()) + //Flame Overlay .group(OptionGroup.createBuilder() .name(Text.translatable("skyblocker.config.uiAndVisuals.flameOverlay")) 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 267dde14..99c6381f 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -53,6 +53,9 @@ public class UIAndVisualsConfig { @SerialEntry public SearchOverlay searchOverlay = new SearchOverlay(); + @SerialEntry + public InputCalculator inputCalculator = new InputCalculator(); + @SerialEntry public FlameOverlay flameOverlay = new FlameOverlay(); @@ -239,6 +242,14 @@ public class UIAndVisualsConfig { public List auctionHistory = new ArrayList<>(); } + public static class InputCalculator { + @SerialEntry + public boolean enabled = true; + + @SerialEntry + public boolean requiresEquals = true; + } + public static class FlameOverlay { @SerialEntry public int flameHeight = 100; -- cgit From 0c0b11c80ca38b4631a0828358667bd64f05abdf Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 9 May 2024 23:14:23 +0100 Subject: fix text name --- .../skyblocker/config/categories/UIAndVisualsCategory.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 a613ebf1..e6cd3c54 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java @@ -335,19 +335,19 @@ public class UIAndVisualsCategory { //Input Calculator .group(OptionGroup.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator")) + .name(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator")) .collapsed(true) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled")) - .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.enabled.@Tooltip"))) + .name(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.enabled")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.enabled.@Tooltip"))) .binding(defaults.uiAndVisuals.inputCalculator.enabled, () -> config.uiAndVisuals.inputCalculator.enabled, newValue -> config.uiAndVisuals.inputCalculator.enabled = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals")) - .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip"))) + .name(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals")) + .description(OptionDescription.of(Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.requiresEquals.@Tooltip"))) .binding(defaults.uiAndVisuals.inputCalculator.requiresEquals, () -> config.uiAndVisuals.inputCalculator.requiresEquals, newValue -> config.uiAndVisuals.inputCalculator.requiresEquals = newValue) -- cgit From 34a804caaebf08c448ac3ced76d265b9a8ba9457 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sat, 11 May 2024 21:29:26 -0400 Subject: Fix invalid equation text and refactor --- .../java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 99c6381f..03d300f4 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/UIAndVisualsConfig.java @@ -247,7 +247,7 @@ public class UIAndVisualsConfig { public boolean enabled = true; @SerialEntry - public boolean requiresEquals = true; + public boolean requiresEquals = false; } public static class FlameOverlay { -- cgit