diff options
-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/misc/ServerRestartTitle.kt | 2 |
2 files changed, 6 insertions, 6 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 bdb609ead..e61c6a3c1 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 @@ -48,7 +48,7 @@ object ScoreboardPattern { ) val votesPattern by mainSb.pattern( "votes", - "(?<votes>§[caebd]\\|+§f\\|+ §(.+)\$)" + "(?<votes>§[caebd]\\|+(§f)?\\|+ §(.+)$)$)" ) val waitingForVotePattern by mainSb.pattern( "waitingforvote", @@ -144,7 +144,7 @@ object ScoreboardPattern { ) val pastingPattern by farmingSb.pattern( "pasting", - "^\\s*§f(Barn )?Pasting§7: (§.)*[\\d,]+%$" + "^\\s*§f(Barn )?Pasting§7: (§.)*[\\d,.]+%$" ) val peltsPattern by farmingSb.pattern( "pelts", @@ -307,11 +307,11 @@ object ScoreboardPattern { ) val dojoPointsPattern by miscSb.pattern( "dojopoints", - "^(§.)*Points: (§.)*(?<points>[\\w,.]+) ?( (§.)*\\((§.)*[+-](§.)*(?<difference>[\\w,.]+)(§.)*\\))?\$" + "^(§.)*Points: (§.)*[\\w.]+( §7\\(§.*§7\\))?$" ) val dojoTimePattern by miscSb.pattern( "dojotime", - "^(§.)*Time: (§.)*(?<time>(?<seconds>\\w+s))( (§.)*\\((§.)*[+-](§.)*(?<difference>[\\w,.]+)(§.)*\\))?$" + "^(§.)*Time: (§.)*[\\w.]+( §7\\(§.*§7\\))?$" ) val objectivePattern by miscSb.pattern( "objective", @@ -393,7 +393,7 @@ object ScoreboardPattern { ) val mithrilPowderPattern by tablistGroup.pattern( "mithrilpowder", - "^\\s*Gemstone Powder: (?:§.)+(?<mithrilpowder>[\\d,\\.]+)$" + "^\\s*Mithril Powder: (?:§.)+(?<mithrilpowder>[\\d,\\.]+)$" ) val gemstonePowderPattern by tablistGroup.pattern( "gemstonepowder", diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt index a236daf4e..7f9c4c9eb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt @@ -24,7 +24,7 @@ class ServerRestartTitle { ) val restartingGreedyPattern by restartingGroup.pattern( "greedy", - "§cServer closing:.*" + "§cServer closing.*" ) } |