fix keymapping localization 1.21.9+

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

Author: Octol1ttle

src/main/kotlin/ru/octol1ttle/flightassistant/FAKeyMappings.kt

@@ -13,8 +13,8 @@ object FAKeyMappings {
     /*private val DEFAULT_CATEGORY = KeyMapping.Category.register(FlightAssistant.id("main"))
     private val THRUST_CATEGORY = KeyMapping.Category.register(FlightAssistant.id("thrust"))
 *///?} else {
-    private const val DEFAULT_CATEGORY = "key.flightassistant"
-    private const val THRUST_CATEGORY = "key.flightassistant.thrust"
+    private const val DEFAULT_CATEGORY = "key.category.flightassistant.main"
+    private const val THRUST_CATEGORY = "key.category.flightassistant.thrust"
 //?}
 
     internal val keyMappings: MutableList<KeyMapping> = ArrayList()
@@ -52,9 +52,11 @@ object FAKeyMappings {
 
 //? if >=1.21.9 {
     /*private fun addKeyMapping(translationKey: String, code: Int, category: KeyMapping.Category = DEFAULT_CATEGORY): KeyMapping {
-*///?} else
-    private fun addKeyMapping(translationKey: String, code: Int, category: String = "key.flightassistant"): KeyMapping {
+        val keyBinding = KeyMapping("key.category.flightassistant.${category.id.path}.${translationKey}", InputConstants.Type.KEYSYM, code, category)
+*///?} else {
+    private fun addKeyMapping(translationKey: String, code: Int, category: String = DEFAULT_CATEGORY): KeyMapping {
         val keyBinding = KeyMapping("${category}.${translationKey}", InputConstants.Type.KEYSYM, code, category)
+//?}
         keyMappings.add(keyBinding)
         return keyBinding
     }

src/main/kotlin/ru/octol1ttle/flightassistant/screen/components/CycleTextOnlyButton.kt

@@ -41,7 +41,7 @@ class CycleTextOnlyButton<E : NameableEnum>(x: Int, y: Int, private val entries:
     }
 *///?} else {
     override fun onPress() {
-        if (Screen.hasShiftDown()) {
+        if (net.minecraft.client.gui.screens.Screen.hasShiftDown()) {
             this.cycleValue(-1)
         } else {
             this.cycleValue(1)

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

@@ -422,14 +422,15 @@ misc.flightassistant:
     .: WAITING FOR WORLD LOAD
     maximum_time: (MAX 3 SECONDS)
 
-key.flightassistant:
-  .: FlightAssistant
-  toggle_enabled: Toggle mod enabled
-  open_flightassistant_setup: Open FlightAssistant setup screen
-  autopilot_disconnect: Disconnect autopilot
-  global_automation_override: Global automation override (hold)
-  hide_current_alert: Hide currently active alert
-  show_hidden_alert: Show last hidden alert
+key.category.flightassistant:
+  main:
+    .: FlightAssistant
+    toggle_enabled: Toggle mod enabled
+    open_flightassistant_setup: Open FlightAssistant setup screen
+    autopilot_disconnect: Disconnect autopilot
+    global_automation_override: Global automation override (hold)
+    hide_current_alert: Hide currently active alert
+    show_hidden_alert: Show last hidden alert
   thrust:
     .: 'FlightAssistant: Thrust'
     decrease_thrust: Decrease thrust

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

@@ -425,14 +425,15 @@ misc.flightassistant:
     .: ОЖИДАНИЕ ЗАГРУЗКИ МИРА
     maximum_time: (МАКС 3 СЕКУНДЫ)
 
-key.flightassistant:
-  .: FlightAssistant
-  toggle_enabled: Включить/выключить мод
-  open_flightassistant_setup: Открыть экран настройки FlightAssistant
-  autopilot_disconnect: Отключить автопилот
-  global_automation_override: Принудительное отключение автоматики (зажать)
-  hide_current_alert: Скрыть активное предупреждение
-  show_hidden_alert: Показать скрытое предупреждение
+key.category.flightassistant:
+  main:
+    .: FlightAssistant
+    toggle_enabled: Включить/выключить мод
+    open_flightassistant_setup: Открыть экран настройки FlightAssistant
+    autopilot_disconnect: Отключить автопилот
+    global_automation_override: Принудительное отключение автоматики (зажать)
+    hide_current_alert: Скрыть активное предупреждение
+    show_hidden_alert: Показать скрытое предупреждение
   thrust:
     .: 'FlightAssistant: Тяга'
     decrease_thrust: Снизить тягу