aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-05-26 20:22:09 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-05-26 20:22:09 +0200
commit52d45970bbcb534004ac4f799035ff448e10f212 (patch)
tree80735390a72bab72c6e3eb6dc2f6d7ef9a2e5128 /src/main/java/at
parent60a0fe2f8553979c82be10d94001d2e247ebaeab (diff)
parent0353e125f1c98ae409ea0e6753e446d522955549 (diff)
downloadskyhanni-52d45970bbcb534004ac4f799035ff448e10f212.tar.gz
skyhanni-52d45970bbcb534004ac4f799035ff448e10f212.tar.bz2
skyhanni-52d45970bbcb534004ac4f799035ff448e10f212.zip
Merge remote-tracking branch 'origin/beta' into beta
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
index 93ed11873..c8d929ce2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt
@@ -49,7 +49,7 @@ class SackDisplay {
private val numPattern =
"(?:(?:§[0-9a-f](?<level>I{1,3})§7:)?|(?:§7Stored:)?) (?<color>§[0-9a-f])(?<stored>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)§7/(?<total>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)".toPattern()
private val gemstonePattern =
- " (?:§[0-9a-f])(?<gemrarity>[A-z]*): §[0-9a-f](?<stored>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?) §[0-9a-f]\\((?:\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)\\)".toPattern()
+ " §[0-9a-f](?<gemrarity>[A-z]*): §[0-9a-f](?<stored>\\d+(?:\\.\\d+)?(?:,\\d+)?[kKmM]?)(?: §[0-9a-f]\\(\\d+(?:\\.\\d+)?(?:(?:,\\d+)?)+[kKmM]?\\))?".toPattern()
@SubscribeEvent
@@ -351,4 +351,4 @@ class SackDisplay {
else -> 0
}
-} \ No newline at end of file
+}