bounce efly fixes / improvements

Author: beanbag44

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

@@ -29,7 +29,9 @@
 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;
 import net.minecraft.entity.data.TrackedData;
 import net.minecraft.util.math.Vec3d;
@@ -161,6 +163,13 @@ private boolean wrapSetPitch(Entity instance, float yaw) {
     private void injectIsSprinting(CallbackInfoReturnable<Boolean> cir) {
         var player = Lambda.getMc().player;
         if ((Object) this != Lambda.getMc().player) return;
-        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getSprint() && player.isGliding()) cir.setReturnValue(true);
+        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && player.isGliding()) cir.setReturnValue(true);
+    }
+
+    @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);
     }
 }

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

@@ -31,7 +31,6 @@
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -186,20 +185,9 @@ private void wrapPushAwayFrom(Entity entity, Operation<Void> original) {
         original.call(entity);
     }
 
-    @Nullable
-    @Unique
-    Boolean previouslyFlying = null;
-
     @Inject(method = "isGliding", at = @At("HEAD"), cancellable = true)
     private void injectIsGliding(CallbackInfoReturnable<Boolean> cir) {
         if (lambda$instance != Lambda.getMc().player) return;
-        var original = lambda$instance.getFlag(Entity.GLIDING_FLAG_INDEX);
-        if (previouslyFlying == null) {
-            previouslyFlying = original;
-            return;
-        }
-        if (ElytraFly.INSTANCE.isEnabled() && ElytraFly.getMode() == ElytraFly.FlyMode.Bounce && previouslyFlying) {
-            cir.setReturnValue(true);
-        } else previouslyFlying = original;
+        cir.setReturnValue(ElytraFly.isGliding());
     }
 }

src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt

@@ -19,8 +19,10 @@ package com.lambda.module.modules.movement
 
 import com.lambda.config.AutomationConfig.Companion.setDefaultAutomationConfig
 import com.lambda.config.applyEdits
+import com.lambda.context.SafeContext
 import com.lambda.event.events.ClientEvent
 import com.lambda.event.events.MovementEvent
+import com.lambda.event.events.PacketEvent
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.interaction.managers.rotating.IRotationRequest.Companion.rotationRequest
@@ -31,7 +33,9 @@ import com.lambda.module.tag.ModuleTag
 import com.lambda.threading.runSafe
 import com.lambda.util.extension.isElytraFlying
 import com.lambda.util.player.MovementUtils.addSpeed
+import net.minecraft.entity.Entity
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket
+import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
 import net.minecraft.sound.SoundEvents
 
 object ElytraFly : Module(
@@ -44,17 +48,19 @@ object ElytraFly : Module(
     //ToDo: Implement these commented out settings
     private val takeoff by setting("Takeoff", true, "Automatically jumps and initiates gliding") { mode == FlyMode.Bounce }
     private val autoPitch by setting("Auto Pitch", true, "Automatically pitches the players rotation down to bounce at faster speeds") { mode == FlyMode.Bounce }
-    private val pitch by setting("Pitch", 70, 0..90, 1) { autoPitch && mode == FlyMode.Bounce }
+    private val pitch by setting("Pitch", 80, 0..90, 1) { autoPitch && mode == FlyMode.Bounce }
     private val jump by setting("Jump", true, "Automatically jumps") { mode == FlyMode.Bounce }
-    @JvmStatic val sprint by setting("Sprint", true) { mode == FlyMode.Bounce }
+    private val flagPause by setting("Flag Pause", 20, 0..100, 1, "How long to pause if the server flags you for a movement check") { mode == FlyMode.Bounce }
 //    private val passObstacles by setting("Pass Obstacles", true, "Automatically paths around obstacles using baritone") { mode == FlyMode.Bounce }
 
-    private val boostSpeed by setting("Boost", 0.02, 0.0..0.5, 0.005, description = "Speed to add when flying")
+    private val boostSpeed by setting("Boost", 0.00, 0.0..0.5, 0.005, description = "Speed to add when flying")
     private val rocketSpeed by setting("Rocket Speed", 0.0, 0.0 ..2.0, description = "Speed multiplier that the rocket gives you") { mode == FlyMode.Enhanced }
 
     private val mute by setting("Mute Elytra", false, "Mutes the elytra sound when gliding")
 
     var jumpThisTick = false
+    var previouslyFlying: Boolean? = null
+    var glidePause = 0
 
     init {
         setDefaultAutomationConfig {
@@ -73,14 +79,27 @@ object ElytraFly : Module(
 
             if (!player.isGliding) {
                 if (takeoff && player.canTakeoff) {
-                    if (player.canOpenElytra) player.startGliding();
+                    if (player.canOpenElytra) {
+                        player.startGliding()
+                        startFlyPacket()
+                    };
                     else jumpThisTick = true
                 }
                 return@listen
             }
 
-            if (mode == FlyMode.Bounce)
-                connection.sendPacket(ClientCommandC2SPacket(player, ClientCommandC2SPacket.Mode.START_FALL_FLYING))
+            if (mode == FlyMode.Bounce) startFlyPacket()
+        }
+
+        listen<TickEvent.Post> {
+            if (glidePause > 0) glidePause--
+        }
+
+        listen<PacketEvent.Receive.Post> { event ->
+            if (event.packet !is PlayerPositionLookS2CPacket) return@listen
+            if (mode == FlyMode.Bounce && player.isGliding) {
+                glidePause = flagPause
+            }
         }
 
         listen<MovementEvent.InputUpdate> { event ->
@@ -103,6 +122,23 @@ object ElytraFly : Module(
         }
     }
 
+    private fun SafeContext.startFlyPacket() =
+        connection.sendPacket(ClientCommandC2SPacket(player, ClientCommandC2SPacket.Mode.START_FALL_FLYING))
+
+    @JvmStatic
+    fun isGliding(): Boolean? = runSafe {
+        val original: Boolean = player.getFlag(Entity.GLIDING_FLAG_INDEX)
+        if (previouslyFlying == null) {
+            previouslyFlying = original
+            return@runSafe original
+        }
+        return if (isEnabled && mode == FlyMode.Bounce && previouslyFlying == true && glidePause <= 0) true
+        else {
+            previouslyFlying = original
+            original
+        }
+    }
+
     @JvmStatic
     fun boostRocket() = runSafe {
         if (mode == FlyMode.Bounce) return@runSafe