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

7
src/main/java/dev/isxander/controlify/controller/joystick/CompoundJoystickController.java
View File

@ -6,6 +6,7 @@ import com.google.gson.JsonElement;
import dev.isxander.controlify.Controlify;
import dev.isxander.controlify.bindings.ControllerBindings;
import dev.isxander.controlify.controller.ControllerType;
import dev.isxander.controlify.controller.hid.ControllerHIDService;
import dev.isxander.controlify.controller.joystick.mapping.JoystickMapping;
import dev.isxander.controlify.controller.joystick.mapping.RPJoystickMapping;
import dev.isxander.controlify.rumble.RumbleCapable;
@ -14,6 +15,7 @@ import dev.isxander.controlify.rumble.RumbleSource;
import org.lwjgl.glfw.GLFW;
import java.util.List;
import java.util.Optional;
public class CompoundJoystickController implements JoystickController<JoystickConfig>, RumbleCapable {
private final String uid;
@ -177,4 +179,9 @@ public class CompoundJoystickController implements JoystickController<JoystickCo
private int getHatCountForJoystick(int joystick) {
return GLFW.glfwGetJoystickHats(joystick).capacity();
}
@Override
public Optional<ControllerHIDService.ControllerHIDInfo> hidInfo() {
return Optional.empty();
}
}

2
src/main/java/dev/isxander/controlify/controller/joystick/mapping/UnmappedJoystickMapping.java
View File

@ -20,7 +20,7 @@ public class UnmappedJoystickMapping implements JoystickMapping {
this.axes[i] = new UnmappedAxis(i, new GenericRenderer.Axis(Integer.toString(i + 1)));
}
this.buttons = new UnmappedButton[axisCount];
this.buttons = new UnmappedButton[buttonCount];
for (int i = 0; i < buttonCount; i++) {
this.buttons[i] = new UnmappedButton(i, new GenericRenderer.Button(Integer.toString(i + 1)));
}