diff options
| author | David Cole <40234707+DavidArthurCole@users.noreply.github.com> | 2024-09-18 03:30:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 09:30:32 +0200 |
| commit | 532e748e8e65d8435c5bcc7939f950a0e05a3de7 (patch) | |
| tree | 724878fa16160cfebbae0dec7361e9610d6b17b7 | |
| parent | 92ec20864b6653f86bb1a149c9d280e0ae03e62b (diff) | |
| download | skyhanni-532e748e8e65d8435c5bcc7939f950a0e05a3de7.tar.gz skyhanni-532e748e8e65d8435c5bcc7939f950a0e05a3de7.tar.bz2 skyhanni-532e748e8e65d8435c5bcc7939f950a0e05a3de7.zip | |
Fix: Garden Color in Messages (#2532)
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt | 7 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt index 3ae865ac8..8ad8d21da 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt @@ -72,9 +72,14 @@ object GardenPlotAPI { "spray.target", "§a§lSPRAYONATOR! §r§7You sprayed §r§aPlot §r§7- §r§b(?<plot>.*) §r§7with §r§a(?<spray>.*)§r§7!" ) + + /** + * REGEX-TEST: §9§lSPLASH! §r§6Your §r§aGarden §r§6was cleared of all active §r§aSprayonator §r§6effects! + * REGEX-TEST: §9§lSPLASH! §r§6Your §r§bGarden §r§6was cleared of all active §r§aSprayonator §r§6effects! + */ private val portableWasherPattern by patternGroup.pattern( "spray.cleared.portablewasher", - "§9§lSPLASH! §r§6Your §r§bGarden §r§6was cleared of all active §r§aSprayonator §r§6effects!" + "§9§lSPLASH! §r§6Your §r§[ba]Garden §r§6was cleared of all active §r§aSprayonator §r§6effects!" ) var plots = listOf<Plot>() diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index fef28450f..aed4f7e7c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -80,9 +80,14 @@ object GardenVisitorFeatures { private var display = emptyList<List<Any>>() private val patternGroup = RepoPattern.group("garden.visitor") + + /** + * REGEX-TEST: §a§r§aBanker Broadjaw §r§ehas arrived on your §r§aGarden§r§e! + * REGEX-TEST: §a§r§aBanker Broadjaw §r§ehas arrived on your §r§bGarden§r§e! + */ private val visitorArrivePattern by patternGroup.pattern( "visitorarrive", - ".* §r§ehas arrived on your §r§bGarden§r§e!", + ".* §r§ehas arrived on your §r§[ba]Garden§r§e!", ) private val copperPattern by patternGroup.pattern( "copper", |