the enroute GUI is DONE

Signed-off-by: Octol1ttle <[email protected]>

Author: Octol1ttle

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

@@ -30,3 +30,9 @@ fun List<AlertData>.getHighestPriority(): List<AlertData> {
 fun <T> List<T>.filterWorking(): List<T> {
     return this.filter { it !is Computer || !it.isDisabledOrFaulted() }
 }
+
+fun <T> MutableList<T>.swap(index1: Int, index2: Int) {
+    val entry1: T = this[index1]
+    this[index1] = this[index2]
+    this[index2] = entry1
+}

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

@@ -78,24 +78,24 @@ fun textWidth(text: String): Int {
     return font.width(text)
 }
 
-fun GuiGraphics.drawString(text: String, x: Int, y: Int, color: Int) {
-    drawString(font, text, x, y, color, false)
+fun GuiGraphics.drawString(text: String, x: Int, y: Int, color: Int, shadow: Boolean = false) {
+    drawString(font, text, x, y, color, shadow)
 }
 
-fun GuiGraphics.drawRightAlignedString(text: String, x: Int, y: Int, color: Int) {
-    drawString(font, text, x - font.width(text), y, color, false)
+fun GuiGraphics.drawRightAlignedString(text: String, x: Int, y: Int, color: Int, shadow: Boolean = false) {
+    drawString(font, text, x - font.width(text), y, color, shadow)
 }
 
-fun GuiGraphics.drawMiddleAlignedString(text: String, x: Int, y: Int, color: Int) {
-    drawString(font, text, x - font.width(text) / 2 + 1, y, color, false)
+fun GuiGraphics.drawMiddleAlignedString(text: String, x: Int, y: Int, color: Int, shadow: Boolean = false) {
+    drawString(font, text, x - font.width(text) / 2 + 1, y, color, shadow)
 }
 
 fun textWidth(formattedText: FormattedText): Int {
     return font.width(formattedText)
 }
 
-fun GuiGraphics.drawString(text: Component, x: Int, y: Int, color: Int): Int {
-    drawString(font, text, x, y, color, false)
+fun GuiGraphics.drawString(text: Component, x: Int, y: Int, color: Int, shadow: Boolean = false): Int {
+    drawString(font, text, x, y, color, shadow)
     return 1
 }
 
@@ -107,25 +107,25 @@ private fun getContrasting(original: Int): Int {
     return if (luma > 0.5) Color.BLACK.rgb else Color.WHITE.rgb
 }
 
-fun GuiGraphics.drawRightAlignedString(text: Component, x: Int, y: Int, color: Int) {
-    drawString(font, text, x - textWidth(text), y, color, false)
+fun GuiGraphics.drawRightAlignedString(text: Component, x: Int, y: Int, color: Int, shadow: Boolean = false) {
+    drawString(font, text, x - textWidth(text), y, color, shadow)
 }
 
-fun GuiGraphics.drawMiddleAlignedString(text: Component, x: Int, y: Int, color: Int) {
-    drawString(font, text, x - textWidth(text) / 2 + 1, y, color, false)
+fun GuiGraphics.drawMiddleAlignedString(text: Component, x: Int, y: Int, color: Int, shadow: Boolean = false) {
+    drawString(font, text, x - textWidth(text) / 2 + 1, y, color, shadow)
 }
 
-fun GuiGraphics.drawHighlightedCenteredText(text: Component, x: Int, y: Int, color: Int, highlight: Boolean) {
+fun GuiGraphics.drawHighlightedCenteredText(text: Component, x: Int, y: Int, color: Int, highlight: Boolean, shadow: Boolean = false) {
     pose().push()
 
     if (highlight) {
         val halfWidth: Int = textWidth(text) / 2
         fill(x - halfWidth - 1, y - 1, x + halfWidth + 2, y + 8, color)
 //? if <1.21.6
         pose().translate(0.0f, 0.0f, 100.0f)
-        drawMiddleAlignedString(text, x, y, getContrasting(color))
+        drawMiddleAlignedString(text, x, y, getContrasting(color), shadow)
     } else {
-        drawMiddleAlignedString(text, x, y, color)
+        drawMiddleAlignedString(text, x, y, color, shadow)
     }
 
     pose().pop()

src/main/kotlin/ru/octol1ttle/flightassistant/screen/FlightAssistantSetupScreen.kt

@@ -37,24 +37,24 @@ class FlightAssistantSetupScreen : FABaseScreen(null, Component.translatable("me
 
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.autoflight")) {
             this.minecraft!!.setScreen(AutoFlightScreen(this))
-        }.pos(this.centerX - 75, this.centerY - 30).width(150).build())
+        }.pos(this.centerX - 80, this.centerY - 30).width(160).build())
 
         this.addRenderableWidget(StringWidget(0, this.centerY + 5, this.width, this.font.lineHeight, Component.translatable("menu.flightassistant.fms"), this.font))
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.departure")) {
             this.minecraft!!.setScreen(DepartureScreen(this))
-        }.pos(this.centerX - 160, this.centerY + 20).width(100).build())
+        }.pos(this.centerX - 130, this.centerY + 20).width(80).build())
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.enroute")) {
             this.minecraft!!.setScreen(EnrouteScreen(this))
-        }.pos(this.centerX - 50, this.centerY + 20).width(100).build()).active = Platform.isDevelopmentEnvironment()
+        }.pos(this.centerX - 40, this.centerY + 20).width(80).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 = Platform.isDevelopmentEnvironment()
+        }.pos(this.centerX + 50, this.centerY + 20).width(80).build()).active = Platform.isDevelopmentEnvironment()
 
         this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.config")) {
             this.minecraft!!.setScreen(FAConfigScreen.generate(this))
