Fix #210

- When Wynntils is present, the keybindings are now loaded only after the keybinding category was created, allowing them to be handled by MidnightControls

build.gradle

@@ -32,7 +32,7 @@ boolean isMCVersionNonRelease() {
 }
 
 String getMCVersionString() {
-    if (isMCVersionNonRelease() || project.minecraft_version == "1.19.4") {
+    if (isMCVersionNonRelease() || project.minecraft_version == "1.20.2") {
         return project.minecraft_version
     }
     def version = project.minecraft_version.split('\\.')

gradle.properties

@@ -3,23 +3,23 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.1
-loader_version=0.14.17
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.1
+loader_version=0.14.22
 
 # Mod Properties
-mod_version = 1.8.1
+mod_version = 1.9.0
 maven_group = eu.midnightdust
 archives_base_name = midnightcontrols
 modrinth_id=bXX9h73M
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.75.3+1.19.4
+fabric_version=0.89.2+1.20.2
 sodium_version=mc1.19.2-0.4.4
-spruceui_version=4.2.0+1.19.4
-midnightlib_version=1.2.1-fabric
-modmenu_version=5.0.1
+spruceui_version=5.0.3+1.20.2
+midnightlib_version=1.5.0-fabric
+modmenu_version=7.0.0
 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
 bendylib_version=2.0.+
 emi_version=0.5.0+1.19.3
@@ -27,7 +27,7 @@ libgui_version=6.0.0+1.19
 inventorytabs_version=inventorytabs-0.9.beta-1.19.x
 clothconfig_version=7.0.72
 yacl_version=2.2.0
-bedrockify_version=1.5+mc1.19.1-2
+bedrockify_version=1.9+mc1.20
 
 # Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions.
 # ok_zoomer_version=5.0.0-beta.3+1.17.1

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java

@@ -10,12 +10,12 @@
 package eu.midnightdust.midnightcontrols.client;
 
 import dev.lambdaurora.spruceui.event.OpenScreenCallback;
+import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
-import eu.midnightdust.midnightcontrols.client.compat.VoxelMapCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
@@ -24,10 +24,10 @@ import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsHud;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
 import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingIDAccessor;
-import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingRegistryImplAccessor;
 import eu.midnightdust.midnightcontrols.client.ring.ButtonBindingRingAction;
 import eu.midnightdust.midnightcontrols.client.ring.MidnightRing;
 import dev.lambdaurora.spruceui.hud.HudManager;
+import eu.midnightdust.midnightcontrols.client.util.RainbowColor;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
@@ -47,6 +47,7 @@ import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 import java.io.File;
+import java.util.Objects;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -59,7 +60,6 @@ import java.util.TimerTask;
  */
 public class MidnightControlsClient extends MidnightControls implements ClientModInitializer {
     public static boolean lateInitDone = false;
-    public static boolean voxelmapInitDone = false;
     private static MidnightControlsClient INSTANCE;
     public static final KeyBinding BINDING_LOOK_UP = InputManager.makeKeyBinding(new Identifier(MidnightControlsConstants.NAMESPACE, "look_up"),
             InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_KP_8, "key.categories.movement");
@@ -122,20 +122,21 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
                 this.input.onScreenOpen(client, client.getWindow().getWidth(), client.getWindow().getHeight());
             }
         });
+        final MinecraftClient client = MinecraftClient.getInstance();
+        int delay = 0; // delay for 0 sec.
+        int period = 1; // repeat every 0.001 sec. (100 times a second)
+        Timer timer = new Timer();
+        timer.scheduleAtFixedRate(new TimerTask() {
+            public void run() {
+                input.updateCamera(client);
+            }
+        }, delay, period);
 
         HudManager.register(this.hud = new MidnightControlsHud(this));
         FabricLoader.getInstance().getModContainer("midnightcontrols").ifPresent(modContainer -> {
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("midnightcontrols","bedrock"), modContainer, ResourcePackActivationType.NORMAL);
             ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("midnightcontrols","legacy"), modContainer, ResourcePackActivationType.NORMAL);
         });
-        int delay = 0; // delay for 0 sec.
-        int period = 1; // repeat every 0.001 sec. (100 times a second)
-        Timer timer = new Timer();
-        timer.scheduleAtFixedRate(new TimerTask() {
-            public void run() {
-                input.updateCamera(MinecraftClient.getInstance());
-            }
-        }, delay, period);
     }
 
     /**
@@ -154,18 +155,20 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
         }
         this.hud.setVisible(MidnightControlsConfig.hudEnable);
         Controller.updateMappings();
-        GLFW.glfwSetJoystickCallback((jid, event) -> {
-            if (event == GLFW.GLFW_CONNECTED) {
-                var controller = Controller.byId(jid);
-                client.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT, Text.translatable("midnightcontrols.controller.connected", jid),
-                        Text.literal(controller.getName())));
-            } else if (event == GLFW.GLFW_DISCONNECTED) {
-                client.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT, Text.translatable("midnightcontrols.controller.disconnected", jid),
-                        null));
-            }
+        try {
+            GLFW.glfwSetJoystickCallback((jid, event) -> {
+                if (event == GLFW.GLFW_CONNECTED) {
+                    var controller = Controller.byId(jid);
+                    client.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT, Text.translatable("midnightcontrols.controller.connected", jid),
+                            Text.literal(controller.getName())));
+                } else if (event == GLFW.GLFW_DISCONNECTED) {
+                    client.getToastManager().add(new SystemToast(SystemToast.Type.TUTORIAL_HINT, Text.translatable("midnightcontrols.controller.disconnected", jid),
+                            null));
+                }
 
-            this.switchControlsMode();
-        });
+                this.switchControlsMode();
+            });
+        } catch (Exception e) {e.printStackTrace();}
 
         MidnightControlsCompat.init(this);
     }
@@ -174,30 +177,28 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
      * This method is called to initialize keybindings
      */
     public void initKeybindings() {
-        if (!voxelmapInitDone && FabricLoader.getInstance().isModLoaded("voxelmap") && KeyBindingIDAccessor.getKEYS_BY_ID().containsKey("key.minimap.toggleingamewaypoints")) {
-            this.log("Adding VoxelMap compatibility...");
-            new VoxelMapCompat().handle(this);
-            InputManager.loadButtonBindings();
-            voxelmapInitDone = true;
-        }
         if (lateInitDone) return;
-        if (KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS() == null || KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().isEmpty()) return;
-        for (int i = 0; i < KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().size(); ++i) {
-            KeyBinding keyBinding = KeyBindingRegistryImplAccessor.getMODDED_KEY_BINDINGS().get(i);
-            if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
-                category = null;
-                InputManager.streamCategories().forEach(buttonCategory -> {
-                    if (buttonCategory.getIdentifier().equals(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory())))
-                        category = buttonCategory;
-                });
-                if (category == null) {
-                    category = new ButtonCategory(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory()));
-                    InputManager.registerCategory(category);
-                }
-                ButtonBinding buttonBinding = new ButtonBinding.Builder(keyBinding.getTranslationKey()).category(category).linkKeybind(keyBinding).register();
-                if (MidnightControlsConfig.debug) {
-                    logger.info(keyBinding.getTranslationKey());
-                    logger.info(buttonBinding);
+        if (KeyBindingIDAccessor.getKEYS_BY_ID() == null || KeyBindingIDAccessor.getKEYS_BY_ID().isEmpty()) return;
+        if (PlatformFunctions.isModLoaded("voxelmap") && !KeyBindingIDAccessor.getKEYS_BY_ID().containsKey("key.minimap.toggleingamewaypoints")) return;
+        if (PlatformFunctions.isModLoaded("wynntils") && KeyBindingIDAccessor.getKEYS_BY_ID().entrySet().stream().noneMatch(b -> Objects.equals(b.getValue().getCategory(), "Wynntils"))) return;
+        for (int i = 0; i < KeyBindingIDAccessor.getKEYS_BY_ID().size(); ++i) {
+            KeyBinding keyBinding = KeyBindingIDAccessor.getKEYS_BY_ID().entrySet().stream().toList().get(i).getValue();
+            if (MidnightControlsConfig.excludedKeybindings.stream().noneMatch(excluded -> keyBinding.getTranslationKey().startsWith(excluded))) {
+                if (!keyBinding.getTranslationKey().contains("midnightcontrols") && !keyBinding.getTranslationKey().contains("ok_zoomer") && !keyBinding.getTranslationKey().contains("okzoomer")) {
+                    category = null;
+                    InputManager.streamCategories().forEach(buttonCategory -> {
+                        if (buttonCategory.getIdentifier().equals(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory())))
+                            category = buttonCategory;
+                    });
+                    if (category == null) {
+                        category = new ButtonCategory(new org.aperlambda.lambdacommon.Identifier("minecraft", keyBinding.getCategory()));
+                        InputManager.registerCategory(category);
+                    }
+                    ButtonBinding buttonBinding = new ButtonBinding.Builder(keyBinding.getTranslationKey()).category(category).linkKeybind(keyBinding).register();
+                    if (MidnightControlsConfig.debug) {
+                        logger.info(keyBinding.getTranslationKey());
+                        logger.info(buttonBinding);
+                    }
                 }
             }
         }
@@ -227,9 +228,7 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo
             MidnightControlsConfig.enableHints = false;
             MidnightControlsConfig.save();
         }
-    }
-    public void onRender(MinecraftClient client) {
-        //this.input.onRender(client);
+        RainbowColor.tick();
     }
 
     /**

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java

@@ -18,8 +18,11 @@ import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
+import eu.midnightdust.midnightcontrols.client.touch.TouchMode;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
@@ -60,13 +63,16 @@ public class MidnightControlsConfig extends MidnightConfig {
     @Entry(category = "controller", name = "midnightcontrols.menu.left_dead_zone", isSlider = true, min = 0.05, max = 1) public static double leftDeadZone = 0.25;
     @Entry(category = "controller", name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false;
     @Entry(category = "controller", name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false;
-    @Entry(category = "controller", name = "midnightcontrols.menu.rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double rotationSpeed = 40.0; //used for x-axis, name kept for compatibility
+    @Entry(category = "controller", name = "midnightcontrols.menu.rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double rotationSpeed = 35.0; //used for x-axis, name kept for compatibility
     @Entry(category = "controller", name = "midnightcontrols.menu.y_axis_rotation_speed", isSlider = true, min = 0, max = 100, precision = 10) public static double yAxisRotationSpeed = rotationSpeed;
     @Entry(category = "screens", name = "midnightcontrols.menu.mouse_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double mouseSpeed = 25.0;
     @Entry(category = "screens", name = "midnightcontrols.menu.joystick_as_mouse") public static boolean joystickAsMouse = false;
+    @Entry(category = "screens", name = "midnightcontrols.menu.eye_tracker_as_mouse") public static boolean eyeTrackerAsMouse = false;
+    @Entry(category = "screens", name = "midnightcontrols.menu.eye_tracker_deadzone", isSlider = true, min = 0, max = 0.4) public static double eyeTrackerDeadzone = 0.05;
     @Entry(category = "controller", name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false;
     @Entry(category = "screens", name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false;
     @Entry(category = "screens", name = "midnightcontrols.menu.virtual_mouse.skin") public static VirtualMouseSkin virtualMouseSkin = VirtualMouseSkin.DEFAULT_LIGHT;
+    @Entry(category = "screens", name = "midnightcontrols.menu.hide_cursor") public static boolean hideNormalMouse = false;
     @Entry(category = "controller", name = "Controller ID") @Hidden public static Object controllerID = 0;
     @Entry(category = "controller", name = "2nd Controller ID") @Hidden public static Object secondControllerID = -1;
     @Entry(category = "visual", name = "midnightcontrols.menu.controller_type") public static ControllerType controllerType = ControllerType.DEFAULT;
@@ -76,6 +82,17 @@ public class MidnightControlsConfig extends MidnightConfig {
             "me.shedaniel.clothconfig2.gui.ClothConfigScreen", "com.mamiyaotaru.voxelmap.gui.GuiWaypoints", "com.mamiyaotaru.voxelmap.gui.GuiPersistentMap");
     @Entry(category = "screens", name = "Arrow screens") public static List<String> arrowScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName());
     @Entry(category = "screens", name = "WASD screens") public static List<String> wasdScreens = Lists.newArrayList("com.ultreon.devices.core.Laptop");
+    @Entry(category = "touch", name = "Screens with close button") public static List<String> closeButtonScreens = Lists.newArrayList(ChatScreen.class.getCanonicalName(), AdvancementsScreen.class.getCanonicalName(), RingScreen.class.getCanonicalName());
+    @Entry(category = "touch", name = "midnightcontrols.menu.touch_speed", isSlider = true, min = 0, max = 150, precision = 10) public static double touchSpeed = 50.0;
+    @Entry(category = "touch", name = "midnightcontrols.menu.invert_touch") public static boolean invertTouch = false;
+    @Entry(category = "touch", name = "midnightcontrols.menu.touch_mode") public static TouchMode touchMode = TouchMode.CROSSHAIR;
+    @Entry(category = "touch", name = "midnightcontrols.menu.touch_break_delay", isSlider = true, min = 50, max = 500) public static int touchBreakDelay = 120;
+    @Entry(category = "touch", name = "midnightcontrols.menu.touch_transparency", isSlider = true, min = 0, max = 100) public static int touchTransparency = 75;
+    @Entry(category = "touch", name = "Touch Outline Color", isColor = true) public static String touchOutlineColorHex = "#ffffff";
+    @Entry(category = "touch", name = "Touch Outline Alpha", isSlider = true, min = 0, max = 255) public static int touchOutlineColorAlpha = 150;
+    @Entry(category = "touch", name = "Left Touch button bindings") public static List<String> leftTouchBinds = Lists.newArrayList("debug_screen", "screenshot","toggle_perspective");
+    @Entry(category = "touch", name = "Right Touch button bindings") public static List<String> rightTouchBinds = Lists.newArrayList("screenshot","toggle_perspective", "use");
+
     @Entry @Hidden public static Map<String, String> BINDING = new HashMap<>();
 
     private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
@@ -84,7 +101,10 @@ public class MidnightControlsConfig extends MidnightConfig {
     @Entry(category = "controller", name = "Max analog value: Left Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueLeftY = maxAnalogValues[1];
     @Entry(category = "controller", name = "Max analog value: Right X", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightX = maxAnalogValues[2];
     @Entry(category = "controller", name = "Max analog value: Right Y", isSlider = true, min = .25f, max = 1.f) public static double maxAnalogValueRightY = maxAnalogValues[3];
-    @Entry(category = "controller", name = "Trigger button fix") public static boolean triggerFix = true;
+    @Entry(category = "controller", name = "Trigger button fix") public static boolean triggerFix = false;
+    @Entry(category = "controller", name = "Excluded Keybindings") public static List<String> excludedKeybindings = Lists.newArrayList("key.forward", "key.left", "key.back", "key.right", "key.jump", "key.sneak", "key.sprint", "key.inventory",
+            "key.swapOffhand", "key.drop", "key.use", "key.attack", "key.chat", "key.playerlist", "key.screenshot", "key.togglePerspective", "key.smoothCamera", "key.fullscreen", "key.saveToolbarActivator", "key.loadToolbarActivator",
+            "key.pickItem", "key.hotbar.1", "key.hotbar.2", "key.hotbar.3", "key.hotbar.4", "key.hotbar.5", "key.hotbar.6", "key.hotbar.7", "key.hotbar.8", "key.hotbar.9");
     @Entry(category = "gameplay", name = "Enable Hints") public static boolean enableHints = true;
     @Entry(category = "screens", name = "Enable Shortcut in Controls Options") public static boolean shortcutInControls = true;
     @Entry(category = "misc", name = "Ring Bindings (WIP)") public static List<String> ringBindings = new ArrayList<>();

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java

@@ -23,6 +23,7 @@ import eu.midnightdust.midnightcontrols.client.gui.widget.ControllerControlsWidg
 import eu.midnightdust.midnightcontrols.client.mixin.*;
 import eu.midnightdust.midnightcontrols.client.ring.RingPage;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
+import eu.midnightdust.midnightcontrols.client.util.MathUtil;
 import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
 import dev.lambdaurora.spruceui.navigation.NavigationDirection;
 import dev.lambdaurora.spruceui.screen.SpruceScreen;
@@ -35,7 +36,6 @@ import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.ParentElement;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementTab;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
@@ -46,8 +46,6 @@ import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
 import net.minecraft.client.gui.screen.world.WorldListWidget;
 import net.minecraft.client.gui.widget.*;
-import net.minecraft.client.input.Input;
-import net.minecraft.client.util.InputUtil;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.TranslatableTextContent;
 import net.minecraft.util.math.MathHelper;
@@ -203,18 +201,8 @@ public class MidnightInput {
             }
             client.getTutorialManager().onUpdateMouse(this.targetPitch, this.targetYaw);
             MidnightControlsCompat.HANDLERS.forEach(handler -> handler.handleCamera(client, targetYaw, targetPitch));
-            this.onRender(client);
         }
     }
-    /**
-     * This method is deprecated and will be removed in future versions
-     * It is just kept, because the current version of 'Do a Barrel Roll' mixins into this method
-     *
-     * @param client the client instance
-     */
-    @Deprecated
-    public void onRender(@NotNull MinecraftClient client) {
-    }
 
     /**
      * This method is called when a Screen is opened.
@@ -266,12 +254,33 @@ public class MidnightInput {
             InputManager.STATES.put(btn, state);
         }
     }
+    MathUtil.PolarUtil polarLeft = new MathUtil.PolarUtil();
+    MathUtil.PolarUtil polarRight = new MathUtil.PolarUtil();
 
     private void fetchAxeInput(@NotNull MinecraftClient client, @NotNull GLFWGamepadState gamepadState, boolean leftJoycon) {
         var buffer = gamepadState.axes();
+
+        polarLeft.calculate(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X), buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y), 1, MidnightControlsConfig.leftDeadZone);
+        float leftX = polarLeft.polarX;
+        float leftY = polarLeft.polarY;
+        polarRight.calculate(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X), buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y), 1, MidnightControlsConfig.rightDeadZone);
+        float rightX = polarRight.polarX;
+        float rightY = polarRight.polarY;
+
         for (int i = 0; i < buffer.limit(); i++) {
             int axis = leftJoycon ? ButtonBinding.controller2Button(i) : i;
             float value = buffer.get();
+
+            if (MidnightControlsConfig.analogMovement) {
+                switch (i) {
+                    case GLFW_GAMEPAD_AXIS_LEFT_X -> value = leftX;
+                    case GLFW_GAMEPAD_AXIS_LEFT_Y -> value = leftY;
+                }
+            }
+            switch (i) {
+                case GLFW_GAMEPAD_AXIS_RIGHT_X -> value = rightX;
+                case GLFW_GAMEPAD_AXIS_RIGHT_Y -> value = rightY;
+            }
             float absValue = Math.abs(value);
 
             if (i == GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y)
@@ -281,24 +290,26 @@ public class MidnightInput {
             if (!(client.currentScreen instanceof RingScreen || (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)))) this.handleAxe(client, axis, value, absValue, state);
         }
         if (client.currentScreen instanceof RingScreen || (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen))) {
-            float x = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X)) > MidnightControlsConfig.leftDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_LEFT_X) : 0;
-            float y = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y)) > MidnightControlsConfig.leftDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_LEFT_Y) : 0;
+            float x = leftX;
+            float y = leftY;
+
             if (x == 0 && y == 0) {
-                x = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X)) > MidnightControlsConfig.rightDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_X) : 0;
-                y = Math.abs(buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y)) > MidnightControlsConfig.rightDeadZone ? buffer.get(GLFW_GAMEPAD_AXIS_RIGHT_Y) : 0;
+                x = rightX;
+                y = rightY;
             }
             int index = -1;
-            if (x < 0) {
-                if (y < 0) index = 0;
-                if (y == 0) index = 3;
-                if (y > 0) index = 5;
-            } else if (x == 0) {
-                if (y < 0) index = 1;
-                if (y > 0) index = 6;
-            } else if (x > 0) {
-                if (y < 0) index = 2;
-                if (y == 0) index = 4;
-                if (y > 0) index = 7;
+            float border = 0.3f;
+            if (x < -border) {
+                index = 3;
+                if (y < -border) index = 0;
+                else if (y > border) index = 5;
+            } else if (x > border) {
+                index = 4;
+                if (y < -border) index = 2;
+                else if (y > border) index = 7;
+            } else {
+                if (y < -border) index = 1;
+                else if (y > border) index = 6;
             }
             if (client.currentScreen instanceof RingScreen && index > -1) RingPage.selected = index;
             if (MidnightControlsCompat.isEmotecraftPresent() && EmotecraftCompat.isEmotecraftScreen(client.currentScreen)) EmotecraftCompat.handleEmoteSelector(index);
@@ -458,7 +469,6 @@ public class MidnightInput {
     private void handleAxe(@NotNull MinecraftClient client, int axis, float value, float absValue, int state) {
         int asButtonState = value > .5f ? 1 : (value < -.5f ? 2 : 0);
 
-
         if (axis == GLFW_GAMEPAD_AXIS_LEFT_TRIGGER || axis == GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER
                 || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER)
                 || axis == ButtonBinding.controller2Button(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER)) {
@@ -478,8 +488,12 @@ public class MidnightInput {
         }
 
         {
-            boolean currentPlusState = asButtonState == 1;
-            boolean currentMinusState = asButtonState == 2;
+            boolean currentPlusState = value > getDeadZoneValue(axis);
+            boolean currentMinusState = value < -getDeadZoneValue(axis);
+            if (!MidnightControlsConfig.analogMovement && (axis == GLFW_GAMEPAD_AXIS_LEFT_X || axis == GLFW_GAMEPAD_AXIS_LEFT_Y)) {
+                currentPlusState = asButtonState == 1;
+                currentMinusState = asButtonState == 2;
+            }
             var previousPlusState = InputManager.STATES.getOrDefault(ButtonBinding.axisAsButton(axis, true), ButtonState.NONE);
             var previousMinusState = InputManager.STATES.getOrDefault(ButtonBinding.axisAsButton(axis, false), ButtonState.NONE);
 
@@ -505,9 +519,13 @@ public class MidnightInput {
                 }
             }
 
-            double deadZone = this.getDeadZoneValue(axis);
-            float axisValue = absValue < deadZone ? 0.f : (float) (absValue - deadZone);
-            axisValue /= (1.0 - deadZone);
+            float axisValue = absValue;
+            if (!MidnightControlsConfig.analogMovement) {
+                double deadZone = this.getDeadZoneValue(axis);
+                axisValue = (float) (absValue - deadZone);
+                axisValue /= (1.0 - deadZone);
+                axisValue *= deadZone;
+            }
 
             axisValue = (float) Math.min(axisValue / MidnightControlsConfig.getAxisMaxValue(axis), 1);
             if (currentPlusState)
@@ -540,7 +558,7 @@ public class MidnightInput {
                 var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen;
                 // @TODO allow rebinding to left stick
                 if (accessor.midnightcontrols$hasScrollbar() && absValue >= deadZone) {
-                    creativeInventoryScreen.mouseScrolled(0.0, 0.0, -value);
+                    creativeInventoryScreen.mouseScrolled(0.0, 0.0, 0, -value);
                 }
                 return;
             }
@@ -548,7 +566,7 @@ public class MidnightInput {
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
                 // @TODO allow rebinding to left stick
                 if (absValue >= deadZone) {
-                    merchantScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                    merchantScreen.mouseScrolled(0.0, 0.0, 0, -(value * 1.5f));
                 }
                 return;
             }
@@ -556,7 +574,7 @@ public class MidnightInput {
             if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
                 // @TODO allow rebinding to left stick
                 if (absValue >= deadZone) {
-                    stonecutterScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                    stonecutterScreen.mouseScrolled(0.0, 0.0, 0, -(value * 1.5f));
                 }
                 return;
             }
@@ -575,7 +593,7 @@ public class MidnightInput {
                         .map(element -> (SpruceEntryListWidget<?>) element)
                         .filter(AbstractSpruceWidget::isFocusedOrHovered)
                         .noneMatch(element -> {
-                            element.mouseScrolled(0.0, 0.0, -finalValue);
+                            element.mouseScrolled(0.0, 0.0, 0, -finalValue);
                             return true;
                         })
                         &&
@@ -583,11 +601,11 @@ public class MidnightInput {
                         .map(element -> (EntryListWidget<?>) element)
                         .filter(element -> element.getType().isFocused())
                         .noneMatch(element -> {
-                            element.mouseScrolled(0.0, 0.0, -finalValue);
+                            element.mouseScrolled(0.0, 0.0, 0, -finalValue);
                             return true;
                         }))
                 {
-                    client.currentScreen.mouseScrolled(0.0, 0.0, -(value * 1.5f));
+                    client.currentScreen.mouseScrolled(0.0, 0.0, 0, -(value * 1.5f));
                 }
             else if (isScreenInteractive(client.currentScreen) && absValue >= deadZone) {
                 if (value > 0 && joystickCooldown == 0) {
@@ -607,8 +625,6 @@ public class MidnightInput {
             }
         }
 
-        absValue -= deadZone;
-        absValue /= (1.0 - deadZone);
         absValue = (float) MathHelper.clamp(absValue / MidnightControlsConfig.getAxisMaxValue(axis), 0.f, 1.f);
         if (client.currentScreen == null) {
             // Handles the look direction.
@@ -756,6 +772,10 @@ public class MidnightInput {
         }
         return true;
     }
+    private double prevX = 0;
+    private double prevY = 0;
+    private double xValue;
+    private int xState;
 
     /**
      * Handles the look direction input.
@@ -767,22 +787,38 @@ public class MidnightInput {
      */
     public void handleLook(@NotNull MinecraftClient client, int axis, float value, int state) {
         // Handles the look direction.
-        if (client.player != null) {
-            double powValue = Math.pow(value, 2.0);
-            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) {
-                if (state == 2) {
-                    this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D;
-                } else if (state == 1) {
-                    this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D;
-                }
+        if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
+            xValue = value;
+            xState = state;
+            return;
+        }
+        if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y && client.player != null) {
+            double yStep = (MidnightControlsConfig.yAxisRotationSpeed / 100) * 0.6000000238418579 + 0.20000000298023224;
+            double xStep = (MidnightControlsConfig.rotationSpeed / 100) * 0.6000000238418579 + 0.20000000298023224;
+
+            double cursorDeltaX = 2 * xValue - this.prevX;
+            double cursorDeltaY = 2 * value - this.prevY;
+            boolean slowdown = client.options.getPerspective().isFirstPerson() && client.player.isUsingSpyglass();
+            double x = cursorDeltaX * xStep * (slowdown ? xStep : 1);
+            double y = cursorDeltaY * yStep * (slowdown ? yStep : 1);
+
+            double powXValue = Math.pow(x, 2.0);
+            double powYValue = Math.pow(y, 2.0);
+
+            if (state == 2) {
+                this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powYValue) * 0.11D;
+            } else if (state == 1) {
+                this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powYValue) * 0.11D;
             }
-            if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) {
-                if (state == 2) {
-                    this.targetYaw = -MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D;
-                } else if (state == 1) {
-                    this.targetYaw = MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D;
-                }
+
+            if (xState == 2) {
+                this.targetYaw = -MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powXValue) * 0.11D;
+            } else if (xState == 1) {
+                this.targetYaw = MidnightControlsConfig.getRightXAxisSign() * (MidnightControlsConfig.rotationSpeed * powXValue) * 0.11D;
             }
+
+            this.prevY = value;
+            this.prevX = xValue;
         }
     }
 

src/main/java/eu/midnightdust/midnightcontrols/client/MidnightReacharound.java

@@ -73,7 +73,7 @@ public class MidnightReacharound {
         return MidnightControlsFeature.HORIZONTAL_REACHAROUND.isAvailable() || MidnightControlsFeature.VERTICAL_REACHAROUND.isAvailable();
     }
 
-    private float getPlayerRange(@NotNull MinecraftClient client) {
+    public static float getPlayerRange(@NotNull MinecraftClient client) {
         return client.interactionManager != null ? client.interactionManager.getReachDistance() : 0.f;
     }
 
@@ -101,7 +101,7 @@ public class MidnightReacharound {
             BlockPos blockPos = result.getBlockPos().down();
             BlockState state = client.world.getBlockState(blockPos);
 
-            if (client.player.getBlockPos().getY() - blockPos.getY() > 1 && (client.world.isAir(blockPos) || state.getMaterial().isReplaceable())) {
+            if (client.player.getBlockPos().getY() - blockPos.getY() > 1 && (client.world.isAir(blockPos) || state.isReplaceable())) {
                 return new BlockHitResult(result.getPos(), Direction.DOWN, blockPos, false);
             }
         }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/EmotecraftCompat.java

@@ -1,16 +1,21 @@
 package eu.midnightdust.midnightcontrols.client.compat;
 
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import io.github.kosmx.emotes.arch.gui.EmoteMenuImpl;
 import io.github.kosmx.emotes.arch.gui.screen.ingame.FastChosseScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 
 public class EmotecraftCompat {
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    public static void openEmotecraftScreen(Screen parent) {
+        client.setScreen(new EmoteMenuImpl(parent));
+    }
     public static boolean isEmotecraftScreen(Screen screen) {
         return screen instanceof FastChosseScreen;
     }
     public static void handleEmoteSelector(int index) {
-        MinecraftClient client = MinecraftClient.getInstance();
+
         if (client.currentScreen instanceof FastChosseScreen) {
             int x = client.getWindow().getWidth() / 2;
             int y = client.getWindow().getHeight() / 2;

src/main/java/eu/midnightdust/midnightcontrols/client/compat/SodiumCompat.java

@@ -1,35 +1,12 @@
 package eu.midnightdust.midnightcontrols.client.compat;
 
 import eu.midnightdust.midnightcontrols.MidnightControls;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.compat.mixin.SodiumOptionsGUIAccessor;
-import eu.midnightdust.midnightcontrols.client.controller.InputManager;
 import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
-import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 
 public class SodiumCompat {
-    private static final MinecraftClient client = MinecraftClient.getInstance();
-    public static void handleInput(Screen screen, boolean direction) {
-        if (screen instanceof SodiumOptionsGUI optionsGUI) {
-            SodiumOptionsGUIAccessor accessor = (SodiumOptionsGUIAccessor) optionsGUI;
-            final int max = accessor.getControls().size()-1;
-
-            var option = accessor.getControls().stream().filter(ControlElement::isHovered).findFirst().orElse(accessor.getControls().get(0));
-            int i = accessor.getControls().indexOf(option);
-            i = (direction ? ((max > i) ? ++i : 0) : (i > 0 ? --i : max));
-
-            var dimensions = accessor.getControls().get(i).getDimensions();
-            int x = (int) (client.getWindow().getScaleFactor() * dimensions.getCenterX());
-            int y = (int) (client.getWindow().getScaleFactor() * dimensions.getCenterY());
-            InputManager.queueMousePosition(x,y);
-            InputManager.INPUT_MANAGER.updateMousePosition(client);
-            MidnightControlsClient.get().input.actionGuiCooldown = 5;
-            if (MidnightControlsConfig.debug) MidnightControls.get().log(i+" "+accessor.getControls().size()+" | " + dimensions.getCenterX() + " " + dimensions.getCenterY());
-        }
-    }
     public static void handleTabs(Screen screen, boolean direction) {
         if (screen instanceof SodiumOptionsGUI optionsGUI) {
             SodiumOptionsGUIAccessor accessor = (SodiumOptionsGUIAccessor) optionsGUI;

src/main/java/eu/midnightdust/midnightcontrols/client/compat/VoxelMapCompat.java

@@ -1,95 +0,0 @@
-/*
- * Copyright © 2022 Motschen <motschen@midnightdust.eu>
- *
- * This file is part of MidnightControls.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat;
-
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
-import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import eu.midnightdust.midnightcontrols.client.mixin.KeyBindingIDAccessor;
-import net.minecraft.client.option.KeyBinding;
-import org.aperlambda.lambdacommon.Identifier;
-import org.jetbrains.annotations.NotNull;
-import org.lwjgl.glfw.GLFW;
-
-/**
- * Represents a compatibility handler for VoxelMap.
- *
- * @author Motschen
- * @version 1.8.0
- * @since 1.8.0
- */
-public class VoxelMapCompat implements CompatHandler {
-
-    private final KeyBinding voxelMapZoomKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.zoom", null);
-    private final KeyBinding voxelmapFullscreenKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.togglefullscreen", null);
-    private final KeyBinding voxelmapMenuKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.voxelmapmenu", null);;
-    private final KeyBinding voxelmapWaypointMenuKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.waypointmenu", null);;
-    private final KeyBinding voxelmapWaypointKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.waypointhotkey", null);
-    private final KeyBinding voxelmapMobToggleKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.togglemobs", null);
-    private final KeyBinding voxelmapWaypointToggleKey = KeyBindingIDAccessor.getKEYS_BY_ID().getOrDefault("key.minimap.toggleingamewaypoints", null);
-    private static final ButtonCategory VOXELMAP_CATEGORY = InputManager.registerCategory(new Identifier("minecraft","controls.minimap.title"));
-
-
-    @Override
-    public void handle(@NotNull MidnightControlsClient mod) {
-        if (MidnightControlsConfig.debug && KeyBindingIDAccessor.getKEYS_BY_ID() != null) KeyBindingIDAccessor.getKEYS_BY_ID().forEach((a, b) -> System.out.println(a + " - " + b));
-        new ButtonBinding.Builder("key.minimap.zoom")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_X)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelMapZoomKey)
-                .register();
-        new ButtonBinding.Builder("key.minimap.togglefullscreen")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_Y)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelmapFullscreenKey)
-                .register();
-        new ButtonBinding.Builder("key.minimap.voxelmapmenu")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_START)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelmapMenuKey)
-                .register();
-        new ButtonBinding.Builder("key.minimap.waypointmenu")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_GUIDE)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelmapWaypointMenuKey)
-                .register();
-        new ButtonBinding.Builder("key.minimap.waypointhotkey")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_BACK)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelmapWaypointKey)
-                .register();
-        new ButtonBinding.Builder("key.minimap.togglemobs")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_A)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelmapMobToggleKey)
-                .register();
-        new ButtonBinding.Builder("key.minimap.toggleingamewaypoints")
-                .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_DOWN, GLFW.GLFW_GAMEPAD_BUTTON_B)
-                .onlyInGame()
-                .cooldown(true)
-                .category(VOXELMAP_CATEGORY)
-                .linkKeybind(voxelmapWaypointToggleKey)
-                .register();
-    }
-}

src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java

@@ -13,6 +13,8 @@ import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.DebugHud;
+import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.resource.language.I18n;
@@ -75,9 +77,8 @@ public class ButtonBinding {
             .action(MovementHandler.HANDLER).onlyInGame().register();
     public static final ButtonBinding SCREENSHOT = new Builder("screenshot").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_A)
             .action(InputHandlers::handleScreenshot).cooldown().register();
-
     public static final ButtonBinding DEBUG_SCREEN = new Builder("debug_screen").buttons(GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW_GAMEPAD_BUTTON_B)
-            .action((client,binding,value,action) -> {if (action == ButtonState.PRESS) client.options.debugEnabled = !client.options.debugEnabled; return true;}).cooldown().register();
+            .action((client,binding,value,action) -> {if (action == ButtonState.PRESS) client.inGameHud.getDebugHud().toggleDebugHud(); return true;}).cooldown().register();
     public static final ButtonBinding SLOT_DOWN = new Builder("slot_down").buttons(GLFW_GAMEPAD_BUTTON_DPAD_DOWN)
             .action(InputHandlers.handleInventorySlotPad(1)).onlyInInventory().cooldown().register();
     public static final ButtonBinding SLOT_LEFT = new Builder("slot_left").buttons(GLFW_GAMEPAD_BUTTON_DPAD_LEFT)

src/main/java/eu/midnightdust/midnightcontrols/client/controller/Controller.java

@@ -32,6 +32,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 
 import static org.lwjgl.BufferUtils.createByteBuffer;
 
@@ -79,7 +80,7 @@ public record Controller(int id) implements Nameable {
      * @return the controller's name
      */
     @Override
-    public String getName() {
+    public @NotNull String getName() {
         var name = this.isGamepad() ? GLFW.glfwGetGamepadName(this.id) : GLFW.glfwGetJoystickName(this.id);
         return name == null ? String.valueOf(this.id()) : name;
     }
@@ -145,6 +146,9 @@ public record Controller(int id) implements Nameable {
      * Updates the controller mappings.
      */
     public static void updateMappings() {
+        CompletableFuture.supplyAsync(Controller::updateMappingsSync);
+    }
+    private static boolean updateMappingsSync() {
         try {
             MidnightControlsClient.get().log("Updating controller mappings...");
             File databaseFile = new File("config/gamecontrollerdatabase.txt");
@@ -161,7 +165,7 @@ public record Controller(int id) implements Nameable {
             var database = ioResourceToBuffer(databaseFile.getPath(), 1024);
             if (database != null) GLFW.glfwUpdateGamepadMappings(database);
             if (!MidnightControlsClient.MAPPINGS_FILE.exists())
-                return;
+                return false;
             var buffer = ioResourceToBuffer(MidnightControlsClient.MAPPINGS_FILE.getPath(), 1024);
             if (buffer != null) GLFW.glfwUpdateGamepadMappings(buffer);
         } catch (IOException e) {
@@ -199,5 +203,6 @@ public record Controller(int id) implements Nameable {
                         controller.isGamepad()));
             }
         }
+        return true;
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java

@@ -10,6 +10,7 @@
 package eu.midnightdust.midnightcontrols.client.controller;
 
 import com.google.common.collect.Lists;
+import eu.midnightdust.lib.util.PlatformFunctions;
 import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
@@ -19,6 +20,7 @@ import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat;
 import eu.midnightdust.midnightcontrols.client.compat.YACLCompat;
 import eu.midnightdust.midnightcontrols.client.gui.RingScreen;
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
 import eu.midnightdust.midnightcontrols.client.mixin.AdvancementsScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
 import eu.midnightdust.midnightcontrols.client.mixin.RecipeBookWidgetAccessor;
@@ -28,14 +30,12 @@ import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
 import net.fabricmc.fabric.impl.client.itemgroup.CreativeGuiExtensions;
 import net.fabricmc.fabric.impl.client.itemgroup.FabricCreativeGuiComponents;
 import net.fabricmc.fabric.impl.itemgroup.FabricItemGroup;
-import net.fabricmc.fabric.impl.itemgroup.ItemGroupHelper;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.ingame.*;
 import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
-import net.minecraft.client.gui.tab.TabManager;
 import net.minecraft.client.gui.widget.PressableWidget;
 import net.minecraft.client.gui.widget.TabNavigationWidget;
 import net.minecraft.client.util.ScreenshotRecorder;
@@ -68,7 +68,7 @@ public class InputHandlers {
     private InputHandlers() {
     }
     private static List<ItemGroup> getVisibleGroups(CreativeInventoryScreen screen) {
-        return ItemGroupHelper.sortedGroups.stream()
+        return ItemGroups.getGroups().stream()
             .filter(itemGroup -> {
                 if (FabricCreativeGuiComponents.COMMON_GROUPS.contains(itemGroup)) return true;
                 return ((CreativeGuiExtensions)screen).fabric_currentPage() == ((FabricItemGroup)itemGroup).getPage() && itemGroup.shouldDisplay();
@@ -100,6 +100,7 @@ public class InputHandlers {
             } else if (client.currentScreen instanceof RingScreen) {
                 MidnightControlsClient.get().ring.cyclePage(next);
             } else if (client.currentScreen instanceof CreativeInventoryScreenAccessor inventory) {
+                if (PlatformFunctions.isModLoaded("connectormod")) return true;
                 ItemGroup currentTab = CreativeInventoryScreenAccessor.getSelectedTab();
                 int currentColumn = currentTab.getColumn();
                 ItemGroup.Row currentRow = currentTab.getRow();
@@ -160,7 +161,7 @@ public class InputHandlers {
                             nextTab = tabs.size() - 1;
                         else if (nextTab >= tabs.size())
                             nextTab = 0;
-                        screen.getAdvancementManager().selectTab(tabs.get(nextTab).getRoot(), true);
+                        screen.getAdvancementManager().selectTab(tabs.get(nextTab).getRoot().getAdvancementEntry(), true);
                         break;
                     }
                 }
@@ -190,6 +191,8 @@ public class InputHandlers {
     }
     public static PressAction handlePage(boolean next) {
         return (client, button, value, action) -> {
+            if (action == ButtonState.RELEASE)
+                return false;
             if (client.currentScreen instanceof CreativeInventoryScreen) {
                 try {
                     return client.currentScreen.children().stream().filter(element -> element instanceof PressableWidget)
@@ -277,7 +280,7 @@ public class InputHandlers {
         if (action == ButtonState.PRESS) {
             // If in game, then pause the game.
             if (client.currentScreen == null || client.currentScreen instanceof RingScreen)
-                client.openPauseMenu(false);
+                client.openGameMenu(false);
             else if (client.currentScreen instanceof HandledScreen && client.player != null) // If the current screen is a container then close it.
                 client.player.closeHandledScreen();
             else // Else just close the current screen.
@@ -418,7 +421,7 @@ public class InputHandlers {
      * @return true if the client is in game, else false
      */
     public static boolean inGame(@NotNull MinecraftClient client, @NotNull ButtonBinding binding) {
-        return (client.currentScreen == null && MidnightControlsClient.get().input.screenCloseCooldown <= 0) || client.currentScreen instanceof RingScreen;
+        return (client.currentScreen == null && MidnightControlsClient.get().input.screenCloseCooldown <= 0) || client.currentScreen instanceof TouchscreenOverlay || client.currentScreen instanceof RingScreen;
     }
 
     /**

src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java

@@ -12,6 +12,7 @@ package eu.midnightdust.midnightcontrols.client.controller;
 import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.util.MathUtil;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
@@ -43,6 +44,7 @@ public final class MovementHandler implements PressAction {
     private float slowdownFactor = 1.f;
     private float movementForward = 0.f;
     private float movementSideways = 0.f;
+    private MathUtil.PolarUtil polarUtil = new MathUtil.PolarUtil();
 
     private MovementHandler() {
     }
@@ -53,8 +55,6 @@ public final class MovementHandler implements PressAction {
      * @param player The client player.
      */
     public void applyMovement(@NotNull ClientPlayerEntity player) {
-        double movementR, movementTheta;
-
         if (!this.shouldOverrideMovement)
             return;
         player.input.pressingForward = this.pressingForward;
@@ -62,12 +62,9 @@ public final class MovementHandler implements PressAction {
         player.input.pressingLeft = this.pressingLeft;
         player.input.pressingRight = this.pressingRight;
 
-        // Do an implicit square here
-        movementR = this.slowdownFactor * (Math.pow(this.movementSideways, 2) + Math.pow(this.movementForward, 2));
-        movementR = MathHelper.clamp(movementR, 0.f, 1.f);
-        movementTheta = Math.atan2(this.movementForward, this.movementSideways);
-        player.input.movementForward = (float) (movementR * Math.sin(movementTheta));
-        player.input.movementSideways = (float) (movementR * Math.cos(movementTheta));
+        polarUtil.calculate(this.movementSideways, this.movementForward, this.slowdownFactor);
+        player.input.movementForward = polarUtil.polarY;
+        player.input.movementSideways = polarUtil.polarX;
 
         this.shouldOverrideMovement = false;
     }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsHud.java

@@ -18,6 +18,7 @@ import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import dev.lambdaurora.spruceui.hud.Hud;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.BlockItem;
@@ -37,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class MidnightControlsHud extends Hud {
     private final MidnightControlsClient mod;
-    private MinecraftClient client;
+    private final MinecraftClient client = MinecraftClient.getInstance();
     private int attackWidth = 0;
     private int attackButtonWidth = 0;
     private int dropItemWidth = 0;
@@ -63,7 +64,6 @@ public class MidnightControlsHud extends Hud {
     @Override
     public void init(@NotNull MinecraftClient client, int screenWidth, int screenHeight) {
         super.init(client, screenWidth, screenHeight);
-        this.client = client;
         this.inventoryWidth = this.width(ButtonBinding.INVENTORY);
         this.inventoryButtonWidth = MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.INVENTORY);
         this.swapHandsWidth = this.width(ButtonBinding.SWAP_HANDS);
@@ -79,16 +79,17 @@ public class MidnightControlsHud extends Hud {
      * Renders the MidnightControls HUD.
      */
     @Override
-    public void render(MatrixStack matrices, float tickDelta) {
+    public void render(DrawContext context, float tickDelta) {
         if (this.client == null) return;
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && this.client.currentScreen == null) {
             isCrammed = client.getWindow().getScaledWidth() < 520;
             int y = bottom(2);
+            MatrixStack matrices = context.getMatrices();
             matrices.push();
-            this.renderFirstIcons(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
-            this.renderSecondIcons(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
-            this.renderFirstSection(matrices, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
-            this.renderSecondSection(matrices, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderFirstIcons(context, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderSecondIcons(context, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderFirstSection(context, MidnightControlsConfig.hudSide == HudSide.LEFT ? 2 : client.getWindow().getScaledWidth() - 2, y);
+            this.renderSecondSection(context, MidnightControlsConfig.hudSide == HudSide.RIGHT ? 2 : client.getWindow().getScaledWidth() - 2, y);
             matrices.pop();
         }
 
@@ -101,16 +102,16 @@ public class MidnightControlsHud extends Hud {
             scale *= scale;
             int opacity = ((int) (255 * scale)) << 24;
 
-            this.client.textRenderer.draw(matrices, text, window.getScaledWidth() / 2.f - this.client.textRenderer.getWidth(text) / 2.f,
-                    window.getScaledHeight() / 2.f - 4, 0xCCCCCC | opacity);
+            context.drawText(client.textRenderer, text, (int) (window.getScaledWidth() / 2.f - this.client.textRenderer.getWidth(text) / 2.f),
+                    (int) (window.getScaledHeight() / 2.f - 4), 0xCCCCCC | opacity, false);
         }
     }
 
-    public void renderFirstIcons(MatrixStack matrices, int x, int y) {
+    public void renderFirstIcons(DrawContext context, int x, int y) {
         int offset = 2 + this.inventoryWidth + this.inventoryButtonWidth + 4;
         int currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x : x - this.inventoryButtonWidth;
-        if (!ButtonBinding.INVENTORY.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.INVENTORY, true);
-        if (!ButtonBinding.SWAP_HANDS.isNotBound() && !isCrammed && showSwapHandsAction) this.drawButton(matrices, currentX += (MidnightControlsConfig.hudSide == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true);
+        if (!ButtonBinding.INVENTORY.isNotBound()) this.drawButton(context, currentX, y, ButtonBinding.INVENTORY, true);
+        if (!ButtonBinding.SWAP_HANDS.isNotBound() && !isCrammed && showSwapHandsAction) this.drawButton(context, currentX += (MidnightControlsConfig.hudSide == HudSide.LEFT ? offset : -offset), y, ButtonBinding.SWAP_HANDS, true);
         offset = 2 + this.swapHandsWidth + this.dropItemButtonWidth + 4;
         if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.RIGHT) {
             currentX += -offset;
@@ -118,23 +119,23 @@ public class MidnightControlsHud extends Hud {
             currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x : x - this.dropItemButtonWidth;
             y -= 20;
         }
-        if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
+        if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawButton(context, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
     }
 
-    public void renderSecondIcons(MatrixStack matrices, int x, int y) {
+    public void renderSecondIcons(DrawContext context, int x, int y) {
         int offset;
         int currentX = x;
         if (isCrammed && showSwapHandsAction && !this.client.options.getShowSubtitles().getValue() && !ButtonBinding.SWAP_HANDS.isNotBound()) {
             if (MidnightControlsConfig.hudSide == HudSide.LEFT)
                 currentX -= this.useButtonWidth;
-            this.drawButton(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+            this.drawButton(context, currentX, y, ButtonBinding.SWAP_HANDS, true);
             currentX = x;
             y -= 20;
         }
         if (!this.placeAction.isEmpty() && (!ButtonBinding.USE.isNotBound()) ) {
             if (MidnightControlsConfig.hudSide == HudSide.LEFT)
                 currentX -= this.useButtonWidth;
-            this.drawButton(matrices, currentX, y, ButtonBinding.USE, true);
+            this.drawButton(context, currentX, y, ButtonBinding.USE, true);
             offset = 2 + this.useWidth + 4;
             if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.LEFT) {
                 currentX -= offset;
@@ -147,31 +148,31 @@ public class MidnightControlsHud extends Hud {
         if (MidnightControlsConfig.hudSide == HudSide.LEFT)
             currentX -= this.attackButtonWidth;
 
-        if (!ButtonBinding.ATTACK.isNotBound()) this.drawButton(matrices, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0);
+        if (!ButtonBinding.ATTACK.isNotBound()) this.drawButton(context, currentX, y, ButtonBinding.ATTACK, this.attackWidth != 0);
     }
 
-    public void renderFirstSection(MatrixStack matrices, int x, int y) {
+    public void renderFirstSection(DrawContext context, int x, int y) {
         int currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.inventoryButtonWidth + 2 : x - this.inventoryButtonWidth - 2 - this.inventoryWidth;
-        if (!ButtonBinding.INVENTORY.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.INVENTORY, true);
+        if (!ButtonBinding.INVENTORY.isNotBound()) this.drawTip(context, currentX, y, ButtonBinding.INVENTORY, true);
         currentX += MidnightControlsConfig.hudSide == HudSide.LEFT ? this.inventoryWidth + 4 + this.swapHandsButtonWidth + 2
                 : -this.swapHandsWidth - 2 - this.swapHandsButtonWidth - 4;
-        if (!ButtonBinding.SWAP_HANDS.isNotBound() && !isCrammed && showSwapHandsAction) this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+        if (!ButtonBinding.SWAP_HANDS.isNotBound() && !isCrammed && showSwapHandsAction) this.drawTip(context, currentX, y, ButtonBinding.SWAP_HANDS, true);
         if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.RIGHT) {
             currentX += -this.dropItemWidth - 2 - this.dropItemButtonWidth - 4;
         } else {
             y -= 20;
             currentX = MidnightControlsConfig.hudSide == HudSide.LEFT ? x + this.dropItemButtonWidth + 2 : x - this.dropItemButtonWidth - 2 - this.dropItemWidth;
         }
-        if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawTip(matrices, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
+        if (!ButtonBinding.DROP_ITEM.isNotBound()) this.drawTip(context, currentX, y, ButtonBinding.DROP_ITEM, !this.client.player.getMainHandStack().isEmpty());
     }
 
-    public void renderSecondSection(MatrixStack matrices, int x, int y) {
+    public void renderSecondSection(DrawContext context, int x, int y) {
         int currentX = x;
 
         if (isCrammed && showSwapHandsAction && !this.client.options.getShowSubtitles().getValue() && !ButtonBinding.SWAP_HANDS.isNotBound()) {
             currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.swapHandsButtonWidth + 2 : -this.swapHandsButtonWidth - 2 - this.swapHandsWidth;
 
-            this.drawTip(matrices, currentX, y, ButtonBinding.SWAP_HANDS, true);
+            this.drawTip(context, currentX, y, ButtonBinding.SWAP_HANDS, true);
 
             currentX = x;
             y -= 20;
@@ -179,7 +180,7 @@ public class MidnightControlsHud extends Hud {
         if (!this.placeAction.isEmpty()) {
             currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.useButtonWidth + 2 : -this.useButtonWidth - 2 - this.useWidth;
 
-            this.drawTip(matrices, currentX, y, this.placeAction, true);
+            this.drawTip(context, currentX, y, this.placeAction, true);
 
             if (this.client.options.getShowSubtitles().getValue() && MidnightControlsConfig.hudSide == HudSide.LEFT) {
                 currentX -= 4;
@@ -191,11 +192,12 @@ public class MidnightControlsHud extends Hud {
 
         currentX += MidnightControlsConfig.hudSide == HudSide.RIGHT ? this.attackButtonWidth + 2 : -this.attackButtonWidth - 2 - this.attackWidth;
 
-        if (!ButtonBinding.ATTACK.isNotBound()) this.drawTip(matrices, currentX, y, this.attackAction, this.attackWidth != 0);
+        if (!ButtonBinding.ATTACK.isNotBound()) this.drawTip(context, currentX, y, this.attackAction, this.attackWidth != 0);
     }
 
     @Override
     public void tick() {
+        if (this.client == null) return;
         super.tick();
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER) {
             if (this.client.crosshairTarget == null)
@@ -281,20 +283,20 @@ public class MidnightControlsHud extends Hud {
         return this.client.textRenderer.getWidth(I18n.translate(text));
     }
 
-    private void drawButton(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, boolean display) {
+    private void drawButton(DrawContext context, int x, int y, @NotNull ButtonBinding button, boolean display) {
         if (display)
-            MidnightControlsRenderer.drawButton(matrices, x, y, button, this.client);
+            MidnightControlsRenderer.drawButton(context, x, y, button, this.client);
     }
 
-    private void drawTip(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, boolean display) {
-        this.drawTip(matrices, x, y, button.getTranslationKey(), display);
+    private void drawTip(DrawContext context, int x, int y, @NotNull ButtonBinding button, boolean display) {
+        this.drawTip(context, x, y, button.getTranslationKey(), display);
     }
 
-    private void drawTip(MatrixStack matrices, int x, int y, @NotNull String action, boolean display) {
+    private void drawTip(DrawContext context, int x, int y, @NotNull String action, boolean display) {
         if (!display)
             return;
         var translatedAction = I18n.translate(action);
         int textY = (MidnightControlsRenderer.ICON_SIZE / 2 - this.client.textRenderer.fontHeight / 2) + 1;
-        this.client.textRenderer.draw(matrices, translatedAction, (float) x, (float) (y + textY), 14737632);
+        context.drawText(this.client.textRenderer, translatedAction, x, (y + textY), 14737632, false);
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java

@@ -10,7 +10,6 @@
 package eu.midnightdust.midnightcontrols.client.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.ControllerType;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
@@ -20,9 +19,8 @@ import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.slot.Slot;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
@@ -77,17 +75,17 @@ public class MidnightControlsRenderer {
         return width;
     }
 
-    public static ButtonSize drawButton(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, @NotNull MinecraftClient client) {
-        return drawButton(matrices, x, y, button.getButton(), client);
+    public static ButtonSize drawButton(DrawContext context, int x, int y, @NotNull ButtonBinding button, @NotNull MinecraftClient client) {
+        return drawButton(context, x, y, button.getButton(), client);
     }
 
-    public static ButtonSize drawButton(MatrixStack matrices, int x, int y, int[] buttons, @NotNull MinecraftClient client) {
+    public static ButtonSize drawButton(DrawContext context, int x, int y, int[] buttons, @NotNull MinecraftClient client) {
         int height = 0;
         int length = 0;
         int currentX = x;
         for (int i = 0; i < buttons.length; i++) {
             int btn = buttons[i];
-            int size = drawButton(matrices, currentX, y, btn, client);
+            int size = drawButton(context, currentX, y, btn, client);
             if (size > height)
                 height = size;
             length += size;
@@ -99,7 +97,7 @@ public class MidnightControlsRenderer {
         return new ButtonSize(length, height);
     }
 
-    public static int drawButton(MatrixStack matrices, int x, int y, int button, @NotNull MinecraftClient client) {
+    public static int drawButton(DrawContext context, int x, int y, int button, @NotNull MinecraftClient client) {
         boolean second = false;
         if (button == -1)
             return 0;
@@ -159,13 +157,13 @@ public class MidnightControlsRenderer {
             case GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 100, GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER + 200 -> buttonOffset = 10 * 15;
         }
 
-        RenderSystem.setShaderTexture(0, axis ? MidnightControlsClient.CONTROLLER_AXIS : button >= 15 && button <= 19 ? MidnightControlsClient.CONTROLLER_EXPANDED :MidnightControlsClient.CONTROLLER_BUTTONS);
         RenderSystem.disableDepthTest();
 
         int assetSize = axis || (button >= 15 && button <= 18) ? AXIS_SIZE : BUTTON_SIZE;
 
         RenderSystem.setShaderColor(1.f, second ? 0.f : 1.f, 1.f, 1.f);
-        DrawableHelper.drawTexture(matrices, x + (ICON_SIZE / 2 - assetSize / 2), y + (ICON_SIZE / 2 - assetSize / 2),
+        context.drawTexture(axis ? MidnightControlsClient.CONTROLLER_AXIS : button >= 15 && button <= 19 ? MidnightControlsClient.CONTROLLER_EXPANDED :MidnightControlsClient.CONTROLLER_BUTTONS
+                , x + (ICON_SIZE / 2 - assetSize / 2), y + (ICON_SIZE / 2 - assetSize / 2),
                 (float) buttonOffset, (float) (controllerType * assetSize),
                 assetSize, assetSize,
                 256, 256);
@@ -174,18 +172,18 @@ public class MidnightControlsRenderer {
         return ICON_SIZE;
     }
 
-    public static int drawButtonTip(MatrixStack matrices, int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull MinecraftClient client) {
-        return drawButtonTip(matrices, x, y, button.getButton(), button.getTranslationKey(), display, client);
+    public static int drawButtonTip(DrawContext context, int x, int y, @NotNull ButtonBinding button, boolean display, @NotNull MinecraftClient client) {
+        return drawButtonTip(context, x, y, button.getButton(), button.getTranslationKey(), display, client);
     }
 
-    public static int drawButtonTip(MatrixStack matrices, int x, int y, int[] button, @NotNull String action, boolean display, @NotNull MinecraftClient client) {
+    public static int drawButtonTip(DrawContext context, int x, int y, int[] button, @NotNull String action, boolean display, @NotNull MinecraftClient client) {
         if (display) {
-            int buttonWidth = drawButton(matrices, x, y, button, client).length();
+            int buttonWidth = drawButton(context, x, y, button, client).length();
 
             var translatedAction = I18n.translate(action);
             int textY = (MidnightControlsRenderer.ICON_SIZE / 2 - client.textRenderer.fontHeight / 2) + 1;
 
-            return client.textRenderer.drawWithShadow(matrices, translatedAction, (float) (x + buttonWidth + 2), (float) (y + textY), 14737632);
+            return context.drawTextWithShadow(client.textRenderer, translatedAction, (x + buttonWidth + 2), (y + textY), 14737632);
         }
 
         return -10;
@@ -195,7 +193,7 @@ public class MidnightControlsRenderer {
         return 15 + 5 + textRenderer.getWidth(action);
     }
 
-    public static void renderVirtualCursor(@NotNull MatrixStack matrices, @NotNull MinecraftClient client) {
+    public static void renderVirtualCursor(@NotNull DrawContext context, @NotNull MinecraftClient client) {
         if (!MidnightControlsConfig.virtualMouse || (client.currentScreen == null
                 || MidnightInput.isScreenInteractive(client.currentScreen)))
             return;
@@ -233,27 +231,32 @@ public class MidnightControlsRenderer {
             mouseY -= 8;
         }
 
-        drawCursor(matrices, mouseX, mouseY, hoverSlot, client);
+        //context.getMatrices().push();
+        context.getMatrices().translate(0f, 0f, 999f);
+        drawCursor(context, mouseX, mouseY, hoverSlot, client);
+        //context.getMatrices().pop();
     }
 
     /**
      * Draws the virtual cursor.
      *
-     * @param matrices the matrix stack
+     * @param context the context
      * @param x x coordinate
      * @param y y coordinate
      * @param hoverSlot true if hovering a slot, else false
      * @param client the client instance
      */
-    public static void drawCursor(@NotNull MatrixStack matrices, int x, int y, boolean hoverSlot, @NotNull MinecraftClient client) {
-        RenderSystem.disableDepthTest();
-
-        RenderSystem.setShaderColor(1.f, 1.f, 1.f, 1.f);
-        RenderSystem.setShaderTexture(0, MidnightControlsClient.CURSOR_TEXTURE);
-        DrawableHelper.drawTexture(matrices, x, y,
+    public static void drawCursor(@NotNull DrawContext context, int x, int y, boolean hoverSlot, @NotNull MinecraftClient client) {
+        //RenderSystem.disableDepthTest();
+        //RenderSystem.setShaderColor(1.f, 1.f, 1.f, 1.f);
+        //RenderSystem.disableBlend();
+        //RenderSystem.setShaderTexture(0, MidnightControlsClient.CURSOR_TEXTURE);
+        context.drawTexture(MidnightControlsClient.CURSOR_TEXTURE, x, y,
                 hoverSlot ? 16.f : 0.f, MidnightControlsConfig.virtualMouseSkin.ordinal() * 16.f,
                 16, 16, 32, 64);
-        RenderSystem.enableDepthTest();
+        context.fill(1, 1, x, y, 0xFFFFFF);
+        context.draw();
+        //RenderSystem.enableDepthTest();
     }
 
     public record ButtonSize(int length, int height) {

src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java

@@ -29,6 +29,7 @@ import dev.lambdaurora.spruceui.widget.container.SpruceOptionListWidget;
 import dev.lambdaurora.spruceui.widget.container.tabbed.SpruceTabbedWidget;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.render.*;
@@ -58,7 +59,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
     private final SpruceOption yAxisRotationSpeedOption;
     private final SpruceOption mouseSpeedOption;
     private final SpruceOption joystickAsMouseOption;
+    private final SpruceOption eyeTrackingAsMouseOption;
+    private final SpruceOption eyeTrackingDeadzone;
     private final SpruceOption virtualMouseOption;
+    private final SpruceOption hideCursorOption;
     private final SpruceOption resetOption;
     private final SpruceOption advancedConfigOption;
     // Gameplay options
@@ -117,7 +121,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 else
                     return option.getDisplayText(Text.literal(controllerName));
             }).orElse(option.getDisplayText(SpruceTexts.OPTIONS_OFF.copyContentOnly().formatted(Formatting.RED))),
-            Text.translatable("midnightcontrols.tooltip.controller2"));
+            Text.translatable("midnightcontrols.menu.controller2.tooltip"));
     private final SpruceOption unfocusedInputOption;
     private final SpruceOption invertsRightXAxis;
     private final SpruceOption invertsRightYAxis;
@@ -136,9 +140,15 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 () -> MidnightControlsConfig.getAxisMaxValue(axis),
                 newValue -> MidnightControlsConfig.setAxisMaxValue(axis, newValue),
                 option -> option.getDisplayText(Text.literal(String.format("%.2f", option.get()))),
-                Text.translatable(key.replace("menu", "tooltip"))
+                Text.translatable(key.concat(".tooltip"))
         );
     }
+    // Touch options
+    private final SpruceOption touchSpeedOption;
+    private final SpruceOption touchBreakDelayOption;
+    private final SpruceOption invertTouchOption;
+    private final SpruceOption touchTransparencyOption;
+    private final SpruceOption touchModeOption;
 
     private final MutableText controllerMappingsUrlText = Text.literal("(")
             .append(Text.literal(GAMEPAD_TOOL_URL).formatted(Formatting.GOLD))
@@ -173,24 +183,30 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                         ClientPlayNetworking.getSender().sendPacket(MidnightControls.CONTROLS_MODE_CHANNEL, this.mod.makeControlsModeBuffer(next));
                     }
                 }, option -> option.getDisplayText(Text.translatable(MidnightControlsConfig.controlsMode.getTranslationKey())),
-                Text.translatable("midnightcontrols.tooltip.controls_mode"));
+                Text.translatable("midnightcontrols.menu.controls_mode.tooltip"));
         this.autoSwitchModeOption = new SpruceToggleBooleanOption("midnightcontrols.menu.auto_switch_mode", () -> MidnightControlsConfig.autoSwitchMode,
-                value -> MidnightControlsConfig.autoSwitchMode = value, Text.translatable("midnightcontrols.tooltip.auto_switch_mode"));
+                value -> MidnightControlsConfig.autoSwitchMode = value, Text.translatable("midnightcontrols.menu.auto_switch_mode.tooltip"));
         this.rotationSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.rotation_speed", 0.0, 100.0, .5f,
                 () -> MidnightControlsConfig.rotationSpeed,
                 value -> MidnightControlsConfig.rotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.tooltip.rotation_speed"));
+                Text.translatable("midnightcontrols.menu.rotation_speed.tooltip"));
         this.yAxisRotationSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.y_axis_rotation_speed", 0.0, 100.0, .5f,
                 () -> MidnightControlsConfig.yAxisRotationSpeed,
                 value -> MidnightControlsConfig.yAxisRotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.tooltip.y_axis_rotation_speed"));
+                Text.translatable("midnightcontrols.menu.y_axis_rotation_speed.tooltip"));
         this.mouseSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.mouse_speed", 0.0, 150.0, .5f,
                 () -> MidnightControlsConfig.mouseSpeed,
                 value -> MidnightControlsConfig.mouseSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
-                Text.translatable("midnightcontrols.tooltip.joystick_as_mouse"));
+                Text.translatable("midnightcontrols.menu.mouse_speed.tooltip"));
         this.joystickAsMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.joystick_as_mouse",
                 () -> MidnightControlsConfig.joystickAsMouse, value -> MidnightControlsConfig.joystickAsMouse = value,
-                Text.translatable("midnightcontrols.tooltip.joystick_as_mouse"));
+                Text.translatable("midnightcontrols.menu.joystick_as_mouse.tooltip"));
+        this.eyeTrackingAsMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.eye_tracker_as_mouse",
+                () -> MidnightControlsConfig.eyeTrackerAsMouse, value -> MidnightControlsConfig.eyeTrackerAsMouse = value,
+                Text.translatable("midnightcontrols.menu.eye_tracker_as_mouse.tooltip"));
+        this.eyeTrackingDeadzone = new SpruceDoubleInputOption("midnightcontrols.menu.eye_tracker_deadzone",
+                () -> MidnightControlsConfig.eyeTrackerDeadzone, value -> MidnightControlsConfig.eyeTrackerDeadzone = value,
+                Text.translatable("midnightcontrols.menu.eye_tracker_deadzone.tooltip"));
         this.resetOption = SpruceSimpleActionOption.reset(btn -> {
             MidnightControlsConfig.reset();
             var client = MinecraftClient.getInstance();
@@ -200,10 +216,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         // Gameplay options
         this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement",
                 () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value,
-                Text.translatable("midnightcontrols.tooltip.analog_movement"));
+                Text.translatable("midnightcontrols.menu.analog_movement.tooltip"));
         this.doubleTapToSprintOption = new SpruceToggleBooleanOption("midnightcontrols.menu.double_tap_to_sprint",
                 () -> MidnightControlsConfig.doubleTapToSprint, value -> MidnightControlsConfig.doubleTapToSprint = value,
-                Text.translatable("midnightcontrols.tooltip.double_tap_to_sprint"));
+                Text.translatable("midnightcontrols.menu.double_tap_to_sprint.tooltip"));
         this.autoJumpOption = new SpruceToggleBooleanOption("options.autoJump",
                 () -> this.client.options.getAutoJump().getValue(),
                 newValue -> this.client.options.getAutoJump().setValue(newValue),
@@ -215,32 +231,32 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 () -> MidnightControlsConfig.controllerToggleSprint, value -> MidnightControlsConfig.controllerToggleSprint = value,
                 null);
         this.fastBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fast_block_placing", () -> MidnightControlsConfig.fastBlockPlacing,
-                value -> MidnightControlsConfig.fastBlockPlacing = value, Text.translatable("midnightcontrols.tooltip.fast_block_placing"));
+                value -> MidnightControlsConfig.fastBlockPlacing = value, Text.translatable("midnightcontrols.menu.fast_block_placing.tooltip"));
         this.frontBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.reacharound.horizontal", () -> MidnightControlsConfig.horizontalReacharound,
-                value -> MidnightControlsConfig.horizontalReacharound = value, Text.translatable("midnightcontrols.tooltip.reacharound.horizontal"));
+                value -> MidnightControlsConfig.horizontalReacharound = value, Text.translatable("midnightcontrols.menu.reacharound.horizontal.tooltip"));
         this.verticalReacharoundOption = new SpruceToggleBooleanOption("midnightcontrols.menu.reacharound.vertical", () -> MidnightControlsConfig.verticalReacharound,
-                value -> MidnightControlsConfig.verticalReacharound = value, Text.translatable("midnightcontrols.tooltip.reacharound.vertical"));
+                value -> MidnightControlsConfig.verticalReacharound = value, Text.translatable("midnightcontrols.menu.reacharound.vertical.tooltip"));
         this.flyDriftingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fly_drifting", () -> MidnightControlsConfig.flyDrifting,
-                value -> MidnightControlsConfig.flyDrifting = value, Text.translatable("midnightcontrols.tooltip.fly_drifting"));
+                value -> MidnightControlsConfig.flyDrifting = value, Text.translatable("midnightcontrols.menu.fly_drifting.tooltip"));
         this.flyVerticalDriftingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fly_drifting_vertical", () -> MidnightControlsConfig.verticalFlyDrifting,
-                value -> MidnightControlsConfig.verticalFlyDrifting = value, Text.translatable("midnightcontrols.tooltip.fly_drifting_vertical"));
+                value -> MidnightControlsConfig.verticalFlyDrifting = value, Text.translatable("midnightcontrols.menu.fly_drifting_vertical.tooltip"));
         // Appearance options
         this.controllerTypeOption = new SpruceCyclingOption("midnightcontrols.menu.controller_type",
                 amount -> MidnightControlsConfig.controllerType = MidnightControlsConfig.controllerType.next(),
                 option -> option.getDisplayText(MidnightControlsConfig.controllerType.getTranslatedText()),
-                Text.translatable("midnightcontrols.tooltip.controller_type"));
+                Text.translatable("midnightcontrols.menu.controller_type.tooltip"));
         this.virtualMouseSkinOption = new SpruceCyclingOption("midnightcontrols.menu.virtual_mouse.skin",
                 amount -> MidnightControlsConfig.virtualMouseSkin = MidnightControlsConfig.virtualMouseSkin.next(),
                 option -> option.getDisplayText(MidnightControlsConfig.virtualMouseSkin.getTranslatedText()),
                 null);
         this.hudEnableOption = new SpruceToggleBooleanOption("midnightcontrols.menu.hud_enable", () -> MidnightControlsConfig.hudEnable,
-                this.mod::setHudEnabled, Text.translatable("midnightcontrols.tooltip.hud_enable"));
+                this.mod::setHudEnabled, Text.translatable("midnightcontrols.menu.hud_enable.tooltip"));
         this.hudSideOption = new SpruceCyclingOption("midnightcontrols.menu.hud_side",
                 amount -> MidnightControlsConfig.hudSide = MidnightControlsConfig.hudSide.next(),
                 option -> option.getDisplayText(MidnightControlsConfig.hudSide.getTranslatedText()),
-                Text.translatable("midnightcontrols.tooltip.hud_side"));
+                Text.translatable("midnightcontrols.menu.hud_side.tooltip"));
         this.moveChatOption = new SpruceToggleBooleanOption("midnightcontrols.menu.move_chat", () -> MidnightControlsConfig.moveChat,
-                value -> MidnightControlsConfig.moveChat = value, Text.translatable("midnightcontrols.tooltip.move_chat"));
+                value -> MidnightControlsConfig.moveChat = value, Text.translatable("midnightcontrols.menu.move_chat.tooltip"));
         // Controller options
         this.toggleControllerProfileOption = new SpruceToggleBooleanOption("midnightcontrols.menu.separate_controller_profile", () -> MidnightControlsConfig.controllerBindingProfiles.containsKey(MidnightControlsConfig.getController().getGuid()), value -> {
             if (value) {
@@ -257,21 +273,42 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                 value -> MidnightControlsConfig.rightDeadZone = value, option -> {
             var value = String.valueOf(option.get());
             return option.getDisplayText(Text.literal(value.substring(0, Math.min(value.length(), 5))));
-        }, Text.translatable("midnightcontrols.tooltip.right_dead_zone"));
+        }, Text.translatable("midnightcontrols.menu.right_dead_zone.tooltip"));
         this.leftDeadZoneOption = new SpruceDoubleOption("midnightcontrols.menu.left_dead_zone", 0.05, 1.0, .05f,
                 () -> MidnightControlsConfig.leftDeadZone,
                 value -> MidnightControlsConfig.leftDeadZone = value, option -> {
             var value = String.valueOf(option.get());
             return option.getDisplayText(Text.literal(value.substring(0, Math.min(value.length(), 5))));
-        }, Text.translatable("midnightcontrols.tooltip.left_dead_zone"));
+        }, Text.translatable("midnightcontrols.menu.left_dead_zone.tooltip"));
         this.invertsRightXAxis = new SpruceToggleBooleanOption("midnightcontrols.menu.invert_right_x_axis", () -> MidnightControlsConfig.invertRightXAxis,
                 value -> MidnightControlsConfig.invertRightXAxis = value, null);
         this.invertsRightYAxis = new SpruceToggleBooleanOption("midnightcontrols.menu.invert_right_y_axis", () -> MidnightControlsConfig.invertRightYAxis,
                 value -> MidnightControlsConfig.invertRightYAxis = value, null);
         this.unfocusedInputOption = new SpruceToggleBooleanOption("midnightcontrols.menu.unfocused_input", () -> MidnightControlsConfig.unfocusedInput,
-                value -> MidnightControlsConfig.unfocusedInput = value, Text.translatable("midnightcontrols.tooltip.unfocused_input"));
+                value -> MidnightControlsConfig.unfocusedInput = value, Text.translatable("midnightcontrols.menu.unfocused_input.tooltip"));
         this.virtualMouseOption = new SpruceToggleBooleanOption("midnightcontrols.menu.virtual_mouse", () -> MidnightControlsConfig.virtualMouse,
-                value -> MidnightControlsConfig.virtualMouse = value, Text.translatable("midnightcontrols.tooltip.virtual_mouse"));
+                value -> MidnightControlsConfig.virtualMouse = value, Text.translatable("midnightcontrols.menu.virtual_mouse.tooltip"));
+        this.hideCursorOption = new SpruceToggleBooleanOption("midnightcontrols.menu.hide_cursor", () -> MidnightControlsConfig.hideNormalMouse,
+                value -> MidnightControlsConfig.hideNormalMouse = value, Text.translatable("midnightcontrols.menu.hide_cursor.tooltip"));
+        // Touch options
+        this.touchModeOption = new SpruceCyclingOption("midnightcontrols.menu.touch_mode",
+                amount -> MidnightControlsConfig.touchMode = MidnightControlsConfig.touchMode.next(),
+                option -> option.getDisplayText(MidnightControlsConfig.touchMode.getTranslatedText()),
+                Text.translatable("midnightcontrols.menu.touch_mode.tooltip"));
+        this.touchSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.touch_speed", 0.0, 150.0, .5f,
+                () -> MidnightControlsConfig.touchSpeed,
+                value -> MidnightControlsConfig.touchSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
+                Text.translatable("midnightcontrols.menu.touch_speed.tooltip"));
+        this.touchBreakDelayOption = new SpruceDoubleOption("midnightcontrols.menu.touch_break_delay", 50, 500, 1f,
+                () -> (double) MidnightControlsConfig.touchBreakDelay,
+                value -> MidnightControlsConfig.touchBreakDelay = value.intValue(), option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
+                Text.translatable("midnightcontrols.menu.touch_break_delay.tooltip"));
+        this.touchTransparencyOption = new SpruceDoubleOption("midnightcontrols.menu.touch_transparency", 0, 100, 1f,
+                () -> (double) MidnightControlsConfig.touchTransparency,
+                value -> MidnightControlsConfig.touchTransparency = value.intValue(), option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))),
+                Text.translatable("midnightcontrols.menu.touch_break_delay.tooltip"));
+        this.invertTouchOption = new SpruceToggleBooleanOption("midnightcontrols.menu.invert_touch", () -> MidnightControlsConfig.invertTouch,
+                value -> MidnightControlsConfig.invertTouch = value, Text.translatable("midnightcontrols.menu.invert_touch.tooltip"));
     }
 
     @Override
@@ -325,6 +362,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         tabs.addSeparatorEntry(Text.translatable("midnightcontrols.menu.separator.controller"));
         tabs.addTabEntry(Text.translatable("midnightcontrols.menu.title.controller"), null,
                 this::buildControllerTab);
+        tabs.addTabEntry(Text.translatable("midnightcontrols.menu.title.touch"), null,
+                this::buildTouchTab);
         tabs.addTabEntry(Text.translatable("midnightcontrols.menu.title.mappings.string"), null,
                 this::buildMappingsStringEditorTab);
     }
@@ -338,7 +377,9 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         list.addSingleOptionEntry(this.yAxisRotationSpeedOption);
         list.addSingleOptionEntry(this.mouseSpeedOption);
         list.addSingleOptionEntry(this.virtualMouseOption);
+        list.addSingleOptionEntry(this.hideCursorOption);
         list.addSingleOptionEntry(this.joystickAsMouseOption);
+        list.addSingleOptionEntry(this.eyeTrackingAsMouseOption);
         list.addSingleOptionEntry(this.advancedConfigOption);
         return list;
     }
@@ -417,14 +458,25 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
         root.addChild(labels);
         return root;
     }
+    public SpruceOptionListWidget buildTouchTab(int width, int height) {
+        var list = new SpruceOptionListWidget(Position.origin(), width, height);
+        list.setBackground(new MidnightControlsBackground(130));
+        list.addSingleOptionEntry(this.touchSpeedOption);
+        list.addSingleOptionEntry(this.invertTouchOption);
+        list.addSingleOptionEntry(new SpruceSeparatorOption("midnightcontrols.menu.title.hud", true, null));
+        list.addSingleOptionEntry(this.touchModeOption);
+        list.addSingleOptionEntry(this.touchBreakDelayOption);
+        list.addSingleOptionEntry(this.touchTransparencyOption);
+        return list;
+    }
 
     public SpruceContainerWidget buildMappingsStringEditorTab(int width, int height) {
         return new MappingsStringInputWidget(Position.origin(), width, height);
     }
 
     @Override
-    public void renderTitle(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        drawCenteredTextWithShadow(matrices, this.textRenderer, I18n.translate("midnightcontrols.menu.title"), this.width / 2, 8, 16777215);
+    public void renderTitle(DrawContext context, int mouseX, int mouseY, float delta) {
+        context.drawCenteredTextWithShadow(this.textRenderer, I18n.translate("midnightcontrols.menu.title"), this.width / 2, 8, 16777215);
     }
 
     public static class MidnightControlsBackground implements Background {
@@ -434,8 +486,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
             MidnightControlsBackground.transparency = transparency;
         }
         @Override
-        public void render(MatrixStack matrixStack, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
-            fill(matrixStack, widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), MidnightColorUtil.hex2Rgb("#000000"));
+        public void render(DrawContext context, SpruceWidget widget, int vOffset, int mouseX, int mouseY, float delta) {
+            fill(context.getMatrices(), widget.getX(), widget.getY(), widget.getX() + widget.getWidth(), widget.getY() + widget.getHeight(), MidnightColorUtil.hex2Rgb("#000000"));
         }
         private static void fill(MatrixStack matrixStack, int x2, int y2, int x1, int y1, Color color) {
             matrixStack.push();

src/main/java/eu/midnightdust/midnightcontrols/client/gui/RingScreen.java

@@ -12,9 +12,9 @@ package eu.midnightdust.midnightcontrols.client.gui;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.ring.RingButtonMode;
 import eu.midnightdust.midnightcontrols.client.ring.RingPage;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 
 /**
@@ -47,11 +47,11 @@ public class RingScreen extends Screen {
     }
 
     @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        super.render(matrices, mouseX, mouseY, delta);
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
 
         RingPage page = this.mod.ring.getCurrentPage();
-        page.render(matrices, this.textRenderer, this.width, this.height, mouseX, mouseY, delta);
+        page.render(context, this.textRenderer, this.width, this.height, mouseX, mouseY, delta);
     }
 
     @Override

src/main/java/eu/midnightdust/midnightcontrols/client/gui/TouchscreenOverlay.java

@@ -11,25 +11,43 @@ package eu.midnightdust.midnightcontrols.client.gui;
 
 import dev.lambdaurora.spruceui.Position;
 import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
+import eu.midnightdust.lib.util.PlatformFunctions;
+import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
+import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.HudSide;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
-import eu.midnightdust.midnightcontrols.client.gui.widget.SilentTexturedButtonWidget;
+import eu.midnightdust.midnightcontrols.client.compat.EmotecraftCompat;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import eu.midnightdust.midnightcontrols.client.touch.gui.ItemUseButtonWidget;
+import eu.midnightdust.midnightcontrols.client.touch.gui.SilentTexturedButtonWidget;
+import eu.midnightdust.midnightcontrols.client.touch.TouchUtils;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
-import net.minecraft.client.gui.screen.ChatScreen;
-import net.minecraft.client.gui.screen.GameMenuScreen;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.screen.*;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.client.gui.widget.TexturedButtonWidget;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.texture.MissingSprite;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.item.*;
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
 import net.minecraft.text.Text;
-import net.minecraft.util.Arm;
-import net.minecraft.util.Identifier;
+import net.minecraft.util.*;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
+import java.util.List;
+import java.util.Objects;
+
 import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_X;
 import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y;
 
@@ -38,46 +56,47 @@ import static org.lwjgl.glfw.GLFW.GLFW_GAMEPAD_AXIS_RIGHT_Y;
  */
 public class TouchscreenOverlay extends Screen {
     public static final Identifier WIDGETS_LOCATION = new Identifier("midnightcontrols", "textures/gui/widgets.png");
-    private MidnightControlsClient mod;
+    private final MidnightControlsClient mod;
+    private SilentTexturedButtonWidget inventoryButton;
+    private SilentTexturedButtonWidget swapHandsButton;
+    private SilentTexturedButtonWidget dropButton;
+    private ItemUseButtonWidget useButton;
     private SilentTexturedButtonWidget jumpButton;
     private SilentTexturedButtonWidget flyButton;
     private SilentTexturedButtonWidget flyUpButton;
     private SilentTexturedButtonWidget flyDownButton;
-    private int flyButtonEnableTicks = 0;
-    private int forwardButtonTick = 0;
+    private SilentTexturedButtonWidget forwardButton;
     private SilentTexturedButtonWidget forwardLeftButton;
     private SilentTexturedButtonWidget forwardRightButton;
+    private SilentTexturedButtonWidget leftButton;
+    private SilentTexturedButtonWidget rightButton;
+    private SilentTexturedButtonWidget backButton;
     private SilentTexturedButtonWidget startSneakButton;
     private SilentTexturedButtonWidget endSneakButton;
+    private int flyButtonEnableTicks = 0;
+    private int forwardButtonTick = 0;
+    public long clickStartTime;
+    public HitResult firstHitResult = null;
+    public static TouchscreenOverlay instance;
 
     public TouchscreenOverlay(@NotNull MidnightControlsClient mod) {
         super(Text.literal("Touchscreen overlay"));
         this.mod = mod;
-        this.passEvents = true;
     }
 
     @Override
-    public boolean shouldPause()
-    {
+    public boolean shouldPause() {
         return false;
     }
 
     @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        super.keyPressed(keyCode,scanCode,modifiers);
-        //return false;
-        return true;
-    }
+    public void renderInGameBackground(DrawContext context) {}
 
-    private void pauseGame(boolean bl) {
-        if (this.client == null)
-            return;
-        boolean bl2 = this.client.isIntegratedServerRunning() && !this.client.getServer().isRemote();
-        if (bl2) {
-            this.client.setScreen(new GameMenuScreen(!bl));
+    private void pauseGame() {
+        assert this.client != null;
+        this.client.setScreen(new GameMenuScreen(true));
+        if (this.client.isIntegratedServerRunning() && !Objects.requireNonNull(this.client.getServer()).isRemote()) {
             this.client.getSoundManager().pauseAll();
-        } else {
-            this.client.setScreen(new GameMenuScreen(true));
         }
     }
 
@@ -88,24 +107,26 @@ public class TouchscreenOverlay extends Screen {
      *
      */
     private void updateForwardButtonsState(boolean state) {
-        if (state)
-            this.forwardButtonTick = -1;
-        else
-            this.forwardButtonTick = 20;
+        this.forwardButtonTick = state ? -1 : 20;
     }
 
     /**
      * Updates the jump buttons.
      */
     private void updateJumpButtons() {
-        if (this.client == null)
-            return;
-        if (!this.client.interactionManager.isFlyingLocked()) {
+        assert this.client != null;
+        assert this.client.player != null;
+        float transparency = MidnightControlsConfig.touchTransparency / 100f;
+
+        if (this.client.player.getAbilities().flying) {
             boolean oldStateFly = this.flyButton.isVisible();
             this.jumpButton.setVisible(false);
             this.flyButton.setVisible(true);
             this.flyUpButton.setVisible(true);
             this.flyDownButton.setVisible(true);
+            this.flyButton.setAlpha(transparency);
+            this.flyUpButton.setAlpha(transparency);
+            this.flyDownButton.setAlpha(transparency);
             if (oldStateFly != this.flyButton.isVisible()) {
                 this.flyButtonEnableTicks = 5;
                 this.setJump(false);
@@ -116,6 +137,7 @@ public class TouchscreenOverlay extends Screen {
             this.flyButton.setVisible(false);
             this.flyUpButton.setVisible(false);
             this.flyDownButton.setVisible(false);
+            this.jumpButton.setAlpha(transparency);
         }
     }
 
@@ -125,6 +147,7 @@ public class TouchscreenOverlay extends Screen {
      * @param btn   The pressed button.
      */
     private void handleJump(SpruceButtonWidget btn) {
+        assert this.client != null;
         ((KeyBindingAccessor) this.client.options.jumpKey).midnightcontrols$handlePressState(btn.isActive());
     }
     /**
@@ -133,31 +156,32 @@ public class TouchscreenOverlay extends Screen {
      * @param state   The state.
      */
     private void setJump(boolean state) {
+        assert this.client != null;
         ((KeyBindingAccessor) this.client.options.jumpKey).midnightcontrols$handlePressState(state);
     }
 
-    @Override
-    public void tick() {
-        if (this.forwardButtonTick > 0) {
-            this.forwardButtonTick--;
-        } else if (this.forwardButtonTick == 0) {
-            if (this.forwardLeftButton.isVisible())
-                this.forwardLeftButton.setVisible(false);
-            if (this.forwardRightButton.isVisible())
-                this.forwardRightButton.setVisible(false);
-        }
-        this.updateJumpButtons();
-    }
-
     @Override
     protected void init() {
         super.init();
+        assert this.client != null;
+        assert this.client.player != null;
+        assert this.client.interactionManager != null;
         int scaledWidth = this.client.getWindow().getScaledWidth();
         int scaledHeight = this.client.getWindow().getScaledHeight();
-        this.addDrawableChild(new TexturedButtonWidget(scaledWidth / 2 - 20, 0, 20, 20, 0, 106, 20, new Identifier("textures/gui/widgets.png"), 256, 256,
-                btn -> this.client.setScreen(new ChatScreen("")), Text.empty()));
-        this.addDrawableChild(new TexturedButtonWidget(scaledWidth / 2, 0, 20, 20, 0, 0, 20, WIDGETS_LOCATION, 256, 256,
-                btn -> this.pauseGame(false)));
+        int emoteOffset = 0;
+        if (PlatformFunctions.isModLoaded("emotecraft")) {
+            emoteOffset = 10;
+            TextIconButtonWidget emoteButton = TextIconButtonWidget.builder(Text.empty(), btn -> EmotecraftCompat.openEmotecraftScreen(this), true).width(20).texture(new Identifier(MidnightControlsConstants.NAMESPACE, "touch/emote"), 20, 20).build();
+            emoteButton.setPosition(scaledWidth / 2 - 30, 0);
+            this.addDrawableChild(emoteButton);
+        }
+
+        TextIconButtonWidget chatButton = TextIconButtonWidget.builder(Text.empty(), btn -> this.client.setScreen(new ChatScreen("")), true).width(20).texture(new Identifier(MidnightControlsConstants.NAMESPACE, "touch/chat"), 20, 20).build();
+        chatButton.setPosition(scaledWidth / 2 - 20 + emoteOffset, 0);
+        this.addDrawableChild(chatButton);
+        TextIconButtonWidget pauseButton = TextIconButtonWidget.builder(Text.empty(), btn -> this.pauseGame(), true).width(20).texture(new Identifier(MidnightControlsConstants.NAMESPACE, "touch/pause"), 20, 20).build();
+        pauseButton.setPosition(scaledWidth / 2 + emoteOffset, 0);
+        this.addDrawableChild(pauseButton);
         // Inventory buttons.
         int inventoryButtonX = scaledWidth / 2;
         int inventoryButtonY = scaledHeight - 16 - 5;
@@ -166,15 +190,15 @@ public class TouchscreenOverlay extends Screen {
         } else {
             inventoryButtonX = inventoryButtonX + 91 + 4;
         }
-        this.addDrawableChild(new TexturedButtonWidget(inventoryButtonX, inventoryButtonY, 20, 20, 20, 0, 20, WIDGETS_LOCATION, 256, 256,
-                btn -> {
-                    if (this.client.interactionManager.hasRidingInventory()) {
-                        this.client.player.openRidingInventory();
-                    } else {
-                        this.client.getTutorialManager().onInventoryOpened();
-                        this.client.setScreen(new InventoryScreen(this.client.player));
-                    }
-                }));
+        this.addDrawableChild(this.inventoryButton = new SilentTexturedButtonWidget(Position.of(inventoryButtonX, inventoryButtonY), 20, 20, Text.empty(), btn -> {
+            if (this.client.interactionManager.hasRidingInventory()) {
+                this.client.player.openRidingInventory();
+            } else {
+                this.client.getTutorialManager().onInventoryOpened();
+                this.client.setScreen(new InventoryScreen(this.client.player));
+            }
+        }, 20, 0, 20, WIDGETS_LOCATION, 256, 256));
+                ;
         int jumpButtonX, swapHandsX, sneakButtonX;
         int sneakButtonY = scaledHeight - 10 - 40 - 5;
         if (MidnightControlsConfig.hudSide == HudSide.LEFT) {
@@ -187,17 +211,23 @@ public class TouchscreenOverlay extends Screen {
             sneakButtonX = scaledWidth - 10 - 40 - 5;
         }
         // Swap items hand.
-        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY), 20, 20, Text.empty(),
+        this.addDrawableChild(this.swapHandsButton = new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY), 20, 20, Text.empty(),
                 button -> {
                     if (button.isActive()) {
                         if (!this.client.player.isSpectator()) {
-                            this.client.getNetworkHandler().sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ORIGIN, Direction.DOWN));
+                            Objects.requireNonNull(this.client.getNetworkHandler()).sendPacket(new PlayerActionC2SPacket(PlayerActionC2SPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ORIGIN, Direction.DOWN));
                         }
                     }
                 },0, 160, 20, WIDGETS_LOCATION));
         // Drop
-        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY + 5 + 20), 20, 20, Text.empty(), btn ->
-                ((KeyBindingAccessor) this.client.options.dropKey).midnightcontrols$handlePressState(btn.isActive()), 0, 160, 20, WIDGETS_LOCATION));
+        this.addDrawableChild(this.dropButton = new SilentTexturedButtonWidget(Position.of(swapHandsX, sneakButtonY + 5 + 20), 20, 20, Text.empty(), btn -> {
+            if (btn.isActive() && !client.player.isSpectator() && client.player.dropSelectedItem(false)) {
+                client.player.swingHand(Hand.MAIN_HAND);
+            }
+        }, 20, 160, 20, WIDGETS_LOCATION));
+        // Use
+        this.addDrawableChild(this.useButton = new ItemUseButtonWidget(Position.of(width/2-25, height - 70), 50, 17, Text.translatable(MidnightControlsConstants.NAMESPACE+".action.eat"), btn ->
+                client.interactionManager.interactItem(client.player, client.player.getActiveHand())));
         // Jump keys
         this.addDrawableChild(this.jumpButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY), 20, 20, Text.empty(), this::handleJump, 0, 40, 20, WIDGETS_LOCATION));
         this.addDrawableChild(this.flyButton = new SilentTexturedButtonWidget(Position.of(jumpButtonX, sneakButtonY), 20, 20, Text.empty(),btn -> {
@@ -227,15 +257,13 @@ public class TouchscreenOverlay extends Screen {
                 this.startSneakButton.setVisible(true);
             }
         }, 20, 120, 20, WIDGETS_LOCATION)));
-        this.endSneakButton.setVisible(false);
         this.addDrawableChild(this.forwardLeftButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
             ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
             ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isActive());
             this.updateForwardButtonsState(btn.isActive());
         }, 80, 80, 20, WIDGETS_LOCATION
         ));
-        this.forwardLeftButton.setVisible(false);
-        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
+        this.addDrawableChild(this.forwardButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY - 5 - 20), 20, 20, Text.empty(), btn -> {
             ((KeyBindingAccessor) this.client.options.forwardKey).midnightcontrols$handlePressState(btn.isActive());
             this.updateForwardButtonsState(btn.isActive());
             this.forwardLeftButton.setVisible(true);
@@ -248,48 +276,215 @@ public class TouchscreenOverlay extends Screen {
             this.updateForwardButtonsState(btn.isActive());
         }, 100, 80, 20, WIDGETS_LOCATION
         ));
-        this.forwardRightButton.setVisible(true);
-        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX + 20 + 5, sneakButtonY), 20, 20, Text.empty(),
+
+        this.addDrawableChild(this.rightButton =new SilentTexturedButtonWidget(Position.of(sneakButtonX + 20 + 5, sneakButtonY), 20, 20, Text.empty(),
                 btn -> ((KeyBindingAccessor) this.client.options.rightKey).midnightcontrols$handlePressState(btn.isActive()), 20, 80, 20, WIDGETS_LOCATION
         ));
-        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY + 20 + 5), 20, 20, Text.empty(),
+        this.addDrawableChild(this.backButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX, sneakButtonY + 20 + 5), 20, 20, Text.empty(),
                 btn -> ((KeyBindingAccessor) this.client.options.backKey).midnightcontrols$handlePressState(btn.isActive()), 40, 80, 20, WIDGETS_LOCATION
         ));
-        this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY), 20, 20, Text.empty(),
+        this.addDrawableChild(this.leftButton = new SilentTexturedButtonWidget(Position.of(sneakButtonX - 20 - 5, sneakButtonY), 20, 20, Text.empty(),
                 btn -> ((KeyBindingAccessor) this.client.options.leftKey).midnightcontrols$handlePressState(btn.isActive()), 60, 80, 20, WIDGETS_LOCATION
         ));
+        initCustomButtons(true);
+        initCustomButtons(false);
+
+        this.setButtonProperties(MidnightControlsConfig.touchTransparency / 100f);
+        TouchscreenOverlay.instance = this;
+    }
+    private void initCustomButtons(boolean left) {
+        assert client != null;
+        Identifier emptySprite = new Identifier(MidnightControlsConstants.NAMESPACE, "touch/empty");
+        List<String> list = left ? MidnightControlsConfig.leftTouchBinds : MidnightControlsConfig.rightTouchBinds;
+        Sprite missingSprite = client.getGuiAtlasManager().getSprite(MissingSprite.getMissingSpriteId());
+        for (int i = 0; i < list.size(); i++) {
+            String bindName = list.get(i);
+            ButtonBinding binding = InputManager.getBinding(bindName);
+            if (binding == null) continue;
+            boolean hasTexture = client.getGuiAtlasManager().getSprite(new Identifier(MidnightControlsConstants.NAMESPACE, "binding/"+bindName)) != missingSprite;
+            if (MidnightControlsConfig.debug) System.out.println(left +" "+new Identifier(MidnightControlsConstants.NAMESPACE, "binding/"+bindName)+" "+ hasTexture);
+            var button = TextIconButtonWidget.builder(Text.translatable("binding.getTranslationKey()"), b -> binding.handle(client, 1, ButtonState.PRESS), hasTexture)
+                    .texture(hasTexture ? new Identifier(MidnightControlsConstants.NAMESPACE, "binding/"+bindName) : emptySprite, 20, 20).dimension(20, 20).build();
+            button.setPosition(left ? (3+(i*23)) : this.width-(23+(i*23)), 3);
+            button.setAlpha(MidnightControlsConfig.touchTransparency / 100f);
+            this.addDrawableChild(button);
+        }
+    }
+    private void setButtonProperties(float transparency) {
+        this.inventoryButton.setAlpha(transparency);
+        this.dropButton.setAlpha(transparency);
+        this.swapHandsButton.setAlpha(transparency);
+        this.jumpButton.setAlpha(transparency);
+        this.flyButton.setAlpha(transparency);
+        this.flyUpButton.setAlpha(transparency);this.useButton.setAlpha(Math.min(transparency+0.1f, 1.0f));
+        this.flyDownButton.setAlpha(transparency);
+        this.startSneakButton.setAlpha(transparency);
+        this.endSneakButton.setAlpha(transparency);
+        this.forwardButton.setAlpha(transparency);
+        this.forwardLeftButton.setAlpha(Math.max(0.05f, transparency-0.1f));
+        this.forwardRightButton.setAlpha(Math.max(0.05f, transparency-0.1f));
+        this.leftButton.setAlpha(transparency);
+        this.rightButton.setAlpha(transparency);
+        this.backButton.setAlpha(transparency);
+        this.useButton.setAlpha(Math.min(transparency+0.1f, 1.0f));
+        this.endSneakButton.setVisible(false);
+        this.forwardLeftButton.setVisible(false);
+        this.forwardRightButton.setVisible(false);
+    }
+
+    @Override
+    public void tick() {
+        assert this.client != null;
+        assert this.client.interactionManager != null;
+        assert this.client.player != null;
+
+        if (this.forwardButtonTick > 0) {
+            --this.forwardButtonTick;
+        } else {
+            this.forwardLeftButton.setVisible(false);
+            this.forwardRightButton.setVisible(false);
+        }
+        this.useButton.setVisible(client.player.getMainHandStack() != null && (client.player.getMainHandStack().getUseAction() != UseAction.NONE || client.player.getMainHandStack().getItem() instanceof ArmorItem) && !TouchUtils.hasInWorldUseAction(client.player.getMainHandStack()));
+        this.updateJumpButtons();
+
+        double scaleFactor = client.getWindow().getScaleFactor();
+        if (clickStartTime > 0 && System.currentTimeMillis() - clickStartTime >= MidnightControlsConfig.touchBreakDelay) this.mouseHeldDown(client.mouse.getX() / scaleFactor, client.mouse.getY() / scaleFactor);
+        else client.interactionManager.cancelBlockBreaking();
     }
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (mouseY >= (double) (this.height - 22) && this.client != null && this.client.player != null) {
-            int centerX = this.width / 2;
-            if (mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
-                for (int slot = 0; slot < 9; ++slot) {
-                    int slotX = centerX - 90 + slot * 20 + 2;
-                    if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
-                        this.client.player.getInventory().selectedSlot = slot;
-                        return true;
-                    }
+        int centerX = this.width / 2;
+        if (mouseY >= (double) (this.height - 22) && this.client != null && this.client.player != null && mouseX >= (double) (centerX - 90) && mouseX <= (double) (centerX + 90)) {
+            for (int slot = 0; slot < 9; ++slot) {
+                int slotX = centerX - 90 + slot * 20 + 2;
+                if (mouseX >= (double) slotX && mouseX <= (double) (slotX + 20)) {
+                    this.client.player.getInventory().selectedSlot = slot;
+                    return true;
                 }
             }
+        } else {
+            clickStartTime = System.currentTimeMillis();
+            boolean bl = super.mouseClicked(mouseX, mouseY, button);
+            if (!bl) firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
+            return bl;
         }
         return super.mouseClicked(mouseX, mouseY, button);
     }
 
+    @Override
+    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+        firstHitResult = null;
+        if (!super.mouseReleased(mouseX, mouseY, button) && System.currentTimeMillis() - clickStartTime < 200) {
+            assert client != null;
+            assert client.player != null;
+            assert client.world != null;
+            assert client.interactionManager != null;
+            clickStartTime = -1;
+
+            if (client.player.getMainHandStack() != null && TouchUtils.hasInWorldUseAction(client.player.getMainHandStack())) {
+                client.interactionManager.stopUsingItem(client.player);
+                return true;
+            }
+            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
+            if (result == null) return false;
+
+
+            if (result instanceof BlockHitResult blockHit) {
+                BlockPos blockPos = blockHit.getBlockPos().offset(blockHit.getSide());
+                BlockState state = client.world.getBlockState(blockPos);
+
+                if (client.world.isAir(blockPos) || state.isReplaceable()) {
+                    ItemStack stackInHand = client.player.getMainHandStack();
+                    int previousStackCount = stackInHand.getCount();
+                    var interaction = client.interactionManager.interactBlock(client.player, client.player.getActiveHand(), blockHit);
+                    if (interaction.isAccepted()) {
+                        if (interaction.shouldSwingHand()) {
+                            client.player.swingHand(client.player.preferredHand);
+                            if (!stackInHand.isEmpty() && (stackInHand.getCount() != previousStackCount || client.interactionManager.hasCreativeInventory())) {
+                                client.gameRenderer.firstPersonRenderer.resetEquipProgress(client.player.preferredHand);
+                            }
+                        }
+                        return true;
+                    }
+                }
+            }
+            if (result instanceof EntityHitResult entityHit) {
+                client.interactionManager.attackEntity(client.player, entityHit.getEntity());
+                client.player.swingHand(Hand.MAIN_HAND);
+            }
+        }
+        clickStartTime = -1;
+        return false;
+    }
+    public void mouseHeldDown(double mouseX, double mouseY) {
+        assert client != null;
+        assert client.player != null;
+        assert client.interactionManager != null;
+        if (!isDragging()) {
+            if (client.player.getMainHandStack() != null && TouchUtils.hasInWorldUseAction(client.player.getMainHandStack())) {
+                client.interactionManager.interactItem(client.player, client.player.getActiveHand());
+                return;
+            }
+            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
+            if (result == null || firstHitResult == null) return;
+
+            if (result instanceof BlockHitResult blockHit && firstHitResult instanceof BlockHitResult firstBlock && blockHit.getBlockPos().equals(firstBlock.getBlockPos())) {
+                if (MidnightControlsConfig.debug) System.out.println(blockHit.getBlockPos().toString());
+                if (client.interactionManager.updateBlockBreakingProgress(blockHit.getBlockPos(), blockHit.getSide())) {
+                    client.particleManager.addBlockBreakingParticles(blockHit.getBlockPos(), blockHit.getSide());
+                    client.player.swingHand(Hand.MAIN_HAND);
+                } else client.interactionManager.cancelBlockBreaking();
+                firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
+            }
+            else if (result instanceof EntityHitResult entityHit && firstHitResult instanceof EntityHitResult firstEntity && entityHit.getEntity().getUuid().compareTo(firstEntity.getEntity().getUuid()) == 0) {
+                if (client.interactionManager.interactEntity(client.player, entityHit.getEntity(), client.player.getActiveHand()) == ActionResult.SUCCESS) {
+                    client.player.swingHand(Hand.MAIN_HAND);
+                }
+                firstHitResult = TouchUtils.getTargettedObject(mouseX, mouseY);
+            }
+        }
+    }
+
     @Override
     public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
         if (button == GLFW.GLFW_MOUSE_BUTTON_1 && this.client != null) {
+            if (!MidnightControlsConfig.invertTouch) {
+                deltaX = -deltaX;
+                deltaY = -deltaY;
+            }
             if (deltaY > 0.01)
-                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 2);
-            else if (deltaY < 0.01)
-                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs(deltaY / 5.0), 1);
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs((deltaY / 3.0)*MidnightControlsConfig.touchSpeed/100), 2);
+            else this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_Y, (float) Math.abs((deltaY / 3.0)*MidnightControlsConfig.touchSpeed/100), 1);
 
             if (deltaX > 0.01)
-                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 2);
-            else if (deltaX < 0.01)
-                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs(deltaX / 5.0), 1);
+                this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs((deltaX / 3.0)*MidnightControlsConfig.touchSpeed/100), 2);
+            else this.mod.input.handleLook(this.client, GLFW_GAMEPAD_AXIS_RIGHT_X, (float) Math.abs((deltaX / 3.0)*MidnightControlsConfig.touchSpeed/100), 1);
+
+            HitResult result = TouchUtils.getTargettedObject(mouseX, mouseY);
+            if (result != null && firstHitResult != null) {
+                if (result instanceof BlockHitResult blockHit && firstHitResult instanceof BlockHitResult firstBlock && !blockHit.getBlockPos().equals(firstBlock.getBlockPos())) {
+                    firstHitResult = null;
+                } else if (result instanceof EntityHitResult entityHit && firstHitResult instanceof EntityHitResult firstEntity && entityHit.getEntity().getUuid().compareTo(firstEntity.getEntity().getUuid()) != 0) {
+                    firstHitResult = null;
+                }
+            }
         }
         return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
     }
+    @Override
+    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+        //client.currentScreen = null;
+        KeyBinding.onKeyPressed(InputUtil.fromKeyCode(keyCode, scanCode));
+
+        super.keyPressed(keyCode,scanCode,modifiers);
+        return true;
+    }
+
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
+        context.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
+        context.fill(mouseX-10, mouseY-10, mouseX+10, mouseY+10, 0xFFFFFF);
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerButtonWidget.java

@@ -15,7 +15,7 @@ import dev.lambdaurora.spruceui.Position;
 import dev.lambdaurora.spruceui.SpruceTexts;
 import dev.lambdaurora.spruceui.widget.AbstractSpruceIconButtonWidget;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
 
@@ -45,12 +45,12 @@ public class ControllerButtonWidget extends AbstractSpruceIconButtonWidget {
     }
 
     @Override
-    protected int renderIcon(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+    protected int renderIcon(DrawContext context, int mouseX, int mouseY, float delta) {
         int x = this.getX();
         if (this.binding.getButton().length > 1) {
             x += (this.width / 2 - this.iconWidth / 2) - 4;
         }
-        var size = MidnightControlsRenderer.drawButton(matrices, x, this.getY(), this.binding, MinecraftClient.getInstance());
+        var size = MidnightControlsRenderer.drawButton(context, x, this.getY(), this.binding, MinecraftClient.getInstance());
         this.iconWidth = size.length();
         return size.height();
     }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControllerControlsWidget.java

@@ -18,8 +18,8 @@ import dev.lambdaurora.spruceui.SpruceTexts;
 import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
 import dev.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.function.Predicates;
 
@@ -58,11 +58,11 @@ public class ControllerControlsWidget extends SpruceContainerWidget {
     }
 
     @Override
-    public void renderWidget(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        drawCenteredTextWithShadow(matrices, this.client.textRenderer, Text.translatable("midnightcontrols.menu.title.controller_controls"),
+    public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+        context.drawCenteredTextWithShadow(this.client.textRenderer, Text.translatable("midnightcontrols.menu.title.controller_controls"),
                 this.getX() + this.width / 2, this.getY() + 4, 16777215);
         this.resetButton.setActive(InputManager.streamBindings().anyMatch(Predicates.not(ButtonBinding::isDefault)));
-        super.renderWidget(matrices, mouseX, mouseY, delta);
+        super.renderWidget(context, mouseX, mouseY, delta);
     }
 
     public void finishBindingEdit(int... buttons) {

src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControlsListWidget.java

@@ -25,6 +25,7 @@ import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget;
 import dev.lambdaurora.spruceui.widget.container.SpruceParentWidget;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
@@ -226,14 +227,14 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
         /* Rendering */
 
         @Override
-        protected void renderWidget(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
             boolean focused = gui.focusedBinding == this.binding;
 
             var textRenderer = ControlsListWidget.this.client.textRenderer;
             int height = this.getHeight();
             //float textX = (float) (this.getX() + 70 - ControlsListWidget.this.maxTextLength);
             int textY = this.getY() + height / 2;
-            textRenderer.draw(matrices, this.bindingName, this.getX(), (float) (textY - 9 / 2), 16777215);
+            context.drawText(textRenderer, this.bindingName, this.getX(), (textY - 9 / 2), 16777215, true);
 
             this.resetButton.setVisible(!focused);
             this.unbindButton.setVisible(focused);
@@ -252,7 +253,7 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
                 this.editButton.setMessage(text.formatted(Formatting.GOLD));
             }
 
-            this.children.forEach(widget -> widget.render(matrices, mouseX, mouseY, delta));
+            this.children.forEach(widget -> widget.render(context, mouseX, mouseY, delta));
         }
     }
 
@@ -289,8 +290,8 @@ public class ControlsListWidget extends SpruceEntryListWidget<ControlsListWidget
         /* Rendering */
 
         @Override
-        protected void renderWidget(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-            this.separatorWidget.render(matrices, mouseX, mouseY, delta);
+        protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
+            this.separatorWidget.render(context, mouseX, mouseY, delta);
         }
 
         @Override

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ChatScreenMixin.java

@@ -1,10 +1,10 @@
 package eu.midnightdust.midnightcontrols.client.mixin;
 
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -25,11 +25,11 @@ public abstract class ChatScreenMixin extends Screen {
         if (MidnightControlsConfig.moveChat) chatField.setY(4);
     }
     @Inject(method = "render", at = @At("HEAD"))
-    private void midnightcontrols$moveInputFieldBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (MidnightControlsConfig.moveChat) matrices.translate(0f, -this.height + 16, 0f);
+    private void midnightcontrols$moveInputFieldBackground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) context.getMatrices().translate(0f, -this.height + 16, 0f);
     }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V", shift = At.Shift.BEFORE))
-    private void midnightcontrols$dontMoveOtherStuff(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (MidnightControlsConfig.moveChat) matrices.translate(0f, this.height - 16, 0f);
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;render(Lnet/minecraft/client/gui/DrawContext;IIF)V", shift = At.Shift.BEFORE))
+    private void midnightcontrols$dontMoveOtherStuff(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+        if (MidnightControlsConfig.moveChat) context.getMatrices().translate(0f, this.height - 16, 0f);
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java

@@ -9,11 +9,11 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
-import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsSettingsScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.ControlsOptionsScreen;
 import net.minecraft.client.gui.screen.option.GameOptionsScreen;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -32,8 +32,9 @@ public abstract class ControlsOptionsScreenMixin extends GameOptionsScreen {
     }
     @Inject(method = "init", at = @At(value = "INVOKE", ordinal = 1, shift = At.Shift.AFTER, target = "Lnet/minecraft/client/gui/screen/option/ControlsOptionsScreen;addDrawableChild(Lnet/minecraft/client/gui/Element;)Lnet/minecraft/client/gui/Element;"))
     private void addControllerButton(CallbackInfo ci) {
-        this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20,0,0,20, new Identifier("midnightcontrols", "textures/gui/midnightcontrols_button.png"), 32, 64, (button) -> {
-            this.client.setScreen(new MidnightControlsSettingsScreen(this, false));
-            }, Text.translatable("midnightcontrols.menu.title.controller")));
+        TextIconButtonWidget iconWidget = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"), (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
+                .dimension(20,20).texture(new Identifier("midnightcontrols", "icon/controller"), 20, 20).build();
+        iconWidget.setPosition(this.width / 2 + 158, this.height / 6 - 12);
+        this.addDrawableChild(iconWidget);
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/EntryListWidgetAccessor.java

@@ -1,21 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.navigation.NavigationDirection;
-import net.minecraft.client.gui.widget.EntryListWidget;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(EntryListWidget.class)
-public interface EntryListWidgetAccessor {
-    //@Invoker("getNeighbouringEntry")
-    //void midnightcontrols$getNeighbouringEntry(NavigationDirection direction);
-}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameOptionsMixin.java

@@ -1,36 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.option.GameOptions;
-import net.minecraft.client.option.SimpleOption;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-/**
- * Represents a mixin to GameOptions.
- * <p>
- * Sets the default of the Auto-Jump option to false.
- */
-@Mixin(GameOptions.class)
-public abstract class GameOptionsMixin {
-
-    @Shadow public abstract SimpleOption<Boolean> getAutoJump();
-
-    @Inject(method = "load", at = @At("HEAD"))
-    public void onInit(CallbackInfo ci) {
-        // Set default value of the Auto-Jump option to false.
-        getAutoJump().setValue(false);
-    }
-}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java

@@ -9,27 +9,44 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
+import eu.midnightdust.midnightcontrols.client.touch.TouchUtils;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 @Mixin(GameRenderer.class)
-public class GameRendererMixin {
+public abstract class GameRendererMixin {
     @Shadow
     @Final
-    private MinecraftClient client;
+    MinecraftClient client;
 
     @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Mouse;getX()D", shift = At.Shift.BEFORE))
     private void onRender(float tickDelta, long startTime, boolean fullRender, CallbackInfo ci) {
         if (this.client.currentScreen != null && MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER)
             MidnightControlsClient.get().input.onPreRenderScreen(this.client, this.client.currentScreen);
     }
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V", shift = At.Shift.BEFORE), locals = LocalCapture.CAPTURE_FAILSOFT)
+    private void renderVirtualCursor(float tickDelta, long startTime, boolean tick, CallbackInfo ci, boolean bl, MatrixStack matrixStack, DrawContext drawContext) {
+        MidnightControlsRenderer.renderVirtualCursor(drawContext,  client);
+        drawContext.draw();
+    }
+    @Inject(at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/GameRenderer;renderHand:Z", ordinal = 0), method = "renderWorld")
+    private void postWorldRender(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) {
+        TouchUtils.lastProjMat.set(RenderSystem.getProjectionMatrix());
+        TouchUtils.lastModMat.set(RenderSystem.getModelViewMatrix());
+        TouchUtils.lastWorldSpaceMatrix.set(matrix.peek().getPositionMatrix());
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/HandledScreenMixin.java

@@ -18,6 +18,7 @@ import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
 import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.slot.Slot;
@@ -55,16 +56,15 @@ public abstract class HandledScreenMixin implements HandledScreenAccessor {
     public abstract void midnightcontrols$onMouseClick(@Nullable Slot slot, int slotId, int clickData, SlotActionType actionType);
 
     @Inject(method = "render", at = @At("RETURN"))
-    public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
+    public void onRender(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
         if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.hudEnable) {
             var client = MinecraftClient.getInstance();
-            matrices.push();
             int x = 2, y = client.getWindow().getScaledHeight() - 2 - MidnightControlsRenderer.ICON_SIZE;
             if (MidnightControlsCompat.isEMIPresent() && EMICompat.isEMIEnabled()) {
                 x += 42;
             }
-            if (!ButtonBinding.TAKE_ALL.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.TAKE_ALL,true, client) + 2;
-            if (!ButtonBinding.EXIT.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.EXIT, true, client) + 2;
+            if (!ButtonBinding.TAKE_ALL.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(context, x, y, ButtonBinding.TAKE_ALL,true, client) + 2;
+            if (!ButtonBinding.EXIT.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(context, x, y, ButtonBinding.EXIT, true, client) + 2;
             if (MidnightControlsCompat.isReiPresent()) {
                 x = 2;
                 y -= 24;
@@ -74,9 +74,8 @@ public abstract class HandledScreenMixin implements HandledScreenAccessor {
                         - client.textRenderer.getWidth(Text.translatable("midnightcontrols.action.quick_move"))
                         - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.TAKE) - MidnightControlsRenderer.getBindingIconWidth(ButtonBinding.QUICK_MOVE);
             }
-            if (!ButtonBinding.TAKE.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.TAKE, true, client);
-            if (!ButtonBinding.QUICK_MOVE.isNotBound()) MidnightControlsRenderer.drawButtonTip(matrices, x, y, ButtonBinding.QUICK_MOVE, true, client);
-            matrices.pop();
+            if (!ButtonBinding.TAKE.isNotBound()) x = MidnightControlsRenderer.drawButtonTip(context, x, y, ButtonBinding.TAKE, true, client);
+            if (!ButtonBinding.QUICK_MOVE.isNotBound()) MidnightControlsRenderer.drawButtonTip(context, x, y, ButtonBinding.QUICK_MOVE, true, client);
         }
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InputUtilMixin.java

@@ -0,0 +1,24 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.minecraft.client.util.InputUtil;
+import org.spongepowered.asm.mixin.Mixin;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(InputUtil.class)
+public abstract class InputUtilMixin {
+
+    /**
+     * @author kabliz
+     * @reason This method is static, and there is a terrible UX issue if raw input is turned on at the same time as
+     * eye tracking. Raw input only tracks literal mice and not other devices, leading to the game appearing to be
+     * unresponsive and the player not understanding why. This overwrite preserves the user's mouse preferences,
+     * while not interfering with eye tracking, and the two modes can be switched between during a play session.
+     */
+    @Inject(method = "isRawMouseMotionSupported", at = @At("HEAD"), cancellable = true)
+    private static void setRawMouseMotionSupported(CallbackInfoReturnable<Boolean> cir) {
+        if (MidnightControlsConfig.eyeTrackerAsMouse) cir.setReturnValue(false);
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingMixin.java

@@ -15,7 +15,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(KeyBinding.class)
-public class KeyBindingMixin implements KeyBindingAccessor {
+public abstract class KeyBindingMixin implements KeyBindingAccessor {
     @Shadow
     private int timesPressed;
 

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java

@@ -1,19 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
-import net.minecraft.client.option.KeyBinding;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-
-@Mixin(value = KeyBindingRegistryImpl.class, remap = false)
-public interface KeyBindingRegistryImplAccessor {
-
-    @Accessor @Final
-    static List<KeyBinding> getMODDED_KEY_BINDINGS() {
-        return null;
-    }
-
-}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyboardMixin.java

@@ -0,0 +1,18 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
+import net.minecraft.client.Keyboard;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(Keyboard.class)
+public class KeyboardMixin {
+    @Redirect(method = "onKey", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
+    private Screen midnightcontrols$ignoreTouchOverlay(MinecraftClient instance) {
+        if (instance.currentScreen instanceof TouchscreenOverlay) return null;
+        return instance.currentScreen;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java

@@ -9,18 +9,15 @@
 
 package eu.midnightdust.midnightcontrols.client.mixin;
 
-import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.MidnightInput;
-import eu.midnightdust.midnightcontrols.client.gui.MidnightControlsRenderer;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.client.render.BufferBuilderStorage;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.world.ClientWorld;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
@@ -31,7 +28,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.Opcodes;
+import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -61,6 +58,8 @@ public abstract class MinecraftClientMixin {
     @Shadow
     private int itemUseCooldown;
 
+    @Shadow public abstract BufferBuilderStorage getBufferBuilders();
+
     private BlockPos midnightcontrols$lastTargetPos;
     private Vec3d midnightcontrols$lastPos;
     private Direction midnightcontrols$lastTargetSide;
@@ -109,13 +108,13 @@ public abstract class MinecraftClientMixin {
 //        }
         this.midnightcontrols$lastPos = this.player.getPos();
     }
-    @Inject(method = "render", at = @At("HEAD"))
-    private void onRender(CallbackInfo ci) {
-        MidnightControlsClient.get().onRender((MinecraftClient) (Object) (this));
-    }
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;render(FJZ)V", shift = At.Shift.AFTER))
-    private void renderVirtualCursor(boolean fullRender, CallbackInfo ci) {
-        MidnightControlsRenderer.renderVirtualCursor(new MatrixStack(), (MinecraftClient) (Object) this);
+
+    @Inject(at = @At("TAIL"), method = "setScreen")
+    private void setScreen(Screen screen, CallbackInfo info) {
+        if (MidnightControlsConfig.hideNormalMouse){
+            if (screen != null) GLFW.glfwSetInputMode(MinecraftClient.getInstance().getWindow().getHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_HIDDEN);
+            else GLFW.glfwSetInputMode(MinecraftClient.getInstance().getWindow().getHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_DISABLED);
+        }
     }
 
     @Inject(method = "doItemUse()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/HitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true)
@@ -151,4 +150,10 @@ public abstract class MinecraftClientMixin {
             }
         }
     }
+    // This is always supposed to be located at before the line 'this.profiler.swap("Keybindings");'
+//    @Redirect(method = "tick", at = @At(value = "FIELD",target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;", ordinal = 6))
+//    private Screen midnightcontrols$ignoreTouchOverlay(MinecraftClient instance) {
+//        if (instance.currentScreen instanceof TouchscreenOverlay) return null;
+//        return instance.currentScreen;
+//    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MouseMixin.java

@@ -15,7 +15,9 @@ import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.util.MouseAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.Mouse;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.GlfwUtil;
+import net.minecraft.client.util.SmoothUtil;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -26,6 +28,10 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import eu.midnightdust.midnightcontrols.client.mouse.EyeTrackerHandler;
+
+import static org.lwjgl.glfw.GLFW.GLFW_CURSOR;
+import static org.lwjgl.glfw.GLFW.GLFW_CURSOR_HIDDEN;
 
 /**
  * Adds extra access to the mouse.
@@ -36,6 +42,37 @@ public abstract class MouseMixin implements MouseAccessor {
     @Final
     private MinecraftClient client;
 
+    @Shadow
+    private double y;
+
+    @Shadow
+    private double cursorDeltaX;
+
+    @Shadow
+    private double cursorDeltaY;
+
+    @Shadow
+    private double x;
+
+    @Shadow
+    private boolean cursorLocked;
+
+    @Shadow
+    private boolean hasResolutionChanged;
+
+    @Shadow
+    private double lastMouseUpdateTime;
+
+    @Shadow
+    @Final
+    private SmoothUtil cursorXSmoother;
+
+    @Shadow
+    @Final
+    private SmoothUtil cursorYSmoother;
+
+    @Shadow private boolean leftButtonClicked;
+
     @Accessor
     public abstract void setLeftButtonClicked(boolean value);
 
@@ -55,7 +92,7 @@ public abstract class MouseMixin implements MouseAccessor {
     private void isCursorLocked(CallbackInfoReturnable<Boolean> ci) {
         if (this.client.currentScreen == null) {
             if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse) {
-                ci.setReturnValue(true);
+                //ci.setReturnValue(true);
                 ci.cancel();
             }
         }
@@ -63,8 +100,42 @@ public abstract class MouseMixin implements MouseAccessor {
 
     @Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
     private void onCursorLocked(CallbackInfo ci) {
-        if (/*config.getControlsMode() == ControlsMode.TOUCHSCREEN
-                ||*/ (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse))
+        if ((MidnightControlsConfig.eyeTrackerAsMouse && client.isWindowFocused() && !this.cursorLocked)
+                || MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN
+                || (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && MidnightControlsConfig.virtualMouse))
             ci.cancel();
     }
+
+    @Inject(method = "updateMouse", at = @At("HEAD"), cancellable = true)
+    private void updateMouse(CallbackInfo ci) {
+        if (MidnightControlsConfig.eyeTrackerAsMouse && cursorLocked && client.isWindowFocused()) {
+            //Eye Tracking is only for the camera controlling cursor, we need the normal cursor everywhere else.
+            if (!client.options.smoothCameraEnabled) {
+                cursorXSmoother.clear();
+                cursorYSmoother.clear();
+            }
+            EyeTrackerHandler.updateMouseWithEyeTracking(x + cursorDeltaX, y + cursorDeltaY, client,
+                    lastMouseUpdateTime, leftButtonClicked, cursorXSmoother, cursorYSmoother);
+            lastMouseUpdateTime = GlfwUtil.getTime();
+            cursorDeltaX = 0.0;
+            cursorDeltaY = 0.0;
+            ci.cancel();
+        }
+    }
+
+    @Inject(method = "lockCursor", at = @At("HEAD"), cancellable = true)
+    private void lockCursor(CallbackInfo ci) {
+        if (MidnightControlsConfig.eyeTrackerAsMouse && client.isWindowFocused() && !this.cursorLocked) {
+            if (!MinecraftClient.IS_SYSTEM_MAC) {
+                KeyBinding.updatePressedStates();
+            }
+            //In eye tracking mode, we cannot have the cursor locked to the center.
+            GLFW.glfwSetInputMode(client.getWindow().getHandle(), GLFW_CURSOR, GLFW_CURSOR_HIDDEN);
+            cursorLocked = true; //The game uses this flag for other gameplay checks
+            client.setScreen(null);
+            hasResolutionChanged = true;
+            ci.cancel();
+        }
+    }
+
 }

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenAccessor.java

@@ -1,17 +0,0 @@
-package eu.midnightdust.midnightcontrols.client.mixin;
-
-import net.minecraft.client.gui.Selectable;
-import net.minecraft.client.gui.screen.Screen;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import java.util.List;
-
-@Mixin(Screen.class)
-public interface ScreenAccessor {
-    @Accessor
-    List<Selectable> getSelectables();
-    @Accessor @Nullable
-    Selectable getSelected();
-}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ScreenMixin.java

@@ -0,0 +1,38 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import dev.lambdaurora.spruceui.Position;
+import eu.midnightdust.midnightcontrols.ControlsMode;
+import eu.midnightdust.midnightcontrols.client.ButtonState;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
+import eu.midnightdust.midnightcontrols.client.controller.InputHandlers;
+import eu.midnightdust.midnightcontrols.client.touch.gui.SilentTexturedButtonWidget;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.Drawable;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.text.Text;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import static eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay.WIDGETS_LOCATION;
+
+@Mixin(Screen.class)
+public abstract class ScreenMixin {
+    @Shadow protected abstract <T extends Element & Drawable & Selectable> T addDrawableChild(T drawableElement);
+
+    @Shadow public int width;
+
+    @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;II)V", at = @At("TAIL"))
+    public void midnightcontrols$addCloseButton(MinecraftClient client, int width, int height, CallbackInfo ci) {
+        if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && (MidnightControlsConfig.closeButtonScreens.stream().anyMatch(s -> this.getClass().getName().startsWith(s) || ((Object)this) instanceof HandledScreen<?>))) {
+            this.addDrawableChild(new SilentTexturedButtonWidget(Position.of(this.width - 30, 10), 20, 20, Text.empty(), btn ->
+                    InputHandlers.handleExit().press(client, ButtonBinding.BACK, 0f, ButtonState.PRESS), 20, 160, 20, WIDGETS_LOCATION));
+        }
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/WorldRendererMixin.java

@@ -10,8 +10,12 @@
 package eu.midnightdust.midnightcontrols.client.mixin;
 
 import eu.midnightdust.lib.util.MidnightColorUtil;
+import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.gui.TouchscreenOverlay;
+import eu.midnightdust.midnightcontrols.client.touch.TouchMode;
+import eu.midnightdust.midnightcontrols.client.util.RainbowColor;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.*;
@@ -21,14 +25,17 @@ import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemUsageContext;
 import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.shape.VoxelShape;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.awt.*;
@@ -54,6 +61,13 @@ public abstract class WorldRendererMixin {
     @Shadow
     private static void drawCuboidShapeOutline(MatrixStack matrices, VertexConsumer vertexConsumer, VoxelShape shape, double offsetX, double offsetY, double offsetZ, float red, float green, float blue, float alpha) {
     }
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/hit/HitResult;getType()Lnet/minecraft/util/hit/HitResult$Type;"))
+    private HitResult.Type dontRenderOutline(HitResult instance) {
+        if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS) {
+            return HitResult.Type.MISS;
+        }
+        return instance.getType();
+    }
 
     @Inject(
             method = "render",
@@ -66,6 +80,31 @@ public abstract class WorldRendererMixin {
     )
     private void onOutlineRender(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer,
                                  LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) {
+        if (MidnightControlsConfig.controlsMode == ControlsMode.TOUCHSCREEN && MidnightControlsConfig.touchMode == TouchMode.FINGER_POS && TouchscreenOverlay.instance != null) {
+            this.renderFingerOutline(matrices, camera);
+        }
+        this.renderReacharoundOutline(matrices, camera);
+    }
+    @Unique
+    private void renderFingerOutline(MatrixStack matrices, Camera camera) {
+        if (TouchscreenOverlay.instance.firstHitResult == null || TouchscreenOverlay.instance.firstHitResult.getType() != HitResult.Type.BLOCK)
+            return;
+        BlockHitResult result = (BlockHitResult) TouchscreenOverlay.instance.firstHitResult;
+        var blockPos = result.getBlockPos();
+        if (this.world.getWorldBorder().contains(blockPos) && this.client.player != null) {
+            var outlineShape = this.world.getBlockState(blockPos).getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
+            Color rgb = MidnightColorUtil.hex2Rgb(MidnightControlsConfig.touchOutlineColorHex);
+            if (MidnightControlsConfig.touchOutlineColorHex.isEmpty()) rgb = RainbowColor.radialRainbow(1,1);
+            var pos = camera.getPos();
+            matrices.push();
+            var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
+            drawCuboidShapeOutline(matrices, vertexConsumer, outlineShape, blockPos.getX() - pos.getX(), blockPos.getY() - pos.getY(), blockPos.getZ() - pos.getZ(),
+                    rgb.getRed() / 255.f, rgb.getGreen() / 255.f, rgb.getBlue() / 255.f, MidnightControlsConfig.touchOutlineColorAlpha / 255.f);
+            matrices.pop();
+        }
+    }
+    @Unique
+    private void renderReacharoundOutline(MatrixStack matrices, Camera camera) {
         if (this.client.crosshairTarget == null || this.client.crosshairTarget.getType() != HitResult.Type.MISS || !MidnightControlsConfig.shouldRenderReacharoundOutline)
             return;
         var result = MidnightControlsClient.get().reacharound.getLastReacharoundResult();
@@ -90,7 +129,7 @@ public abstract class WorldRendererMixin {
 
             var outlineShape = placementState.getOutlineShape(this.client.world, blockPos, ShapeContext.of(camera.getFocusedEntity()));
             Color rgb = MidnightColorUtil.hex2Rgb(MidnightControlsConfig.reacharoundOutlineColorHex);
-            if (MidnightControlsConfig.reacharoundOutlineColorHex.isEmpty()) rgb = MidnightColorUtil.radialRainbow(1,1);
+            if (MidnightControlsConfig.reacharoundOutlineColorHex.isEmpty()) rgb = RainbowColor.radialRainbow(1,1);
             matrices.push();
             var vertexConsumer = this.bufferBuilders.getEntityVertexConsumers().getBuffer(RenderLayer.getLines());
             drawCuboidShapeOutline(matrices, vertexConsumer, outlineShape,

src/main/java/eu/midnightdust/midnightcontrols/client/mouse/EyeTrackerHandler.java

@@ -0,0 +1,76 @@
+package eu.midnightdust.midnightcontrols.client.mouse;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.util.GlfwUtil;
+import net.minecraft.client.util.SmoothUtil;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+
+public class EyeTrackerHandler {
+
+    /**
+     * Based on the updateMouse method in the Mouse.class, this changes the mouse algorithm to suit eye tracking.
+     * This requires the cursor to not be locked, and the raw input setting to be turned off.
+     */
+    public static void updateMouseWithEyeTracking(double mouseX, double mouseY,
+                                                  MinecraftClient client,
+                                                  double lastMouseUpdateTime,
+                                                  boolean holdingLeftMouseButton,
+                                                  SmoothUtil smoothX,
+                                                  SmoothUtil smoothY
+                                             ) {
+        // The player wants objects of interest to be moved under the crosshair that is always center of screen.
+        // Normal mouse controls operate with the delta values from the direction of mouse movement,
+        // but in eye tracking we want to use the cursor's actual x,y values (their point of gaze), relative to
+        // the screen center (where the crosshair is). This new eye tracking delta creates a vector that points
+        // from the crosshair to the gaze point. As the player keeps their eyes on the object of interest, we pull
+        // that object into the center until the object is underneath the crosshair.
+        double timestamp = GlfwUtil.getTime();
+        double deltaTime = timestamp - lastMouseUpdateTime;
+
+        // The center of screen is the new (0,0)
+        double centerX = client.getWindow().getWidth() / 2.0;
+        double centerY = client.getWindow().getHeight() / 2.0;
+        double gazeRawX = mouseX - centerX;
+        double gazeRawY = mouseY - centerY;
+
+        //This part follows the original mouse.java somewhat closely, with different constants
+        double feeling = 2.5;
+        double sensitivity = client.options.getMouseSensitivity().getValue() * feeling;
+        double spyglass = sensitivity * sensitivity * sensitivity;
+        double moveScalar = spyglass * 8.0;
+
+        double frameScalar;
+        if(client.options.getPerspective().isFirstPerson() && client.player.isUsingSpyglass()) {
+            frameScalar = spyglass;
+        } else {
+            frameScalar = moveScalar;
+        }
+        if(holdingLeftMouseButton){
+            frameScalar *= 0.5; //Don't move the camera so much while mining. It's annoying.
+        }
+
+        // The longest vector connects the center to the corner of the screen, so that is our maximum magnitude for
+        // normalization. We use normalized screen size vector for resolution independent control
+        double magnitudeMax = Math.sqrt(centerX*centerX + centerY*centerY);
+        double normalizedX = gazeRawX / magnitudeMax;
+        double normalizedY = gazeRawY / magnitudeMax;
+
+        double moveX = normalizedX * frameScalar;
+        double moveY = normalizedY * frameScalar;
+        if (client.options.smoothCameraEnabled) {
+            moveX = smoothX.smooth(moveX, moveScalar*deltaTime);
+            moveY = smoothY.smooth(moveY, moveScalar*deltaTime);
+        }
+
+        // The player entity's needs their facing rotated.
+        double invertY = 1.0;
+        double moveMagnitude = Math.sqrt(normalizedX*normalizedX + normalizedY*normalizedY);
+        if (client.options.getInvertYMouse().getValue()) {
+            invertY = -1.0;
+        }
+        if (client.player != null && moveMagnitude > MidnightControlsConfig.eyeTrackerDeadzone) {
+            client.player.changeLookDirection(moveX, moveY * invertY);
+            client.getTutorialManager().onUpdateMouse(moveX, moveY);
+        }
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/ring/ButtonBindingRingAction.java

@@ -15,6 +15,7 @@ import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.option.StickyKeyBinding;
@@ -51,10 +52,10 @@ public class ButtonBindingRingAction extends RingAction {
     }
 
     @Override
-    public void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
+    public void drawIcon(@NotNull DrawContext context, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
         List<OrderedText> lines = textRenderer.wrapLines(Text.translatable(this.getName()), MidnightRing.ELEMENT_SIZE);
         for (int i = 0; i < lines.size(); ++i) {
-            drawCenteredTextWithShadow(matrices, textRenderer, lines.get(i), x + MidnightRing.ELEMENT_SIZE / 2, y + MidnightRing.ELEMENT_SIZE / 2 - textRenderer.fontHeight / 2 * (lines.size()-1) - textRenderer.fontHeight / 2 + textRenderer.fontHeight * i, 0xffffff);
+            context.drawCenteredTextWithShadow(textRenderer, lines.get(i), x + MidnightRing.ELEMENT_SIZE / 2, y + MidnightRing.ELEMENT_SIZE / 2 - textRenderer.fontHeight / 2 * (lines.size()-1) - textRenderer.fontHeight / 2 + textRenderer.fontHeight * i, 0xffffff);
         }
     }
 

src/main/java/eu/midnightdust/midnightcontrols/client/ring/RingAction.java

@@ -11,9 +11,8 @@ package eu.midnightdust.midnightcontrols.client.ring;
 
 import com.electronwill.nightconfig.core.Config;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import org.aperlambda.lambdacommon.utils.Nameable;
 import org.jetbrains.annotations.NotNull;
@@ -28,7 +27,7 @@ import java.util.function.Supplier;
  * @version 1.5.0
  * @since 1.4.0
  */
-public abstract class RingAction extends DrawableHelper implements Nameable {
+public abstract class RingAction implements Nameable {
     protected boolean activated = false;
 
     public RingAction() {
@@ -60,12 +59,12 @@ public abstract class RingAction extends DrawableHelper implements Nameable {
 
     public abstract void onAction(@NotNull RingButtonMode mode);
 
-    public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered, int index) {
-        fill(matrices, x, y, x + MidnightRing.ELEMENT_SIZE, y + MidnightRing.ELEMENT_SIZE, hovered || RingPage.selected == index ? 0xbb777777 : 0xbb000000);
-        drawIcon(matrices, textRenderer, x, y, hovered);
+    public void render(@NotNull DrawContext context, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered, int index) {
+        context.fill(x, y, x + MidnightRing.ELEMENT_SIZE, y + MidnightRing.ELEMENT_SIZE, hovered || RingPage.selected == index ? 0xbb777777 : 0xbb000000);
+        drawIcon(context, textRenderer, x, y, hovered);
     }
 
-    public abstract void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered);
+    public abstract void drawIcon(@NotNull DrawContext context, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered);
 
     /**
      * Represents a factory for {@link RingAction}.

src/main/java/eu/midnightdust/midnightcontrols/client/ring/RingPage.java

@@ -9,21 +9,12 @@
 
 package eu.midnightdust.midnightcontrols.client.ring;
 
-import com.electronwill.nightconfig.core.Config;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.gui.screen.ChatScreen;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.util.math.MatrixStack;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
 /**
  * Represents a ring page.
  *
@@ -31,7 +22,7 @@ import java.util.Optional;
  * @version 1.5.0
  * @since 1.4.0
  */
-public class RingPage extends DrawableHelper {
+public class RingPage {
     public static final RingPage DEFAULT = new RingPage("Default");
 
     public final String name;
@@ -48,17 +39,17 @@ public class RingPage extends DrawableHelper {
     /**
      * Renders the ring page.
      *
-     * @param matrices the matrices
+     * @param context the context
      * @param width the screen width
      * @param height the screen height
      * @param mouseX the mouse X-coordinate
      * @param mouseY the mouse Y-coordinate
      * @param tickDelta the tick delta
      */
-    public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int width, int height, int mouseX, int mouseY, float tickDelta) {
+    public void render(@NotNull DrawContext context, @NotNull TextRenderer textRenderer, int width, int height, int mouseX, int mouseY, float tickDelta) {
         int centerX = width / 2;
         int centerY = height / 2;
-        if (MidnightControlsClient.get().ring.getMaxPages() > 1) drawCenteredTextWithShadow(matrices, textRenderer, name, centerX, 5, 0xffffff);
+        if (MidnightControlsClient.get().ring.getMaxPages() > 1) context.drawCenteredTextWithShadow(textRenderer, name, centerX, 5, 0xffffff);
 
         int offset = MidnightRing.ELEMENT_SIZE + (MidnightRing.ELEMENT_SIZE / 2) + 5;
 
@@ -67,7 +58,7 @@ public class RingPage extends DrawableHelper {
         for (int i = 0; i < 3; i++) {
             var ringAction = this.actions[i];
             if (ringAction != null)
-                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
+                ringAction.render(context, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
             x += MidnightRing.ELEMENT_SIZE + 5;
         }
         y += MidnightRing.ELEMENT_SIZE + 5;
@@ -75,7 +66,7 @@ public class RingPage extends DrawableHelper {
         for (int i = 3; i < 5; i++) {
             var ringAction = this.actions[i];
             if (ringAction != null)
-                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
+                ringAction.render(context, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
             x += (MidnightRing.ELEMENT_SIZE + 5) * 2;
         }
         y += MidnightRing.ELEMENT_SIZE + 5;
@@ -83,7 +74,7 @@ public class RingPage extends DrawableHelper {
         for (int i = 5; i < 8; i++) {
             var ringAction = this.actions[i];
             if (ringAction != null)
-                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
+                ringAction.render(context, textRenderer, x, y, isHovered(x, y, mouseX, mouseY), i);
             x += MidnightRing.ELEMENT_SIZE + 5;
         }
     }

src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchMode.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.midnightcontrols.client.touch;
+
+import net.minecraft.text.Text;
+import org.jetbrains.annotations.NotNull;
+
+public enum TouchMode {
+    CROSSHAIR, FINGER_POS;
+    public Text getTranslatedText() {
+        return Text.translatable("midnightcontrols.midnightconfig.enum."+this.getClass().getSimpleName()+"."+this.name());
+    }
+    public @NotNull TouchMode next() {
+        var v = values();
+        if (v.length == this.ordinal() + 1)
+            return v[0];
+        return v[this.ordinal() + 1];
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchUtils.java

@@ -0,0 +1,66 @@
+package eu.midnightdust.midnightcontrols.client.touch;
+
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.Camera;
+import net.minecraft.entity.projectile.ProjectileUtil;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.UseAction;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.RaycastContext;
+import org.joml.Matrix4f;
+import org.joml.Vector3f;
+import org.lwjgl.opengl.GL11;
+
+import static eu.midnightdust.midnightcontrols.client.MidnightReacharound.getPlayerRange;
+
+public class TouchUtils {
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    public static final Matrix4f lastWorldSpaceMatrix = new Matrix4f();
+    public static final Matrix4f lastProjMat = new Matrix4f();
+    public static final Matrix4f lastModMat = new Matrix4f();
+    public static HitResult getTargettedObject(double mouseX, double mouseY) {
+        if (MidnightControlsConfig.touchMode == TouchMode.CROSSHAIR) {
+            return client.crosshairTarget;
+        }
+        Vec3d near = screenSpaceToWorldSpace(mouseX, mouseY, 0);
+        Vec3d far = screenSpaceToWorldSpace(mouseX, mouseY, 1);
+        EntityHitResult entityCast = ProjectileUtil.raycast(client.player, near, far, Box.from(client.player.getPos()).expand(getPlayerRange(client)), entity -> (!entity.isSpectator() && entity.isAttackable()), getPlayerRange(client) * getPlayerRange(client));
+
+        if (entityCast != null && entityCast.getType() == HitResult.Type.ENTITY) return entityCast;
+
+        BlockHitResult result = client.world.raycast(new RaycastContext(near, far, RaycastContext.ShapeType.OUTLINE, RaycastContext.FluidHandling.ANY, client.player));
+
+        if (client.player.getPos().distanceTo(result.getPos()) > getPlayerRange(client)) return null;
+        return result;
+    }
+
+    /* Taken from https://github.com/0x3C50/Renderer/blob/master/src/main/java/me/x150/renderer/util/RendererUtils.java#L270
+     * Credits to 0x3C50 */
+    public static Vec3d screenSpaceToWorldSpace(double x, double y, double d) {
+        Camera camera = client.getEntityRenderDispatcher().camera;
+        int displayHeight = client.getWindow().getScaledHeight();
+        int displayWidth = client.getWindow().getScaledWidth();
+        int[] viewport = new int[4];
+        GL11.glGetIntegerv(GL11.GL_VIEWPORT, viewport);
+        Vector3f target = new Vector3f();
+
+        Matrix4f matrixProj = new Matrix4f(lastProjMat);
+        Matrix4f matrixModel = new Matrix4f(lastModMat);
+
+        matrixProj.mul(matrixModel)
+                .mul(lastWorldSpaceMatrix)
+                .unproject((float) x / displayWidth * viewport[2],
+                        (float) (displayHeight - y) / displayHeight * viewport[3], (float) d, viewport, target);
+
+        return new Vec3d(target.x, target.y, target.z).add(camera.getPos());
+    }
+    public static boolean hasInWorldUseAction(ItemStack stack) {
+        UseAction action = stack.getUseAction();
+        return action == UseAction.BOW || action == UseAction.BRUSH || action == UseAction.SPEAR;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/ItemUseButtonWidget.java

@@ -0,0 +1,43 @@
+package eu.midnightdust.midnightcontrols.client.touch.gui;
+
+import dev.lambdaurora.spruceui.Position;
+import dev.lambdaurora.spruceui.widget.SpruceButtonWidget;
+import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import net.minecraft.item.ArmorItem;
+import net.minecraft.item.PotionItem;
+import net.minecraft.text.Text;
+import net.minecraft.util.UseAction;
+
+public class ItemUseButtonWidget extends SpruceButtonWidget {
+
+    public ItemUseButtonWidget(Position position, int width, int height, Text message, PressAction action) {
+        super(position, width, height, message, action);
+    }
+    @Override
+    protected void onRelease(double mouseX, double mouseY) {
+        assert client.player != null;
+        assert client.interactionManager != null;
+        UseAction action = client.player.getMainHandStack().getUseAction();
+        if (action == UseAction.SPYGLASS || action == UseAction.TOOT_HORN) client.interactionManager.stopUsingItem(client.player);
+        super.onRelease(mouseX, mouseY);
+    }
+
+    @Override
+    public void setVisible(boolean visible) {
+        if (visible && client.player != null && client.player.getMainHandStack() != null) {
+            UseAction action = client.player.getMainHandStack().getUseAction();
+            if (action == UseAction.EAT) {
+                this.setMessage(Text.translatable(MidnightControlsConstants.NAMESPACE+".action.eat"));
+            } else if (action == UseAction.DRINK) {
+                this.setMessage(Text.translatable(MidnightControlsConstants.NAMESPACE+".action.drink"));
+            } else if (client.player.getMainHandStack().getItem() instanceof ArmorItem) {
+                this.setMessage(Text.translatable(MidnightControlsConstants.NAMESPACE+".action.equip"));
+            } else if (!action.equals(UseAction.NONE)) {
+                this.setMessage(Text.translatable(MidnightControlsConstants.NAMESPACE+".action.use"));
+            }
+        }
+        this.setAlpha(MidnightControlsConfig.touchTransparency / 100f);
+        super.setVisible(visible);
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/touch/gui/SilentTexturedButtonWidget.java

@@ -1,4 +1,4 @@
-package eu.midnightdust.midnightcontrols.client.gui.widget;
+package eu.midnightdust.midnightcontrols.client.touch.gui;
 
 import dev.lambdaurora.spruceui.Position;
 import dev.lambdaurora.spruceui.widget.SpruceTexturedButtonWidget;
@@ -23,4 +23,17 @@ public class SilentTexturedButtonWidget extends SpruceTexturedButtonWidget {
     }
     @Override
     public void playDownSound() {}
+    @Override
+    protected void onRelease(double mouseX, double mouseY) {
+        this.setActive(false);
+        super.onClick(mouseX, mouseY);
+        super.onRelease(mouseX, mouseY);
+        this.setActive(true);
+    }
+    @Override
+    public void onClick(double mouseX, double mouseY) {
+        this.setActive(true);
+        super.onClick(mouseX, mouseY);
+        this.setActive(false);
+    }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/util/MathUtil.java

@@ -0,0 +1,23 @@
+package eu.midnightdust.midnightcontrols.client.util;
+
+import net.minecraft.util.math.MathHelper;
+
+public class MathUtil {
+    public static class PolarUtil {
+        public float polarX;
+        public float polarY;
+        public PolarUtil() {}
+
+        public void calculate(float x, float y, float speedFactor) {
+            calculate(x, y, speedFactor, 0);
+        }
+        public void calculate(float x, float y, float speedFactor, double deadZone) {
+            double inputR = Math.pow(x, 2) + Math.pow(y, 2);
+            inputR = (Math.abs(speedFactor * MathHelper.clamp(inputR,0.f,1.f)));
+            inputR = inputR < deadZone ? 0f : (inputR-deadZone) / (1f-deadZone);
+            double inputTheta = Math.atan2(y, x);
+            polarX = (float) (inputR *Math.cos(inputTheta));
+            polarY = (float) (inputR *Math.sin(inputTheta));
+        }
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/util/RainbowColor.java

@@ -0,0 +1,15 @@
+package eu.midnightdust.midnightcontrols.client.util;
+
+import java.awt.*;
+
+public class RainbowColor {
+    public static float hue;
+    public static void tick() {
+        if (hue > 1) hue = 0f;
+        hue = hue + 0.01f;
+    }
+
+    public static Color radialRainbow(float saturation, float brightness) {
+        return Color.getHSBColor(hue, saturation, brightness);
+    }
+}

src/main/resources/assets/midnightcontrols/lang/de_de.json

@@ -84,33 +84,55 @@
   "midnightcontrols.hud_side.left": "Links",
   "midnightcontrols.hud_side.right": "Rechts",
   "midnightcontrols.menu.analog_movement": "Analoge Bewegung",
+  "midnightcontrols.menu.analog_movement.tooltip": "Aktiviert analoge Bewegung, wenn möglich.",
   "midnightcontrols.menu.auto_switch_mode": "Automatischer Wechsel",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Ob der Eingabemodus automatisch auf Controller eingestellt werden soll, wenn einer verbunden wird.",
   "midnightcontrols.menu.controller": "Controller",
   "midnightcontrols.menu.controller2": "Zweiter Controller",
+  "midnightcontrols.menu.controller2.tooltip": "Zweiter Controller, zum Beispiel für Joy-Cons.",
   "midnightcontrols.menu.controller_type": "Controller-Typ",
+  "midnightcontrols.menu.controller_type.tooltip": "Der Controllertyp für den die Knöpfe angezeigt werden sollen.",
   "midnightcontrols.menu.controls_mode": "Modus",
+  "midnightcontrols.menu.controls_mode.tooltip": "Der Steuerungsmodus.",
   "midnightcontrols.menu.double_tap_to_sprint": "Doppel-Tipp zum Sprinten",
   "midnightcontrols.menu.fast_block_placing": "Schnelles Bauen",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Während des Fliegens im Kreativmodus das schnelle Platzieren von Knöpfen aktivieren. §cWird von manchen Servern als cheaten eingestuft.",
   "midnightcontrols.menu.fly_drifting": "Flug-Drifting",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Aktiviert das Flug-Drifting von Vanilla Minecraft.",
   "midnightcontrols.menu.fly_drifting_vertical": "Vertikales Flug-Drifting",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Aktiviert das vertikale Flug-Drifting von Vanilla Minecraft",
   "midnightcontrols.menu.hud_enable": "HUD aktivieren",
+  "midnightcontrols.menu.hud_enable.tooltip": "(De-)Aktiviert die Knopfanzeige im Spiel",
   "midnightcontrols.menu.hud_side": "HUD-Seite",
+  "midnightcontrols.menu.hud_side.tooltip": "Die Position der Knopfanzeige.",
   "midnightcontrols.menu.invert_right_x_axis": "X rechts umkehren",
   "midnightcontrols.menu.invert_right_y_axis": "Y rechts umkehren",
   "midnightcontrols.menu.keyboard_controls": "Tastatureinstellungen...",
   "midnightcontrols.menu.left_dead_zone": "Tote Zone des linken Sticks",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "Die tote Zone für den linken Analogstick.",
   "midnightcontrols.menu.mappings.open_input_str": "Öffne den Controller-Mapping Editor",
   "midnightcontrols.menu.max_left_x_value": "Maximalwert Linke X-Achse",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Ändert den maximalen Wert der linken X-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
   "midnightcontrols.menu.max_left_y_value": "Maximalwert Linke Y-Achse",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Ändert den maximalen Wert der linken Y-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
   "midnightcontrols.menu.max_right_x_value": "Maximalwert Rechte X-Achse",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Ändert den maximalen Wert der rechten X-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
   "midnightcontrols.menu.max_right_y_value": "Maximalwert Rechte Y-Achse",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Ändert den maximalen Wert der rechten Y-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
   "midnightcontrols.menu.mouse_speed": "Mausgeschwindigkeit",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Die emulierte Mausgeschwindigkeit des Controllers.",
   "midnightcontrols.menu.reacharound.horizontal": "Vorderes Blockplatzieren",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Aktiviert vorderes Platzieren von Blöcken, §cwird von manchen Servern als cheaten eingestuft§r.",
   "midnightcontrols.menu.reacharound.vertical": "Vertikales Umgreifen",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Aktiviert vertikales Platzieren von Blöcken, §cwird von manchen Servern als cheaten eingestuft§r.",
   "midnightcontrols.menu.reload_controller_mappings": "Controller-Mappings neuladen",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Lädt die Controller-Mappings neu.",
   "midnightcontrols.menu.right_dead_zone": "Tote Zone des rechten Sticks",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "Die tote Zone für den rechten Analogstick.",
   "midnightcontrols.menu.rotation_speed": "Rotationsgeschwindigkeit (X-Achse)",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (X-Achse)",
   "midnightcontrols.menu.y_axis_rotation_speed": "Rotationsgeschwindigkeit (Y-Achse)",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (Y-Achse)",
   "midnightcontrols.menu.separate_controller_profile": "Separates Controller-Profil",
   "midnightcontrols.menu.separator.controller": "Controller",
   "midnightcontrols.menu.separator.general": "Generell",
@@ -123,34 +145,12 @@
   "midnightcontrols.menu.title.mappings.string": "Mapping-Datei Editor",
   "midnightcontrols.menu.title.visual": "Visuelle Optionen",
   "midnightcontrols.menu.unfocused_input": "Unfokussierte Eingabe",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Erlaube Controllereingabe auch wenn das Fenster nicht fokussiert ist.",
   "midnightcontrols.menu.virtual_mouse": "Virtuelle Maus",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Aktiviere die virtuelle Maus.",
   "midnightcontrols.menu.virtual_mouse.skin": "Aussehen der Virtuellen Maus",
   "midnightcontrols.narrator.unbound": "%s entbunden",
   "midnightcontrols.not_bound": "Nicht zugewiesen",
-  "midnightcontrols.tooltip.analog_movement": "Aktiviert analoge Bewegung, wenn möglich.",
-  "midnightcontrols.tooltip.auto_switch_mode": "Ob der Eingabemodus automatisch auf Controller eingestellt werden soll, wenn einer verbunden wird.",
-  "midnightcontrols.tooltip.controller2": "Zweiter Controller, zum Beispiel für Joy-Cons.",
-  "midnightcontrols.tooltip.controller_type": "Der Controllertyp für den die Knöpfe angezeigt werden sollen.",
-  "midnightcontrols.tooltip.controls_mode": "Der Steuerungsmodus.",
-  "midnightcontrols.tooltip.fast_block_placing": "Während des Fliegens im Kreativmodus das schnelle Platzieren von Knöpfen aktivieren. §cWird von manchen Servern als cheaten eingestuft.",
-  "midnightcontrols.tooltip.fly_drifting": "Aktiviert das Flug-Drifting von Vanilla Minecraft.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Aktiviert das vertikale Flug-Drifting von Vanilla Minecraft",
-  "midnightcontrols.tooltip.hud_enable": "(De-)Aktiviert die Knopfanzeige im Spiel",
-  "midnightcontrols.tooltip.hud_side": "Die Position der Knopfanzeige.",
-  "midnightcontrols.tooltip.left_dead_zone": "Die tote Zone für den linken Analogstick.",
-  "midnightcontrols.tooltip.max_left_x_value": "Ändert den maximalen Wert der linken X-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
-  "midnightcontrols.tooltip.max_left_y_value": "Ändert den maximalen Wert der linken Y-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
-  "midnightcontrols.tooltip.max_right_x_value": "Ändert den maximalen Wert der rechten X-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
-  "midnightcontrols.tooltip.max_right_y_value": "Ändert den maximalen Wert der rechten Y-Achse. Nützlich, wenn deine Achse nicht bis zum Maximum geht.",
-  "midnightcontrols.tooltip.mouse_speed": "Die emulierte Mausgeschwindigkeit des Controllers.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Aktiviert vorderes Platzieren von Blöcken, §cwird von manchen Servern als cheaten eingestuft§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Aktiviert vertikales Platzieren von Blöcken, §cwird von manchen Servern als cheaten eingestuft§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Lädt die Controller-Mappings neu.",
-  "midnightcontrols.tooltip.right_dead_zone": "Die tote Zone für den rechten Analogstick.",
-  "midnightcontrols.tooltip.rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (X-Achse)",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (Y-Achse)",
-  "midnightcontrols.tooltip.unfocused_input": "Erlaube Controllereingabe auch wenn das Fenster nicht fokussiert ist.",
-  "midnightcontrols.tooltip.virtual_mouse": "Aktiviere die virtuelle Maus.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Standard Hell",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Standard Dunkel",
   "midnightcontrols.virtual_mouse.skin.second_light": "Alternativ Hell",

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

@@ -19,6 +19,8 @@
   "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Touchscreen (WIP)",
   "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Left",
   "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Right",
+  "midnightcontrols.midnightconfig.enum.TouchMode.CROSSHAIR": "At Crosshair",
+  "midnightcontrols.midnightconfig.enum.TouchMode.FINGER_POS": "Finger Position",
   "key.midnightcontrols.look_down": "Look down",
   "key.midnightcontrols.look_left": "Look left",
   "key.midnightcontrols.look_right": "Look right",
@@ -30,6 +32,9 @@
   "midnightcontrols.action.controls_ring": "Open Unbound Keybind Ring",
   "midnightcontrols.action.debug_screen": "Open Debug HUD (F3)",
   "midnightcontrols.action.drop_item": "Drop Item",
+  "midnightcontrols.action.drink": "Drink",
+  "midnightcontrols.action.eat": "Eat",
+  "midnightcontrols.action.equip": "Equip",
   "midnightcontrols.action.exit": "Exit Screen",
   "midnightcontrols.action.forward": "Forward",
   "midnightcontrols.action.hit": "Hit",
@@ -125,37 +130,66 @@
   "midnightcontrols.hud_side.left": "Left",
   "midnightcontrols.hud_side.right": "Right",
   "midnightcontrols.menu.analog_movement": "Analog Movement",
+  "midnightcontrols.menu.analog_movement.tooltip": "When possible, enables analog movement.",
   "midnightcontrols.menu.auto_switch_mode": "Auto Switch Mode",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Whether the controls mode should be switched to Controller automatically if one is connected.",
   "midnightcontrols.menu.controller": "Controller",
   "midnightcontrols.menu.controller2": "Second Controller",
+  "midnightcontrols.menu.controller2.tooltip": "Second controller to use, which allows (for example) Joy-Cons support.",
   "midnightcontrols.menu.controller_toggle_sneak": "Toggle Sneak on Controller",
   "midnightcontrols.menu.controller_toggle_sprint": "Toggle Sprint on Controller",
   "midnightcontrols.menu.controller_type": "Controller Type",
+  "midnightcontrols.menu.controller_type.tooltip": "The controller type you're using (needed to display the correct buttons)",
   "midnightcontrols.menu.controls_mode": "Mode",
+  "midnightcontrols.menu.controls_mode.tooltip": "The controls mode.",
   "midnightcontrols.menu.double_tap_to_sprint": "Double-Tap to Sprint",
+  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "Toggles whether the Walk Forwards key makes the player sprint when double-tapped quickly",
   "midnightcontrols.menu.fast_block_placing": "Fast Block Placing",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "While flying in creative mode, enables fast block placing depending on your speed. §cOn some servers this might be considered as cheating.",
   "midnightcontrols.menu.fly_drifting": "Fly Drifting",
+  "midnightcontrols.menu.fly_drifting.tooltip": "While flying, enables Vanilla drifting/inertia.",
   "midnightcontrols.menu.fly_drifting_vertical": "Vertical Fly Drifting",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "While flying, enables Vanilla vertical drifting/intertia.",
   "midnightcontrols.menu.hud_enable": "Enable HUD",
+  "midnightcontrols.menu.hud_enable.tooltip": "Toggles the on-screen controller button indicator.",
   "midnightcontrols.menu.hud_side": "HUD Side",
+  "midnightcontrols.menu.hud_side.tooltip": "The position of the HUD.",
   "midnightcontrols.menu.invert_right_x_axis": "Invert Right X",
   "midnightcontrols.menu.invert_right_y_axis": "Invert Right Y",
   "midnightcontrols.menu.joystick_as_mouse": "Always use left stick as mouse",
+  "midnightcontrols.menu.joystick_as_mouse.tooltip": "Make the joystick behave like a mouse in every menu.",
+  "midnightcontrols.menu.eye_tracker_as_mouse": "Use Eye Tracker as Mouse",
+  "midnightcontrols.menu.eye_tracker_as_mouse.tooltip": "Replace the mouse with an eye tracking device, (for example) the Tobii 5.",
+  "midnightcontrols.menu.eye_tracker_deadzone": "Eye Tracker Deadzone Size",
+  "midnightcontrols.menu.eye_tracker_deadzone.tooltip": "Stops camera movement when looking near the cross hair",
   "midnightcontrols.menu.keyboard_controls": "Keyboard Controls...",
   "midnightcontrols.menu.left_dead_zone": "Left Stick Dead Zone",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "The dead zone for the controller's left analog stick.",
   "midnightcontrols.menu.mappings.open_input_str": "Open Mappings File Editor",
   "midnightcontrols.menu.max_left_x_value": "Left X Axis Max Value",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Changes what the mod considers the highest value for the left X axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.menu.max_left_y_value": "Left Y Axis Max Value",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Changes what the mod considers the highest value for the left Y axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.menu.max_right_x_value": "Right X Axis Max Value",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Changes what the mod considers the highest value for the right X axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.menu.max_right_y_value": "Right Y Axis Max Value",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Changes what the mod considers the highest value for the right Y axis. Useful if your axis does not use the full range and seems slow.",
   "midnightcontrols.menu.mouse_speed": "Mouse Speed",
+  "midnightcontrols.menu.mouse_speed.tooltip": "The controller's emulated mouse speed.",
   "midnightcontrols.menu.move_chat": "Move chat input box to top",
+  "midnightcontrols.menu.move_chat.tooltip": "Moves the chat input field to the top, for better input on devices with on-screen keyboards.",
   "midnightcontrols.menu.reacharound.horizontal": "Front Block Placing",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Enables front block placing, §cmight be considered cheating on some servers§r.",
   "midnightcontrols.menu.reacharound.vertical": "Vertical Reacharound",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Enables vertical reacharound, §cmight be considered cheating on some servers§r.",
   "midnightcontrols.menu.reload_controller_mappings": "Reload Controller Mappings",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Reloads the controller mappings file.",
   "midnightcontrols.menu.right_dead_zone": "Right Stick Dead Zone",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "The dead zone for the controller's right analog stick.",
   "midnightcontrols.menu.rotation_speed": "X Axis Rotation Speed",
+  "midnightcontrols.menu.rotation_speed.tooltip": "The camera's X Axis rotation speed in controller mode.",
   "midnightcontrols.menu.y_axis_rotation_speed": "Y Axis Rotation Speed",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "The camera's Y Axis rotation speed in controller mode.",
   "midnightcontrols.menu.separate_controller_profile": "Separate Controller Profile",
   "midnightcontrols.menu.separator.controller": "Controller",
   "midnightcontrols.menu.separator.general": "General",
@@ -166,39 +200,22 @@
   "midnightcontrols.menu.title.general": "General Options",
   "midnightcontrols.menu.title.hud": "HUD Options",
   "midnightcontrols.menu.title.mappings.string": "Mappings File Editor",
+  "midnightcontrols.menu.title.touch": "Touch Options",
   "midnightcontrols.menu.title.visual": "Appearance Options",
+  "midnightcontrols.menu.touch_break_delay": "Touch Break Delay",
+  "midnightcontrols.menu.touch_speed": "Touch Speed",
+  "midnightcontrols.menu.invert_touch": "Invert Touch Direction",
+  "midnightcontrols.menu.touch_mode": "Touch Interaction Mode",
+  "midnightcontrols.menu.touch_transparency": "Touch HUD Transparency",
   "midnightcontrols.menu.unfocused_input": "Unfocused Input",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Allows controller input when the window is not focused.",
   "midnightcontrols.menu.virtual_mouse": "Virtual Mouse",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Enables the virtual mouse, which is useful during splitscreen.",
   "midnightcontrols.menu.virtual_mouse.skin": "Virtual Mouse Skin",
+  "midnightcontrols.menu.hide_cursor": "Hide Normal Mouse Cursor",
+  "midnightcontrols.menu.hide_cursor.tooltip": "Hides the normal mouse cursor, leaving only the virtual mouse visible.",
   "midnightcontrols.narrator.unbound": "Unbound %s",
   "midnightcontrols.not_bound": "Not bound",
-  "midnightcontrols.tooltip.analog_movement": "When possible, enables analog movement.",
-  "midnightcontrols.tooltip.auto_switch_mode": "Whether the controls mode should be switched to Controller automatically if one is connected.",
-  "midnightcontrols.tooltip.controller2": "Second controller to use, which allows (for example) Joy-Cons support.",
-  "midnightcontrols.tooltip.controller_type": "The controller type you're using (needed to display the correct buttons)",
-  "midnightcontrols.tooltip.controls_mode": "The controls mode.",
-  "midnightcontrols.tooltip.double_tap_to_sprint": "Toggles whether the Walk Forwards key makes the player sprint when double-tapped quickly",
-  "midnightcontrols.tooltip.fast_block_placing": "While flying in creative mode, enables fast block placing depending on your speed. §cOn some servers this might be considered as cheating.",
-  "midnightcontrols.tooltip.fly_drifting": "While flying, enables Vanilla drifting/inertia.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "While flying, enables Vanilla vertical drifting/intertia.",
-  "midnightcontrols.tooltip.hud_enable": "Toggles the on-screen controller button indicator.",
-  "midnightcontrols.tooltip.hud_side": "The position of the HUD.",
-  "midnightcontrols.tooltip.joystick_as_mouse": "Make the joystick behave like a mouse in every menu.",
-  "midnightcontrols.tooltip.left_dead_zone": "The dead zone for the controller's left analog stick.",
-  "midnightcontrols.tooltip.max_left_x_value": "Changes what the mod considers the highest value for the left X axis. Useful if your axis does not use the full range and seems slow.",
-  "midnightcontrols.tooltip.max_left_y_value": "Changes what the mod considers the highest value for the left Y axis. Useful if your axis does not use the full range and seems slow.",
-  "midnightcontrols.tooltip.max_right_x_value": "Changes what the mod considers the highest value for the right X axis. Useful if your axis does not use the full range and seems slow.",
-  "midnightcontrols.tooltip.max_right_y_value": "Changes what the mod considers the highest value for the right Y axis. Useful if your axis does not use the full range and seems slow.",
-  "midnightcontrols.tooltip.mouse_speed": "The controller's emulated mouse speed.",
-  "midnightcontrols.tooltip.move_chat": "Moves the chat input field to the top, for better input on devices with on-screen keyboards.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Enables front block placing, §cmight be considered cheating on some servers§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Enables vertical reacharound, §cmight be considered cheating on some servers§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.",
-  "midnightcontrols.tooltip.right_dead_zone": "The dead zone for the controller's right analog stick.",
-  "midnightcontrols.tooltip.rotation_speed": "The camera's X Axis rotation speed in controller mode.",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "The camera's Y Axis rotation speed in controller mode.",
-  "midnightcontrols.tooltip.unfocused_input": "Allows controller input when the window is not focused.",
-  "midnightcontrols.tooltip.virtual_mouse": "Enables the virtual mouse, which is useful during splitscreen.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Default Light",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Default Dark",
   "midnightcontrols.virtual_mouse.skin.second_light": "Second Light",
@@ -207,6 +224,7 @@
   "midnightcontrols.midnightconfig.category.misc": "Miscellaneous",
   "midnightcontrols.midnightconfig.category.screens": "Screens",
   "midnightcontrols.midnightconfig.category.gameplay": "Gameplay",
+  "midnightcontrols.midnightconfig.category.touch": "Touch",
   "midnightcontrols.midnightconfig.category.visual": "Visual",
   "modmenu.descriptionTranslation.midnightcontrols": "Adds controller support and enhanced controls overall.\nForked from LambdaControls, which sadly got discontinued."
 }

src/main/resources/assets/midnightcontrols/lang/es_mx.json

@@ -80,32 +80,54 @@
   "midnightcontrols.hud_side.left": "izquierda",
   "midnightcontrols.hud_side.right": "derecha",
   "midnightcontrols.menu.analog_movement": "Movimiento analógico",
+  "midnightcontrols.menu.analog_movement.tooltip": "Habilita el movimiento analógico cuando es posible.",
   "midnightcontrols.menu.auto_switch_mode": "Cambio de modo automático",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Si el modo de controles debe cambiarse a Controlador automáticamente si hay uno conectado.",
   "midnightcontrols.menu.controller": "Controlador",
   "midnightcontrols.menu.controller2": "Segundo controlador",
+  "midnightcontrols.menu.controller2.tooltip": "Segundo controlador a uso, que permite el soporte de Joy-Cons por ejemplo.",
   "midnightcontrols.menu.controller_type": "Tipo de controlador",
+  "midnightcontrols.menu.controller_type.tooltip": "El tipo de controlador para mostrar los botones correctos.",
   "midnightcontrols.menu.controls_mode": "Modo",
+  "midnightcontrols.menu.controls_mode.tooltip": "El modo de controles.",
   "midnightcontrols.menu.fast_block_placing": "Colocación rápida de bloques",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Mientras vuela en modo creativo, permite la colocación rápida de bloques dependiendo su velocidad. §cEn algunos servidores, esto podría considerarse como trampa.",
   "midnightcontrols.menu.fly_drifting": "Volar a la deriva",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Mientras vuela, habilita la deriva/inercia de vainilla.",
   "midnightcontrols.menu.fly_drifting_vertical": "Volar a la deriva vertical",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Mientras vuela, habilita la deriva/inercia vertical de vainilla.",
   "midnightcontrols.menu.hud_enable": "Habilitar HUD",
+  "midnightcontrols.menu.hud_enable.tooltip": "Alterna el indicador del botón del controlador en pantalla.",
   "midnightcontrols.menu.hud_side": "Lado de HUD",
+  "midnightcontrols.menu.hud_side.tooltip": "La posición del HUD.",
   "midnightcontrols.menu.invert_right_x_axis": "Invertir derecha X",
   "midnightcontrols.menu.invert_right_y_axis": "Invertir derecha Y",
   "midnightcontrols.menu.keyboard_controls": "Controles del teclado...",
   "midnightcontrols.menu.left_dead_zone": "Zona muerta izquierda",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "La zona muerta de la palanca analógica izquierda del controlador.",
   "midnightcontrols.menu.mappings.open_input_str": "Abrir el editor de archivo de asignaciones",
   "midnightcontrols.menu.max_left_x_value": "Valor máximo del eje X izquierdo",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Cambia lo que el mod considera el valor más alto para el eje X izquierdo. Útil si su eje no usa el rango completo y parece lento.",
   "midnightcontrols.menu.max_left_y_value": "Valor máximo del eje Y izquierdo",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Cambia lo que el mod considera el valor más alto para el eje Y izquierdo. Útil si su eje no usa el rango completo y parece lento.",
   "midnightcontrols.menu.max_right_x_value": "Valor máximo del eje X derecho",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Cambia lo que el mod considera el valor más alto para el eje X derecho. Útil si su eje no usa el rango completo y parece lento.",
   "midnightcontrols.menu.max_right_y_value": "Valor máximo del eje Y derecho",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Cambia lo que el mod considera el valor más alto para el eje Y derecho. Útil si su eje no usa el rango completo y parece lento.",
   "midnightcontrols.menu.mouse_speed": "Velocidad del ratón",
+  "midnightcontrols.menu.mouse_speed.tooltip": "La velocidad del ratón emulada del controlador.",
   "midnightcontrols.menu.reacharound.horizontal": "Colocación de bloque frontal",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Habilita la colocación del bloque frontal, §cpodría considerarse trampa en algunos servidores§r.",
   "midnightcontrols.menu.reacharound.vertical": "Alcance vertical",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Habilita el alcance vertical, §cpodría considerarse trampa en algunos servidores§r.",
   "midnightcontrols.menu.reload_controller_mappings": "Recargar asignaciones de controlador",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Vuelve a cargar el archivo de asignaciones del controlador.",
   "midnightcontrols.menu.right_dead_zone": "Zona muerta derecha",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "La zona muerta de la palanca analógica derecha del controlador.",
   "midnightcontrols.menu.rotation_speed": "Velocidad de rotación (eje X)",
+  "midnightcontrols.menu.rotation_speed.tooltip": "La velocidad de rotación de la cámara en modo controlador. (eje X)",
   "midnightcontrols.menu.y_axis_rotation_speed": "Velocidad de rotación (eje Y)",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "La velocidad de rotación de la cámara en modo controlador. (eje Y)",
   "midnightcontrols.menu.separator.controller": "Controlador",
   "midnightcontrols.menu.separator.general": "General",
   "midnightcontrols.menu.title": "midnightcontrols - Configuraciones",
@@ -117,34 +139,12 @@
   "midnightcontrols.menu.title.mappings.string": "Editor de archivo de asignaciones",
   "midnightcontrols.menu.title.visual": "Opciones de apariencia",
   "midnightcontrols.menu.unfocused_input": "Entrada desenfocada",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Habilita entrada del controlador cuando la ventana no está enfocada.",
   "midnightcontrols.menu.virtual_mouse": "Ratón virtual",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Habilite el ratón virtual que es útil en el caso de una pantalla dividida.",
   "midnightcontrols.menu.virtual_mouse.skin": "Piel de ratón virtual",
   "midnightcontrols.narrator.unbound": "Resetear %s",
   "midnightcontrols.not_bound": "No ligado",
-  "midnightcontrols.tooltip.analog_movement": "Habilita el movimiento analógico cuando es posible.",
-  "midnightcontrols.tooltip.auto_switch_mode": "Si el modo de controles debe cambiarse a Controlador automáticamente si hay uno conectado.",
-  "midnightcontrols.tooltip.controller2": "Segundo controlador a uso, que permite el soporte de Joy-Cons por ejemplo.",
-  "midnightcontrols.tooltip.controller_type": "El tipo de controlador para mostrar los botones correctos.",
-  "midnightcontrols.tooltip.controls_mode": "El modo de controles.",
-  "midnightcontrols.tooltip.fast_block_placing": "Mientras vuela en modo creativo, permite la colocación rápida de bloques dependiendo su velocidad. §cEn algunos servidores, esto podría considerarse como trampa.",
-  "midnightcontrols.tooltip.fly_drifting": "Mientras vuela, habilita la deriva/inercia de vainilla.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Mientras vuela, habilita la deriva/inercia vertical de vainilla.",
-  "midnightcontrols.tooltip.hud_enable": "Alterna el indicador del botón del controlador en pantalla.",
-  "midnightcontrols.tooltip.hud_side": "La posición del HUD.",
-  "midnightcontrols.tooltip.left_dead_zone": "La zona muerta de la palanca analógica izquierda del controlador.",
-  "midnightcontrols.tooltip.max_left_x_value": "Cambia lo que el mod considera el valor más alto para el eje X izquierdo. Útil si su eje no usa el rango completo y parece lento.",
-  "midnightcontrols.tooltip.max_left_y_value": "Cambia lo que el mod considera el valor más alto para el eje Y izquierdo. Útil si su eje no usa el rango completo y parece lento.",
-  "midnightcontrols.tooltip.max_right_x_value": "Cambia lo que el mod considera el valor más alto para el eje X derecho. Útil si su eje no usa el rango completo y parece lento.",
-  "midnightcontrols.tooltip.max_right_y_value": "Cambia lo que el mod considera el valor más alto para el eje Y derecho. Útil si su eje no usa el rango completo y parece lento.",
-  "midnightcontrols.tooltip.mouse_speed": "La velocidad del ratón emulada del controlador.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Habilita la colocación del bloque frontal, §cpodría considerarse trampa en algunos servidores§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Habilita el alcance vertical, §cpodría considerarse trampa en algunos servidores§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Vuelve a cargar el archivo de asignaciones del controlador.",
-  "midnightcontrols.tooltip.right_dead_zone": "La zona muerta de la palanca analógica derecha del controlador.",
-  "midnightcontrols.tooltip.rotation_speed": "La velocidad de rotación de la cámara en modo controlador. (eje X)",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "La velocidad de rotación de la cámara en modo controlador. (eje Y)",
-  "midnightcontrols.tooltip.unfocused_input": "Habilita entrada del controlador cuando la ventana no está enfocada.",
-  "midnightcontrols.tooltip.virtual_mouse": "Habilite el ratón virtual que es útil en el caso de una pantalla dividida.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Ligera por defecto",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Oscura por defecto",
   "midnightcontrols.virtual_mouse.skin.second_light": "Ligera segundario",

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

@@ -121,30 +121,30 @@
   "midnightcontrols.menu.virtual_mouse.skin": "Apparence souris virtuelle",
   "midnightcontrols.narrator.unbound": "Délier %s",
   "midnightcontrols.not_bound": "Non défini",
-  "midnightcontrols.tooltip.analog_movement": "Active le mouvement analogique si possible.",
-  "midnightcontrols.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.",
-  "midnightcontrols.tooltip.controller2": "Défini une deuxième manette, utile dans le cas d'utilisation de Joy-Cons.",
-  "midnightcontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
-  "midnightcontrols.tooltip.controls_mode": "Change le mode de contrôle.",
-  "midnightcontrols.tooltip.fast_block_placing": "Active le placement rapide de blocs en vol.",
-  "midnightcontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement Vanilla.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
-  "midnightcontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
-  "midnightcontrols.tooltip.hud_side": "Change la position du HUD.",
-  "midnightcontrols.tooltip.left_dead_zone": "Zone morte de l'axe gauche de la manette.",
-  "midnightcontrols.tooltip.max_left_x_value": "Change ce que le mod considère comme valeur maximale pour l'axe X gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.max_left_y_value": "Change ce que le mod considère comme valeur maximale pour l'axe Y gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.max_right_x_value": "Change ce que le mod considère comme valeur maximale pour l'axe X droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.max_right_y_value": "Change ce que le mod considère comme valeur maximale pour l'axe Y droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Active le placement avant de blocs, §cpeut être considérer comme de la triche sur certains serveurs§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
-  "midnightcontrols.tooltip.right_dead_zone": "Zone morte de l'axe droit de la manette.",
-  "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra. (X)",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "Change la vitesse de rotation de la caméra. (Y)",
-  "midnightcontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
-  "midnightcontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
+  "midnightcontrols.menu.analog_movement.tooltip": "Active le mouvement analogique si possible.",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
+  "midnightcontrols.menu.controller2.tooltip": "Défini une deuxième manette, utile dans le cas d'utilisation de Joy-Cons.",
+  "midnightcontrols.menu.controller_type.tooltip": "Le type de contrôle n'influe que sur les boutons affichés.",
+  "midnightcontrols.menu.controls_mode.tooltip": "Change le mode de contrôle.",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Active le placement rapide de blocs en vol.",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Pendant que le joueur vole, active le glissement Vanilla.",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
+  "midnightcontrols.menu.hud_enable.tooltip": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
+  "midnightcontrols.menu.hud_side.tooltip": "Change la position du HUD.",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "Zone morte de l'axe gauche de la manette.",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe X gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe Y gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe X droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe Y droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Change la vitesse de la souris émulée par la manette.",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Active le placement avant de blocs, §cpeut être considérer comme de la triche sur certains serveurs§r.",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Recharge le fichier de configuration des manettes.",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "Zone morte de l'axe droit de la manette.",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Change la vitesse de rotation de la caméra. (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Change la vitesse de rotation de la caméra. (Y)",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
   "midnightcontrols.virtual_mouse.skin.default_light": "défaut clair",
   "midnightcontrols.virtual_mouse.skin.default_dark": "défaut foncé",
   "midnightcontrols.virtual_mouse.skin.second_light": "second clair",

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

@@ -121,30 +121,30 @@
   "midnightcontrols.menu.virtual_mouse.skin": "Apparence souris virtuelle",
   "midnightcontrols.narrator.unbound": "Délier %s",
   "midnightcontrols.not_bound": "Non défini",
-  "midnightcontrols.tooltip.analog_movement": "Active le mouvement analogique si possible.",
-  "midnightcontrols.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.",
-  "midnightcontrols.tooltip.controller2": "Défini une deuxième manette, utile dans le cas d'utilisation de Joy-Cons.",
-  "midnightcontrols.tooltip.controller_type": "Le type de contrôle n'influe que sur les boutons affichés.",
-  "midnightcontrols.tooltip.controls_mode": "Change le mode de contrôle.",
-  "midnightcontrols.tooltip.fast_block_placing": "Active le placement rapide de blocs en vol.",
-  "midnightcontrols.tooltip.fly_drifting": "Pendant que le joueur vole, active le glissement Vanilla.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
-  "midnightcontrols.tooltip.hud_enable": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
-  "midnightcontrols.tooltip.hud_side": "Change la position du HUD.",
-  "midnightcontrols.tooltip.left_dead_zone": "Zone morte de l'axe gauche de la manette.",
-  "midnightcontrols.tooltip.max_left_x_value": "Change ce que le mod considère comme valeur maximale pour l'axe X gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.max_left_y_value": "Change ce que le mod considère comme valeur maximale pour l'axe Y gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.max_right_x_value": "Change ce que le mod considère comme valeur maximale pour l'axe X droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.max_right_y_value": "Change ce que le mod considère comme valeur maximale pour l'axe Y droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
-  "midnightcontrols.tooltip.mouse_speed": "Change la vitesse de la souris émulée par la manette.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Active le placement avant de blocs, §cpeut être considérer comme de la triche sur certains serveurs§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.",
-  "midnightcontrols.tooltip.right_dead_zone": "Zone morte de l'axe droit de la manette.",
-  "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra. (X)",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "Change la vitesse de rotation de la caméra. (Y)",
-  "midnightcontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
-  "midnightcontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
+  "midnightcontrols.menu.analog_movement.tooltip": "Active le mouvement analogique si possible.",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Détermine si le mode de contrôle doit automatiquement changer sur Manette si une manette est connectée et inversement.",
+  "midnightcontrols.menu.controller2.tooltip": "Défini une deuxième manette, utile dans le cas d'utilisation de Joy-Cons.",
+  "midnightcontrols.menu.controller_type.tooltip": "Le type de contrôle n'influe que sur les boutons affichés.",
+  "midnightcontrols.menu.controls_mode.tooltip": "Change le mode de contrôle.",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Active le placement rapide de blocs en vol.",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Pendant que le joueur vole, active le glissement Vanilla.",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Pendant que le joueur vole, active le glissement vertical Vanilla.",
+  "midnightcontrols.menu.hud_enable.tooltip": "Détermine si l'indicateur des buttons de la manette doit être affiché ou non.",
+  "midnightcontrols.menu.hud_side.tooltip": "Change la position du HUD.",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "Zone morte de l'axe gauche de la manette.",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe X gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe Y gauche. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe X droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Change ce que le mod considère comme valeur maximale pour l'axe Y droit. Utile si votre axe n'utilise pas l'entièreté de l'ensemble des valeurs et paraît lent.",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Change la vitesse de la souris émulée par la manette.",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Active le placement avant de blocs, §cpeut être considérer comme de la triche sur certains serveurs§r.",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Recharge le fichier de configuration des manettes.",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "Zone morte de l'axe droit de la manette.",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Change la vitesse de rotation de la caméra. (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Change la vitesse de rotation de la caméra. (Y)",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.",
   "midnightcontrols.virtual_mouse.skin.default_light": "défaut clair",
   "midnightcontrols.virtual_mouse.skin.default_dark": "défaut foncé",
   "midnightcontrols.virtual_mouse.skin.second_light": "second clair",

src/main/resources/assets/midnightcontrols/lang/it_it.json

@@ -170,31 +170,31 @@
 	"midnightcontrols.menu.virtual_mouse.skin": "Aspetto Mouse Virtuale",
 	"midnightcontrols.narrator.unbound": "Disimpostato %s",
 	"midnightcontrols.not_bound": "Non Impostato",
-	"midnightcontrols.tooltip.analog_movement": "Quando possibile, attiva movimento analogo.",
-	"midnightcontrols.tooltip.auto_switch_mode": "Quando la modalità controlli dovrebbe passare a Controller automaticamente se uno è connesso",
-	"midnightcontrols.tooltip.controller2": "Secondo controller da usare, che permette (per esempio) Supporto dei Joy-Cons.",
-	"midnightcontrols.tooltip.controller_type": "Il tipo di controller che stai usando (usato per mostrare i pulsanti corretti)",
-	"midnightcontrols.tooltip.controls_mode": "Modalita controlli.",
-	"midnightcontrols.tooltip.double_tap_to_sprint": "Attiva quando il tasto \"Cammina Avanti\" fa correre il giocatore con doppio tap velocemente",
-	"midnightcontrols.tooltip.fast_block_placing": "Quando si vola in creativa, attiva il movimento veloce dei blocchi in base alla tua velocità. §cSu alcuni server potrebbe essere considerato un cheat.§r",
-	"midnightcontrols.tooltip.fly_drifting": "Quando si vola, attiva L'inerzia del Vanilla",
-	"midnightcontrols.tooltip.fly_drifting_vertical": "Quando si vola, attiva l'inerzia verticale Vanilla",
-	"midnightcontrols.tooltip.hud_enable": "Attiva gli indicatori dei pulsanti dei controller sullo schermo.",
-	"midnightcontrols.tooltip.hud_side": "La posizione della HUD",
-	"midnightcontrols.tooltip.left_dead_zone": "La zona morta per lo stick sinistro del controller.",
-	"midnightcontrols.tooltip.max_left_x_value": "Cambia cosa la mod considera il più alto valore per l'asse X sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
-	"midnightcontrols.tooltip.max_left_y_value": "Cambia cosa la mod considera il più alto valore per l'asse Y sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
-	"midnightcontrols.tooltip.max_right_x_value": "Cambia cosa la mod considera il più alto valore per l'asse X Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
-	"midnightcontrols.tooltip.max_right_y_value": "Cambia cosa la mod considera il più alto valore per l'asse Y Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
-	"midnightcontrols.tooltip.mouse_speed": "La velocità del controller emulato.",
-	"midnightcontrols.tooltip.reacharound.horizontal": "Attiva il piazzare blocchi davanti, Potrebbe essere considerato un cheat su alcuni server.",
-	"midnightcontrols.tooltip.reacharound.vertical": "Attiva il reach verticale, potrebbe essere considerato cheating su alcuni server",
-	"midnightcontrols.tooltip.reload_controller_mappings": "Riavvia il file dlle mappature del controller",
-	"midnightcontrols.tooltip.right_dead_zone": "La zona morta per lo stick destro del controller",
-	"midnightcontrols.tooltip.rotation_speed": "L'asse X della velocità di rotazione della camera im modalità controller",
-	"midnightcontrols.tooltip.y_axis_rotation_speed": "L'asse Y della velocità di rotazione della camera im modalità controller",
-	"midnightcontrols.tooltip.unfocused_input": "Permette imput dei controller quando la finestra non è messa a fuoco",
-	"midnightcontrols.tooltip.virtual_mouse": "Attiva il mouse virtuale, che può essere utile nello schermo diviso.",
+	"midnightcontrols.menu.analog_movement.tooltip": "Quando possibile, attiva movimento analogo.",
+	"midnightcontrols.menu.auto_switch_mode.tooltip": "Quando la modalità controlli dovrebbe passare a Controller automaticamente se uno è connesso",
+	"midnightcontrols.menu.controller2.tooltip": "Secondo controller da usare, che permette (per esempio) Supporto dei Joy-Cons.",
+	"midnightcontrols.menu.controller_type.tooltip": "Il tipo di controller che stai usando (usato per mostrare i pulsanti corretti)",
+	"midnightcontrols.menu.controls_mode.tooltip": "Modalita controlli.",
+	"midnightcontrols.menu.double_tap_to_sprint.tooltip": "Attiva quando il tasto \"Cammina Avanti\" fa correre il giocatore con doppio tap velocemente",
+	"midnightcontrols.menu.fast_block_placing.tooltip": "Quando si vola in creativa, attiva il movimento veloce dei blocchi in base alla tua velocità. §cSu alcuni server potrebbe essere considerato un cheat.§r",
+	"midnightcontrols.menu.fly_drifting.tooltip": "Quando si vola, attiva L'inerzia del Vanilla",
+	"midnightcontrols.menu.fly_drifting_vertical.tooltip": "Quando si vola, attiva l'inerzia verticale Vanilla",
+	"midnightcontrols.menu.hud_enable.tooltip": "Attiva gli indicatori dei pulsanti dei controller sullo schermo.",
+	"midnightcontrols.menu.hud_side.tooltip": "La posizione della HUD",
+	"midnightcontrols.menu.left_dead_zone.tooltip": "La zona morta per lo stick sinistro del controller.",
+	"midnightcontrols.menu.max_left_x_value.tooltip": "Cambia cosa la mod considera il più alto valore per l'asse X sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
+	"midnightcontrols.menu.max_left_y_value.tooltip": "Cambia cosa la mod considera il più alto valore per l'asse Y sinistro. Utile se il tuo asse non usa il range massimo e sembra lento",
+	"midnightcontrols.menu.max_right_x_value.tooltip": "Cambia cosa la mod considera il più alto valore per l'asse X Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
+	"midnightcontrols.menu.max_right_y_value.tooltip": "Cambia cosa la mod considera il più alto valore per l'asse Y Destro. Utile se il tuo asse non usa il range massimo e sembra lento.",
+	"midnightcontrols.menu.mouse_speed.tooltip": "La velocità del controller emulato.",
+	"midnightcontrols.menu.reacharound.horizontal.tooltip": "Attiva il piazzare blocchi davanti, Potrebbe essere considerato un cheat su alcuni server.",
+	"midnightcontrols.menu.reacharound.vertical.tooltip": "Attiva il reach verticale, potrebbe essere considerato cheating su alcuni server",
+	"midnightcontrols.menu.reload_controller_mappings.tooltip": "Riavvia il file dlle mappature del controller",
+	"midnightcontrols.menu.right_dead_zone.tooltip": "La zona morta per lo stick destro del controller",
+	"midnightcontrols.menu.rotation_speed.tooltip": "L'asse X della velocità di rotazione della camera im modalità controller",
+	"midnightcontrols.menu.y_axis_rotation_speed.tooltip": "L'asse Y della velocità di rotazione della camera im modalità controller",
+	"midnightcontrols.menu.unfocused_input.tooltip": "Permette imput dei controller quando la finestra non è messa a fuoco",
+	"midnightcontrols.menu.virtual_mouse.tooltip": "Attiva il mouse virtuale, che può essere utile nello schermo diviso.",
 	"midnightcontrols.virtual_mouse.skin.default_light": "Chiaro Default",
 	"midnightcontrols.virtual_mouse.skin.default_dark": "Scuro Default",
 	"midnightcontrols.virtual_mouse.skin.second_light": "Chiaro Secondario",

src/main/resources/assets/midnightcontrols/lang/ko_kr.json

@@ -1,5 +1,24 @@
 {
   "midnightcontrols.midnightconfig.title": "MidnightControls 고급 설정",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "기본 밝게",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "기본 어둡게",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "두 번째 밝게",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "두 번째 어둡게",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "기본값값",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "듀얼쇼크",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "듀얼센스",
+  "midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Switch/Wii 컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "엑스박스 원/시리즈 컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "엑스박스 360 컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "스팀 컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "스팀 덱",
+  "midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "OUYA 컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "숫자 컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "키보드/마우스",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "컨트롤러",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "터치스크린 (미완성)",
+  "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "왼쪽",
+  "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "오른쪽",
   "key.midnightcontrols.look_down": "아래쪽 보기",
   "key.midnightcontrols.look_left": "왼쪽 보기",
   "key.midnightcontrols.look_right": "오른쪽 보기",
@@ -8,6 +27,7 @@
   "midnightcontrols.action.attack": "공격",
   "midnightcontrols.action.back": "뒤로",
   "midnightcontrols.action.chat": "채팅 열기",
+  "midnightcontrols.action.debug_screen": "디버그 HUD 열기 (F3)",
   "midnightcontrols.action.drop_item": "아이템 버리기",
   "midnightcontrols.action.exit": "종료",
   "midnightcontrols.action.forward": "앞으로",
@@ -127,32 +147,32 @@
   "midnightcontrols.menu.virtual_mouse.skin": "가상 마우스 스킨",
   "midnightcontrols.narrator.unbound": "%s 해제됨",
   "midnightcontrols.not_bound": "바인딩되지 않음",
-  "midnightcontrols.tooltip.analog_movement": "가능한 경우 아날로그 움직임을 사용합니다.",
-  "midnightcontrols.tooltip.auto_switch_mode": "컨트롤러가 연결되면 자동으로 컨트롤 모드가 컨트롤러로 전환됩니다.",
-  "midnightcontrols.tooltip.controller2": "보조 컨트롤러를 사용하려면 Joy-Cons 지원을 허용하세요.",
-  "midnightcontrols.tooltip.controller_type": "올바른 버튼을 표시할 컨트롤러 종류입니다.",
-  "midnightcontrols.tooltip.controls_mode": "컨트롤 모드.",
-  "midnightcontrols.tooltip.fast_block_placing": "크리에이티브 모드에서 비행하는 동안 사용자 속도에 따른 빠른 블록 배치를 사용합니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다.",
-  "midnightcontrols.tooltip.fly_drifting": "비행하는 동안 바닐라처럼 관성을 적용합니다.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "비행하는 동안 바닐라처럼 수직 관성을 적용합니다.",
-  "midnightcontrols.tooltip.hud_enable": "화면 컨트롤러 버튼 표시기 토글",
-  "midnightcontrols.tooltip.hud_side": "HUD 위치.",
-  "midnightcontrols.tooltip.left_dead_zone": "컨트롤러 왼쪽 아날로그 스틱 데드 존.",
-  "midnightcontrols.tooltip.max_left_x_value": "모드가 인식하는 왼쪽 X 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
-  "midnightcontrols.tooltip.max_left_y_value": "모드가 인식하는 왼쪽 Y 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
-  "midnightcontrols.tooltip.max_right_x_value": "모드가 인식하는 오른쪽 X 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
-  "midnightcontrols.tooltip.max_right_y_value": "모드가 인식하는 오른쪽 Y 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
-  "midnightcontrols.tooltip.mouse_speed": "컨트롤러의 에뮬레이트된 마우스 속도.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "블록 전면 배치를 사용합니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "블록 수직 배치를 사용합니다. 블록 아래에 다른 블록을 배치할 수 있습니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "컨트롤러 매핑 파일을 다시 불러옵니다.",
-  "midnightcontrols.tooltip.right_dead_zone": "컨트롤러 오른쪽 아날로그 스틱 데드 존",
-  "midnightcontrols.tooltip.rotation_speed": "컨트롤러 모드에서 적용되는 카메라 회전 속도.",
-  "midnightcontrols.tooltip.unfocused_input": "창이 활성화된 상태가 아니여도 컨트롤러 입력 허용.",
-  "midnightcontrols.tooltip.virtual_mouse": "분할 화면에선 도움 되는 가상 마우스를 사용합니다.",
-  "midnightcontrols.virtual_mouse.skin.default_light": "기본 라이트",
-  "midnightcontrols.virtual_mouse.skin.default_dark": "기본 다크",
-  "midnightcontrols.virtual_mouse.skin.second_light": "두 번째 라이트",
-  "midnightcontrols.virtual_mouse.skin.second_dark": "두 번째 다크",
+  "midnightcontrols.menu.analog_movement.tooltip": "가능한 경우 아날로그 움직임을 사용합니다.",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "컨트롤러가 연결되면 자동으로 컨트롤 모드가 컨트롤러로 전환됩니다.",
+  "midnightcontrols.menu.controller2.tooltip": "보조 컨트롤러를 사용하려면 Joy-Cons 지원을 허용하세요.",
+  "midnightcontrols.menu.controller_type.tooltip": "올바른 버튼을 표시할 컨트롤러 종류입니다.",
+  "midnightcontrols.menu.controls_mode.tooltip": "컨트롤 모드.",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "크리에이티브 모드에서 비행하는 동안 사용자 속도에 따른 빠른 블록 배치를 사용합니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다.",
+  "midnightcontrols.menu.fly_drifting.tooltip": "비행하는 동안 바닐라처럼 관성을 적용합니다.",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "비행하는 동안 바닐라처럼 수직 관성을 적용합니다.",
+  "midnightcontrols.menu.hud_enable.tooltip": "화면 컨트롤러 버튼 표시기 토글",
+  "midnightcontrols.menu.hud_side.tooltip": "HUD 위치.",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "컨트롤러 왼쪽 아날로그 스틱 데드 존.",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "모드가 인식하는 왼쪽 X 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "모드가 인식하는 왼쪽 Y 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "모드가 인식하는 오른쪽 X 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "모드가 인식하는 오른쪽 Y 축 최댓값을 변경합니다. 사용자의 축이 전체 범위를 사용하지 않고 느리게 보일 경우 유용합니다.",
+  "midnightcontrols.menu.mouse_speed.tooltip": "컨트롤러의 에뮬레이트된 마우스 속도.",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "블록 전면 배치를 사용합니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다§r.",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "블록 수직 배치를 사용합니다. 블록 아래에 다른 블록을 배치할 수 있습니다. §c일부 서버에선 치팅 행위로 취급될 수 있습니다§r.",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "컨트롤러 매핑 파일을 다시 불러옵니다.",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "컨트롤러 오른쪽 아날로그 스틱 데드 존",
+  "midnightcontrols.menu.rotation_speed.tooltip": "컨트롤러 모드에서 적용되는 카메라 회전 속도.",
+  "midnightcontrols.menu.unfocused_input.tooltip": "창이 활성화된 상태가 아니여도 컨트롤러 입력 허용.",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "분할 화면에선 도움 되는 가상 마우스를 사용합니다.",
+  "midnightcontrols.virtual_mouse.skin.default_light": "기본 밝게",
+  "midnightcontrols.virtual_mouse.skin.default_dark": "기본 어둡게",
+  "midnightcontrols.virtual_mouse.skin.second_light": "두 번째 밝게",
+  "midnightcontrols.virtual_mouse.skin.second_dark": "두 번째 어둡게",
   "modmenu.descriptionTranslation.midnightcontrols": "컨트롤러 제어 및 전반적인 향상된 제어 기능을 추가합니다.\n안타깝게도 업데이트가 끊긴 LambdaControls의 Fork 버전입니다."
-}
+}

src/main/resources/assets/midnightcontrols/lang/ru_ru.json

@@ -144,31 +144,31 @@
   "midnightcontrols.menu.virtual_mouse.skin": "Дизайн Виртуальной Мышки",
   "midnightcontrols.narrator.unbound": "Освобождённый %s",
   "midnightcontrols.not_bound": "Не Назначанно",
-  "midnightcontrols.tooltip.analog_movement": "Включает аналоговое движение, когда это возможно.",
-  "midnightcontrols.tooltip.auto_switch_mode": "Автоматическое переключение на новый, только подключенный контроллер.",
-  "midnightcontrols.tooltip.controller2": "Дополнительный контроллер, например для Джой-конов.",
-  "midnightcontrols.tooltip.controller_type": "Тип контроллера, чтобы правильно сопоставить иконки кнопок.",
-  "midnightcontrols.tooltip.controls_mode": "Тип контроля над игрой.",
-  "midnightcontrols.tooltip.double_tap_to_sprint": "При двойном перемещением на левый стик, персонаж начинает бежать.",
-  "midnightcontrols.tooltip.fast_block_placing": "Во время полета в творческом режиме позволяет быстро размещать блоки в зависимости от вашей скорости. §cНа некоторых серверах это может расцениваться как читерство.§r",
-  "midnightcontrols.tooltip.fly_drifting": "Во время полета включает ванильную инерцию.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Во время полета включает ванильную вертикальную инерцию.",
-  "midnightcontrols.tooltip.hud_enable": "Переключает видение иконок кнопок контроллера на экране.",
-  "midnightcontrols.tooltip.hud_side": "Расположение интерфейса в определённую сторону.",
-  "midnightcontrols.tooltip.left_dead_zone": "Мертвая зона для левого аналогового стика контроллера.",
-  "midnightcontrols.tooltip.max_left_x_value": "Изменяет то, что мод в итоге считает максимальным значением для левой оси X. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
-  "midnightcontrols.tooltip.max_left_y_value": "Изменяет то, что мод в итоге считает максимальным значением для левой оси Y. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
-  "midnightcontrols.tooltip.max_right_x_value": "Изменяет то, что мод в итоге считает максимальным значением для правой оси X. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
-  "midnightcontrols.tooltip.max_right_y_value": "Изменяет то, что мод в итоге считает максимальным значением для правой оси Y. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
-  "midnightcontrols.tooltip.mouse_speed": "Скорость мыши, эмулируемая контроллером.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Позволяет размещать передний блок перед собой. §cМожет рассматриваться как читерство на некоторых серверах§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Обеспечивает вертикальный охват. §cМожет рассматриваться как мошенничество на некоторых серверах§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Перезагружает файл раскладки контроллеров.",
-  "midnightcontrols.tooltip.right_dead_zone": "Мертвая зона для правого аналогового стика контроллера.",
-  "midnightcontrols.tooltip.rotation_speed": "Скорость вращения камеры по оси X в режиме контроллера.",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "Скорость вращения камеры по оси Y в режиме контроллера.",
-  "midnightcontrols.tooltip.unfocused_input": "Разрешить ввод с контроллера, даже если игра на сфокусирована.",
-  "midnightcontrols.tooltip.virtual_mouse": "Включить виртуальную мышь, очень полезно при игре двоём на одном компьютере.",
+  "midnightcontrols.menu.analog_movement.tooltip": "Включает аналоговое движение, когда это возможно.",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Автоматическое переключение на новый, только подключенный контроллер.",
+  "midnightcontrols.menu.controller2.tooltip": "Дополнительный контроллер, например для Джой-конов.",
+  "midnightcontrols.menu.controller_type.tooltip": "Тип контроллера, чтобы правильно сопоставить иконки кнопок.",
+  "midnightcontrols.menu.controls_mode.tooltip": "Тип контроля над игрой.",
+  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "При двойном перемещением на левый стик, персонаж начинает бежать.",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Во время полета в творческом режиме позволяет быстро размещать блоки в зависимости от вашей скорости. §cНа некоторых серверах это может расцениваться как читерство.§r",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Во время полета включает ванильную инерцию.",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Во время полета включает ванильную вертикальную инерцию.",
+  "midnightcontrols.menu.hud_enable.tooltip": "Переключает видение иконок кнопок контроллера на экране.",
+  "midnightcontrols.menu.hud_side.tooltip": "Расположение интерфейса в определённую сторону.",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "Мертвая зона для левого аналогового стика контроллера.",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Изменяет то, что мод в итоге считает максимальным значением для левой оси X. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Изменяет то, что мод в итоге считает максимальным значением для левой оси Y. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Изменяет то, что мод в итоге считает максимальным значением для правой оси X. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Изменяет то, что мод в итоге считает максимальным значением для правой оси Y. Полезно, если ваша ось не использует весь диапазон и кажется медленной.",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Скорость мыши, эмулируемая контроллером.",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Позволяет размещать передний блок перед собой. §cМожет рассматриваться как читерство на некоторых серверах§r.",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Обеспечивает вертикальный охват. §cМожет рассматриваться как мошенничество на некоторых серверах§r.",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Перезагружает файл раскладки контроллеров.",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "Мертвая зона для правого аналогового стика контроллера.",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Скорость вращения камеры по оси X в режиме контроллера.",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Скорость вращения камеры по оси Y в режиме контроллера.",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Разрешить ввод с контроллера, даже если игра на сфокусирована.",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Включить виртуальную мышь, очень полезно при игре двоём на одном компьютере.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Обычный Светлый",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Обычный Тёмный",
   "midnightcontrols.virtual_mouse.skin.second_light": "Дополнительный Светлый",

src/main/resources/assets/midnightcontrols/lang/tr_tr.json

@@ -112,23 +112,23 @@
   "midnightcontrols.menu.virtual_mouse.skin": "Sanal Fare Görünümü",
   "midnightcontrols.narrator.unbound": "%s Atanmamış",
   "midnightcontrols.not_bound": "Tuş ataması yok",
-  "midnightcontrols.tooltip.auto_switch_mode": "Eğer bir tanesi bağlandıysa, kontrol modu Oyun Kolu olarak değişmeli.",
-  "midnightcontrols.tooltip.controller2": "Kullanılacak ikinci oyun kolu, örnek olarak Joy-Con desteği de mümkün.",
-  "midnightcontrols.tooltip.controller_type": "Doğru tuşları göstermesi için oyun kolu türü.",
-  "midnightcontrols.tooltip.controls_mode": "Kontrol Modu",
-  "midnightcontrols.tooltip.fast_block_placing": "Yaratıcı modda uçarken, hızına bağlı olarak hızlı blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.",
-  "midnightcontrols.tooltip.fly_drifting": "Uçarken, Vanilla'daki gibi ani duruşlarda kayma efektini etkinleştirir.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Yukarı/aşağı uçarken, Vanilla'daki gibi ani duruşlarda kayma efektini etkinleştirir.",
-  "midnightcontrols.tooltip.hud_enable": "Ekranın üstünde oyun kolu tuşu göstergesini açar/kapatır.",
-  "midnightcontrols.tooltip.hud_side": "HUD'un konumu",
-  "midnightcontrols.tooltip.mouse_speed": "Oyun kolunun taklit edilen fare hızı.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Hızlı blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "En alta blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Oyun kolu için eşleştirme dosyasını yeniler.",
-  "midnightcontrols.tooltip.rotation_speed": "Oyun kolu modunda olan kamera dönme hızı (X)",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "Oyun kolu modunda olan kamera dönme hızı (Y)",
-  "midnightcontrols.tooltip.unfocused_input": "Oyun penceresinde değilken oyun kolu girişine izine verir.",
-  "midnightcontrols.tooltip.virtual_mouse": "Sanal fareyi etkinleştirir. Çift ekran oynanılacağı zaman işe yarar.",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Eğer bir tanesi bağlandıysa, kontrol modu Oyun Kolu olarak değişmeli.",
+  "midnightcontrols.menu.controller2.tooltip": "Kullanılacak ikinci oyun kolu, örnek olarak Joy-Con desteği de mümkün.",
+  "midnightcontrols.menu.controller_type.tooltip": "Doğru tuşları göstermesi için oyun kolu türü.",
+  "midnightcontrols.menu.controls_mode.tooltip": "Kontrol Modu",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Yaratıcı modda uçarken, hızına bağlı olarak hızlı blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Uçarken, Vanilla'daki gibi ani duruşlarda kayma efektini etkinleştirir.",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Yukarı/aşağı uçarken, Vanilla'daki gibi ani duruşlarda kayma efektini etkinleştirir.",
+  "midnightcontrols.menu.hud_enable.tooltip": "Ekranın üstünde oyun kolu tuşu göstergesini açar/kapatır.",
+  "midnightcontrols.menu.hud_side.tooltip": "HUD'un konumu",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Oyun kolunun taklit edilen fare hızı.",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Hızlı blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "En alta blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Oyun kolu için eşleştirme dosyasını yeniler.",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Oyun kolu modunda olan kamera dönme hızı (X)",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Oyun kolu modunda olan kamera dönme hızı (Y)",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Oyun penceresinde değilken oyun kolu girişine izine verir.",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Sanal fareyi etkinleştirir. Çift ekran oynanılacağı zaman işe yarar.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Varsayılan Aydınlık Tema",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Varsayılan Karanlık Tema",
   "midnightcontrols.virtual_mouse.skin.second_light": "İkincil Aydınlık Tema",

src/main/resources/assets/midnightcontrols/lang/uk_ua.json

@@ -144,38 +144,38 @@
   "midnightcontrols.menu.virtual_mouse.skin": "Дизайн віртуальної мишки",
   "midnightcontrols.narrator.unbound": "Звільнений %s",
   "midnightcontrols.not_bound": "Не призначено",
-  "midnightcontrols.tooltip.analog_movement": "Включає аналоговий рух, коли це можливо.",
-  "midnightcontrols.tooltip.auto_switch_mode": "Автоматичне перемикання на новий, тільки підключений контролер.",
-  "midnightcontrols.tooltip.controller2": "Додатковий контролер, наприклад для джой-конів.",
-  "midnightcontrols.tooltip.controller_type": "Тип контролера, щоб правильно зіставити іконки кнопок.",
-  "midnightcontrols.tooltip.controls_mode": "Тип контролю за грою.",
-  "midnightcontrols.tooltip.double_tap_to_sprint": "При подвійному переміщенні на лівий стик, персонаж починає бігти.",
-  "midnightcontrols.tooltip.fast_block_placing": "Під час польоту в творчому режимі дозволяє швидко розміщувати блоки в залежності від вашої швидкості. §cНа деяких серверах це може розцінюватися як читерство.§r",
-  "midnightcontrols.tooltip.fly_drifting": "Під час польоту включає ванільну інерцію.",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "Під час польоту включає ванільну вертикальну інерцію.",
-  "midnightcontrols.tooltip.hud_enable": "Переключає бачення іконок кнопок контролера на екрані.",
-  "midnightcontrols.tooltip.hud_side": "Розташування інтерфейсу у певний бік.",
-  "midnightcontrols.tooltip.left_dead_zone": "Мертва зона для лівого аналогового стику контролера.",
-  "midnightcontrols.tooltip.max_left_x_value": "Змінює те, що мод в результаті вважає максимальним значенням для лівої осі X. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
-  "midnightcontrols.tooltip.max_left_y_value": "Змінює те, що мод в результаті вважає максимальним значенням для лівої осі Y. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
-  "midnightcontrols.tooltip.max_right_x_value": "Змінює те, що мод в результаті вважає максимальним значенням для правої осі X. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
-  "midnightcontrols.tooltip.max_right_y_value": "Змінює те, що мод в результаті вважає максимальним значенням для правої осі Y. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
-  "midnightcontrols.tooltip.mouse_speed": "Швидкість миші, що емульується контролером.",
-  "midnightcontrols.tooltip.reacharound.horizontal": "Дозволяє розміщувати передній блок перед собою. §cМоже розглядатися як читерство на деяких серверах§r.",
-  "midnightcontrols.tooltip.reacharound.vertical": "Забезпечує вертикальне охоплення. §cМоже розглядатися як шахрайство на деяких серверах§r.",
-  "midnightcontrols.tooltip.reload_controller_mappings": "Перезавантажує файл розкладки контролерів.",
-  "midnightcontrols.tooltip.right_dead_zone": "Мертва зона для правого аналогового стику контролера.",
-  "midnightcontrols.tooltip.rotation_speed": "Швидкість обертання камери по осі X в режимі контролера.",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "Швидкість обертання камери по осі Y в режимі контролера.",
-  "midnightcontrols.tooltip.unfocused_input": "Дозволити введення з контролера, навіть якщо гра сфокусована.",
-  "midnightcontrols.tooltip.virtual_mouse": "Включити віртуальну мишу дуже корисно при грі двом на одному комп'ютері.",
+  "midnightcontrols.menu.analog_movement.tooltip": "Включає аналоговий рух, коли це можливо.",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Автоматичне перемикання на новий, тільки підключений контролер.",
+  "midnightcontrols.menu.controller2.tooltip": "Додатковий контролер, наприклад для джой-конів.",
+  "midnightcontrols.menu.controller_type.tooltip": "Тип контролера, щоб правильно зіставити іконки кнопок.",
+  "midnightcontrols.menu.controls_mode.tooltip": "Тип контролю за грою.",
+  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "При подвійному переміщенні на лівий стик, персонаж починає бігти.",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Під час польоту в творчому режимі дозволяє швидко розміщувати блоки в залежності від вашої швидкості. §cНа деяких серверах це може розцінюватися як читерство.§r",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Під час польоту включає ванільну інерцію.",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Під час польоту включає ванільну вертикальну інерцію.",
+  "midnightcontrols.menu.hud_enable.tooltip": "Переключає бачення іконок кнопок контролера на екрані.",
+  "midnightcontrols.menu.hud_side.tooltip": "Розташування інтерфейсу у певний бік.",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "Мертва зона для лівого аналогового стику контролера.",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Змінює те, що мод в результаті вважає максимальним значенням для лівої осі X. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Змінює те, що мод в результаті вважає максимальним значенням для лівої осі Y. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Змінює те, що мод в результаті вважає максимальним значенням для правої осі X. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Змінює те, що мод в результаті вважає максимальним значенням для правої осі Y. Корисно, якщо ваша вісь не використовує весь діапазон і здається повільною.",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Швидкість миші, що емульується контролером.",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Дозволяє розміщувати передній блок перед собою. §cМоже розглядатися як читерство на деяких серверах§r.",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Забезпечує вертикальне охоплення. §cМоже розглядатися як шахрайство на деяких серверах§r.",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Перезавантажує файл розкладки контролерів.",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "Мертва зона для правого аналогового стику контролера.",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Швидкість обертання камери по осі X в режимі контролера.",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Швидкість обертання камери по осі Y в режимі контролера.",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Дозволити введення з контролера, навіть якщо гра сфокусована.",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Включити віртуальну мишу дуже корисно при грі двом на одному комп'ютері.",
   "midnightcontrols.virtual_mouse.skin.default_light": "Звичайний світлий",
   "midnightcontrols.virtual_mouse.skin.default_dark": "Звичайний темний",
   "midnightcontrols.virtual_mouse.skin.second_light": "Додатковий світлий",
   "midnightcontrols.virtual_mouse.skin.second_dark": "Додатковий темний",
   "modmenu.descriptionTranslation.midnightcontrols": "Додавання підтримки контролера та покращення елементів керування в цілому.\nРозгалужений від LambdaControls, підтримка якого, на жаль, припинена..",
   "midnightcontrols.menu.joystick_as_mouse": "Завжди використовуйте лівий стік як мишку",
-  "midnightcontrols.tooltip.joystick_as_mouse": "Джойстик поводиться як миша в кожному меню.",
+  "midnightcontrols.menu.joystick_as_mouse.tooltip": "Джойстик поводиться як миша в кожному меню.",
   "midnightcontrols.menu.controller_toggle_sneak": "Перемикач присідання на контролері",
   "midnightcontrols.menu.controller_toggle_sprint": "Перемикач бігу на контролері",
   "midnightcontrols.menu.move_chat": "Перемістити поле введення чату вгору",

src/main/resources/assets/midnightcontrols/lang/vi_vn.json

@@ -0,0 +1,214 @@
+{
+  "midnightcontrols.midnightconfig.title": "Cấu hình MidnightControls nâng cao",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_LIGHT": "Sáng mặc định",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.DEFAULT_DARK": "Tối mặc định",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_LIGHT": "Sáng thứ hai",
+  "midnightcontrols.midnightconfig.enum.VirtualMouseSkin.SECOND_DARK": "Tối thứ hai",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DEFAULT": "Mặc định",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSHOCK": "DualShock",
+  "midnightcontrols.midnightconfig.enum.ControllerType.DUALSENSE": "DualSense",
+  "midnightcontrols.midnightconfig.enum.ControllerType.SWITCH": "Bộ điều khiển Switch/Wii",
+  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX": "Bộ điều khiển Xbox One/Series",
+  "midnightcontrols.midnightconfig.enum.ControllerType.XBOX_360": "Bộ điều khiển Xbox 360",
+  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_CONTROLLER": "Bộ điều khiển Steam",
+  "midnightcontrols.midnightconfig.enum.ControllerType.STEAM_DECK": "Steam Deck",
+  "midnightcontrols.midnightconfig.enum.ControllerType.OUYA": "Bộ điều khiển OUYA",
+  "midnightcontrols.midnightconfig.enum.ControllerType.NUMBERED": "Bộ điều khiển được đánh số",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.DEFAULT": "Bàn phím/Chuột",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.CONTROLLER": "Bộ điều khiển",
+  "midnightcontrols.midnightconfig.enum.ControlsMode.TOUCHSCREEN": "Màn hình cảm ứng (WIP)",
+  "midnightcontrols.midnightconfig.enum.HudSide.LEFT": "Trái",
+  "midnightcontrols.midnightconfig.enum.HudSide.RIGHT": "Phải",
+  "key.midnightcontrols.look_down": "Nhìn xuống",
+  "key.midnightcontrols.look_left": "Nhìn trái",
+  "key.midnightcontrols.look_right": "Nhìn phải",
+  "key.midnightcontrols.look_up": "Nhìn lên",
+  "key.midnightcontrols.ring": "Mở vòng liên kết phím không liên kết",
+  "midnightcontrols.action.attack": "Tấn công",
+  "midnightcontrols.action.back": "Trở lại",
+  "midnightcontrols.action.chat": "Mở trò chuyện",
+  "midnightcontrols.action.controls_ring": "Mở vòng liên kết phím không liên kết",
+  "midnightcontrols.action.debug_screen": "Mở HUD gỡ lỗi (F3)",
+  "midnightcontrols.action.drop_item": "Thả vật phẩm",
+  "midnightcontrols.action.exit": "Màn hình thoát",
+  "midnightcontrols.action.forward": "Tiến",
+  "midnightcontrols.action.hit": "Đánh",
+  "midnightcontrols.action.hotbar_left": "Thanh nóng bên trái",
+  "midnightcontrols.action.hotbar_right": "Thanh nóng bên phải",
+  "midnightcontrols.action.inventory": "Túi đồ",
+  "midnightcontrols.action.jump": "Nhảy",
+  "midnightcontrols.action.left": "Trái",
+  "midnightcontrols.action.pause_game": "Tạm dừng trò chơi",
+  "midnightcontrols.action.pick_block": "Chọn khối",
+  "midnightcontrols.action.pickup": "Nhặt",
+  "midnightcontrols.action.pickup_all": "Nhặt tất cả",
+  "midnightcontrols.action.place": "Đặt",
+  "midnightcontrols.action.player_list": "Danh sách người chơi",
+  "midnightcontrols.action.quick_move": "Di chuyển nhanh",
+  "midnightcontrols.action.right": "Phải",
+  "midnightcontrols.action.screenshot": "Chụp màn hình",
+  "midnightcontrols.action.slot_up": "Di chuyển vị trí lên",
+  "midnightcontrols.action.slot_down": "Di chuyển vị trí xuống",
+  "midnightcontrols.action.slot_left": "Di chuyển vị trí qua trái",
+  "midnightcontrols.action.slot_right": "Di chuyển vị trí qua phải",
+  "midnightcontrols.action.sneak": "Đi rón rén",
+  "midnightcontrols.action.sprint": "Chạy nhanh",
+  "midnightcontrols.action.swap_hands": "Đổi tay",
+  "midnightcontrols.action.toggle_perspective": "Đổi góc nhìn",
+  "midnightcontrols.action.toggle_smooth_camera": "Đổi góc nhìn kịch tính",
+  "midnightcontrols.action.page_back": "Trang trước",
+  "midnightcontrols.action.page_next": "Trang tiếp theo",
+  "midnightcontrols.action.tab_back": "Tab trước",
+  "midnightcontrols.action.tab_next": "Tab trước",
+  "midnightcontrols.action.take": "Lấy vật phẩm",
+  "midnightcontrols.action.take_all": "Lấy Stack",
+  "midnightcontrols.action.use": "Sử dụng",
+  "midnightcontrols.action.zoom": "Phóng",
+  "midnightcontrols.action.zoom_in": "Tăng Phóng",
+  "midnightcontrols.action.zoom_out": "Giảm Phóng",
+  "midnightcontrols.action.zoom_reset": "Đặt lại Phóng",
+  "midnightcontrols.action.emi_page_left": "Trang trước",
+  "midnightcontrols.action.emi_page_right": "Trang tiếp theo",
+  "midnightcontrols.category.emi": "EMI",
+  "midnightcontrols.button.a": "A",
+  "midnightcontrols.button.b": "B",
+  "midnightcontrols.button.x": "X",
+  "midnightcontrols.button.y": "Y",
+  "midnightcontrols.button.left_bumper": "Cản trái",
+  "midnightcontrols.button.right_bumper": "Cản phải",
+  "midnightcontrols.button.back": "Trở lại",
+  "midnightcontrols.button.start": "Bắt đầu",
+  "midnightcontrols.button.guide": "Hướng dẫn",
+  "midnightcontrols.button.left_thumb": "Ngón cái trái",
+  "midnightcontrols.button.right_thumb": "Ngón cái phải",
+  "midnightcontrols.button.dpad_up": "DPAD lên",
+  "midnightcontrols.button.dpad_right": "DPAD qua phải",
+  "midnightcontrols.button.dpad_down": "DPAD xuống",
+  "midnightcontrols.button.dpad_left": "DPAD qua trái",
+  "midnightcontrols.button.l4": "L4",
+  "midnightcontrols.button.l5": "L5",
+  "midnightcontrols.button.r4": "R4",
+  "midnightcontrols.button.r5": "L5",
+  "midnightcontrols.axis.left_x+": "X+ trái",
+  "midnightcontrols.axis.left_y+": "Y+ phải",
+  "midnightcontrols.axis.right_x+": "X+ phải",
+  "midnightcontrols.axis.right_y+": "Y+ trái",
+  "midnightcontrols.axis.left_trigger": "Bấm nút trái",
+  "midnightcontrols.axis.right_trigger": "Bấm nút phải",
+  "midnightcontrols.axis.left_x-": "X- trái",
+  "midnightcontrols.axis.left_y-": "Y- phải",
+  "midnightcontrols.axis.right_x-": "X- phải",
+  "midnightcontrols.axis.right_y-": "Y- trái",
+  "midnightcontrols.button.unknown": "Không biết (%d)",
+  "midnightcontrols.controller.tutorial.title": "Chơi trò chơi với Bộ điều khiển!",
+  "midnightcontrols.controller.tutorial.description": "Đi tới %s -> %s -> %s",
+  "midnightcontrols.controller.connected": "Bộ điều khiển %d đã được kết nối.",
+  "midnightcontrols.controller.disconnected": "Bộ điều khiển %d đã bị ngắt kết nối.",
+  "midnightcontrols.controller.mappings.1": "Để định cấu hình mapping bộ điều khiển, vui lòng sử dụng %s",
+  "midnightcontrols.controller.mappings.3": "và dán mapping vào trình chỉnh sửa tệp mapping.",
+  "midnightcontrols.controller.mappings.error": "Lỗi khi tải mapping.",
+  "midnightcontrols.controller.mappings.error.write": "Lỗi khi ghi mapping vào tệp.",
+  "midnightcontrols.controller.mappings.updated": "Mapping đã được cập nhật!",
+  "midnightcontrols.controller_type.default": "Mặc định",
+  "midnightcontrols.controller_type.dualshock": "DualShock",
+  "midnightcontrols.controller_type.dualsense": "DualSense",
+  "midnightcontrols.controller_type.switch": "Bộ điều khiển Switch/Wii",
+  "midnightcontrols.controller_type.xbox": "Bộ điều khiển Xbox One/Series",
+  "midnightcontrols.controller_type.xbox_360": "Bộ điều khiển Xbox 360",
+  "midnightcontrols.controller_type.steam_controller": "Bộ điều khiển Steam",
+  "midnightcontrols.controller_type.steam_deck": "Steam Deck",
+  "midnightcontrols.controller_type.ouya": "Bộ điều khiển OUYA",
+  "midnightcontrols.controller_type.numbered": "Bộ điều khiển được đánh số",
+  "midnightcontrols.controls_mode.default": "Bàn phím/Chuột",
+  "midnightcontrols.controls_mode.controller": "Bộ điều khiển",
+  "midnightcontrols.controls_mode.touchscreen": "Màn hình cảm ứng (WIP)",
+  "midnightcontrols.hud_side.left": "Trái",
+  "midnightcontrols.hud_side.right": "Phải",
+  "midnightcontrols.menu.analog_movement": "Chuyển động tương tự",
+  "midnightcontrols.menu.analog_movement.tooltip": "Khi có thể, hãy bật chuyển động tương tự.",
+  "midnightcontrols.menu.auto_switch_mode": "Chế độ tự động chuyển đổi",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "Có nên tự động chuyển chế độ điều khiển sang Bộ điều khiển nếu một bộ điều khiển được kết nối hay không.",
+  "midnightcontrols.menu.controller": "Bộ điều khiển",
+  "midnightcontrols.menu.controller2": "Bộ điều khiển thứ hai",
+  "midnightcontrols.menu.controller2.tooltip": "Bộ điều khiển thứ hai để sử dụng, cho phép (ví dụ) hỗ trợ Joy-Cons.",
+  "midnightcontrols.menu.controller_toggle_sneak": "Đổi đi rón rén trên bộ điều khiển",
+  "midnightcontrols.menu.controller_toggle_sprint": "Đổi chạy nhanh trên bộ điều khiển",
+  "midnightcontrols.menu.controller_type": "Loại bộ điều khiển",
+  "midnightcontrols.menu.controller_type.tooltip": "Loại bộ điều khiển bạn đang sử dụng (cần thiết để hiển thị các nút chính xác)",
+  "midnightcontrols.menu.controls_mode": "Chế độ",
+  "midnightcontrols.menu.controls_mode.tooltip": "Chế độ điều khiển.",
+  "midnightcontrols.menu.double_tap_to_sprint": "Nhấn đúp để chạy nhanh",
+  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "Chuyển đổi liệu phím Tiến lên phía trước có khiến người chơi chạy nhanh khi nhấn chạm nhanh hai lần hay không",
+  "midnightcontrols.menu.fast_block_placing": "Đặt khối nhanh",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "Trong khi bay ở chế độ sáng tạo, cho phép đặt khối nhanh tùy thuộc vào tốc độ của bạn. §cTrên một số máy chủ, điều này có thể bị coi là gian lận.",
+  "midnightcontrols.menu.fly_drifting": "Trôi bay",
+  "midnightcontrols.menu.fly_drifting.tooltip": "Khi đang bay, cho phép trôi dọc/xen kẽ truyền thống.",
+  "midnightcontrols.menu.fly_drifting_vertical": "Trôi theo phương thẳng đứng",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "Trong khi bay, cho phép trôi dọc/xen kẽ truyền thống.",
+  "midnightcontrols.menu.hud_enable": "Bật HUD",
+  "midnightcontrols.menu.hud_enable.tooltip": "Chuyển đổi chỉ báo nút điều khiển trên màn hình.",
+  "midnightcontrols.menu.hud_side": "Phía HUD",
+  "midnightcontrols.menu.hud_side.tooltip": "Vị trí của HUD.",
+  "midnightcontrols.menu.invert_right_x_axis": "Đảo ngược X phải",
+  "midnightcontrols.menu.invert_right_y_axis": "Đảo ngược Y phải",
+  "midnightcontrols.menu.joystick_as_mouse": "Luôn sử dụng thanh bên trái làm chuột",
+  "midnightcontrols.menu.joystick_as_mouse.tooltip": "Làm cho cần điều khiển hoạt động giống như một con chuột trong mọi menu.",
+  "midnightcontrols.menu.keyboard_controls": "Điều khiển bàn phím...",
+  "midnightcontrols.menu.left_dead_zone": "Vùng chết thanh bên trái",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "Vùng chết cho thanh analog bên trái của bộ điều khiển.",
+  "midnightcontrols.menu.mappings.open_input_str": "Mở Trình chỉnh sửa tệp mapping",
+  "midnightcontrols.menu.max_left_x_value": "Giá trị tối đa của trục X bên trái",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "Thay đổi những gì mod coi là giá trị cao nhất cho trục X bên trái. Hữu ích nếu trục của bạn không sử dụng hết phạm vi và có vẻ chậm.",
+  "midnightcontrols.menu.max_left_y_value": "Giá trị tối đa của trục Y bên trái",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "Thay đổi những gì mod coi là giá trị cao nhất cho trục Y bên trái. Hữu ích nếu trục của bạn không sử dụng hết phạm vi và có vẻ chậm.",
+  "midnightcontrols.menu.max_right_x_value": "Giá trị tối đa của trục X bên phải",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "Thay đổi những gì mod coi là giá trị cao nhất cho trục X bên phải. Hữu ích nếu trục của bạn không sử dụng hết phạm vi và có vẻ chậm.",
+  "midnightcontrols.menu.max_right_y_value": "Giá trị tối đa của trục Y bên phải",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "Thay đổi những gì mod coi là giá trị cao nhất cho trục Y bên phải. Hữu ích nếu trục của bạn không sử dụng hết phạm vi và có vẻ chậm.",
+  "midnightcontrols.menu.mouse_speed": "Tốc độ chuột",
+  "midnightcontrols.menu.mouse_speed.tooltip": "Tốc độ chuột mô phỏng của bộ điều khiển.",
+  "midnightcontrols.menu.move_chat": "Di chuyển hộp nhập trò chuyện lên trên cùng",
+  "midnightcontrols.menu.move_chat.tooltip": "Di chuyển phần nhập trò chuyện lên trên cùng để nhập tốt hơn trên các thiết bị có bàn phím ảo.",
+  "midnightcontrols.menu.reacharound.horizontal": "Đặt khối phía trước",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "Cho phép đặt khối phía trước, §cmcó thể bị coi là gian lận trên một số máy chủ §r.",
+  "midnightcontrols.menu.reacharound.vertical": "Tiếp cận theo chiều dọc",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "Cho phép tiếp cận theo chiều dọc, §cm có thể bị coi là gian lận trên một số máy chủ §r.",
+  "midnightcontrols.menu.reload_controller_mappings": "Tải lại mapping bộ điều khiển",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "Tải lại tệp mapping bộ điều khiển.",
+  "midnightcontrols.menu.right_dead_zone": "Vùng chết thanh bên phải",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "Vùng chết cho thanh analog bên phải của bộ điều khiển.",
+  "midnightcontrols.menu.rotation_speed": "Tốc độ quay trục X",
+  "midnightcontrols.menu.rotation_speed.tooltip": "Tốc độ quay Trục X của máy ảnh ở chế độ bộ điều khiển.",
+  "midnightcontrols.menu.y_axis_rotation_speed": "Tốc độ quay trục Y",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "Tốc độ quay Trục Y của máy ảnh ở chế độ bộ điều khiển.",
+  "midnightcontrols.menu.separate_controller_profile": "Hồ sơ bộ điều khiển riêng biệt",
+  "midnightcontrols.menu.separator.controller": "Bộ điều khiển",
+  "midnightcontrols.menu.separator.general": "Chung",
+  "midnightcontrols.menu.title": "MidnightControls - Cài đặt",
+  "midnightcontrols.menu.title.controller": "Tùy chọn bộ điều khiển",
+  "midnightcontrols.menu.title.controller_controls": "Ràng buộc bộ điều khiển",
+  "midnightcontrols.menu.title.gameplay": "Tuỳ chọn Gameplay",
+  "midnightcontrols.menu.title.general": "Tuỳ chọn chung",
+  "midnightcontrols.menu.title.hud": "Tuỳ chọn HUD",
+  "midnightcontrols.menu.title.mappings.string": "Trình chỉnh sửa tệp mapping",
+  "midnightcontrols.menu.title.visual": "Tùy chọn giao diện",
+  "midnightcontrols.menu.unfocused_input": "Đầu vào không tập trung",
+  "midnightcontrols.menu.unfocused_input.tooltip": "Cho phép đầu vào bộ điều khiển khi cửa sổ không được đặt tiêu điểm.",
+  "midnightcontrols.menu.virtual_mouse": "Chuột ảo",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "Bật chuột ảo, rất hữu ích trong quá trình chia đôi màn hình.",
+  "midnightcontrols.menu.virtual_mouse.skin": "Skin chuột ảo",
+  "midnightcontrols.menu.hide_cursor": "Ẩn con trỏ chuột bình thường",
+  "midnightcontrols.menu.hide_cursor.tooltip": "Ẩn con trỏ chuột bình thường, chỉ để lại con chuột ảo.",
+  "midnightcontrols.narrator.unbound": "Bỏ ràng buộc %s",
+  "midnightcontrols.not_bound": "Không ràng buộc",
+  "midnightcontrols.virtual_mouse.skin.default_light": "Sáng mặc định",
+  "midnightcontrols.virtual_mouse.skin.default_dark": "Tối mặc định",
+  "midnightcontrols.virtual_mouse.skin.second_light": "Sáng thứ hai",
+  "midnightcontrols.virtual_mouse.skin.second_dark": "Tối thứ hai",
+  "midnightcontrols.midnightconfig.category.controller": "Bộ điều khiển",
+  "midnightcontrols.midnightconfig.category.misc": "Khác",
+  "midnightcontrols.midnightconfig.category.screens": "Màn hình",
+  "midnightcontrols.midnightconfig.category.gameplay": "Gameplay",
+  "midnightcontrols.midnightconfig.category.visual": "Hình ảnh",
+  "modmenu.descriptionTranslation.midnightcontrols": "Thêm hỗ trợ bộ điều khiển và kiểm soát nâng cao tổng thể.\nĐược phân tách từ LambdaControls, đáng tiếc là đã ngừng hoạt động."
+}

src/main/resources/assets/midnightcontrols/lang/zh_cn.json

@@ -121,30 +121,30 @@
   "midnightcontrols.menu.virtual_mouse.skin": "虚拟鼠标指针样式",
   "midnightcontrols.narrator.unbound": "取消绑定 %s",
   "midnightcontrols.not_bound": "未绑定",
-  "midnightcontrols.tooltip.analog_movement": "若游戏机制允许，则可根据推动摇杆的力度与幅度决定移动的速度。",
-  "midnightcontrols.tooltip.auto_switch_mode": "如果已有手柄连接，则自动切换为手柄操作模式。",
-  "midnightcontrols.tooltip.controller2": "使用额外的手柄，比如将一左一右的两个 Joy-Con 合为一个功能完全的手柄。",
-  "midnightcontrols.tooltip.controller_type": "选择手柄类型，以显示对应的按键图标。",
-  "midnightcontrols.tooltip.controls_mode": "操作模式",
-  "midnightcontrols.tooltip.fast_block_placing": "在创造模式中处于飞行状态时，可以根据你飞行的速度快速放置方块。\n§c在部分服务器可能会被认定为作弊。",
-  "midnightcontrols.tooltip.fly_drifting": "处于飞行状态时，启用原版的水平方向飞行惯性（缓停滑行）。",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "处于飞行状态时，启用原版的垂直方向飞行惯性（缓停滑行）。",
-  "midnightcontrols.tooltip.hud_enable": "显示手柄按键操作提示。",
-  "midnightcontrols.tooltip.hud_side": "HUD的位置位于画面的哪一侧。",
-  "midnightcontrols.tooltip.left_dead_zone": "左摇杆配置的死区。\n死区决定摇杆要偏离中心位置多远才能让摇杆的输入有效。",
-  "midnightcontrols.tooltip.max_left_x_value": "更改左摇杆X轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致在识别摇杆输入的精确值的情况下，左右移动较为缓慢等问题，本项可能会有所帮助。",
-  "midnightcontrols.tooltip.max_left_y_value": "更改左摇杆Y轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致在识别摇杆输入的精确值的情况下，前后移动较为缓慢等问题，本项可能会有所帮助。",
-  "midnightcontrols.tooltip.max_right_x_value": "更改右摇杆X轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致镜头左右旋转较为缓慢等问题，本项可能会有所帮助。",
-  "midnightcontrols.tooltip.max_right_y_value": "更改右摇杆Y轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致镜头上下旋转较为缓慢等问题，本项可能会有所帮助。",
-  "midnightcontrols.tooltip.mouse_speed": "手柄模拟的鼠标的移动速度。",
-  "midnightcontrols.tooltip.reacharound.horizontal": "启用水平方向方块放置辅助，可在脚下方块的前方放置方块。\n§c在部分服务器可能会被认定为作弊。",
-  "midnightcontrols.tooltip.reacharound.vertical": "启用垂直方向方块放置辅助，可在脚下方块的下方放置方块。\n§c在部分服务器可能会被认定为作弊。",
-  "midnightcontrols.tooltip.reload_controller_mappings": "重新加载手柄的按键映射文件。",
-  "midnightcontrols.tooltip.right_dead_zone": "右摇杆配置的死区。\n死区决定摇杆要偏离中心位置多远才能让摇杆的输入有效。",
-  "midnightcontrols.tooltip.rotation_speed": "手柄操作模式下的镜头旋转速度。(X)",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "手柄操作模式下的镜头旋转速度。(Y)",
-  "midnightcontrols.tooltip.unfocused_input": "即使游戏窗口处于非活动状态，也允许手柄进行按键输入。",
-  "midnightcontrols.tooltip.virtual_mouse": "启用虚拟鼠标，在分屏的情况下很有用。",
+  "midnightcontrols.menu.analog_movement.tooltip": "若游戏机制允许，则可根据推动摇杆的力度与幅度决定移动的速度。",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "如果已有手柄连接，则自动切换为手柄操作模式。",
+  "midnightcontrols.menu.controller2.tooltip": "使用额外的手柄，比如将一左一右的两个 Joy-Con 合为一个功能完全的手柄。",
+  "midnightcontrols.menu.controller_type.tooltip": "选择手柄类型，以显示对应的按键图标。",
+  "midnightcontrols.menu.controls_mode.tooltip": "操作模式",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "在创造模式中处于飞行状态时，可以根据你飞行的速度快速放置方块。\n§c在部分服务器可能会被认定为作弊。",
+  "midnightcontrols.menu.fly_drifting.tooltip": "处于飞行状态时，启用原版的水平方向飞行惯性（缓停滑行）。",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "处于飞行状态时，启用原版的垂直方向飞行惯性（缓停滑行）。",
+  "midnightcontrols.menu.hud_enable.tooltip": "显示手柄按键操作提示。",
+  "midnightcontrols.menu.hud_side.tooltip": "HUD的位置位于画面的哪一侧。",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "左摇杆配置的死区。\n死区决定摇杆要偏离中心位置多远才能让摇杆的输入有效。",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "更改左摇杆X轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致在识别摇杆输入的精确值的情况下，左右移动较为缓慢等问题，本项可能会有所帮助。",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "更改左摇杆Y轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致在识别摇杆输入的精确值的情况下，前后移动较为缓慢等问题，本项可能会有所帮助。",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "更改右摇杆X轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致镜头左右旋转较为缓慢等问题，本项可能会有所帮助。",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "更改右摇杆Y轴最大值的识别范围。\n若感觉即便推满摇杆也未达到最大的输入值，导致镜头上下旋转较为缓慢等问题，本项可能会有所帮助。",
+  "midnightcontrols.menu.mouse_speed.tooltip": "手柄模拟的鼠标的移动速度。",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "启用水平方向方块放置辅助，可在脚下方块的前方放置方块。\n§c在部分服务器可能会被认定为作弊。",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "启用垂直方向方块放置辅助，可在脚下方块的下方放置方块。\n§c在部分服务器可能会被认定为作弊。",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "重新加载手柄的按键映射文件。",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "右摇杆配置的死区。\n死区决定摇杆要偏离中心位置多远才能让摇杆的输入有效。",
+  "midnightcontrols.menu.rotation_speed.tooltip": "手柄操作模式下的镜头旋转速度。(X)",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "手柄操作模式下的镜头旋转速度。(Y)",
+  "midnightcontrols.menu.unfocused_input.tooltip": "即使游戏窗口处于非活动状态，也允许手柄进行按键输入。",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "启用虚拟鼠标，在分屏的情况下很有用。",
   "midnightcontrols.virtual_mouse.skin.default_light": "默认样式（白色）",
   "midnightcontrols.virtual_mouse.skin.default_dark": "默认样式（黑色）",
   "midnightcontrols.virtual_mouse.skin.second_light": "额外样式（白色）",

src/main/resources/assets/midnightcontrols/lang/zh_tw.json

@@ -105,9 +105,9 @@
   "midnightcontrols.controller.connected": "搖桿 %d 已連接。",
   "midnightcontrols.controller.disconnected": "搖桿 %d 已斷開。",
   "midnightcontrols.controller.mappings.1": "請使用 %s 設定搖桿按鍵映射",
-  "midnightcontrols.controller.mappings.3": "並將按鍵映射文件放入此路徑：「%s.minecraft/config/gamecontrollerdb.txt%s」。",
-  "midnightcontrols.controller.mappings.error": "發生錯誤，無法讀取按鍵映射文件。",
-  "midnightcontrols.controller.mappings.error.write": "發生錯誤，無法保存按鍵映射文件。",
+  "midnightcontrols.controller.mappings.3": "並將按鍵映射檔案放入此路徑：「%s.minecraft/config/gamecontrollerdb.txt%s」。",
+  "midnightcontrols.controller.mappings.error": "發生錯誤，無法讀取按鍵映射檔案。",
+  "midnightcontrols.controller.mappings.error.write": "發生錯誤，無法保存按鍵映射檔案。",
   "midnightcontrols.controller.mappings.updated": "按鍵映射已更新！",
   "midnightcontrols.controller_type.default": "預設",
   "midnightcontrols.controller_type.dualshock": "DualShock",
@@ -125,37 +125,62 @@
   "midnightcontrols.hud_side.left": "左側",
   "midnightcontrols.hud_side.right": "右側",
   "midnightcontrols.menu.analog_movement": "識別搖桿輸入的精確值",
+  "midnightcontrols.menu.analog_movement.tooltip": "若遊戲機制允許，則可根據推動搖桿的力度與幅度決定移動的速度。",
   "midnightcontrols.menu.auto_switch_mode": "自動切換模式",
+  "midnightcontrols.menu.auto_switch_mode.tooltip": "如果已有搖桿連接，則自動切換為搖桿操作模式。",
   "midnightcontrols.menu.controller": "搖桿",
   "midnightcontrols.menu.controller2": "額外搖桿",
+  "midnightcontrols.menu.controller2.tooltip": "使用額外的搖桿，例如將左右兩個的 Joy-Con 合為一個功能完全的搖桿。",
   "midnightcontrols.menu.controller_toggle_sneak": "搖桿潛行切換",
   "midnightcontrols.menu.controller_toggle_sprint": "搖桿衝刺切換",
   "midnightcontrols.menu.controller_type": "搖桿類型",
+  "midnightcontrols.menu.controller_type.tooltip": "你正在使用的搖桿類型（需要以顯示正確的按鈕）",
   "midnightcontrols.menu.controls_mode": "模式",
+  "midnightcontrols.menu.controls_mode.tooltip": "操作模式。",
   "midnightcontrols.menu.double_tap_to_sprint": "雙擊以奔跑",
+  "midnightcontrols.menu.double_tap_to_sprint.tooltip": "切換是否啟用向前行走按鍵，快速按兩次走路讓玩家奔跑",
   "midnightcontrols.menu.fast_block_placing": "快速放置方塊",
+  "midnightcontrols.menu.fast_block_placing.tooltip": "在創造模式中處於飛行狀態時，可以根據你飛行的速度快速放置方塊。\n§c在部分伺服器可能會被認定為作弊。",
   "midnightcontrols.menu.fly_drifting": "水平方向飛行慣性",
+  "midnightcontrols.menu.fly_drifting.tooltip": "處於飛行狀態時，啟用原版的水平方向飛行慣性（緩停滑行）。",
   "midnightcontrols.menu.fly_drifting_vertical": "垂直方向飛行慣性",
+  "midnightcontrols.menu.fly_drifting_vertical.tooltip": "處於飛行狀態時，啟用原版的垂直方向飛行慣性（緩停滑行）。",
   "midnightcontrols.menu.hud_enable": "啟用 HUD",
+  "midnightcontrols.menu.hud_enable.tooltip": "顯示搖桿按鍵操作提示。",
   "midnightcontrols.menu.hud_side": "HUD 位置",
+  "midnightcontrols.menu.hud_side.tooltip": "HUD 的位置位於畫面的哪一側。",
   "midnightcontrols.menu.invert_right_x_axis": "反轉右搖桿 X 軸",
   "midnightcontrols.menu.invert_right_y_axis": "反轉右搖桿 Y 軸",
   "midnightcontrols.menu.joystick_as_mouse": "總是將左搖桿作為滑鼠",
+  "midnightcontrols.menu.joystick_as_mouse.tooltip": "讓左搖桿在每個選單的像滑鼠一樣。",
   "midnightcontrols.menu.keyboard_controls": "鍵盤控制...",
   "midnightcontrols.menu.left_dead_zone": "左搖桿死區",
-  "midnightcontrols.menu.mappings.open_input_str": "編輯按鍵映射文件",
+  "midnightcontrols.menu.left_dead_zone.tooltip": "左搖桿設定的死區。",
+  "midnightcontrols.menu.mappings.open_input_str": "編輯按鍵映射檔案",
   "midnightcontrols.menu.max_left_x_value": "左搖桿 X 軸最大值識別範圍",
+  "midnightcontrols.menu.max_left_x_value.tooltip": "更改左搖桿 X 軸最大值的識別範圍。若感覺即便推滿搖桿也未達到最大的輸入值，導致在識別搖桿輸入的精確值的情況下，左右移動較為緩慢等問題，本項可能會有所幫助。",
   "midnightcontrols.menu.max_left_y_value": "左搖桿 Y 軸最大值識別範圍",
+  "midnightcontrols.menu.max_left_y_value.tooltip": "更改左搖桿 Y 軸最大值的識別範圍。若感覺即便推滿搖桿也未達到最大的輸入值，導致在識別搖桿輸入的精確值的情況下，前後移動較為緩慢等問題，本項可能會有所幫助。",
   "midnightcontrols.menu.max_right_x_value": "右搖桿 X 軸最大值識別範圍",
+  "midnightcontrols.menu.max_right_x_value.tooltip": "更改右搖桿 X 軸最大值的識別範圍。若感覺即便推滿搖桿也未達到最大的輸入值，導致鏡頭左右旋轉較為緩慢等問題，本項可能會有所幫助。",
   "midnightcontrols.menu.max_right_y_value": "右搖桿 Y 軸最大值識別範圍",
-  "midnightcontrols.menu.mouse_speed": "滑鼠指標移動速度",
+  "midnightcontrols.menu.max_right_y_value.tooltip": "更改右搖桿 Y 軸最大值的識別範圍。若感覺即便推滿搖桿也未達到最大的輸入值，導致鏡頭上下旋轉較為緩慢等問題，本項可能會有所幫助。",
+  "midnightcontrols.menu.mouse_speed": "游標移動速度",
+  "midnightcontrols.menu.mouse_speed.tooltip": "搖桿模擬的游標的移動速度。",
   "midnightcontrols.menu.move_chat": "將聊天輸入框移至頂部",
+  "midnightcontrols.menu.move_chat.tooltip": "將聊天輸入欄位移至頂部，以便在使用虛擬鍵盤的裝置上更好地輸入。",
   "midnightcontrols.menu.reacharound.horizontal": "水平方向方塊放置輔助",
+  "midnightcontrols.menu.reacharound.horizontal.tooltip": "啟用水平方向方塊放置輔助，可在腳下方塊的前方放置方塊。§c在部分伺服器可能會被認定為作弊§r。",
   "midnightcontrols.menu.reacharound.vertical": "垂直方向方塊放置輔助",
-  "midnightcontrols.menu.reload_controller_mappings": "重新載人搖桿按鍵映射",
+  "midnightcontrols.menu.reacharound.vertical.tooltip": "啟用垂直方向方塊放置輔助，可在腳下方塊的下方放置方塊。§c在部分伺服器可能會被認定為作弊§r。",
+  "midnightcontrols.menu.reload_controller_mappings": "重新載入搖桿按鍵映射",
+  "midnightcontrols.menu.reload_controller_mappings.tooltip": "重新載入搖桿的按鍵映射檔案。",
   "midnightcontrols.menu.right_dead_zone": "右搖桿死區",
+  "midnightcontrols.menu.right_dead_zone.tooltip": "右搖桿設定的死區。",
   "midnightcontrols.menu.rotation_speed": "X 軸鏡頭旋轉速度",
+  "midnightcontrols.menu.rotation_speed.tooltip": "搖桿操作模式下的鏡頭旋轉速度。（X）",
   "midnightcontrols.menu.y_axis_rotation_speed": "Y 軸鏡頭旋轉速度",
+  "midnightcontrols.menu.y_axis_rotation_speed.tooltip": "搖桿操作模式下的鏡頭旋轉速度。（Y）",
   "midnightcontrols.menu.separate_controller_profile": "搖桿設定檔",
   "midnightcontrols.menu.separator.controller": "搖桿",
   "midnightcontrols.menu.separator.general": "一般",
@@ -165,40 +190,17 @@
   "midnightcontrols.menu.title.gameplay": "遊戲內容選項",
   "midnightcontrols.menu.title.general": "一般選項",
   "midnightcontrols.menu.title.hud": "HUD 選項",
-  "midnightcontrols.menu.title.mappings.string": "編輯按鍵映射文件",
+  "midnightcontrols.menu.title.mappings.string": "編輯按鍵映射檔案",
   "midnightcontrols.menu.title.visual": "界面選項",
   "midnightcontrols.menu.unfocused_input": "非活動狀態輸入",
-  "midnightcontrols.menu.virtual_mouse": "虛擬滑鼠指標",
-  "midnightcontrols.menu.virtual_mouse.skin": "虛擬滑鼠指標樣式",
+  "midnightcontrols.menu.unfocused_input.tooltip": "即使遊戲窗口處於非活動狀態，也允許搖桿進行按鍵輸入。",
+  "midnightcontrols.menu.virtual_mouse": "虛擬游標",
+  "midnightcontrols.menu.virtual_mouse.tooltip": "啟用虛擬游標，在分屏的情況下很有用。",
+  "midnightcontrols.menu.virtual_mouse.skin": "虛擬游標樣式",
+  "midnightcontrols.menu.hide_cursor": "隱藏正常游標",
+  "midnightcontrols.menu.hide_cursor.tooltip": "隱藏正常游標", 
   "midnightcontrols.narrator.unbound": "取消綁定 %s",
   "midnightcontrols.not_bound": "未綁定",
-  "midnightcontrols.tooltip.analog_movement": "若遊戲機制允許，則可根據推動搖桿的力度與幅度決定移動的速度。",
-  "midnightcontrols.tooltip.auto_switch_mode": "如果已有搖桿連接，則自動切換為搖桿操作模式。",
-  "midnightcontrols.tooltip.controller2": "使用額外的搖桿，例如將左右兩個的 Joy-Con 合為一個功能完全的搖桿。",
-  "midnightcontrols.tooltip.controller_type": "選擇搖桿類型，以顯示對應的按鍵圖標。",
-  "midnightcontrols.tooltip.controls_mode": "操作模式",
-  "midnightcontrols.tooltip.double_tap_to_sprint": "切換是否啟用向前行走按鍵，快速按兩次走路讓玩家奔跑",
-  "midnightcontrols.tooltip.fast_block_placing": "在創造模式中處於飛行狀態時，可以根據你飛行的速度快速放置方塊。\n§c在部分伺服器可能會被認定為作弊§r。",
-  "midnightcontrols.tooltip.fly_drifting": "處於飛行狀態時，啟用原版的水平方向飛行慣性（緩停滑行）。",
-  "midnightcontrols.tooltip.fly_drifting_vertical": "處於飛行狀態時，啟用原版的垂直方向飛行慣性（緩停滑行）。",
-  "midnightcontrols.tooltip.hud_enable": "顯示搖桿按鍵操作提示。",
-  "midnightcontrols.tooltip.hud_side": "HUD 的位置位於畫面的哪一側。",
-  "midnightcontrols.tooltip.joystick_as_mouse": "讓搖桿在每個介面有滑鼠的功能。",
-  "midnightcontrols.tooltip.left_dead_zone": "左搖桿設定的死區。\n死區決定搖桿要偏離中心位置多遠才能讓搖桿的輸入有效。",
-  "midnightcontrols.tooltip.max_left_x_value": "更改左搖桿 X 軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致在識別搖桿輸入的精確值的情況下，左右移動較為緩慢等問題，本項可能會有所幫助。",
-  "midnightcontrols.tooltip.max_left_y_value": "更改左搖桿 Y 軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致在識別搖桿輸入的精確值的情況下，前後移動較為緩慢等問題，本項可能會有所幫助。",
-  "midnightcontrols.tooltip.max_right_x_value": "更改右搖桿 X 軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致鏡頭左右旋轉較為緩慢等問題，本項可能會有所幫助。",
-  "midnightcontrols.tooltip.max_right_y_value": "更改右搖桿 Y 軸最大值的識別範圍。\n若感覺即便推滿搖桿也未達到最大的輸入值，導致鏡頭上下旋轉較為緩慢等問題，本項可能會有所幫助。",
-  "midnightcontrols.tooltip.mouse_speed": "搖桿模擬的滑鼠指標的移動速度。",
-  "midnightcontrols.tooltip.move_chat": "將聊天輸入欄位移至頂部，以便在使用虛擬鍵盤的裝置上更好地輸入。",
-  "midnightcontrols.tooltip.reacharound.horizontal": "啟用水平方向方塊放置輔助，可在腳下方塊的前方放置方塊。\n§c在部分伺服器可能會被認定為作弊§r。",
-  "midnightcontrols.tooltip.reacharound.vertical": "啟用垂直方向方塊放置輔助，可在腳下方塊的下方放置方塊。\n§c在部分伺服器可能會被認定為作弊§r。",
-  "midnightcontrols.tooltip.reload_controller_mappings": "重新加載搖桿的按鍵映射文件。",
-  "midnightcontrols.tooltip.right_dead_zone": "右搖桿設定的死區。\n死區決定搖桿要偏離中心位置多遠才能讓搖桿的輸入有效。",
-  "midnightcontrols.tooltip.rotation_speed": "搖桿操作模式下的鏡頭旋轉速度。（X）",
-  "midnightcontrols.tooltip.y_axis_rotation_speed": "搖桿操作模式下的鏡頭旋轉速度。（Y）",
-  "midnightcontrols.tooltip.unfocused_input": "即使遊戲窗口處於非活動狀態，也允許搖桿進行按鍵輸入。",
-  "midnightcontrols.tooltip.virtual_mouse": "啟用虛擬滑鼠指標，在分屏的情況下很有用。",
   "midnightcontrols.virtual_mouse.skin.default_light": "預設樣式（白色）",
   "midnightcontrols.virtual_mouse.skin.default_dark": "預設樣式（黑色）",
   "midnightcontrols.virtual_mouse.skin.second_light": "額外樣式（白色）",

src/main/resources/fabric.mod.json

@@ -53,7 +53,7 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": ">=0.71.0",
-    "minecraft": "~1.19.3",
+    "minecraft": "~1.20",
     "spruceui": ">=3.2.0",
     "java": ">=17"
   },

src/main/resources/midnightcontrols.mixins.json

@@ -8,20 +8,19 @@
     "ClientPlayerEntityMixin",
     "ControlsOptionsScreenMixin",
     "CreativeInventoryScreenAccessor",
-    "EntryListWidgetAccessor",
-    "GameOptionsMixin",
     "GameRendererMixin",
     "HandledScreenMixin",
     "KeyBindingMixin",
+    "InputUtilMixin",
     "MinecraftClientMixin",
     "MouseMixin",
     "ChatScreenMixin",
     "RecipeBookWidgetAccessor",
     "WorldRendererMixin",
-    "KeyBindingRegistryImplAccessor",
     "KeyBindingIDAccessor",
-    "ScreenAccessor",
-    "TabNavigationWidgetAccessor"
+    "TabNavigationWidgetAccessor",
+    "ScreenMixin",
+    "KeyboardMixin"
   ],
   "injectors": {
     "defaultRequire": 1