should fix a couple major bounce efly bugs. Prevents jump glide spam when correcting y motion and flagging when gliding after flagging once due to desynced pitch. Should also un-sneak when stuck on an edge to drop down for a tick

Author: beanbag44

src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -50,11 +50,13 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Objects;
 
 import static com.lambda.Lambda.getMc;
+import static com.lambda.interaction.managers.rotating.Rotation.dist;
 
 @Mixin(value = ClientPlayerEntity.class, priority = Integer.MAX_VALUE)
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
@@ -131,6 +133,12 @@ private void wrapSendPacket(ClientPlayNetworkHandler instance, Packet<?> packet,
         original.call(instance, event.getPacket());
     }
 
+    @ModifyVariable(method = "sendMovementPackets", at = @At(value = "STORE"), ordinal = 1)
+    private boolean modifyBl2(boolean original) {
+        boolean rotationMismatch = dist(RotationManager.getActiveRotation(), RotationManager.getServerRotation()) > 0.00001;
+        return original || rotationMismatch;
+    }
+
     @Inject(method = "sendMovementPackets", at = @At("TAIL"))
     private void injectSendMovementPacketsReturn(CallbackInfo ci) {
         if (!BaritoneHandler.isActive()) { RotationManager.onRotationSend(); }

src/main/kotlin/com/lambda/interaction/managers/rotating/Rotation.kt

@@ -36,6 +36,7 @@ import kotlin.math.cos
 import kotlin.math.hypot
 import kotlin.math.sin
 
+@Suppress("unused")
 data class Rotation(val yaw: Double, val pitch: Double) {
     constructor(yaw: Float, pitch: Float) : this(yaw.toDouble(), pitch.toDouble())
 
@@ -158,6 +159,7 @@ data class Rotation(val yaw: Double, val pitch: Double) {
             return Rotation(yaw, pitch)
         }
 
+        @JvmStatic
         infix fun Rotation.dist(b: Rotation) =
             hypot(
                 wrap(yaw - b.yaw),

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

@@ -102,7 +102,8 @@ object RotationManager : Manager<RotationRequest>(
 			mc.crosshairTarget = blockHit
 		}
 
-        listen<PacketEvent.Receive.Post>({ Int.MIN_VALUE }) { event ->
+		//FixMe: PacketEvent.Receive.Post doesn't work here for some reason, it just never triggers
+        listen<PacketEvent.Receive.Pre>({ Int.MIN_VALUE }) { event ->
             val packet = event.packet
             if (packet !is PlayerPositionLookS2CPacket) return@listen
 

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/modes/BounceElytraFly.kt

@@ -39,6 +39,7 @@ import com.lambda.util.PacketUtils.handlePacketSilently
 import com.lambda.util.PacketUtils.sendPacketSilently
 import com.lambda.util.SpeedUnit
 import com.lambda.util.TickTimer
+import com.lambda.util.math.dist
 import com.lambda.util.math.distSq
 import com.lambda.util.math.minus
 import com.lambda.util.player.PlayerUtils.canStartGliding
@@ -67,7 +68,7 @@ class BounceElytraFly(
 
 	private val takeoff by c.setting("Takeoff", true, "Automatically jumps and initiates gliding")
 	private val autoPitch by c.setting("Auto Pitch", true, "Automatically pitches the players rotation down to bounce at faster speeds")
-	private val pitch by c.setting("Pitch", 80.0, -90.0..90.0, 0.000001) { autoPitch }
+	private val pitch by c.setting("Pitch", 72.0, -90.0..90.0, 0.000001) { autoPitch }
 	private val jump by c.setting("Jump", true, "Automatically jumps")
 	private val flagPause by c.setting("FlagPause Pause", 5, 0..100, 1, "How long to pause if the server flags you for a movement check", "ticks")
 	private val minimizePackets by c.setting("Minimize Packets", true, "Shrinks the amount of start fly packets sent to the server as much as possible")
@@ -104,6 +105,9 @@ class BounceElytraFly(
 	private var sneakRight = false
 	private var interrupting = false
 
+	private val paused
+		get() = !pauseTimer.hasSurpassed(flagPause)
+
 	private val SafeContext.queuePackets
 		get() = fakeLag && player.isGliding && (!yMotionSetting || !onYMotionAngle) &&
 				player.y - startPos.y < if (passerConfig.passObstacles) passerConfig.minObstacleHeight + 0.1 else 0.163
@@ -122,16 +126,20 @@ class BounceElytraFly(
 
 			if (handlePassingObstacles()) return@listen
 
-			if (yMotionSetting && strictYMotionRange && onYMotionAngle && player.isOnGround) {
+			if (yMotionSetting && strictYMotionRange && onYMotionAngle) run yMotionCorrection@ {
+				val playerPos = player.pos
+				val validDistanceFromStart = Vec3d(playerPos.x, startPos.y, playerPos.z) dist startPos > 0.1
+				if (!validDistanceFromStart) return@yMotionCorrection
+
 				val snappedDir = getSnappedDir()
-				val closestLinePoint = player.pos.findClosestPointOnLine(snappedDir)
+				val closestLinePoint = playerPos.findClosestPointOnLine(snappedDir)
 				val xz = Vec3d(player.x, closestLinePoint.y, player.z)
 				if (xz distSq closestLinePoint > acceptableYMotionRange.pow(2)) {
 					if (player.isGliding) {
 						interrupt()
 						return@listen
 					}
-					val offset = player.pos - startPos
+					val offset = playerPos - startPos
 					val cross = snappedDir.x * offset.z - snappedDir.z * offset.x
 					val rotationRequest = rotationRequest {
 						val yawAndPitch = snappedDir.yawAndPitch
@@ -144,7 +152,7 @@ class BounceElytraFly(
 				}
 			}
 
-			if (!pauseTimer.hasSurpassed(flagPause)) return@listen
+			if (paused) return@listen
 
 			if (!player.isGliding) {
 				if (takeoff && player.canTakeoff) {
@@ -176,9 +184,9 @@ class BounceElytraFly(
 		listen<MovementEvent.InputUpdate> { event ->
 			val input = event.input
 			val playerInput = input.playerInput
-			val sneak = player.velocity.horizontal.length() > 0.001 || !player.isSneaking
 
 			if (sneakLeft || sneakRight) {
+				val sneak = player.velocity.horizontal.length() > 0.001 || !player.isSneaking
 				input.playerInput = PlayerInput(
 					playerInput.forward,
 					playerInput.backward,
@@ -196,10 +204,10 @@ class BounceElytraFly(
 				sneakRight = false
 				return@listen
 			}
-			if ((player.isGliding && !interrupting && jump) || jumpThisTick) {
-				input.jump()
-				jumpThisTick = false
-			}
+			if ((!player.isGliding || !jump) && !jumpThisTick) return@listen
+			jumpThisTick = false
+			if (paused || interrupting) return@listen
+			input.jump()
 		}
 
 		listen<PacketEvent.Send.Pre>({ 1 }) { event ->
@@ -255,7 +263,7 @@ class BounceElytraFly(
 			val original: Boolean = player.getFlag(Entity.GLIDING_FLAG_INDEX)
 			if (prevGliding == true &&
 				!interrupting &&
-				pauseTimer.hasSurpassed(flagPause) &&
+				!paused &&
 				!BaritoneHandler.isActive) true
 			else {
 				prevGliding = original

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

@@ -52,10 +52,9 @@ object EndermanLook : Module(
 			}
 
 		listen<TickEvent.Pre> {
-			if (player.getEquippedStack(EquipmentSlot.HEAD).isOf(Items.CARVED_PUMPKIN)
-				|| player.abilities.creativeMode
-				|| (disableWhileGliding && player.isGliding)
-			) return@listen
+			if (player.getEquippedStack(EquipmentSlot.HEAD).isOf(Items.CARVED_PUMPKIN) ||
+				player.abilities.creativeMode ||
+				(disableWhileGliding && player.isGliding)) return@listen
 
 			val endermen = world.entities
 				.filterIsInstance<EndermanEntity>()