-        }.pos(10, this.height - 30).width(100).build())
+        }.pos(10, this.height - 30).width(120).build())
 
-        this.addRenderableWidget(Button.builder(CommonComponents.GUI_CANCEL) { _: Button? ->
+        this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE) { _: Button? ->
             this.onClose()
         }.pos(this.width - 90, this.height - 30).width(80).build())
     }

src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteScreen.kt

@@ -10,11 +10,14 @@ 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.api.util.extensions.drawMiddleAlignedString
 import ru.octol1ttle.flightassistant.screen.FABaseScreen
 import ru.octol1ttle.flightassistant.screen.components.SmartStringWidget
 
 class EnrouteScreen(parent: Screen) : FABaseScreen(parent, Component.translatable("menu.flightassistant.fms.enroute")) {
     private lateinit var discardChanges: Button
+    private lateinit var save: Button
+    private lateinit var done: Button
 
     override fun init() {
         super.init()
@@ -27,28 +30,38 @@ class EnrouteScreen(parent: Screen) : FABaseScreen(parent, Component.translatabl
             this.addRenderableWidget(SmartStringWidget((this.width * (max(0.4f, i.toFloat()) / optimumColumnsSize)).toInt(), Y0, component).setColor(ChatFormatting.GRAY.color!!))
         }
 
-        this.addRenderableWidget(EnrouteWaypointsList(Y0 + 10, this.height - Y0 * 2, this.width, optimumColumnsSize))
+        val list: EnrouteWaypointsList = this.addRenderableWidget(EnrouteWaypointsList(Y0 + 10, this.height - Y0 * 2, this.width, optimumColumnsSize, state) { !state.equals(lastState) })
+
+        this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.enroute.add_waypoint")) {
+            state.waypoints.add(EnrouteScreenState.Waypoint())
+            list.rebuildEntries()
+        }.bounds(this.centerX - 50, this.height - Y0 * 2 + 5, 100, 20).build())
 
         discardChanges = this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.discard_changes")) { _: Button? ->
             state = lastState.copy()
             this.rebuildWidgets()
-        }.pos(this.width - 200, this.height - 30).width(100).build())
+        }.pos(this.width - 290, this.height - 30).width(100).build())
+
+        save = this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.save")) { _: Button? ->
+            lastState = state.copy()
+        }.pos(this.width - 180, this.height - 30).width(80).build())
 
-        this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE) { _: Button? ->
+        done = this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE) { _: Button? ->
             this.onClose()
         }.pos(this.width - 90, this.height - 30).width(80).build())
     }
 
-    override fun onClose() {
-        lastState = state.copy()
-        state.save(computers.plan)
-        super.onClose()
-    }
-
     override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        discardChanges.active = !state.equals(lastState)
