From 9017b3008c70f1e47adb816b5d401b1d38aacbc9 Mon Sep 17 00:00:00 2001 From: isXander Date: Sat, 6 May 2023 12:51:42 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20rumble=20reported=20as=20u?= =?UTF-8?q?nsupported=20if=20it's=20off?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 2 +- .../controlify/config/gui/YACLHelper.java | 2 +- .../controlify/controller/Controller.java | 6 +-- .../controller/gamepad/GamepadController.java | 9 ++-- .../joystick/CompoundJoystickController.java | 2 +- .../joystick/SingleJoystickController.java | 8 ++-- .../controlify/driver/SDL2GamepadDriver.java | 4 +- .../controlify/driver/SDL2JoystickDriver.java | 44 +++++++++++++++++++ .../controlify/driver/SteamDeckDriver.java | 1 - .../controlify/rumble/RumbleCapable.java | 2 +- .../controlify/rumble/RumbleManager.java | 2 +- .../controlify/test/FakeController.java | 2 +- 12 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 src/main/java/dev/isxander/controlify/driver/SDL2JoystickDriver.java diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cc9e2e..be0eab2 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java b/src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java index 2756e25..51728ca 100644 --- a/src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java +++ b/src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java @@ -256,7 +256,7 @@ public class YACLHelper { } private static OptionGroup makeVibrationGroup(Option globalVibrationOption, Controller controller) { - boolean canRumble = controller.canRumble(); + boolean canRumble = controller.supportsRumble(); var config = controller.config(); var def = controller.defaultConfig(); diff --git a/src/main/java/dev/isxander/controlify/controller/Controller.java b/src/main/java/dev/isxander/controlify/controller/Controller.java index 955292d..1431c86 100644 --- a/src/main/java/dev/isxander/controlify/controller/Controller.java +++ b/src/main/java/dev/isxander/controlify/controller/Controller.java @@ -46,7 +46,7 @@ public interface Controller hidInfo(); @@ -104,7 +104,7 @@ public interface Controller