🚧 WIP of chording and next release.

src/main/resources/assets/lambdacontrols/lang/en_us.json

@@ -10,6 +10,8 @@
   "lambdacontrols.action.exit": "Exit",
   "lambdacontrols.action.forward": "Forward",
   "lambdacontrols.action.hit": "Hit",
+  "lambdacontrols.action.hotbar_left": "Hotbar left",
+  "lambdacontrols.action.hotbar_right": "Hotbar right",
   "lambdacontrols.action.inventory": "Inventory",
   "lambdacontrols.action.jump": "Jump",
   "lambdacontrols.action.left": "Left",
@@ -72,6 +74,7 @@
   "lambdacontrols.hud_side.right": "right",
   "lambdacontrols.menu.auto_switch_mode": "Auto switch mode",
   "lambdacontrols.menu.controller": "Controller",
+  "lambdacontrols.menu.controller2": "Second controller",
   "lambdacontrols.menu.controller_type": "Controller type",
   "lambdacontrols.menu.controls_mode": "Mode",
   "lambdacontrols.menu.dead_zone": "Dead zone",
@@ -79,9 +82,23 @@
   "lambdacontrols.menu.hud_side": "HUD side",
   "lambdacontrols.menu.invert_right_x_axis": "Invert right X",
   "lambdacontrols.menu.invert_right_y_axis": "Invert right Y",
+  "lambdacontrols.menu.keyboard_controls": "Keyboard controls...",
   "lambdacontrols.menu.mouse_speed": "Mouse speed",
   "lambdacontrols.menu.reload_controller_mappings": "Reload controller mappings",
   "lambdacontrols.menu.rotation_speed": "Rotation speed",
   "lambdacontrols.menu.title": "LambdaControls - Settings",
-  "lambdacontrols.menu.title.controller_controls": "Controller controls"
+  "lambdacontrols.menu.title.controller": "Controller options",
+  "lambdacontrols.menu.title.controller_controls": "Controller controls",
+  "lambdacontrols.menu.title.general": "General options",
+  "lambdacontrols.menu.title.hud": "HUD options",
+  "lambdacontrols.tooltip.auto_switch_mode": "Sets whether the controls mode should be switched automatically to Controller if a controller is connected.",
+  "lambdacontrols.tooltip.controller2": "Defines a second controller to use, which allow Joy-Cons support for example.",
+  "lambdacontrols.tooltip.controller_type": "Changes the controller type to displays the correct buttons.",
+  "lambdacontrols.tooltip.controls_mode": "Changes the controls mode.",
+  "lambdacontrols.tooltip.dead_zone": "Sets the dead zone of the controller's axises.",
+  "lambdacontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.",
+  "lambdacontrols.tooltip.hud_side": "Changes the position of the HUD.",
+  "lambdacontrols.tooltip.mouse_speed": "Changes the emulated mouse speed with a controller.",
+  "lambdacontrols.tooltip.rotation_speed": "Changes the camera rotation speed in controller mode.",
+  "lambdacontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file."
 }

src/main/resources/assets/lambdacontrols/lang/fr_ca.json

@@ -0,0 +1,104 @@
+{
+  "key.lambdacontrols.look_down": "Regarder en bas",
+  "key.lambdacontrols.look_left": "Regarder à gauche",
+  "key.lambdacontrols.look_right": "Regarder à droite",
+  "key.lambdacontrols.look_up": "Regarder en haut",
+  "lambdacontrols.action.attack": "Attaquer",
+  "lambdacontrols.action.back": "Reculer",
+  "lambdacontrols.action.chat": "Ouvrir le tchat",
+  "lambdacontrols.action.drop_item": "Jeter l'objet",
+  "lambdacontrols.action.exit": "Sortir",
+  "lambdacontrols.action.forward": "Avancer",
+  "lambdacontrols.action.hit": "Taper",
+  "lambdacontrols.action.hotbar_left": "Case à gauche de la barre d'action",
+  "lambdacontrols.action.hotbar_right": "Case à droite de la barre d'action",
+  "lambdacontrols.action.inventory": "Inventaire",
+  "lambdacontrols.action.jump": "Sauter",
+  "lambdacontrols.action.left": "Aller à gauche",
+  "lambdacontrols.action.pause_game": "Mettre en pause le jeu",
+  "lambdacontrols.action.pick_block": "Choisir le bloc",
+  "lambdacontrols.action.pickup": "Prendre",
+  "lambdacontrols.action.pickup_all": "Prendre tout",
+  "lambdacontrols.action.player_list": "Afficher la liste des joueurs",
+  "lambdacontrols.action.quick_move": "Mouvement rapide",
+  "lambdacontrols.action.right": "Aller à droite",
+  "lambdacontrols.action.screenshot": "Prendre une capture d'écran",
+  "lambdacontrols.action.sneak": "S'accroupir",
+  "lambdacontrols.action.sprint": "Courir",
+  "lambdacontrols.action.swap_hands": "Échanger de mains",
+  "lambdacontrols.action.toggle_perspective": "Changer de point de vue",
+  "lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique",
+  "lambdacontrols.action.use": "Utiliser",
+  "lambdacontrols.button.a": "A",
+  "lambdacontrols.button.b": "B",
+  "lambdacontrols.button.x": "X",
+  "lambdacontrols.button.y": "Y",
+  "lambdacontrols.button.left_bumper": "Gâchette haute gauche",
+  "lambdacontrols.button.right_bumper": "Gâchette haute droite",
+  "lambdacontrols.button.back": "Retour",
+  "lambdacontrols.button.start": "Touche Menu",
+  "lambdacontrols.button.guide": "Guide",
+  "lambdacontrols.button.left_thumb": "Stick gauche",
+  "lambdacontrols.button.right_thumb": "Stick droit",
+  "lambdacontrols.button.dpad_up": "D-Pad haut",
+  "lambdacontrols.button.dpad_right": "D-Pad droit",
+  "lambdacontrols.button.dpad_down": "D-Pad bas",
+  "lambdacontrols.button.dpad_left": "D-Pad gauche",
+  "lambdacontrols.axis.left_x+": "X+ Gauche",
+  "lambdacontrols.axis.left_y+": "Y+ Gauche",
+  "lambdacontrols.axis.right_x+": "X+ Droit",
+  "lambdacontrols.axis.right_y+": "Y+ Droit",
+  "lambdacontrols.axis.left_trigger": "Gâchette gauche",
+  "lambdacontrols.axis.right_trigger": "Gâchette droite",
+  "lambdacontrols.axis.left_x-": "X- Gauche",
+  "lambdacontrols.axis.left_y-": "Y- Gauche",
+  "lambdacontrols.axis.right_x-": "X- Droit",
+  "lambdacontrols.axis.right_y-": "Y- Droit",
+  "lambdacontrols.button.unknown": "Inconnu (%d)",
+  "lambdacontrols.controller.connected": "Manette %d connecté.",
+  "lambdacontrols.controller.disconnected": "Manette %d déconnecté.",
+  "lambdacontrols.controller.mappings.1": "Pour configurer les correspondances de la manette, veuillez utiliser %sSDL2 Gamepad Tool%s",
+  "lambdacontrols.controller.mappings.2": "(%s%s%s),",
+  "lambdacontrols.controller.mappings.3": "et mettez les correspondances dans le fichier `%s.minecraft/config/gamecontrollerdb.txt%s`.",
+  "lambdacontrols.controller.mappings.updated": "Configuration des manettes mise à jour!",
+  "lambdacontrols.controller_type.default": "default",
+  "lambdacontrols.controller_type.dualshock": "DualShock",
+  "lambdacontrols.controller_type.switch": "Switch",
+  "lambdacontrols.controller_type.xbox": "Xbox",
+  "lambdacontrols.controller_type.steam": "Steam",
+  "lambdacontrols.controller_type.ouya": "OUYA",
+  "lambdacontrols.controls_mode.default": "Clavier/Souris",
+  "lambdacontrols.controls_mode.controller": "Manette",
+  "lambdacontrols.controls_mode.touchscreen": "Tactile",
+  "lambdacontrols.hud_side.left": "gauche",
+  "lambdacontrols.hud_side.right": "droit",
+  "lambdacontrols.menu.auto_switch_mode": "Changement auto de mode",
+  "lambdacontrols.menu.controller": "Manette",
+  "lambdacontrols.menu.controller2": "Deuxième manette",
+  "lambdacontrols.menu.controller_type": "Type de manette",
+  "lambdacontrols.menu.controls_mode": "Mode",
+  "lambdacontrols.menu.dead_zone": "Zone morte",
+  "lambdacontrols.menu.hud_enable": "Activer le HUD",
+  "lambdacontrols.menu.hud_side": "Côté du HUD",
+  "lambdacontrols.menu.invert_right_x_axis": "Inverser le stick droit (X)",
+  "lambdacontrols.menu.invert_right_y_axis": "Inverser le stick droit (Y)",
+  "lambdacontrols.menu.keyboard_controls": "Contrôles clavier...",
+  "lambdacontrols.menu.mouse_speed": "Vitesse de la souris",
+  "lambdacontrols.menu.reload_controller_mappings": "Recharge la configuration des manettes",
+  "lambdacontrols.menu.rotation_speed": "Vitesse de rotation",
+  "lambdacontrols.menu.title": "LambdaControls - Paramètres",
+  "lambdacontrols.menu.title.controller": "Options de manettes",
+  "lambdacontrols.menu.title.controller_controls": "Contrôles de la manette",
+  "lambdacontrols.menu.title.general": "Options générales",
+  "lambdacontrols.menu.title.hud": "Options du HUD",
+  "lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
+  "lambdacontrols.tooltip.controller2": "Défini une deuxième manette, utile dans le cas d'utilisation de Joy-Cons.",
+  "lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
+  "lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
+  "lambdacontrols.tooltip.dead_zone": "Détermine la zone morte des axes de la manette.",
+  "lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
+  "lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
+  "lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
+  "lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes."
+}

src/main/resources/assets/lambdacontrols/lang/fr_fr.json

@@ -10,6 +10,8 @@
   "lambdacontrols.action.exit": "Sortir",
   "lambdacontrols.action.forward": "Avancer",
   "lambdacontrols.action.hit": "Taper",
+  "lambdacontrols.action.hotbar_left": "Case à gauche de la barre d'action",
+  "lambdacontrols.action.hotbar_right": "Case à droite de la barre d'action",
   "lambdacontrols.action.inventory": "Inventaire",
   "lambdacontrols.action.jump": "Sauter",
   "lambdacontrols.action.left": "Aller à gauche",
@@ -36,8 +38,8 @@
   "lambdacontrols.button.back": "Retour",
   "lambdacontrols.button.start": "Touche Menu",
   "lambdacontrols.button.guide": "Guide",
-  "lambdacontrols.button.left_thumb": "Stick analogique gauche",
-  "lambdacontrols.button.right_thumb": "Stick analogique droit",
+  "lambdacontrols.button.left_thumb": "Stick gauche",
+  "lambdacontrols.button.right_thumb": "Stick droit",
   "lambdacontrols.button.dpad_up": "D-Pad haut",
   "lambdacontrols.button.dpad_right": "D-Pad droit",
   "lambdacontrols.button.dpad_down": "D-Pad bas",
@@ -72,16 +74,31 @@
   "lambdacontrols.hud_side.right": "droit",
   "lambdacontrols.menu.auto_switch_mode": "Changement auto de mode",
   "lambdacontrols.menu.controller": "Manette",
+  "lambdacontrols.menu.controller2": "Deuxième manette",
   "lambdacontrols.menu.controller_type": "Type de manette",
   "lambdacontrols.menu.controls_mode": "Mode",
   "lambdacontrols.menu.dead_zone": "Zone morte",
   "lambdacontrols.menu.hud_enable": "Activer le HUD",
   "lambdacontrols.menu.hud_side": "Côté du HUD",
-  "lambdacontrols.menu.invert_right_x_axis": "Inverser le joystick droit (X)",
-  "lambdacontrols.menu.invert_right_y_axis": "Inverser le joystick droit (Y)",
+  "lambdacontrols.menu.invert_right_x_axis": "Inverser le stick droit (X)",
+  "lambdacontrols.menu.invert_right_y_axis": "Inverser le stick droit (Y)",
+  "lambdacontrols.menu.keyboard_controls": "Contrôles clavier...",
   "lambdacontrols.menu.mouse_speed": "Vitesse de la souris",
   "lambdacontrols.menu.reload_controller_mappings": "Recharge la configuration des manettes",
   "lambdacontrols.menu.rotation_speed": "Vitesse de rotation",
   "lambdacontrols.menu.title": "LambdaControls - Paramètres",
-  "lambdacontrols.menu.title.controller_controls": "Contrôles de la manette"
+  "lambdacontrols.menu.title.controller": "Options de manettes",
+  "lambdacontrols.menu.title.controller_controls": "Contrôles de la manette",
+  "lambdacontrols.menu.title.general": "Options générales",
+  "lambdacontrols.menu.title.hud": "Options du HUD",
+  "lambdacontrols.tooltip.auto_switch_mode": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
+  "lambdacontrols.tooltip.controller2": "Défini une deuxième manette, utile dans le cas d'utilisation de Joy-Cons.",
+  "lambdacontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
+  "lambdacontrols.tooltip.controls_mode": "Change le mode de contrôle.",
+  "lambdacontrols.tooltip.dead_zone": "Détermine la zone morte des axes de la manette.",
+  "lambdacontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
+  "lambdacontrols.tooltip.hud_side": "Change la position du HUD.",
+  "lambdacontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
+  "lambdacontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.",
+  "lambdacontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes."
 }

src/main/resources/config.toml

@@ -15,6 +15,8 @@ auto_switch_mode = false
 [controller]
     # Controller to use.
     id = 0
+    # Second controller to use.
+    id2 = -1
     # Controller's type.
     type = "default"
     # Controller's dead zone.
@@ -30,36 +32,42 @@ auto_switch_mode = false
     # Controller controls.
     [controller.controls]
         # Attack control.
-        attack = 105
+        attack = "105"
         # Back control.
-        back = 201
+        back = "201"
         # Open chat control.
-        chat = 12
+        chat = "12"
         # Drop item control.
-        drop_item = 1
+        drop_item = "1"
         # Forward control.
-        forward = 101
+        forward = "101"
+        # Hot-bar left control.
+        hotbar_left = "4"
+        # Hot-bar right control.
+        hotbar_right = "5"
         # Inventory control.
-        inventory = 3
+        inventory = "3"
         # Jump control.
-        jump = 0
+        jump = "0"
         # Pause game control.
-        pause_game = 7
+        pause_game = "7"
         # Pick block control.
-        pick_block = 14
+        pick_block = "14"
         # Show player list control.
-        player_list = 6
+        player_list = "6"
         # Take screenshot control.
-        screenshot = 13
+        screenshot = "11+0"
         # Sneak control.
-        sneak = 10
+        sneak = "10"
         # Sprint control.
-        sprint = 9
+        sprint = "9"
         # Swap hands control.
-        swap_hands = 2
+        swap_hands = "2"
         # Toggle perspective control.
-        toggle_perspective = 11
+        toggle_perspective = "11+3"
         # Toggle smooth camera control.
-        toggle_smooth_camera = -1
+        toggle_smooth_camera = "-1"
         # Use control.
-        use = 104
+        use = "104"
+        # Zoom control.
+        zoom = "11+2"

src/main/resources/fabric.mod.json

@@ -18,6 +18,9 @@
   "entrypoints": {
     "client": [
       "me.lambdaurora.lambdacontrols.LambdaControls"
+    ],
+    "modmenu": [
+      "me.lambdaurora.lambdacontrols.LambdaControlsModMenu"
     ]
   },
   "mixins": [
@@ -26,7 +29,11 @@
   "depends": {
     "fabricloader": ">=0.4.0",
     "fabric": "*",
-    "minecraft": "1.15.x"
+    "minecraft": "1.15.x",
+    "spruceui": ">=1.0.1"
+  },
+  "recommends": {
+    "modmenu": ">=1.8.0+build.16"
   },
   "suggests": {
     "flamingo": "*"

src/main/resources/lambdacontrols.mixins.json

@@ -5,10 +5,10 @@
   "client": [
     "AbstractButtonWidgetAccessor",
     "AbstractContainerScreenMixin",
+    "ControlsOptionsScreenMixin",
     "CreativeInventoryScreenMixin",
     "EntryListWidgetAccessor",
     "GameRendererMixin",
-    "InGameHudMixin",
     "KeyBindingMixin",
     "MinecraftClientMixin",
     "MouseMixin",
@@ -17,4 +17,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
+}