+        save.active = !state.equals(lastState)
+        discardChanges.active = save.active
+        done.active = !save.active
 
         super.render(guiGraphics, mouseX, mouseY, delta)
+
+        if (save.active) {
+            val text: Component = Component.translatable("menu.flightassistant.fms.enroute.unsaved_changes")
+            guiGraphics.drawMiddleAlignedString(text, this.width / 4, 7, ChatFormatting.YELLOW.color!!, true)
+        }
     }
 
     companion object {

src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/enroute/EnrouteWaypointsList.kt

@@ -1,45 +1,60 @@
 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.Button
 import net.minecraft.client.gui.components.ContainerObjectSelectionList
+import net.minecraft.client.gui.components.Tooltip
 import net.minecraft.client.gui.components.events.GuiEventListener
 import net.minecraft.client.gui.narration.NarratableEntry
 import net.minecraft.network.chat.Component
 import ru.octol1ttle.flightassistant.api.util.extensions.drawString
 import ru.octol1ttle.flightassistant.api.util.extensions.font
+import ru.octol1ttle.flightassistant.api.util.extensions.swap
 import ru.octol1ttle.flightassistant.api.util.extensions.toIntOrNullWithFallback
 import ru.octol1ttle.flightassistant.screen.components.FABaseList
 import ru.octol1ttle.flightassistant.screen.components.TypeStrictEditBox
 
-class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, columns: Float) : FABaseList<EnrouteWaypointsList.Entry>(y0, y1, width, ITEM_HEIGHT) {
+class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, val columns: Float, val state: EnrouteScreenState, val hasUnsavedChanges: () -> Boolean) : FABaseList<EnrouteWaypointsList.Entry>(y0, y1, width, ITEM_HEIGHT) {
     init {
-        repeat(Random.nextInt(1..69)) {
-            addEntry(Entry(width, 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))))
-        }
+        rebuildEntries()
     }
 
-    class Entry(val width: Int, val columns: Float, val state: EnrouteScreenState.Waypoint) : ContainerObjectSelectionList.Entry<Entry>() {
+    class Entry(val width: Int, val columns: Float, val state: EnrouteScreenState.Waypoint, val list: EnrouteWaypointsList) : ContainerObjectSelectionList.Entry<Entry>() {
         private val columnWidth: Float = width / this.columns
 
         private val xEditBox = TypeStrictEditBox(0, 0, columnWidth.toInt(), font.lineHeight, state.coordinatesX, { state.coordinatesX = it }, String::toIntOrNullWithFallback)
         private val zEditBox = TypeStrictEditBox(0, 0, columnWidth.toInt(), font.lineHeight, state.coordinatesZ, { state.coordinatesZ = it }, String::toIntOrNullWithFallback)
         private val altitudeEditBox = TypeStrictEditBox(0, 0, columnWidth.toInt(), font.lineHeight, state.altitude, { state.altitude = it }, String::toIntOrNullWithFallback)
         private val speedEditBox = TypeStrictEditBox(0, 0, columnWidth.toInt(), font.lineHeight, state.speed, { state.speed = it }, String::toIntOrNullWithFallback) { it >= 0 }
 
-        private val moveUpButton = Button.builder(Component.literal("↑")) {}.size(12, 12).build()
-        private val moveDownButton = Button.builder(Component.literal("↓")) {}.size(12, 12).build()
-        private val deleteButton = Button.builder(Component.literal("X")) {}.size(12, 12).build()
+        private val directToButton = Button.builder(Component.literal("⏭")) {
+        }.size(12, 12).build()
+        private val moveUpButton = Button.builder(Component.literal("↑")) {
+            list.state.waypoints.swap(index, index - 1)
+            list.rebuildEntries()
+        }.size(12, 12).build()
+        private val moveDownButton = Button.builder(Component.literal("↓")) {
+            list.state.waypoints.swap(index, index + 1)
+            list.rebuildEntries()
+        }.size(12, 12).build()
+        private val deleteButton = Button.builder(Component.literal("X")) {
+            list.state.waypoints.remove(this.state)
+            list.rebuildEntries()
+        }.size(12, 12).build()
 
+        private var index: Int = 0
         private var hovering: Boolean = false
         val children = listOf(xEditBox, zEditBox, altitudeEditBox, speedEditBox)
-        val childrenWhenHovering = listOf(xEditBox, zEditBox, altitudeEditBox, speedEditBox, moveUpButton, moveDownButton, deleteButton)
+        val childrenWhenHovering = listOf(xEditBox, zEditBox, altitudeEditBox, speedEditBox, directToButton, moveUpButton, moveDownButton, deleteButton)
 
         override fun render(guiGraphics: GuiGraphics, index: Int, top: Int, left: Int, width: Int, height: Int, mouseX: Int, mouseY: Int, hovering: Boolean, partialTick: Float) {
+            this.index = index
             this.hovering = hovering
+            this.directToButton.active = !list.hasUnsavedChanges()
+            this.directToButton.tooltip = Tooltip.create(if (this.directToButton.active) DIRECT_TO_TOOLTIP_TEXT else UNSAVED_CHANGES_TOOLTIP_TEXT)
+            if (index == 0) this.moveUpButton.active = false
+            if (index == list.children().size - 1) this.moveDownButton.active = false
 
             guiGraphics.drawString((index + 1).toString(), (width * (0.4f / this.columns)).toInt(), top, ChatFormatting.WHITE.color!!)
 
@@ -51,9 +66,11 @@ class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, columns: Float) : FABas
                 editBox.render(guiGraphics, mouseX, mouseY, partialTick)
             }
 
-            children().filterIsInstance<Button>().forEachIndexed { i, button ->
-                button.x = (columnWidth * (if (columns <= 7) columns - 1 else 7.0f) + i * 15).toInt()
-                button.y = top - button.height / 4
+            var buttonX: Int = (columnWidth * (if (columns <= 7) columns - 1.25f else 6.75f)).toInt()
+            children().filterIsInstance<Button>().forEach { button ->
+                button.x = buttonX
+                buttonX += button.width + 3
+                button.y = top
                 button.render(guiGraphics, mouseX, mouseY, partialTick)
             }
         }
@@ -67,7 +84,16 @@ class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, columns: Float) : FABas
         }
     }
 
