reorder configs

29 files changed, 2614 insertions, 2519 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index a45c9dd8..84c957ca 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -4,42 +4,42 @@ import de.hysky.skyblocker.config.configs.*;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 
 public class SkyblockerConfig {
-	@SerialEntry
-	public int version = 2;
+    @SerialEntry
+    public int version = 2;
 
-	@SerialEntry
-	public GeneralConfig general = new GeneralConfig();
+    @SerialEntry
+    public GeneralConfig general = new GeneralConfig();
 
-	@SerialEntry
-	public UiAndVisualsConfig uiAndVisuals = new UiAndVisualsConfig();
+    @SerialEntry
+    public UIAndVisualsConfig uiAndVisuals = new UIAndVisualsConfig();
 
-	@SerialEntry
-	public HelperConfig helper = new HelperConfig();
+    @SerialEntry
+    public HelperConfig helper = new HelperConfig();
 
-	@SerialEntry
-	public DungeonsConfig dungeons = new DungeonsConfig();
+    @SerialEntry
+    public DungeonsConfig dungeons = new DungeonsConfig();
 
-	@SerialEntry
-	public CrimsonIsleConfig crimsonIsle = new CrimsonIsleConfig();
+    @SerialEntry
+    public CrimsonIsleConfig crimsonIsle = new CrimsonIsleConfig();
 
-	@SerialEntry
-	public MiningConfig mining = new MiningConfig();
+    @SerialEntry
+    public MiningConfig mining = new MiningConfig();
 
-	@SerialEntry
-	public FarmingConfig farming = new FarmingConfig();
+    @SerialEntry
+    public FarmingConfig farming = new FarmingConfig();
 
-	@SerialEntry
-	public OtherLocationsConfig otherLocations = new OtherLocationsConfig();
+    @SerialEntry
+    public OtherLocationsConfig otherLocations = new OtherLocationsConfig();
 
-	@SerialEntry
-	public SlayerConfig slayer = new SlayerConfig();
+    @SerialEntry
+    public SlayersConfig slayer = new SlayersConfig();
 
-	@SerialEntry
-	public MessagesConfig messages = new MessagesConfig();
+    @SerialEntry
+    public MessagesFilterConfig messages = new MessagesFilterConfig();
 
-	@SerialEntry
-	public QuickNavConfig quickNav = new QuickNavConfig();
+    @SerialEntry
+    public QuickNavigationConfig quickNav = new QuickNavigationConfig();
 
-	@SerialEntry
-	public MiscConfig misc = new MiscConfig();
+    @SerialEntry
+    public MiscConfig misc = new MiscConfig();
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
index 11a61cde..f01f463c 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
@@ -26,69 +26,72 @@ import java.lang.StackWalker.Option;
 import java.nio.file.Path;
 
 public class SkyblockerConfigManager {
-	private static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("skyblocker-2.json");
-	private static final ConfigClassHandler<SkyblockerConfig> HANDLER = ConfigClassHandler.createBuilder(SkyblockerConfig.class)
-			.serializer(config -> GsonConfigSerializerBuilder.create(config)
-					.setPath(PATH)
-					.setJson5(false)
-					.appendGsonBuilder(builder -> builder
-							.setFieldNamingPolicy(FieldNamingPolicy.IDENTITY)
-							.registerTypeHierarchyAdapter(Identifier.class, new Identifier.Serializer()))
-					.build())
-			.build();
+    private static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("skyblocker-2.json");
+    private static final ConfigClassHandler<SkyblockerConfig> HANDLER = ConfigClassHandler.createBuilder(SkyblockerConfig.class)
+            .serializer(config -> GsonConfigSerializerBuilder.create(config)
+                    .setPath(PATH)
+                    .setJson5(false)
+                    .appendGsonBuilder(builder -> builder
+                            .setFieldNamingPolicy(FieldNamingPolicy.IDENTITY)
+                            .registerTypeHierarchyAdapter(Identifier.class, new Identifier.Serializer()))
+                    .build())
+            .build();
 
-	public static SkyblockerConfig get() {
-		return HANDLER.instance();
-	}
+    public static SkyblockerConfig get() {
+        return HANDLER.instance();
+    }
 
-	/**
-	 * This method is caller sensitive and can only be called by the mod initializer,
-	 * this is enforced.
-	 */
-	public static void init() {
-		if (StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE).getCallerClass() != SkyblockerMod.class) {
-			throw new RuntimeException("Skyblocker: Called config init from an illegal place!");
-		}
+    /**
+     * This method is caller sensitive and can only be called by the mod initializer,
+     * this is enforced.
+     */
+    public static void init() {
+        if (StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE).getCallerClass() != SkyblockerMod.class) {
+            throw new RuntimeException("Skyblocker: Called config init from an illegal place!");
+        }
 
-		HANDLER.load();
-		ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal(SkyblockerMod.NAMESPACE).then(optionsLiteral("config")).then(optionsLiteral("options")))));
-		ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
-			if (screen instanceof GenericContainerScreen genericContainerScreen && screen.getTitle().getString().equals("SkyBlock Menu")) {
-				Screens.getButtons(screen).add(ButtonWidget
-						.builder(Text.literal("\uD83D\uDD27"), buttonWidget -> client.setScreen(createGUI(screen)))
-						.dimensions(((HandledScreenAccessor) genericContainerScreen).getX() + ((HandledScreenAccessor) genericContainerScreen).getBackgroundWidth() - 16, ((HandledScreenAccessor) genericContainerScreen).getY() + 4, 12, 12)
-						.tooltip(Tooltip.of(Text.translatable("skyblocker.title")))
-						.build());
-			}
-		});
-	}
+        HANDLER.load();
+        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal(SkyblockerMod.NAMESPACE).then(optionsLiteral("config")).then(optionsLiteral("options")))));
+        ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
+            if (screen instanceof GenericContainerScreen genericContainerScreen && screen.getTitle().getString().equals("SkyBlock Menu")) {
+                Screens.getButtons(screen).add(ButtonWidget
+                        .builder(Text.literal("\uD83D\uDD27"), buttonWidget -> client.setScreen(createGUI(screen)))
+                        .dimensions(((HandledScreenAccessor) genericContainerScreen).getX() + ((HandledScreenAccessor) genericContainerScreen).getBackgroundWidth() - 16, ((HandledScreenAccessor) genericContainerScreen).getY() + 4, 12, 12)
+                        .tooltip(Tooltip.of(Text.translatable("skyblocker.title")))
+                        .build());
+            }
+        });
+    }
 
