migrate blazingSoul into crimson isle config

2 files changed, 19 insertions, 12 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
index ed3cc1682..99edc22e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.config.FeatureToggle;
 import at.hannibal2.skyhanni.config.core.config.Position;
 import com.google.gson.annotations.Expose;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
 
 public class AshfangConfig {
@@ -28,17 +27,6 @@ public class AshfangConfig {
     public Position nextResetCooldownPos = new Position(10, 10, false, true);
 
     @Expose
-    @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean blazingSouls = false;
-
-    @Expose
-    @ConfigOption(name = "Souls Color", desc = "Color of the Ashfang Blazing Souls.")
-    @ConfigEditorColour
-    public String blazingSoulsColor = "0:245:85:255:85";
-
-    @Expose
     @ConfigOption(name = "Highlight Blazes", desc = "Highlight the different blazes in their respective colors.")
     @ConfigEditorBoolean
     @FeatureToggle
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java
index e9f861606..70167e5a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java
@@ -34,5 +34,24 @@ public class CrimsonIsleConfig {
             @ConfigEditorColour
             public String color = "0:120:255:85:85";
         }
+
+        @ConfigOption(name = "Blazing Souls", desc = "")
+        @Accordion
+        @Expose
+        public BlazingSoulsColor blazingSouls = new BlazingSoulsColor();
+
+        public static class BlazingSoulsColor {
+
+            @Expose
+            @ConfigOption(name = "Enabled", desc = "Shows the Blazing Souls more clearly.")
+            @ConfigEditorBoolean
+            @FeatureToggle
+            public boolean enabled = false;
+
+            @Expose
+            @ConfigOption(name = "Souls Color", desc = "Color of the Blazing Souls.")
+            @ConfigEditorColour
+            public String color = "0:245:85:255:85";
+        }
     }
 }