+    fun rebuildEntries() {
+        this.clearEntries()
+        for (waypoint: EnrouteScreenState.Waypoint in state.waypoints) {
+            addEntry(Entry(this.width, this.columns, waypoint, this))
+        }
+    }
+
     companion object {
-        private const val ITEM_HEIGHT: Int = 10
+        private const val ITEM_HEIGHT: Int = 12
+        private val DIRECT_TO_TOOLTIP_TEXT: Component = Component.translatable("menu.flightassistant.fms.enroute.direct_to")
+        private val UNSAVED_CHANGES_TOOLTIP_TEXT: Component = Component.translatable("menu.flightassistant.fms.enroute.direct_to.unsaved_changes")
     }
 }

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

@@ -286,8 +286,15 @@ menu.flightassistant:
       .: Departure
       takeoff_thrust: 'Takeoff thrust %: '
       minimum_climb_speed: 'Minimum climb speed: '
-    enroute: Enroute
+    enroute:
+      .: Enroute
+      add_waypoint: Add waypoint
+      direct_to:
+        .: Direct-to
+        unsaved_changes: Cannot use Direct-to because there are unsaved changes!
+      unsaved_changes: UNSAVED CHANGES
     arrival: Arrival
+    save: Save
     discard_changes: Discard changes
     coordinates: 'Coordinates: '
     elevation: 'Elevation: '

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

@@ -290,8 +290,15 @@ menu.flightassistant:
       .: Вылет
       takeoff_thrust: 'Взлётная тяга (%): '
       minimum_climb_speed: 'Минимальная скорость набора: '
-    enroute: Путь
+    enroute:
+      .: Маршрут
+      add_waypoint: Добавить точку
+      direct_to:
+        .: Прямо-на
+        unsaved_changes: Невозможно использовать Прямо-на, так как есть несохранённые изменения!
+      unsaved_changes: НЕСОХРАНЕН ИЗМЕНЕНИЯ
     arrival: Прибытие
+    save: Сохранить
     discard_changes: Отменить изменения
     coordinates: 'Координаты: '
     elevation: 'Высота: '