-	public static void save() {
-		HANDLER.save();
-	}
+    public static void save() {
+        HANDLER.save();
+    }
 
-	public static Screen createGUI(Screen parent) {
-		return YetAnotherConfigLib.create(HANDLER, (defaults, config, builder) -> builder
-				.title(Text.translatable("skyblocker.title"))
-				.category(GeneralCategory.create(defaults, config))
-				.category(DungeonsCategory.create(defaults, config))
-				.category(DwarvenMinesCategory.create(defaults, config))
-				.category(CrimsonIsleCategory.create(defaults, config))
-				.category(LocationsCategory.create(defaults, config))
-				.category(SlayersCategory.create(defaults, config))
-				.category(QuickNavigationCategory.create(defaults, config))
-				.category(MessageFilterCategory.create(defaults, config))
-				.category(DiscordRPCCategory.create(defaults, config))).generateScreen(parent);
-	}
+    public static Screen createGUI(Screen parent) {
+        return YetAnotherConfigLib.create(HANDLER, (defaults, config, builder) -> builder
+                .title(Text.translatable("skyblocker.title"))
+                .category(GeneralCategory.create(defaults, config))
+                .category(UIAndVisualsCategory.create(defaults, config))
+                .category(HelperCategory.create(defaults, config))
+                .category(DungeonsCategory.create(defaults, config))
+                .category(CrimsonIsleCategory.create(defaults, config))
+                .category(MiningCategory.create(defaults, config))
+                .category(FarmingCategory.create(defaults, config))
+                .category(OtherLocationsCategory.create(defaults, config))
+                .category(SlayersCategory.create(defaults, config))
+                .category(MessageFilterCategory.create(defaults, config))
+                .category(QuickNavigationCategory.create(defaults, config))
+                .category(MiscCategory.create(defaults, config))).generateScreen(parent);
+    }
 
