Backend: Widget abstractions

src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt

@@ -65,6 +65,7 @@ import at.hannibal2.skyhanni.data.jsonobjects.local.VisualWordsJson
 import at.hannibal2.skyhanni.data.mob.MobData
 import at.hannibal2.skyhanni.data.mob.MobDebug
 import at.hannibal2.skyhanni.data.mob.MobDetection
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.data.repo.RepoManager
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.PreInitFinishedEvent
@@ -579,6 +580,7 @@ class SkyHanniMod {
         loadModule(ChatUtils)
         loadModule(FixedRateTimerManager())
         loadModule(ChromaManager)
+        loadModule(TabWidget)
         loadModule(HotmData)
         loadModule(ContributorManager)
         loadModule(TabComplete)

src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt

@@ -2,13 +2,15 @@ package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigManager.Companion.gson
+import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.HypixelJoinEvent
 import at.hannibal2.skyhanni.events.IslandChangeEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.LorenzTickEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
 import at.hannibal2.skyhanni.events.TabListUpdateEvent
+import at.hannibal2.skyhanni.events.WidgetUpdateEvent
 import at.hannibal2.skyhanni.features.bingo.BingoAPI
 import at.hannibal2.skyhanni.features.dungeon.DungeonAPI
 import at.hannibal2.skyhanni.features.rift.RiftAPI
@@ -68,6 +70,7 @@ class HypixelData {
             "playeramount.guesting",
             "^\\s*(?:§.)*Guests (?:§.)*\\((?<amount>\\d+)\\)\\s*$"
         )
+
         /**
          * REGEX-TEST:           §r§b§lParty §r§f(4)
          */
@@ -342,7 +345,6 @@ class HypixelData {
 
         val inSkyBlock = checkScoreboard()
         if (inSkyBlock) {
-            checkIsland()
             checkSidebar()
             checkCurrentServerId()
         }
@@ -351,6 +353,14 @@ class HypixelData {
         skyBlock = inSkyBlock
     }
 
+    @SubscribeEvent
+    fun onTabListUpdate(event: WidgetUpdateEvent) {
+        when (event.widget) {
+            TabWidget.AREA -> checkIsland(event)
+            else -> Unit
+        }
+    }
+
     private fun checkProfileName() {
         if (profileName.isNotEmpty()) return
 
@@ -392,18 +402,24 @@ class HypixelData {
         noTrade = ironman || stranded || bingo
     }
 
-    private fun checkIsland() {
-        var foundIsland = ""
-        TabListData.fullyLoaded = false
+    private fun checkIsland(event: WidgetUpdateEvent) {
+        val islandType: IslandType
+        val foundIsland: String
+        if (event.isClear()) {
+
+            TabListData.fullyLoaded = false
+            islandType = IslandType.NONE
+            foundIsland = ""
 
-        TabListData.getTabList().matchFirst(islandNamePattern) {
-            foundIsland = group("island").removeColor()
+        } else {
             TabListData.fullyLoaded = true
+            // Can not use color coding, because of the color effect (§f§lSKYB§6§lL§e§lOCK§A§L GUEST)
+            val guesting = guestPattern.matches(ScoreboardData.objectiveTitle.removeColor())
+            foundIsland = TabWidget.AREA.matchMatcherFirstLine { group("island").removeColor() } ?: ""
+            islandType = getIslandType(foundIsland, guesting)
+            TabWidget.reSendEvents()
         }
-
-        // Can not use color coding, because of the color effect (§f§lSKYB§6§lL§e§lOCK§A§L GUEST)
-        val guesting = guestPattern.matches(ScoreboardData.objectiveTitle.removeColor())
-        val islandType = getIslandType(foundIsland, guesting)
+
         if (skyBlockIsland != islandType) {
             IslandChangeEvent(islandType, skyBlockIsland).postAndCatch()
             if (islandType == IslandType.UNKNOWN) {