pass origin position to scanner to correctly check everything regardless of block position. This is important when the place sim scans hits on a block next to the origin placement. The scan mode must correctly min max the new shape instead of clamping the origin position. Works but needs improving

Author: beanbag44

src/main/kotlin/com/lambda/interaction/construction/processing/PreProcessingInfo.kt

@@ -25,14 +25,12 @@ interface PreProcessingInfo {
     val surfaceScan: SurfaceScan
     val ignore: Set<Property<*>>
     val sides: Set<Direction>
-    val shouldBeOmitted: Boolean
 
     companion object {
         val DEFAULT = object : PreProcessingInfo {
             override val surfaceScan = SurfaceScan.DEFAULT
             override val ignore = setOf<Property<*>>()
             override val sides = Direction.entries.toSet()
-            override val shouldBeOmitted = false
         }
     }
 }

src/main/kotlin/com/lambda/interaction/construction/processing/PreProcessingInfoAccumulator.kt

@@ -25,7 +25,6 @@ class PreProcessingInfoAccumulator(
     override var surfaceScan: SurfaceScan = SurfaceScan.DEFAULT,
     override val ignore: MutableSet<Property<*>> = ProcessorRegistry.postProcessedProperties.toMutableSet(),
     override val sides: MutableSet<Direction> = Direction.entries.toMutableSet(),
-    override var shouldBeOmitted: Boolean = false
 ) : PreProcessingInfo {
     @InfoAccumulator
     fun offerSurfaceScan(scan: SurfaceScan) {
@@ -49,11 +48,6 @@ class PreProcessingInfoAccumulator(
         this.sides.retainAll(sides.toSet())
     }
 
-    @InfoAccumulator
-    fun omitPlacement() {
-        shouldBeOmitted = true
-    }
-
     @InfoAccumulator
     fun complete() = this as PreProcessingInfo
 

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

@@ -142,23 +142,22 @@ object ProcessorRegistry : Loadable {
      * each pre-processor checking if the state can be accepted. If so, the state is passed through the pre-processor
      * which can call the functions within the [PreProcessingInfoAccumulator] DSL to modify the information.
      */
-    fun TargetState.getProcessingInfo(pos: BlockPos): PreProcessingInfo? =
-        if (this !is TargetState.State) PreProcessingInfo.DEFAULT
-        else {
-            val get: () -> PreProcessingInfo? = get@{
-                val infoAccumulator = PreProcessingInfoAccumulator()
+    fun TargetState.getProcessingInfo(pos: BlockPos): PreProcessingData? {
+        if (this !is TargetState.State) return PreProcessingData(PreProcessingInfo.DEFAULT, pos)
 
-                processors.forEach { processor ->
-                    if (!processor.acceptsState(blockState)) return@forEach
-                    processor.preProcess(blockState, pos, infoAccumulator)
-                    if (infoAccumulator.shouldBeOmitted)
-                        return@get null
-                }
+        val get: () -> PreProcessingInfo? = get@{
+            val infoAccumulator = PreProcessingInfoAccumulator()
 
-                infoAccumulator.complete()
+            processors.forEach { processor ->
+                if (!processor.acceptsState(blockState)) return@forEach
+                processor.preProcess(blockState, pos, infoAccumulator)
             }
-            processorCache.getOrPut(blockState, get)
+
+            infoAccumulator.complete()
         }
+        val preProcessingInfo = processorCache.getOrPut(blockState, get) ?: return null
+        return PreProcessingData(preProcessingInfo, pos)
+    }
 
     /**
      * Contains the starting initial block placement and any subsequent intermediary processes to transform the placement
@@ -196,3 +195,5 @@ object ProcessorRegistry : Loadable {
         val sides: Set<Direction> = Direction.entries.toSet()
     )
 }
+
+data class PreProcessingData(val info: PreProcessingInfo, val pos: BlockPos)

src/main/kotlin/com/lambda/interaction/construction/simulation/ISimInfo.kt

@@ -19,7 +19,7 @@ package com.lambda.interaction.construction.simulation
 
 import com.lambda.context.Automated
 import com.lambda.context.AutomatedSafeContext
-import com.lambda.interaction.construction.processing.PreProcessingInfo
+import com.lambda.interaction.construction.processing.PreProcessingData
 import com.lambda.interaction.construction.processing.ProcessorRegistry.getProcessingInfo
 import com.lambda.interaction.construction.processing.ProcessorRegistry.intermediaryBlockMap
 import com.lambda.interaction.construction.result.BuildResult
@@ -38,13 +38,13 @@ interface ISimInfo : Automated {
     val pos: BlockPos
     val state: BlockState
     val targetState: TargetState
-    val preProcessing: PreProcessingInfo
+    val preProcessing: PreProcessingData
     val pov: Vec3d
     val concurrentResults: MutableSet<BuildResult>
     val dependencyStack: Stack<Sim<*>>
 
     fun AutomatedSafeContext.matchesTarget(state: BlockState = [email protected], complete: Boolean = true): Boolean {
-        if (targetState.matches(state, pos, if (!complete) preProcessing.ignore else emptySet())) return true
+        if (targetState.matches(state, pos, if (!complete) preProcessing.info.ignore else emptySet())) return true
         else if (complete) return false
 
         intermediaryBlockMap[targetState.getState(pos).block]?.let { intermediaryInfo ->
@@ -102,7 +102,7 @@ data class SimInfo(
     override val pos: BlockPos,
     override val state: BlockState,
     override val targetState: TargetState,
-    override val preProcessing: PreProcessingInfo,
+    override val preProcessing: PreProcessingData,
     override val pov: Vec3d,
     override val dependencyStack: Stack<Sim<*>>,
     override val concurrentResults: MutableSet<BuildResult>,

src/main/kotlin/com/lambda/interaction/construction/simulation/Sim.kt

@@ -17,7 +17,7 @@
 
 package com.lambda.interaction.construction.simulation
 
-import com.lambda.interaction.construction.processing.PreProcessingInfo
+import com.lambda.interaction.construction.processing.PreProcessingData
 import com.lambda.interaction.construction.result.BuildResult
 import com.lambda.interaction.construction.result.results.GenericResult
 import com.lambda.interaction.request.rotating.Rotation.Companion.rotationTo
@@ -91,7 +91,7 @@ abstract class Sim<T : BuildResult> : Results<T> {
         voxelShape: VoxelShape,
         pos: BlockPos,
         sides: Set<Direction>,
-        preProcessing: PreProcessingInfo
+        preProcessing: PreProcessingData
     ): Set<CheckedHit>? {
         val boxes = voxelShape.boundingBoxes.map { it.offset(pos) }
 
@@ -108,7 +108,7 @@ abstract class Sim<T : BuildResult> : Results<T> {
                     else sides
 
                     if (!buildConfig.strictRayCast) {
-                        box.getClosestPoints(pov, sides, preProcessing.surfaceScan, placeConfig.airPlace.isEnabled) { vec, side ->
+                        box.getClosestPoints(pov, sides, preProcessing, placeConfig.airPlace.isEnabled) { vec, side ->
                             if (pov distSq vec > reachSq)
                                 misses.add(Pair(vec, side))
                             else {
@@ -120,7 +120,7 @@ abstract class Sim<T : BuildResult> : Results<T> {
                                 )
                             }
                         }
-                    } else box.scanSurfaces(sides, buildConfig.resolution, preProcessing.surfaceScan, false) { side, vec ->
+                    } else box.scanSurfaces(sides, buildConfig.resolution, preProcessing, false) { side, vec ->
                         if (pov distSq vec > reachSq) {
                             misses.add(Pair(vec, side))
                             return@scanSurfaces

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

@@ -90,7 +90,7 @@ class PlaceSim private constructor(simInfo: ISimInfo)
 
     private suspend fun AutomatedSafeContext.simPlacements() =
         supervisorScope {
-            preProcessing.sides.forEach { side ->
+            preProcessing.info.sides.forEach { side ->
                 val neighborPos = pos.offset(side)
                 val neighborSide = side.opposite
                 launch { testBlock(neighborPos, neighborSide, this@supervisorScope) }

src/main/kotlin/com/lambda/interaction/construction/verify/SurfaceScan.kt

@@ -21,7 +21,7 @@ import net.minecraft.util.math.Direction
 
 data class SurfaceScan(
     val mode: ScanMode,
-    val axis: Direction.Axis,
+    val axis: Direction.Axis
 ) {
     companion object {
         val DEFAULT = SurfaceScan(ScanMode.Full, Direction.Axis.Y)

src/main/kotlin/com/lambda/interaction/request/rotating/visibilty/RotationTargets.kt

@@ -19,7 +19,6 @@ package com.lambda.interaction.request.rotating.visibilty
 
 import com.lambda.context.Automated
 import com.lambda.context.SafeContext
-import com.lambda.interaction.construction.verify.SurfaceScan
 import com.lambda.interaction.request.rotating.Rotation
 import com.lambda.interaction.request.rotating.Rotation.Companion.dist
 import com.lambda.interaction.request.rotating.RotationManager
@@ -83,7 +82,7 @@ fun lookAtHit(hit: RequestedHit, rotation: SafeContext.() -> Rotation?) =
 @RotationDsl
 fun Automated.lookAtHit(hit: HitResult): RotationTarget? {
     return when (hit) {
-        is BlockHitResult -> lookAtBlock(hit.blockPos, setOf(hit.side), SurfaceScan.DEFAULT)
+        is BlockHitResult -> lookAtBlock(hit.blockPos, setOf(hit.side))
         is EntityHitResult -> lookAtEntity(hit.entity as? LivingEntity ?: return null)
         else -> null
     }
@@ -107,7 +106,7 @@ fun Automated.lookAtEntity(entity: LivingEntity): RotationTarget {
                 buildConfig.attackReach,
                 player.eyePos,
                 ALL_SIDES,
-                SurfaceScan.DEFAULT,
+                null,
                 false,
                 InteractionMask.Entity
             ) { requestedHit.verifyHit(hit) }?.rotation
@@ -127,7 +126,6 @@ fun Automated.lookAtEntity(entity: LivingEntity): RotationTarget {
 fun Automated.lookAtBlock(
     pos: BlockPos,
     sides: Set<Direction> = ALL_SIDES,
-    surfaceScan: SurfaceScan = SurfaceScan.DEFAULT
 ): RotationTarget {
     val requestedHit = blockHit(pos, sides, buildConfig.interactReach)
 
@@ -138,7 +136,7 @@ fun Automated.lookAtBlock(
                 buildConfig.interactReach,
                 player.eyePos,
                 sides,
-                surfaceScan,
+                null,
                 false,
                 InteractionMask.Block
             ) { requestedHit.verifyHit(hit) }?.rotation