Ref: Mixin cleanup (#228)

This pull request cleans up the mixins and replaces some mixins with
less intrusive ones. It also fixes a bug that was introduced last month regarding the NoRender darkness and blindcheck checks.

Author: emyfops

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

@@ -22,12 +22,11 @@
 import baritone.utils.player.BaritonePlayerContext;
 import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.managers.rotating.RotationManager;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(value = BaritonePlayerContext.class, remap = false) // fix compileJava warning
 public class BaritonePlayerContextMixin {
@@ -36,13 +35,11 @@ public class BaritonePlayerContextMixin {
     private Baritone baritone;
 
     // Let baritone know the actual rotation
-    @Inject(method = "playerRotations", at = @At("HEAD"), cancellable = true, remap = false)
-    void syncRotationWithBaritone(CallbackInfoReturnable<Rotation> cir) {
-        if (baritone != BaritoneManager.getPrimary()) return;
+    @ModifyReturnValue(method = "playerRotations", at = @At("RETURN"), remap = false)
+    Rotation syncRotationWithBaritone(Rotation original) {
+        if (baritone != BaritoneManager.getPrimary())
+            return original;
 
-        RotationManager rm = RotationManager.INSTANCE;
-        cir.setReturnValue(new Rotation(
-                (float) rm.getActiveRotation().getYaw(), (float) rm.getActiveRotation().getPitch())
-        );
+        return new Rotation((float) RotationManager.getActiveRotation().getYaw(), (float) RotationManager.getActiveRotation().getPitch());
     }
 }

src/main/java/com/lambda/mixin/client/sound/SoundSystemMixin.java

@@ -24,7 +24,6 @@
 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.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(SoundSystem.class)

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

@@ -32,6 +32,7 @@
 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;
@@ -46,13 +47,13 @@
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.util.Hand;
 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.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.Objects;
@@ -140,13 +141,13 @@ boolean modifyIsSprinting(boolean original) {
         return EventFlow.post(new MovementEvent.Sprint(original)).getSprint();
     }
 
-    @Inject(method = "isSneaking", at = @At(value = "HEAD"), cancellable = true)
-    void injectSneakingInput(CallbackInfoReturnable<Boolean> cir) {
+    @ModifyReturnValue(method = "isSneaking", at = @At("RETURN"))
+    boolean injectSneakingInput(boolean original) {
         ClientPlayerEntity self = (ClientPlayerEntity) (Object) this;
-        if (self != Lambda.getMc().player) return;
+        if (self != Lambda.getMc().player ||
+                self.input == null) return original;
 
-        if (self.input == null) return;
-        cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.playerInput.sneak())).getSneak());
+        return EventFlow.post(new MovementEvent.Sneak(self.input.playerInput.sneak())).getSneak();
     }
 
     @WrapMethod(method = "tick")
@@ -204,7 +205,7 @@ public void injectUpdateHealth(float health, CallbackInfo ci) {
      * }
      * }</pre>
      */
-    @ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
+    @ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;", opcode = Opcodes.GETFIELD))
     Screen modifyCurrentScreen(Screen original) {
         if (PortalGui.INSTANCE.isEnabled()) return null;
         else return original;

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

@@ -25,10 +25,10 @@
 import com.lambda.module.modules.render.NoRender;
 import com.lambda.util.math.Vec2d;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityPose;
 import net.minecraft.entity.MovementType;
@@ -39,7 +39,6 @@
 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.CallbackInfoReturnable;
 
 import static com.lambda.Lambda.getMc;
 
@@ -160,18 +159,26 @@ private boolean wrapSetPitch(Entity instance, float yaw) {
         return RotationManager.getLockPitch() == null;
     }
 
-    @Inject(method = "isSprinting()Z", at = @At("HEAD"), cancellable = true)
-    private void injectIsSprinting(CallbackInfoReturnable<Boolean> cir) {
+    @ModifyReturnValue(method = "isSprinting()Z", at = @At("RETURN"))
+    private boolean injectIsSprinting(boolean original) {
         var player = getMc().player;
-        if ((Object) this != getMc().player) return;
-        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && player.isGliding()) cir.setReturnValue(true);
+        if ((Object) this != getMc().player) return original;
+
+        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && player.isGliding())
+            return true;
+
+        return original;
     }
 
-    @Inject(method = "getPose", at = @At("HEAD"), cancellable = true)
-    private void injectGetPose(CallbackInfoReturnable<EntityPose> cir) {
-        var entity = (Entity) (Object) this;
-        if (!(entity instanceof ClientPlayerEntity player)) return;
-        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && player.isGliding()) cir.setReturnValue(EntityPose.GLIDING);
+    @ModifyReturnValue(method = "getPose", at = @At("RETURN"))
+    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;
+
+        return EntityPose.GLIDING;
     }
 
     @ModifyExpressionValue(method = "getHorizontalFacing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getYaw()F"))

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

