Merge branch '1.21.5' into 1.21.11

Author: beanbag44

…baritone/MixinBaritonePlayerContext.java …baritone/BaritonePlayerContextMixin.javasrc/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java renamed to src/main/java/com/lambda/mixin/baritone/BaritonePlayerContextMixin.java src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java renamed to src/main/java/com/lambda/mixin/baritone/BaritonePlayerContextMixin.java

@@ -30,7 +30,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(value = BaritonePlayerContext.class, remap = false) // fix compileJava warning
-public class MixinBaritonePlayerContext {
+public class BaritonePlayerContextMixin {
     @Shadow
     @Final
     private Baritone baritone;

…da/mixin/baritone/MixinLookBehavior.java …a/mixin/baritone/LookBehaviourMixin.javasrc/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java renamed to src/main/java/com/lambda/mixin/baritone/LookBehaviourMixin.java src/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java renamed to src/main/java/com/lambda/mixin/baritone/LookBehaviourMixin.java

@@ -24,33 +24,34 @@
 import com.lambda.interaction.BaritoneManager;
 import com.lambda.interaction.managers.rotating.RotationManager;
 import org.spongepowered.asm.mixin.Mixin;
+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;
 
-@Mixin(LookBehavior.class)
-public class MixinLookBehavior {
+@Mixin(value = LookBehavior.class, remap = false)
+public class LookBehaviourMixin {
+    @Unique
+    LookBehavior instance = ((LookBehavior) (Object) this);
+
     // Redirect baritone's rotations into our rotation engine
-    @Inject(method = "updateTarget", at = @At("HEAD"), remap = false, cancellable = true)
+    @Inject(method = "updateTarget", at = @At("HEAD"), cancellable = true)
     void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
-        LookBehavior instance = ((LookBehavior) (Object) this);
         if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
         ci.cancel();
     }
 
-    @Inject(method = "onPlayerUpdate", at = @At("HEAD"), remap = false, cancellable = true)
+    @Inject(method = "onPlayerUpdate", at = @At("HEAD"), cancellable = true)
     void onUpdate(PlayerUpdateEvent event, CallbackInfo ci) {
-        LookBehavior instance = ((LookBehavior) (Object) this);
         if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();
     }
 
-    @Inject(method = "onPlayerRotationMove", at = @At("HEAD"), remap = false, cancellable = true)
+    @Inject(method = "onPlayerRotationMove", at = @At("HEAD"), cancellable = true)
     void onMovementUpdate(RotationMoveEvent event, CallbackInfo ci) {
-        LookBehavior instance = ((LookBehavior) (Object) this);
         if (instance.baritone != BaritoneManager.getPrimary()) return;
 
         ci.cancel();

src/main/resources/lambda.mixins.common.json

@@ -6,8 +6,8 @@
   "client": [
     "CrashReportMixin",
     "MinecraftClientMixin",
-    "baritone.MixinBaritonePlayerContext",
-    "baritone.MixinLookBehavior",
+    "baritone.BaritonePlayerContextMixin",
+    "baritone.LookBehaviourMixin",
     "client.sound.SoundSystemMixin",
     "entity.ClientPlayerEntityMixin",
     "entity.ClientPlayInteractionManagerMixin",