use tick pre listener over onStart for inventory request actions in tasks in case they cant be completed

Author: beanbag44

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

@@ -19,7 +19,8 @@ package com.lambda.interaction.material.container.containers
 
 import com.lambda.Lambda.mc
 import com.lambda.context.Automated
-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.container.MaterialContainer
 import com.lambda.interaction.request.inventory.InventoryRequest.Companion.inventoryRequest
@@ -44,20 +45,22 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
     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() {
-            if (!gamemode.isCreative) {
-                // ToDo: Maybe switch gamemode?
-                throw NotInCreativeModeException()
-            }
+        init {
+            listen<TickEvent.Pre> {
+                if (!gamemode.isCreative) {
+                    // ToDo: Maybe switch gamemode?
+                    throw NotInCreativeModeException()
+                }
 
-            inventoryRequest {
-                player.currentScreenHandler?.slots?.let { slots ->
-                    selection.filterSlots(slots).forEach {
-                        clickCreativeStack(ItemStack.EMPTY, it.id)
+                inventoryRequest {
+                    player.currentScreenHandler?.slots?.let { slots ->
+                        selection.filterSlots(slots).forEach {
+                            clickCreativeStack(ItemStack.EMPTY, it.id)
+                        }
                     }
-                }
-                onComplete { success() }
-            }.submit(queueIfClosed = false)
+                    onComplete { success() }
+                }.submit(queueIfClosed = false)
+            }
         }
     }
 
@@ -67,24 +70,29 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
     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() {
-            selection.optimalStack?.let { optimalStack ->
-                if (player.mainHandStack.equal(optimalStack)) return
+        init {
+            listen<TickEvent.Pre> {
+                selection.optimalStack?.let { optimalStack ->
+                    if (player.mainHandStack.equal(optimalStack)) {
+                        success()
+                        return@listen
+                    }
 
-                if (!gamemode.isCreative) {
-                    // ToDo: Maybe switch gamemode?
-                    throw NotInCreativeModeException()
+                    if (!gamemode.isCreative) {
+                        // ToDo: Maybe switch gamemode?
+                        throw NotInCreativeModeException()
+                    }
+
+                    inventoryRequest {
+                        clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)
+                        action { player.inventory.selectedStack = optimalStack }
+                        onComplete { success() }
+                    }.submit(queueIfClosed = false)
+                    return@listen
                 }
 
-                inventoryRequest {
-                    clickCreativeStack(optimalStack, 36 + player.inventory.selectedSlot)
-                    player.inventory.selectedStack = optimalStack
-                    onComplete { success() }
-                }.submit(queueIfClosed = false)
-                return
+                throw NoOptimalStackException()
             }
-
-            throw NoOptimalStackException()
         }
     }
 

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

@@ -19,7 +19,8 @@ package com.lambda.interaction.material.container.containers
 
 import com.lambda.Lambda.mc
 import com.lambda.context.Automated
-import com.lambda.context.SafeContext
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.material.ContainerTask
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.MaterialContainer
@@ -44,33 +45,35 @@ object MainHandContainer : MaterialContainer(Rank.MainHand) {
     ) : ContainerTask(), Automated by automated {
         override val name: String get() = "Depositing [$selection] to ${hand.name.lowercase().replace("_", " ")}"
 
-        override fun SafeContext.onStart() {
-            val moveStack = InventoryContainer.matchingStacks(selection).firstOrNull() ?: run {
-                failure("No matching stacks found in inventory")
-                return
-            }
-
-            val handStack = player.getStackInHand(hand)
-            if (moveStack.equal(handStack)) {
-                success()
-                return
-            }
+        init {
+            listen<TickEvent.Pre> {
+                val moveStack = InventoryContainer.matchingStacks(selection).firstOrNull() ?: run {
+                    failure("No matching stacks found in inventory")
+                    return@listen
+                }
 
-            inventoryRequest {
-                val stackInOffHand = moveStack.equal(player.offHandStack)
-                val stackInMainHand = moveStack.equal(player.mainHandStack)
-                if ((hand == Hand.MAIN_HAND && stackInOffHand) || (hand == Hand.OFF_HAND && stackInMainHand)) {
-                    swapHands()
-                    return@inventoryRequest
+                val handStack = player.getStackInHand(hand)
+                if (moveStack.equal(handStack)) {
+                    success()
+                    return@listen
                 }
 
-                val slot = player.currentScreenHandler.slots.first { it.stack == moveStack } ?: throw NotInInventoryException()
-                swap(slot.id, player.inventory.selectedSlot)
+                inventoryRequest {
+                    val stackInOffHand = moveStack.equal(player.offHandStack)
+                    val stackInMainHand = moveStack.equal(player.mainHandStack)
+                    if ((hand == Hand.MAIN_HAND && stackInOffHand) || (hand == Hand.OFF_HAND && stackInMainHand)) {
+                        swapHands()
+                        return@inventoryRequest
+                    }
+
+                    val slot = player.currentScreenHandler.slots.first { it.stack == moveStack } ?: throw NotInInventoryException()
+                    swap(slot.id, player.inventory.selectedSlot)
 
-                if (hand == Hand.OFF_HAND) swapHands()
+                    if (hand == Hand.OFF_HAND) swapHands()
 
-                onComplete { success() }
-            }.submit(queueIfClosed = false)
+                    onComplete { success() }
+                }.submit(queueIfClosed = false)
+            }
         }
     }
 

src/main/kotlin/com/lambda/task/Task.kt

@@ -128,9 +128,7 @@ abstract class Task<Result> : Nameable, Muteable {
         unsubscribe()
         state = State.Completed
         if (!AutomationConfig.showAllEntries) parent?.subTasks?.remove(this)
-        runSafe {
-            executeNextTask(result)
-        }
+        runSafe { executeNextTask(result) }
     }
 
     @Ta5kBuilder