creative stack handling

Author: beanbag44

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

@@ -101,7 +101,7 @@ sealed class BreakResult : BuildResult() {
         override fun resolve() {
             selectStack {
                 isItem(badItem).not()
-            }.transferByTask(HotbarContainer)
+            }.transferByTask(HotbarContainer)?.execute(task)
         }
 
         override fun compareResult(other: ComparableResult<Rank>) =

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

@@ -98,9 +98,7 @@ object ContainerManager : Loadable {
     context(automatedSafeContext: AutomatedSafeContext)
     fun StackSelection.transferByTask(destination: MaterialContainer) =
         with(automatedSafeContext) {
-            findContainerWithMaterial(
-                inventoryConfig.containerSelection
-            )?.transferByTask(this@transferByTask, destination)
+            findContainerWithMaterial()?.transferByTask(this@transferByTask, destination)
         }
 
     context(_: SafeContext)
@@ -122,8 +120,8 @@ object ContainerManager : Loadable {
         containerSelection: ContainerSelection = automated.inventoryConfig.containerSelection,
     ): List<MaterialContainer> =
         containers()
-            .filter { it.materialAvailable(this) >= count }
             .filter { containerSelection.matches(it) }
+            .filter { it.materialAvailable(this) >= count }
             .sortedWith(automated.inventoryConfig.providerPriority.materialComparator(this))
 
     context(automatedSafeContext: AutomatedSafeContext)

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

@@ -39,6 +39,7 @@ import com.lambda.util.text.buildText
 import com.lambda.util.text.highlighted
 import com.lambda.util.text.literal
 import com.lambda.util.text.text
+import net.minecraft.component.DataComponentTypes
 import net.minecraft.item.ItemStack
 import net.minecraft.screen.slot.Slot
 import net.minecraft.text.Text
@@ -58,6 +59,12 @@ abstract class MaterialContainer(
         it.stack.isEmpty
     }.thenByDescending {
         it.stack.item in automated.inventoryConfig.disposables
+    }.thenByDescending {
+        it.stack.item.components.contains(DataComponentTypes.TOOL)
+    }.thenByDescending {
+        it.stack.item.components.contains(DataComponentTypes.FOOD)
+    }.thenByDescending {
+        it.stack.isStackable
     }
 
     @TextDsl
@@ -122,10 +129,11 @@ abstract class MaterialContainer(
     context(automatedSafeContext: AutomatedSafeContext)
     fun transfer(stackSelection: StackSelection, destination: MaterialContainer): Boolean =
         with(automatedSafeContext) {
-            val fromSlot = stackSelection.filterSlots(slots).firstOrNull() ?: return false
+            val fromSlot = getSlot(stackSelection) ?: return false
             val toSlot = destination.getReplaceSlot() ?: return false
             return inventoryRequest {
-                transfer(fromSlot, toSlot)
+                if (swapMethodPriority > destination.swapMethodPriority) transfer(fromSlot, toSlot)
+                else with(destination) { transfer(toSlot, fromSlot) }
             }.submit().done
         }
 
@@ -157,6 +165,10 @@ abstract class MaterialContainer(
     context(_: AutomatedSafeContext)
     open fun getReplaceSlot() = slots.sortedWith(replaceSorter).firstOrNull()
 
+    context(_: SafeContext)
+    open fun getSlot(stackSelection: StackSelection): Slot? =
+        stackSelection.filterSlots(slots).firstOrNull()
+
     enum class Rank {
         MainHand,
         OffHand,

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

@@ -24,6 +24,8 @@ 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.entity.player.PlayerEntity
+import net.minecraft.inventory.SingleStackInventory
 import net.minecraft.item.ItemStack
 import net.minecraft.screen.slot.Slot
 
@@ -37,14 +39,29 @@ data object CreativeContainer : MaterialContainer(Rank.Creative) {
 
     override val description = buildText { literal("Creative") }
 
-    context(_: SafeContext)
-    override fun InventoryRequest.InvRequestBuilder.transfer(from: Slot, toHere: Slot) {
-        clickCreativeStack(toHere.stack, from.id)
+    context(safeContext : SafeContext)
+    override fun InventoryRequest.InvRequestBuilder.transfer(fromHere: Slot, toSlot: Slot) {
+        clickCreativeStack(fromHere.stack, toSlot.id)
+        safeContext.player.currentScreenHandler.slots[toSlot.id].stack = fromHere.stack
     }
 
-    context(_: SafeContext)
+    context(safeContext: SafeContext)
+    override fun getSlot(stackSelection: StackSelection) =
+        stackSelection.optimalStack?.let { stack ->
+            Slot(
+                object : SingleStackInventory {
+                    override fun getStack() = stack
+                    override fun setStack(stack: ItemStack?) {}
+                    override fun markDirty() {}
+                    override fun canPlayerUse(player: PlayerEntity?) = false
+                },
+                0, 0, 0
+            )
+        }
+
+    context(safeContext: SafeContext)
     override fun materialAvailable(selection: StackSelection): Int =
-        if (mc.player?.isCreative == true && selection.optimalStack != null) Int.MAX_VALUE else 0
+        if (safeContext.player.isCreative && selection.optimalStack != null) Int.MAX_VALUE else 0
 
     context(_: SafeContext)
     override fun spaceAvailable(selection: StackSelection): Int =

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

@@ -40,7 +40,7 @@ object HotbarContainer : MaterialContainer(Rank.Hotbar) {
     override val description = buildText { literal("Hotbar") }
 
     context(safeContext: SafeContext)
-    override fun InventoryRequest.InvRequestBuilder.transfer(from: Slot, toHere: Slot) {
-        swap(from.id, safeContext.player.hotbarSlots.indexOf(toHere))
+    override fun InventoryRequest.InvRequestBuilder.transfer(fromHere: Slot, toSlot: Slot) {
+        swap(toSlot.id, safeContext.player.hotbarSlots.indexOf(toSlot))
     }
 }

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

@@ -40,7 +40,7 @@ object MainHandContainer : MaterialContainer(Rank.MainHand) {
     override val description = buildText { literal("MainHand") }
 
     context(safeContext: SafeContext)
-    override fun InventoryRequest.InvRequestBuilder.transfer(from: Slot, toHere: Slot) {
-        swap(from.id, safeContext.player.inventory.selectedSlot)
+    override fun InventoryRequest.InvRequestBuilder.transfer(fromHere: Slot, toSlot: Slot) {
+        swap(toSlot.id, safeContext.player.inventory.selectedSlot)
     }
 }

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

@@ -40,7 +40,7 @@ object OffHandContainer : MaterialContainer(Rank.OffHand) {
     override val description = buildText { literal("OffHand") }
 
     context(_: SafeContext)
-    override fun InventoryRequest.InvRequestBuilder.transfer(from: Slot, toHere: Slot) {
-        swap(from.id, 40)
+    override fun InventoryRequest.InvRequestBuilder.transfer(fromHere: Slot, toSlot: Slot) {
+        swap(toSlot.id, 40)
     }
 }

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

@@ -59,10 +59,12 @@ class ContainerTransferTask(
 					return@listen
 				}
 
-				stackSelection.filterSlots(slots).firstOrNull()?.let { fromSlot ->
+				fromContainer.getSlot(stackSelection)?.let { fromSlot ->
 					destination.getReplaceSlot()?.let { toSlot ->
 						inventoryRequest {
-							with(fromContainer) { transfer(fromSlot, toSlot) }
+							if (fromContainer.swapMethodPriority > destination.swapMethodPriority)
+								with(fromContainer) { transfer(fromSlot, toSlot) }
+							else with(destination) { transfer(toSlot, toSlot) }
 							onComplete { success() }
 						}.submit()
 						return@listen