Fixed movement vector

Author: emyfops

src/main/kotlin/com/lambda/interaction/request/rotating/RotationManager.kt

@@ -61,14 +61,6 @@ object RotationManager : RequestHandler<RotationRequest>(
     var activeRequest: RotationRequest? = null
     private var changedThisTick = false
 
-    fun Any.onRotate(
-        alwaysListen: Boolean = false,
-        priority: Int = 0,
-        block: SafeContext.() -> Unit
-    ) = this.listen<UpdateManagerEvent.Rotation>(priority, alwaysListen) {
-        block()
-    }
-
     override fun load(): String {
         super.load()
 

src/main/kotlin/com/lambda/module/modules/movement/Speed.kt

@@ -20,10 +20,10 @@ package com.lambda.module.modules.movement
 import com.lambda.context.SafeContext
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.MovementEvent
+import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.request.rotating.Rotation
 import com.lambda.interaction.request.rotating.RotationConfig
-import com.lambda.interaction.request.rotating.RotationManager.onRotate
 import com.lambda.interaction.request.rotating.RotationMode
 import com.lambda.interaction.request.rotating.visibilty.lookAt
 import com.lambda.module.Module
@@ -130,14 +130,14 @@ object Speed : Module(
             }
         }
 
-        onRotate {
-            if (mode != Mode.GRIM_STRAFE) return@onRotate
-            if (!shouldWork()) return@onRotate
+        listen<UpdateManagerEvent.Rotation> {
+            if (mode != Mode.GRIM_STRAFE) return@listen
+            if (!shouldWork()) return@listen
 
             var yaw = player.yaw
             val input = newMovementInput()
 
-            if (!input.isInputting) return@onRotate
+            if (!input.isInputting) return@listen
 
             run {
                 if (!diagonal) return@run

src/main/kotlin/com/lambda/module/modules/player/Freecam.kt

@@ -22,15 +22,14 @@ import com.lambda.event.events.ConnectionEvent
 import com.lambda.event.events.MovementEvent
 import com.lambda.event.events.PlayerEvent
 import com.lambda.event.events.RenderEvent
+import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.request.rotating.Rotation
 import com.lambda.interaction.request.rotating.RotationConfig
-import com.lambda.interaction.request.rotating.RotationManager.onRotate
 import com.lambda.interaction.request.rotating.RotationMode
 import com.lambda.interaction.request.rotating.visibilty.lookAtHit
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
-import com.lambda.util.extension.partialTicks
 import com.lambda.util.extension.rotation
 import com.lambda.util.math.interpolate
 import com.lambda.util.math.plus
@@ -98,8 +97,8 @@ object Freecam : Module(
             mc.options.perspective = lastPerspective
         }
 
-        onRotate {
-            if (!rotateToTarget) return@onRotate
+        listen<UpdateManagerEvent.Rotation> {
+            if (!rotateToTarget) return@listen
 
             mc.crosshairTarget?.let {
                 lookAtHit(it)?.requestBy(rotationConfig)

src/main/kotlin/com/lambda/module/modules/player/InventoryMove.kt

@@ -18,11 +18,11 @@
 package com.lambda.module.modules.player
 
 import com.lambda.event.events.MovementEvent
+import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.gui.LambdaScreen
 import com.lambda.interaction.request.rotating.Rotation
 import com.lambda.interaction.request.rotating.RotationConfig
-import com.lambda.interaction.request.rotating.RotationManager.onRotate
 import com.lambda.interaction.request.rotating.RotationMode
 import com.lambda.interaction.request.rotating.visibilty.lookAt
 import com.lambda.module.Module
@@ -88,8 +88,8 @@ object InventoryMove : Module(
             event.input.update(forward, strafe, jump, sneak, sprint)
         }
 
-        onRotate {
-            if (mc.currentScreen.hasInputOrNull) return@onRotate
+        listen<UpdateManagerEvent.Rotation> {
+            if (mc.currentScreen.hasInputOrNull) return@listen
 
             val pitch = (isKeyPressed(GLFW_KEY_DOWN, GLFW_KEY_KP_2).toFloatSign() -
                     isKeyPressed(GLFW_KEY_UP, GLFW_KEY_KP_8).toFloatSign()) * speed

src/main/kotlin/com/lambda/module/modules/player/Replay.kt

@@ -31,10 +31,10 @@ import com.lambda.core.TimerManager
 import com.lambda.event.EventFlow.lambdaScope
 import com.lambda.event.events.KeyboardEvent
 import com.lambda.event.events.MovementEvent
+import com.lambda.event.events.UpdateManagerEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.request.rotating.Rotation
 import com.lambda.interaction.request.rotating.RotationConfig
-import com.lambda.interaction.request.rotating.RotationManager.onRotate
 import com.lambda.interaction.request.rotating.RotationMode
 import com.lambda.interaction.request.rotating.visibilty.lookAt
 import com.lambda.module.Module
@@ -179,7 +179,7 @@ object Replay : Module(
             }
         }
 
-        onRotate {
+        listen<UpdateManagerEvent.Rotation> {
             when (state) {
                 State.RECORDING -> {
                     buffer?.rotation?.add(player.rotation)

src/main/kotlin/com/lambda/util/player/MovementUtils.kt

@@ -20,7 +20,7 @@ package com.lambda.util.player
 import com.lambda.context.SafeContext
 import com.lambda.interaction.request.rotating.RotationManager
 import com.lambda.util.math.MathUtils.toDegree
-import com.lambda.util.math.MathUtils.toInt
+import com.lambda.util.math.MathUtils.toDouble
 import com.lambda.util.math.MathUtils.toRadian
 import com.lambda.util.math.plus
 import com.lambda.util.math.times
@@ -73,22 +73,8 @@ object MovementUtils {
     ): Input {
         if (assumeBaritone && player.input.handledByBaritone) return player.input
 
-        val newInput = KeyboardInput(mc.options)
-
-        if (!slowdownCheck) return newInput.apply { tick() }
-
-        newInput.movementVector = player.applyMovementSpeedFactors(player.input.movementVector)
-
-        return newInput
-    }
-
-    @Deprecated(
-        message = "mergeFrom is deprecated in favor of Input.update",
-        replaceWith = ReplaceWith("this.update()")
-    )
-    fun Input.mergeFrom(input: Input) {
-        playerInput = input.playerInput
-        movementVector = input.movementVector
+        // ToDo: Add slowdown
+        return KeyboardInput(mc.options).apply { tick() }
     }
 
     fun Input.update(
@@ -99,7 +85,6 @@ object MovementUtils {
         sprint: Boolean = playerInput.sprint,
     ) {
         val input = buildMovementInput(forward, strafe, jump, sneak, sprint)
-
         movementVector = input.movementVector
         playerInput = input.playerInput
     }
@@ -111,7 +96,7 @@ object MovementUtils {
         sneak: Boolean = false,
         sprint: Boolean = false,
     ) = Input().apply {
-        movementVector = Vec2f(strafe.toFloat(), forward.toFloat())
+        movementVector = Vec2f(strafe.toFloat(), forward.toFloat()).normalize()
         playerInput = PlayerInput(
             forward > 0.0,
             forward < 0.0,
@@ -127,7 +112,7 @@ object MovementUtils {
         update(0.0, 0.0, !vertical, !vertical, false)
 
     val Input.verticalMovement
-        get() = (playerInput.jump.toInt() - playerInput.sneak.toInt()).toDouble()
+        get() = jumping.toDouble() - sneaking.toDouble()
 
     private fun inputMoveOffset(
         moveForward: Double,