djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

fix bugs:

Browse Source 
fix reconnecting controllers are unidentified
fix some mod keybinds failing to register
fix crash with unmapped joysticks
This commit is contained in:
isXander
2023-05-02 12:30:34 +01:00
parent 4e076631a4
commit 681eabd90a
12 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/dev/isxander/controlify/controller/AbstractController.java
View File

@ -16,6 +16,7 @@ import org.libsdl.SDL;
import org.lwjgl.glfw.GLFW;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
public abstract class AbstractController<S extends ControllerState, C extends ControllerConfig> implements Controller<S, C>, RumbleCapable {
@ -24,6 +25,7 @@ public abstract class AbstractController<S extends ControllerState, C extends Co
private final String uid;
private final String guid;
private final ControllerType type;
private final ControllerHIDService.ControllerHIDInfo hidInfo;
protected ControllerBindings<S> bindings;
protected C config, defaultConfig;
@ -34,6 +36,8 @@ public abstract class AbstractController<S extends ControllerState, C extends Co
if (!GLFW.glfwJoystickPresent(joystickId))
throw new IllegalArgumentException("Joystick " + joystickId + " is not present and cannot be initialised!");
this.hidInfo = hidInfo;
this.joystickId = joystickId;
this.guid = GLFW.glfwGetJoystickGUID(joystickId);
@ -121,6 +125,11 @@ public abstract class AbstractController<S extends ControllerState, C extends Co
}
}
@Override
public Optional<ControllerHIDService.ControllerHIDInfo> hidInfo() {
return Optional.of(hidInfo);
}
@Override
public boolean equals(Object o) {
if (this == o) return true;