From 84b9b27da573a33d845642547a50510bf8a8a234 Mon Sep 17 00:00:00 2001
From: Lorenz <lo.scherf@gmail.com>
Date: Sat, 6 Aug 2022 17:56:02 +0200
Subject: adding support for damage indicator outside dungeon

---
 src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt    | 6 +++---
 src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt
index 9ee0982fa..177917900 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.misc
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PacketEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
-import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes
+import at.hannibal2.skyhanni.utils.LorenzUtils.removeColor
 import net.minecraft.client.Minecraft
 import net.minecraft.network.play.server.S38PacketPlayerListItem
 import net.minecraftforge.event.world.WorldEvent
@@ -61,7 +61,7 @@ class HypixelData {
     fun onStatusBar(event: LorenzChatEvent) {
         if (!hypixel) return
 
-        val message = event.message.removeColorCodes().lowercase()
+        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()
@@ -99,7 +99,7 @@ class HypixelData {
 
         val displayName = sidebarObjective.displayName
 
-        return displayName.removeColorCodes().contains("SKYBLOCK")
+        return displayName.removeColor().contains("SKYBLOCK")
 
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt
index 166b6ce17..a10d2dcef 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.misc
 
-import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes
+import at.hannibal2.skyhanni.utils.LorenzUtils.removeColor
 import net.minecraft.client.Minecraft
 import net.minecraft.scoreboard.Score
 import net.minecraft.scoreboard.ScorePlayerTeam
@@ -22,7 +22,7 @@ class ScoreboardData {
     }
 
     private fun cleanSB(scoreboard: String): String {
-        return scoreboard.removeColorCodes().toCharArray().filter { it.code in 21..126 }.joinToString(separator = "")
+        return scoreboard.removeColor().toCharArray().filter { it.code in 21..126 }.joinToString(separator = "")
     }
 
     fun fetchScoreboardLines(): List<String> {
-- 
cgit