Add legend to EnrouteScreen

Closes #72

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

Author: Octol1ttle

src/main/kotlin/ru/octol1ttle/flightassistant/screen/fms/arrival/ArrivalScreen.kt

@@ -37,7 +37,7 @@ class ArrivalScreen(parent: Screen) : FABaseScreen(parent, Component.translatabl
 
         val minimums = this.addRenderableWidget(SmartStringWidget(baseX, baseY + 64, Component.translatable("menu.flightassistant.fms.arrival.minimums")))
         val minimumsEditBox = this.addRenderableWidget(TypeStrictEditBox(minimums.x + minimums.width, minimums.y - 2, baseWidth, baseHeight, state.minimums, { state.minimums = it }, String::toIntOrNullWithFallback,
-            { if (state.minimumsType == ArrivalScreenState.MinimumsType.RELATIVE) it > 0 else true }))
+            { if (state.minimumsType == ArrivalScreenState.MinimumsType.RELATIVE) it >= 0 else true }))
         this.addRenderableWidget(CycleTextOnlyButton(minimumsEditBox.x + minimumsEditBox.width + 5, minimumsEditBox.y + 2, ArrivalScreenState.MinimumsType.entries, state.minimumsType) { state.minimumsType = it; })
 
         val goAroundAltitude = this.addRenderableWidget(SmartStringWidget(baseX, baseY + 80, Component.translatable("menu.flightassistant.fms.arrival.go_around_altitude")))

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

@@ -5,12 +5,16 @@ 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.client.gui.components.Tooltip
 import net.minecraft.client.gui.screens.Screen
 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 net.minecraft.network.chat.Style
 import ru.octol1ttle.flightassistant.api.util.extensions.drawMiddleAlignedString
+import ru.octol1ttle.flightassistant.api.util.extensions.primaryAdvisoryColor
+import ru.octol1ttle.flightassistant.api.util.extensions.setColor
 import ru.octol1ttle.flightassistant.impl.computer.autoflight.FlightPlanComputer
 import ru.octol1ttle.flightassistant.screen.FABaseScreen
 import ru.octol1ttle.flightassistant.screen.components.SmartStringWidget
@@ -44,6 +48,11 @@ class EnrouteScreen(parent: Screen) : FABaseScreen(parent, Component.translatabl
             list.rebuildEntries()
         }.bounds(this.centerX - 50, this.height - Y0 * 2 + 5, 100, 20).build())
 
+        @Suppress("UsePropertyAccessSyntax")
+        this.addRenderableWidget(SmartStringWidget(10, this.height - 24,
+            Component.translatable("menu.flightassistant.fms.enroute.legend.hover").setStyle(Style.EMPTY.withItalic(true).withColor(ChatFormatting.GRAY.color!!))
+        )).setTooltip(Tooltip.create(LEGEND_TOOLTIP_TEXT))
+
         discardChanges = this.addRenderableWidget(Button.builder(Component.translatable("menu.flightassistant.fms.discard_changes")) { _: Button? ->
             state = EnrouteScreenState.load(computers.plan)
             this.rebuildWidgets()
@@ -79,6 +88,11 @@ class EnrouteScreen(parent: Screen) : FABaseScreen(parent, Component.translatabl
         private const val Y0: Int = 30
         private const val HOVERING_COLUMNS_MARGIN: Float = 0.75f
         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 val LEGEND_TOOLTIP_TEXT: Component = translatable("%s\n%s\n%s",
+            translatable("menu.flightassistant.fms.enroute.legend.origin", literal(EnrouteWaypointsList.FROM_SYMBOL).setColor(primaryAdvisoryColor)),
+            translatable("menu.flightassistant.fms.enroute.legend.target", literal(EnrouteWaypointsList.TO_SYMBOL).setColor(primaryAdvisoryColor)),
+            translatable("menu.flightassistant.fms.enroute.legend.direct-to", literal(EnrouteWaypointsList.DIRECT_TO_SYMBOL).setColor(primaryAdvisoryColor))
+        )
 
         private var state: EnrouteScreenState = EnrouteScreenState()
     }

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

@@ -111,9 +111,9 @@ class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, val columns: Float, val
         private fun getActiveSymbol(): String? {
             val active: FlightPlanComputer.EnrouteWaypoint.Active = state.active ?: return null
             return when (active) {
-                FlightPlanComputer.EnrouteWaypoint.Active.ORIGIN -> "→"
+                FlightPlanComputer.EnrouteWaypoint.Active.ORIGIN -> FROM_SYMBOL
                 FlightPlanComputer.EnrouteWaypoint.Active.TARGET -> {
-                    if (list.state.waypoints.any { it.active == FlightPlanComputer.EnrouteWaypoint.Active.ORIGIN }) "▶"
+                    if (list.state.waypoints.any { it.active == FlightPlanComputer.EnrouteWaypoint.Active.ORIGIN }) TO_SYMBOL
                     else DIRECT_TO_SYMBOL
                 }
             }
@@ -137,7 +137,9 @@ class EnrouteWaypointsList(y0: Int, y1: Int, width: Int, val columns: Float, val
 
     companion object {
         private const val ITEM_HEIGHT: Int = 12
-        private const val DIRECT_TO_SYMBOL: String = "⏭"
+        const val FROM_SYMBOL: String = "→"
+        const val TO_SYMBOL: String = "▶"
+        const val DIRECT_TO_SYMBOL: String = "⏭"
         private val DIRECT_TO_TOOLTIP_TEXT: Component = Component.translatable("menu.flightassistant.fms.enroute.direct_to")
     }
 }

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

@@ -306,6 +306,11 @@ menu.flightassistant:
       minimum_climb_speed: 'Minimum climb speed: '
     enroute:
       .: Enroute
+      legend:
+        hover: Hover for legend
+        origin: '%s - FROM waypoint'
+        target: '%s - TO waypoint'
+        direct-to: '%s - DIRECT-TO waypoint'
       delete_all: Delete all
       add_waypoint: Add waypoint
       direct_to: Direct-to

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

@@ -310,6 +310,11 @@ menu.flightassistant:
       minimum_climb_speed: 'Минимальная скорость набора: '
     enroute:
       .: Маршрут
+      legend:
+        hover: Наведись для легенды
+        origin: '%s - точка "откуда"'
+        target: '%s - точка "куда"'
+        direct-to: '%s - точка "куда" (напрямую)'
       delete_all: Удалить все
       add_waypoint: Добавить точку
       direct_to: Прямо-на