fix rotations being reset causing incorrect placements

Author: beanbag44

common/src/main/kotlin/com/lambda/config/groups/TickStage.kt

@@ -21,5 +21,5 @@ enum class TickStage {
     TickStart,
     PostHotbar,
     PostInteract,
-    PostMovement,
+    PlayerTickPost
 }

common/src/main/kotlin/com/lambda/interaction/PlayerPacketManager.kt

@@ -134,6 +134,15 @@ object PlayerPacketManager {
             }
         }
 
+        // Update the server rotation in RotationManager
+        with (RotationManager) {
+            prevServerRotation = serverRotation
+            serverRotation = new.rotation/*.fixSensitivity(prevServerRotation)*/
+            activeRequest?.let { request ->
+                request.matchesServerRot = request.done
+            }
+        }
+
         PlayerPacketEvent.Post().post()
     }
 

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

@@ -45,7 +45,7 @@ data class PlaceContext(
     override val targetState: TargetState,
     val sneak: Boolean,
     val insideBlock: Boolean,
-    val previousDirWasInvalid: Boolean = false
+    val currentDirIsInvalid: Boolean = false
 ) : BuildContext {
     private val baseColor = Color(35, 188, 254, 25)
     private val sideColor = Color(35, 188, 254, 100)
@@ -79,9 +79,7 @@ data class PlaceContext(
     fun requestDependencies(request: PlaceRequest): Boolean {
         val hotbarRequest = request.hotbar.request(HotbarRequest(hotbarIndex, request.hotbar))
         val validRotation = if (request.build.placing.rotate) {
-            //ToDo: add a rotation compare to the !previousDirWasInvalid check in case the player
-            // was able to perform actions after updating the server rotation in the same tick
-            request.rotation.request(rotation, false).done && !previousDirWasInvalid
+            request.rotation.request(rotation, false).done && (!currentDirIsInvalid || rotation.matchesServerRot)
         } else true
         return hotbarRequest.done && validRotation
     }

common/src/main/kotlin/com/lambda/interaction/request/RequestHandler.kt

@@ -20,7 +20,6 @@ package com.lambda.interaction.request
 import com.lambda.config.groups.TickStage
 import com.lambda.context.SafeContext
 import com.lambda.event.Event
-import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.threading.runSafe
@@ -61,7 +60,7 @@ abstract class RequestHandler<R : Request>(
                 TickStage.TickStart -> openRequestsFor<TickEvent.Pre>(TickStage.TickStart)
                 TickStage.PostHotbar -> { /*ToDo*/ }
                 TickStage.PostInteract -> { /*ToDo*/ }
-                TickStage.PostMovement -> openRequestsFor<MovementEvent.Player.Post>(TickStage.PostMovement)
+                TickStage.PlayerTickPost -> openRequestsFor<TickEvent.Player.Post>(TickStage.PlayerTickPost)
             }
         }
 

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationManager.kt

@@ -24,7 +24,6 @@ import com.lambda.core.Loadable
 import com.lambda.event.Event
 import com.lambda.event.EventFlow.post
 import com.lambda.event.events.ConnectionEvent
-import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.RotationEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.events.UpdateManagerEvent
@@ -35,15 +34,13 @@ import com.lambda.interaction.request.RequestHandler
 import com.lambda.interaction.request.rotation.Rotation.Companion.slerp
 import com.lambda.interaction.request.rotation.visibilty.lookAt
 import com.lambda.module.modules.client.Baritone
-import com.lambda.threading.runGameScheduled
 import com.lambda.threading.runSafe
 import com.lambda.util.extension.partialTicks
 import com.lambda.util.extension.rotation
 import com.lambda.util.math.MathUtils.toRadian
 import com.lambda.util.math.Vec2d
 import com.lambda.util.math.lerp
 import net.minecraft.client.input.Input
-import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
 import kotlin.math.cos
 import kotlin.math.round
 import kotlin.math.sign
@@ -54,12 +51,12 @@ object RotationManager : RequestHandler<RotationRequest>(
     TickStage.PostHotbar,
     TickStage.PostInteract,
 ), Loadable {
-    var activeRotation = Rotation.ZERO; private set
-    var serverRotation = Rotation.ZERO; private set
-    private var prevServerRotation = Rotation.ZERO
+    var activeRotation = Rotation.ZERO
+    var serverRotation = Rotation.ZERO
+    var prevServerRotation = Rotation.ZERO
 
+    var activeRequest: RotationRequest? = null
     private var changedThisTick = false
-    private var activeRequest: RotationRequest? = null
 
     override fun load() = "Loaded Rotation Manager"
 
@@ -79,15 +76,6 @@ object RotationManager : RequestHandler<RotationRequest>(
             changedThisTick = false
         }
 
-        listen<PacketEvent.Receive.Post> { event ->
-            val packet = event.packet
-            if (packet !is PlayerPositionLookS2CPacket) return@listen
-
-            runGameScheduled {
-                reset(Rotation(packet.yaw, packet.pitch))
-            }
-        }
-
         listenUnsafe<ConnectionEvent.Connect.Pre> {
             reset(Rotation.ZERO)
         }
@@ -111,10 +99,6 @@ object RotationManager : RequestHandler<RotationRequest>(
             updateActiveRotation()
         }
 
-        // Update the current rotation
-        prevServerRotation = serverRotation
-        serverRotation = activeRotation/*.fixSensitivity(prevServerRotation)*/
-
         // Handle LOCK mode
         if (activeRequest?.mode == RotationMode.Lock) {
             player.yaw = serverRotation.yawF

common/src/main/kotlin/com/lambda/interaction/request/rotation/RotationRequest.kt

@@ -33,6 +33,7 @@ data class RotationRequest(
     val speedMultiplier: Double = 1.0
 ) : Request(prio, rot) {
     var age = 0
+    var matchesServerRot = false
 
     constructor(
         target: RotationTarget,