From ae4af78e29efb97d8898d6cf8d1e817357412bb0 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 2 Apr 2023 17:27:12 +0200 Subject: Counting items in inventory and from minions to the bingo step helper collection goal display --- .../java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt | 10 ++++++++-- .../java/at/hannibal2/skyhanni/events/InventoryOpenEvent.kt | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/events') diff --git a/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt index 8ff1f481b..2aa1ec65a 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt @@ -1,5 +1,11 @@ package at.hannibal2.skyhanni.events -import at.hannibal2.skyhanni.data.InventoryData +import at.hannibal2.skyhanni.data.OtherInventoryData +import net.minecraft.item.ItemStack -class InventoryCloseEvent(val inventory: InventoryData.Inventory): LorenzEvent() \ No newline at end of file +class InventoryCloseEvent(val inventory: OtherInventoryData.Inventory): LorenzEvent() { + val inventoryId: Int by lazy { inventory.windowId } + val inventoryName: String by lazy {inventory.title } + val inventorySize: Int by lazy {inventory.slotCount } + val inventoryItems: MutableMap by lazy {inventory.items } +} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/events/InventoryOpenEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/InventoryOpenEvent.kt index aec3e6542..3c95e4507 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/InventoryOpenEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/InventoryOpenEvent.kt @@ -1,16 +1,16 @@ package at.hannibal2.skyhanni.events -import at.hannibal2.skyhanni.data.InventoryData +import at.hannibal2.skyhanni.data.OtherInventoryData import net.minecraft.item.ItemStack -open class BaseInventoryOpenEvent(inventory: InventoryData.Inventory): LorenzEvent() { +open class BaseInventoryOpenEvent(inventory: OtherInventoryData.Inventory): LorenzEvent() { val inventoryId: Int by lazy { inventory.windowId } val inventoryName: String by lazy {inventory.title } val inventorySize: Int by lazy {inventory.slotCount } val inventoryItems: MutableMap by lazy {inventory.items } } -class InventoryOpenEvent(inventory: InventoryData.Inventory): BaseInventoryOpenEvent(inventory) +class InventoryOpenEvent(inventory: OtherInventoryData.Inventory): BaseInventoryOpenEvent(inventory) // Firing with items that are added later -class LateInventoryOpenEvent(inventory: InventoryData.Inventory): BaseInventoryOpenEvent(inventory) \ No newline at end of file +class LateInventoryOpenEvent(inventory: OtherInventoryData.Inventory): BaseInventoryOpenEvent(inventory) \ No newline at end of file -- cgit