1
0
forked from Clones/Controlify

🐛 fix rumble reported as unsupported if it's off

This commit is contained in:
isXander
2023-05-06 12:51:42 +01:00
parent ede64f471f
commit 9017b3008c
12 changed files with 61 additions and 23 deletions

View File

@ -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() {
return drivers.rumbleDriver().isRumbleSupported()
&& config().allowVibrations;
public boolean supportsRumble() {
return drivers.rumbleDriver().isRumbleSupported();
}
@Override