swap old system for inventory manager requests

Author: beanbag44

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

@@ -22,7 +22,7 @@ import com.lambda.context.Automated
 import com.lambda.context.SafeContext
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.MaterialContainer
-import com.lambda.interaction.material.transfer.TransactionExecutor
+import com.lambda.interaction.request.inventory.InventoryRequest.Companion.inventoryRequest
 import com.lambda.task.Task
 import com.lambda.util.item.ItemStackUtils.equal
 import com.lambda.util.player.gamemode
@@ -41,7 +41,7 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
     override fun spaceAvailable(selection: StackSelection): Int =
         if (mc.player?.isCreative == true && selection.optimalStack != null) Int.MAX_VALUE else 0
 
-    class CreativeDeposit @Ta5kBuilder constructor(val selection: StackSelection) : Task<Unit>() {
+    class CreativeDeposit @Ta5kBuilder constructor(val selection: StackSelection, automated: Automated) : Task<Unit>(), Automated by automated {
         override val name: String get() = "Removing $selection from creative inventory"
 
         override fun SafeContext.onStart() {
@@ -50,22 +50,21 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
                 throw NotInCreativeModeException()
             }
 
-            TransactionExecutor.transfer(player.currentScreenHandler) {
+            inventoryRequest {
                 player.currentScreenHandler?.slots?.let { slots ->
                     selection.filterSlots(slots).forEach {
                         clickCreativeStack(ItemStack.EMPTY, it.id)
                     }
                 }
-            }.finally {
-                success()
-            }.execute(this@CreativeDeposit)
+                onComplete { success() }
+            }.submit(queueIfClosed = false)
         }
     }
 
     context(automated: Automated)
-    override fun deposit(selection: StackSelection) = CreativeDeposit(selection)
+    override fun deposit(selection: StackSelection) = CreativeDeposit(selection, automated)
 
-    class CreativeWithdrawal @Ta5kBuilder constructor(val selection: StackSelection) : Task<Unit>() {
+    class CreativeWithdrawal @Ta5kBuilder constructor(val selection: StackSelection, automated: Automated) : Task<Unit>(), Automated by automated {
         override val name: String get() = "Withdrawing $selection from creative inventory"
 
         override fun SafeContext.onStart() {
@@ -77,11 +76,11 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
                     throw NotInCreativeModeException()
                 }
 
-                TransactionExecutor.transfer(player.currentScreenHandler) {
+                inventoryRequest {
                     clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)
-                }.finally {
-                    success()
-                }.execute(this@CreativeWithdrawal)
+                    player.inventory.selectedStack = optimalStack
+                    onComplete { success() }
+                }.submit(queueIfClosed = false)
                 return
             }
 
@@ -91,7 +90,7 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
 
     // Withdraws items from the creative menu to the player's main hand
     context(automated: Automated)
-    override fun withdraw(selection: StackSelection) = CreativeWithdrawal(selection)
+    override fun withdraw(selection: StackSelection) = CreativeWithdrawal(selection, automated)
 
     class NotInCreativeModeException : IllegalStateException("Insufficient permission: not in creative mode")
     class NoOptimalStackException : IllegalStateException("Cannot move item: no optimal stack")

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

@@ -23,10 +23,9 @@ import com.lambda.context.SafeContext
 import com.lambda.interaction.material.ContainerTask
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.MaterialContainer
-import com.lambda.interaction.material.transfer.TransactionExecutor.Companion.transfer
+import com.lambda.interaction.request.inventory.InventoryRequest.Companion.inventoryRequest
 import com.lambda.util.item.ItemStackUtils.equal
 import com.lambda.util.player.SlotUtils.combined
-import com.lambda.util.player.SlotUtils.hotbar
 import com.lambda.util.player.SlotUtils.storage
 import com.lambda.util.text.buildText
 import com.lambda.util.text.literal
@@ -40,7 +39,11 @@ object MainHandContainer : MaterialContainer(Rank.MainHand) {
 
     override val description = buildText { literal("MainHand") }
 
-    class HandDeposit @Ta5kBuilder constructor(val selection: StackSelection, val hand: Hand) : ContainerTask() {
+    class HandDeposit @Ta5kBuilder constructor(
+        val selection: StackSelection,
+        val hand: Hand,
+        automated: Automated
+    ) : ContainerTask(), Automated by automated {
         override val name: String get() = "Depositing [$selection] to ${hand.name.lowercase().replace("_", " ")}"
 
         override fun SafeContext.onStart() {
@@ -55,26 +58,24 @@ object MainHandContainer : MaterialContainer(Rank.MainHand) {
                 return
             }
 
-            transfer(player.currentScreenHandler) {
+            inventoryRequest {
                 val stackInOffHand = moveStack.equal(player.offHandStack)
-                if (hand == Hand.MAIN_HAND && stackInOffHand) {
+                val stackInMainHand = moveStack.equal(player.mainHandStack)
+                if ((hand == Hand.MAIN_HAND && stackInOffHand) || (hand == Hand.OFF_HAND && stackInMainHand)) {
                     swapHands()
-                    return@transfer
+                    return@inventoryRequest
                 }
 
-                when (moveStack) {
-                    in player.hotbar -> swapToHotbarSlot(player.hotbar.indexOf(moveStack))
-                    // ToDo: Use pickFromInventory
-                    in player.storage -> swap(player.combined.indexOf(moveStack), 0)
-                }
+                if (moveStack in player.storage) swap(player.combined.indexOf(moveStack), 0)
+                else throw NotInInventoryException()
 
-                if (hand == Hand.OFF_HAND) swapHands()
-            }.finally {
-                success()
-            }.execute(this@HandDeposit)
+                onComplete { success() }
+            }.submit(queueIfClosed = false)
         }
     }
 
     context(automated: Automated)
-    override fun deposit(selection: StackSelection) = HandDeposit(selection, Hand.MAIN_HAND)
+    override fun deposit(selection: StackSelection) = HandDeposit(selection, Hand.MAIN_HAND, automated)
+
+    class NotInInventoryException : IllegalStateException("Cannot find stack in inventory")
 }

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

@@ -34,5 +34,5 @@ object OffHandContainer : MaterialContainer(Rank.OffHand) {
     override val description = buildText { literal("OffHand") }
 
     context(automated: Automated)
-    override fun deposit(selection: StackSelection) = MainHandContainer.HandDeposit(selection, Hand.OFF_HAND)
+    override fun deposit(selection: StackSelection) = MainHandContainer.HandDeposit(selection, Hand.OFF_HAND, automated)
 }

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

@@ -22,7 +22,7 @@ import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.material.StackSelection
-import com.lambda.interaction.material.transfer.TransactionExecutor.Companion.transfer
+import com.lambda.interaction.request.inventory.InventoryRequest.Companion.inventoryRequest
 import com.lambda.task.Task
 import com.lambda.util.extension.containerSlots
 import com.lambda.util.extension.inventorySlots
@@ -70,13 +70,12 @@ class SlotTransfer @Ta5kBuilder constructor(
             val nextFrom = selectedFrom.firstOrNull() ?: return@listen
             val nextTo = selectedTo.firstOrNull() ?: return@listen
 
-            transfer(screen) {
+            inventoryRequest {
 //                moveSlot(nextFrom.id, nextTo.id)
                 swap(nextTo.id, 1)
                 swap(nextFrom.id, 1)
-            }.finally { change ->
-                changes merge change
-            }.execute(this@SlotTransfer)
+                onComplete { success() }
+            }.submit(queueIfClosed = false)
         }
     }