Add configs and minor code refactor

2 files changed, 60 insertions, 0 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
index 1528f853..d9824a23 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
@@ -2,11 +2,14 @@ package de.hysky.skyblocker.config.categories;
 
 import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
 import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
+import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder;
+import dev.isxander.yacl3.config.v2.api.autogen.TickBox;
 import net.minecraft.text.Text;
 
 public class HelperCategory {
@@ -137,6 +140,45 @@ public class HelperCategory {
                                 .build())
                         .build())
 
+                //Chocolate Factory
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.config.helpers.chocolateFactory"))
+                        .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableChocolateFactoryHelper"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableChocolateFactoryHelper.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.enableChocolateFactoryHelper,
+                                        () -> config.helpers.chocolateFactory.enableChocolateFactoryHelper,
+                                        newValue -> config.helpers.chocolateFactory.enableChocolateFactoryHelper = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableEggFinder"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableEggFinder.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.enableEggFinder,
+                                        () -> config.helpers.chocolateFactory.enableEggFinder,
+                                        newValue -> config.helpers.chocolateFactory.enableEggFinder = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.sendEggFoundMessages"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.sendEggFoundMessages.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.sendEggFoundMessages,
+                                        () -> config.helpers.chocolateFactory.sendEggFoundMessages,
+                                        newValue -> config.helpers.chocolateFactory.sendEggFoundMessages = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Waypoint.Type>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.waypointType"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.waypointType.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.waypointType,
+                                        () -> config.helpers.chocolateFactory.waypointType,
+                                        newValue -> config.helpers.chocolateFactory.waypointType = newValue)
+                                .controller(ConfigUtils::createEnumCyclingListController)
+                                .build())
+
+                        .build())
+
                 .build();
     }
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java
index 2abff6ac..8721e35c 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.config.configs;
 
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 
 public class HelperConfig {
@@ -19,6 +20,9 @@ public class HelperConfig {
     @SerialEntry
     public FairySouls fairySouls = new FairySouls();
 
+    @SerialEntry
+    public ChocolateFactory chocolateFactory = new ChocolateFactory();
+
     public static class MythologicalRitual {
         @SerialEntry
         public boolean enableMythologicalRitualHelper = true;
@@ -62,4 +66,18 @@ public class HelperConfig {
         @SerialEntry
         public boolean highlightOnlyNearbySouls = false;
     }
+
+    public static class ChocolateFactory {
+        @SerialEntry
+        public boolean enableChocolateFactoryHelper = true;
+
+        @SerialEntry
+        public boolean enableEggFinder = true;
+
+        @SerialEntry
+        public boolean sendEggFoundMessages = true;
+
+        @SerialEntry
+        public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT;
+    }
 }