air place request inventory manager

Author: beanbag44

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

@@ -34,8 +34,8 @@ class InventorySettings(
         Access("Access")
     }
 
-    override val actionsPerSecond by c.setting("Actions Per Tick", 20, 0..100, 1, "How many inventory actions can be performed per tick", visibility = vis).group(baseGroup, Group.General)
-    override val tickStageMask by c.setting("Inventory Stage Mask", setOf<TickEvent>(TickEvent.Pre), description = "The sub-tick timing at which inventory actions are performed", visibility = vis).group(baseGroup, Group.General)
+    override val actionsPerSecond by c.setting("Actions Per Second", 100, 0..100, 1, "How many inventory actions can be performed per tick", visibility = vis).group(baseGroup, Group.General)
+    override val tickStageMask by c.setting("Inventory Stage Mask", setOf<TickEvent>(TickEvent.Pre, TickEvent.Input.Pre, TickEvent.Input.Post, TickEvent.Player.Post), description = "The sub-tick timing at which inventory actions are performed", visibility = vis).group(baseGroup, Group.General)
     override val disposables by c.setting("Disposables", ItemUtils.defaultDisposables, ItemUtils.defaultDisposables, "Items that will be ignored when checking for a free slot", vis).group(baseGroup, Group.Container)
     override val swapWithDisposables by c.setting("Swap With Disposables", true, "Swap items with disposable ones", vis).group(baseGroup, Group.Container)
     override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when retrieving the item from", vis).group(baseGroup, Group.Container)

src/main/kotlin/com/lambda/interaction/request/inventory/InventoryAction.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.interaction.request.inventory
+
+import com.lambda.context.SafeContext
+
+sealed interface InventoryAction {
+    val action: SafeContext.() -> Unit
+
+    class Inventory(override val action: SafeContext.() -> Unit) : InventoryAction
+    class Other(override val action: SafeContext.() -> Unit) : InventoryAction
+}

src/main/kotlin/com/lambda/interaction/request/inventory/InventoryManager.kt

