move stack selection checks to after simulation and improve processing

Author: beanbag44

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

@@ -130,19 +130,15 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
         buildConfig.pointSelection.select(validHits)?.let { checkedHit ->
             val hitResult = checkedHit.hit.blockResult ?: return
 
-	        val swapStack = getSwapStack(item)
-
 	        if (!placing) {
-		        if (swapStack == null) return
-
 		        val interactContext = InteractContext(
 			        hitResult,
 			        rotationRequest { rotation(checkedHit.rotation) },
-			        swapStack.inventoryIndex,
+			        getSwapStack(item, supervisorScope)?.inventoryIndex ?: return,
 			        pos,
 			        state,
 			        expectedState,
-			        false,
+			        preProcessing.info,
 			        fakePlayer.isSneaking,
 			        true,
 			        this@InteractSim
@@ -188,21 +184,14 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
                 lookInDirection(PlaceDirection.fromRotation(rotatePlaceTest.rotation))
             else rotatePlaceTest.rotation
 
-	        if (swapStack == null) return
-            if (!swapStack.item.isEnabled(world.enabledFeatures)) {
-                result(InteractResult.BlockFeatureDisabled(pos, swapStack))
-                supervisorScope.cancel()
-                return
-            }
-
             val interactContext = InteractContext(
                 hitResult,
                 rotationRequest { rotation(rotationRequest) },
-                swapStack.inventoryIndex,
+	            getSwapStack(item, supervisorScope)?.inventoryIndex ?: return,
                 pos,
                 state,
                 rotatePlaceTest.resultState,
-	            true,
+	            preProcessing.info,
                 fakePlayer.isSneaking,
                 rotatePlaceTest.currentDirIsValid,
                 this@InteractSim
@@ -214,7 +203,12 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
         return
     }
 
-	private fun AutomatedSafeContext.getSwapStack(item: Item?): ItemStack? {
+	private fun AutomatedSafeContext.getSwapStack(item: Item?, supervisorScope: CoroutineScope): ItemStack? {
+		if (item?.isEnabled(world.enabledFeatures) == false) {
+			result(InteractResult.BlockFeatureDisabled(pos, item))
+			supervisorScope.cancel()
+			return null
+		}
 		val stackSelection = item?.select()
 			?: StackSelection.selectStack(0, sorter = compareByDescending { it.inventoryIndex == player.inventory.selectedSlot })
 		val containerSelection = selectContainer { ofAnyType(MaterialContainer.Rank.Hotbar) }
@@ -309,9 +303,8 @@ class InteractSim private constructor(simInfo: InteractSimInfo)
                             (pos.y - (hitbox.maxY - hitbox.minY)).floorToInt(),
                             pos.y
                         )
-                    }
-                        .flatten()
-                        .forEach { support ->
+                    }.flatten()
+						.forEach { support ->
                             sim(support, blockState(support), TargetState.Empty)
                         }
                 }

src/main/kotlin/com/lambda/interaction/construction/simulation/context/InteractContext.kt

@@ -19,6 +19,7 @@ package com.lambda.interaction.construction.simulation.context
 
 import com.lambda.context.Automated
 import com.lambda.graphics.mc.TransientRegionESP
+import com.lambda.interaction.construction.simulation.processing.PreProcessingInfo
 import com.lambda.interaction.managers.hotbar.HotbarRequest
 import com.lambda.interaction.managers.interacting.InteractRequest
 import com.lambda.interaction.managers.rotating.RotationRequest
@@ -35,7 +36,7 @@ data class InteractContext(
     override val blockPos: BlockPos,
     override var cachedState: BlockState,
     override val expectedState: BlockState,
-    val placing: Boolean,
+    val preProcessingInfo: PreProcessingInfo,
     val sneak: Boolean,
     val currentDirIsValid: Boolean = false,
     private val automated: Automated

src/main/kotlin/com/lambda/interaction/construction/simulation/processing/ProcessorRegistry.kt

@@ -22,6 +22,7 @@ import com.lambda.context.SafeContext
 import com.lambda.core.Loadable
 import com.lambda.interaction.construction.simulation.SimDsl
 import com.lambda.interaction.construction.verify.TargetState
+import com.lambda.util.BlockUtils.matches
 import com.lambda.util.reflections.getInstances
 import net.minecraft.block.BlockState
 import net.minecraft.item.ItemStack
@@ -162,12 +163,12 @@ object ProcessorRegistry : Loadable {
 							with(processor) { preProcess(state, expectedState) }
 					}
 				} else {
-					val postProcessable = propertyPostProcessors.any { processor ->
-						processor.acceptsState(state, expectedState).also {
+					propertyPostProcessors.forEach { processor ->
+						if (processor.acceptsState(state, expectedState)) {
 							with(processor) { preProcess(state, expectedState) }
 						}
 					}
-					if (!postProcessable) return@run null
+					if (!state.matches(targetState, ignore)) return@run null
 				}
 			}
 			complete()

…ent/post/StandardInteractPreProcessor.kt …nt/post/StandardInteractPostProcessor.ktsrc/main/kotlin/com/lambda/interaction/construction/simulation/processing/preprocessors/property/placement/post/StandardInteractPreProcessor.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/processing/preprocessors/property/placement/post/StandardInteractPostProcessor.kt src/main/kotlin/com/lambda/interaction/construction/simulation/processing/preprocessors/property/placement/post/StandardInteractPreProcessor.kt renamed to src/main/kotlin/com/lambda/interaction/construction/simulation/processing/preprocessors/property/placement/post/StandardInteractPostProcessor.kt

@@ -22,7 +22,9 @@ import com.lambda.interaction.construction.simulation.processing.ProcessorRegist
 import com.lambda.interaction.construction.simulation.processing.PropertyPostProcessor
 import net.minecraft.block.BlockState
 
-object StandardInteractPreProcessor : PropertyPostProcessor {
+// Collected using reflections and then accessed from a collection in ProcessorRegistry
+@Suppress("unused")
+object StandardInteractPostProcessor : PropertyPostProcessor {
 	override fun acceptsState(state: BlockState, targetState: BlockState) =
 		standardInteractProperties.any {
 			it in targetState && state.get(it) != targetState.get(it)

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

@@ -19,7 +19,6 @@ package com.lambda.interaction.construction.simulation.result.results
 
 import baritone.api.pathing.goals.GoalBlock
 import baritone.api.pathing.goals.GoalInverted
-import com.lambda.graphics.esp.ShapeScope
 import com.lambda.graphics.mc.TransientRegionESP
 import com.lambda.interaction.construction.simulation.context.InteractContext
 import com.lambda.interaction.construction.simulation.result.BuildResult
@@ -30,8 +29,8 @@ import com.lambda.interaction.construction.simulation.result.Navigable
 import com.lambda.interaction.construction.simulation.result.Rank
 import net.minecraft.block.BlockState
 import net.minecraft.entity.Entity
+import net.minecraft.item.Item
 import net.minecraft.item.ItemPlacementContext
-import net.minecraft.item.ItemStack
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
@@ -168,7 +167,7 @@ sealed class InteractResult : BuildResult() {
      */
     data class BlockFeatureDisabled(
         override val pos: BlockPos,
-        val itemStack: ItemStack,
+        val item: Item,
     ) : InteractResult() {
         override val rank = Rank.PlaceBlockFeatureDisabled
     }

src/main/kotlin/com/lambda/interaction/managers/interacting/InteractManager.kt

@@ -148,7 +148,7 @@ object InteractManager : Manager<InteractRequest>(
             if (!validSneak(player)) return
             if (tickStage !in interactConfig.tickStageMask) return
 
-            val actionResult = if (ctx.placing) placeBlock(ctx, request, Hand.MAIN_HAND)
+            val actionResult = if (ctx.preProcessingInfo.placing) placeBlock(ctx, request, Hand.MAIN_HAND)
 	        else interaction.interactBlock(player, Hand.MAIN_HAND, ctx.hitResult)
             if (actionResult.isAccepted && interactConfig.swing) {
                 swingHand(interactConfig.swingType, Hand.MAIN_HAND)

src/main/kotlin/com/lambda/interaction/managers/interacting/InteractedBlockHandler.kt

@@ -21,7 +21,6 @@ import com.lambda.config.AutomationConfig.Companion.DEFAULT
 import com.lambda.config.AutomationConfig.Companion.DEFAULT.managerDebugLogs
 import com.lambda.event.events.WorldEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
-import com.lambda.interaction.construction.simulation.processing.ProcessorRegistry
 import com.lambda.interaction.managers.PostActionHandler
 import com.lambda.interaction.managers.interacting.InteractManager.placeSound
 import com.lambda.threading.runSafe
@@ -49,11 +48,7 @@ object InteractedBlockHandler : PostActionHandler<InteractInfo>() {
                 .firstOrNull { it.context.blockPos == event.pos }
                 ?.let { pending ->
                     if (!pending.context.expectedState.matches(event.newState)) {
-                        if (pending.context.cachedState.matches(
-                                event.newState,
-                                ProcessorRegistry.postProcessedProperties
-                            )
-                        ) {
+                        if (pending.context.cachedState.matches(event.newState, pending.context.preProcessingInfo.ignore)) {
                             pending.context.cachedState = event.newState
                             return@listen
                         }