creating new crimson isle config and adding gravityOrbs to it

4 files changed, 42 insertions, 22 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 9b95f8a10..cd6c14488 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -72,7 +72,7 @@ public class Features extends Config {
     public AshfangConfig ashfang = new AshfangConfig();
 
     @Expose
-    @Category(name = "Crimson Isle", desc = "Crimson isle nether features.")
+    @Category(name = "Crimson Isle", desc = "Things to do on the Crimson Isle/Nether island.")
     public CrimsonIsleConfig crimsonIsle = new CrimsonIsleConfig();
 
     @Expose
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 d21328d3b..ed3cc1682 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java
@@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.config.features;
 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.Accordion;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
 import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
 import io.github.moulberry.moulconfig.annotations.ConfigOption;
@@ -28,25 +27,6 @@ public class AshfangConfig {
     @Expose
     public Position nextResetCooldownPos = new Position(10, 10, false, true);
 
-    @ConfigOption(name = "Gravity Orbs", desc = "")
-    @Accordion
-    @Expose
-    public GravityOrbsConfig gravityOrbs = new GravityOrbsConfig();
-
-    public static class GravityOrbsConfig {
-
-        @Expose
-        @ConfigOption(name = "Enabled", desc = "Shows the Gravity Orbs more clearly.")
-        @ConfigEditorBoolean
-        @FeatureToggle
-        public boolean enabled = false;
-
-        @Expose
-        @ConfigOption(name = "Color", desc = "Color of the Gravity Orbs.")
-        @ConfigEditorColour
-        public String color = "0:120:255:85:85";
-    }
-
     @Expose
     @ConfigOption(name = "Blazing Souls", desc = "Shows the Blazing Souls more clearly.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java
new file mode 100644
index 000000000..e9f861606
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/CrimsonIsleConfig.java
@@ -0,0 +1,38 @@
+package at.hannibal2.skyhanni.config.features;
+
+import at.hannibal2.skyhanni.config.FeatureToggle;
+import com.google.gson.annotations.Expose;
+import io.github.moulberry.moulconfig.annotations.Accordion;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
+import io.github.moulberry.moulconfig.annotations.ConfigEditorColour;
+import io.github.moulberry.moulconfig.annotations.ConfigOption;
+
+public class CrimsonIsleConfig {
+
+    @ConfigOption(name = "Ashfang", desc = "")
+    @Accordion
+    @Expose
+    public AshfangConfig ashfang = new AshfangConfig();
+
+    public static class AshfangConfig {
+
+        @ConfigOption(name = "Gravity Orbs", desc = "")
+        @Accordion
+        @Expose
+        public GravityOrbsConfig gravityOrbs = new GravityOrbsConfig();
+
+        public static class GravityOrbsConfig {
+
+            @Expose
+            @ConfigOption(name = "Enabled", desc = "Shows the Gravity Orbs more clearly.")
+            @ConfigEditorBoolean
+            @FeatureToggle
+            public boolean enabled = false;
+
+            @Expose
+            @ConfigOption(name = "Color", desc = "Color of the Gravity Orbs.")
+            @ConfigEditorColour
+            public String color = "0:120:255:85:85";
+        }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
index b9d6e6b7e..98a282218 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt
@@ -15,7 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
 
 class AshfangGravityOrbs {
-    private val config get() = SkyHanniMod.feature.ashfang.gravityOrbs
+    private val config get() = SkyHanniMod.feature.crimsonIsle.ashfang.gravityOrbs
 
     private val texture = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV" +
             "0L3RleHR1cmUvMWE2OWNjZjdhZDkwNGM5YTg1MmVhMmZmM2Y1YjRlMjNhZGViZjcyZWQxMmQ1ZjI0Yjc4Y2UyZDQ0YjRhMiJ9fX0="
@@ -58,6 +58,8 @@ class AshfangGravityOrbs {
     fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
         event.move(1, "ashfang.gravityOrbs", "ashfang.gravityOrbs.enabled")
         event.move(1, "ashfang.gravityOrbsColor", "ashfang.gravityOrbs.color")
+
+        event.move(2, "ashfang.gravityOrbs", "crimsonIsle.ashfang.gravityOrbs")
     }
 
     private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled &&