improve speed thrust mode

Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>

Author: Octol1ttle

src/main/java/ru/octol1ttle/flightassistant/mixin/EntityInvoker.java

@@ -6,7 +6,7 @@
 @Mixin(Entity.class)
 public interface EntityInvoker {
 //? if >=1.21.2 {
-    /*@org.spongepowered.asm.mixin.gen.Invoker
+    /*@org.spongepowered.asm.mixin.gen.Invoker("isInvulnerableToBase)
     boolean invokeIsInvulnerableToBase(net.minecraft.world.damagesource.DamageSource damageSource);
 *///?}
 }

src/main/kotlin/ru/octol1ttle/flightassistant/api/autoflight/thrust/BuiltInThrustModes.kt

@@ -13,8 +13,8 @@ data class SpeedThrustMode(val target: Int) : AutoFlightComputer.ThrustMode {
         val currentSpeed: Double = computers.data.forwardVelocity.length() * 20
         val acceleration: Double = computers.data.forwardAcceleration.length() * 20
 
-        val speedCorrection: Double = (target - currentSpeed) * FATickCounter.timePassed.pow(2)
-        val accelerationDamping: Double = -acceleration * FATickCounter.timePassed.pow(4)
+        val speedCorrection: Double = (target - currentSpeed) * FATickCounter.timePassed.pow(1.5f)
+        val accelerationDamping: Double = -acceleration * FATickCounter.timePassed
         return ControlInput(
             (currentThrust + speedCorrection + accelerationDamping).toFloat().coerceIn(0.0f..1.0f),
             ControlInput.Priority.NORMAL,
@@ -25,6 +25,7 @@ data class SpeedThrustMode(val target: Int) : AutoFlightComputer.ThrustMode {
 
 data class SpeedReferenceVerticalMode(val targetSpeed: Int) : AutoFlightComputer.VerticalMode {
     override fun getControlInput(computers: ComputerView): ControlInput {
+        // TODO: find a way to fix jittering
         val range: Float = computers.thrust.getOptimumClimbPitch() - computers.thrust.getAltitudeHoldPitch()
         val currentPitch: Float = computers.data.pitch
         val currentSpeed: Double = computers.data.forwardVelocity.length() * 20

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/AirDataComputer.kt

@@ -81,11 +81,8 @@ class AirDataComputer(computers: ComputerView, private val mc: Minecraft) : Comp
         position = player.getPosition(partialTick)
         groundY = computeGroundLevel()
         velocity = player.getDeltaMovementLerped(partialTick)
-
-        val newForwardVelocity: Vec3 = computeForwardVelocity()
-        forwardAcceleration = newForwardVelocity.subtract(forwardVelocity)
-        forwardVelocity = newForwardVelocity
-
+        forwardVelocity = computeForwardVector(velocity)
+        forwardAcceleration = computeForwardVector(player.deltaMovement.subtract(player.getDeltaMovementLerped(0.0f)))
         roll = degrees(atan2(-RenderMatrices.worldSpaceMatrix.m10(), RenderMatrices.worldSpaceMatrix.m11()))
     }
 
@@ -126,10 +123,10 @@ class AirDataComputer(computers: ComputerView, private val mc: Minecraft) : Comp
         return result.location.y
     }
 
-    private fun computeForwardVelocity(): Vec3 {
+    private fun computeForwardVector(vector: Vec3): Vec3 {
         val normalizedLookAngle: Vec3 = player.lookAngle.normalize()
-        val normalizedVelocity: Vec3 = velocity.normalize()
-        return velocity.scale(normalizedLookAngle.dot(normalizedVelocity).coerceAtLeast(0.0))
+        val normalizedVector: Vec3 = vector.normalize()
+        return vector.scale(normalizedLookAngle.dot(normalizedVector).coerceAtLeast(0.0))
     }
 
     override fun reset() {

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/FlightPlanComputer.kt

@@ -74,5 +74,5 @@ class FlightPlanComputer(computers: ComputerView) : Computer(computers) {
         CLIMB
     }
 
-    data class DepartureData(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val elevation: Int = 0, val takeoffThrust: Float = 0.0f, val minimumClimbSpeed: Int = 0)
+    data class DepartureData(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val elevation: Int = 0, val takeoffThrust: Float = 1.0f, val minimumClimbSpeed: Int = 15)
 }