EatTask swapping rework

Author: beanbag44

src/main/kotlin/com/lambda/task/tasks/EatTask.kt

@@ -23,7 +23,10 @@ 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.managers.hotbar.HotbarRequest
 import com.lambda.interaction.material.container.ContainerManager.transfer
+import com.lambda.interaction.material.container.containers.HotbarContainer
+import com.lambda.interaction.material.container.containers.InventoryContainer
 import com.lambda.interaction.material.container.containers.MainHandContainer
 import com.lambda.task.Task
 import com.lambda.threading.runSafeAutomated
@@ -46,7 +49,7 @@ class EatTask @Ta5kBuilder constructor(
     }
 
     init {
-        listen<TickEvent.Input.Pre> {
+        listen<TickEvent.Input.Post> {
             if (holdingUse && !reason.shouldKeepEating(eatStack)) {
                 mc.options.useKey.isPressed = false
                 holdingUse = false
@@ -55,25 +58,36 @@ class EatTask @Ta5kBuilder constructor(
                 return@listen
             }
 
-            if (player.isUsingItem) {
-                if (!holdingUse) {
-                    mc.options.useKey.isPressed = true
-                    holdingUse = true
-                }
-                return@listen
-            }
-
             val foodFinder = reason.selector()
-            if (!foodFinder.matches(player.mainHandStack)) {
+            val hotbarSlot = foodFinder.filterSlots(HotbarContainer.slots).firstOrNull()
+            if (hotbarSlot != null) {
+                val request = HotbarRequest(
+                    hotbarSlot.index,
+                    this@EatTask,
+                    keepTicks = hotbarConfig.keepTicks.coerceAtLeast(1),
+                    nowOrNothing = false
+                ).submit()
+                if (!request.done) return@listen
+            } else {
+                val inventorySlot = foodFinder.filterSlots(InventoryContainer.slots).firstOrNull()
+                if (inventorySlot != null) runSafeAutomated {
+                    InventoryContainer.transfer(foodFinder, HotbarContainer)
+                }
                 if (holdingUse) {
                     mc.options.useKey.isPressed = false
                     holdingUse = false
                 }
-                runSafeAutomated {
-                    foodFinder.transfer(MainHandContainer)
+                return@listen
+            }
+
+            if (player.isUsingItem) {
+                if (!holdingUse) {
+                    mc.options.useKey.isPressed = true
+                    holdingUse = true
                 }
                 return@listen
             }
+
             eatStack = player.mainHandStack
 
             (interaction.interactItem(player, Hand.MAIN_HAND) as? ActionResult.Success)?.let {