migrate mobs nad summoning config into combat

4 files changed, 120 insertions, 152 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 29123ee00..1acc0a393 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -64,10 +64,6 @@ public class Features extends Config {
     public ItemAbilityConfig itemAbilities = new ItemAbilityConfig();
 
     @Expose
-    @Category(name = "Summonings", desc = "Mobs you revive.")
-    public SummoningsConfig summonings = new SummoningsConfig();
-
-    @Expose
     @Category(name = "Crimson Isle", desc = "Things to do on the Crimson Isle/Nether island.")
     public CrimsonIsleConfig crimsonIsle = new CrimsonIsleConfig();
 
@@ -108,10 +104,6 @@ public class Features extends Config {
     public BingoConfig bingo = new BingoConfig();
 
     @Expose
-    @Category(name = "Mobs", desc = "Visual help for Mobs")
-    public MobsConfig mobs = new MobsConfig();
-
-    @Expose
     @Category(name = "Garden", desc = "Features on the Garden island.")
     public GardenConfig garden = new GardenConfig();
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java
index 75f8c063c..88b7256af 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/CombatConfig.java
@@ -475,6 +475,126 @@ public class CombatConfig {
     }
 
     @Expose
+    @ConfigOption(name = "Summonings", desc = "")
+    @Accordion
+    public SummoningsConfig summonings = new SummoningsConfig();
+
+    public static class SummoningsConfig {
+
+        @Expose
+        @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped Summoning Souls laying on the ground. " +
+                "§cNot working in dungeons if Skytils' 'Hide Non-Starred Mobs Nametags' feature is enabled!")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean summoningSoulDisplay = false;
+
+        @Expose
+        @ConfigOption(name = "Summoning Mob Display", desc = "Show the health of your spawned summons.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean summoningMobDisplay = false;
+
+        @Expose
+        public Position summoningMobDisplayPos = new Position(10, 10, false, true);
+
+        @Expose
+        @ConfigOption(name = "Summoning Mob Nametag", desc = "Hide the nametag of your spawned summons.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean summoningMobHideNametag = false;
+
+        @Expose
+        @ConfigOption(name = "Summoning Mob Color", desc = "Marks own summons green.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean summoningMobColored = false;
+    }
+
+    @Expose
+    @ConfigOption(name = "Mobs", desc = "")
+    @Accordion
+    public MobsConfig mobs = new MobsConfig();
+
+    public static class MobsConfig {
+
+        @Expose
+        @ConfigOption(name = "Highlighters", desc = "")
+        @ConfigEditorAccordion(id = 0)
+        public boolean highlighters = false;
+
+        @Expose
+        @ConfigOption(name = "Area Boss", desc = "Highlight Golden Ghoul, Old Wolf, Voidling Extremist and Millenia-Aged Blaze.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean areaBossHighlight = true;
+
+        @Expose
+        @ConfigOption(name = "Arachne Keeper", desc = "Highlight the Arachne Keeper in the Spider's Den in purple color.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean arachneKeeperHighlight = true;
+
+        @Expose
+        @ConfigOption(name = "Corleone", desc = "Highlight Boss Corleone in the Crystal Hollows.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean corleoneHighlighter = true;
+
+        @Expose
+        @ConfigOption(name = "Zealot", desc = "Highlight Zealots and Bruisers in The End.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean zealotBruiserHighlighter = false;
+
+        @Expose
+        @ConfigOption(
+                name = "Special Zealots",
+                desc = "Highlight Special Zealots (the ones that drop Summoning Eyes) in the End."
+        )
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean specialZealotHighlighter = true;
+
+        @Expose
+        @ConfigOption(name = "Corrupted Mob", desc = "Highlight corrupted mobs in purple color.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean corruptedMobHighlight = false;
+
+        @Expose
+        @ConfigOption(name = "Arachne Boss", desc = "Highlight the Arachne boss in red and mini-bosses in orange.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean arachneBossHighlighter = true;
+
+        @Expose
+        @ConfigOption(name = "Respawn Timers", desc = "")
+        public boolean timers = false;
+
+        @Expose
+        @ConfigOption(
+                name = "Area Boss",
+                desc = "Show a timer when Golden Ghoul, Old Wolf, Voidling Extremist or Millenia-Aged Blaze respawns. " +
+                        "§cSometimes it takes 20-30 seconds to calibrate correctly."
+        )
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean areaBossRespawnTimer = false;
+
+        @Expose
+        @ConfigOption(name = "Enderman TP Hider", desc = "Stops the Enderman Teleportation animation.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean endermanTeleportationHider = true;
+
+        @Expose
+        @ConfigOption(name = "Arachne Minis Hider", desc = "Hides the nametag above arachne minis.")
+        @ConfigEditorBoolean
+        @FeatureToggle
+        public boolean hideNameTagArachneMinis = true;
+    }
+
+    @Expose
     @ConfigOption(name = "Hide Damage Splash", desc = "Hide all damage splashes anywhere in SkyBlock.")
     @ConfigEditorBoolean
     @FeatureToggle
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MobsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MobsConfig.java
deleted file mode 100644
index b58ab06d1..000000000
--- a/src/main/java/at/hannibal2/skyhanni/config/features/MobsConfig.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package at.hannibal2.skyhanni.config.features;
-
-import at.hannibal2.skyhanni.config.FeatureToggle;
-import com.google.gson.annotations.Expose;
-import io.github.moulberry.moulconfig.annotations.ConfigAccordionId;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
-
-public class MobsConfig {
-
-    @Expose
-    @ConfigOption(name = "Highlighters", desc = "")
-    @ConfigEditorAccordion(id = 0)
-    public boolean highlighters = false;
-
-    @Expose
-    @ConfigOption(name = "Area Boss", desc = "Highlight Golden Ghoul, Old Wolf, Voidling Extremist and Millenia-Aged Blaze.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean areaBossHighlight = true;
-
-    @Expose
-    @ConfigOption(name = "Arachne Keeper", desc = "Highlight the Arachne Keeper in the Spider's Den in purple color.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean arachneKeeperHighlight = true;
-
-    @Expose
-    @ConfigOption(name = "Corleone", desc = "Highlight Boss Corleone in the Crystal Hollows.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean corleoneHighlighter = true;
-
-    @Expose
-    @ConfigOption(name = "Zealot", desc = "Highlight Zealots and Bruisers in The End.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean zealotBruiserHighlighter = false;
-
-    @Expose
-    @ConfigOption(
-            name = "Special Zealots",
-            desc = "Highlight Special Zealots (the ones that drop Summoning Eyes) in the End."
-    )
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean specialZealotHighlighter = true;
-
-    @Expose
-    @ConfigOption(name = "Corrupted Mob", desc = "Highlight corrupted mobs in purple color.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean corruptedMobHighlight = false;
-
-    @Expose
-    @ConfigOption(name = "Arachne Boss", desc = "Highlight the Arachne boss in red and mini-bosses in orange.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean arachneBossHighlighter = true;
-
-    @Expose
-    @ConfigOption(name = "Respawn Timers", desc = "")
-    @ConfigEditorAccordion(id = 1)
-    public boolean timers = false;
-
-    @Expose
-    @ConfigOption(
-            name = "Area Boss",
-            desc = "Show a timer when Golden Ghoul, Old Wolf, Voidling Extremist or Millenia-Aged Blaze respawns. " +
-                    "§cSometimes it takes 20-30 seconds to calibrate correctly."
-    )
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 1)
-    @FeatureToggle
-    public boolean areaBossRespawnTimer = false;
-
-    @Expose
-    @ConfigOption(name = "Enderman TP Hider", desc = "Stops the Enderman Teleportation animation.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean endermanTeleportationHider = true;
-
-    @Expose
-    @ConfigOption(name = "Arachne Minis Hider", desc = "Hides the nametag above arachne minis.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean hideNameTagArachneMinis = true;
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java
deleted file mode 100644
index c7ebef451..000000000
--- a/src/main/java/at/hannibal2/skyhanni/config/features/SummoningsConfig.java
+++ /dev/null
@@ -1,48 +0,0 @@
-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.ConfigAccordionId;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorAccordion;
-import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean;
-import io.github.moulberry.moulconfig.annotations.ConfigOption;
-
-public class SummoningsConfig {
-
-    @Expose
-    @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped Summoning Souls laying on the ground. " +
-            "§cNot working in dungeons if Skytils' 'Hide Non-Starred Mobs Nametags' feature is enabled!")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean summoningSoulDisplay = false;
-
-    @Expose
-    @ConfigOption(name = "Summoning Mob", desc = "")
-    @ConfigEditorAccordion(id = 0)
-    public boolean summoningMob = false;
-
-    @Expose
-    @ConfigOption(name = "Summoning Mob Display", desc = "Show the health of your spawned summons.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean summoningMobDisplay = false;
-
-    @Expose
-    public Position summoningMobDisplayPos = new Position(10, 10, false, true);
-
-    @Expose
-    @ConfigOption(name = "Summoning Mob Nametag", desc = "Hide the nametag of your spawned summons.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean summoningMobHideNametag = false;
-
-    @Expose
-    @ConfigOption(name = "Summoning Mob Color", desc = "Marks own summons green.")
-    @ConfigEditorBoolean
-    @ConfigAccordionId(id = 0)
-    @FeatureToggle
-    public boolean summoningMobColored = false;
-}