From 6b0e324c96073d824c12dff1629a782352155e99 Mon Sep 17 00:00:00 2001 From: Thunderblade73 <85900443+Thunderblade73@users.noreply.github.com> Date: Thu, 30 May 2024 11:21:50 +0200 Subject: Feature: Hotm Features + Hotm API/Data (#1059) Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com> Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com> Co-authored-by: martimavocado <39881008+martimavocado@users.noreply.github.com> Co-authored-by: martimavocado Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../features/gui/customscoreboard/ScoreboardPattern.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/gui') diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt index ec4cf0c6f..2db0c37f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt @@ -173,9 +173,18 @@ object ScoreboardPattern { // mining private val miningSb = scoreboardGroup.group("mining") + + /** + * REGEX-TEST: §2᠅ §fMithril§f: §235,448 + * REGEX-TEST: §d᠅ §fGemstone§f: §d36,758 + * REGEX-TEST: §b᠅ §fGlacite§f: §b29,537 + * REGEX-TEST: §2᠅ §fMithril Powder§f: §235,448 + * REGEX-TEST: §d᠅ §fGemstone Powder§f: §d36,758 + * REGEX-TEST: §b᠅ §fGlacite Powder§f: §b29,537 + */ val powderPattern by miningSb.pattern( "powder", - "(§.)*᠅ §.(Gemstone|Mithril|Glacite)( Powder)?(§.)*:?.*$" + "(?:§.)*᠅ (?:§.)(?Gemstone|Mithril|Glacite)(?: Powder)?(?:§.)*:? (?:§.)*(?[\\d,.]*)" ) val windCompassPattern by miningSb.pattern( "windcompass", -- cgit