Merge branch 'beta' into frozen_treasure_tracker

2 files changed, 6 insertions, 17 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt
index 82938994a..0d412f6da 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.ProfileApiDataLoadedEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.utils.APIUtil
@@ -36,19 +35,6 @@ class ApiDataLoader {
     }
 
     @SubscribeEvent
-    fun onStatusBar(event: LorenzChatEvent) {
-        val message = event.message
-        if (message.startsWith("§aYour new API key is §r§b")) {
-            SkyHanniMod.feature.storage.apiKey = message.substring(26)
-            LorenzUtils.chat("§b[SkyHanni] A new API Key has been detected and installed")
-
-            if (currentProfileName != "") {
-                updateApiData()
-            }
-        }
-    }
-
-    @SubscribeEvent
     fun onProfileJoin(event: ProfileJoinEvent) {
         currentProfileName = event.name
         updateApiData()
@@ -99,7 +85,6 @@ class ApiDataLoader {
                     LorenzUtils.error("§c[SkyHanni] Invalid API key from $modName")
                 }
             }
-            LorenzUtils.error("§c[SkyHanni] SkyHanni has no API key set. Please run /api new")
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
index 1c5c76d92..7e44bd5cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt
@@ -27,7 +27,7 @@ object SlayerAPI {
 
     var questStartTime = 0L
     var isInSlayerArea = false
-    private var latestSlayerCategory = ""
+    var latestSlayerCategory = ""
     private var latestProgressChangeTime = 0L
     var latestWrongAreaWarning = 0L
     private var latestSlayerProgress = ""
@@ -106,10 +106,14 @@ object SlayerAPI {
         if (event.phase != TickEvent.Phase.START) return
         if (!LorenzUtils.inSkyBlock) return
 
+        // wait with sending SlayerChangeEvent until profile is detected
+        if (ProfileStorageData.profileSpecific == null) return
+
         val slayerQuest = ScoreboardData.sidebarLinesFormatted.nextAfter("Slayer Quest") ?: ""
         if (slayerQuest != latestSlayerCategory) {
-            SlayerChangeEvent(latestSlayerCategory, slayerQuest).postAndCatch()
+            val old = latestSlayerCategory
             latestSlayerCategory = slayerQuest
+            SlayerChangeEvent(old, latestSlayerCategory).postAndCatch()
         }
 
         val slayerProgress = ScoreboardData.sidebarLinesFormatted.nextAfter("Slayer Quest", 2) ?: ""