formatting dungeon features

6 files changed, 39 insertions, 22 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index 49eca4470..48b568a9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -78,7 +78,7 @@ public class SkyHanniMod {
         registerEvent(new ExpBottleOnGroundHider());
         registerEvent(new DamageIndicatorManager());
         registerEvent(new ItemAbilityCooldown());
-        registerEvent(new DungeonMilestoneDisplay());
+        registerEvent(new DungeonMilestonesDisplay());
         registerEvent(new DungeonDeathCounter());
         registerEvent(new DungeonCleanEnd());
         registerEvent(new DungeonBossMessages());
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 56a78c3c8..ba3b49129 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -37,8 +37,8 @@ public class Features {
             return;
         }
 
-        if (runnableId.equals("dungeonMilestoneDisplay")) {
-            editOverlay(activeConfigCategory, 200, 16, dungeon.milestoneDisplayPos);
+        if (runnableId.equals("dungeonMilestonesDisplay")) {
+            editOverlay(activeConfigCategory, 200, 16, dungeon.showMileStonesDisplayPos);
             return;
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
index 7be3f6902..74d2a076c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
@@ -1,9 +1,7 @@
 package at.hannibal2.skyhanni.config.features;
 
 import at.hannibal2.skyhanni.config.gui.core.config.Position;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
 import com.google.gson.annotations.Expose;
 
 public class Dungeon {
@@ -13,33 +11,52 @@ public class Dungeon {
     @ConfigEditorBoolean
     public boolean highlightClickedBlocks = false;
 
+    @ConfigOption(name = "Milestones", desc = "")
+    @ConfigEditorAccordion(id = 0)
+    public boolean showMilestone = false;
+
     @Expose
-    @ConfigOption(name = "Milestone Display", desc = "Show the current milestone inside Dungeons.")
+    @ConfigOption(name = "Milestones Display", desc = "Show the current milestone inside Dungeons.")
     @ConfigEditorBoolean
-    public boolean showMilestoneDisplay = false;
+    @ConfigAccordionId(id = 0)
+    public boolean showMilestonesDisplay = false;
 
     @Expose
     @ConfigOption(name = "Milestone Display Position", desc = "")
-    @ConfigEditorButton(runnableId = "dungeonMilestoneDisplay", buttonText = "Edit")
-    public Position milestoneDisplayPos = new Position(10, 10, false, true);
+    @ConfigEditorButton(runnableId = "dungeonMilestonesDisplay", buttonText = "Edit")
+    @ConfigAccordionId(id = 0)
+    public Position showMileStonesDisplayPos = new Position(10, 10, false, true);
+
+    @ConfigOption(name = "Death Counter", desc = "")
+    @ConfigEditorAccordion(id = 1)
+    public boolean deathCounter = false;
 
     @Expose
-    @ConfigOption(name = "Death Counter", desc = "Display the total amount of deaths in the current dungeon.")
+    @ConfigOption(name = "Death Counter Display", desc = "Display the total amount of deaths in the current dungeon.")
     @ConfigEditorBoolean
-    public boolean deathCounter = false;
+    @ConfigAccordionId(id = 1)
+    public boolean deathCounterDisplay = false;
 
     @Expose
     @ConfigOption(name = "Death Counter Position", desc = "")
     @ConfigEditorButton(runnableId = "dungeonDeathCounter", buttonText = "Edit")
+    @ConfigAccordionId(id = 1)
     public Position deathCounterPos = new Position(10, 10, false, true);
 
+    @ConfigOption(name = "Clean End", desc = "")
+    @ConfigEditorAccordion(id = 2)
+    public boolean cleanEnd = false;
+
     @Expose
     @ConfigOption(name = "Clean End", desc = "Hide entities and particles after the boss in Floor 1 - 6 has died.")
     @ConfigEditorBoolean
-    public boolean cleanEnd = false;
+    @ConfigAccordionId(id = 2)
+    public boolean cleanEndToggle = false;
 
     @Expose
-    @ConfigOption(name = "Ignore Guardians", desc = "Ignore F3 and M3 guardians from the clean end feature when sneaking. Makes it easier to kill them after the boss died already. Thanks hypixel.")
+    @ConfigOption(name = "Ignore Guardians", desc = "Ignore F3 and M3 guardians from the clean end feature when " +
+            "sneaking. Makes it easier to kill them after the boss died already. Thanks hypixel.")
     @ConfigEditorBoolean
+    @ConfigAccordionId(id = 2)
     public boolean cleanEndF3IgnoreGuardians = false;
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
index 01950688a..6867e2171 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
@@ -25,7 +25,7 @@ class DungeonCleanEnd {
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
         if (!LorenzUtils.inDungeons) return
-        if (!SkyHanniMod.feature.dungeon.cleanEnd) return
+        if (!SkyHanniMod.feature.dungeon.cleanEndToggle) return
 
         val message = event.message
 
@@ -36,7 +36,7 @@ class DungeonCleanEnd {
 
     private fun shouldBlock(): Boolean {
         if (!LorenzUtils.inDungeons) return false
-        if (!SkyHanniMod.feature.dungeon.cleanEnd) return false
+        if (!SkyHanniMod.feature.dungeon.cleanEndToggle) return false
 
         if (!bossDone) return false
 
@@ -63,7 +63,7 @@ class DungeonCleanEnd {
     @SubscribeEvent
     fun onHealthUpdatePacket(event: PacketEvent.ReceiveEvent) {
         if (!LorenzUtils.inDungeons) return
-        if (!SkyHanniMod.feature.dungeon.cleanEnd) return
+        if (!SkyHanniMod.feature.dungeon.cleanEndToggle) return
 
         if (bossDone) return
         if (lastBossId == -1) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
index c59f5a3cb..129d9e3bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
@@ -88,10 +88,10 @@ class DungeonDeathCounter {
     fun renderOverlay(event: RenderGameOverlayEvent.Post) {
         if (!isEnabled()) return
 
-        SkyHanniMod.feature.dungeon.deathCounterPos.renderString(DungeonMilestoneDisplay.color + textToRender)
+        SkyHanniMod.feature.dungeon.deathCounterPos.renderString(DungeonMilestonesDisplay.color + textToRender)
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.deathCounter
+        return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.deathCounterDisplay
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
index cd8464730..12af1c7a4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
@@ -11,7 +11,7 @@ import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.concurrent.fixedRateTimer
 
-class DungeonMilestoneDisplay {
+class DungeonMilestonesDisplay {
 
 
     companion object {
@@ -87,10 +87,10 @@ class DungeonMilestoneDisplay {
     fun renderOverlay(event: RenderGameOverlayEvent.Post) {
         if (!isEnabled()) return
 
-        SkyHanniMod.feature.dungeon.milestoneDisplayPos.renderString(color + textToRender)
+        SkyHanniMod.feature.dungeon.showMileStonesDisplayPos.renderString(color + textToRender)
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.showMilestoneDisplay
+        return LorenzUtils.inDungeons && SkyHanniMod.feature.dungeon.showMilestonesDisplay
     }
 }
\ No newline at end of file