Refactor config

10 files changed, 28 insertions, 36 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/compatibility/modmenu/ModMenuEntry.java b/src/main/java/me/xmrvizzy/skyblocker/compatibility/modmenu/ModMenuEntry.java
index 65287cc9..5a3f4504 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/compatibility/modmenu/ModMenuEntry.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/compatibility/modmenu/ModMenuEntry.java
@@ -10,6 +10,6 @@ import net.fabricmc.api.Environment;
 public class ModMenuEntry implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> SkyblockerConfigManager.createGUI(parent);
+        return SkyblockerConfigManager::createGUI;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 4207b495..ce268978 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -249,7 +249,7 @@ public class SkyblockerConfig {
 		public boolean enableBars = true;
 
 		@ConfigEntry
-		public BarPositions barpositions = new BarPositions();
+		public BarPositions barPositions = new BarPositions();
 	}
 
 	public static class BarPositions {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfigManager.java
index 111df7c4..fdc323b5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfigManager.java
@@ -60,19 +60,16 @@ public class SkyblockerConfigManager {
 	}
 	
 	public static Screen createGUI(Screen parent) {
-		return YetAnotherConfigLib.create(INSTANCE, (defaults, config, builder) -> {
-			return builder
-					.title(Text.translatable("text.autoconfig.skyblocker.title"))
-					.category(GeneralCategory.create(defaults, config))
-					.category(DungeonsCategory.create(defaults, config))
-					.category(DwarvenMinesCategory.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);
+		return YetAnotherConfigLib.create(INSTANCE, (defaults, config, builder) -> builder
+				.title(Text.translatable("text.autoconfig.skyblocker.title"))
+				.category(GeneralCategory.create(defaults, config))
+				.category(DungeonsCategory.create(defaults, config))
+				.category(DwarvenMinesCategory.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);
 	}
 	
 	/**
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 e75dc331..842f0894 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/categories/GeneralCategory.java
@@ -109,30 +109,30 @@ public class GeneralCategory {
 								.build())
 						.option(Option.<SkyblockerConfig.BarPosition>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition"))
-								.binding(defaults.general.bars.barpositions.healthBarPosition,
-										() -> config.general.bars.barpositions.healthBarPosition,
-										newValue -> config.general.bars.barpositions.healthBarPosition = newValue)
+								.binding(defaults.general.bars.barPositions.healthBarPosition,
+										() -> config.general.bars.barPositions.healthBarPosition,
+										newValue -> config.general.bars.barPositions.healthBarPosition = newValue)
 								.controller(ConfigUtils::createCyclingListController4Enum)
 								.build())
 						.option(Option.<SkyblockerConfig.BarPosition>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition"))
-								.binding(defaults.general.bars.barpositions.manaBarPosition,
-										() -> config.general.bars.barpositions.manaBarPosition,
-										newValue -> config.general.bars.barpositions.manaBarPosition = newValue)
+								.binding(defaults.general.bars.barPositions.manaBarPosition,
+										() -> config.general.bars.barPositions.manaBarPosition,
+										newValue -> config.general.bars.barPositions.manaBarPosition = newValue)
 								.controller(ConfigUtils::createCyclingListController4Enum)
 								.build())
 						.option(Option.<SkyblockerConfig.BarPosition>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition"))
-								.binding(defaults.general.bars.barpositions.defenceBarPosition,
-										() -> config.general.bars.barpositions.defenceBarPosition,
-										newValue -> config.general.bars.barpositions.defenceBarPosition = newValue)
+								.binding(defaults.general.bars.barPositions.defenceBarPosition,
+										() -> config.general.bars.barPositions.defenceBarPosition,
+										newValue -> config.general.bars.barPositions.defenceBarPosition = newValue)
 								.controller(ConfigUtils::createCyclingListController4Enum)
 								.build())
 						.option(Option.<SkyblockerConfig.BarPosition>createBuilder()
 								.name(Text.translatable("text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition"))
-								.binding(defaults.general.bars.barpositions.experienceBarPosition,
-										() -> config.general.bars.barpositions.experienceBarPosition,
-										newValue -> config.general.bars.barpositions.experienceBarPosition = newValue)
+								.binding(defaults.general.bars.barPositions.experienceBarPosition,
+										() -> config.general.bars.barPositions.experienceBarPosition,
+										newValue -> config.general.bars.barPositions.experienceBarPosition = newValue)
 								.controller(ConfigUtils::createCyclingListController4Enum)
 								.build())
 						.build())
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java
index 56b6c7fe..a7428056 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java
@@ -60,10 +60,10 @@ public class FancyStatusBars {
         // Update positions of bars from config
         for (int i = 0; i < 4; i++) {
             int configAnchorNum = switch (i) {
-                case 0 -> SkyblockerConfigManager.get().general.bars.barpositions.healthBarPosition.toInt();
-                case 1 -> SkyblockerConfigManager.get().general.bars.barpositions.manaBarPosition.toInt();
-                case 2 -> SkyblockerConfigManager.get().general.bars.barpositions.defenceBarPosition.toInt();
-                case 3 -> SkyblockerConfigManager.get().general.bars.barpositions.experienceBarPosition.toInt();
+                case 0 -> SkyblockerConfigManager.get().general.bars.barPositions.healthBarPosition.toInt();
+                case 1 -> SkyblockerConfigManager.get().general.bars.barPositions.manaBarPosition.toInt();
+                case 2 -> SkyblockerConfigManager.get().general.bars.barPositions.defenceBarPosition.toInt();
+                case 3 -> SkyblockerConfigManager.get().general.bars.barPositions.experienceBarPosition.toInt();
                 default -> 0;
             };
 
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java
index ab8ea882..30dd1270 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java
@@ -1,6 +1,5 @@
 package me.xmrvizzy.skyblocker.skyblock;
 
-import me.shedaniel.autoconfig.AutoConfig;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.network.ClientPlayerEntity;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
index 6e5784e3..232817bb 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java
@@ -1,7 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.dwarven;
 
 import it.unimi.dsi.fastutil.ints.IntIntPair;
-import me.shedaniel.autoconfig.AutoConfig;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
 import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud.Commission;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.hud.HudCommsWidget;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java
index 1eef9722..02d612a6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java
@@ -3,7 +3,6 @@ package me.xmrvizzy.skyblocker.skyblock.experiment;
 import com.google.common.collect.ImmutableMap;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
 import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java
index 40f1ab1b..f329a395 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java
@@ -1,7 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.experiment;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
 import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java
index 166fb8a9..d4d80ee6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java
@@ -1,7 +1,6 @@
 package me.xmrvizzy.skyblocker.skyblock.experiment;
 
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
 import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;