diff options
| author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-05-31 01:13:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 01:13:27 +0200 |
| commit | 3b8c54f0928beffeb64db6879e47b145b28854e0 (patch) | |
| tree | b3edf15d4fb71f7ead721a965ade4d923026feff /src/main/java/at/hannibal2/skyhanni | |
| parent | 747f64bc6263dc5644c42d7308b32a780604f33e (diff) | |
| download | skyhanni-3b8c54f0928beffeb64db6879e47b145b28854e0.tar.gz skyhanni-3b8c54f0928beffeb64db6879e47b145b28854e0.tar.bz2 skyhanni-3b8c54f0928beffeb64db6879e47b145b28854e0.zip | |
Fix: Custom Scoreboard Powder Error (#1947)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt | 10 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt | 2 |
2 files changed, 11 insertions, 1 deletions
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 2db0c37f7..1f793709a 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 @@ -186,6 +186,16 @@ object ScoreboardPattern { "powder", "(?:§.)*᠅ (?:§.)(?<type>Gemstone|Mithril|Glacite)(?: Powder)?(?:§.)*:? (?:§.)*(?<amount>[\\d,.]*)" ) + + /** + * REGEX-TEST: §2᠅ §fMithril§f:§695 + * REGEX-TEST: §d᠅ §fGemstone§f + * REGEX-TEST: §d᠅ §fGemstone§f§e(+1) + */ + val powderGreedyPattern by miningSb.pattern( + "powdergreedy", + "(?:§.)*᠅ (?:§.)(?<type>Gemstone|Mithril|Glacite)(?: Powder)?.*$" + ) val windCompassPattern by miningSb.pattern( "windcompass", "§9Wind Compass$" diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt index 6ed53c60e..eeaa0b447 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/UnknownLinesHandler.kt @@ -60,7 +60,7 @@ object UnknownLinesHandler { SbPattern.mobLocationPattern, SbPattern.jacobsContestPattern, SbPattern.plotPattern, - SbPattern.powderPattern, + SbPattern.powderGreedyPattern, SbPattern.windCompassPattern, SbPattern.windCompassArrowPattern, SbPattern.miningEventPattern, |