🐛 fix rumble reported as unsupported if it's off

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ quilt_mappings = "10"
 fabric_loader = "0.14.19"
 fabric_api = "0.78.0+1.19.4"
 mixin_extras = "0.2.0-beta.6"
-yet_another_config_lib = "2.5.0+1.19.4"
+yet_another_config_lib = "2.5.1+1.19.4"
 mod_menu = "6.1.0-rc.4"
 hid4java = "0.7.0"
 quilt_json5 = "1.0.3"

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

@@ -256,7 +256,7 @@ public class YACLHelper {
     }
 
     private static OptionGroup makeVibrationGroup(Option<Boolean> globalVibrationOption, Controller<?, ?> controller) {
-        boolean canRumble = controller.canRumble();
+        boolean canRumble = controller.supportsRumble();
         var config = controller.config();
         var def = controller.defaultConfig();
 

src/main/java/dev/isxander/controlify/controller/Controller.java

@@ -46,7 +46,7 @@ public interface Controller<S extends ControllerState, C extends ControllerConfi
     default void close() {}
 
     RumbleManager rumbleManager();
-    boolean canRumble();
+    boolean supportsRumble();
 
     Optional<ControllerHIDService.ControllerHIDInfo> hidInfo();
 
@@ -104,7 +104,7 @@ public interface Controller<S extends ControllerState, C extends ControllerConfi
             }
 
             @Override
-            public boolean canRumble() {
+            public boolean supportsRumble() {
                 return false;
             }
         });
@@ -196,7 +196,7 @@ public interface Controller<S extends ControllerState, C extends ControllerConfi
         }
 
         @Override
-        public boolean canRumble() {
+        public boolean supportsRumble() {
             return false;
         }
     };

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

@@ -1,7 +1,5 @@
 package dev.isxander.controlify.controller.gamepad;
 
-import dev.isxander.controlify.InputMode;
-import dev.isxander.controlify.api.ControlifyApi;
 import dev.isxander.controlify.bindings.ControllerBindings;
 import dev.isxander.controlify.controller.AbstractController;
 import dev.isxander.controlify.controller.hid.ControllerHIDService;
@@ -83,7 +81,7 @@ public class GamepadController extends AbstractController<GamepadState, GamepadC
 
     @Override
     public boolean setRumble(float strongMagnitude, float weakMagnitude, RumbleSource source) {
-        if (!canRumble()) return false;
+        if (!supportsRumble() || !config().allowVibrations) return false;
 
         var strengthMod = config().getRumbleStrength(source);
         if (source != RumbleSource.MASTER)
@@ -96,9 +94,8 @@ public class GamepadController extends AbstractController<GamepadState, GamepadC
     }
 
     @Override
-    public boolean canRumble() {
+    public boolean supportsRumble() {
-        return drivers.rumbleDriver().isRumbleSupported()
+        return drivers.rumbleDriver().isRumbleSupported();
-                && config().allowVibrations;
     }
 
     @Override

src/main/java/dev/isxander/controlify/controller/joystick/CompoundJoystickController.java

@@ -148,7 +148,7 @@ public class CompoundJoystickController implements JoystickController<JoystickCo
     }
 
     @Override
-    public boolean canRumble() {
+    public boolean supportsRumble() {
         return false;
     }
 

src/main/java/dev/isxander/controlify/controller/joystick/SingleJoystickController.java

@@ -94,7 +94,7 @@ public class SingleJoystickController extends AbstractController<JoystickState,
 
     @Override
     public boolean setRumble(float strongMagnitude, float weakMagnitude, RumbleSource source) {
-        if (!canRumble()) return false;
+        if (!supportsRumble()) return false;
 
         var strengthMod = config().getRumbleStrength(source);
         if (source != RumbleSource.MASTER)
@@ -113,10 +113,8 @@ public class SingleJoystickController extends AbstractController<JoystickState,
     }
 
     @Override
-    public boolean canRumble() {
+    public boolean supportsRumble() {
-        return rumbleSupported
+        return rumbleSupported;
-                && config().allowVibrations
-                && ControlifyApi.get().currentInputMode() == InputMode.CONTROLLER;
     }
 
     @Override

src/main/java/dev/isxander/controlify/driver/SDL2GamepadDriver.java

@@ -59,11 +59,11 @@ public class SDL2GamepadDriver implements GyroDriver, RumbleDriver {
 
     @Override
     public String getGyroDetails() {
-        return "SDL2 supported=%s".formatted(isGyroSupported);
+        return "SDL2gp supported=" + isGyroSupported();
     }
 
     @Override
     public String getRumbleDetails() {
-        return "SDL2 supported=%s".formatted(isRumbleSupported);
+        return "SDL2gp supported=" + isRumbleSupported();
     }
 }

src/main/java/dev/isxander/controlify/driver/SDL2JoystickDriver.java

@@ -0,0 +1,44 @@
+package dev.isxander.controlify.driver;
+
+import dev.isxander.controlify.Controlify;
+import org.libsdl.SDL;
+
+public class SDL2JoystickDriver implements RumbleDriver {
+    private final long ptrJoystick;
+    private final boolean isRumbleSupported;
+
+    public SDL2JoystickDriver(int jid) {
+        this.ptrJoystick = SDL.SDL_JoystickOpen(jid);
+        this.isRumbleSupported = SDL.SDL_JoystickHasRumble(ptrJoystick);
+    }
+
+    @Override
+    public void update() {
+
+    }
+
+    @Override
+    public boolean rumble(float strongMagnitude, float weakMagnitude) {
+        // duration of 0 is infinite
+        if (!SDL.SDL_JoystickRumble(ptrJoystick, (int)(strongMagnitude * 65535.0F), (int)(weakMagnitude * 65535.0F), 0)) {
+            Controlify.LOGGER.error("Could not rumble controller: " + SDL.SDL_GetError());
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public boolean isRumbleSupported() {
+        return isRumbleSupported;
+    }
+
+    @Override
+    public String getRumbleDetails() {
+        return "SDL2joy supported=" + isRumbleSupported();
+    }
+
+    @Override
+    public void close() {
+        SDL.SDL_JoystickClose(ptrJoystick);
+    }
+}

src/main/java/dev/isxander/controlify/driver/SteamDeckDriver.java

@@ -2,7 +2,6 @@ package dev.isxander.controlify.driver;
 
 import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.controller.gamepad.GamepadState;
-import dev.isxander.controlify.controller.hid.HIDIdentifier;
 import org.hid4java.HidDevice;
 
 import java.util.Arrays;

src/main/java/dev/isxander/controlify/rumble/RumbleCapable.java

@@ -3,5 +3,5 @@ package dev.isxander.controlify.rumble;
 public interface RumbleCapable {
     boolean setRumble(float strongMagnitude, float weakMagnitude, RumbleSource source);
 
-    boolean canRumble();
+    boolean supportsRumble();
 }

src/main/java/dev/isxander/controlify/rumble/RumbleManager.java

@@ -21,7 +21,7 @@ public class RumbleManager {
     }
 
     public void play(RumbleSource source, RumbleEffect effect) {
-        if (!controller.canRumble())
+        if (!controller.supportsRumble())
             return;
 
         effectQueue.add(new RumbleEffectInstance(source, effect));

src/testmod/java/dev/isxander/controlify/test/FakeController.java

@@ -47,7 +47,7 @@ public class FakeController implements JoystickController<JoystickConfig> {
             }
 
             @Override
-            public boolean canRumble() {
+            public boolean supportsRumble() {
                 return false;
             }
         });