@@ -48,7 +48,7 @@ object InventoryManager : RequestHandler<InventoryRequest>(
     TickEvent.Input.Post,
     TickEvent.Player.Post
 ), Logger {
-    private var actions = mutableListOf<SafeContext.() -> Unit>()
+    private var actions = mutableListOf<InventoryAction>()
 
     private var slots = listOf<ItemStack>()
     private var alteredSlots = LimitedDecayQueue<Pair<Int, Pair<ItemStack, ItemStack>>>(
@@ -86,7 +86,8 @@ object InventoryManager : RequestHandler<InventoryRequest>(
     }
 
     override fun AutomatedSafeContext.handleRequest(request: InventoryRequest) {
-        if (request.actions.size >= request.inventoryConfig.actionsPerSecond - actionsThisSecond &&
+        val inventoryActionCount = request.actions.count { it is InventoryAction.Inventory }
+        if (inventoryActionCount >= request.inventoryConfig.actionsPerSecond - actionsThisSecond &&
             !request.settleForLess &&
             !request.mustPerform) return
         if (tickStage !in inventoryConfig.tickStageMask) return
@@ -99,7 +100,7 @@ object InventoryManager : RequestHandler<InventoryRequest>(
         val iterator = actions.iterator()
         while (iterator.hasNext()) {
             if (actionsThisSecond + 1 > maxActionsThisSecond && !request.mustPerform) break
-            iterator.next()()
+            iterator.next().action(this)
             if (avoidDesync) indexInventoryChanges()
             actionsThisTick++
             actionsThisSecond++

src/main/kotlin/com/lambda/interaction/request/inventory/InventoryRequest.kt

@@ -34,7 +34,7 @@ import net.minecraft.util.math.Direction
 private annotation class InvRequestDsl
 
 class InventoryRequest private constructor(
-    val actions: List<SafeContext.() -> Unit>,
+    val actions: List<InventoryAction>,
     val settleForLess: Boolean,
     val mustPerform: Boolean,
     automated: Automated,
@@ -55,27 +55,29 @@ class InventoryRequest private constructor(
 
     @InvRequestDsl
     class InvRequestBuilder(val settleForLess: Boolean, val mustPerform: Boolean) {
-        val actions = mutableListOf<SafeContext.() -> Unit>()
+        val actions = mutableListOf<InventoryAction>()
         var onComplete: (SafeContext.() -> Unit)? = null
 
         @InvRequestDsl
         fun click(slotId: Int, button: Int, actionType: SlotActionType) {
-            actions.add { clickSlot(slotId, button, actionType) }
+            InventoryAction.Inventory { clickSlot(slotId, button, actionType) }.addToActions()
         }
 
         @InvRequestDsl
         fun pickFromInventory(slotId: Int) {
-            actions.add { clickSlot(slotId, player.inventory.selectedSlot, SlotActionType.SWAP) }
+            InventoryAction.Inventory {
+                clickSlot(slotId, player.inventory.selectedSlot, SlotActionType.SWAP)
+            }.addToActions()
         }
 
         @InvRequestDsl
         fun dropItemInHand(entireStack: Boolean = true) {
-            actions.add { player.dropSelectedItem(entireStack) }
+            InventoryAction.Inventory { player.dropSelectedItem(entireStack) }.addToActions()
         }
 
         @InvRequestDsl
         fun swapHands() {
-            actions.add {
+            InventoryAction.Inventory {
                 val offhandStack = player.getStackInHand(Hand.OFF_HAND)
                 player.setStackInHand(Hand.OFF_HAND, player.getStackInHand(Hand.MAIN_HAND))
                 player.setStackInHand(Hand.MAIN_HAND, offhandStack)
@@ -86,12 +88,12 @@ class InventoryRequest private constructor(
                         Direction.DOWN
                     )
                 )
-            }
+            }.addToActions()
         }
 
         @InvRequestDsl
         fun clickCreativeStack(stack: ItemStack, slotId: Int) {
-            actions.add { interaction.clickCreativeStack(stack, slotId) }
+            InventoryAction.Inventory { interaction.clickCreativeStack(stack, slotId) }.addToActions()
         }
 
         @InvRequestDsl
@@ -150,10 +152,20 @@ class InventoryRequest private constructor(
             pickup(targetSlotId, 0)
         }
 
+        @InvRequestDsl
+        fun action(action: SafeContext.() -> Unit) {
+            InventoryAction.Other(action).addToActions()
+        }
+
         @InvRequestDsl
         fun onComplete(callback: SafeContext.() -> Unit) {
             onComplete = callback
         }
+
+        @InvRequestDsl
+        private fun InventoryAction.addToActions() {
+            actions.add(this)
+        }
     }
 
     companion object {

src/main/kotlin/com/lambda/interaction/request/placing/PlaceManager.kt

@@ -35,6 +35,7 @@ import com.lambda.interaction.request.PositionBlocking
 import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.breaking.BreakManager
 import com.lambda.interaction.request.interacting.InteractionManager
+import com.lambda.interaction.request.inventory.InventoryRequest.Companion.inventoryRequest
 import com.lambda.interaction.request.placing.PlaceManager.activeRequest
 import com.lambda.interaction.request.placing.PlaceManager.maxPlacementsThisTick
 import com.lambda.interaction.request.placing.PlaceManager.placeBlock
@@ -59,14 +60,12 @@ import net.minecraft.item.BlockItem
 import net.minecraft.item.ItemPlacementContext
 import net.minecraft.item.ItemStack
 import net.minecraft.item.ItemUsageContext
-import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket
 import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket
 import net.minecraft.sound.SoundCategory
 import net.minecraft.util.ActionResult
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Direction
 import net.minecraft.world.GameMode
 import kotlin.math.min
 
@@ -328,21 +327,25 @@ object PlaceManager : RequestHandler<PlaceRequest>(
             return ActionResult.FAIL
         }
 
-        val stackInHand = player.getStackInHand(hand)
-        val stackCountPre = stackInHand.count
-        if (placeConfig.placeConfirmationMode != PlaceConfig.PlaceConfirmationMode.None) {
-            PlaceInfo(placeContext, request.pendingInteractions, request.onPlace, placeConfig).startPending()
-        }
-
         if (placeConfig.airPlace == PlaceConfig.AirPlaceMode.Grim) {
             val placeHand = if (hand == Hand.MAIN_HAND) Hand.OFF_HAND else Hand.MAIN_HAND
-            airPlaceOffhandSwap()
-            sendPlacePacket(placeHand, hitResult)
-            airPlaceOffhandSwap()
+            val inventoryRequest = inventoryRequest {
+                swapHands()
+                action { sendPlacePacket(placeHand, hitResult) }
+                swapHands()
+            }.submit(queueIfClosed = false)
+            if (!inventoryRequest.done) return ActionResult.FAIL
         } else {
             sendPlacePacket(hand, hitResult)
         }
 
+        if (placeConfig.placeConfirmationMode != PlaceConfig.PlaceConfirmationMode.None) {
+            PlaceInfo(placeContext, request.pendingInteractions, request.onPlace, placeConfig).startPending()
+        }
+
+        val stackInHand = player.getStackInHand(hand)
+        val stackCountPre = stackInHand.count
+
         if (placeConfig.swing) {
             swingHand(placeConfig.swingType, hand)
 
@@ -407,18 +410,5 @@ object PlaceManager : RequestHandler<PlaceRequest>(
         )
     }
 
-    /**
-     * Must be called before and after placing a block to bypass grim's air place checks.
-     */
-    private fun SafeContext.airPlaceOffhandSwap() {
-        connection.sendPacket(
-            PlayerActionC2SPacket(
-                PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND,
-                BlockPos.ORIGIN,
-                Direction.DOWN
-            )
-        )
-    }
-
     override fun preEvent(): Event = UpdateManagerEvent.Place.post()
 }

src/main/kotlin/com/lambda/util/player/SlotUtils.kt

@@ -29,19 +29,8 @@ object SlotUtils {
     val ClientPlayerEntity.hotbarAndStorage: List<ItemStack> get() = inventory.mainStacks
     val ClientPlayerEntity.combined: List<ItemStack> get() = hotbarAndStorage + equipment
 
-    fun SafeContext.clickSlot(
-        slotId: Int,
-        button: Int,
-        actionType: SlotActionType,
-    ) {
+    fun SafeContext.clickSlot(slotId: Int, button: Int, actionType: SlotActionType) {
         val syncId = player.currentScreenHandler?.syncId ?: return
-
-        interaction.clickSlot(
-            syncId,
-            slotId,
-            button,
-            actionType,
-            player,
-        )
+        interaction.clickSlot(syncId, slotId, button, actionType, player)
     }
 }