Add stick-independent dead zones (#32) and update license headers.

2025-12-13 23:25:10 +01:00 · 2021-03-17 18:49:10 +01:00
parent 400b625716
commit 97521e832d
71 changed files with 169 additions and 109 deletions
--- a/src/main/java/dev/lambdaurora/lambdacontrols/ControlsMode.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/ControlsMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControls.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsConstants.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsFeature.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/LambdaControlsFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ButtonState.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ButtonState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ControllerType.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ControllerType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/HudSide.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/HudSide.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsClient.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
@@ -68,7 +68,8 @@ public class LambdaControlsConfig {
    private boolean shouldRenderReacharoundOutline;
    private int[] reacharoundOutlineColor;
    // Controller settings
-    private double deadZone;
+    private double rightDeadZone;
+    private double leftDeadZone;
    private double rotationSpeed;
    private double mouseSpeed;
    private boolean unfocusedInput;
@@ -102,7 +103,8 @@ public class LambdaControlsConfig {
        this.reacharoundOutlineColor = this.config.getOptional("gameplay.reacharound.outline_color").map(hex -> parseColor((String) hex)).orElse(DEFAULT_REACHAROUND_OUTLINE_COLOR);
        // Controller settings.
        this.controllerType = ControllerType.byId(this.config.getOrElse("controller.type", DEFAULT_CONTROLLER_TYPE.getName())).orElse(DEFAULT_CONTROLLER_TYPE);
-        this.deadZone = this.config.getOrElse("controller.dead_zone", DEFAULT_DEAD_ZONE);
+        this.rightDeadZone = this.config.getOrElse("controller.right_dead_zone", DEFAULT_DEAD_ZONE);
+        this.leftDeadZone = this.config.getOrElse("controller.left_dead_zone", DEFAULT_DEAD_ZONE);
        this.rotationSpeed = this.config.getOrElse("controller.rotation_speed", DEFAULT_ROTATION_SPEED);
        this.mouseSpeed = this.config.getOrElse("controller.mouse_speed", DEFAULT_MOUSE_SPEED);
        this.unfocusedInput = this.config.getOrElse("controller.unfocused_input", DEFAULT_UNFOCUSED_INPUT);
@@ -118,7 +120,8 @@ public class LambdaControlsConfig {
     * Saves the configuration.
     */
    public void save() {
-        this.config.set("controller.dead_zone", this.deadZone);
+        this.config.set("controller.right_dead_zone", this.rightDeadZone);
+        this.config.set("controller.left_dead_zone", this.leftDeadZone);
        this.config.set("controller.rotation_speed", this.rotationSpeed);
        this.config.set("controller.mouse_speed", this.mouseSpeed);
        this.config.set("controller.unfocused_input", this.unfocusedInput);
@@ -152,6 +155,7 @@ public class LambdaControlsConfig {
            this.config.remove("gameplay.front_block_placing.outline_color");
        }

+        this.renamed("controller.dead_zone", "controller.right_dead_zone");
        this.renamed("controller.controls.tab_left", "controller.controls.tab_back");
        this.renamed("controller.controls.tab_right", "controller.controls.tab_next");
    }
@@ -182,7 +186,8 @@ public class LambdaControlsConfig {
        this.setRenderReacharoundOutline(DEFAULT_REACHAROUND_OUTLINE);
        // Controller
        this.setControllerType(DEFAULT_CONTROLLER_TYPE);
-        this.setDeadZone(DEFAULT_DEAD_ZONE);
+        this.setRightDeadZone(DEFAULT_DEAD_ZONE);
+        this.setLeftDeadZone(DEFAULT_DEAD_ZONE);
        this.setRotationSpeed(DEFAULT_ROTATION_SPEED);
        this.setMouseSpeed(DEFAULT_MOUSE_SPEED);
        this.setUnfocusedInput(DEFAULT_UNFOCUSED_INPUT);
@@ -509,21 +514,39 @@ public class LambdaControlsConfig {
    }

    /**
-     * Gets the controller's dead zone from the configuration.
+     * Gets the controller's right dead zone from the configuration.
     *
-     * @return The controller's dead zone value.
+     * @return the controller's right dead zone value
     */
-    public double getDeadZone() {
-        return this.deadZone;
+    public double getRightDeadZone() {
+        return this.rightDeadZone;
    }

    /**
-     * Sets the controller's dead zone in the configuration.
+     * Sets the controller's right dead zone in the configuration.
     *
-     * @param deadZone The new controller's dead zone value.
+     * @param deadZone the controller's right dead zone value
     */
-    public void setDeadZone(double deadZone) {
-        this.deadZone = deadZone;
+    public void setRightDeadZone(double deadZone) {
+        this.rightDeadZone = deadZone;
+    }
+
+    /**
+     * Gets the controller's left dead zone from the configuration.
+     *
+     * @return the controller's left dead zone value
+     */
+    public double getLeftDeadZone() {
+        return this.leftDeadZone;
+    }
+
+    /**
+     * Sets the controller's left dead zone in the configuration.
+     *
+     * @param deadZone the controller's left dead zone value
+     */
+    public void setLeftDeadZone(double deadZone) {
+        this.leftDeadZone = deadZone;
    }

    /**
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaControlsModMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaInput.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaInput.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
@@ -266,7 +266,7 @@ public class LambdaInput {
            if (i == GLFW.GLFW_GAMEPAD_AXIS_LEFT_Y)
                value *= -1.0F;

-            int state = value > this.config.getDeadZone() ? 1 : (value < -this.config.getDeadZone() ? 2 : 0);
+            int state = value > this.config.getRightDeadZone() ? 1 : (value < -this.config.getRightDeadZone() ? 2 : 0);
            this.handleAxe(client, axis, value, absValue, state);
        }
    }
@@ -433,11 +433,17 @@ public class LambdaInput {
                });
    }

-    private void handleAxe(@NotNull MinecraftClient client, int axis, float value, float absValue, int state) {
-        int asButtonState = value > 0.5F ? 1 : (value < -0.5F ? 2 : 0);
+    private double getDeadZoneValue(int axis) {
+        return (axis == GLFW_GAMEPAD_AXIS_LEFT_X || axis == GLFW_GAMEPAD_AXIS_LEFT_Y) ? this.config.getLeftDeadZone()
+                : this.config.getRightDeadZone();
+    }

-        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))
+    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))
            if (asButtonState == 2)
                asButtonState = 0;

@@ -469,8 +475,9 @@ public class LambdaInput {
                }
            }

-            float axisValue = absValue < this.config.getDeadZone() ? 0.f : (float) (absValue - this.config.getDeadZone());
-            axisValue /= (1.0 - this.config.getDeadZone());
+            double deadZone = this.getDeadZoneValue(axis);
+            float axisValue = absValue < deadZone ? 0.f : (float) (absValue - deadZone);
+            axisValue /= (1.0 - deadZone);
            if (currentPlusState)
                InputManager.BUTTON_VALUES.put(axisAsButton(axis, true), axisValue);
            else
@@ -481,7 +488,7 @@ public class LambdaInput {
                InputManager.BUTTON_VALUES.put(axisAsButton(axis, false), 0.f);
        }

-        double deadZone = this.config.getDeadZone();
+        double deadZone = this.getDeadZoneValue(axis);

        if (this.controlsInput != null && this.controlsInput.focusedBinding != null) {
            if (asButtonState != 0 && !this.controlsInput.currentButtons.contains(axisAsButton(axis, asButtonState == 1))) {
@@ -520,8 +527,8 @@ public class LambdaInput {

        if (client.currentScreen == null) {
            // Handles the look direction.
-            absValue -= this.config.getDeadZone();
-            this.handleLook(client, axis, (float) (absValue / (1.0 - this.config.getDeadZone())), state);
+            absValue -= this.getDeadZoneValue(axis);
+            this.handleLook(client, axis, (float) (absValue / (1.0 - this.getDeadZoneValue(axis))), state);
        } else {
            boolean allowMouseControl = true;

@@ -537,8 +544,8 @@ public class LambdaInput {
                }
            }

-            float movementX = 0.0F;
-            float movementY = 0.0F;
+            float movementX = 0.f;
+            float movementY = 0.f;

            if (this.config.isBackButton(axis, false, (value > 0 ? 1 : 2))) {
                movementY = absValue;
@@ -564,19 +571,22 @@ public class LambdaInput {
                    if (Math.abs(movementX) >= deadZone)
                        this.mouseSpeedX = movementX;
                    else
-                        this.mouseSpeedX = 0.F;
+                        this.mouseSpeedX = 0.f;

                    if (Math.abs(movementY) >= deadZone)
                        this.mouseSpeedY = movementY;
                    else
-                        this.mouseSpeedY = 0.F;
+                        this.mouseSpeedY = 0.f;
                } else {
-                    this.mouseSpeedX = 0.F;
-                    this.mouseSpeedY = 0.F;
+                    this.mouseSpeedX = 0.f;
+                    this.mouseSpeedY = 0.f;
                }

-                if (Math.abs(this.mouseSpeedX) >= .05F || Math.abs(this.mouseSpeedY) >= .05F) {
-                    InputManager.queueMoveMousePosition(this.mouseSpeedX * this.config.getMouseSpeed(), this.mouseSpeedY * this.config.getMouseSpeed());
+                if (Math.abs(this.mouseSpeedX) >= .05f || Math.abs(this.mouseSpeedY) >= .05f) {
+                    InputManager.queueMoveMousePosition(
+                            this.mouseSpeedX * this.config.getMouseSpeed(),
+                            this.mouseSpeedY * this.config.getMouseSpeed()
+                    );
                }

                this.moveMouseToClosestSlot(client, client.currentScreen);
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaReacharound.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/LambdaReacharound.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/VirtualMouseSkin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/CompatHandler.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/CompatHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/HQMCompat.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/HQMCompat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsMixinPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/ReiCompat.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/ReiCompat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryListWidgetAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/EntryWidgetAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/ButtonCategory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/Controller.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/Controller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputHandlers.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputHandlers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputManager.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/InputManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/MovementHandler.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/MovementHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/PressAction.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/controller/PressAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsHud.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/LambdaControlsSettingsScreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
@@ -23,7 +23,7 @@ import me.lambdaurora.spruceui.widget.SpruceLabelWidget;
 import me.lambdaurora.spruceui.widget.container.SpruceContainerWidget;
 import me.lambdaurora.spruceui.widget.container.SpruceOptionListWidget;
 import me.lambdaurora.spruceui.widget.container.tabbed.SpruceTabbedWidget;
-import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -67,7 +67,8 @@ public class LambdaControlsSettingsScreen extends SpruceScreen {
    // Controller options
    private final SpruceOption controllerOption;
    private final SpruceOption secondControllerOption;
-    private final SpruceOption deadZoneOption;
+    private final SpruceOption rightDeadZoneOption;
+    private final SpruceOption leftDeadZoneOption;
    private final SpruceOption invertsRightXAxis;
    private final SpruceOption invertsRightYAxis;
    private final SpruceOption unfocusedInputOption;
@@ -88,7 +89,7 @@ public class LambdaControlsSettingsScreen extends SpruceScreen {
                    this.mod.config.save();

                    if (this.client.player != null) {
-                        ClientSidePacketRegistry.INSTANCE.sendToServer(LambdaControls.CONTROLS_MODE_CHANNEL, this.mod.makeControlsModeBuffer(next));
+                        ClientPlayNetworking.getSender().sendPacket(LambdaControls.CONTROLS_MODE_CHANNEL, this.mod.makeControlsModeBuffer(next));
                    }
                }, option -> option.getDisplayText(new TranslatableText(this.mod.config.getControlsMode().getTranslationKey())),
                new TranslatableText("lambdacontrols.tooltip.controls_mode"));
@@ -179,15 +180,26 @@ public class LambdaControlsSettingsScreen extends SpruceScreen {
                return option.getDisplayText(new LiteralText(controllerName));
        }).orElse(option.getDisplayText(SpruceTexts.OPTIONS_OFF.shallowCopy().formatted(Formatting.RED))),
                new TranslatableText("lambdacontrols.tooltip.controller2"));
-        this.deadZoneOption = new SpruceDoubleOption("lambdacontrols.menu.dead_zone", 0.05, 1.0, 0.05F, this.mod.config::getDeadZone,
+        this.rightDeadZoneOption = new SpruceDoubleOption("lambdacontrols.menu.right_dead_zone", 0.05, 1.0, 0.05f,
+                this.mod.config::getRightDeadZone,
                newValue -> {
                    synchronized (this.mod.config) {
-                        this.mod.config.setDeadZone(newValue);
+                        this.mod.config.setRightDeadZone(newValue);
                    }
                }, option -> {
            String value = String.valueOf(option.get());
            return option.getDisplayText(new LiteralText(value.substring(0, Math.min(value.length(), 5))));
-        }, new TranslatableText("lambdacontrols.tooltip.dead_zone"));
+        }, new TranslatableText("lambdacontrols.tooltip.right_dead_zone"));
+        this.leftDeadZoneOption = new SpruceDoubleOption("lambdacontrols.menu.left_dead_zone", 0.05, 1.0, 0.05f,
+                this.mod.config::getLeftDeadZone,
+                newValue -> {
+                    synchronized (this.mod.config) {
+                        this.mod.config.setLeftDeadZone(newValue);
+                    }
+                }, option -> {
+            String value = String.valueOf(option.get());
+            return option.getDisplayText(new LiteralText(value.substring(0, Math.min(value.length(), 5))));
+        }, new TranslatableText("lambdacontrols.tooltip.left_dead_zone"));
        this.invertsRightXAxis = new SpruceToggleBooleanOption("lambdacontrols.menu.invert_right_x_axis", this.mod.config::doesInvertRightXAxis,
                newValue -> {
                    synchronized (this.mod.config) {
@@ -323,6 +335,9 @@ public class LambdaControlsSettingsScreen extends SpruceScreen {
        list.addSingleOptionEntry(this.controllerOption);
        list.addSingleOptionEntry(this.secondControllerOption);
        list.addSingleOptionEntry(this.unfocusedInputOption);
+        list.addOptionEntry(this.invertsRightXAxis, this.invertsRightYAxis);
+        list.addSingleOptionEntry(this.rightDeadZoneOption);
+        list.addSingleOptionEntry(this.leftDeadZoneOption);

        root.addChild(list);
        root.addChild(labels);
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/MappingsStringInputWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/ReloadControllerMappingsOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/RingScreen.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/RingScreen.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/TouchscreenOverlay.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerButtonWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControllerControlsWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/gui/widget/ControlsListWidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AbstractButtonWidgetAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/AdvancementsScreenAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ClientPlayerEntityMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/ControlsOptionsScreenMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/CreativeInventoryScreenAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/EntryListWidgetAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameOptionsMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/GameRendererMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/HandledScreenMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/KeyBindingMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MinecraftClientMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/MouseMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/OptionsScreenMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/RecipeBookWidgetAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/mixin/WorldRendererMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/DummyRingAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/KeyBindingRingAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/LambdaRing.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/LambdaRing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingAction.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingButtonMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingPage.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/ring/RingPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/HandledScreenAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/KeyBindingAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/client/util/MouseAccessor.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/client/util/MouseAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *
--- a/src/main/java/dev/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java
+++ b/src/main/java/dev/lambdaurora/lambdacontrols/event/PlayerChangeControlsModeCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 LambdAurora <aurora42lambda@gmail.com>
+ * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
 *
 * This file is part of LambdaControls.
 *