Refactor config

3 files changed, 23 insertions, 26 deletions

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())