|
17 | 17 |
|
18 | 18 | package com.lambda.mixin.baritone; |
19 | 19 |
|
20 | | -import baritone.api.event.events.PlayerUpdateEvent; |
21 | | -import baritone.api.event.events.RotationMoveEvent; |
22 | 20 | import baritone.api.utils.Rotation; |
23 | 21 | import baritone.behavior.LookBehavior; |
24 | 22 | import com.lambda.interaction.BaritoneHandler; |
25 | 23 | import com.lambda.interaction.managers.rotating.RotationManager; |
| 24 | +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; |
| 25 | +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; |
| 26 | +import net.minecraft.client.network.ClientPlayerEntity; |
26 | 27 | import org.spongepowered.asm.mixin.Mixin; |
27 | 28 | import org.spongepowered.asm.mixin.Unique; |
28 | 29 | import org.spongepowered.asm.mixin.injection.At; |
|
32 | 33 | @Mixin(value = LookBehavior.class, remap = false) |
33 | 34 | public class LookBehaviourMixin { |
34 | 35 | @Unique |
35 | | - LookBehavior instance = ((LookBehavior) (Object) this); |
| 36 | + LookBehavior instance = (LookBehavior) (Object) this; |
36 | 37 |
|
37 | 38 | // Redirect baritone's rotations into our rotation engine |
38 | | - @Inject(method = "updateTarget", at = @At("HEAD"), cancellable = true) |
| 39 | + @Inject(method = "updateTarget", at = @At("HEAD")) |
39 | 40 | void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) { |
40 | 41 | if (instance.baritone != BaritoneHandler.getPrimary()) return; |
41 | | - |
42 | 42 | RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch()); |
43 | | - ci.cancel(); |
44 | 43 | } |
45 | 44 |
|
46 | | - @Inject(method = "onPlayerUpdate", at = @At("HEAD"), cancellable = true) |
47 | | - void onUpdate(PlayerUpdateEvent event, CallbackInfo ci) { |
48 | | - if (instance.baritone != BaritoneHandler.getPrimary()) return; |
49 | | - |
50 | | - ci.cancel(); |
51 | | - } |
| 45 | + @WrapOperation(method = "onPlayerUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;setYaw(F)V")) |
| 46 | + private void wrapSetYaw(ClientPlayerEntity instance, float v, Operation<Void> original) {} |
52 | 47 |
|
53 | | - @Inject(method = "onPlayerRotationMove", at = @At("HEAD"), cancellable = true) |
54 | | - void onMovementUpdate(RotationMoveEvent event, CallbackInfo ci) { |
55 | | - if (instance.baritone != BaritoneHandler.getPrimary()) return; |
| 48 | + @WrapOperation(method = "onPlayerUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;setPitch(F)V")) |
| 49 | + private void wrapSetPitch(ClientPlayerEntity instance, float v, Operation<Void> original) {} |
56 | 50 |
|
57 | | - ci.cancel(); |
58 | | - } |
| 51 | + @WrapOperation(method = "pig", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;setYaw(F)V")) |
| 52 | + private void wrapPigSetYaw(ClientPlayerEntity instance, float v, Operation<Void> original) {} |
59 | 53 | } |
0 commit comments