From bd6d46dac8f6ef489f1a11bffa67356a6727d7c2 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:41:55 +1100 Subject: sack item amount (#854) Show sack item amount to the visitor shopping list. #854 --- .../features/garden/visitor/GardenVisitorFeatures.kt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden') 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 8607a12af..4bcd4a079 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 @@ -3,11 +3,14 @@ package at.hannibal2.skyhanni.features.garden.visitor import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.HighlightMode import at.hannibal2.skyhanni.data.IslandType +import at.hannibal2.skyhanni.data.SackAPI +import at.hannibal2.skyhanni.data.SackStatus import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent import at.hannibal2.skyhanni.events.PreProfileSwitchEvent +import at.hannibal2.skyhanni.events.SackDataUpdateEvent import at.hannibal2.skyhanni.events.garden.visitor.VisitorAcceptEvent import at.hannibal2.skyhanni.events.garden.visitor.VisitorAcceptedEvent import at.hannibal2.skyhanni.events.garden.visitor.VisitorArrivalEvent @@ -177,6 +180,18 @@ class GardenVisitorFeatures { list.add(" §7(§6$format§7)") } + if (config.needs.showSackCount) { + val sackItemData = SackAPI.fetchSackItem(internalName) + val itemStatus = sackItemData.getStatus() + val itemAmount = sackItemData.amount + if (itemStatus == SackStatus.OUTDATED) { + list.add(" §cdata outdated, open sacks") + } else { + val textColour = if (itemAmount > amount) "a" else "e" + list.add(" §${textColour}x${sackItemData.amount.addSeparators()} §7in your sack") + } + } + add(list) } if (totalPrice > 0) { @@ -239,6 +254,11 @@ class GardenVisitorFeatures { } } + @SubscribeEvent + fun onSackUpdate(event: SackDataUpdateEvent) { + update() + } + @SubscribeEvent fun onVisitorRefused(event: VisitorRefusedEvent) { update() -- cgit