diff options
| author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-09-03 10:04:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-03 10:04:33 +0200 |
| commit | 141d2f3c5798b97487ccb733b65c288150cf6d3d (patch) | |
| tree | 91520dad97d963c261c6a0a6c45fe3bc0798387d /src/main/java/at/hannibal2/skyhanni/features/gui | |
| parent | 602aab42e82bbab32fc00c0ee6e36f49d964a3d7 (diff) | |
| download | skyhanni-141d2f3c5798b97487ccb733b65c288150cf6d3d.tar.gz skyhanni-141d2f3c5798b97487ccb733b65c288150cf6d3d.tar.bz2 skyhanni-141d2f3c5798b97487ccb733b65c288150cf6d3d.zip | |
Fix: Custom Scoreboard Error in Dungeon Queue (#2441)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/gui')
3 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt index 4e89f89a4..d35952cb3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt @@ -558,6 +558,7 @@ private fun getEssenceShowWhen(): Boolean = SbPattern.essencePattern.anyMatches( private fun getQueueLines(): List<String> = listOf(getSbLines().first { SbPattern.queuePattern.matches(it) }) + + (getSbLines().first { SbPattern.queueTierPattern.matches(it) }) + (getSbLines().first { SbPattern.queuePositionPattern.matches(it) }) private fun getQueueShowWhen(): Boolean = SbPattern.queuePattern.anyMatches(getSbLines()) 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 126331ff2..7195bc896 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 @@ -386,6 +386,14 @@ object ScoreboardPattern { "queued", "Queued:.*", ) + + /** + * REGEX-TEST: Tier: §eFloor VI + */ + val queueTierPattern by miscSb.pattern( + "queuetier", + "Tier: §e.*", + ) val queuePositionPattern by miscSb.pattern( "queueposition", "Position: (?:§.)*#\\d+ (?:§.)*Since: (?:§.)*.*", 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 625c91159..2c0ba2c86 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 @@ -119,6 +119,7 @@ object UnknownLinesHandler { SbPattern.riftHotdogEatenPattern, SbPattern.mineshaftNotStartedPattern, SbPattern.queuePattern, + SbPattern.queueTierPattern, SbPattern.queuePositionPattern, SbPattern.fortunateFreezingBonusPattern, SbPattern.riftAveikxPattern, |