Add 0.1 deadzone for boats (closes #279)

Author: isXander

src/main/java/dev/isxander/controlify/controller/input/mapping/MappingEntry.java

@@ -3,8 +3,8 @@
 import dev.isxander.controlify.controller.input.ControllerState;
 import dev.isxander.controlify.controller.input.HatState;
 import dev.isxander.controlify.controller.input.ModifiableControllerState;
+import dev.isxander.controlify.utils.MthExt;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
 
 public sealed interface MappingEntry {
     void apply(ControllerState oldState, ModifiableControllerState newState);
@@ -70,7 +70,7 @@ public ToAxis(ResourceLocation from, ResourceLocation to, float minIn, float min
             @Override
             public void apply(ControllerState oldState, ModifiableControllerState newState) {
                 float oldVal = oldState.getAxisState(from);
-                float newVal = Mth.lerp(Mth.inverseLerp(oldVal, minIn, maxIn), minOut, maxOut);
+                float newVal = MthExt.remap(oldVal, minIn, maxIn, minOut, maxOut);
                 newState.setAxis(to, newVal);
             }
         }

src/main/java/dev/isxander/controlify/mixins/feature/patches/boatfix/LocalPlayerMixin.java

@@ -5,7 +5,10 @@
 import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.api.ControlifyApi;
 import dev.isxander.controlify.fixes.boatfix.AnalogBoatInput;
+import dev.isxander.controlify.utils.CUtil;
+import dev.isxander.controlify.utils.MthExt;
 import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.vehicle.Boat;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -40,9 +43,24 @@ private void useAnalogInput(
             Operation<Void> original
     ) {
         if (ControlifyApi.get().currentInputMode().isController() && !Controlify.instance().config().globalSettings().shouldUseKeyboardMovement()) {
+            float forwardImpulse = input.forwardImpulse;
+            float rightImpulse = -input.leftImpulse;
+
+            // Add a deadzone to the analog input. Right impulse between -0.1 and 0.1 is considered 0.
+            // Other values are remapped to remap [0.1, 1] to [0, 1] and [-1, -0.1] to [-1, 0].
+            float deadzone = 0.1f;
+
+            float onlyRightImpulseAbs = Math.max(0, rightImpulse);
+            float onlyLeftImpulseAbs = -Math.min(0, rightImpulse);
+
+            onlyRightImpulseAbs = onlyRightImpulseAbs < deadzone ? 0 : MthExt.remap(onlyRightImpulseAbs, deadzone, 1, 0, 1);
+            onlyLeftImpulseAbs = onlyLeftImpulseAbs < deadzone ? 0 : MthExt.remap(onlyLeftImpulseAbs, deadzone, 1, 0, 1);
+
+            rightImpulse = onlyRightImpulseAbs - onlyLeftImpulseAbs;
+
             ((AnalogBoatInput) boat).controlify$setAnalogInput(
-                    input.forwardImpulse,
-                    -input.leftImpulse
+                    forwardImpulse,
+                    rightImpulse
             );
 
             return;

src/main/java/dev/isxander/controlify/utils/MthExt.java

@@ -0,0 +1,12 @@
+package dev.isxander.controlify.utils;
+
+import net.minecraft.util.Mth;
+
+public final class MthExt {
+    private MthExt() {
+    }
+
+    public static float remap(float value, float minIn, float maxIn, float minOut, float maxOut) {
+        return Mth.lerp(Mth.inverseLerp(value, minIn, maxIn), minOut, maxOut);
+    }
+}