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

compound joysticks, button guide in screens, improve API

Browse Source
This commit is contained in:
isXander
2023-03-26 18:13:02 +01:00
parent de210df84f
commit 0d9321e3ba
55 changed files with 1188 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dev/isxander/controlify/bindings/JoystickAxisBind.java
View File

@ -18,11 +18,11 @@ import java.util.Objects;
public class JoystickAxisBind implements IBind<JoystickState> {
public static final String BIND_ID = "joystick_axis";
private final JoystickController joystick;
private final JoystickController<?> joystick;
private final int axisIndex;
private final AxisDirection direction;
public JoystickAxisBind(JoystickController joystick, int axisIndex, AxisDirection direction) {
public JoystickAxisBind(JoystickController<?> joystick, int axisIndex, AxisDirection direction) {
this.joystick = joystick;
this.axisIndex = axisIndex;
this.direction = direction;
@ -93,7 +93,7 @@ public class JoystickAxisBind implements IBind<JoystickState> {
return Objects.hash(axisIndex, direction);
}
public static JoystickAxisBind fromJson(JsonObject object, JoystickController joystick) {
public static JoystickAxisBind fromJson(JsonObject object, JoystickController<?> joystick) {
var axisIndex = object.get("axis").getAsInt();
var direction = AxisDirection.valueOf(object.get("direction").getAsString());
return new JoystickAxisBind(joystick, axisIndex, direction);