bounce elytra fly y motion setting with speed limit and y motion start speed settings

Author: beanbag44

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

@@ -17,7 +17,6 @@
 
 package com.lambda.mixin.entity;
 
-import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.PlayerEvent;
@@ -40,6 +39,7 @@
 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;
 
@@ -51,6 +51,9 @@ public void move(MovementType movementType, Vec3d movement) {}
     @Shadow
     public abstract float getYaw();
 
+    @Shadow
+    private Vec3d velocity;
+
     /**
      * Modifies the player yaw when there is an active rotation to apply the player velocity correctly
      */
@@ -186,4 +189,10 @@ private EntityPose injectGetPose(EntityPose original) {
     private float modifyGetYaw(float original) {
         return (Object) this == getMc().player ? RotationManager.getServerRotation().getYawF() : original;
     }
+
+    @Inject(method = "getVelocity", at = @At("HEAD"), cancellable = true)
+    private void injectGetVelocity(CallbackInfoReturnable<Vec3d> cir) {
+        if (ElytraFly.INSTANCE.isDisabled() || ElytraFly.getMode() != ElytraFly.FlyMode.Bounce) return;
+        cir.setReturnValue(ElytraFly.getModifiedBounceVelocity(velocity));
+    }
 }

src/main/kotlin/com/lambda/module/hud/Speedometer.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.module.hud
 
+import com.lambda.context.SafeContext
 import com.lambda.event.events.TickEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.gui.dsl.ImGuiBuilder
@@ -39,15 +40,10 @@ object Speedometer : HudModule(
     var speed: Double = 0.0
 
     init {
-        listen<TickEvent.Post> {
+        listen<TickEvent.Post>(alwaysListen = true) {
             previousPos = currentPos
             currentPos = player.pos
-
-            var vecDelta = player.pos.subtract(previousPos)
-            if (onlyHorizontal) {
-                vecDelta = Vec3d(vecDelta.x, 0.0, vecDelta.z)
-            }
-            speed = speedUnit.convertFromMinecraft(vecDelta.length())
+            speed = calculateSpeed()
         }
 
         onEnable {
@@ -59,6 +55,18 @@ object Speedometer : HudModule(
         onDisable { speed = 0.0 }
     }
 
+    context(safeContext: SafeContext)
+    fun calculateSpeed(
+        onlyHorizontal: Boolean = this.onlyHorizontal,
+        speedUnit: SpeedUnit = this.speedUnit
+    ) = with(safeContext) {
+        var vecDelta = player.pos.subtract(previousPos)
+        if (onlyHorizontal) {
+            vecDelta = Vec3d(vecDelta.x, 0.0, vecDelta.z)
+        }
+        speedUnit.convertFromMinecraft(vecDelta.length())
+    }
+
     override fun ImGuiBuilder.buildLayout() {
         runSafe {
             text("Speed: %.2f %s".format(speed, speedUnit.unitName))

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

@@ -39,6 +39,8 @@ import com.lambda.util.player.SlotUtils.hotbarAndInventoryStacks
 import com.lambda.util.player.SlotUtils.hotbarStacks
 import com.lambda.util.player.hasFirework
 import com.lambda.interaction.material.StackSelection.Companion.selectStack
+import com.lambda.module.hud.Speedometer
+import com.lambda.util.SpeedUnit
 import net.minecraft.component.DataComponentTypes
 import net.minecraft.entity.Entity
 import net.minecraft.item.ItemStack
@@ -55,12 +57,15 @@ object ElytraFly : Module(
     tag = ModuleTag.MOVEMENT,
 ) {
     @JvmStatic val mode by setting("Mode", FlyMode.Bounce)
-    private val inventory by setting("Inventory", true, "Allow using fireworks from the players inventory")
+    private val inventory by setting("Inventory", true, "Allow using fireworks from the players inventory") { mode == FlyMode.GrimControl }
 
     //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", 80, 0..90, 1) { autoPitch && mode == FlyMode.Bounce }
+    private val yMotion by setting("Y Motion", false, "Cancels the players y velocity to aid speed") { mode == FlyMode.Bounce }
+    private val yMotionStartSpeed by setting("Y Motion Start Speed", 20, 5..30, 1, "bps") { mode == FlyMode.Bounce && yMotion }
+    private val speedLimit by setting("Speed Limit", 110, 10..720, 1, "bps") { mode == FlyMode.Bounce && yMotion }
     private val jump by setting("Jump", true, "Automatically jumps") { 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 }
@@ -85,8 +90,11 @@ object ElytraFly : Module(
         }
 
         listen<TickEvent.Pre> {
-            if (mode == FlyMode.GrimControl) onTickGrimControl()
-            else if (mode == FlyMode.Bounce) onTickBounce()
+            when (mode) {
+                FlyMode.Bounce -> onTickBounce()
+                FlyMode.GrimControl -> onTickGrimControl()
+                else -> {}
+            }
         }
 
         listen<TickEvent.Post> {
@@ -170,9 +178,22 @@ object ElytraFly : Module(
             return
         }
 
-        startFlyPacket()
+        if (!player.getFlag(Entity.GLIDING_FLAG_INDEX) || yMotion) {
+            player.setFlag(Entity.GLIDING_FLAG_INDEX, true)
+            startFlyPacket()
+        }
     }
 
+    @JvmStatic
+    fun getModifiedBounceVelocity(original: Vec3d) =
+        runSafe {
+            if (!yMotion || !player.isGliding || !player.isOnGround) return@runSafe original
+            val speed = Speedometer.calculateSpeed(true, SpeedUnit.BlocksPerSecond)
+            if (speed >= speedLimit) return@runSafe original
+            if (speed <= yMotionStartSpeed) return@runSafe original
+            Vec3d(original.x, 0.0, original.z)
+        } ?: original
+
     private fun SafeContext.startFlyPacket() =
         connection.sendPacket(ClientCommandC2SPacket(player, ClientCommandC2SPacket.Mode.START_FALL_FLYING))
 

src/main/kotlin/com/lambda/module/modules/world/AirPlace.kt

@@ -68,6 +68,7 @@ object AirPlace : Module(
 
 	private var distance by setting("Distance", 4.0, 1.0..7.0, 0.01).group(Group.General)
 	private val distanceScrollBind by setting("Distance Scroll Bind", Bind(KeyCode.Unbound.code, GLFW.GLFW_MOD_CONTROL), "Allows you to hold the given key and scroll to adjust distance").group(Group.General)
+	// Credit to THCFree for the rotation scroll idea
 	private val rotationScrollBind by setting("Rotation Scroll Bind", Bind(KeyCode.Unbound.code, GLFW.GLFW_MOD_ALT), "Allows you to hold the given key and scroll to adjust the rotation of the block you're placing").group(Group.General)
 
 	private val renderState by setting("Render State", true).group(Group.Render)