more themes, fix input events passing to ingame from screen, changelog, fix button guide sneak wrong in some places

src/main/java/dev/isxander/controlify/Controlify.java

@@ -228,8 +228,9 @@ public class Controlify implements ControlifyApi {
             controller.rumbleManager().tick();
         }
 
-        if (state.hasAnyInput())
+        if (state.hasAnyInput()) {
             this.setInputMode(InputMode.CONTROLLER);
+        }
 
         if (consecutiveInputSwitches > 100) {
             LOGGER.warn("Controlify detected current controller to be constantly giving input and has been disabled.");
@@ -408,8 +409,8 @@ public class Controlify implements ControlifyApi {
     }
 
     @Override
-    public void setInputMode(@NotNull InputMode currentInputMode) {
-        if (this.currentInputMode == currentInputMode) return;
+    public boolean setInputMode(@NotNull InputMode currentInputMode) {
+        if (this.currentInputMode == currentInputMode) return false;
         this.currentInputMode = currentInputMode;
 
         var minecraft = Minecraft.getInstance();
@@ -432,7 +433,12 @@ public class Controlify implements ControlifyApi {
         }
         lastInputSwitchTime = Blaze3D.getTime();
 
+        if (currentInputMode == InputMode.CONTROLLER)
+            getCurrentController().ifPresent(Controller::clearState);
+
         ControlifyEvents.INPUT_MODE_CHANGED.invoker().onInputModeChanged(currentInputMode);
+
+        return true;
     }
 
     public void hideMouse(boolean hide, boolean moveMouse) {

src/main/java/dev/isxander/controlify/api/ControlifyApi.java

@@ -30,7 +30,7 @@ public interface ControlifyApi {
      * Get the current input mode for the game.
      */
     @NotNull InputMode currentInputMode();
-    void setInputMode(@NotNull InputMode mode);
+    boolean setInputMode(@NotNull InputMode mode);
 
     static ControlifyApi get() {
         return Controlify.instance();

src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java

@@ -137,7 +137,6 @@ public class ControllerBindings<T extends ControllerState> {
                 .identifier("controlify", "sneak")
                 .defaultBind(GamepadBinds.RIGHT_STICK_PRESS)
                 .category(MOVEMENT_CATEGORY)
-                .vanillaOverride(options.keyShift, () -> controller.config().toggleSneak)
                 .build());
         register(ATTACK = ControllerBindingBuilder.create(controller)
                 .identifier("controlify", "attack")

src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java

@@ -220,9 +220,7 @@ public class YACLHelper {
             category.group(makeVibrationGroup(globalVibrationOption, config, def));
         }
 
-        if (controller instanceof GamepadController gamepad && gamepad.hasGyro()) {
-            category.group(makeGyroGroup(gamepad));
-        }
+        category.group(makeGyroGroup(controller));
 
         var advancedGroup = OptionGroup.createBuilder()
                 .name(Component.translatable("controlify.gui.group.advanced"))
@@ -309,19 +307,27 @@ public class YACLHelper {
         return vibrationGroup.build();
     }
 
-    private static OptionGroup makeGyroGroup(GamepadController gamepad) {
-        var gpCfg = gamepad.config();
-        var gpCfgDef = gamepad.defaultConfig();
+    private static OptionGroup makeGyroGroup(Controller<?, ?> controller) {
+        GamepadController gamepad = (controller instanceof GamepadController) ? (GamepadController) controller : null;
+        boolean hasGyro = gamepad != null && gamepad.hasGyro();
+
+        var gpCfg = gamepad != null ? gamepad.config() : null;
+        var gpCfgDef = gamepad != null ? gamepad.defaultConfig() : null;
+
+        Component noGyroTooltip = Component.translatable("controlify.gui.group.gyro.no_gyro.tooltip").withStyle(ChatFormatting.RED);
 
         Option<Float> gyroSensitivity;
         List<Option<?>> gyroOptions = new ArrayList<>();
         var gyroGroup = OptionGroup.createBuilder()
                 .name(Component.translatable("controlify.gui.group.gyro"))
                 .tooltip(Component.translatable("controlify.gui.group.gyro.tooltip"))
+                .collapsed(!hasGyro)
                 .option(gyroSensitivity = Option.createBuilder(float.class)
                         .name(Component.translatable("controlify.gui.gyro_look_sensitivity"))
                         .tooltip(Component.translatable("controlify.gui.gyro_look_sensitivity.tooltip"))
-                        .binding(gpCfgDef.gyroLookSensitivity, () -> gpCfg.gyroLookSensitivity, v -> gpCfg.gyroLookSensitivity = v)
+                        .tooltip(hasGyro ? Component.empty() : noGyroTooltip)
+                        .available(hasGyro)
+                        .binding(hasGyro ? gpCfgDef.gyroLookSensitivity : 0, () -> hasGyro ? gpCfg.gyroLookSensitivity : 0, v -> gpCfg.gyroLookSensitivity = v)
                         .controller(opt -> new FloatSliderController(opt, 0f, 1f, 0.05f, percentOrOffFormatter))
                         .listener((opt, sensitivity) -> gyroOptions.forEach(o -> {
                             o.setAvailable(sensitivity > 0);
@@ -332,7 +338,9 @@ public class YACLHelper {
                     var opt = Option.createBuilder(boolean.class)
                             .name(Component.translatable("controlify.gui.gyro_requires_button"))
                             .tooltip(Component.translatable("controlify.gui.gyro_requires_button.tooltip"))
-                            .binding(gpCfgDef.gyroRequiresButton, () -> gpCfg.gyroRequiresButton, v -> gpCfg.gyroRequiresButton = v)
+                            .tooltip(hasGyro ? Component.empty() : noGyroTooltip)
+                            .available(hasGyro)
+                            .binding(hasGyro ? gpCfgDef.gyroRequiresButton : false, () -> hasGyro ? gpCfg.gyroRequiresButton : false, v -> gpCfg.gyroRequiresButton = v)
                             .controller(TickBoxController::new)
                             .available(gyroSensitivity.pendingValue() > 0)
                             .build();
@@ -343,7 +351,9 @@ public class YACLHelper {
                     var opt = Option.createBuilder(boolean.class)
                             .name(Component.translatable("controlify.gui.flick_stick"))
                             .tooltip(Component.translatable("controlify.gui.flick_stick.tooltip"))
-                            .binding(gpCfgDef.flickStick, () -> gpCfg.flickStick, v -> gpCfg.flickStick = v)
+                            .tooltip(hasGyro ? Component.empty() : noGyroTooltip)
+                            .available(hasGyro)
+                            .binding(hasGyro ? gpCfgDef.flickStick : false, () -> hasGyro ? gpCfg.flickStick : false, v -> gpCfg.flickStick = v)
                             .controller(TickBoxController::new)
                             .available(gyroSensitivity.pendingValue() > 0)
                             .build();

src/main/java/dev/isxander/controlify/controller/gamepad/BuiltinGamepadTheme.java

@@ -9,7 +9,8 @@ public enum BuiltinGamepadTheme implements NameableEnum {
     XBOX_ONE("Xbox One", "xbox_one"),
     DUALSHOCK4("Dualshock 4", "dualshock4"),
     DUALSHOCK3("Dualshock 3", "dualshock3"),
-    DUALSENSE("Dualsense", "dualsense");
+    DUALSENSE("Dualsense", "dualsense"),
+    STEAM_DECK("Steam Deck", "steam_deck");
 
     private final String name, id;
 

src/main/java/dev/isxander/controlify/controller/gamepad/GamepadController.java

@@ -81,16 +81,6 @@ public class GamepadController extends AbstractController<GamepadState, GamepadC
         state = GamepadState.EMPTY;
     }
 
-    public void consumeButtonState() {
-        this.state = new GamepadState(state().gamepadAxes(), state().rawGamepadAxes(), GamepadState.ButtonState.EMPTY, state().gyroDelta(), state().absoluteGyroPos());
-    }
-
-    GLFWGamepadState getGamepadState() {
-        GLFWGamepadState state = GLFWGamepadState.create();
-        GLFW.glfwGetGamepadState(joystickId, state);
-        return state;
-    }
-
     @Override
     public boolean setRumble(float strongMagnitude, float weakMagnitude, RumbleSource source) {
         if (!canRumble()) return false;

src/main/java/dev/isxander/controlify/ingame/ControllerPlayerMovement.java

@@ -16,7 +16,7 @@ public class ControllerPlayerMovement extends Input {
     }
 
     @Override
-    public void tick(boolean slowDown, float f) {
+    public void tick(boolean slowDown, float movementMultiplier) {
         if (Minecraft.getInstance().screen != null || player == null) {
             this.up = false;
             this.down = false;
@@ -46,19 +46,25 @@ public class ControllerPlayerMovement extends Input {
         }
 
         if (slowDown) {
-            this.leftImpulse *= f;
-            this.forwardImpulse *= f;
+            this.leftImpulse *= movementMultiplier;
+            this.forwardImpulse *= movementMultiplier;
         }
 
-        if (!this.jumping && bindings.JUMP.justPressed())
+        // this over-complication is so exiting a GUI with the button still held doesn't trigger a jump.
+        if (bindings.JUMP.justPressed())
             this.jumping = true;
-        else
-            this.jumping = bindings.JUMP.held();
+        if (!bindings.JUMP.held())
+            this.jumping = false;
 
-        if (player.getAbilities().flying || player.isInWater() || !controller.config().toggleSneak) {
-            this.shiftKeyDown = bindings.SNEAK.held();
+        if (player.getAbilities().flying || (player.isInWater() && !player.isOnGround()) || !controller.config().toggleSneak) {
+            if (bindings.SNEAK.justPressed())
+                this.shiftKeyDown = true;
+            if (!bindings.SNEAK.held())
+                this.shiftKeyDown = false;
         } else {
-            this.shiftKeyDown = Minecraft.getInstance().options.keyShift.isDown();
+            if (bindings.SNEAK.justPressed()) {
+                this.shiftKeyDown = !this.shiftKeyDown;
+            }
         }
     }
 }

src/main/java/dev/isxander/controlify/ingame/guide/InGameButtonGuide.java

@@ -154,13 +154,10 @@ public class InGameButtonGuide implements IngameGuideRegistry {
                 return Optional.of(Component.translatable("controlify.guide.dismount"));
             if (player.getAbilities().flying)
                 return Optional.of(Component.translatable("controlify.guide.fly_down"));
-            if (player.isInWater())
+            if (player.isInWater() && !player.isOnGround())
                 return Optional.of(Component.translatable("controlify.guide.swim_down"));
             if (ctx.controller().config().toggleSneak) {
-                if (player.input.shiftKeyDown)
-                    return Optional.of(Component.translatable("controlify.guide.stop_sneaking"));
-                else
-                    return Optional.of(Component.translatable("controlify.guide.start_sneaking"));
+                return Optional.of(Component.translatable(player.input.shiftKeyDown ? "controlify.guide.stop_sneaking" : "controlify.guide.start_sneaking"));
             } else {
                 if (!player.input.shiftKeyDown)
                     return Optional.of(Component.translatable("controlify.guide.sneak"));

src/main/resources/assets/controlify/controllers/controller_identification.json5

@@ -48,7 +48,7 @@
   },
   {
     "name": "Steam Deck",
-    "theme": "xbox_one",
+    "theme": "steam_deck",
 
     "hids": [
       [0x28de, 0x1205],

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

@@ -53,6 +53,7 @@
   "controlify.gui.group.vibration.tooltip": "Adjust how your controller vibrates.",
   "controlify.gui.group.gyro": "Gyro",
   "controlify.gui.group.gyro.tooltip": "Adjust how Controlify treats your controller's built in gyroscope.\nA gyroscope determines how the controller is rotated.",
+  "controlify.gui.group.gyro.no_gyro.tooltip": "This controller does not support Gyro. You must have a Dualsense™ controller or other compatible controller to use this feature.",
   "controlify.gui.gyro_look_sensitivity": "Look Sensitivity",
   "controlify.gui.gyro_look_sensitivity.tooltip": "How much the camera moves based on gyroscope rotation.",
   "controlify.gui.gyro_requires_button": "Require Button",