small item stack utils edit to account for empty slots and remove Resolvable from CantReplace place result

Author: beanbag44

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

@@ -19,7 +19,6 @@ package com.lambda.interaction.construction.result.results
 
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
-import com.lambda.context.Automated
 import com.lambda.graphics.renderer.esp.ShapeBuilder
 import com.lambda.interaction.construction.context.PlaceContext
 import com.lambda.interaction.construction.result.BuildResult
@@ -28,8 +27,6 @@ import com.lambda.interaction.construction.result.Dependent
 import com.lambda.interaction.construction.result.Drawable
 import com.lambda.interaction.construction.result.Navigable
 import com.lambda.interaction.construction.result.Rank
-import com.lambda.interaction.construction.result.Resolvable
-import com.lambda.task.tasks.BuildTask.Companion.breakBlock
 import net.minecraft.block.BlockState
 import net.minecraft.entity.Entity
 import net.minecraft.item.ItemPlacementContext
@@ -142,11 +139,8 @@ sealed class PlaceResult : BuildResult() {
     data class CantReplace(
         override val pos: BlockPos,
         val simulated: ItemPlacementContext,
-    ) : Resolvable, PlaceResult() {
+    ) : PlaceResult() {
         override val rank = Rank.PlaceCantReplace
-
-        context(automated: Automated)
-        override fun resolve() = automated.breakBlock(pos)
     }
 
     /**

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

@@ -148,6 +148,7 @@ class BreakSim private constructor(simInfo: ISimInfo)
     }
 
     private fun AutomatedSafeContext.getSwapStack(): Pair<ItemStack, StackSelection>? {
+        // Stack size 0 to account for attacking with an empty hand. Empty slots have stack size 0
         val stackSelection = selectStack(
             count = 0,
             sorter = compareByDescending<ItemStack> {
@@ -186,18 +187,18 @@ class BreakSim private constructor(simInfo: ISimInfo)
             ofAnyType(MaterialContainer.Rank.Hotbar)
         }
 
-        val swapCandidates = stackSelection
+        val hotbarCandidates = stackSelection
             .containerWithMaterial(silentSwapSelection)
             .map { it.matchingStacks(stackSelection) }
             .flatten()
-        if (swapCandidates.isEmpty()) {
+        if (hotbarCandidates.isEmpty()) {
             result(GenericResult.WrongItemSelection(pos, stackSelection, player.mainHandStack))
             return null
         }
 
         var bestStack = ItemStack.EMPTY
         var bestBreakDelta = -1f
-        swapCandidates.forEach { stack ->
+        hotbarCandidates.forEach { stack ->
             val breakDelta = state.calcItemBlockBreakingDelta(pos, stack)
             if (breakDelta > bestBreakDelta ||
                 (stack == player.mainHandStack && breakDelta >= bestBreakDelta)

src/main/kotlin/com/lambda/util/item/ItemStackUtils.kt

@@ -76,7 +76,7 @@ object ItemStackUtils {
     val ItemStack.hasSpace get() = spaceLeft > 0
     val List<ItemStack>.spaceLeft get() = sumOf { it.spaceLeft }
     val List<ItemStack>.empty: Int get() = count { it.isEmpty }
-    val List<ItemStack>.count: Int get() = sumOf { it.count }
+    val List<ItemStack>.count: Int get() = if (isEmpty()) -1 else sumOf { it.count }
     val List<ItemStack>.copy: List<ItemStack> get() = map { it.copy() }
 
     context(safeContext: SafeContext)