replace "Manual pitch override" with "Global automation override"

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

Author: Octol1ttle

src/main/kotlin/ru/octol1ttle/flightassistant/FAKeyMappings.kt

@@ -16,7 +16,7 @@ object FAKeyMappings {
     lateinit var openFlightAssistantSetup: KeyMapping
 
     lateinit var autopilotDisconnect: KeyMapping
-    lateinit var manualPitchOverride: KeyMapping
+    lateinit var globalAutomationOverride: KeyMapping
 
     lateinit var hideCurrentAlert: KeyMapping
     lateinit var showHiddenAlert: KeyMapping
@@ -31,7 +31,7 @@ object FAKeyMappings {
         openFlightAssistantSetup = addKeyMapping("open_flightassistant_setup", GLFW.GLFW_KEY_KP_ENTER)
 
         autopilotDisconnect = addKeyMapping("autopilot_disconnect", GLFW.GLFW_KEY_CAPS_LOCK) // TODO: replace with "Toggle FD", "Toggle A/T", "Toggle AP"
-        manualPitchOverride = addKeyMapping("manual_pitch_override", GLFW.GLFW_KEY_RIGHT_ALT)
+        globalAutomationOverride = addKeyMapping("global_automation_override", GLFW.GLFW_KEY_LEFT_ALT)
 
         hideCurrentAlert = addKeyMapping("hide_current_alert", GLFW.GLFW_KEY_KP_0)
         showHiddenAlert = addKeyMapping("show_hidden_alert", GLFW.GLFW_KEY_KP_DECIMAL)
@@ -65,7 +65,6 @@ object FAKeyMappings {
             }
             computers.autoflight.setAutoPilot(false, alert = false)
         }
-        computers.pitch.manualOverride = manualPitchOverride.isDown
 
         while (hideCurrentAlert.consumeClick()) {
             computers.alert.hideCurrentAlert()

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

@@ -3,6 +3,7 @@ package ru.octol1ttle.flightassistant.impl.computer.autoflight
 import kotlin.math.abs
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
+import ru.octol1ttle.flightassistant.FAKeyMappings
 import ru.octol1ttle.flightassistant.FlightAssistant
 import ru.octol1ttle.flightassistant.api.autoflight.ControlInput
 import ru.octol1ttle.flightassistant.api.autoflight.FlightController
@@ -87,7 +88,8 @@ class AutoFlightComputer(computers: ComputerBus) : Computer(computers), FlightCo
             return
         }
 
-        if (computers.pitch.manualOverride) {
+        if (FAKeyMappings.globalAutomationOverride.isDown) {
+            setAutoThrust(false, alert = false)
             setAutoPilot(false, alert = false)
         }
 

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

@@ -40,7 +40,7 @@ class FireworkComputer(computers: ComputerBus, private val mc: Minecraft) : Comp
             if (player.level().isClientSide() && computers.data.flying && stack.item is FireworkRocketItem) {
                 val explosive = FAConfig.safety.fireworkLockExplosive && !isEmptyOrSafe(player, hand)
                 val anyTerrainAhead = FAConfig.safety.fireworkLockObstacles && anyTerrainAhead()
-                if (explosive || anyTerrainAhead) {
+                if (computers.data.automationsAllowed() && (explosive || anyTerrainAhead)) {
 //? if >=1.21.2 {
                     /*return@RightClickItem net.minecraft.world.InteractionResult.FAIL
 *///?} else

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

@@ -18,7 +18,6 @@ import ru.octol1ttle.flightassistant.api.util.throwIfNotInRange
 
 class PitchComputer(computers: ComputerBus) : Computer(computers), FlightController {
     private val controllers: MutableList<FlightController> = ArrayList()
-    internal var manualOverride: Boolean = false
 
     var minimumPitch: ControlInput? = null
         private set
@@ -85,7 +84,7 @@ class PitchComputer(computers: ComputerBus) : Computer(computers), FlightControl
     }
 
     private fun canMoveOrBlockPitch(): Boolean {
-        return !manualOverride && !computers.protections.protectionsLost && computers.data.automationsAllowed()
+        return computers.data.automationsAllowed() && !computers.protections.protectionsLost
     }
 
     private fun updateSafePitches() {

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

@@ -10,6 +10,7 @@ import net.minecraft.tags.DamageTypeTags
 import net.minecraft.util.Mth
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.phys.Vec3
+import ru.octol1ttle.flightassistant.FAKeyMappings
 import ru.octol1ttle.flightassistant.FlightAssistant
 import ru.octol1ttle.flightassistant.api.computer.Computer
 import ru.octol1ttle.flightassistant.api.computer.ComputerBus
@@ -77,6 +78,9 @@ class AirDataComputer(computers: ComputerBus, private val mc: Minecraft) : Compu
     }
 
     fun automationsAllowed(checkFlying: Boolean = true): Boolean {
+        if (FAKeyMappings.globalAutomationOverride.isDown) {
+            return false
+        }
         return (!checkFlying || flying) && (FAConfig.global.automationsAllowedInOverlays || (mc.screen == null && mc.overlay == null))
     }
 

src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/safety/AlertComputer.kt

@@ -101,7 +101,7 @@ class AlertComputer(computers: ComputerBus, private val soundManager: SoundManag
                 .add(
                     ComputerFaultAlert(
                         computers, PitchComputer.ID, Component.translatable("alert.flightassistant.flight_controls.pitch_fault"), listOf(
-                            Component.translatable("alert.flightassistant.flight_controls.pitch_fault.use_manual_pitch"),
+                            Component.translatable("alert.flightassistant.flight_controls.pitch_fault.use_automation_override"),
                 )))
                 .add(ProtectionsLostAlert(computers))
         )

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

@@ -27,6 +27,9 @@ class AutomationModesDisplay(computers: ComputerBus) : Display(computers) {
     }
 
     override fun render(guiGraphics: GuiGraphics) {
+        if (FAKeyMappings.globalAutomationOverride.isDown) {
+            return
+        }
         renderThrustMode(guiGraphics)
         renderPitchMode(guiGraphics)
         renderInput(guiGraphics, headingDisplay, computers.heading.activeInput)
@@ -76,10 +79,6 @@ class AutomationModesDisplay(computers: ComputerBus) : Display(computers) {
     }
 
     private fun renderPitchMode(guiGraphics: GuiGraphics) {
-        if (computers.pitch.manualOverride) {
-            pitchDisplay.render(guiGraphics, Component.translatable("mode.flightassistant.vertical.override").setColor(cautionColor), ControlInput.Status.ACTIVE, cautionColor)
-            return
-        }
         renderInput(guiGraphics, pitchDisplay, computers.pitch.activeInput)
     }
 
@@ -103,12 +102,14 @@ class AutomationModesDisplay(computers: ComputerBus) : Display(computers) {
             text.appendWithSeparation(Component.translatable("short.flightassistant.autopilot"))
         }
 
-        automationStatusDisplay.render(
-            guiGraphics,
-            if (text.siblings.isNotEmpty()) text else null, ControlInput.Status.ACTIVE,
+        val color =
             if (computers.autoflight.autopilotAlert) warningColor
             else if (computers.autoflight.autoThrustAlert) cautionColor
             else null
+        automationStatusDisplay.render(
+            guiGraphics,
+            if (text.siblings.isNotEmpty()) text else null, ControlInput.Status.ACTIVE,
+            if (FATickCounter.totalTicks % 20 >= 10) color else null
         )
     }
 

src/main/resources/assets/flightassistant/lang/en_us.yml

@@ -48,7 +48,7 @@ alert.flightassistant: # TODO: get rid of alert categories, more flexible alert
     .: F/CTL
     pitch_fault:
       .: PITCH LIMIT FAULT
-      use_manual_pitch: ' -MAN PITCH OVRD: USE'
+      use_automation_override: ' -AUTOMATION OVERRIDE: USE'
     protections_lost:
       .: PROTECT LOST
       enable_air_data: ' -AIR DATA: OFF THEN ON'
@@ -332,7 +332,6 @@ menu.flightassistant:
 
 mode.flightassistant:
   thrust:
-    override: THR OVRD # TODO: single key to override all
     manual:
       .: MAN THR
       reverse: MAN REV
@@ -347,7 +346,6 @@ mode.flightassistant:
     takeoff: THR TO # TODO: fix confusion with TOGA somehow
     landing: THR LAND
   vertical:
-    override: PITCH OVRD # TODO: single key to override all
     void_protection: VOID PROT
     void_escape: VOID ESC
     stall_protection: STALL PROT
@@ -422,7 +420,7 @@ key.flightassistant:
   toggle_enabled: Toggle mod enabled
   open_flightassistant_setup: Open FlightAssistant setup screen
   autopilot_disconnect: Disconnect autopilot
-  manual_pitch_override: Manual pitch override (hold)
+  global_automation_override: Global automation override (hold)
   hide_current_alert: Hide currently active alert
   show_hidden_alert: Show last hidden alert
   thrust:

src/main/resources/assets/flightassistant/lang/ru_ru.yml

@@ -52,7 +52,7 @@ alert.flightassistant:
     .: УПР/ПОЛЕТ
     pitch_fault:
       .: ОТКАЗ ОГРАН УГЛА НАКЛ
-      use_manual_pitch: ' -РУЧН УПР УГЛ НАКЛ: ИСПОЛЬЗ'
+      use_automation_override: ' -ПРИНУД ОТКЛ АВТОМАТ: ИСПОЛЬЗ'
     protections_lost:
       .: ЗАЩИТЫ ПОТЕРЯНЫ
       enable_air_data: ' -КОМП ДАННЫХ ПОЛЕТА: ВЫКЛ ЗАТЕМ ВКЛ'
@@ -425,7 +425,7 @@ key.flightassistant:
   toggle_enabled: Включить/выключить мод
   open_flight_setup: Открыть экран настройки полёта
   autopilot_disconnect: Отключить автопилот
-  manual_pitch_override: Принудительное ручное управление углом наклона (зажать)
+  global_automation_override: Принудительное отключение автоматики (зажать)
   hide_current_alert: Скрыть активное предупреждение
   show_hidden_alert: Показать скрытое предупреждение
   thrust: