allow use of the rest of the hotbar for placing

Author: beanbag44

common/src/main/kotlin/com/lambda/interaction/construction/context/PlaceContext.kt

@@ -35,7 +35,7 @@ import java.awt.Color
 data class PlaceContext(
     override val result: BlockHitResult,
     override val rotation: RotationRequest,
-    override val hotbarIndex: Int,
+    override var hotbarIndex: Int,
     override val blockPos: BlockPos,
     override val cachedState: BlockState,
     override val expectedState: BlockState,

common/src/main/kotlin/com/lambda/interaction/construction/simulation/BuildSimulator.kt

@@ -62,7 +62,6 @@ import com.lambda.util.BlockUtils.isEmpty
 import com.lambda.util.BlockUtils.isNotEmpty
 import com.lambda.util.BlockUtils.vecOf
 import com.lambda.util.Communication.warn
-import com.lambda.util.item.ItemStackUtils.equal
 import com.lambda.util.math.distSq
 import com.lambda.util.player.SlotUtils.hotbar
 import com.lambda.util.player.copyPlayer
@@ -545,17 +544,19 @@ object BuildSimulator {
                     currentDirIsValid
                 )
 
-                val currentHandStack = player.getStackInHand(Hand.MAIN_HAND)
-                if (targetState is TargetState.Stack && !targetState.itemStack.equal(currentHandStack)) {
-                    acc.add(BuildResult.WrongStack(pos, placeContext, targetState.itemStack, inventory))
-                    return@forEach
+                val selection = optimalStack.item.select()
+                val hotbarSelection = selectContainer { ofAnyType(MaterialContainer.Rank.HOTBAR) }
+                val containerStacks = selection.containerWithMaterial(inventory, hotbarSelection).firstOrNull()?.stacks ?: run {
+                    acc.add(BuildResult.WrongItemSelection(pos, placeContext, optimalStack.item.select(), player.mainHandStack, inventory))
+                    return acc
                 }
-
-                if (optimalStack.item != currentHandStack.item) {
-                    acc.add(BuildResult.WrongItemSelection(pos, placeContext, optimalStack.item.select(), currentHandStack, inventory))
-                    return@forEach
+                val stack = selection.filterStacks(containerStacks).run {
+                    firstOrNull { player.inventory.getSlotWithStack(it) == player.inventory.selectedSlot }
+                        ?: first()
                 }
 
+                placeContext.hotbarIndex = player.inventory.getSlotWithStack(stack)
+
                 acc.add(PlaceResult.Place(pos, placeContext))
             }
         }
@@ -716,7 +717,7 @@ object BuildSimulator {
         )
 
         val silentSwapSelection = selectContainer {
-            matches(stackSelection) and ofAnyType(MaterialContainer.Rank.HOTBAR)
+            ofAnyType(MaterialContainer.Rank.HOTBAR)
         }
 
         val swapCandidates = stackSelection.containerWithMaterial(inventory, silentSwapSelection)