Explicit screen checks and better transaction syncing

Author: Avanatiker

common/src/main/kotlin/com/lambda/interaction/material/container/containers/CreativeContainer.kt

@@ -49,7 +49,7 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
                 throw NotInCreativeModeException()
             }
 
-            TransactionExecutor.transfer {
+            TransactionExecutor.transfer(player.currentScreenHandler) {
                 player.currentScreenHandler?.slots?.let { slots ->
                     selection.filterSlots(slots).forEach {
                         clickCreativeStack(ItemStack.EMPTY, it.id)
@@ -75,7 +75,7 @@ data object CreativeContainer : MaterialContainer(Rank.CREATIVE) {
                     throw NotInCreativeModeException()
                 }
 
-                TransactionExecutor.transfer {
+                TransactionExecutor.transfer(player.currentScreenHandler) {
                     clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)
                 }.finally {
                     success()

common/src/main/kotlin/com/lambda/interaction/material/container/containers/MainHandContainer.kt

@@ -54,7 +54,7 @@ object MainHandContainer : MaterialContainer(Rank.MAIN_HAND) {
                 return
             }
 
-            transfer {
+            transfer(player.currentScreenHandler) {
                 val stackInOffHand = moveStack.equal(player.offHandStack)
                 if (hand == Hand.MAIN_HAND && stackInOffHand) {
                     swapHands()

common/src/main/kotlin/com/lambda/interaction/material/transfer/SlotTransfer.kt

@@ -71,7 +71,7 @@ class SlotTransfer @Ta5kBuilder constructor(
             val nextFrom = selectedFrom.firstOrNull() ?: return@listen
             val nextTo = selectedTo.firstOrNull() ?: return@listen
 
-            transfer {
+            transfer(screen) {
 //                moveSlot(nextFrom.id, nextTo.id)
                 swap(nextTo.id, 1)
                 swap(nextFrom.id, 1)

common/src/main/kotlin/com/lambda/interaction/material/transfer/TransactionExecutor.kt

@@ -17,24 +17,21 @@
 
 package com.lambda.interaction.material.transfer
 
-import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.material.transfer.transaction.*
 import com.lambda.task.Task
 import net.minecraft.item.ItemStack
+import net.minecraft.screen.ScreenHandler
 import net.minecraft.screen.slot.SlotActionType
 
 class TransactionExecutor @Ta5kBuilder constructor(
+    private val screenHandler: ScreenHandler,
     private val transactions: MutableList<InventoryTransaction> = mutableListOf(),
 ) : Task<InventoryChanges>() {
     override val name: String get() = "Execution of ${transactions.size} transactions left"
 
-    private lateinit var changes: InventoryChanges
-
-    override fun SafeContext.onStart() {
-        changes = InventoryChanges(player.currentScreenHandler.slots)
-    }
+    private var changes = InventoryChanges(screenHandler.slots)
 
     init {
         listen<TickEvent.Pre> {
@@ -43,6 +40,11 @@ class TransactionExecutor @Ta5kBuilder constructor(
                 return@listen
             }
 
+            if (player.currentScreenHandler != screenHandler) {
+                failure("Screen handler was closed")
+                return@listen
+            }
+
             transactions.removeFirstOrNull()?.finally { change ->
                 changes merge change
             }?.execute(this@TransactionExecutor)
@@ -140,8 +142,8 @@ class TransactionExecutor @Ta5kBuilder constructor(
 
     companion object {
         @InvTransfer
-        fun transfer(block: TransactionExecutor.() -> Unit) =
-            TransactionExecutor().apply {
+        fun transfer(screenHandler: ScreenHandler, block: TransactionExecutor.() -> Unit) =
+            TransactionExecutor(screenHandler).apply {
                 block(this)
             }
     }

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/ClickSlotTransaction.kt

@@ -32,7 +32,12 @@ class ClickSlotTransaction @Ta5kBuilder constructor(
 
     init {
     	listen<TickEvent.Pre> {
-            clickSlot(slotId, button, actionType)
+            try {
+                clickSlot(slotId, button, actionType)
+            } catch (e: Exception) {
+                failure(e.message ?: "Unknown error")
+                return@listen
+            }
             finish()
         }
     }

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/DropItemInHandTransaction.kt

@@ -17,10 +17,8 @@
 
 package com.lambda.interaction.material.transfer.transaction
 
-import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.material.transfer.InventoryChanges
 import com.lambda.interaction.material.transfer.InventoryTransaction
 import net.minecraft.util.Hand
 
@@ -29,12 +27,12 @@ class DropItemInHandTransaction @Ta5kBuilder constructor(
 ) : InventoryTransaction() {
     override val name: String get() = "Dropping ${if (entireStack) "stack" else "item"} in hand"
 
-    override fun SafeContext.onStart() {
-        changes = InventoryChanges(player.currentScreenHandler.slots)
-        if (!player.isSpectator && player.dropSelectedItem(entireStack)) {
-            player.swingHand(Hand.MAIN_HAND)
+    init {
+        listen<TickEvent.Pre> {
+            if (!player.isSpectator && player.dropSelectedItem(entireStack)) {
+                player.swingHand(Hand.MAIN_HAND)
+            }
+            finish()
         }
-        changes.detectChanges()
-        success(changes)
     }
 }

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/PickFromInventoryTransaction.kt

@@ -36,8 +36,8 @@ class PickFromInventoryTransaction @Ta5kBuilder constructor(
             confirming = true
         }
 
-        listen<InventoryEvent.HotbarSlot.Update> {
-            // ToDo: Check slot
+        listen<InventoryEvent.SlotUpdate> {
+            if (it.slot != slot) return@listen
             finish()
         }
     }

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/SwapHandsTransaction.kt

@@ -45,9 +45,9 @@ class SwapHandsTransaction @Ta5kBuilder constructor() : InventoryTransaction() {
             confirming = true
         }
 
-        listen<InventoryEvent.SlotUpdate> {
-            // ToDo: Check slot
-            if (confirming) finish()
+        listen<InventoryEvent.HotbarSlot.Sync> {
+            if (it.slot != player.inventory.selectedSlot) return@listen
+            finish()
         }
     }
 }

common/src/main/kotlin/com/lambda/interaction/material/transfer/transaction/SwapHotbarSlotTransaction.kt

@@ -17,21 +17,19 @@
 
 package com.lambda.interaction.material.transfer.transaction
 
-import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.material.transfer.InventoryChanges
 import com.lambda.interaction.material.transfer.InventoryTransaction
 
 class SwapHotbarSlotTransaction @Ta5kBuilder constructor(
     val slot: Int,
 ) : InventoryTransaction() {
     override val name: String get() = "Selecting slot #$slot"
 
-    override fun SafeContext.onStart() {
-        changes = InventoryChanges(player.currentScreenHandler.slots)
-        player.inventory.selectedSlot = slot
-        changes.detectChanges()
-        success(changes)
+    init {
+    	listen<TickEvent.Pre> {
+            player.inventory.selectedSlot = slot
+            finish()
+        }
     }
 }

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -115,7 +115,7 @@ class BuildTask @Ta5kBuilder constructor(
                         failure("No item in inventory to throw but inventory is full and cant pick up item drop")
                         return@listen
                     }
-                    transfer {
+                    transfer(player.currentScreenHandler) {
                         throwStack(stackToThrow.id)
                     }.execute(this@BuildTask)
                     return@listen