fix a/thr not disconnecting on manual input

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

Author: Octol1ttle

src/main/kotlin/ru/octol1ttle/flightassistant/api/util/MathHelper.kt

@@ -1,6 +1,6 @@
 package ru.octol1ttle.flightassistant.api.util
 
-import kotlin.math.*
+import kotlin.math.PI
 
 fun degrees(value: Float): Float {
     return (value * (180.0f / PI)).toFloat()
@@ -18,14 +18,6 @@ fun radians(value: Double): Double {
     return (value * (PI / 180.0))
 }
 
-fun furtherFromZero(value: Float): Int {
-    return if (value < 0.0f) {
-        floor(value).toInt()
-    } else {
-        ceil(value).toInt()
-    }
-}
-
 fun Float.requireFinite(): Float {
     require(this.isFinite()) {
         "Float value invalid; expected finite value, got $this"

src/main/kotlin/ru/octol1ttle/flightassistant/api/util/extensions/CollectionExtensions.kt

@@ -30,13 +30,3 @@ fun List<AlertData>.getHighestPriority(): List<AlertData> {
 fun <T> List<T>.filterWorking(): List<T> {
     return this.filter { it !is Computer || !it.isDisabledOrFaulted() }
 }
-
-fun <E, T : MutableList<E>> T.clearAndAdd(element: E) {
-    this.clear()
-    this.add(element)
-}
-
-fun <E, T : MutableList<E>> T.clearAndAdd(vararg elements: E) {
-    this.clear()
-    this.addAll(elements)
-}

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

@@ -47,8 +47,8 @@ class AutoFlightComputer(computers: ComputerView) : Computer(computers), FlightC
         HeadingControllerRegistrationCallback.EVENT.register { it.accept(this) }
         RollControllerRegistrationCallback.EVENT.register { it.accept(this) }
         ThrustChangeCallback.EVENT.register(ThrustChangeCallback { _, _, input ->
-            if (input == null && autoThrustAlert) {
-                autoThrustAlert = false
+            if (input == null) {
+                setAutoThrust(false, alert = false)
             }
         })
         EntityTurnEvents.X_ROT.register(EntityTurnEvents.EntityTurn { pitchDelta, output ->

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

@@ -119,6 +119,5 @@ class ThrustComputer(computers: ComputerView) : Computer(computers) {
 
     companion object {
         val ID: ResourceLocation = FlightAssistant.id("thrust")
-        const val TOGA_THRESHOLD: Float = 0.99f // TODO: just hardcode it to 1.0f bruh
     }
 }

src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/AutomationModesDisplay.kt

@@ -14,9 +14,7 @@ import ru.octol1ttle.flightassistant.api.display.Display
 import ru.octol1ttle.flightassistant.api.display.HudFrame
 import ru.octol1ttle.flightassistant.api.util.FATickCounter
 import ru.octol1ttle.flightassistant.api.util.extensions.*
-import ru.octol1ttle.flightassistant.api.util.furtherFromZero
 import ru.octol1ttle.flightassistant.config.FAConfig
-import ru.octol1ttle.flightassistant.impl.computer.autoflight.base.ThrustComputer.Companion.TOGA_THRESHOLD
 
 class AutomationModesDisplay(computers: ComputerView) : Display(computers) {
     private val thrustDisplay: ModeDisplay = ModeDisplay(1)
@@ -51,12 +49,11 @@ class AutomationModesDisplay(computers: ComputerView) : Display(computers) {
             return
         }
 
-        val thrustValueText: MutableComponent = Component.literal(furtherFromZero(computers.thrust.current * 100).toString() + "%").setColor(primaryColor)
         if (computers.thrust.thrustLocked) {
             thrustDisplay.render(
                 guiGraphics,
-                if (computers.thrust.current > TOGA_THRESHOLD) Component.translatable("mode.flightassistant.thrust.locked_toga").setColor(primaryColor)
-                else Component.translatable("mode.flightassistant.thrust.locked", thrustValueText).setColor(primaryColor),
+                if (computers.thrust.current == 1.0f) Component.translatable("mode.flightassistant.thrust.locked_toga").setColor(primaryColor)
+                else Component.translatable("mode.flightassistant.thrust.locked").setColor(primaryColor),
                 false,
                 if (FATickCounter.totalTicks % 20 >= 10) cautionColor else emptyColor
             )
@@ -67,10 +64,9 @@ class AutomationModesDisplay(computers: ComputerView) : Display(computers) {
         if (computers.thrust.current != 0.0f) {
             thrustDisplay.render(
                 guiGraphics,
-                if (computers.thrust.current > TOGA_THRESHOLD) Component.translatable("mode.flightassistant.thrust.manual_toga").setColor(secondaryColor)
-                else Component.translatable("mode.flightassistant.thrust.manual", thrustValueText),
-                computers.thrust.current == 0.0f || computers.thrust.current > TOGA_THRESHOLD,
-                if (thrustUnusable) cautionColor else null
+                if (computers.thrust.current == 1.0f) Component.translatable("mode.flightassistant.thrust.manual_toga").setColor(secondaryColor)
+                else Component.translatable("mode.flightassistant.thrust.manual"),
+                false, if (thrustUnusable) cautionColor else secondaryColor
             )
             return
         }