send rotation update if the active rotation doesnt equal the server rotation

Author: beanbag44

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

@@ -28,10 +28,13 @@
 import com.lambda.module.modules.movement.NoJumpCooldown;
 import com.lambda.module.modules.player.PortalGui;
 import com.lambda.module.modules.render.ViewModel;
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
@@ -69,14 +72,14 @@ public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
     }
 
     @WrapOperation(method = "move", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
-    private void emitMovementEvents(ClientPlayerEntity instance, MovementType movementType, Vec3d vec3d, Operation<Void> original) {
+    private void wrapMove(ClientPlayerEntity instance, MovementType movementType, Vec3d vec3d, Operation<Void> original) {
         EventFlow.post(new MovementEvent.Player.Pre(movementType, vec3d));
         original.call(instance, movementType, vec3d);
         EventFlow.post(new MovementEvent.Player.Post(movementType, vec3d));
     }
 
     @WrapOperation(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V"))
-    void processMovement(Input input, Operation<Void> original) {
+    void wrapTick(Input input, Operation<Void> original) {
         original.call(input);
         RotationManager.processRotations();
         RotationManager.redirectStrafeInputs(input);
@@ -89,38 +92,45 @@ private void injectTickMovement(CallbackInfo ci) {
     }
 
     @Inject(method = "sendMovementPackets", at = @At("HEAD"))
-    private void MovementEventPre(CallbackInfo ci) {
+    private void injectSendMovementPacketsHead(CallbackInfo ci) {
         moveEvent = EventFlow.post(new PlayerPacketEvent.Pre(pos, RotationManager.getActiveRotation(), isOnGround(), isSprinting(), horizontalCollision));
     }
 
+    @Definition(id = "g", local = @Local(type = double.class, ordinal = 3))
+    @Expression("g != 0.0")
+    @ModifyExpressionValue(method = "sendMovementPackets", at = @At("MIXINEXTRAS:EXPRESSION"))
+    private boolean modifyHasRotated(boolean original) {
+        return RotationManager.getActiveRotation() != RotationManager.getServerRotation() || original;
+    }
+
     @WrapOperation(method = "sendMovementPackets", at = @At(value = "NEW", target = "net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket$Full"))
-    private PlayerMoveC2SPacket.Full onFullPacket(Vec3d pos, float yaw, float pitch, boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.Full> original) {
+    private PlayerMoveC2SPacket.Full wrapFullPacket(Vec3d pos, float yaw, float pitch, boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.Full> original) {
         return original.call(moveEvent.getPosition(), moveEvent.getRotation().getYawF(), moveEvent.getRotation().getPitchF(), moveEvent.getOnGround(), moveEvent.isCollidingHorizontally());
     }
 
     @WrapOperation(method = "sendMovementPackets", at = @At(value = "NEW", target = "net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket$PositionAndOnGround"))
-    private PlayerMoveC2SPacket.PositionAndOnGround onPositionPacket(Vec3d pos, boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.PositionAndOnGround> original) {
+    private PlayerMoveC2SPacket.PositionAndOnGround wrapPositionAndOnGround(Vec3d pos, boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.PositionAndOnGround> original) {
         return original.call(moveEvent.getPosition(), moveEvent.getOnGround(), moveEvent.isCollidingHorizontally());
     }
 
     @WrapOperation(method = "sendMovementPackets", at = @At(value = "NEW", target = "net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket$LookAndOnGround"))
-    private PlayerMoveC2SPacket.LookAndOnGround onLookPacket(float yaw, float pitch, boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.LookAndOnGround> original) {
+    private PlayerMoveC2SPacket.LookAndOnGround wrapLookAndOnGround(float yaw, float pitch, boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.LookAndOnGround> original) {
         return original.call(moveEvent.getRotation().getYawF(), moveEvent.getRotation().getPitchF(), moveEvent.getOnGround(), moveEvent.isCollidingHorizontally());
     }
 
     @WrapOperation(method = "sendMovementPackets", at = @At(value = "NEW", target = "net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket$OnGroundOnly"))
-    private PlayerMoveC2SPacket.OnGroundOnly onOnGroundPacket(boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.OnGroundOnly> original) {
+    private PlayerMoveC2SPacket.OnGroundOnly wrapOnGroundOnly(boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.OnGroundOnly> original) {
         return original.call(moveEvent.getOnGround(), moveEvent.isCollidingHorizontally());
     }
 
-    @Inject(method = "sendMovementPackets", at = @At("TAIL"))
-    private void injectSendMovementPackets(CallbackInfo ci) {
+    @Inject(method = "sendMovementPackets", at = @At("RETURN"))
+    private void injectSendMovementPacketsReturn(CallbackInfo ci) {
         RotationManager.onRotationSend();
         EventFlow.post(new PlayerPacketEvent.Post());
     }
 
     @ModifyExpressionValue(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
-    boolean isSprinting(boolean original) {
+    boolean modifyIsSprinting(boolean original) {
         return EventFlow.post(new MovementEvent.Sprint(original)).getSprint();
     }
 
@@ -141,22 +151,22 @@ void onTick(Operation<Void> original) {
     }
 
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getYaw()F"))
-    float fixHeldItemYaw(ClientPlayerEntity instance, Operation<Float> original) {
+    float wrapGetYaw(ClientPlayerEntity instance, Operation<Float> original) {
         return Objects.requireNonNullElse(RotationManager.getHandYaw(), original.call(instance));
     }
 
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getPitch()F"))
-    float fixHeldItemPitch(ClientPlayerEntity instance, Operation<Float> original) {
+    float wrapGetPitch(ClientPlayerEntity instance, Operation<Float> original) {
         return Objects.requireNonNullElse(RotationManager.getHandPitch(), original.call(instance));
     }
 
     @Inject(method = "swingHand", at = @At("HEAD"), cancellable = true)
-    void onSwing(Hand hand, CallbackInfo ci) {
+    void injectSwingHand(Hand hand, CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
     }
 
     @WrapOperation(method = "swingHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
-    private void adjustSwing(ClientPlayerEntity instance, Hand hand, Operation<Void> original) {
+    private void wrapSwingHand(ClientPlayerEntity instance, Hand hand, Operation<Void> original) {
         ViewModel viewModel = ViewModel.INSTANCE;
 
         if (!viewModel.isEnabled()) {
@@ -168,7 +178,7 @@ private void adjustSwing(ClientPlayerEntity instance, Hand hand, Operation<Void>
     }
 
     @Inject(method = "updateHealth", at = @At("HEAD"))
-    public void damage(float health, CallbackInfo ci) {
+    public void injectUpdateHealth(float health, CallbackInfo ci) {
         EventFlow.post(new PlayerEvent.Health(health));
     }
 
@@ -189,7 +199,7 @@ public void damage(float health, CallbackInfo ci) {
      * }</pre>
      */
     @ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
-    Screen keepScreensInPortal(Screen original) {
+    Screen modifyCurrentScreen(Screen original) {
         if (PortalGui.INSTANCE.isEnabled()) return null;
         else return original;
     }