From 00831584bfa2e0e54e5f5bc65efbce10e06ee8e9 Mon Sep 17 00:00:00 2001 From: ILike2WatchMemes Date: Sun, 21 Jul 2024 12:21:17 +0200 Subject: Improvement: Added SkyBlock Level to Item Number (#2172) --- .../features/inventory/ItemDisplayOverlayFeatures.kt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt index 324227248..ebd793cab 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt @@ -21,6 +21,7 @@ import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumbe import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.PET_LEVEL import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.RANCHERS_BOOTS_SPEED import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKILL_LEVEL +import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.SKYBLOCK_LEVEL import at.hannibal2.skyhanni.config.features.inventory.InventoryConfig.ItemNumberEntry.VACUUM_GARDEN import at.hannibal2.skyhanni.data.PetAPI import at.hannibal2.skyhanni.events.RenderItemTipEvent @@ -84,6 +85,15 @@ object ItemDisplayOverlayFeatures { "(§.)*You were the (§.)*(?[\\w]+)(?(st|nd|rd|th)) (§.)*to" ) + /** + * REGEX-TEST: §7Your SkyBlock Level: §8[§a156§8] + * REGEX-TEST: §7Your SkyBlock Level: §8[§5399§8] + */ + private val skyblockLevelPattern by patternGroup.pattern( + "skyblocklevel", + "§7Your SkyBlock Level: §8\\[(?§.\\d+)§8]" + ) + @SubscribeEvent fun onRenderItemTip(event: RenderItemTipEvent) { event.stackTip = getStackTip(event.stack) ?: return @@ -267,6 +277,12 @@ object ItemDisplayOverlayFeatures { } } + if (SKYBLOCK_LEVEL.isSelected() && chestName == "SkyBlock Menu" && itemName == "SkyBlock Leveling") { + lore.matchFirst(skyblockLevelPattern) { + return group("level") + } + } + return null } -- cgit