extract DungeonFloor into own class

5 files changed, 21 insertions, 20 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
index 68761ef3a..fd1d87206 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/storage/ProfileSpecificStorage.java
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.model.ComposterUpgrade;
 import at.hannibal2.skyhanni.features.combat.endernodetracker.EnderNodeTracker;
 import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostData;
 import at.hannibal2.skyhanni.features.dungeon.CroesusChestTracker;
-import at.hannibal2.skyhanni.features.dungeon.DungeonAPI;
+import at.hannibal2.skyhanni.features.dungeon.DungeonFloor;
 import at.hannibal2.skyhanni.features.event.diana.DianaProfitTracker;
 import at.hannibal2.skyhanni.features.event.diana.MythologicalCreatureTracker;
 import at.hannibal2.skyhanni.features.event.jerry.frozentreasure.FrozenTreasureTracker;
@@ -409,7 +409,7 @@ public class ProfileSpecificStorage {
     public static class DungeonStorage {
 
         @Expose
-        public Map<DungeonAPI.DungeonFloor, Integer> bosses = new HashMap<>();
+        public Map<DungeonFloor, Integer> bosses = new HashMap<>();
 
         @Expose
         public List<DungeonStorage.DungeonRunInfo> runs = Stream.generate(DungeonStorage.DungeonRunInfo::new)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
index 1543aaf01..47f742ded 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
@@ -259,22 +259,6 @@ object DungeonAPI {
         }
     }
 
-    enum class DungeonFloor(private val bossName: String) {
-        ENTRANCE("The Watcher"),
-        F1("Bonzo"),
-        F2("Scarf"),
-        F3("The Professor"),
-        F4("Thorn"),
-        F5("Livid"),
-        F6("Sadan"),
-        F7("Necron");
-
-        companion object {
-
-            fun byBossName(bossName: String) = DungeonFloor.entries.firstOrNull { it.bossName == bossName }
-        }
-    }
-
     enum class DungeonClass(val scoreboardName: String) {
         ARCHER("Archer"),
         BERSERK("Berserk"),
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
index 80d4a48d2..60574b1c6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
@@ -75,7 +75,7 @@ class DungeonCopilot {
         if (message == "§c[BOSS] The Watcher§r§f: That will be enough for now.") changeNextStep("Clear Blood Room")
 
         if (message == "§c[BOSS] The Watcher§r§f: You have proven yourself. You may pass.") {
-            if (DungeonAPI.getCurrentBoss() == DungeonAPI.DungeonFloor.ENTRANCE) {
+            if (DungeonAPI.getCurrentBoss() == DungeonFloor.ENTRANCE) {
                 changeNextStep("")
             } else {
                 changeNextStep("Enter Boss Room")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFloor.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFloor.kt
new file mode 100644
index 000000000..5bb2ae0c2
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFloor.kt
@@ -0,0 +1,17 @@
+package at.hannibal2.skyhanni.features.dungeon
+
+enum class DungeonFloor(private val bossName: String) {
+    ENTRANCE("The Watcher"),
+    F1("Bonzo"),
+    F2("Scarf"),
+    F3("The Professor"),
+    F4("Thorn"),
+    F5("Livid"),
+    F6("Sadan"),
+    F7("Necron");
+
+    companion object {
+
+        fun byBossName(bossName: String) = DungeonFloor.entries.firstOrNull { it.bossName == bossName }
+    }
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
index 7b47adfda..a0e923820 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/TerracottaPhase.kt
@@ -46,5 +46,5 @@ class TerracottaPhase {
     private fun isActive() = isEnabled() && inTerracottaPhase
 
     private fun isEnabled() =
-        LorenzUtils.inDungeons && DungeonAPI.inBossRoom && DungeonAPI.getCurrentBoss() == DungeonAPI.DungeonFloor.F6
+        LorenzUtils.inDungeons && DungeonAPI.inBossRoom && DungeonAPI.getCurrentBoss() == DungeonFloor.F6
 }