rework jump event mixin to resolve compatibility issues (#287)

Author: cattyngmd

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

@@ -24,16 +24,17 @@
 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.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.ref.LocalFloatRef;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 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;
@@ -45,44 +46,26 @@ public abstract class LivingEntityMixin extends EntityMixin {
 
     @Unique private final LivingEntity lambda$instance = (LivingEntity) (Object) this;
 
-    @Shadow protected abstract float getJumpVelocity();
+    @Inject(method = "jump", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/entity/LivingEntity;getJumpVelocity()F"), cancellable = true)
+    void onJump(CallbackInfo ci, @Local LocalFloatRef heightRef) {
+        if (lambda$instance != Lambda.getMc().player) return;
 
-    /**
-     * Overwrites the jump function to use our rotation and movements
-     * <pre>{@code
-     * protected void jump() {
-     *     Vec3d vec3d = this.getVelocity();
-     *     this.setVelocity(vec3d.x, (double)this.getJumpVelocity(), vec3d.z);
-     *     if (this.isSprinting()) {
-     *         float f = this.getYaw() * (float) (Math.PI / 180.0);
-     *         this.setVelocity(this.getVelocity().add((double)(-MathHelper.sin(f) * 0.2F), 0.0, (double)(MathHelper.cos(f) * 0.2F)));
-     *     }
-     *
-     *     this.velocityDirty = true;
-     * }
-     * }</pre>
-     */
-    @Inject(method = "jump", at = @At("HEAD"), cancellable = true)
-    void onJump(CallbackInfo ci) {
-        LivingEntity self = lambda$instance;
-        if (self != Lambda.getMc().player) return;
-        ci.cancel();
-
-        float height = this.getJumpVelocity();
+        float height = heightRef.get();
         MovementEvent.Jump event = EventFlow.post(new MovementEvent.Jump(height));
+        heightRef.set(event.getHeight());
 
-        if (event.isCanceled()) return;
-
-        Vec3d vec3d = self.getVelocity();
-        self.setVelocity(vec3d.x, event.getHeight(), vec3d.z);
+        if (event.isCanceled()) {
+            ci.cancel();
+        }
+    }
 
-        if (self.isSprinting()) {
+    @ModifyExpressionValue(method = "jump", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getYaw()F"))
+    float hookModifyJumpYaw(float original) {
+        if (lambda$instance == Lambda.getMc().player) {
             Float yaw = RotationManager.getMovementYaw();
-            float f = ((yaw != null) ? yaw : self.getYaw()) * ((float) Math.PI / 180);
-            self.setVelocity(self.getVelocity().add(-MathHelper.sin(f) * 0.2f, 0.0, MathHelper.cos(f) * 0.2f));
+            return yaw == null ? original : yaw;
         }
-
-        self.velocityDirty = true;
+        return original;
     }
 
     @Inject(method = "travel", at = @At("HEAD"), cancellable = true)

src/main/kotlin/com/lambda/event/events/MovementEvent.kt

@@ -123,5 +123,5 @@ sealed class MovementEvent {
      *
      * @property height The height of the jump. Can be modified!
      */
-    data class Jump(var height: Double) : ICancellable by Cancellable()
+    data class Jump(var height: Float) : ICancellable by Cancellable()
 }