start work on the enroute list

Octol1ttle · Octol1ttle · commit 325e7451230a · 2025-08-14T02:57:53.000+05:00
Signed-off-by: Octol1ttle &lt;l1ttleofficial@outlook.com&gt;
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantFabric.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantFabric.kt
@@ -3,16 +3,13 @@ package ru.octol1ttle.flightassistant
 //? if fabric {
 import dev.architectury.registry.client.keymappings.KeyMappingRegistry
 import net.fabricmc.api.ClientModInitializer
-import net.minecraft.client.KeyMapping
 import nl.enjarai.doabarrelroll.compat.flightassistant.DaBRCompatFA
 
 object FlightAssistantFabric : ClientModInitializer {
     override fun onInitializeClient() {
         FlightAssistant.init()
         DaBRCompatFA.init()
-        for (keyMapping: KeyMapping in FAKeyMappings.keyMappings) {
-            KeyMappingRegistry.register(keyMapping)
-        }
+        FAKeyMappings.keyMappings.forEach(KeyMappingRegistry::register)
     }
 }
 //?}
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/config/FAConfigScreen.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/config/FAConfigScreen.kt
@@ -9,7 +9,8 @@ import ru.octol1ttle.flightassistant.config.options.DisplayOptions
 import ru.octol1ttle.flightassistant.config.options.GlobalOptions
 import ru.octol1ttle.flightassistant.config.options.SafetyOptions
 
-@Suppress("UnusedVariable", "unused") object FAConfigScreen {
+object FAConfigScreen {
+    @Suppress("unused", "UnusedVariable")
     fun generate(parent: Screen?): Screen {
         return YetAnotherConfigLib(FlightAssistant.MOD_ID) {
             val global: ConfigCategory by registerGlobalOptions(
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/ComputerHost.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/ComputerHost.kt
@@ -92,12 +92,8 @@ internal object ComputerHost : ModuleController<Computer>, ComputerBus {
     internal fun sendRegistrationEvent() {
         registerBuiltin()
         ComputerRegistrationCallback.EVENT.invoker().register(this, this::register)
-        for (computer: Computer in computers.values) {
-            computer.subscribeToEvents()
-        }
-        for (computer: Computer in computers.values) {
-            computer.invokeEvents()
-        }
+        computers.values.forEach(Computer::subscribeToEvents)
+        computers.values.forEach(Computer::invokeEvents)
 
         logRegisterComplete()
     }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/safety/AlertComputer.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/impl/computer/safety/AlertComputer.kt
@@ -189,9 +189,7 @@ class AlertComputer(computers: ComputerBus, private val soundManager: SoundManag
 
         categories.sortBy { it.getHighestPriority() ?: Int.MAX_VALUE }
 
-        for (list: ChangeTrackingArrayList<Alert> in alertLists.values) {
-            list.startTracking()
-        }
+        alertLists.values.forEach(ChangeTrackingArrayList<*>::startTracking)
 
         for (alert: Alert in categories.flatMap { it.activeAlerts } ) {
             alertLists.computeIfAbsent(alert.data) { return@computeIfAbsent ChangeTrackingArrayList<Alert>() }.add(alert)
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/FlightAssistantSetupScreen.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/FlightAssistantSetupScreen.kt
@@ -1,5 +1,6 @@
 package ru.octol1ttle.flightassistant.screen
 
+import dev.architectury.platform.Platform
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.components.StringWidget
 import net.minecraft.network.chat.CommonComponents
@@ -40,10 +41,10 @@ class FlightAssistantSetupScreen : FABaseScreen(Component.translatable("menu.fli
         }.pos(this.centerX - 160, this.centerY + 20).width(100).build())
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.enroute")) {
             this.minecraft!!.setScreen(EnrouteScreen())
-        }.pos(this.centerX - 50, this.centerY + 20).width(100).build()).active = false
+        }.pos(this.centerX - 50, this.centerY + 20).width(100).build()).active = Platform.isDevelopmentEnvironment()
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.arrival")) {
             //this.minecraft!!.setScreen(FlightPlanScreen())
-        }.pos(this.centerX + 60, this.centerY + 20).width(100).build()).active = false
+        }.pos(this.centerX + 60, this.centerY + 20).width(100).build()).active = Platform.isDevelopmentEnvironment()
 
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.config")) {
             this.minecraft!!.setScreen(FAConfigScreen.generate(null))
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/CycleTextOnlyButton.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/CycleTextOnlyButton.kt
@@ -28,7 +28,7 @@ class CycleTextOnlyButton<E : NameableEnum>(x: Int, y: Int, private val entries:
         val message: Component = TextOnlyButton.getMessageComponent(this)
 
         this.width = font.width(message)
-        guiGraphics.drawString(font, message, this.x, this.y, 0xFFFFFFFF.toInt())
+        guiGraphics.drawString(font, message, this.x, this.y, ChatFormatting.WHITE.color!!)
     }
 
     override fun onPress() {
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/FABaseList.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/FABaseList.kt
@@ -4,8 +4,7 @@ import net.minecraft.client.gui.components.ContainerObjectSelectionList
 import ru.octol1ttle.flightassistant.FlightAssistant.mc
 
 abstract class FABaseList<E : ContainerObjectSelectionList.Entry<E>>
-    (width: Int, height: Int, y0: Int, @Suppress("UNUSED_PARAMETER", "KotlinRedundantDiagnosticSuppress") y1: Int, itemHeight: Int)
-    : ContainerObjectSelectionList<E>(mc, width, height, y0, /*? if <1.21 {*/ y1, /*?}*/ itemHeight) {
+    (y0: Int, y1: Int, width: Int, itemHeight: Int) : ContainerObjectSelectionList<E>(mc, width, y1 - y0, y0, /*? if <1.21 {*/ y1, /*?}*/ itemHeight) {
     init {
 //? if <1.21 {
         setRenderBackground(false)
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/departure/DepartureScreen.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/departure/DepartureScreen.kt
@@ -55,7 +55,7 @@ class DepartureScreen : FABaseScreen(Component.translatable("menu.flightassistan
     }
 
     companion object {
-        var lastState: DepartureScreenState = DepartureScreenState()
-        var state: DepartureScreenState = DepartureScreenState()
+        private var lastState: DepartureScreenState = DepartureScreenState()
+        private var state: DepartureScreenState = DepartureScreenState()
     }
 }
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
@@ -1,11 +1,17 @@
 package ru.octol1ttle.flightassistant.screen.fms.enroute
 
+import kotlin.math.max
+import kotlin.math.min
+import net.minecraft.ChatFormatting
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.components.StringWidget
 import net.minecraft.network.chat.CommonComponents
 import net.minecraft.network.chat.Component
+import net.minecraft.network.chat.Component.literal
+import net.minecraft.network.chat.Component.translatable
 import ru.octol1ttle.flightassistant.screen.FABaseScreen
+import ru.octol1ttle.flightassistant.screen.components.SmartStringWidget
 
 class EnrouteScreen : FABaseScreen(Component.translatable("menu.flightassistant.fms.enroute")) {
     private lateinit var discardChanges: Button
@@ -15,6 +21,14 @@ class EnrouteScreen : FABaseScreen(Component.translatable("menu.flightassistant.
 
         this.addRenderableWidget(StringWidget(0, 7, this.width, 9, this.title, this.font))
 
+        val columnsSizeWithMargin: Float = COLUMNS.size + HOVERING_COLUMNS_MARGIN
+        val optimumColumnsSize: Float = (if (this.width / columnsSizeWithMargin >= 75) columnsSizeWithMargin else COLUMNS.size.toFloat())
+        COLUMNS.forEachIndexed { i, component ->
+            this.addRenderableWidget(SmartStringWidget((this.width * (max(0.4f, i.toFloat()) / optimumColumnsSize)).toInt(), Y0, component).setColor(ChatFormatting.GRAY.color!!))
+        }
+
+        this.addRenderableWidget(EnrouteWaypointsList(0, Y0 + 10, this.height - Y0 * 2, this.width, optimumColumnsSize))
+
         discardChanges = this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.discard_changes")) { _: Button? ->
             state = lastState.copy()
             this.rebuildWidgets()
@@ -34,7 +48,13 @@ class EnrouteScreen : FABaseScreen(Component.translatable("menu.flightassistant.
     }
 
     companion object {
-        var lastState: EnrouteScreenState = EnrouteScreenState()
-        var state: EnrouteScreenState = EnrouteScreenState()
+        private const val X0: Int = 15
+        private const val Y0: Int = 30
+
+        private val COLUMNS: Array<Component> = arrayOf(literal("#"), literal("X"), literal("Z"), translatable("short.flightassistant.altitude"), translatable("short.flightassistant.speed"), translatable("short.flightassistant.distance"), translatable("short.flightassistant.time"))
+        private const val HOVERING_COLUMNS_MARGIN: Float = 1.5f
+
+        private var lastState: EnrouteScreenState = EnrouteScreenState()
+        private var state: EnrouteScreenState = EnrouteScreenState()
     }
 }
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
@@ -3,14 +3,12 @@ package ru.octol1ttle.flightassistant.screen.fms.enroute
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer
 
 class EnrouteScreenState(
-    val waypoints: MutableList<EnrouteWaypointState> = ArrayList()
+    val waypoints: MutableList<Waypoint> = ArrayList()
 ) {
     fun save(flightPlan: FlightPlanComputer) {
-        TODO()
     }
 
     fun load(flightPlan: FlightPlanComputer) {
-        TODO()
     }
 
     fun copy(): EnrouteScreenState {
@@ -21,7 +19,7 @@ class EnrouteScreenState(
         return this.waypoints.size == other.waypoints.size && this.waypoints.all { other.waypoints.contains(it) }
     }
 
-    data class EnrouteWaypointState(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val altitude: Int = 0, val speed: Int = 0) {
+    data class Waypoint(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val altitude: Int = 0, val speed: Int = 0) {
         fun toEnrouteWaypoint() {
             TODO()
         }
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
@@ -1,31 +1,42 @@
 package ru.octol1ttle.flightassistant.screen.fms.enroute
 
+import kotlin.random.Random
+import kotlin.random.nextInt
+import net.minecraft.ChatFormatting
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.ContainerObjectSelectionList
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.narration.NarratableEntry
+import ru.octol1ttle.flightassistant.api.util.extensions.drawString
 import ru.octol1ttle.flightassistant.screen.components.FABaseList
 
-class EnrouteWaypointsList(width: Int, height: Int, y0: Int, y1: Int)
-    : FABaseList<EnrouteWaypointsList.Entry>(width, height, y0, y1, ITEM_HEIGHT) {
+class EnrouteWaypointsList(xOffset: Int, y0: Int, y1: Int, width: Int, columns: Float) : FABaseList<EnrouteWaypointsList.Entry>(y0, y1, width, ITEM_HEIGHT) {
     init {
+        for (i: Int in 0..Random.nextInt(1..69)) {
+            addEntry(Entry(xOffset, columns, EnrouteScreenState.Waypoint(Random.nextInt(-30_000_000..30_000_000), Random.nextInt(-30_000_000..30_000_000), Random.nextInt(62..620), Random.nextInt(0..420))))
+        }
     }
 
-    class Entry(val x: Int, val y: Int, val state: EnrouteScreenState.EnrouteWaypointState) : ContainerObjectSelectionList.Entry<Entry>() {
+    class Entry(val xOffset: Int, val columns: Float, val state: EnrouteScreenState.Waypoint) : ContainerObjectSelectionList.Entry<Entry>() {
         override fun render(guiGraphics: GuiGraphics, index: Int, top: Int, left: Int, width: Int, height: Int, mouseX: Int, mouseY: Int, hovering: Boolean, partialTick: Float) {
-            TODO("Not yet implemented")
+            // TODO: text is cool but we need edit boxes!! SeamlessEditBox
+            guiGraphics.drawString((index + 1).toString(), xOffset + (width * (0.4f / this.columns)).toInt(), top, ChatFormatting.WHITE.color!!)
+            guiGraphics.drawString(state.coordinatesX.toString(), xOffset + (width * (1 / this.columns)).toInt(), top, ChatFormatting.WHITE.color!!)
+            guiGraphics.drawString(state.coordinatesZ.toString(), xOffset + (width * (2 / this.columns)).toInt(), top, ChatFormatting.WHITE.color!!)
+            guiGraphics.drawString(state.altitude.toString(), xOffset + (width * (3 / this.columns)).toInt(), top, ChatFormatting.WHITE.color!!)
+            guiGraphics.drawString(state.speed.toString(), xOffset + (width * (4 / this.columns)).toInt(), top, ChatFormatting.WHITE.color!!)
         }
 
         override fun children(): List<GuiEventListener> {
-            TODO("Not yet implemented")
+            return emptyList()
         }
 
         override fun narratables(): List<NarratableEntry> {
-            TODO("Not yet implemented")
+            return emptyList()
         }
     }
 
     companion object {
-        private const val ITEM_HEIGHT: Int = 20
+        private const val ITEM_HEIGHT: Int = 10
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/system/SystemManagementList.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/system/SystemManagementList.kt
@@ -1,6 +1,7 @@
 package ru.octol1ttle.flightassistant.screen.system
 
 import com.google.common.collect.ImmutableList
+import com.ibm.icu.lang.UCharacter.GraphemeClusterBreak.T
 import net.minecraft.ChatFormatting
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
@@ -15,56 +16,52 @@ import ru.octol1ttle.flightassistant.api.util.extensions.cautionColor
 import ru.octol1ttle.flightassistant.api.util.extensions.font
 import ru.octol1ttle.flightassistant.screen.components.FABaseList
 
-class SystemManagementList(width: Int, height: Int, y0: Int, y1: Int, baseKey: String, controller: ModuleController<*>)
-    : FABaseList<SystemManagementList.Entry>(width, height, y0, y1, ITEM_HEIGHT) {
+class SystemManagementList(y0: Int, y1: Int, width: Int, baseKey: String, controller: ModuleController<*>) : FABaseList<SystemManagementList.Entry>(y0, y1, width, ITEM_HEIGHT) {
     init {
-        var y: Int = y0 + Y_OFFSET
         for (module: ResourceLocation in controller.identifiers()) {
-            this.addEntry(Entry(0, y, width, module, Component.translatable("$baseKey.$module"), controller))
-            y += ITEM_HEIGHT
+            this.addEntry(Entry(10, width, module, Component.translatable("$baseKey.$module"), controller))
         }
     }
 
-    class Entry(val x: Int, val y: Int, private val listWidth: Int, private val identifier: ResourceLocation, displayName: Component, private val controller: ModuleController<*>) : ContainerObjectSelectionList.Entry<Entry>() {
-        private val displayName: StringWidget = StringWidget(x, y, this.listWidth / 2, 9, displayName, font).alignLeft()
-        private val faultText: StringWidget = StringWidget(x, y, this.listWidth / 6, 9, FAULT_TEXT, font)
-        private val offText: StringWidget = StringWidget(x, y, this.listWidth / 6, 9, OFF_TEXT, font)
+    class Entry(val xOffset: Int, private val listWidth: Int, private val identifier: ResourceLocation, displayName: Component, private val controller: ModuleController<*>) : ContainerObjectSelectionList.Entry<Entry>() {
+        private val displayName: StringWidget = StringWidget(xOffset, 0, this.listWidth / 2, 9, displayName, font).alignLeft()
+        private val faultText: StringWidget = StringWidget(xOffset, 0, this.listWidth / 6, 9, FAULT_TEXT, font)
+        private val offText: StringWidget = StringWidget(xOffset, 0, this.listWidth / 6, 9, OFF_TEXT, font)
         private val toggleButton: Button = Button.builder(OFF_TEXT) {
             controller.toggleEnabled(identifier)
-        }.pos(x, y).width(60).build()
+        }.pos(xOffset, 0).width(60).build()
 
         override fun render(guiGraphics: GuiGraphics, index: Int, top: Int, left: Int, width: Int, height: Int, mouseX: Int, mouseY: Int, hovering: Boolean, partialTick: Float) {
-            val renderY: Int = top + Y_OFFSET
+            T
+            displayName.x = this.xOffset
+            displayName.y = top
+            displayName.render(guiGraphics, mouseX, mouseY, partialTick)
 
-            this@Entry.displayName.x = this.x + 10
-            this@Entry.displayName.y = renderY
-            this@Entry.displayName.render(guiGraphics, mouseX, mouseY, partialTick)
-
-            toggleButton.x = this.x + this.listWidth - toggleButton.width - 10
-            toggleButton.y = renderY - toggleButton.height / 4 - 1
+            toggleButton.x = this.listWidth - toggleButton.width - 5
+            toggleButton.y = top - toggleButton.height / 4 - 1
             toggleButton.message =
                 if (controller.isEnabled(identifier))
                     if (controller.modulesResettable) OFF_RESET_TEXT else OFF_TEXT
                 else ON_TEXT
             toggleButton.render(guiGraphics, mouseX, mouseY, partialTick)
 
             offText.x = toggleButton.x - this.listWidth / 12 - font.width(OFF_TEXT)
-            offText.y = renderY
-            offText.setColor(if (controller.isEnabled(identifier)) ChatFormatting.DARK_GRAY.color!! else 0xFFFFFF)
+            offText.y = top
+            offText.setColor((if (controller.isEnabled(identifier)) ChatFormatting.DARK_GRAY else ChatFormatting.WHITE).color!!)
             offText.render(guiGraphics, mouseX, mouseY, partialTick)
 
             faultText.x = offText.x - font.width(FAULT_TEXT)
-            faultText.y = renderY
+            faultText.y = top
             faultText.setColor(if (controller.isFaulted(identifier)) cautionColor else ChatFormatting.DARK_GRAY.color!!)
             faultText.render(guiGraphics, mouseX, mouseY, partialTick)
         }
 
         override fun children(): List<GuiEventListener> {
-            return ImmutableList.of(this@Entry.displayName, faultText, offText, toggleButton)
+            return ImmutableList.of(this.displayName, faultText, offText, toggleButton)
         }
 
         override fun narratables(): List<NarratableEntry> {
-            return ImmutableList.of(this@Entry.displayName, faultText, offText, toggleButton)
+            return ImmutableList.of(this.displayName, faultText, offText, toggleButton)
         }
 
         companion object {
@@ -76,7 +73,6 @@ class SystemManagementList(width: Int, height: Int, y0: Int, y1: Int, baseKey: S
     }
 
     companion object {
-        private const val Y_OFFSET: Int = 5
         private const val ITEM_HEIGHT: Int = 25
     }
 }
diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/screen/system/SystemManagementScreen.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/screen/system/SystemManagementScreen.kt
@@ -15,9 +15,7 @@ class SystemManagementScreen(title: Component, private val baseKey: String, priv
 
         val top = 20
         val bottom: Int = this.height - 40
-        val height: Int = bottom - top
-
-        this.addRenderableWidget(SystemManagementList(this.width, height, top, bottom, baseKey, controller))
+        this.addRenderableWidget(SystemManagementList(top, bottom, this.width, baseKey, controller))
 
         this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE) { _: Button? ->
             this.onClose()
diff --git a/src/main/resources/assets/flightassistant/lang/en_us.yml b/src/main/resources/assets/flightassistant/lang/en_us.yml
@@ -324,13 +324,15 @@ mode.flightassistant:
     heading: HDG
     selected_coordinates: COORDS
 
+# TODO: stop using this
 short.flightassistant:
   alert: ALERT
   altitude: ALT
   attitude: ATT
   auto_thrust: A/T
   autopilot: AP
   automation_modes: AUTO/MODE
+  distance: DIST
   elytra: EL
   elytra_durability: EL/DURA
   flight_directors: FLT DIR
@@ -343,6 +345,7 @@ short.flightassistant:
   radar_altitude: R/ALT
   speed: SPD
   status: STATUS
+  time: TIME
   vertical_speed: 'V/S%s'
   void: VOID
 
diff --git a/src/main/resources/assets/flightassistant/lang/ru_ru.yml b/src/main/resources/assets/flightassistant/lang/ru_ru.yml
@@ -335,6 +335,7 @@ short.flightassistant:
   auto_thrust: А/Т
   autopilot: АП
   automation_modes: АВТО/РЕЖИМ
+  distance: ДИСТ
   elytra: ЭЛ
   elytra_durability: ПРЧН/ЭЛ
   flight_directors: УКАЗАТ
@@ -347,6 +348,7 @@ short.flightassistant:
   radar_altitude: Р/ВЫС
   speed: СКОР
   status: СТАТУС
+  time: ВРЕМ
   vertical_speed: 'В/С%s'
   void: ПУСТ
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class CycleTextOnlyButton<E : NameableEnum>(x: Int, y: Int, private val entries:`
`28`	`28`	`val message: Component = TextOnlyButton.getMessageComponent(this)`
`29`	`29`
`30`	`30`	`this.width = font.width(message)`
`31`		`- guiGraphics.drawString(font, message, this.x, this.y, 0xFFFFFFFF.toInt())`
	`31`	`+ guiGraphics.drawString(font, message, this.x, this.y, ChatFormatting.WHITE.color!!)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`override fun onPress() {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class DepartureScreen : FABaseScreen(Component.translatable("menu.flightassistan`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`companion object {`
`58`		`- var lastState: DepartureScreenState = DepartureScreenState()`
`59`		`- var state: DepartureScreenState = DepartureScreenState()`
	`58`	`+ private var lastState: DepartureScreenState = DepartureScreenState()`
	`59`	`+ private var state: DepartureScreenState = DepartureScreenState()`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,12 @@ package ru.octol1ttle.flightassistant.screen.fms.enroute`
`3`	`3`	`import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer`
`4`	`4`
`5`	`5`	`class EnrouteScreenState(`
`6`		`- val waypoints: MutableList<EnrouteWaypointState> = ArrayList()`
	`6`	`+ val waypoints: MutableList<Waypoint> = ArrayList()`
`7`	`7`	`) {`
`8`	`8`	`fun save(flightPlan: FlightPlanComputer) {`
`9`		`- TODO()`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`fun load(flightPlan: FlightPlanComputer) {`
`13`		`- TODO()`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`fun copy(): EnrouteScreenState {`
`@@ -21,7 +19,7 @@ class EnrouteScreenState(`
`21`	`19`	`return this.waypoints.size == other.waypoints.size && this.waypoints.all { other.waypoints.contains(it) }`
`22`	`20`	`}`
`23`	`21`
`24`		`- data class EnrouteWaypointState(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val altitude: Int = 0, val speed: Int = 0) {`
	`22`	`+ data class Waypoint(val coordinatesX: Int = 0, val coordinatesZ: Int = 0, val altitude: Int = 0, val speed: Int = 0) {`
`25`	`23`	`fun toEnrouteWaypoint() {`
`26`	`24`	`TODO()`
`27`	`25`	`}`