diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-09-16 12:32:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-16 12:32:32 -0400 |
| commit | 113027308dc87ab63e7180182c0dd6be35aac599 (patch) | |
| tree | 79e16d20f8d37b38bfab7badb6e79ec331666dbc /src/main/java/me/xmrvizzy/skyblocker/config | |
| parent | f41ee09fd96983edea8eb307ff61d7a4a72c0edb (diff) | |
| parent | 7cbc13d0cfb1ed061e9c805dbb37074b8771fb81 (diff) | |
| download | Skyblocker-113027308dc87ab63e7180182c0dd6be35aac599.tar.gz Skyblocker-113027308dc87ab63e7180182c0dd6be35aac599.tar.bz2 Skyblocker-113027308dc87ab63e7180182c0dd6be35aac599.zip | |
Merge pull request #301 from Julienraptor01/patch-1
fix the regexes for quicknav and add a fail-safe
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/config')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 4241f68c..d20dd29b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -67,11 +67,19 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("button3") @ConfigEntry.Gui.CollapsibleObject() - public QuickNavItem button3 = new QuickNavItem(true, new ItemData("bone"), "\\Pets \\(\\d+/\\d+\\)", "/pets"); + public QuickNavItem button3 = new QuickNavItem(true, new ItemData("bone"), "Pets(:? \\(\\d+\\/\\d+\\))?", "/pets"); + /* REGEX Explanation + * "Pets" : simple match on letters + * "(?: \\(\\d+\\/\\d+\\))?" : optional match on the non-capturing group for the page in the format " ($number/$number)" + */ @ConfigEntry.Category("button4") @ConfigEntry.Gui.CollapsibleObject() - public QuickNavItem button4 = new QuickNavItem(true, new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe \\([12]/2\\)", "/wardrobe"); + public QuickNavItem button4 = new QuickNavItem(true, new ItemData("leather_chestplate", 1, "tag:{display:{color:8991416}}"), "Wardrobe \\([12]\\/2\\)", "/wardrobe"); + /* REGEX Explanation + * "Wardrobe" : simple match on letters + * " \\([12]\\/2\\)" : match on the page either " (1/2)" or " (2/2)" + */ @ConfigEntry.Category("button5") @ConfigEntry.Gui.CollapsibleObject() @@ -79,7 +87,12 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("button6") @ConfigEntry.Gui.CollapsibleObject() - public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"), "(?:Rift )?Storage(?: \\(1/2\\))?", "/storage"); + public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"), "(?:Rift )?Storage(?: \\([12]\\/2\\))?", "/storage"); + /* REGEX Explanation + * "(?:Rift )?" : optional match on the non-capturing group "Rift " + * "Storage" : simple match on letters + * "(?: \\([12]\\/2\\))?" : optional match on the non-capturing group " (1/2)" or " (2/2)" + */ @ConfigEntry.Category("button7") @ConfigEntry.Gui.CollapsibleObject() |