now things happen

Octol1ttle · Octol1ttle · commit 018a0f647a81 · 2025-08-16T01:56:26.000+05:00
Signed-off-by: Octol1ttle &lt;l1ttleofficial@outlook.com&gt;
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/flight_controls/ProtectionsLostAlert.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/alert/flight_controls/ProtectionsLostAlert.kt
@@ -15,7 +15,7 @@ class ProtectionsLostAlert(computers: ComputerBus) : Alert(computers), ECAMAlert
     override val data: AlertData = AlertData.MASTER_CAUTION
 
     override fun shouldActivate(): Boolean {
-        return computers.protections.protectionsLost
+        return computers.protections.isDisabledOrFaulted()
     }
 
     override fun render(guiGraphics: GuiGraphics, firstLineX: Int, otherLinesX: Int, firstLineY: Int): Int {
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/FlightPlanComputer.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/FlightPlanComputer.kt
@@ -1,28 +1,33 @@
 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.FlightAssistant
 import ru.octol1ttle.flightassistant.api.computer.Computer
 import ru.octol1ttle.flightassistant.api.computer.ComputerBus
+import ru.octol1ttle.flightassistant.api.computer.ComputerQuery
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.builtin.SpeedReferenceVerticalMode
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.builtin.TakeoffThrustMode
+import ru.octol1ttle.flightassistant.impl.display.StatusDisplay
 
 class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
-    private var currentPhase: FlightPhase = FlightPhase.ON_GROUND
-    var departureData: DepartureData = DepartureData()
+    var currentPhase: FlightPhase = FlightPhase.ON_GROUND
+        private set
+    var departureData: DepartureData = DepartureData.DEFAULT
+    val enrouteData: MutableList<EnrouteWaypoint> = ArrayList()
 
     override fun tick() {
         currentPhase = updateFlightPhase()
     }
 
     private fun updateFlightPhase(): FlightPhase {
-        if (computers.data.player.onGround()) {
-            return FlightPhase.ON_GROUND
+        if (!departureData.isDefault() && abs(computers.data.position.x - departureData.coordinatesX) < 20 && abs(computers.data.position.z - departureData.coordinatesZ) < 20) {
+            return FlightPhase.TAKEOFF
         }
 
-        if (abs(computers.data.position.x - departureData.coordinatesX) < 20 && abs(computers.data.position.z - departureData.coordinatesZ) < 20) {
-            return FlightPhase.TAKEOFF
+        if (!computers.data.flying) {
+            return FlightPhase.ON_GROUND
         }
         if (currentPhase == FlightPhase.TAKEOFF) {
             return FlightPhase.TAKEOFF
@@ -46,7 +51,15 @@ class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
     }
 
     fun getLateralMode(): AutoFlightComputer.LateralMode? {
-        return null
+        return when (currentPhase) {
+            else -> null
+        }
+    }
+
+    override fun <Response> processQuery(query: ComputerQuery<Response>) {
+        if (query is StatusDisplay.StatusMessageQuery && currentPhase != FlightPhase.UNKNOWN && (!departureData.isDefault() || enrouteData.isNotEmpty())) {
+            query.respond(Component.translatable("status.flightassistant.flight_phase.${currentPhase.name.lowercase()}"))
+        }
     }
 
     override fun reset() {
@@ -64,7 +77,15 @@ class FlightPlanComputer(computers: ComputerBus) : Computer(computers) {
         CLIMB
     }
 
-    data class DepartureData(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val elevation: Int = 0, val takeoffThrust: Float = 1.0f, val minimumClimbSpeed: Int = 15)
+    data class DepartureData(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val elevation: Int = 0, val takeoffThrust: Float = 1.0f, val minimumClimbSpeed: Int = 15) {
+        fun isDefault(): Boolean {
+            return this == DEFAULT
+        }
+
+        companion object {
+            val DEFAULT: DepartureData = DepartureData()
+        }
+    }
     data class EnrouteWaypoint(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val altitude: Int = 0, val speed: Int = 0, val active: Active? = null) {
         enum class Active {
             ORIGIN,
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInLateralModes.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/autoflight/builtin/BuiltInLateralModes.kt
@@ -8,7 +8,7 @@ import ru.octol1ttle.flightassistant.api.util.degrees
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.AutoFlightComputer
 
 data class HeadingLateralMode(val target: Int) : AutoFlightComputer.LateralMode {
-    override fun getControlInput(computers: ComputerBus): ControlInput? {
+    override fun getControlInput(computers: ComputerBus): ControlInput {
         return ControlInput(
             target.toFloat(),
             ControlInput.Priority.NORMAL,
@@ -17,12 +17,18 @@ data class HeadingLateralMode(val target: Int) : AutoFlightComputer.LateralMode
     }
 }
 
-data class CoordinatesLateralMode(val targetX: Int, val targetZ: Int) : AutoFlightComputer.LateralMode {
-    override fun getControlInput(computers: ComputerBus): ControlInput? {
+data class DirectCoordinatesLateralMode(val targetX: Int, val targetZ: Int) : AutoFlightComputer.LateralMode {
+    override fun getControlInput(computers: ComputerBus): ControlInput {
         return ControlInput(
             degrees(atan2(-(targetX - computers.data.position.x), targetZ - computers.data.position.z)).toFloat() + 180.0f,
             ControlInput.Priority.NORMAL,
-            Component.translatable("mode.flightassistant.lateral.selected_coordinates")
+            Component.translatable("mode.flightassistant.lateral.direct_coordinates")
         )
     }
+}
+
+data class TrackNavigationLateralMode(val originX: Int, val originZ: Int, val targetX: Int, val targetZ: Int) : AutoFlightComputer.LateralMode {
+    override fun getControlInput(computers: ComputerBus): ControlInput {
+        TODO()
+    }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/CoordinatesDisplay.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/display/CoordinatesDisplay.kt
@@ -10,7 +10,7 @@ import ru.octol1ttle.flightassistant.api.display.HudFrame
 import ru.octol1ttle.flightassistant.api.util.extensions.*
 import ru.octol1ttle.flightassistant.config.FAConfig
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.AutoFlightComputer
-import ru.octol1ttle.flightassistant.impl.computer.autoflight.builtin.CoordinatesLateralMode
+import ru.octol1ttle.flightassistant.impl.computer.autoflight.builtin.DirectCoordinatesLateralMode
 
 class CoordinatesDisplay(computers: ComputerBus) : Display(computers) {
     override fun allowedByConfig(): Boolean {
@@ -29,7 +29,7 @@ class CoordinatesDisplay(computers: ComputerBus) : Display(computers) {
 
             val color: Int
             val active: AutoFlightComputer.LateralMode? = computers.autoflight.activeLateralMode
-            if (FAConfig.display.showAutomationModes && computers.autoflight.getHeadingInput() != null && active is CoordinatesLateralMode) {
+            if (FAConfig.display.showAutomationModes && computers.autoflight.getHeadingInput() != null && active is DirectCoordinatesLateralMode) {
                 color = if (active == computers.autoflight.selectedLateralMode) primaryAdvisoryColor else secondaryAdvisoryColor
                 drawString(active.targetX.toString(), x + textWidth(xText) + 3, y, color)
                 drawString(active.targetX.toString(), x + textWidth(zText) + 3, y + lineHeight, color)
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/autoflight/AutoFlightScreenState.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/autoflight/AutoFlightScreenState.kt
@@ -33,7 +33,7 @@ class AutoFlightScreenState {
         }
         autoFlight.selectedLateralMode = when (lateralMode) {
             LateralMode.HEADING -> HeadingLateralMode(targetHeading)
-            LateralMode.COORDINATES -> CoordinatesLateralMode(targetCoordinatesX, targetCoordinatesZ)
+            LateralMode.COORDINATES -> DirectCoordinatesLateralMode(targetCoordinatesX, targetCoordinatesZ)
             LateralMode.FLIGHT_PLAN -> null
         }
     }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/departure/DepartureScreenState.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/departure/DepartureScreenState.kt
@@ -9,11 +9,11 @@ data class DepartureScreenState(
     var takeoffThrustPercent: Int = 100,
     var minimumClimbSpeed: Int = 15
 ) {
-    fun save(flightPlan: FlightPlanComputer) {
-        flightPlan.departureData = FlightPlanComputer.DepartureData(coordinatesX, coordinatesZ, elevation, takeoffThrustPercent / 100.0f, minimumClimbSpeed)
-    }
-
     fun load(flightPlan: FlightPlanComputer) {
         TODO()
     }
+
+    fun save(flightPlan: FlightPlanComputer) {
+        flightPlan.departureData = FlightPlanComputer.DepartureData(coordinatesX, coordinatesZ, elevation, takeoffThrustPercent / 100.0f, minimumClimbSpeed)
+    }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteScreen.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteScreen.kt
@@ -45,6 +45,7 @@ class EnrouteScreen(parent: Screen) : FABaseScreen(parent, Component.translatabl
 
         save = this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.save")) { _: Button? ->
             lastState = state.copy()
+            state.save(computers.plan)
             list.rebuildEntries()
         }.pos(this.width - 180, this.height - 30).width(80).build())
 
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteScreenState.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteScreenState.kt
@@ -5,10 +5,14 @@ import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer
 class EnrouteScreenState(
     val waypoints: MutableList<Waypoint> = ArrayList()
 ) {
-    fun save(flightPlan: FlightPlanComputer) {
+    fun load(flightPlan: FlightPlanComputer) {
+        this.waypoints.clear()
+        this.waypoints.addAll(flightPlan.enrouteData.map { Waypoint(it.coordinatesX, it.coordinatesZ, it.altitude, it.speed, it.active) })
     }
 
-    fun load(flightPlan: FlightPlanComputer) {
+    fun save(flightPlan: FlightPlanComputer) {
+        flightPlan.enrouteData.clear()
+        flightPlan.enrouteData.addAll(this.waypoints.map(Waypoint::toEnrouteWaypoint))
     }
 
     fun copy(): EnrouteScreenState {
@@ -28,8 +32,8 @@ class EnrouteScreenState(
     }
 
     data class Waypoint(var coordinatesX: Int = 0, var coordinatesZ: Int = 0, var altitude: Int = 0, var speed: Int = 0, var active: FlightPlanComputer.EnrouteWaypoint.Active? = null) {
-        fun toEnrouteWaypoint() {
-            TODO()
+        fun toEnrouteWaypoint(): FlightPlanComputer.EnrouteWaypoint {
+            return FlightPlanComputer.EnrouteWaypoint(coordinatesX, coordinatesZ, altitude, speed, active)
         }
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteWaypointsList.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteWaypointsList.kt
@@ -56,7 +56,8 @@ class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, val columns: Float, val
             this.index = index
             this.hovering = hovering
             this.directToButton.active = getActiveSymbol() != DIRECT_TO_SYMBOL
-            this.directToButton.tooltip = Tooltip.create(DIRECT_TO_TOOLTIP_TEXT)
+            @Suppress("UsePropertyAccessSyntax")
+            this.directToButton.setTooltip(Tooltip.create(DIRECT_TO_TOOLTIP_TEXT))
             if (index == 0) {
                 this.moveUpButton.active = false
             }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ProtectionsLostAlert(computers: ComputerBus) : Alert(computers), ECAMAlert`
`15`	`15`	`override val data: AlertData = AlertData.MASTER_CAUTION`
`16`	`16`
`17`	`17`	`override fun shouldActivate(): Boolean {`
`18`		`- return computers.protections.protectionsLost`
	`18`	`+ return computers.protections.isDisabledOrFaulted()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun render(guiGraphics: GuiGraphics, firstLineX: Int, otherLinesX: Int, firstLineY: Int): Int {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import ru.octol1ttle.flightassistant.api.util.degrees`
`8`	`8`	`import ru.octol1ttle.flightassistant.impl.computer.autoflight.AutoFlightComputer`
`9`	`9`
`10`	`10`	`data class HeadingLateralMode(val target: Int) : AutoFlightComputer.LateralMode {`
`11`		`- override fun getControlInput(computers: ComputerBus): ControlInput? {`
	`11`	`+ override fun getControlInput(computers: ComputerBus): ControlInput {`
`12`	`12`	`return ControlInput(`
`13`	`13`	`target.toFloat(),`
`14`	`14`	`ControlInput.Priority.NORMAL,`
`@@ -17,12 +17,18 @@ data class HeadingLateralMode(val target: Int) : AutoFlightComputer.LateralMode`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
`20`		`-data class CoordinatesLateralMode(val targetX: Int, val targetZ: Int) : AutoFlightComputer.LateralMode {`
`21`		`- override fun getControlInput(computers: ComputerBus): ControlInput? {`
	`20`	`+data class DirectCoordinatesLateralMode(val targetX: Int, val targetZ: Int) : AutoFlightComputer.LateralMode {`
	`21`	`+ override fun getControlInput(computers: ComputerBus): ControlInput {`
`22`	`22`	`return ControlInput(`
`23`	`23`	`degrees(atan2(-(targetX - computers.data.position.x), targetZ - computers.data.position.z)).toFloat() + 180.0f,`
`24`	`24`	`ControlInput.Priority.NORMAL,`
`25`		`- Component.translatable("mode.flightassistant.lateral.selected_coordinates")`
	`25`	`+ Component.translatable("mode.flightassistant.lateral.direct_coordinates")`
`26`	`26`	`)`
`27`	`27`	`}`
	`28`	`+}`
	`29`	`+`
	`30`	`+data class TrackNavigationLateralMode(val originX: Int, val originZ: Int, val targetX: Int, val targetZ: Int) : AutoFlightComputer.LateralMode {`
	`31`	`+ override fun getControlInput(computers: ComputerBus): ControlInput {`
	`32`	`+ TODO()`
	`33`	`+ }`
`28`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class AutoFlightScreenState {`
`33`	`33`	`}`
`34`	`34`	`autoFlight.selectedLateralMode = when (lateralMode) {`
`35`	`35`	`LateralMode.HEADING -> HeadingLateralMode(targetHeading)`
`36`		`- LateralMode.COORDINATES -> CoordinatesLateralMode(targetCoordinatesX, targetCoordinatesZ)`
	`36`	`+ LateralMode.COORDINATES -> DirectCoordinatesLateralMode(targetCoordinatesX, targetCoordinatesZ)`
`37`	`37`	`LateralMode.FLIGHT_PLAN -> null`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,14 @@ import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer`
`5`	`5`	`class EnrouteScreenState(`
`6`	`6`	`val waypoints: MutableList<Waypoint> = ArrayList()`
`7`	`7`	`) {`
`8`		`- fun save(flightPlan: FlightPlanComputer) {`
	`8`	`+ fun load(flightPlan: FlightPlanComputer) {`
	`9`	`+ this.waypoints.clear()`
	`10`	`+ this.waypoints.addAll(flightPlan.enrouteData.map { Waypoint(it.coordinatesX, it.coordinatesZ, it.altitude, it.speed, it.active) })`
`9`	`11`	`}`
`10`	`12`
`11`		`- fun load(flightPlan: FlightPlanComputer) {`
	`13`	`+ fun save(flightPlan: FlightPlanComputer) {`
	`14`	`+ flightPlan.enrouteData.clear()`
	`15`	`+ flightPlan.enrouteData.addAll(this.waypoints.map(Waypoint::toEnrouteWaypoint))`
`12`	`16`	`}`
`13`	`17`
`14`	`18`	`fun copy(): EnrouteScreenState {`
`@@ -28,8 +32,8 @@ class EnrouteScreenState(`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`data class Waypoint(var coordinatesX: Int = 0, var coordinatesZ: Int = 0, var altitude: Int = 0, var speed: Int = 0, var active: FlightPlanComputer.EnrouteWaypoint.Active? = null) {`
`31`		`- fun toEnrouteWaypoint() {`
`32`		`- TODO()`
	`35`	`+ fun toEnrouteWaypoint(): FlightPlanComputer.EnrouteWaypoint {`
	`36`	`+ return FlightPlanComputer.EnrouteWaypoint(coordinatesX, coordinatesZ, altitude, speed, active)`
`33`	`37`	`}`
`34`	`38`	`}`
`35`	`39`	`}`