fix to align with new config

4 files changed, 99 insertions, 7 deletions

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 fed8fa96..49850403 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/CrimsonIsleCategory.java
@@ -81,6 +81,60 @@ public class CrimsonIsleCategory {
                                 .controller(IntegerFieldControllerBuilder::create)
                                 .build())
                         .build())
-                .build();
+				//dojo
+				.group(OptionGroup.createBuilder()
+						.name(Text.translatable("skyblocker.crimson.dojo"))
+						.collapsed(false)
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.crimson.dojo.forceHelper"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.crimson.dojo.forceHelper.@Tooltip")))
+								.binding(config.crimsonIsle.dojo.enableForceHelper,
+										() -> config.crimsonIsle.dojo.enableForceHelper,
+										newValue -> config.crimsonIsle.dojo.enableForceHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.crimson.dojo.masteryHelper"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.crimson.dojo.masteryHelper.@Tooltip")))
+								.binding(config.crimsonIsle.dojo.enableMasteryHelper,
+										() -> config.crimsonIsle.dojo.enableMasteryHelper,
+										newValue -> config.crimsonIsle.dojo.enableMasteryHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.crimson.dojo.disciplineHelper"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.crimson.dojo.disciplineHelper.@Tooltip")))
+								.binding(config.crimsonIsle.dojo.enableDisciplineHelper,
+										() -> config.crimsonIsle.dojo.enableDisciplineHelper,
+										newValue -> config.crimsonIsle.dojo.enableDisciplineHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.crimson.dojo.swiftnessHelper"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.crimson.dojo.swiftnessHelper.@Tooltip")))
+								.binding(config.crimsonIsle.dojo.enableSwiftnessHelper,
+										() -> config.crimsonIsle.dojo.enableSwiftnessHelper,
+										newValue -> config.crimsonIsle.dojo.enableSwiftnessHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.crimson.dojo.controlHelper"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.crimson.dojo.controlHelper.@Tooltip")))
+								.binding(config.crimsonIsle.dojo.enableControlHelper,
+										() -> config.crimsonIsle.dojo.enableControlHelper,
+										newValue -> config.crimsonIsle.dojo.enableControlHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.option(Option.<Boolean>createBuilder()
+								.name(Text.translatable("skyblocker.crimson.dojo.tenacityHelper"))
+								.description(OptionDescription.of(Text.translatable("skyblocker.crimson.dojo.tenacityHelper.@Tooltip")))
+								.binding(config.crimsonIsle.dojo.enableTenacityHelper,
+										() -> config.crimsonIsle.dojo.enableTenacityHelper,
+										newValue -> config.crimsonIsle.dojo.enableTenacityHelper = newValue)
+								.controller(ConfigUtils::createBooleanController)
+								.build())
+						.build())
+
+				.build();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java
index 8dd93aee..0bf334a1 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/CrimsonIsleConfig.java
@@ -7,6 +7,10 @@ public class CrimsonIsleConfig {
     @SerialEntry
     public Kuudra kuudra = new Kuudra();
 
+    @SerialEntry
+    public Dojo dojo = new Dojo();
+
+
     public static class Kuudra {
         @SerialEntry
         public boolean supplyWaypoints = true;
@@ -32,4 +36,24 @@ public class CrimsonIsleConfig {
         @SerialEntry
         public int arrowPoisonThreshold = 32;
     }
+
+    public static class Dojo {
+        @SerialEntry
+        public boolean enableForceHelper = true;
+
+        @SerialEntry
+        public boolean enableMasteryHelper = true;
+
+        @SerialEntry
+        public boolean enableDisciplineHelper = true;
+
+        @SerialEntry
+        public boolean enableSwiftnessHelper = true;
+
+        @SerialEntry
+        public boolean enableControlHelper = true;
+
+        @SerialEntry
+        public boolean enableTenacityHelper = true;
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java
index 9d3cf2ee..7b0ebd23 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java
@@ -38,12 +38,12 @@ public class DojoManager {
 
     protected enum DojoChallenges {
         NONE("none", enabled -> false),
-        FORCE("Force",enabled -> SkyblockerConfigManager.get().locations.crimsonIsle.dojo.enableForceHelper),
-        MASTERY("Mastery", enabled -> SkyblockerConfigManager.get().locations.crimsonIsle.dojo.enableMasteryHelper),
-        DISCIPLINE("Discipline", enabled -> SkyblockerConfigManager.get().locations.crimsonIsle.dojo.enableDisciplineHelper),
-        SWIFTNESS("Swiftness", enabled -> SkyblockerConfigManager.get().locations.crimsonIsle.dojo.enableSwiftnessHelper),
-        CONTROL("Control", enabled -> SkyblockerConfigManager.get().locations.crimsonIsle.dojo.enableControlHelper),
-        TENACITY("Tenacity", enabled -> SkyblockerConfigManager.get().locations.crimsonIsle.dojo.enableTenacityHelper);
+        FORCE("Force",enabled -> SkyblockerConfigManager.get().crimsonIsle.dojo.enableForceHelper),
+        MASTERY("Mastery", enabled -> SkyblockerConfigManager.get().crimsonIsle.dojo.enableMasteryHelper),
+        DISCIPLINE("Discipline", enabled -> SkyblockerConfigManager.get().crimsonIsle.dojo.enableDisciplineHelper),
+        SWIFTNESS("Swiftness", enabled -> SkyblockerConfigManager.get().crimsonIsle.dojo.enableSwiftnessHelper),
+        CONTROL("Control", enabled -> SkyblockerConfigManager.get().crimsonIsle.dojo.enableControlHelper),
+        TENACITY("Tenacity", enabled -> SkyblockerConfigManager.get().crimsonIsle.dojo.enableTenacityHelper);
 
         private final String name;
         private final Predicate<Boolean> enabled;
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index a814718e..f2d0db46 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -866,6 +866,20 @@
   "skyblocker.fancyAuctionHouse.yourAuction": "This is your auction!",
   "skyblocker.fancyAuctionHouse.youPay": "You pay: %s",
 
+  "skyblocker.crimson.dojo": "Dojo",
+  "skyblocker.crimson.dojo.forceHelper": "Enable Force Helper",
+  "skyblocker.crimson.dojo.forceHelper.@Tooltip": "Shows timer showing how long until a zombie despawns and outlines negative zombies.",
+  "skyblocker.crimson.dojo.masteryHelper": "Enable Mastery Helper",
+  "skyblocker.crimson.dojo.masteryHelper.@Tooltip": "Shows timer for how long a block has left and a path to follow.",
+  "skyblocker.crimson.dojo.disciplineHelper": "Enable Discipline Helper",
+  "skyblocker.crimson.dojo.disciplineHelper.@Tooltip": "Outlines the zombies to attack with currently held sword.",
+  "skyblocker.crimson.dojo.swiftnessHelper": "Enable Swiftness Helper",
+  "skyblocker.crimson.dojo.swiftnessHelper.@Tooltip": "highlights the newest wool block to go to.",
+  "skyblocker.crimson.dojo.controlHelper": "Enable Control Helper",
+  "skyblocker.crimson.dojo.controlHelper.@Tooltip": "Creates a line from cursor to where to aim (this is not exact and is guessed of ping).",
+  "skyblocker.crimson.dojo.tenacityHelper": "Enable Tenacity Helper",
+  "skyblocker.crimson.dojo.tenacityHelper.@Tooltip": "Shows a path for each fireball and predicted block they are going to hit.",
+
   "skyblocker.crimson.kuudra.noArrowPoison": "No Arrow Poison!",
   "skyblocker.crimson.kuudra.lowArrowPoison": "Low on Arrow Poison!",