Merge pull request #724 from AzureAaron/simon-says

Simon Says Solver & Lights On Solver

2 files changed, 33 insertions, 0 deletions

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 28ace441..017e9186 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -269,6 +269,28 @@ public class DungeonsCategory {
                                 .build())
                         .build())
 
+                // Devices (F7/M7)
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.config.dungeons.devices"))
+                        .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.dungeons.devices.solveSimonSays"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.devices.solveSimonSays.@Tooltip")))
+                                .binding(defaults.dungeons.devices.solveSimonSays,
+                                        () -> config.dungeons.devices.solveSimonSays,
+                                        newValue -> config.dungeons.devices.solveSimonSays = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.dungeons.devices.solveLightsOn"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.devices.solveLightsOn.@Tooltip")))
+                                .binding(defaults.dungeons.devices.solveLightsOn,
+                                        () -> config.dungeons.devices.solveLightsOn,
+                                        newValue -> config.dungeons.devices.solveLightsOn = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .build())
+
                 // Dungeon Secret Waypoints
                 .group(OptionGroup.createBuilder()
                         .name(Text.translatable("skyblocker.config.dungeons.secretWaypoints"))
diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
index 7b394b53..1a0cad9d 100644
--- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java
@@ -42,6 +42,9 @@ public class DungeonsConfig {
     public Terminals terminals = new Terminals();
 
     @SerialEntry
+    public Devices devices = new Devices();
+
+    @SerialEntry
     public SecretWaypoints secretWaypoints = new SecretWaypoints();
 
     @SerialEntry
@@ -135,6 +138,14 @@ public class DungeonsConfig {
         public boolean blockIncorrectClicks = false;
     }
 
+    public static class Devices {
+        @SerialEntry
+        public boolean solveSimonSays = true;
+
+        @SerialEntry
+        public boolean solveLightsOn = true;
+    }
+
     public static class SecretWaypoints {
         @SerialEntry
         public boolean enableRoomMatching = true;