moved damage indicator classes outside of dungeon

8 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index 2a8a76631..d9724877c 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.chat.PlayerChatFilter;
 import at.hannibal2.skyhanni.config.Features;
 import at.hannibal2.skyhanni.config.gui.commands.Commands;
 import at.hannibal2.skyhanni.dungeon.*;
-import at.hannibal2.skyhanni.dungeon.damageindicator.BossDamageIndicator;
+import at.hannibal2.skyhanni.damageindicator.BossDamageIndicator;
 import at.hannibal2.skyhanni.features.abilities.AshfangFreezeCooldown;
 import at.hannibal2.skyhanni.fishing.SeaCreatureManager;
 import at.hannibal2.skyhanni.fishing.SeaCreatureMessageShortener;
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 8217c71a9..7be3f6902 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
@@ -14,11 +14,6 @@ public class Dungeon {
     public boolean highlightClickedBlocks = false;
 
     @Expose
-    @ConfigOption(name = "Boss Damage Indicator", desc = "Show the missing health of a boss in the dungeon and the cooldown time until the boss becomes attackable.")
-    @ConfigEditorBoolean
-    public boolean bossDamageIndicator = false;
-
-    @Expose
     @ConfigOption(name = "Milestone Display", desc = "Show the current milestone inside Dungeons.")
     @ConfigEditorBoolean
     public boolean showMilestoneDisplay = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index 82268e2aa..dcaf6a259 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -9,6 +9,11 @@ import com.google.gson.annotations.Expose;
 public class Misc {
 
     @Expose
+    @ConfigOption(name = "Boss Damage Indicator", desc = "Show the missing health of a boss in the dungeon, of slayer bosses and other bosses and the cooldown time until the boss becomes attackable.")
+    @ConfigEditorBoolean
+    public boolean bossDamageIndicator = false;
+
+    @Expose
     @ConfigOption(name = "Pet Display", desc = "Show the currently active pet.")
     @ConfigEditorBoolean
     public boolean petDisplay = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/BossDamageIndicator.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt
index 4978bd6d2..09032b6c3 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/BossDamageIndicator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon.damageindicator
+package at.hannibal2.skyhanni.damageindicator
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.dungeon.DungeonData
@@ -28,7 +28,7 @@ class BossDamageIndicator {
     private val maxHealth = mutableMapOf<UUID, Int>()
 
     @SubscribeEvent
-    fun onDungeonStart(event: WorldEvent.Load) {
+    fun onWorldLoad(event: WorldEvent.Load) {
         bossFinder = BossFinder()
         data.clear()
     }
@@ -40,7 +40,7 @@ class BossDamageIndicator {
 
     @SubscribeEvent
     fun onWorldRender(event: RenderWorldLastEvent) {
-        if (!SkyHanniMod.feature.dungeon.bossDamageIndicator) return
+        if (!SkyHanniMod.feature.misc.bossDamageIndicator) return
 
         GlStateManager.disableDepth()
         GlStateManager.disableCull()
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
index c0173d2a5..4576afb73 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/BossFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon.damageindicator
+package at.hannibal2.skyhanni.damageindicator
 
 import at.hannibal2.skyhanni.dungeon.DungeonData
 import at.hannibal2.skyhanni.test.LorenzTest
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
index 52f24fd52..889b0d674 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon.damageindicator
+package at.hannibal2.skyhanni.damageindicator
 
 enum class BossType {
     DUNGEON,
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityData.kt
index f073045b8..ffbe00a87 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon.damageindicator
+package at.hannibal2.skyhanni.damageindicator
 
 import at.hannibal2.skyhanni.utils.LorenzColor
 import net.minecraft.entity.EntityLivingBase
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityResult.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityResult.kt
index 521e923b1..e2f8e9e69 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/damageindicator/EntityResult.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityResult.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon.damageindicator
+package at.hannibal2.skyhanni.damageindicator
 
 class EntityResult(
     val delayedStart: Long = -1L,