feat: add "Show flight phase" config option

Closes #16
Octol1ttle · Apr 26, 2024 · 2cedd89 · 2cedd89
1 parent 158620b
commit 2cedd89
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/FAModMenuImpl.java b/src/main/java/ru/octol1ttle/flightassistant/FAModMenuImpl.java
@@ -209,6 +209,11 @@ private ConfigCategory indicators(Text name, IndicatorConfigStorage.IndicatorCon
                         .binding(defaults.showDistanceToWaypoint, () -> config.showDistanceToWaypoint, o -> config.showDistanceToWaypoint = o)
                         .controller(TickBoxControllerBuilder::create)
                         .build())
+                .option(Option.<Boolean>createBuilder()
+                        .name(Text.translatable("config.flightassistant.indicators.info.flight_phase"))
+                        .binding(defaults.showFlightPhase, () -> config.showFlightPhase, o -> config.showFlightPhase = o)
+                        .controller(TickBoxControllerBuilder::create)
+                        .build())
 
                 .option(LabelOption.create(Text.translatable("config.flightassistant.indicators.misc")))
                 .option(Option.<Boolean>createBuilder()

diff --git a/src/main/java/ru/octol1ttle/flightassistant/config/IndicatorConfigStorage.java b/src/main/java/ru/octol1ttle/flightassistant/config/IndicatorConfigStorage.java
@@ -72,6 +72,8 @@ public static class IndicatorConfig {
         public boolean showFireworkCount = true;
         @SerialEntry
         public boolean showDistanceToWaypoint = true;
+        @SerialEntry
+        public boolean showFlightPhase = true;
 
         @SerialEntry
         public boolean showAttitudeIndicator = true;
@@ -119,6 +121,7 @@ IndicatorConfig disableAll() {
             this.showAutomationStatus = false;
             this.showFireworkCount = false;
             this.showDistanceToWaypoint = false;
+            this.showFlightPhase = false;
 
             return this;
         }

diff --git a/src/main/java/ru/octol1ttle/flightassistant/hud/impl/StatusDisplay.java b/src/main/java/ru/octol1ttle/flightassistant/hud/impl/StatusDisplay.java
@@ -51,7 +51,7 @@ public void render(DrawContext context, TextRenderer textRenderer) {
             }
         }
 
-        if (phase.phase != FlightPhaseComputer.FlightPhase.UNKNOWN) {
+        if (FAConfig.indicator().showFlightPhase && phase.phase != FlightPhaseComputer.FlightPhase.UNKNOWN) {
             DrawHelper.drawRightAlignedText(textRenderer, context, phase.phase.text, x, y + 10, FAConfig.indicator().statusColor);
         }
     }

diff --git a/src/main/resources/assets/flightassistant/lang/en_us.json b/src/main/resources/assets/flightassistant/lang/en_us.json
@@ -48,6 +48,7 @@
   "config.flightassistant.indicators.info.alerts": "Show alerts",
   "config.flightassistant.indicators.info.firework_count": "Show firework count",
   "config.flightassistant.indicators.info.waypoint_distance": "Show distance to waypoint",
+  "config.flightassistant.indicators.info.flight_phase": "Show flight phase",
   "config.flightassistant.indicators.misc": "Miscellaneous",
   "config.flightassistant.indicators.misc.attitude": "Show attitude",
   "config.flightassistant.indicators.misc.flight_path": "Show flight path vector icon",

diff --git a/src/main/resources/assets/flightassistant/lang/ru_ru.json b/src/main/resources/assets/flightassistant/lang/ru_ru.json
@@ -48,6 +48,7 @@
   "config.flightassistant.indicators.info.alerts": "Показывать предупреждения",
   "config.flightassistant.indicators.info.firework_count": "Показывать счётчик фейерверков",
   "config.flightassistant.indicators.info.waypoint_distance": "Показывать расстояние до точки назначения",
+  "config.flightassistant.indicators.info.flight_phase": "Показывать фазу полёта",
   "config.flightassistant.indicators.misc": "Прочее",
   "config.flightassistant.indicators.misc.attitude": "Показывать индикатор ориентации",
   "config.flightassistant.indicators.misc.flight_path": "Показывать иконку пути полёта",
@@ -158,6 +159,14 @@
 
   "status.flightassistant.firework_count": "КОЛ-ВО ФРВКОВ: %s",
   "status.flightassistant.waypoint_distance": "РАССТ: %s",
+  "status.flightassistant.phase.on_ground": "НА ЗЕМЛЕ",
+  "status.flightassistant.phase.takeoff": "ВЗЛЕТ",
+  "status.flightassistant.phase.climb": "НАБОР",
+  "status.flightassistant.phase.cruise": "КРЕЙСЕР",
+  "status.flightassistant.phase.descent": "СНИЖЕНИЕ",
+  "status.flightassistant.phase.approach": "ПОДХОД",
+  "status.flightassistant.phase.land": "ПОСАДКА",
+  "status.flightassistant.phase.go_around": "ВТОРОЙ КРУГ",
 
   "mode.flightassistant.minimums.absolute": "МИНИМ %s",
   "mode.flightassistant.minimums.relative": "МИНИМ +%s",
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            if (phase.phase != FlightPhaseComputer.FlightPhase.UNKNOWN) {
+            if (FAConfig.indicator().showFlightPhase && phase.phase != FlightPhaseComputer.FlightPhase.UNKNOWN) {
                 DrawHelper.drawRightAlignedText(textRenderer, context, phase.phase.text, x, y + 10, FAConfig.indicator().statusColor);
             }
         }
@@ Expand Down @@