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

🐛 Fix crashes with some unmapped joysticks. (close #61)

Browse Source
This commit is contained in:
isXander
2023-05-05 17:34:51 +01:00
parent 834b7e9f6f
commit 3969d9312e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,10 @@ import dev.isxander.controlify.controller.joystick.render.JoystickRenderer;
import net.minecraft.network.chat.Component;
import org.lwjgl.glfw.GLFW;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import java.util.Optional;
public class UnmappedJoystickMapping implements JoystickMapping {
public static final UnmappedJoystickMapping EMPTY = new UnmappedJoystickMapping(0, 0, 0);
@ -33,9 +37,9 @@ public class UnmappedJoystickMapping implements JoystickMapping {
public UnmappedJoystickMapping(int joystickId) {
this(
GLFW.glfwGetJoystickAxes(joystickId).limit(),
GLFW.glfwGetJoystickButtons(joystickId).limit(),
GLFW.glfwGetJoystickHats(joystickId).limit()
Optional.ofNullable(GLFW.glfwGetJoystickAxes(joystickId)).map(FloatBuffer::limit).orElse(0),
Optional.ofNullable(GLFW.glfwGetJoystickButtons(joystickId)).map(ByteBuffer::limit).orElse(0),
Optional.ofNullable(GLFW.glfwGetJoystickHats(joystickId)).map(ByteBuffer::limit).orElse(0)
);
}