@@ -24,6 +24,7 @@
 import com.lambda.module.modules.movement.ElytraFly;
 import com.lambda.module.modules.movement.Velocity;
 import com.lambda.module.modules.render.ViewModel;
+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;
@@ -38,7 +39,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends EntityMixin {
@@ -185,9 +185,11 @@ private void wrapPushAwayFrom(Entity entity, Operation<Void> original) {
         original.call(entity);
     }
 
-    @Inject(method = "isGliding", at = @At("HEAD"), cancellable = true)
-    private void injectIsGliding(CallbackInfoReturnable<Boolean> cir) {
-        if (lambda$instance != Lambda.getMc().player) return;
-        cir.setReturnValue(ElytraFly.isGliding());
+    @SuppressWarnings("ConstantConditions")
+    @ModifyReturnValue(method = "isGliding", at = @At("RETURN"))
+    private boolean injectIsGliding(boolean original) {
+        if (lambda$instance != Lambda.getMc().player) return original;
+
+        return ElytraFly.isGliding();
     }
 }

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

@@ -46,14 +46,4 @@ private float wrapHeadYaw(PlayerEntity instance, Operation<Float> original) {
         Float yaw = RotationManager.getHeadYaw();
         return (yaw != null) ? yaw : original.call(instance);
     }
-
-//    @WrapOperation(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getYaw()F"))
-//    private float wrapAttackYaw(PlayerEntity instance, Operation<Float> original) {
-//        if ((Object) this != Lambda.getMc().player) {
-//            return original.call(instance);
-//        }
-//
-//        Float yaw = RotationManager.getMovementYaw();
-//        return (yaw != null) ? yaw : original.call(instance);
-//    }
 }

src/main/java/com/lambda/mixin/input/KeyboardMixin.java

@@ -28,27 +28,13 @@
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
 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.callback.CallbackInfo;
 
-/**
- * Mixin to intercept keyboard input events.
- *
- * Note: In 1.21.11, onKey/onChar methods were refactored to use KeyInput/CharInput records.
- * - onKey(long window, int action, KeyInput input) where KeyInput has key, scancode, modifiers
- * - onChar(long window, CharInput input) where CharInput has codepoint, modifiers
- */
 @Mixin(Keyboard.class)
 public class KeyboardMixin {
     @WrapMethod(method = "onKey")
     private void onKey(long window, int action, KeyInput input, Operation<Void> original) {
         EventFlow.post(new ButtonEvent.Keyboard.Press(input.key(), input.scancode(), action, input.modifiers()));
         original.call(window, action, input);
-    }
-
-    @Inject(method = "onKey", at = @At("RETURN"))
-    private void onKeyTail(long window, int action, KeyInput input, CallbackInfo ci) {
         int key = input.key();
         if (!InventoryMove.getShouldMove() || !InventoryMove.isKeyMovementRelated(key)) return;
         InputUtil.Key fromCode = InputUtil.fromKeyCode(input);

src/main/java/com/lambda/mixin/input/MouseMixin.java

@@ -26,6 +26,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.Mouse;
 import net.minecraft.client.input.MouseInput;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -60,7 +61,7 @@ private void onCursorPos(long window, double x, double y, Operation<Void> origin
             original.call(window, x, y);
     }
 
-    @ModifyExpressionValue(method = "updateMouse", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;smoothCameraEnabled:Z"))
+    @ModifyExpressionValue(method = "updateMouse", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;smoothCameraEnabled:Z", opcode = Opcodes.GETFIELD))
     private boolean modifySmoothCameraEnabled(boolean original) {
         if (Zoom.INSTANCE.isEnabled() && Zoom.getSmoothMovement()) return true;
         else return original;

src/main/java/com/lambda/mixin/network/ClientConnectionMixin.java

@@ -34,7 +34,6 @@
 import org.spongepowered.asm.mixin.Final;
 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;

src/main/java/com/lambda/mixin/network/ClientLoginNetworkMixin.java

@@ -28,7 +28,6 @@
 
 @Mixin(ClientLoginNetworkHandler.class)
 public class ClientLoginNetworkMixin {
-
     @Inject(method = "onSuccess(Lnet/minecraft/network/packet/s2c/login/LoginSuccessS2CPacket;)V", at = @At("HEAD"))
     private void onSuccess(LoginSuccessS2CPacket packet, CallbackInfo ci) {
         EventFlow.post(new ConnectionEvent.Connect.Post(packet.profile()));