Merge pull request #334 from AzureAaron/yacl3

Config Tweaks

13 files changed, 266 insertions, 113 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java
index 4a615ecc..28ed704b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/ConfigUtils.java
@@ -1,11 +1,21 @@
 package me.xmrvizzy.skyblocker.config;
 
 import dev.isxander.yacl3.api.Option;
+import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
 import dev.isxander.yacl3.api.controller.EnumControllerBuilder;
+import me.xmrvizzy.skyblocker.config.controllers.EnumDropdownControllerBuilder;
 
 public class ConfigUtils {
-    @SuppressWarnings("unchecked")
-    public static <E extends Enum<E>> EnumControllerBuilder<E> createEnumCyclingListController(Option<E> opt) {
-        return EnumControllerBuilder.create(opt).enumClass((Class<E>) opt.binding().defaultValue().getClass());
-    }
+	public static BooleanControllerBuilder createBooleanController(Option<Boolean> opt) {
+		return BooleanControllerBuilder.create(opt).yesNoFormatter().coloured(true);
+	}
+
+	@SuppressWarnings("unchecked")
+	public static <E extends Enum<E>> EnumControllerBuilder<E> createEnumCyclingListController(Option<E> opt) {
+		return EnumControllerBuilder.create(opt).enumClass((Class<E>) opt.binding().defaultValue().getClass());
+	}
+
+	public static <E extends Enum<E>> EnumDropdownControllerBuilder<E> createEnumDropdownController(Option<E> opt) {
+		return EnumDropdownControllerBuilder.create(opt);
+	}
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/categories/DiscordRPCCategory.java b/src/main/java/me/xmrvizzy/skyblocker/config/categories/DiscordRPCCategory.java
index 2fe1f775..1e35bc32 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/categories/DiscordRPCCategory.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/categories/DiscordRPCCategory.java
@@ -3,7 +3,6 @@ package me.xmrvizzy.skyblocker.config.categories;
 import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
-import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
 import dev.isxander.yacl3.api.controller.StringControllerBuilder;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.config.ConfigUtils;
@@ -21,7 +20,7 @@ public class DiscordRPCCategory {
 						.binding(defaults.richPresence.enableRichPresence,
 								() -> config.richPresence.enableRichPresence,
 								newValue -> config.richPresence.enableRichPresence = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<SkyblockerConfig.Info>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.richPresence.info"))
@@ -36,7 +35,7 @@ public class DiscordRPCCategory {
 						.binding(defaults.richPresence.cycleMode,
 								() -> config.richPresence.cycleMode,
 								newValue -> config.richPresence.cycleMode = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<String>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.richPresence.customMessage"))
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/me/xmrvizzy/skyblocker/config/categories/DungeonsCategory.java
index 92a7ddec..16439cb5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/categories/DungeonsCategory.java
@@ -6,7 +6,6 @@ import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.OptionFlag;
 import dev.isxander.yacl3.api.OptionGroup;
-import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
 import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.StringControllerBuilder;
@@ -32,7 +31,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.secretWaypoints.enableSecretWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableSecretWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableSecretWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.noInitSecretWaypoints"))
@@ -40,7 +39,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.secretWaypoints.noInitSecretWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.noInitSecretWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.noInitSecretWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.flag(OptionFlag.GAME_RESTART)
 								.build())
 						.option(Option.<Boolean>createBuilder()
@@ -48,63 +47,63 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.secretWaypoints.enableEntranceWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableEntranceWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableEntranceWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableSuperboomWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableSuperboomWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableSuperboomWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableSuperboomWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableChestWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableChestWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableChestWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableChestWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableItemWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableItemWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableItemWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableItemWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableBatWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableBatWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableBatWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableBatWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableWitherWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableWitherWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableWitherWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableWitherWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableLeverWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableLeverWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableLeverWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableLeverWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableFairySoulWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableFairySoulWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableFairySoulWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableFairySoulWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableStonkWaypoints"))
 								.binding(defaults.locations.dungeons.secretWaypoints.enableStonkWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableStonkWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableStonkWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableDefaultWaypoints"))
@@ -112,7 +111,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.secretWaypoints.enableDefaultWaypoints,
 										() -> config.locations.dungeons.secretWaypoints.enableDefaultWaypoints,
 										newValue -> config.locations.dungeons.secretWaypoints.enableDefaultWaypoints = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
 				
@@ -125,7 +124,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.dungeonChestProfit.enableProfitCalculator,
 										() -> config.locations.dungeons.dungeonChestProfit.enableProfitCalculator,
 										newValue -> config.locations.dungeons.dungeonChestProfit.enableProfitCalculator = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.includeKismet"))
@@ -133,7 +132,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.dungeonChestProfit.includeKismet,
 										() -> config.locations.dungeons.dungeonChestProfit.includeKismet,
 										newValue -> config.locations.dungeons.dungeonChestProfit.includeKismet = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.includeEssence"))
@@ -141,7 +140,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.dungeonChestProfit.includeEssence,
 										() -> config.locations.dungeons.dungeonChestProfit.includeEssence,
 										newValue -> config.locations.dungeons.dungeonChestProfit.includeEssence = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Integer>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.neutralThreshold"))
@@ -156,21 +155,21 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.dungeonChestProfit.neutralColor,
 										() -> config.locations.dungeons.dungeonChestProfit.neutralColor,
 										newValue -> config.locations.dungeons.dungeonChestProfit.neutralColor = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
+								.controller(ConfigUtils::createEnumDropdownController)
 								.build())
 						.option(Option.<FormattingOption>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.profitColor"))
 								.binding(defaults.locations.dungeons.dungeonChestProfit.profitColor,
 										() -> config.locations.dungeons.dungeonChestProfit.profitColor,
 										newValue -> config.locations.dungeons.dungeonChestProfit.profitColor = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
+								.controller(ConfigUtils::createEnumDropdownController)
 								.build())
 						.option(Option.<FormattingOption>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.lossColor"))
 								.binding(defaults.locations.dungeons.dungeonChestProfit.lossColor,
 										() -> config.locations.dungeons.dungeonChestProfit.lossColor,
 										newValue -> config.locations.dungeons.dungeonChestProfit.lossColor = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
+								.controller(ConfigUtils::createEnumDropdownController)
 								.build())
 						.option(Option.<FormattingOption>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.incompleteColor"))
@@ -178,7 +177,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.dungeonChestProfit.incompleteColor,
 										() -> config.locations.dungeons.dungeonChestProfit.incompleteColor,
 										newValue -> config.locations.dungeons.dungeonChestProfit.incompleteColor = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
+								.controller(ConfigUtils::createEnumDropdownController)
 								.build())
 						.build())
 				
@@ -189,14 +188,14 @@ public class DungeonsCategory {
 						.binding(defaults.locations.dungeons.croesusHelper,
 								() -> config.locations.dungeons.croesusHelper,
 								newValue -> config.locations.dungeons.croesusHelper = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.enableMap"))
 						.binding(defaults.locations.dungeons.enableMap,
 								() -> config.locations.dungeons.enableMap,
 								newValue -> config.locations.dungeons.enableMap = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(ButtonOption.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.mapScreen"))
@@ -230,14 +229,14 @@ public class DungeonsCategory {
 						.binding(defaults.locations.dungeons.starredMobGlow,
 								() -> config.locations.dungeons.starredMobGlow,
 								newValue -> config.locations.dungeons.starredMobGlow = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos"))
 						.binding(defaults.locations.dungeons.solveThreeWeirdos,
 								() -> config.locations.dungeons.solveThreeWeirdos,
 								newValue -> config.locations.dungeons.solveThreeWeirdos = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.blazesolver"))
@@ -245,14 +244,14 @@ public class DungeonsCategory {
 						.binding(defaults.locations.dungeons.blazesolver,
 								() -> config.locations.dungeons.blazesolver,
 								newValue -> config.locations.dungeons.blazesolver = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia"))
 						.binding(defaults.locations.dungeons.solveTrivia,
 								() -> config.locations.dungeons.solveTrivia,
 								newValue -> config.locations.dungeons.solveTrivia = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe"))
@@ -260,7 +259,7 @@ public class DungeonsCategory {
 						.binding(defaults.locations.dungeons.solveTicTacToe,
 								() -> config.locations.dungeons.solveTicTacToe,
 								newValue -> config.locations.dungeons.solveTicTacToe = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				
 				//Livid Color
@@ -273,7 +272,7 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.lividColor.enableLividColor,
 										() -> config.locations.dungeons.lividColor.enableLividColor,
 										newValue -> config.locations.dungeons.lividColor.enableLividColor = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<String>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText"))
@@ -294,21 +293,21 @@ public class DungeonsCategory {
 								.binding(defaults.locations.dungeons.terminals.solveColor,
 										() -> config.locations.dungeons.terminals.solveColor,
 										newValue -> config.locations.dungeons.terminals.solveColor = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder"))
 								.binding(defaults.locations.dungeons.terminals.solveOrder,
 										() -> config.locations.dungeons.terminals.solveOrder,
 										newValue -> config.locations.dungeons.terminals.solveOrder = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith"))
 								.binding(defaults.locations.dungeons.terminals.solveStartsWith,
 										() -> config.locations.dungeons.terminals.solveStartsWith,
 										newValue -> config.locations.dungeons.terminals.solveStartsWith = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
 				.build();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/me/xmrvizzy/skyblocker/config/categories/DwarvenMinesCategory.java
index 42d623ac..8330ba2a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/categories/DwarvenMinesCategory.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/categories/DwarvenMinesCategory.java
@@ -5,7 +5,6 @@ import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.OptionGroup;
-import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
 import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.config.ConfigUtils;
@@ -25,21 +24,21 @@ public class DwarvenMinesCategory {
 						.binding(defaults.locations.dwarvenMines.enableDrillFuel,
 								() -> config.locations.dwarvenMines.enableDrillFuel,
 								newValue -> config.locations.dwarvenMines.enableDrillFuel = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur"))
 						.binding(defaults.locations.dwarvenMines.solveFetchur,
 								() -> config.locations.dwarvenMines.solveFetchur,
 								newValue -> config.locations.dwarvenMines.solveFetchur = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler"))
 						.binding(defaults.locations.dwarvenMines.solvePuzzler,
 								() -> config.locations.dwarvenMines.solvePuzzler,
 								newValue -> config.locations.dwarvenMines.solvePuzzler = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				
 				//Dwarven HUD
@@ -51,13 +50,13 @@ public class DwarvenMinesCategory {
 								.binding(defaults.locations.dwarvenMines.dwarvenHud.enabled,
 										() -> config.locations.dwarvenMines.dwarvenHud.enabled,
 										newValue -> config.locations.dwarvenMines.dwarvenHud.enabled = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<SkyblockerConfig.DwarvenHudStyle>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style"))
-								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]", 
+								.description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[0]"), 
 										Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[1]"),
-										Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]"))))
+										Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.style.@Tooltip[2]")))
 								.binding(defaults.locations.dwarvenMines.dwarvenHud.style,
 										() -> config.locations.dwarvenMines.dwarvenHud.style,
 										newValue -> config.locations.dwarvenMines.dwarvenHud.style = newValue)
@@ -73,7 +72,7 @@ public class DwarvenMinesCategory {
 								.binding(defaults.locations.dwarvenMines.dwarvenHud.enableBackground,
 										() -> config.locations.dwarvenMines.dwarvenHud.enableBackground,
 										newValue -> config.locations.dwarvenMines.dwarvenHud.enableBackground = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Integer>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x"))
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java b/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
index 95b01dfd..c5e2d34c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
@@ -5,7 +5,6 @@ import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.OptionGroup;
-import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
 import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
 import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
@@ -28,35 +27,35 @@ public class GeneralCategory {
 						.binding(defaults.general.acceptReparty,
 								() -> config.general.acceptReparty,
 								newValue -> config.general.acceptReparty = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift"))
 						.binding(defaults.general.backpackPreviewWithoutShift,
 								() -> config.general.backpackPreviewWithoutShift,
 								newValue -> config.general.backpackPreviewWithoutShift = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.compactorDeletorPreview"))
 						.binding(defaults.general.compactorDeletorPreview,
 								() -> config.general.compactorDeletorPreview,
 								newValue -> config.general.compactorDeletorPreview = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.hideEmptyTooltips"))
 						.binding(defaults.general.hideEmptyTooltips,
 								() -> config.general.hideEmptyTooltips,
 								newValue -> config.general.hideEmptyTooltips = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.general.hideStatusEffectOverlay"))
 						.binding(defaults.general.hideStatusEffectOverlay,
 								() -> config.general.hideStatusEffectOverlay,
 								newValue -> config.general.hideStatusEffectOverlay = newValue)
-						.controller(BooleanControllerBuilder::create)
+						.controller(ConfigUtils::createBooleanController)
 						.build())
 				
 				//Tab Hud
@@ -68,7 +67,7 @@ public class GeneralCategory {
 								.binding(defaults.general.tabHud.tabHudEnabled,
 										() -> config.general.tabHud.tabHudEnabled,
 										newValue -> config.general.tabHud.tabHudEnabled = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Integer>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.tabHud.tabHudScale"))
@@ -84,7 +83,7 @@ public class GeneralCategory {
 								.binding(defaults.general.tabHud.plainPlayerNames,
 										() -> config.general.tabHud.plainPlayerNames,
 										newValue -> config.general.tabHud.plainPlayerNames = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<SkyblockerConfig.NameSorting>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.tabHud.nameSorting"))
@@ -105,7 +104,7 @@ public class GeneralCategory {
 								.binding(defaults.general.bars.enableBars,
 										() -> config.general.bars.enableBars,
 										newValue -> config.general.bars.enableBars = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<SkyblockerConfig.BarPosition>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition"))
@@ -146,21 +145,21 @@ public class GeneralCategory {
 								.binding(defaults.general.experiments.enableChronomatronSolver,
 										() -> config.general.experiments.enableChronomatronSolver,
 										newValue -> config.general.experiments.enableChronomatronSolver = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver"))
 								.binding(defaults.general.experiments.enableSuperpairsSolver,
 										() -> config.general.experiments.enableSuperpairsSolver,
 										newValue -> config.general.experiments.enableSuperpairsSolver = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver"))
 								.binding(defaults.general.experiments.enableUltrasequencerSolver,
 										() -> config.general.experiments.enableUltrasequencerSolver,
 										newValue -> config.general.experiments.enableUltrasequencerSolver = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
 				
@@ -173,7 +172,7 @@ public class GeneralCategory {
 								.binding(defaults.general.fishing.enableFishingHelper,
 										() -> config.general.fishing.enableFishingHelper,
 										newValue -> config.general.fishing.enableFishingHelper = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
 				
@@ -186,14 +185,14 @@ public class GeneralCategory {
 								.binding(defaults.general.fairySouls.enableFairySoulsHelper,
 										() -> config.general.fairySouls.enableFairySoulsHelper,
 										newValue -> config.general.fairySouls.enableFairySoulsHelper = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls"))
 								.binding(defaults.general.fairySouls.highlightFoundSouls,
 										() -> config.general.fairySouls.highlightFoundSouls,
 										newValue -> config.general.fairySouls.highlightFoundSouls = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls"))
@@ -201,7 +200,7 @@ public class GeneralCategory {
 								.binding(defaults.general.fairySouls.highlightOnlyNearbySouls,
 										() -> config.general.fairySouls.highlightOnlyNearbySouls,
 										newValue -> config.general.fairySouls.highlightOnlyNearbySouls = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
 				
@@ -215,7 +214,7 @@ public class GeneralCategory {
 								.binding(defaults.general.shortcuts.enableShortcuts,
 										() -> config.general.shortcuts.enableShortcuts,
 										newValue -> config.general.shortcuts.enableShortcuts = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts"))
@@ -223,7 +222,7 @@ public class GeneralCategory {
 								.binding(defaults.general.shortcuts.enableCommandShortcuts,
 										() -> config.general.shortcuts.enableCommandShortcuts,
 										newValue -> config.general.shortcuts.enableCommandShortcuts = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts"))
@@ -231,7 +230,7 @@ public class GeneralCategory {
 								.binding(defaults.general.shortcuts.enableCommandArgShortcuts,
 										() -> config.general.shortcuts.enableCommandArgShortcuts,
 										newValue -> config.general.shortcuts.enableCommandArgShortcuts = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(ButtonOption.createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.shortcuts.config"))
@@ -249,21 +248,21 @@ public class GeneralCategory {
 								.binding(defaults.general.quiverWarning.enableQuiverWarning,
 										() -> config.general.quiverWarning.enableQuiverWarning,
 										newValue -> config.general.quiverWarning.enableQuiverWarning = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons"))
 								.binding(defaults.general.quiverWarning.enableQuiverWarningInDungeons,
 										() -> config.general.quiverWarning.enableQuiverWarningInDungeons,
 										newValue -> config.general.quiverWarning.enableQuiverWarningInDungeons = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.option(Option.<Boolean>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningAfterDungeon"))
 								.binding(defaults.general.quiverWarning.enableQuiverWarningAfterDungeon,
 										() -> config.general.quiverWarning.enableQuiverWarningAfterDungeon,
 										newValue -> config.general.quiverWarning.enableQuiverWarningAfterDungeon = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
 				
@@ -276,7 +275,7 @@ public class GeneralCategory {
 								.binding(defaults.general.itemList.enableItemList,
 										() -> config.general.itemList.enableItemList,
 										newValue -> config.general.itemList.enableItemList = newValue)
-								.controller(BooleanControllerBuilder::create)
+								.controller(ConfigUti