From bbb25d33da9306e68eb11f03f10dae3fc482948e Mon Sep 17 00:00:00 2001 From: NetheriteMiner <88792142+NetheriteMiner@users.noreply.github.com> Date: Tue, 4 Jul 2023 10:43:33 -0400 Subject: Last minute Rich Presence fixes (#290) --- src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt | 2 +- .../skyhanni/features/misc/discordrpc/DiscordLocationKey.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt index e15190864..873119171 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt @@ -7,7 +7,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object ActionBarStatsData { private val patterns = mapOf( - "health" to "§c(?[\\d,]+)/[\\d,]+❤.*".toPattern(), + "health" to "§[c6](?[\\d,]+)/[\\d,]+❤.*".toPattern(), "defense" to ".*§a(?[\\d,]+)§a❈.*".toPattern(), "mana" to ".*§b(?[\\d,]+)/[\\d,]+✎.*".toPattern(), "riftTime" to "§[a7](?[\\dms ]+)ф.*".toPattern(), diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt index 1dac3f130..0b6ebef0b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt @@ -10,6 +10,7 @@ class DiscordLocationKey { "bank", "canvas-room", "coal-mine", + "crimson-isle", "farm", "fashion-shop", "flower-house", @@ -19,6 +20,7 @@ class DiscordLocationKey { "mountain", "ruins", "tavern", + "unincorporated", "village", "wilderness", "birch-park", @@ -27,7 +29,7 @@ class DiscordLocationKey { "dark-thicket", "jungle-island", "gold-mine", - "slime-hill", + "slimehill" "the-barn", "mushroom-desert", "the-end", @@ -278,4 +280,4 @@ class DiscordLocationKey { getAmbiguousKey(location) // will return skyblock-logo if not found } } -} \ No newline at end of file +} -- cgit