-	/**
-	 * Registers an options command with the given name. Used for registering both options and config as valid commands.
-	 *
-	 * @param name the name of the command node
-	 * @return the command builder
-	 */
-	private static LiteralArgumentBuilder<FabricClientCommandSource> optionsLiteral(String name) {
-		// Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed
-		return ClientCommandManager.literal(name).executes(Scheduler.queueOpenScreenCommand(() -> createGUI(null)));
-	}
+    /**
+     * Registers an options command with the given name. Used for registering both options and config as valid commands.
+     *
+     * @param name the name of the command node
+     * @return the command builder
+     */
+    private static LiteralArgumentBuilder<FabricClientCommandSource> optionsLiteral(String name) {
+        // Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed
+        return ClientCommandManager.literal(name).executes(Scheduler.queueOpenScreenCommand(() -> createGUI(null)));
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
index a573a622..dd9cb693 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
@@ -12,74 +12,74 @@ import net.minecraft.text.Text;
 
 public class CrimsonIsleCategory {
 
-	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
-		return ConfigCategory.createBuilder()
-				.name(Text.translatable("skyblocker.category.crimsonIsle"))
+    public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
+        return ConfigCategory.createBuilder()
+                .name(Text.translatable("skyblocker.category.crimsonIsle"))
 
-				//Kuudra
-				.group(OptionGroup.createBuilder()
-						.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra"))
-						.collapsed(false)
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.supplyWaypoints"))
-								.binding(defaults.crimsonIsle.kuudra.supplyWaypoints,
-										() -> config.crimsonIsle.kuudra.supplyWaypoints,
-										newValue -> config.crimsonIsle.kuudra.supplyWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.fuelWaypoints"))
-								.binding(defaults.crimsonIsle.kuudra.fuelWaypoints,
-										() -> config.crimsonIsle.kuudra.fuelWaypoints,
-										newValue -> config.crimsonIsle.kuudra.fuelWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Waypoint.Type>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType"))
-								.description(OptionDescription.of(Text.translatable("skyblocker.option.general.waypoints.waypointType.@Tooltip")))
-								.binding(defaults.crimsonIsle.kuudra.suppliesAndFuelWaypointType,
-										() -> config.crimsonIsle.kuudra.suppliesAndFuelWaypointType,
-										newValue -> config.crimsonIsle.kuudra.suppliesAndFuelWaypointType = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.ballistaBuildWaypoints"))
-								.binding(defaults.crimsonIsle.kuudra.ballistaBuildWaypoints,
-										() -> config.crimsonIsle.kuudra.ballistaBuildWaypoints,
-										newValue -> config.crimsonIsle.kuudra.ballistaBuildWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.safeSpotWaypoints"))
-								.binding(defaults.crimsonIsle.kuudra.safeSpotWaypoints,
-										() -> config.crimsonIsle.kuudra.safeSpotWaypoints,
-										newValue -> config.crimsonIsle.kuudra.safeSpotWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.pearlWaypoints"))
-								.binding(defaults.crimsonIsle.kuudra.pearlWaypoints,
-										() -> config.crimsonIsle.kuudra.pearlWaypoints,
-										newValue -> config.crimsonIsle.kuudra.pearlWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning"))
-								.description(OptionDescription.of(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning.@Tooltip")))
-								.binding(defaults.crimsonIsle.kuudra.noArrowPoisonWarning,
-										() -> config.crimsonIsle.kuudra.noArrowPoisonWarning,
-										newValue -> config.crimsonIsle.kuudra.noArrowPoisonWarning = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Integer>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.arrowPoisonThreshold"))
-								.description(OptionDescription.of(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.arrowPoisonThreshold.@Tooltip")))
-								.binding(defaults.crimsonIsle.kuudra.arrowPoisonThreshold,
-										() -> config.crimsonIsle.kuudra.arrowPoisonThreshold,
-										newValue -> config.crimsonIsle.kuudra.arrowPoisonThreshold = newValue)
-								.controller(IntegerFieldControllerBuilder::create)
-								.build())
-						.build())
-				.build();
-	}
+                //Kuudra
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra"))
+                        .collapsed(false)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.supplyWaypoints"))
+                                .binding(defaults.crimsonIsle.kuudra.supplyWaypoints,
+                                        () -> config.crimsonIsle.kuudra.supplyWaypoints,
+                                        newValue -> config.crimsonIsle.kuudra.supplyWaypoints = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.fuelWaypoints"))
+                                .binding(defaults.crimsonIsle.kuudra.fuelWaypoints,
+                                        () -> config.crimsonIsle.kuudra.fuelWaypoints,
+                                        newValue -> config.crimsonIsle.kuudra.fuelWaypoints = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Waypoint.Type>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.suppliesAndFuelWaypointType"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.option.general.waypoints.waypointType.@Tooltip")))
+                                .binding(defaults.crimsonIsle.kuudra.suppliesAndFuelWaypointType,
+                                        () -> config.crimsonIsle.kuudra.suppliesAndFuelWaypointType,
+                                        newValue -> config.crimsonIsle.kuudra.suppliesAndFuelWaypointType = newValue)
+                                .controller(ConfigUtils::createEnumCyclingListController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.ballistaBuildWaypoints"))
+                                .binding(defaults.crimsonIsle.kuudra.ballistaBuildWaypoints,
+                                        () -> config.crimsonIsle.kuudra.ballistaBuildWaypoints,
+                                        newValue -> config.crimsonIsle.kuudra.ballistaBuildWaypoints = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.safeSpotWaypoints"))
+                                .binding(defaults.crimsonIsle.kuudra.safeSpotWaypoints,
+                                        () -> config.crimsonIsle.kuudra.safeSpotWaypoints,
+                                        newValue -> config.crimsonIsle.kuudra.safeSpotWaypoints = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.pearlWaypoints"))
+                                .binding(defaults.crimsonIsle.kuudra.pearlWaypoints,
+                                        () -> config.crimsonIsle.kuudra.pearlWaypoints,
+                                        newValue -> config.crimsonIsle.kuudra.pearlWaypoints = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.noArrowPoisonWarning.@Tooltip")))
+                                .binding(defaults.crimsonIsle.kuudra.noArrowPoisonWarning,
+                                        () -> config.crimsonIsle.kuudra.noArrowPoisonWarning,
+                                        newValue -> config.crimsonIsle.kuudra.noArrowPoisonWarning = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Integer>createBuilder()
+                                .name(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.arrowPoisonThreshold"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.option.locations.crimsonIsle.kuudra.arrowPoisonThreshold.@Tooltip")))
+                                .binding(defaults.crimsonIsle.kuudra.arrowPoisonThreshold,
+                                        () -> config.crimsonIsle.kuudra.arrowPoisonThreshold,
+                                        newValue -> config.crimsonIsle.kuudra.arrowPoisonThreshold = newValue)
+                                .controller(IntegerFieldControllerBuilder::create)
+                                .build())
+                        .build())
+                .build();
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java
deleted file mode 100644
index f69d6343..00000000
--- a/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package de.hysky.skyblocker.config.categories;
-
-import de.hysky.skyblocker.config.ConfigUtils;
-import de.hysky.skyblocker.config.SkyblockerConfig;
-import de.hysky.skyblocker.config.configs.MiscConfig;
-import dev.isxander.yacl3.api.ConfigCategory;
-import dev.isxander.yacl3.api.Option;
-import dev.isxander.yacl3.api.OptionDescription;
-import dev.isxander.yacl3.api.controller.StringControllerBuilder;
-import net.minecraft.text.Text;
-
-public class DiscordRPCCategory {
-
-	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
-		return ConfigCategory.createBuilder()
-				.name(Text.translatable("skyblocker.category.richPresence"))
-
-				//Uncategorized Options
-				.option(Option.<Boolean>createBuilder()
-						.name(Text.translatable("skyblocker.option.richPresence.enableRichPresence"))
-						.binding(defaults.misc.richPresence.enableRichPresence,
-								() -> config.misc.richPresence.enableRichPresence,
-								newValue -> config.misc.richPresence.enableRichPresence = newValue)
-						.controller(ConfigUtils::createBooleanController)
-						.build())
-				.option(Option.<MiscConfig.Info>createBuilder()
-						.name(Text.translatable("skyblocker.option.richPresence.info"))
-						.description(OptionDescription.of(Text.translatable("skyblocker.option.richPresence.info.@Tooltip")))
-						.binding(defaults.misc.richPresence.info,
-								() -> config.misc.richPresence.info,
-								newValue -> config.misc.richPresence.info = newValue)
-						.controller(ConfigUtils::createEnumCyclingListController)
-						.build())
-				.option(Option.<Boolean>createBuilder()
-						.name(Text.translatable("skyblocker.option.richPresence.cycleMode"))
-						.binding(defaults.misc.richPresence.cycleMode,
-								() -> config.misc.richPresence.cycleMode,
-								newValue -> config.misc.richPresence.cycleMode = newValue)
-						.controller(ConfigUtils::createBooleanController)
-						.build())
-				.option(Option.<String>createBuilder()
-						.name(Text.translatable("skyblocker.option.richPresence.customMessage"))
-						.binding(defaults.misc.richPresence.customMessage,
-								() -> config.misc.richPresence.customMessage,
-								newValue -> config.misc.richPresence.customMessage = newValue)
-						.controller(StringControllerBuilder::create)
-						.build())
-				.build();
-	}
-}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 2137f380..94cb01b7 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -15,573 +15,604 @@ import net.minecraft.util.Formatting;
 
 public class DungeonsCategory {
 
-	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
-		return ConfigCategory.createBuilder()
-				.name(Text.translatable("skyblocker.option.locations.dungeons"))
+    public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
+        return ConfigCategory.createBuilder()
+                .name(Text.translatable("skyblocker.option.locations.dungeons"))
 
-				//Dungeon Secret Waypoints
-				.group(OptionGroup.createBuilder()
-						.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints"))
-						.collapsed(true)
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableRoomMatching"))
-								.description(OptionDescription.of(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableRoomMatching.@Tooltip")))
-								.binding(defaults.dungeons.secretWaypoints.enableRoomMatching,
-										() -> config.dungeons.secretWaypoints.enableRoomMatching,
-										newValue -> config.dungeons.secretWaypoints.enableRoomMatching = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.flag(OptionFlag.GAME_RESTART)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableSecretWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableSecretWaypoints,
-										() -> config.dungeons.secretWaypoints.enableSecretWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableSecretWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Type>createBuilder()
-								.name(Text.translatable("skyblocker.option.general.waypoints.waypointType"))
-								.description(OptionDescription.of(Text.translatable("skyblocker.option.general.waypoints.waypointType.@Tooltip")))
-								.binding(defaults.dungeons.secretWaypoints.waypointType,
-										() -> config.dungeons.secretWaypoints.waypointType,
-										newValue -> config.dungeons.secretWaypoints.waypointType = newValue)
-								.controller(ConfigUtils::createEnumCyclingListController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.showSecretText"))
-								.binding(defaults.dungeons.secretWaypoints.showSecretText,
-										() -> config.dungeons.secretWaypoints.showSecretText,
-										newValue -> config.dungeons.secretWaypoints.showSecretText = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableEntranceWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableEntranceWaypoints,
-										() -> config.dungeons.secretWaypoints.enableEntranceWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableEntranceWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableSuperboomWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableSuperboomWaypoints,
-										() -> config.dungeons.secretWaypoints.enableSuperboomWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableSuperboomWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableChestWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableChestWaypoints,
-										() -> config.dungeons.secretWaypoints.enableChestWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableChestWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableItemWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableItemWaypoints,
-										() -> config.dungeons.secretWaypoints.enableItemWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableItemWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableBatWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableBatWaypoints,
-										() -> config.dungeons.secretWaypoints.enableBatWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableBatWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableWitherWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableWitherWaypoints,
-										() -> config.dungeons.secretWaypoints.enableWitherWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableWitherWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableLeverWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableLeverWaypoints,
-										() -> config.dungeons.secretWaypoints.enableLeverWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableLeverWaypoints = newValue)
-								.controller(ConfigUtils::createBooleanController)
-								.build())
-						.option(Option.<Boolean>createBuilder()
-								.name(Text.translatable("skyblocker.option.locations.dungeons.secretWaypoints.enableFairySoulWaypoints"))
-								.binding(defaults.dungeons.secretWaypoints.enableFairySoulWaypoints,
-										() -> config.dungeons.secretWaypoints.enableFairySoulWaypoints,
-										newValue -> config.dungeons.secretWaypoints.enableFairySoulWaypoint