Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Garden Color in Messages #2532

Merged
merged 3 commits into from
Sep 18, 2024
Merged

Fix: Garden Color in Messages #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c29dcba
New garden chat color
DavidArthurCole Sep 17, 2024
b9213d6
Wow I can't type
DavidArthurCole Sep 17, 2024
7438820
I also suck at regex
DavidArthurCole Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/at/hannibal2/skyhanni/features/garden/GardenPlotAPI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>()
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading