aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features
diff options
context:
space:
mode:
authorThunderblade73 <85900443+Thunderblade73@users.noreply.github.com>2024-03-02 22:12:53 +0100
committerGitHub <noreply@github.com>2024-03-02 22:12:53 +0100
commiteb6944e0a2a693c0245be86d794836baaf797f08 (patch)
tree6fb3e757805a3cb4e86042e9b09ea7d9cc7a89e1 /src/main/java/at/hannibal2/skyhanni/features
parenta55cde048d8f358cd2632a5f67f4e65ac1e81884 (diff)
downloadskyhanni-eb6944e0a2a693c0245be86d794836baaf797f08.tar.gz
skyhanni-eb6944e0a2a693c0245be86d794836baaf797f08.tar.bz2
skyhanni-eb6944e0a2a693c0245be86d794836baaf797f08.zip
Fix: SkyblockGuideHighlightFeature minion/collection pattern (#1092)
Co-authored-by: Alexia <me@alexia.lol>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
index 3de2803dc..6212bc665 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SkyblockGuideHighlightFeature.kt
@@ -55,7 +55,13 @@ class SkyblockGuideHighlightFeature private constructor(
loreCondition: RepoPattern,
onSlotClicked: (GuiContainerEvent.SlotClickEvent) -> Unit = {},
onTooltip: (LorenzToolTipEvent) -> Unit = {},
- ) : this(config, patternGroup.pattern("$key.$keyPrefixInventory", inventory), loreCondition, onSlotClicked, onTooltip)
+ ) : this(
+ config,
+ patternGroup.pattern("$key.$keyPrefixInventory", inventory),
+ loreCondition,
+ onSlotClicked,
+ onTooltip
+ )
init {
objectList.add(this)
@@ -130,7 +136,10 @@ class SkyblockGuideHighlightFeature private constructor(
private val totalProgressPattern =
patternGroup.pattern("$keyPrefixCondition.total", "§7Total Progress: §3\\d{1,2}(?:\\.\\d)?%")
private val categoryProgressPattern =
- patternGroup.pattern("$keyPrefixCondition.category", "§7Progress to Complete Category: §6\\d{1,2}(?:\\.\\d)?%")
+ patternGroup.pattern(
+ "$keyPrefixCondition.category",
+ "§7Progress to Complete Category: §6\\d{1,2}(?:\\.\\d)?%"
+ )
private val openWikiOnClick: (GuiContainerEvent.SlotClickEvent) -> Unit = { event ->
val internalName = event.item?.getInternalName()
@@ -208,7 +217,12 @@ class SkyblockGuideHighlightFeature private constructor(
taskOnlyCompleteOncePattern
)
SkyblockGuideHighlightFeature({ skyblockGuideConfig.essenceGuide }, "essence", "Essence Shop ➜.*", xPattern)
- SkyblockGuideHighlightFeature({ skyblockGuideConfig.minionGuide }, "minion", "Crafted Minions", xPattern)
+ SkyblockGuideHighlightFeature(
+ { skyblockGuideConfig.minionGuide },
+ "minion",
+ "Crafted Minions",
+ "§c ?✖.*|§7You haven't crafted this minion."
+ )
SkyblockGuideHighlightFeature(
{ skyblockGuideConfig.storyGuide }, "harp", "Miscellaneous ➜ Harp Songs", xPattern
)
@@ -239,7 +253,7 @@ class SkyblockGuideHighlightFeature private constructor(
{ skyblockGuideConfig.collectionGuide },
"collections",
"\\w+ Collections|Collections",
- "§7Progress to .*|§7Find this item to add it to your|§7Kill this boss once to view collection|§7Collections Maxed Out: §e.*|§7Boss Collections Unlocked: §e.*"
+ "§7Progress to .*|§7Find this item to add it to your|§7Kill this boss once to view collection|§7(?:Boss )?Collections (?:Unlocked|Maxed Out): §e.*"
)
}
}