immediateAccessOnly setting in inventory settings

Author: beanbag44

src/main/kotlin/com/lambda/command/commands/TransferCommand.kt

@@ -30,10 +30,11 @@ import com.lambda.command.LambdaCommand
 import com.lambda.config.AutomationConfig
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
 import com.lambda.interaction.material.container.ContainerManager
-import com.lambda.interaction.material.container.ContainerManager.containerWithMaterial
-import com.lambda.interaction.material.container.ContainerManager.containerWithSpace
+import com.lambda.interaction.material.container.ContainerManager.findContainersWithMaterial
+import com.lambda.interaction.material.container.ContainerManager.findContainersWithSpace
 import com.lambda.interaction.material.transfer.TransferResult
 import com.lambda.task.RootTask.run
+import com.lambda.threading.runSafe
 import com.lambda.util.Communication.info
 import com.lambda.util.extension.CommandBuilder
 
@@ -54,8 +55,10 @@ object TransferCommand : LambdaCommand(
                             isItem(stack(ctx).value().item)
                         }
                         with(AutomationConfig.Companion.DEFAULT) {
-                            selection.containerWithMaterial().forEachIndexed { i, container ->
-                                builder.suggest("\"${i + 1}. ${container.name}\"", container.description(selection))
+                            runSafe {
+                                selection.findContainersWithMaterial().forEachIndexed { i, container ->
+                                    builder.suggest("\"${i + 1}. ${container.name}\"", container.description(selection))
+                                }
                             }
                         }
                         builder.buildFuture()
@@ -66,8 +69,10 @@ object TransferCommand : LambdaCommand(
                                 isItem(stack(ctx).value().item)
                             }
                             with(AutomationConfig.Companion.DEFAULT) {
-                                containerWithSpace(selection).forEachIndexed { i, container ->
-                                    builder.suggest("\"${i + 1}. ${container.name}\"", container.description(selection))
+                                runSafe {
+                                    findContainersWithSpace(selection).forEachIndexed { i, container ->
+                                        builder.suggest("\"${i + 1}. ${container.name}\"", container.description(selection))
+                                    }
                                 }
                             }
                             builder.buildFuture()
@@ -76,11 +81,11 @@ object TransferCommand : LambdaCommand(
                             val selection = selectStack(amount().value()) {
                                 isItem(stack().value().item)
                             }
-                            val fromContainer = ContainerManager.container().find {
+                            val fromContainer = ContainerManager.containers().find {
                                 it.name == from().value().split(".").last().trim()
                             } ?: return@executeWithResult failure("From container not found")
 
-                            val toContainer = ContainerManager.container().find {
+                            val toContainer = ContainerManager.containers().find {
                                 it.name == to().value().split(".").last().trim()
                             } ?: return@executeWithResult failure("To container not found")
 

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

@@ -41,6 +41,7 @@ class InventorySettings(
     override val providerPriority by c.setting("Provider Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when retrieving the item from").group(baseGroup, Group.Container).index()
     override val storePriority by c.setting("Store Priority", InventoryConfig.Priority.WithMinItems, "What container to prefer when storing the item to").group(baseGroup, Group.Container).index()
 
+    override val immediateAccessOnly by c.setting("Immediate Access Only", false, "Only allow access to inventories that can be accessed immediately").group(baseGroup, Group.Access).index()
     override val accessShulkerBoxes by c.setting("Access Shulker Boxes", true, "Allow access to the player's shulker boxes").group(baseGroup, Group.Access).index()
     override val accessEnderChest by c.setting("Access Ender Chest", false, "Allow access to the player's ender chest").group(baseGroup, Group.Access).index()
     override val accessChests by c.setting("Access Chests", false, "Allow access to the player's normal chests").group(baseGroup, Group.Access).index()

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/BreakSim.kt

@@ -32,7 +32,7 @@ import com.lambda.interaction.material.ContainerSelection.Companion.selectContai
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.StackSelection.Companion.EVERYTHING
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
-import com.lambda.interaction.material.container.ContainerManager.containerWithMaterial
+import com.lambda.interaction.material.container.ContainerManager.findContainersWithMaterial
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.managers.hotbar.HotbarManager
 import com.lambda.interaction.managers.rotating.RotationManager
@@ -187,7 +187,7 @@ class BreakSim private constructor(simInfo: SimInfo)
         }
 
         val hotbarCandidates = stackSelection
-            .containerWithMaterial(silentSwapSelection)
+            .findContainersWithMaterial(silentSwapSelection)
             .map { it.matchingStacks(stackSelection) }
             .flatten()
         if (hotbarCandidates.isEmpty()) {

src/main/kotlin/com/lambda/interaction/construction/simulation/checks/InteractSim.kt

@@ -38,7 +38,7 @@ import com.lambda.interaction.managers.rotating.visibilty.lookInDirection
 import com.lambda.interaction.material.ContainerSelection.Companion.selectContainer
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.StackSelection.Companion.select
-import com.lambda.interaction.material.container.ContainerManager.containerWithMaterial
+import com.lambda.interaction.material.container.ContainerManager.findContainersWithMaterial
 import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.util.BlockUtils
 import com.lambda.util.BlockUtils.blockState
@@ -219,7 +219,7 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
 		val stackSelection = item?.select()
 			?: StackSelection.selectStack(0, sorter = compareByDescending { it.inventoryIndex == player.inventory.selectedSlot })
 		val containerSelection = selectContainer { ofAnyType(MaterialContainer.Rank.Hotbar) }
-		val container = stackSelection.containerWithMaterial(containerSelection).firstOrNull() ?: run {
+		val container = stackSelection.findContainersWithMaterial(containerSelection).firstOrNull() ?: run {
 			result(GenericResult.WrongItemSelection(pos, stackSelection, player.mainHandStack))
 			return null
 		}

src/main/kotlin/com/lambda/interaction/construction/simulation/result/Resolvable.kt

@@ -18,12 +18,13 @@
 package com.lambda.interaction.construction.simulation.result
 
 import com.lambda.context.Automated
+import com.lambda.context.SafeContext
 import com.lambda.task.Task
 
 /**
  * Represents a [BuildResult] with a resolvable [Task]
  */
 interface Resolvable {
-    context(automated: Automated)
-    fun resolve(): Task<*>
+    context(automated: Automated, safeContext: SafeContext)
+    fun resolve(): Task<*>?
 }

src/main/kotlin/com/lambda/interaction/construction/simulation/result/results/BreakResult.kt

@@ -20,6 +20,7 @@ package com.lambda.interaction.construction.simulation.result.results
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
 import com.lambda.context.Automated
+import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.DirectionMask.mask
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.construction.simulation.context.BreakContext
@@ -33,7 +34,6 @@ import com.lambda.interaction.construction.simulation.result.Rank
 import com.lambda.interaction.construction.simulation.result.Resolvable
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
 import com.lambda.interaction.material.container.ContainerManager.transfer
-import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.material.container.containers.MainHandContainer
 import net.minecraft.block.BlockState
 import net.minecraft.item.Item
@@ -95,18 +95,11 @@ sealed class BreakResult : BuildResult() {
     ) : Resolvable, BreakResult() {
         override val rank = Rank.BreakItemCantMine
 
-        context(automated: Automated)
+        context(automated: Automated, safeContext: SafeContext)
         override fun resolve() =
             selectStack {
                 isItem(badItem).not()
-            }.let { selection ->
-                selection.transfer(MainHandContainer)
-                    ?: MaterialContainer.AwaitItemTask(
-                        "Couldn't find a tool for ${blockState.block.name.string} with $badItem in main hand.",
-                        selection,
-                        automated
-                    )
-            }
+            }.transfer(MainHandContainer)
 
         override fun compareResult(other: ComparableResult<Rank>) =
             when (other) {

src/main/kotlin/com/lambda/interaction/construction/simulation/result/results/GenericResult.kt

@@ -19,6 +19,7 @@ package com.lambda.interaction.construction.simulation.result.results
 
 import baritone.api.pathing.goals.GoalNear
 import com.lambda.context.Automated
+import com.lambda.context.SafeContext
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.construction.simulation.result.BuildResult
 import com.lambda.interaction.construction.simulation.result.ComparableResult
@@ -28,7 +29,6 @@ import com.lambda.interaction.construction.simulation.result.Rank
 import com.lambda.interaction.construction.simulation.result.Resolvable
 import com.lambda.interaction.material.StackSelection
 import com.lambda.interaction.material.container.ContainerManager.transfer
-import com.lambda.interaction.material.container.MaterialContainer
 import com.lambda.interaction.material.container.containers.MainHandContainer
 import net.minecraft.client.data.TextureMap.side
 import net.minecraft.item.ItemStack
@@ -95,14 +95,8 @@ sealed class GenericResult : BuildResult() {
         override val rank = Rank.WrongItem
         private val color = Color(3, 252, 169, 25)
 
-        context(automated: Automated)
-        override fun resolve() =
-            neededSelection.transfer(MainHandContainer)
-                ?: MaterialContainer.AwaitItemTask(
-                    "Couldn't find $neededSelection anywhere.",
-                    neededSelection,
-                    automated
-                )
+        context(automated: Automated, safeContext: SafeContext)
+        override fun resolve() = neededSelection.transfer(MainHandContainer)
 
         override fun ShapeBuilder.buildRenderer() {
             val center = pos.toCenterPos()

src/main/kotlin/com/lambda/interaction/managers/inventory/InventoryConfig.kt

@@ -34,6 +34,7 @@ interface InventoryConfig : ISettingGroup {
     val providerPriority: Priority
     val storePriority: Priority
 
+    val immediateAccessOnly: Boolean
     val accessShulkerBoxes: Boolean
     val accessEnderChest: Boolean
     val accessChests: Boolean

src/main/kotlin/com/lambda/interaction/material/container/ContainerManager.kt

@@ -18,6 +18,7 @@
 package com.lambda.interaction.material.container
 
 import com.lambda.context.Automated
+import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.event.events.InventoryEvent
 import com.lambda.event.events.PlayerEvent
@@ -39,9 +40,8 @@ import net.minecraft.screen.ScreenHandlerType
 
 // ToDo: Make this a Configurable to save container caches. Should use a cached region based storage system.
 object ContainerManager : Loadable {
-    private val container: List<MaterialContainer>
-        // ToDo: Filter containers based on a filter setting TaskFlowModule.inventory.accessEnderChest etc
-        get() = compileContainers.filter { it !is EnderChestContainer } + runtimeContainers
+    private val containers: List<MaterialContainer>
+        get() = compileContainers + runtimeContainers
 
     private val compileContainers = getInstances<MaterialContainer>()
     private val runtimeContainers = mutableSetOf<MaterialContainer>()
@@ -74,7 +74,7 @@ object ContainerManager : Loadable {
                     val stacks = handler.containerStacks
 
                     this@ContainerManager.info("Updating ChestContainer")
-                    container
+                    containers
                         .filterIsInstance<ChestContainer>()
                         .find {
                             it.blockPos == block.pos
@@ -85,44 +85,46 @@ object ContainerManager : Loadable {
         }
     }
 
-    fun container() = container.flatMap { setOf(it) + it.shulkerContainer }.sorted()
+    fun containers() = containers.flatMap { setOf(it) + it.shulkerContainer }.sorted()
 
-    context(automated: Automated)
+    context(automated: Automated, _: SafeContext)
     fun StackSelection.transfer(destination: MaterialContainer) =
         findContainerWithMaterial()?.transfer(this, destination)
 
     fun findContainer(
         block: (MaterialContainer) -> Boolean,
-    ): MaterialContainer? = container().find(block)
+    ): MaterialContainer? = containers().find(block)
 
-    context(automated: Automated)
+    context(_: Automated, _: SafeContext)
     fun StackSelection.findContainerWithMaterial(): MaterialContainer? =
-        containerWithMaterial().firstOrNull()
+        findContainersWithMaterial().firstOrNull()
 
-    context(automated: Automated)
+    context(_: Automated, _: SafeContext)
     fun findContainerWithSpace(selection: StackSelection): MaterialContainer? =
-        containerWithSpace(selection).firstOrNull()
+        findContainersWithSpace(selection).firstOrNull()
 
-    context(automated: Automated)
-    fun StackSelection.containerWithMaterial(
+    context(automated: Automated, safeContext: SafeContext)
+    fun StackSelection.findContainersWithMaterial(
         containerSelection: ContainerSelection = automated.inventoryConfig.containerSelection,
     ): List<MaterialContainer> =
-        container()
+        containers()
+            .filter { !automated.inventoryConfig.immediateAccessOnly || it.isImmediatelyAccessible() }
             .filter { it.materialAvailable(this) >= count }
             .filter { containerSelection.matches(it) }
             .sortedWith(automated.inventoryConfig.providerPriority.materialComparator(this))
 
-    context(automated: Automated)
-    fun containerWithSpace(
+    context(automated: Automated, safeContext: SafeContext)
+    fun findContainersWithSpace(
         selection: StackSelection,
     ): List<MaterialContainer> =
-        container()
+        containers()
+            .filter { !automated.inventoryConfig.immediateAccessOnly || it.isImmediatelyAccessible() }
             .filter { it.spaceAvailable(selection) >= selection.count }
             .filter { automated.inventoryConfig.containerSelection.matches(it) }
             .sortedWith(automated.inventoryConfig.providerPriority.spaceComparator(selection))
 
     context(automated: Automated)
-    fun findDisposable() = container().find { container ->
+    fun findDisposable() = containers().find { container ->
         automated.inventoryConfig.disposables.any { container.materialAvailable(it.asItem().select()) > 0 }
     }
 

src/main/kotlin/com/lambda/interaction/material/container/MaterialContainer.kt

@@ -138,6 +138,9 @@ abstract class MaterialContainer(
     open fun spaceAvailable(selection: StackSelection) =
         matchingStacks(selection).spaceLeft + stacks.empty * selection.stackSize
 
+    context(safeContext: SafeContext)
+    abstract fun isImmediatelyAccessible(): Boolean
+
     context(automated: Automated)
     fun transfer(selection: StackSelection, destination: MaterialContainer): TransferResult {
         val amount = materialAvailable(selection)