Improve inventory transaction speed and accuracy

Author: Avanatiker

common/src/main/kotlin/com/lambda/config/groups/InventoryConfig.kt

@@ -25,7 +25,6 @@ interface InventoryConfig {
     val disposables: Set<Block>
     val accessEnderChest: Boolean
 
-    val actionTimout: Int
     val swapWithDisposables: Boolean
 
     val providerPriority: Priority

common/src/main/kotlin/com/lambda/config/groups/InventorySettings.kt

@@ -26,7 +26,6 @@ class InventorySettings(
 ) : InventoryConfig {
     override val disposables by c.setting("Disposables", ItemUtils.defaultDisposables, "Items that will be ignored when checking for a free slot", vis)
     override val accessEnderChest by c.setting("Access Ender Chest", false, "Allow access to the player's ender chest", vis)
-    override val actionTimout by c.setting("Action Timeout", 10, 0..100, 1, "How long to wait for after each inventory action", " ticks", vis)
     override val swapWithDisposables by c.setting("Swap With Disposables", true, "Swap items with disposable ones", vis)
     override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when retrieving the item from", vis)
     override val storePriority by c.setting("Store Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when storing the item to", vis)

common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt

@@ -25,6 +25,7 @@ import com.lambda.interaction.construction.verify.TargetState
 import com.lambda.interaction.request.rotation.RotationRequest
 import com.lambda.threading.runSafe
 import com.lambda.util.BlockUtils
+import com.lambda.util.BlockUtils.blockState
 import com.lambda.util.Communication.warn
 import net.minecraft.block.BlockState
 import net.minecraft.util.Hand
@@ -94,7 +95,7 @@ data class PlaceContext(
 
     override fun SafeContext.buildRenderer() {
         withState(expectedState, expectedPos, baseColor, DirectionMask.ALL.exclude(result.side.opposite))
-        withState(expectedState, expectedPos, sideColor, result.side.opposite)
+        withState(result.blockPos.blockState(world), result.blockPos, sideColor, result.side.opposite)
     }
 
     override fun shouldRotate(config: BuildConfig) = config.rotateForPlace

common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt

@@ -235,7 +235,7 @@ abstract class BuildResult : ComparableResult<Rank>, Nameable {
         val neededStack: ItemStack,
         val inventory: InventoryConfig
     ) : Drawable, Resolvable, BuildResult() {
-        override val name: String get() = "Wrong stack for $blockPos need $neededStack."
+        override val name: String get() = "Wrong stack for ${blockPos.toShortString()} need $neededStack."
         override val rank = Rank.WRONG_ITEM
         private val color = Color(3, 252, 169, 25)
 

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

@@ -22,7 +22,7 @@ import com.lambda.task.Task
 import com.lambda.threading.runSafe
 
 abstract class InventoryTransaction : Task<InventoryChanges>() {
-    private lateinit var changes: InventoryChanges
+    lateinit var changes: InventoryChanges
 
     override fun SafeContext.onStart() {
         changes = InventoryChanges(player.currentScreenHandler.slots)

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

@@ -17,7 +17,6 @@
 
 package com.lambda.interaction.material.transfer
 
-import com.lambda.Lambda.LOG
 import com.lambda.config.groups.InventoryConfig
 import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
@@ -28,6 +27,7 @@ import com.lambda.module.modules.client.TaskFlowModule
 import com.lambda.task.Task
 import com.lambda.util.extension.containerSlots
 import com.lambda.util.extension.inventorySlots
+import com.lambda.util.item.ItemUtils.block
 import net.minecraft.screen.ScreenHandler
 import net.minecraft.screen.slot.Slot
 
@@ -37,11 +37,10 @@ class SlotTransfer @Ta5kBuilder constructor(
     val from: List<Slot>,
     val to: List<Slot>,
     private val closeScreen: Boolean = true,
-    private val settings: InventoryConfig = TaskFlowModule.inventory,
+    private val config: InventoryConfig = TaskFlowModule.inventory,
 ) : Task<Unit>() {
-    private var selectedFrom = selection.filterSlots(from)
-    private var selectedTo =
-        to.filter { it.stack.isEmpty } // + to.filter { it.stack.item.block in TaskFlowModule.disposables }
+    private var selectedFrom = listOf<Slot>()
+    private var selectedTo = listOf<Slot>()
     override val name: String
         get() = "Moving $selection from slots [${selectedFrom.joinToString { "${it.id}" }}] to slots [${selectedTo.joinToString { "${it.id}" }}] in ${screen::class.simpleName}"
 
@@ -54,42 +53,31 @@ class SlotTransfer @Ta5kBuilder constructor(
 
     init {
         listen<TickEvent.Pre> {
-            val current = player.currentScreenHandler
-            if (current != screen) {
-                failure("Screen has changed. Expected ${screen::class.simpleName} (revision ${screen.revision}) but got ${current::class.simpleName} (revision ${current.revision})")
-                return@listen
-            }
-
             if (changes.fulfillsSelection(to, selection)) {
-                if (closeScreen) player.closeHandledScreen()
+                if (closeScreen) { player.closeHandledScreen() }
                 success()
                 return@listen
             }
 
-            if (--delay >= 0) return@listen
-            delay = settings.actionTimout
+            val current = player.currentScreenHandler
+            if (current != screen) {
+                failure("Screen has changed. Expected ${screen::class.simpleName} (revision ${screen.revision}) but got ${current::class.simpleName} (revision ${current.revision})")
+                return@listen
+            }
 
             selectedFrom = selection.filterSlots(from)
-            selectedTo =
-                to.filter { it.stack.isEmpty } // + to.filter { it.stack.item.block in TaskFlowModule.disposables }
+            selectedTo = to.filter { it.stack.isEmpty } + to.filter { it.stack.item.block in config.disposables }
 
             val nextFrom = selectedFrom.firstOrNull() ?: return@listen
             val nextTo = selectedTo.firstOrNull() ?: return@listen
 
-            LOG.info("Changes so far:\n$changes")
-
             transfer {
                 moveSlot(nextFrom.id, nextTo.id)
+//                swap(nextFrom.id, 0)
+//                swap(nextTo.id, 0)
             }.finally { change ->
                 changes merge change
             }.execute(this@SlotTransfer)
-
-//            if (transfer.fulfillsSelection(selection)) {
-//                info("Transfer complete")
-////                success()
-////                if (closeScreen) player.closeHandledScreen()
-//                return@listen
-//            }
         }
     }
 

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

@@ -17,8 +17,10 @@
 
 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 com.lambda.util.player.SlotUtils.clickSlot
 import net.minecraft.screen.slot.SlotActionType
@@ -30,13 +32,10 @@ class ClickSlotTransaction @Ta5kBuilder constructor(
 ) : InventoryTransaction() {
     override val name: String get() = "Click slot #$slotId with action $actionType and button $button"
 
-    init {
-        listen<TickEvent.Pre> {
-            clickSlot(slotId, button, actionType)
-        }
-
-        listen<TickEvent.Post> {
-            finish()
-        }
+    override fun SafeContext.onStart() {
+        changes = InventoryChanges(player.currentScreenHandler.slots)
+        clickSlot(slotId, button, actionType)
+        changes.detectChanges()
+        success(changes)
     }
 }

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

@@ -17,8 +17,10 @@
 
 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
 
@@ -27,15 +29,12 @@ class DropItemInHandTransaction @Ta5kBuilder constructor(
 ) : InventoryTransaction() {
     override val name: String get() = "Dropping ${if (entireStack) "stack" else "item"} in hand"
 
-    init {
-        listen<TickEvent.Pre> {
-            if (!player.isSpectator && player.dropSelectedItem(entireStack)) {
-                player.swingHand(Hand.MAIN_HAND)
-            }
-        }
-
-        listen<TickEvent.Post> {
-            finish()
+    override fun SafeContext.onStart() {
+        changes = InventoryChanges(player.currentScreenHandler.slots)
+        if (!player.isSpectator && player.dropSelectedItem(entireStack)) {
+            player.swingHand(Hand.MAIN_HAND)
         }
+        changes.detectChanges()
+        success(changes)
     }
 }

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

@@ -37,6 +37,7 @@ class PickFromInventoryTransaction @Ta5kBuilder constructor(
         }
 
         listen<InventoryEvent.HotbarSlot.Update> {
+            // ToDo: Check slot
             finish()
         }
     }

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

@@ -27,21 +27,27 @@ import net.minecraft.util.math.Direction
 
 class SwapHandsTransaction @Ta5kBuilder constructor() : InventoryTransaction() {
     override val name: String get() = "Swap Hand Stacks"
+    private var confirming = false
 
     init {
         listen<TickEvent.Pre> {
-            if (player.isSpectator) return@listen
+            if (player.isSpectator) {
+                failure("Spectators cannot swap hands")
+                return@listen
+            }
             connection.sendPacket(
                 PlayerActionC2SPacket(
                     PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND,
                     BlockPos.ORIGIN,
                     Direction.DOWN
                 )
             )
+            confirming = true
         }
 
         listen<InventoryEvent.SlotUpdate> {
-            finish()
+            // ToDo: Check slot
+            if (confirming) finish()
         }
     }
 }