aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-02 14:32:02 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-12-02 14:32:02 +0100
commit7b8ed68743e0a617d5f8cbccbae8097675490382 (patch)
tree4200b1db1b449dbc48f3771529ce6fb0f7402782 /src/main/java
parentb9c99bdcfc107a460cbf250ff269d19b6a9c0722 (diff)
downloadskyhanni-7b8ed68743e0a617d5f8cbccbae8097675490382.tar.gz
skyhanni-7b8ed68743e0a617d5f8cbccbae8097675490382.tar.bz2
skyhanni-7b8ed68743e0a617d5f8cbccbae8097675490382.zip
Fixed minion features disappear inside the minion inventory when picking up an item.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt9
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt2
3 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt
index 5950d5fb8..921d591b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt
@@ -22,9 +22,9 @@ object OtherInventoryData {
close()
}
- fun close() {
+ fun close(reopenSameName: Boolean = false) {
currentInventory?.let {
- InventoryCloseEvent(it).postAndCatch()
+ InventoryCloseEvent(it, reopenSameName).postAndCatch()
currentInventory = null
}
}
@@ -49,7 +49,8 @@ object OtherInventoryData {
val windowId = packet.windowId
val title = packet.windowTitle.unformattedText
val slotCount = packet.slotCount
- close()
+ val reopenSameName = title == currentInventory?.title
+ close(reopenSameName)
currentInventory = Inventory(windowId, title, slotCount)
acceptItems = true
@@ -104,4 +105,4 @@ object OtherInventoryData {
val slotCount: Int,
val items: MutableMap<Int, ItemStack> = mutableMapOf(),
)
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt
index bf43a57f9..72630756a 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt
@@ -3,9 +3,9 @@ package at.hannibal2.skyhanni.events
import at.hannibal2.skyhanni.data.OtherInventoryData
import net.minecraft.item.ItemStack
-class InventoryCloseEvent(val inventory: OtherInventoryData.Inventory) : LorenzEvent() {
+class InventoryCloseEvent(val inventory: OtherInventoryData.Inventory, val reopenSameName: Boolean) : LorenzEvent() {
val inventoryId: Int by lazy { inventory.windowId }
val inventoryName: String by lazy { inventory.title }
val inventorySize: Int by lazy { inventory.slotCount }
val inventoryItems: Map<Int, ItemStack> by lazy { inventory.items }
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
index 5840475ce..1e19ca676 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt
@@ -175,6 +175,8 @@ class MinionFeatures {
@SubscribeEvent
fun onInventoryClose(event: InventoryCloseEvent) {
+ if (event.reopenSameName) return
+
minionStorageInventoryOpen = false
if (!minionInventoryOpen) return
val minions = minions ?: return