improve / fix transferring from containers that require external actions like placing and opening a shulker, to then break and pick it up again afterward, etc.

beanbag44 · beanbag44 · commit b3c567d38cae · 2026-01-08T12:58:22.000Z
diff --git a/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt b/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt
@@ -67,7 +67,7 @@ object TransferCommand : LambdaCommand(
                                 isItem(stack(ctx).value().item)
                             }
                             AutomationConfig.Companion.DEFAULT.runSafeAutomated {
-                                findContainersWithSpace(selection).forEachIndexed { i, container ->
+                                selection.findContainersWithSpace().forEachIndexed { i, container ->
                                     builder.suggest("\"${i + 1}. ${container.name}\"", container.description(selection))
                                 }
                             }
diff --git a/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt b/src/main/kotlin/com/lambda/config/groups/BuildConfig.kt
@@ -34,8 +34,8 @@ interface BuildConfig : ISettingGroup {
     val actionTimeout: Int
     val maxBuildDependencies: Int
 
-    val entityReach: Double
     val blockReach: Double
+    val entityReach: Double
     val scanReach: Double
 
     val checkSideVisibility: Boolean
diff --git a/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt b/src/main/kotlin/com/lambda/config/groups/BuildSettings.kt
@@ -44,8 +44,8 @@ class BuildSettings(
     override val actionTimeout by c.setting("Action Timeout", 10, 1..30, 1, "Timeout for block breaks in ticks", unit = " ticks").group(baseGroup, Group.General).index()
     override val maxBuildDependencies by c.setting("Max Sim Dependencies", 3, 0..10, 1, "Maximum dependency build results").group(baseGroup, Group.General).index()
 
-    override var entityReach by c.setting("Attack Reach", 3.0, 1.0..7.0, 0.01, "Maximum entity interaction distance").group(baseGroup, Group.Reach).index()
     override var blockReach by c.setting("Interact Reach", 4.5, 1.0..7.0, 0.01, "Maximum block interaction distance").group(baseGroup, Group.Reach).index()
+    override var entityReach by c.setting("Attack Reach", 3.0, 1.0..7.0, 0.01, "Maximum entity interaction distance").group(baseGroup, Group.Reach).index()
     override val scanReach: Double get() = max(entityReach, blockReach)
 
     override val checkSideVisibility by c.setting("Visibility Check", true, "Whether to check if an AABB side is visible").group(baseGroup, Group.Scan).index()
diff --git a/src/main/kotlin/com/lambda/interaction/BaritoneManager.kt b/src/main/kotlin/com/lambda/interaction/BaritoneManager.kt
@@ -21,11 +21,11 @@ import baritone.api.BaritoneAPI
 import baritone.api.IBaritone
 import baritone.api.Settings
 import baritone.api.pathing.goals.Goal
+import com.lambda.config.AutomationConfig
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.LambdaConfig
 import com.lambda.config.groups.RotationSettings
 import com.lambda.context.Automated
-import com.lambda.config.AutomationConfig
 import com.lambda.util.BlockUtils.blockPos
 import com.lambda.util.NamedEnum
 import net.fabricmc.loader.api.FabricLoader
@@ -352,8 +352,10 @@ object BaritoneManager : Configurable(LambdaConfig), Automated by AutomationConf
      * Whether Baritone is active (pathing, calculating goal, etc.)
      */
     val isActive: Boolean
-        get() = isBaritoneLoaded && (primary?.customGoalProcess?.isActive == true || primary?.pathingBehavior?.isPathing == true || primary?.pathingControlManager?.mostRecentInControl()
-            ?.orElse(null)?.isActive == true)
+        get() = isBaritoneLoaded &&
+                (primary?.customGoalProcess?.isActive == true ||
+                        primary?.pathingBehavior?.isPathing == true ||
+                        primary?.pathingControlManager?.mostRecentInControl()?.orElse(null)?.isActive == true)
 
     /**
      * Sets the current Baritone goal and starts pathing
diff --git a/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/InteractSim.kt b/src/main/kotlin/com/lambda/interaction/construction/simulation/checks/InteractSim.kt
@@ -273,7 +273,7 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
     }
 
     private suspend fun AutomatedSafeContext.testPlaceState(context: ItemPlacementContext): BlockState? {
-        val resultState = context.stack.blockItem.getPlacementState(context)
+        val resultState = (context.stack.blockItem ?: return null).getPlacementState(context)
             ?: run {
                 handleEntityBlockage(context)
                 return null
@@ -287,7 +287,7 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
 
     private suspend fun AutomatedSafeContext.handleEntityBlockage(context: ItemPlacementContext): List<Entity> {
         val pos = context.blockPos
-        val theoreticalState = context.stack.blockItem.block.getPlacementState(context)
+        val theoreticalState = (context.stack.blockItem ?: return emptyList()).block.getPlacementState(context)
             ?: return emptyList()
 
         val collisionShape = theoreticalState.getCollisionShape(
diff --git a/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt b/src/main/kotlin/com/lambda/interaction/construction/verify/TargetState.kt
@@ -34,7 +34,7 @@ import net.minecraft.state.property.Property
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 
-sealed class TargetState() : StateMatcher {
+sealed class TargetState : StateMatcher {
     data object Empty : TargetState() {
         override fun toString() = "Empty"
 
@@ -165,8 +165,7 @@ sealed class TargetState() : StateMatcher {
     }
 
     data class Stack(val itemStack: ItemStack) : TargetState() {
-        private val startStack: ItemStack = itemStack.copy()
-        override fun toString() = "Stack of ${startStack.item.name.string.capitalize()}"
+        override fun toString() = "Stack of ${itemStack.item.name.string.capitalize()}"
 
         private val block = itemStack.item.block
 
diff --git a/src/main/kotlin/com/lambda/interaction/managers/interacting/InteractManager.kt b/src/main/kotlin/com/lambda/interaction/managers/interacting/InteractManager.kt
@@ -256,7 +256,7 @@ object InteractManager : Manager<InteractRequest>(
 			) {
 			ActionResult.PASS
 	    } else {
-		    val item = itemStack.blockItem
+		    val item = itemStack.blockItem ?: return ActionResult.FAIL
 		    place(interactContext, request, hand, hitResult, item, ItemPlacementContext(context))
 	    }
     }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt b/src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt
@@ -37,6 +37,7 @@ import net.minecraft.block.entity.ChestBlockEntity
 import net.minecraft.block.entity.EnderChestBlockEntity
 import net.minecraft.screen.GenericContainerScreenHandler
 import net.minecraft.screen.ScreenHandlerType
+import net.minecraft.screen.slot.Slot
 
 // ToDo: Make this a Configurable to save container caches. Should use a cached region based storage system.
 object ContainerManager : Loadable {
@@ -111,9 +112,11 @@ object ContainerManager : Loadable {
         containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
     ): MaterialContainer? = findContainersWithMaterial(containerSelection).firstOrNull()
 
-    context(_: AutomatedSafeContext)
-    fun findContainerWithSpace(selection: StackSelection): MaterialContainer? =
-        findContainersWithSpace(selection).firstOrNull()
+    context(automatedSafeContext: AutomatedSafeContext)
+    fun StackSelection.findContainerWithSpace(
+        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
+    ): MaterialContainer? =
+        findContainersWithSpace(containerSelection).firstOrNull()
 
     context(automated: Automated, safeContext: SafeContext)
     fun StackSelection.findContainersWithMaterial(
@@ -125,13 +128,21 @@ object ContainerManager : Loadable {
             .sortedWith(automated.inventoryConfig.providerPriority.materialComparator(this))
 
     context(automatedSafeContext: AutomatedSafeContext)
-    fun findContainersWithSpace(
-        selection: StackSelection,
+    fun StackSelection.findContainersWithSpace(
+        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
     ): List<MaterialContainer> =
         containers()
-            .filter { it.spaceAvailable(selection) >= selection.count }
-            .filter { automatedSafeContext.inventoryConfig.containerSelection.matches(it) }
-            .sortedWith(automatedSafeContext.inventoryConfig.providerPriority.spaceComparator(selection))
+            .filter { containerSelection.matches(it) }
+            .filter { it.spaceAvailable(this) >= count }
+            .sortedWith(automatedSafeContext.inventoryConfig.providerPriority.spaceComparator(this))
+
+    context(automatedSafeContext: AutomatedSafeContext)
+    fun StackSelection.findSlotsWithMaterial(
+        containerSelection: ContainerSelection = automatedSafeContext.inventoryConfig.containerSelection
+    ): List<Slot> =
+        findContainersWithMaterial(containerSelection)
+            .flatMap { filterSlots(it.slots) }
+
 
     context(automatedSafeContext: AutomatedSafeContext)
     fun findDisposable() = containers().find { container ->
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/ExternalContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/ExternalContainer.kt
@@ -17,10 +17,11 @@
 
 package com.lambda.interaction.material.container
 
-import com.lambda.context.Automated
+import com.lambda.context.AutomatedSafeContext
 import com.lambda.task.Task
+import com.lambda.task.TaskGenerator
 
 interface ExternalContainer {
-	context(_: Automated)
-	fun access(): Task<*>
+	context(_: AutomatedSafeContext)
+	fun accessThen(exitAfter: Boolean = true, taskGenerator: TaskGenerator<Unit>): Task<*>?
 }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/MaterialContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/MaterialContainer.kt
@@ -60,9 +60,9 @@ abstract class MaterialContainer(
     }.thenByDescending {
         it.stack.item in automated.inventoryConfig.disposables
     }.thenByDescending {
-        it.stack.item.components.contains(DataComponentTypes.TOOL)
+        !it.stack.item.components.contains(DataComponentTypes.TOOL)
     }.thenByDescending {
-        it.stack.item.components.contains(DataComponentTypes.FOOD)
+        !it.stack.item.components.contains(DataComponentTypes.FOOD)
     }.thenByDescending {
         it.stack.isStackable
     }
@@ -130,7 +130,7 @@ abstract class MaterialContainer(
     fun transfer(stackSelection: StackSelection, destination: MaterialContainer): Boolean =
         with(automatedSafeContext) {
             val fromSlot = getSlot(stackSelection) ?: return false
-            val toSlot = destination.getReplaceSlot() ?: return false
+            val toSlot = destination.getReplaceableSlot() ?: return false
             return inventoryRequest {
                 if (swapMethodPriority > destination.swapMethodPriority) transfer(fromSlot, toSlot)
                 else with(destination) { transfer(toSlot, fromSlot) }
@@ -163,7 +163,7 @@ abstract class MaterialContainer(
         matchingStacks(selection).spaceLeft + stacks.empty * selection.stackSize
 
     context(_: AutomatedSafeContext)
-    open fun getReplaceSlot() = slots.sortedWith(replaceSorter).firstOrNull()
+    open fun getReplaceableSlot() = slots.sortedWith(replaceSorter).firstOrNull()
 
     context(_: SafeContext)
     open fun getSlot(stackSelection: StackSelection): Slot? =
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/ChestContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/ChestContainer.kt
@@ -17,11 +17,13 @@
 
 package com.lambda.interaction.material.container.containers
 
-import com.lambda.context.Automated
+import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
 import com.lambda.interaction.material.container.ContainerManager
 import com.lambda.interaction.material.container.ExternalContainer
 import com.lambda.interaction.material.container.MaterialContainer
+import com.lambda.task.Task
+import com.lambda.task.TaskGenerator
 import com.lambda.task.tasks.OpenContainerTask
 import com.lambda.util.extension.containerSlots
 import com.lambda.util.text.buildText
@@ -55,6 +57,11 @@ data class ChestContainer(
             }
         }
 
-    context(automated: Automated)
-    override fun access() = OpenContainerTask(blockPos, automated)
+    context(automatedSafeContext: AutomatedSafeContext)
+    override fun accessThen(exitAfter: Boolean, taskGenerator: TaskGenerator<Unit>): Task<*> =
+        OpenContainerTask(blockPos, automatedSafeContext).then {
+            taskGenerator.invoke(automatedSafeContext, Unit).finally {
+                if (exitAfter) automatedSafeContext.player.closeScreen()
+            }
+        }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/CreativeContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/CreativeContainer.kt
@@ -17,16 +17,17 @@
 
 package com.lambda.interaction.material.container.containers
 
-import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.interaction.managers.inventory.InventoryRequest
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.util.text.buildText
 import com.lambda.util.text.literal
+import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen
 import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.inventory.SingleStackInventory
 import net.minecraft.item.ItemStack
+import net.minecraft.screen.PlayerScreenHandler
 import net.minecraft.screen.slot.Slot
 
 data object CreativeContainer : MaterialContainer(Rank.Creative) {
@@ -61,9 +62,13 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
 
     context(safeContext: SafeContext)
     override fun materialAvailable(selection: StackSelection): Int =
-        if (safeContext.player.isCreative && selection.optimalStack != null) Int.MAX_VALUE else 0
+        if (safeContext.player.isCreative && correctScreenHandler && selection.optimalStack != null) Int.MAX_VALUE else 0
 
-    context(_: SafeContext)
+    context(safeContext: SafeContext)
     override fun spaceAvailable(selection: StackSelection): Int =
-        if (mc.player?.isCreative == true && selection.optimalStack != null) Int.MAX_VALUE else 0
+        if (safeContext.player.isCreative && correctScreenHandler && selection.optimalStack != null) Int.MAX_VALUE else 0
+
+    context(safeContext: SafeContext)
+    private val correctScreenHandler
+        get() = safeContext.player.currentScreenHandler is PlayerScreenHandler || safeContext.player.currentScreenHandler is CreativeInventoryScreen.CreativeScreenHandler
 }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/EnderChestContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/EnderChestContainer.kt
@@ -17,13 +17,15 @@
 
 package com.lambda.interaction.material.container.containers
 
-import com.lambda.context.Automated
+import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
 import com.lambda.interaction.material.StackSelection.Companion.select
 import com.lambda.interaction.material.container.ContainerManager
+import com.lambda.interaction.material.container.ContainerManager.findSlotsWithMaterial
 import com.lambda.interaction.material.container.ExternalContainer
 import com.lambda.interaction.material.container.MaterialContainer
-import com.lambda.task.tasks.AcquireMaterialTask.Companion.acquire
+import com.lambda.task.TaskGenerator
+import com.lambda.task.tasks.BuildTask.Companion.breakAndCollectBlock
 import com.lambda.task.tasks.OpenContainerTask
 import com.lambda.task.tasks.PlaceContainerTask
 import com.lambda.util.extension.containerSlots
@@ -32,6 +34,7 @@ import com.lambda.util.text.literal
 import net.minecraft.block.entity.EnderChestBlockEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.item.Items
+import net.minecraft.util.math.BlockPos
 
 object EnderChestContainer : MaterialContainer(Rank.EnderChest), ExternalContainer {
     context(safeContext: SafeContext)
@@ -44,12 +47,22 @@ object EnderChestContainer : MaterialContainer(Rank.EnderChest), ExternalContain
 
     override val description = buildText { literal("Ender Chest") }
 
-    context(automated: Automated)
-    override fun access() =
-        automated.acquire { Items.ENDER_CHEST.select() }.thenOrNull { selection ->
-            val slot = selection.filterSlots(HotbarContainer.slots).firstOrNull() ?: return@thenOrNull FailureTask("Ender Chest not found in hotbar after transfer.")
-            PlaceContainerTask(slot, automated).finally { pos ->
-                OpenContainerTask(pos, automated)
+    private var placePos = BlockPos.ORIGIN
+
+    context(automatedSafeContext: AutomatedSafeContext)
+    override fun accessThen(exitAfter: Boolean, taskGenerator: TaskGenerator<Unit>) =
+        Items.ENDER_CHEST
+            .select()
+            .findSlotsWithMaterial()
+            .firstOrNull()?.let { slot ->
+                PlaceContainerTask(slot, automatedSafeContext).then { pos ->
+                    placePos = pos
+                    OpenContainerTask(pos, automatedSafeContext).then {
+                        taskGenerator.invoke(automatedSafeContext, Unit).thenOrNull {
+                            if (exitAfter) automatedSafeContext.breakAndCollectBlock(placePos, lifeMaintenance = false)
+                            else null
+                        }
+                    }
+                }
             }
-        }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/HotbarContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/HotbarContainer.kt
@@ -41,6 +41,6 @@ object HotbarContainer : MaterialContainer(Rank.Hotbar) {
 
     context(safeContext: SafeContext)
     override fun InventoryRequest.InvRequestBuilder.transfer(fromHere: Slot, toSlot: Slot) {
-        swap(toSlot.id, safeContext.player.hotbarSlots.indexOf(toSlot))
+        swap(toSlot.id, safeContext.player.hotbarSlots.indexOf(fromHere))
     }
 }
diff --git a/src/main/kotlin/com/lambda/interaction/material/container/containers/ShulkerBoxContainer.kt b/src/main/kotlin/com/lambda/interaction/material/container/containers/ShulkerBoxContainer.kt
@@ -17,9 +17,15 @@
 
 package com.lambda.interaction.material.container.containers
 
+import com.lambda.context.AutomatedSafeContext
 import com.lambda.context.SafeContext
 import com.lambda.interaction.material.container.ContainerManager
+import com.lambda.interaction.material.container.ExternalContainer
 import com.lambda.interaction.material.container.MaterialContainer
+import com.lambda.task.TaskGenerator
+import com.lambda.task.tasks.BuildTask.Companion.breakAndCollectBlock
+import com.lambda.task.tasks.OpenContainerTask
+import com.lambda.task.tasks.PlaceContainerTask
 import com.lambda.threading.runSafe
 import com.lambda.util.extension.containerSlots
 import com.lambda.util.text.buildText
@@ -28,12 +34,13 @@ import com.lambda.util.text.literal
 import net.minecraft.block.entity.ShulkerBoxBlockEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.screen.slot.Slot
+import net.minecraft.util.math.BlockPos
 
 data class ShulkerBoxContainer(
     override var stacks: List<ItemStack>,
     val containedIn: MaterialContainer,
     val shulkerSlot: Slot,
-) : MaterialContainer(Rank.ShulkerBox) {
+) : MaterialContainer(Rank.ShulkerBox), ExternalContainer {
     context(safeContext: SafeContext)
     override val slots
         get(): List<Slot> =
@@ -52,4 +59,18 @@ data class ShulkerBoxContainer(
 
     context(_: SafeContext)
     private val slotInContainer: Int get() = containedIn.slots.indexOf(shulkerSlot)
-}
+
+    private var placePos = BlockPos.ORIGIN
+
+    context(automatedSafeContext: AutomatedSafeContext)
+    override fun accessThen(exitAfter: Boolean, taskGenerator: TaskGenerator<Unit>) =
+        PlaceContainerTask(shulkerSlot, automatedSafeContext).then { pos ->
+            placePos = pos
+            OpenContainerTask(pos, automatedSafeContext).then {
+                taskGenerator.invoke(automatedSafeContext, Unit).thenOrNull {
+                    if (exitAfter) automatedSafeContext.breakAndCollectBlock(placePos)
+                    else null
+                }
+            }
+        }
+}
diff --git a/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt b/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt
@@ -262,11 +262,10 @@ class BuildTask private constructor(
         fun Automated.breakAndCollectBlock(
             blockPos: BlockPos,
             finishOnDone: Boolean = true,
-            collectDrops: Boolean = true,
             lifeMaintenance: Boolean = false
         ) = BuildTask(
             blockPos.toStructure(TargetState.Air).toBlueprint(),
-            finishOnDone, collectDrops, lifeMaintenance, this
+            finishOnDone, true, lifeMaintenance, this
         )
     }
 }
diff --git a/src/main/kotlin/com/lambda/task/tasks/ContainerTransferTask.kt b/src/main/kotlin/com/lambda/task/tasks/ContainerTransferTask.kt
diff --git a/src/main/kotlin/com/lambda/task/tasks/OpenContainerTask.kt b/src/main/kotlin/com/lambda/task/tasks/OpenContainerTask.kt
diff --git a/src/main/kotlin/com/lambda/task/tasks/PlaceContainerTask.kt b/src/main/kotlin/com/lambda/task/tasks/PlaceContainerTask.kt
diff --git a/src/main/kotlin/com/lambda/util/item/ItemUtils.kt b/src/main/kotlin/com/lambda/util/item/ItemUtils.kt

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ object TransferCommand : LambdaCommand(`
`67`	`67`	`isItem(stack(ctx).value().item)`
`68`	`68`	`}`
`69`	`69`	`AutomationConfig.Companion.DEFAULT.runSafeAutomated {`
`70`		`- findContainersWithSpace(selection).forEachIndexed { i, container ->`
	`70`	`+ selection.findContainersWithSpace().forEachIndexed { i, container ->`
`71`	`71`	`builder.suggest("\"${i + 1}. ${container.name}\"", container.description(selection))`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ object InteractManager : Manager<InteractRequest>(`
`256`	`256`	`) {`
`257`	`257`	`ActionResult.PASS`
`258`	`258`	`} else {`
`259`		`- val item = itemStack.blockItem`
	`259`	`+ val item = itemStack.blockItem ?: return ActionResult.FAIL`
`260`	`260`	`place(interactContext, request, hand, hitResult, item, ItemPlacementContext(context))`
`261`	`261`	`}`
`262`	`262`	`}`