Merge remote-tracking branch 'origin/1.21.11' into feature/module/automount

Author: IceTank

README.md

@@ -86,6 +86,13 @@ How do I...
     <img alt="" src="https://raw.githubusercontent.com/lambda-client/assets/main/footer.png">
 </p>
 
+## Developing
+
+### MSA authentication setup
+
+Add `--msa --msa-no-dialog` to your CLI arguments to enable MSA authentication when launching from the IDE.
+
+
 ### Stargazers
 
 [![Stargazers over time](https://starchart.cc/lambda-client/lambda.svg?variant=adaptive)](https://starchart.cc/lambda-client/lambda)

…s/buffer/vertex/attributes/VertexMode.kt …graphics/outline/IEntityRenderState.javasrc/main/kotlin/com/lambda/graphics/buffer/vertex/attributes/VertexMode.kt renamed to src/main/java/com/lambda/graphics/outline/IEntityRenderState.java src/main/kotlin/com/lambda/graphics/buffer/vertex/attributes/VertexMode.kt renamed to src/main/java/com/lambda/graphics/outline/IEntityRenderState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 Lambda
+ * Copyright 2026 Lambda
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.lambda.graphics.buffer.vertex.attributes
+package com.lambda.graphics.outline;
 
-import org.lwjgl.opengl.GL11C.GL_LINES
-import org.lwjgl.opengl.GL11C.GL_TRIANGLES
+/**
+ * Duck interface for EntityRenderState to store and retrieve entity ID.
+ */
+public interface IEntityRenderState {
+    int lambda$getEntityId();
 
-enum class VertexMode(val mode: Int) {
-    Lines(GL_LINES),
-    Triangles(GL_TRIANGLES)
+    void lambda$setEntityId(int id);
 }

src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -74,6 +74,7 @@ void closeImGui(CallbackInfo ci) {
 
     @WrapMethod(method = "render")
     void onLoopTick(boolean tick, Operation<Void> original) {
+        com.lambda.graphics.RenderMain.preRender();
         EventFlow.post(TickEvent.Render.Pre.INSTANCE);
         original.call(tick);
         EventFlow.post(TickEvent.Render.Post.INSTANCE);
@@ -95,7 +96,7 @@ void onNetwork(ClientPlayerInteractionManager instance, Operation<Void> original
 
     @Definition(id = "overlay", field = "Lnet/minecraft/client/MinecraftClient;overlay:Lnet/minecraft/client/gui/screen/Overlay;")
     @Expression("this.overlay == null")
-    @ModifyExpressionValue(method = "tick", at = @At("MIXINEXTRAS:EXPRESSION"))
+    @ModifyExpressionValue(method = "tick", at = @At(value = "MIXINEXTRAS:EXPRESSION", ordinal = 1))
     private boolean modifyCurrentScreenNullCheck(boolean original) {
         if (!original || this.currentScreen != null) {
             EventFlow.post(TickEvent.Input.Pre.INSTANCE);
@@ -120,11 +121,13 @@ void onSound(SoundManager instance, boolean paused, Operation<Void> original) {
 
     @Inject(at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER, remap = false), method = "stop")
     private void onShutdown(CallbackInfo ci) {
+        com.lambda.graphics.outline.OutlineRenderer.INSTANCE.cleanup();
         EventFlow.post(new ClientEvent.Shutdown());
     }
 
     /**
-     * Inject after the thread field is set so that {@link ThreadExecutor#getThread} is available
+     * Inject after the thread field is set so that {@link ThreadExecutor#getThread}
+     * is available
      */
     @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;thread:Ljava/lang/Thread;", shift = At.Shift.AFTER, ordinal = 0, opcode = Opcodes.PUTFIELD), method = "run")
     private void onStartup(CallbackInfo ci) {
@@ -175,30 +178,25 @@ boolean redirectMultiActon(boolean original) {
     @Inject(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isRiding()Z"))
     void injectFastPlace(CallbackInfo ci) {
         if (!Interact.INSTANCE.isEnabled()) return;
-
         itemUseCooldown = Interact.getPlaceDelay();
     }
 
     @WrapMethod(method = "doItemUse")
     void injectItemUse(Operation<Void> original) {
-        if (BetterFirework.INSTANCE.isDisabled() || !BetterFirework.onInteract())
-            original.call();
+        if (BetterFirework.INSTANCE.isDisabled() || !BetterFirework.onInteract()) original.call();
     }
 
     @WrapMethod(method = "doItemPick")
     void injectItemPick(Operation<Void> original) {
-        if (BetterFirework.INSTANCE.isDisabled() || !BetterFirework.onPick())
-            original.call();
+        if (BetterFirework.INSTANCE.isDisabled() || !BetterFirework.onPick()) original.call();
     }
 
     @WrapMethod(method = "getTargetMillisPerTick")
     float getTargetMillisPerTick(float millis, Operation<Float> original) {
         var length = TimerManager.INSTANCE.getLength();
 
-        if (length == TimerManager.DEFAULT_LENGTH)
-            return original.call(millis);
-        else
-            return (float) TimerManager.INSTANCE.getLength();
+        if (length == TimerManager.DEFAULT_LENGTH) return original.call(millis);
+        else return (float) TimerManager.INSTANCE.getLength();
     }
 
     @Inject(method = "updateWindowTitle", at = @At("HEAD"), cancellable = true)

src/main/java/com/lambda/mixin/baritone/BaritonePlayerContextMixin.java

@@ -40,6 +40,13 @@ Rotation syncRotationWithBaritone(Rotation original) {
         if (baritone != BaritoneManager.getPrimary())
             return original;
 
-        return new Rotation((float) RotationManager.getActiveRotation().getYaw(), (float) RotationManager.getActiveRotation().getPitch());
+        float yaw = (float) RotationManager.getActiveRotation().getYaw();
+        float pitch = (float) RotationManager.getActiveRotation().getPitch();
+
+        if (Float.isNaN(yaw) || Float.isNaN(pitch)) {
+            return original;
+        }
+
+        return new Rotation(net.minecraft.util.math.MathHelper.wrapDegrees(yaw), pitch);
     }
 }

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

@@ -17,60 +17,67 @@
 
 package com.lambda.mixin.entity;
 
-import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.PlayerPacketEvent;
 import com.lambda.event.events.TickEvent;
-import com.lambda.interaction.managers.rotating.Rotation;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.movement.ElytraFly;
 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.ModifyReturnValue;
 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.llamalad7.mixinextras.sugar.Share;
+import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.MovementType;
+import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.util.Hand;
+import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.Objects;
 
+import static com.lambda.Lambda.getMc;
+
 @Mixin(value = ClientPlayerEntity.class, priority = Integer.MAX_VALUE)
 public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
-    @Shadow
-    private float lastYawClient;
-    @Shadow
-    private float lastPitchClient;
-    @Unique
-    private PlayerPacketEvent.Pre moveEvent;
-
     public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
         super(world, profile);
     }
 
+    @WrapMethod(method = "tick")
+    void onTick(Operation<Void> original) {
+        EventFlow.post(TickEvent.Player.Pre.INSTANCE);
+        original.call();
+        EventFlow.post(TickEvent.Player.Post.INSTANCE);
+    }
+
+    @Inject(method = "tick", at = @At("HEAD"))
+    private void injectTick(CallbackInfo ci, @Share(namespace = "shared_rotations", value = "target_rotation") final LocalRef<Vec2f> targetRotation) {
+        if (RotationManager.getRequests().stream().anyMatch(Objects::nonNull)) {
+            final var activeRotation = RotationManager.getActiveRotation();
+            targetRotation.set(new Vec2f(activeRotation.getYawF(), activeRotation.getPitchF()));
+        }
+    }
+
     @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 wrapMove(ClientPlayerEntity instance, MovementType movementType, Vec3d vec3d, Operation<Void> original) {
         EventFlow.post(new MovementEvent.Player.Pre(movementType, vec3d));
@@ -91,43 +98,23 @@ private void injectTickMovement(CallbackInfo ci) {
         if (NoJumpCooldown.INSTANCE.isEnabled() || (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce)) jumpingCooldown = 0;
     }
 
-    @Inject(method = "sendMovementPackets", at = @At("HEAD"))
-    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().equalFloat(RotationManager.getServerRotation()) || original;
+    @ModifyExpressionValue(method = "sendMovementPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getYaw()F"))
+    private float modifyGetYaw(float original) {
+        final var yaw = RotationManager.getHeadYaw();
+        return yaw != null ? yaw : original;
     }
 
-    @Inject(method = "sendMovementPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V", shift = At.Shift.BEFORE), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
-    private void injectSendPacket(CallbackInfo ci, double d, double e, double f, double g, double h, boolean bl, boolean bl2) {
-        if (RotationManager.getRequests().stream().allMatch(Objects::isNull)) {
-            moveEvent.setRotation(new Rotation(g + lastYawClient, h + lastPitchClient));
-        }
-    }
-
-    @WrapOperation(method = "sendMovementPackets", at = @At(value = "NEW", target = "net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket$Full"))
-    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 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 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());
+    @ModifyExpressionValue(method = "sendMovementPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getPitch()F"))
+    private float modifyGetPitch(float original) {
+        final var pitch = RotationManager.getHeadPitch();
+        return pitch != null ? pitch : original;
     }
 
-    @WrapOperation(method = "sendMovementPackets", at = @At(value = "NEW", target = "net/minecraft/network/packet/c2s/play/PlayerMoveC2SPacket$OnGroundOnly"))
-    private PlayerMoveC2SPacket.OnGroundOnly wrapOnGroundOnly(boolean onGround, boolean horizontalCollision, Operation<PlayerMoveC2SPacket.OnGroundOnly> original) {
-        return original.call(moveEvent.getOnGround(), moveEvent.isCollidingHorizontally());
+    @WrapOperation(method = "sendMovementPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"))
+    private void wrapSendPacket(ClientPlayNetworkHandler instance, Packet packet, Operation<Void> original) {
+        var event = EventFlow.post(new PlayerPacketEvent.Send((PlayerMoveC2SPacket) packet));
+        if (event.isCanceled()) return;
+        original.call(instance, event.getPacket());
     }
 
     @Inject(method = "sendMovementPackets", at = @At("TAIL"))
@@ -144,19 +131,11 @@ boolean modifyIsSprinting(boolean original) {
     @ModifyReturnValue(method = "isSneaking", at = @At("RETURN"))
     boolean injectSneakingInput(boolean original) {
         ClientPlayerEntity self = (ClientPlayerEntity) (Object) this;
-        if (self != Lambda.getMc().player ||
-                self.input == null) return original;
+        if (self != getMc().player || self.input == null) return original;
 
         return EventFlow.post(new MovementEvent.Sneak(self.input.playerInput.sneak())).getSneak();
     }
 
-    @WrapMethod(method = "tick")
-    void onTick(Operation<Void> original) {
-        EventFlow.post(TickEvent.Player.Pre.INSTANCE);
-        original.call();
-        EventFlow.post(TickEvent.Player.Post.INSTANCE);
-    }
-
     @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getYaw()F"))
     float wrapGetYaw(ClientPlayerEntity instance, Operation<Float> original) {
         return Objects.requireNonNullElse(RotationManager.getHandYaw(), original.call(instance));

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

@@ -17,6 +17,7 @@
 
 package com.lambda.mixin.entity;
 
+import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
@@ -45,8 +46,7 @@
 @Mixin(Entity.class)
 public abstract class EntityMixin {
     @Shadow
-    public void move(MovementType movementType, Vec3d movement) {
-    }
+    public void move(MovementType movementType, Vec3d movement) {}
 
     @Shadow
     public abstract float getYaw();
@@ -151,11 +151,13 @@ private boolean modifyGetFlagGlowing(boolean original) {
 
     @WrapWithCondition(method = "changeLookDirection", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setYaw(F)V"))
     private boolean wrapSetYaw(Entity instance, float yaw) {
+        if ((Object) this != getMc().player) return true;
         return RotationManager.getLockYaw() == null;
     }
 
     @WrapWithCondition(method = "changeLookDirection", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;setPitch(F)V"))
     private boolean wrapSetPitch(Entity instance, float yaw) {
+        if ((Object) this != getMc().player) return true;
         return RotationManager.getLockPitch() == null;
     }
 
@@ -175,8 +177,7 @@ private EntityPose injectGetPose(EntityPose original) {
         var player = getMc().player;
         if ((Object) this != getMc().player) return original;
 
-        if (ElytraFly.INSTANCE.isDisabled() ||
-                ElytraFly.getMode() != ElytraFly.FlyMode.Bounce || !player.isGliding()) return original;
+        if (ElytraFly.INSTANCE.isDisabled() || ElytraFly.getMode() != ElytraFly.FlyMode.Bounce || !player.isGliding()) return original;
 
         return EntityPose.GLIDING;
     }