aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni
diff options
context:
space:
mode:
authorNetheriteMiner <88792142+NetheriteMiner@users.noreply.github.com>2023-07-04 10:43:33 -0400
committerGitHub <noreply@github.com>2023-07-04 16:43:33 +0200
commitbbb25d33da9306e68eb11f03f10dae3fc482948e (patch)
treedabe66f4c4afbbd32b2bea0f5a70582b329f5223 /src/main/java/at/hannibal2/skyhanni
parent52b008ef304e14e8141df1c71aea9d959b68f300 (diff)
downloadskyhanni-bbb25d33da9306e68eb11f03f10dae3fc482948e.tar.gz
skyhanni-bbb25d33da9306e68eb11f03f10dae3fc482948e.tar.bz2
skyhanni-bbb25d33da9306e68eb11f03f10dae3fc482948e.zip
Last minute Rich Presence fixes (#290)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt6
2 files changed, 5 insertions, 3 deletions
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(?<health>[\\d,]+)/[\\d,]+❤.*".toPattern(),
+ "health" to "§[c6](?<health>[\\d,]+)/[\\d,]+❤.*".toPattern(),
"defense" to ".*§a(?<defense>[\\d,]+)§a❈.*".toPattern(),
"mana" to ".*§b(?<mana>[\\d,]+)/[\\d,]+✎.*".toPattern(),
"riftTime" to "§[a7](?<riftTime>[\\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
+}