test players rotation before simulating axis rotations

Author: beanbag44

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

@@ -78,11 +78,11 @@ data class PlaceContext(
         withState(blockState(result.blockPos), result.blockPos, sideColor, result.side)
     }
 
-    override fun shouldRotate(config: BuildConfig) = config.placing.rotate
+    override fun shouldRotate(config: BuildConfig) = config.placing.rotateForPlace
 
     fun requestDependencies(request: PlaceRequest): Boolean {
         val hotbarRequest = request.hotbar.request(HotbarRequest(hotbarIndex, request.hotbar), false)
-        val validRotation = if (request.build.placing.rotate) {
+        val validRotation = if (request.build.placing.rotateForPlace) {
             request.rotation.request(rotation, false).done && !currentDirIsInvalid
         } else true
         return hotbarRequest.done && validRotation

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

@@ -295,7 +295,7 @@ object BuildSimulator {
                 }
 
                 lateinit var resultState: BlockState
-                var rot = RotationManager.serverRotation
+                var rot = fakePlayer.rotation
 
                 val simulatePlaceState = placeState@ {
                     resultState = blockItem.getPlacementState(context)
@@ -311,7 +311,7 @@ object BuildSimulator {
                 }
 
                 val currentDirIsInvalid = simulatePlaceState()?.let { basePlaceResult ->
-                    if (!place.rotate) {
+                    if (!place.rotateForPlace) {
                         acc.add(basePlaceResult)
                         return@forEach
                     }
@@ -329,6 +329,12 @@ object BuildSimulator {
                         return@rotate
                     }
 
+                    fakePlayer.rotation = player.rotation
+                    simulatePlaceState() ?: run {
+                        rot = fakePlayer.rotation
+                        return@rotate
+                    }
+
                     if (currentDirIsInvalid) {
                         PlaceDirection.entries.asReversed().forEachIndexed direction@ { index, direction ->
                             fakePlayer.rotation = direction.rotation

common/src/main/kotlin/com/lambda/interaction/request/placing/PlaceConfig.kt

@@ -18,7 +18,6 @@
 package com.lambda.interaction.request.placing
 
 import com.lambda.config.groups.BuildConfig
-import com.lambda.config.groups.TickStage
 import com.lambda.event.Event
 import com.lambda.interaction.request.Priority
 import com.lambda.interaction.request.RequestConfig
@@ -27,12 +26,10 @@ abstract class PlaceConfig(
     priority: Priority
 ) : RequestConfig<PlaceRequest>(priority) {
     abstract val rotateForPlace: Boolean
-    val rotate
-        get() = rotateForPlace || axisRotate
     abstract val airPlace: AirPlaceMode
     protected abstract val axisRotateSetting: Boolean
     val axisRotate
-        get() = airPlace.isEnabled() && axisRotateSetting
+        get() = rotateForPlace && airPlace.isEnabled() && axisRotateSetting
     abstract val placeStageMask: Set<Event>
     abstract val placeConfirmationMode: PlaceConfirmationMode
     abstract val maxPendingPlacements: Int

common/src/main/kotlin/com/lambda/task/tasks/BuildTask.kt

@@ -100,7 +100,6 @@ class BuildTask @Ta5kBuilder constructor(
             TaskFlowModule.drawables = results
                 .filterIsInstance<Drawable>()
                 .plus(pendingInteractions.toList())
-                .toMutableList()
 
             val resultsNotBlocked = results
                 .filter { result -> pendingInteractions.none { it.expectedPos == result.blockPos } }
@@ -143,10 +142,9 @@ class BuildTask @Ta5kBuilder constructor(
                             val requestContexts = arrayListOf<BreakContext>()
 
                             if (build.breaking.breaksPerTick > 1) {
-                                val take = emptyPendingInteractionSlots.coerceAtLeast(0)
                                 breakResults
                                     .filter { it.context.instantBreak }
-                                    .take(take)
+                                    .take(emptyPendingInteractionSlots)
                                     .let { instantBreakResults ->
                                         requestContexts.addAll(instantBreakResults.map { it.context })
                                     }