previous rotation direction checks in build sim

Author: beanbag44

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

@@ -30,7 +30,6 @@ import com.lambda.util.BlockUtils.blockState
 import net.minecraft.block.BlockState
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
-import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
 import java.awt.Color
 
@@ -46,7 +45,7 @@ data class PlaceContext(
     override val targetState: TargetState,
     val sneak: Boolean,
     val insideBlock: Boolean,
-    val primeDirection: Direction?
+    val previousDirWasInvalid: Boolean = false
 ) : BuildContext {
     private val baseColor = Color(35, 188, 254, 25)
     private val sideColor = Color(35, 188, 254, 100)
@@ -79,7 +78,9 @@ data class PlaceContext(
 
     fun requestDependencies(request: PlaceRequest): Boolean {
         val hotbarRequest = request.hotbar.request(HotbarRequest(hotbarIndex, request.hotbar))
-        val validRotation = if (request.build.placing.rotate) request.rotation.request(rotation).done else true
+        val validRotation = if (request.build.placing.rotate) {
+            request.rotation.request(rotation).done && !previousDirWasInvalid
+        } else true
         return hotbarRequest.done && validRotation
     }
 }

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

@@ -69,15 +69,13 @@ import net.minecraft.item.BlockItem
 import net.minecraft.item.ItemPlacementContext
 import net.minecraft.item.ItemUsageContext
 import net.minecraft.registry.RegistryKeys
-import net.minecraft.state.property.Properties
 import net.minecraft.util.Hand
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.Vec3d
 import net.minecraft.util.shape.VoxelShapes
-import kotlin.jvm.optionals.getOrNull
 import kotlin.math.pow
 
 object BuildSimulator {
@@ -243,7 +241,7 @@ object BuildSimulator {
                 // ToDo: For each hand and sneak or not?
                 val fakePlayer = copyPlayer(player).apply {
                     setPos(eye.x, eye.y - standingEyeHeight, eye.z)
-                    if (place.rotateForPlace) this.rotation = checkedHit.targetRotation
+                    this.rotation = RotationManager.serverRotation
                 }
 
                 val checkedResult = checkedHit.hit
@@ -311,11 +309,26 @@ object BuildSimulator {
                     }
                 }
 
-                simulatePlaceState()?.let simulatePlaceState@ { basePlaceResult ->
-                    if (!place.axisRotate) {
+                var currentDirIsInvalid = false
+                simulatePlaceState()?.let { basePlaceResult ->
+                    if (!place.rotate) {
                         acc.add(basePlaceResult)
                         return@forEach
                     }
+
+                    currentDirIsInvalid = true
+                }
+
+                if (place.rotateForPlace && !place.axisRotate) {
+                    fakePlayer.rotation = checkedHit.targetRotation
+                    simulatePlaceState()?.let { rotatedPlaceResult ->
+                        acc.add(rotatedPlaceResult)
+                        return@forEach
+                    }
+                    rot = checkedHit.targetRotation
+                }
+
+                if (place.axisRotate) run axisRotations@ {
                     placementRotations.forEachIndexed direction@ { index, angle ->
                         fakePlayer.rotation = angle
 
@@ -332,8 +345,8 @@ object BuildSimulator {
                             }
 
                             else -> {
-                                rot = fakePlayer.rotation
-                                return@simulatePlaceState
+                                rot = angle
+                                return@axisRotations
                             }
                         }
                     }
@@ -343,9 +356,6 @@ object BuildSimulator {
                 val hitBlock = blockState(blockHit.blockPos).block
                 val shouldSneak = hitBlock::class in BlockUtils.interactionBlocks
 
-                val primeDirection =
-                    (target as? TargetState.State)?.blockState?.getOrEmpty(Properties.HORIZONTAL_FACING)?.getOrNull()
-
                 val placeContext = PlaceContext(
                     eye,
                     blockHit,
@@ -358,7 +368,7 @@ object BuildSimulator {
                     target,
                     shouldSneak,
                     false,
-                    primeDirection
+                    currentDirIsInvalid
                 )
 
                 val currentHandStack = player.getStackInHand(Hand.MAIN_HAND)