From ce0956ac232f444724f90f0633b4b35f3dd8cfdf Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 7 Jan 2023 02:35:44 +0100
Subject: Renamed hypixel and skyblock.

---
 .../java/at/hannibal2/skyhanni/data/HyPixelData.kt | 155 +++++++++++++++++++++
 .../java/at/hannibal2/skyhanni/data/HypixelData.kt | 155 ---------------------
 2 files changed, 155 insertions(+), 155 deletions(-)
 create mode 100644 src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
 delete mode 100644 src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt

(limited to 'src/main/java/at/hannibal2/skyhanni/data')

diff --git a/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
new file mode 100644
index 000000000..e1c466762
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
@@ -0,0 +1,155 @@
+package at.hannibal2.skyhanni.data
+
+import at.hannibal2.skyhanni.events.IslandChangeEvent
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.events.ProfileJoinEvent
+import at.hannibal2.skyhanni.utils.LorenzLogger
+import at.hannibal2.skyhanni.utils.StringUtils.removeColor
+import at.hannibal2.skyhanni.utils.TabListUtils
+import net.minecraft.client.Minecraft
+import net.minecraftforge.event.world.WorldEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
+import net.minecraftforge.fml.common.network.FMLNetworkEvent
+
+class HyPixelData {
+
+    companion object {
+        var hypixel = false
+        var skyBlock = false
+        var skyBlockIsland: String = ""
+
+        //Ironman, Stranded and Bingo
+        var noTrade = false
+
+        var ironman = false
+        var stranded = false
+        var bingo = false
+
+        fun readSkyBlockArea(): String {
+            for (line in ScoreboardData.sidebarLinesFormatted()) {
+                if (line.startsWith(" §7⏣ ")) {
+                    return line.substring(5).removeColor()
+                }
+            }
+
+            return "invalid"
+        }
+    }
+
+    private var loggerIslandChange = LorenzLogger("debug/island_change")
+
+    @SubscribeEvent
+    fun onConnect(event: FMLNetworkEvent.ClientConnectedToServerEvent) {
+        hypixel = Minecraft.getMinecraft().runCatching {
+            !event.isLocal && (thePlayer?.clientBrand?.lowercase()?.contains("hypixel")
+                ?: currentServerData?.serverIP?.lowercase()?.contains("hypixel") ?: false)
+        }.onFailure { it.printStackTrace() }.getOrDefault(false)
+    }
+
+    @SubscribeEvent
+    fun onWorldChange(event: WorldEvent.Load) {
+        skyBlock = false
+    }
+
+    @SubscribeEvent
+    fun onDisconnect(event: FMLNetworkEvent.ClientDisconnectionFromServerEvent) {
+        hypixel = false
+        skyBlock = false
+    }
+
+    @SubscribeEvent
+    fun onStatusBar(event: LorenzChatEvent) {
+        if (!hypixel) return
+
+        val message = event.message.removeColor().lowercase()
+        if (message.startsWith("your profile was changed to:")) {
+            val stripped = message.replace("your profile was changed to:", "").replace("(co-op)", "").trim()
+            ProfileJoinEvent(stripped).postAndCatch()
+        }
+        if (message.startsWith("you are playing on profile:")) {
+            val stripped = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim()
+            ProfileJoinEvent(stripped).postAndCatch()
+        }
+    }
+
+    var tick = 0
+
+    @SubscribeEvent
+    fun onTick(event: TickEvent.ClientTickEvent) {
+        if (!hypixel) return
+        if (event.phase != TickEvent.Phase.START) return
+
+        tick++
+
+        if (tick % 5 != 0) return
+
+        val inSkyBlock = checkScoreboard()
+        if (inSkyBlock) {
+            checkIsland()
+            checkSidebar()
+        }
+
+        if (inSkyBlock == skyBlock) return
+        skyBlock = inSkyBlock
+    }
+
+    private fun checkSidebar() {
+        ironman = false
+        stranded = false
+        bingo = false
+
+        for (line in ScoreboardData.sidebarLinesFormatted()) {
+            when (line) {
+                " §7Ⓑ §7Bingo", // No Rank
+                " §bⒷ §bBingo", // Rank 1
+                " §9Ⓑ §9Bingo", // Rank 2
+                " §5Ⓑ §5Bingo", // Rank 3
+                " §6Ⓑ §6Bingo", // Rank 4
+                -> {
+                    bingo = true
+                }
+
+                // TODO implemennt stranded check
+
+                " §7♲ §7Ironman" -> {
+                    ironman = true
+                }
+
+            }
+        }
+
+        noTrade = ironman || stranded || bingo
+    }
+
+    private fun checkIsland() {
+        var newIsland = ""
+        var guesting = false
+        for (line in TabListUtils.getTabList()) {
+            if (line.startsWith("§r§b§lArea: ")) {
+                newIsland = line.split(": ")[1].removeColor()
+            }
+            if (line == "§r Status: §r§9Guest§r") {
+                guesting = true
+            }
+        }
+        if (guesting) {
+            newIsland = "$newIsland guesting"
+        }
+
+        if (skyBlockIsland != newIsland) {
+            IslandChangeEvent(newIsland, skyBlockIsland).postAndCatch()
+            loggerIslandChange.log(newIsland)
+            skyBlockIsland = newIsland
+        }
+    }
+
+    private fun checkScoreboard(): Boolean {
+        val minecraft = Minecraft.getMinecraft()
+        val world = minecraft.theWorld ?: return false
+
+        val objective = world.scoreboard.getObjectiveInDisplaySlot(1) ?: return false
+        val displayName = objective.displayName
+        return displayName.removeColor().contains("SKYBLOCK")
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
deleted file mode 100644
index bbb3db69d..000000000
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-package at.hannibal2.skyhanni.data
-
-import at.hannibal2.skyhanni.events.IslandChangeEvent
-import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.events.ProfileJoinEvent
-import at.hannibal2.skyhanni.utils.LorenzLogger
-import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import at.hannibal2.skyhanni.utils.TabListUtils
-import net.minecraft.client.Minecraft
-import net.minecraftforge.event.world.WorldEvent
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
-import net.minecraftforge.fml.common.gameevent.TickEvent
-import net.minecraftforge.fml.common.network.FMLNetworkEvent
-
-class HypixelData {
-
-    companion object {
-        var hypixel = false
-        var skyBlock = false
-        var skyBlockIsland: String = ""
-
-        //Ironman, Stranded and Bingo
-        var noTrade = false
-
-        var ironman = false
-        var stranded = false
-        var bingo = false
-
-        fun readSkyBlockArea(): String {
-            for (line in ScoreboardData.sidebarLinesFormatted()) {
-                if (line.startsWith(" §7⏣ ")) {
-                    return line.substring(5).removeColor()
-                }
-            }
-
-            return "invalid"
-        }
-    }
-
-    var loggerIslandChange = LorenzLogger("debug/island_change")
-
-    @SubscribeEvent
-    fun onConnect(event: FMLNetworkEvent.ClientConnectedToServerEvent) {
-        hypixel = Minecraft.getMinecraft().runCatching {
-            !event.isLocal && (thePlayer?.clientBrand?.lowercase()?.contains("hypixel")
-                ?: currentServerData?.serverIP?.lowercase()?.contains("hypixel") ?: false)
-        }.onFailure { it.printStackTrace() }.getOrDefault(false)
-    }
-
-    @SubscribeEvent
-    fun onWorldChange(event: WorldEvent.Load) {
-        skyBlock = false
-    }
-
-    @SubscribeEvent
-    fun onDisconnect(event: FMLNetworkEvent.ClientDisconnectionFromServerEvent) {
-        hypixel = false
-        skyBlock = false
-    }
-
-    @SubscribeEvent
-    fun onStatusBar(event: LorenzChatEvent) {
-        if (!hypixel) return
-
-        val message = event.message.removeColor().lowercase()
-        if (message.startsWith("your profile was changed to:")) {
-            val stripped = message.replace("your profile was changed to:", "").replace("(co-op)", "").trim()
-            ProfileJoinEvent(stripped).postAndCatch()
-        }
-        if (message.startsWith("you are playing on profile:")) {
-            val stripped = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim()
-            ProfileJoinEvent(stripped).postAndCatch()
-        }
-    }
-
-    var tick = 0
-
-    @SubscribeEvent
-    fun onTick(event: TickEvent.ClientTickEvent) {
-        if (!hypixel) return
-        if (event.phase != TickEvent.Phase.START) return
-
-        tick++
-
-        if (tick % 5 != 0) return
-
-        val inSkyBlock = checkScoreboard()
-        if (inSkyBlock) {
-            checkIsland()
-            checkSidebar()
-        }
-
-        if (inSkyBlock == skyBlock) return
-        skyBlock = inSkyBlock
-    }
-
-    private fun checkSidebar() {
-        ironman = false
-        stranded = false
-        bingo = false
-
-        for (line in ScoreboardData.sidebarLinesFormatted()) {
-            when (line) {
-                " §7Ⓑ §7Bingo", // No Rank
-                " §bⒷ §bBingo", // Rank 1
-                " §9Ⓑ §9Bingo", // Rank 2
-                " §5Ⓑ §5Bingo", // Rank 3
-                " §6Ⓑ §6Bingo", // Rank 4
-                -> {
-                    bingo = true
-                }
-
-                // TODO implemennt stranded check
-
-                " §7♲ §7Ironman" -> {
-                    ironman = true
-                }
-
-            }
-        }
-
-        noTrade = ironman || stranded || bingo
-    }
-
-    private fun checkIsland() {
-        var newIsland = ""
-        var guesting = false
-        for (line in TabListUtils.getTabList()) {
-            if (line.startsWith("§r§b§lArea: ")) {
-                newIsland = line.split(": ")[1].removeColor()
-            }
-            if (line == "§r Status: §r§9Guest§r") {
-                guesting = true
-            }
-        }
-        if (guesting) {
-            newIsland = "$newIsland guesting"
-        }
-
-        if (skyBlockIsland != newIsland) {
-            IslandChangeEvent(newIsland, skyBlockIsland).postAndCatch()
-            loggerIslandChange.log(newIsland)
-            skyBlockIsland = newIsland
-        }
-    }
-
-    private fun checkScoreboard(): Boolean {
-        val minecraft = Minecraft.getMinecraft()
-        val world = minecraft.theWorld ?: return false
-
-        val objective = world.scoreboard.getObjectiveInDisplaySlot(1) ?: return false
-        val displayName = objective.displayName
-        return displayName.removeColor().contains("SKYBLOCK")
-    }
-}
\ No newline at end of file
-- 
cgit