From dcf97229ecf3f4d851672d5582cb8b89931e9ccb Mon Sep 17 00:00:00 2001 From: ItsEmpa <42304516+ItsEmpa@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:20:03 +0100 Subject: [PATCH 1/2] Fix rift island not being detected --- src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index 60630a675131..de319c0f9267 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -212,7 +212,7 @@ class HypixelData { var guesting = false for (line in TabListData.getTabList()) { islandNamePattern.matchMatcher(line) { - newIsland = group("island") + newIsland = group("island").removeColor() } if (line == " Status: §r§9Guest") { guesting = true From 3f601f8bbd876bb39230a2adb717b8aa714acb89 Mon Sep 17 00:00:00 2001 From: ItsEmpa <42304516+ItsEmpa@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:36:16 +0100 Subject: [PATCH 2/2] Changed regex in case hypixel changes color codes --- src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index de319c0f9267..0ba26998a432 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -29,7 +29,7 @@ class HypixelData { private val group = RepoPattern.group("data.hypixeldata") private val tabListProfilePattern by group.pattern("tablistprofile", "§e§lProfile: §r§a(?.*)") private val lobbyTypePattern by group.pattern("lobbytype", "(?.*lobby)\\d+") - private val islandNamePattern by group.pattern("islandname", "§b§l(Area|Dungeon): §r§7(?.*)") + private val islandNamePattern by group.pattern("islandname", "(?:§.)*(Area|Dungeon): (?:§.)*(?.*)") private var lastLocRaw = 0L