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

controller hid identification + ps4 buttons

Browse Source
This commit is contained in:
isXander
2023-02-03 19:23:08 +00:00
parent 5bd390f2b1
commit c9b0870af3
54 changed files with 302 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/dev/isxander/controlify/Controlify.java
View File

@ -5,6 +5,7 @@ import dev.isxander.controlify.compatibility.screen.ScreenProcessorProvider;
import dev.isxander.controlify.config.ControlifyConfig;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.controller.ControllerState;
import dev.isxander.controlify.controller.hid.ControllerHIDService;
import dev.isxander.controlify.event.ControlifyEvents;
import dev.isxander.controlify.ingame.InGameInputHandler;
import dev.isxander.controlify.mixins.feature.virtualmouse.MouseHandlerAccessor;
@ -24,51 +25,65 @@ public class Controlify {
private InGameInputHandler inGameInputHandler;
private VirtualMouseHandler virtualMouseHandler;
private InputMode currentInputMode;
private ControllerHIDService controllerHIDService;
private final ControlifyConfig config = new ControlifyConfig();
public void onInitializeInput() {
Minecraft minecraft = Minecraft.getInstance();
inGameInputHandler = new InGameInputHandler(Controller.DUMMY); // initialize with dummy controller before connection in case of no controllers
controllerHIDService = new ControllerHIDService();
// find already connected controllers
for (int i = 0; i < GLFW.GLFW_JOYSTICK_LAST; i++) {
if (GLFW.glfwJoystickPresent(i)) {
setCurrentController(Controller.byId(i));
LOGGER.info("Controller found: " + currentController.name());
int jid = i;
controllerHIDService.awaitNextDevice(device -> {
setCurrentController(Controller.create(jid, device));
LOGGER.info("Controller found: " + currentController.name());
});
}
}
controllerHIDService.start();
// load after initial controller discovery
config().load();
// listen for new controllers
GLFW.glfwSetJoystickCallback((jid, event) -> {
if (event == GLFW.GLFW_CONNECTED) {
setCurrentController(Controller.byId(jid));
LOGGER.info("Controller connected: " + currentController.name());
this.setCurrentInputMode(InputMode.CONTROLLER);
controllerHIDService.awaitNextDevice(device -> {
setCurrentController(Controller.create(jid, device));
LOGGER.info("Controller connected: " + currentController.name() + " (" + device.getPath() + ")");
this.setCurrentInputMode(InputMode.CONTROLLER);
config().load(); // load config again if a configuration already exists for this controller
config().save(); // save config if it doesn't exist
config().load(); // load config again if a configuration already exists for this controller
config().save(); // save config if it doesn't exist
minecraft.getToasts().addToast(SystemToast.multiline(
minecraft,
SystemToast.SystemToastIds.PERIODIC_NOTIFICATION,
Component.translatable("controlify.toast.controller_connected.title"),
Component.translatable("controlify.toast.controller_connected.description")
));
});
minecraft.getToasts().addToast(SystemToast.multiline(
minecraft,
SystemToast.SystemToastIds.PERIODIC_NOTIFICATION,
Component.translatable("controlify.toast.controller_connected.title"),
Component.translatable("controlify.toast.controller_connected.description")
));
} else if (event == GLFW.GLFW_DISCONNECTED) {
var controller = Controller.CONTROLLERS.remove(jid);
setCurrentController(Controller.CONTROLLERS.values().stream().filter(Controller::connected).findFirst().orElse(null));
LOGGER.info("Controller disconnected: " + controller.name());
this.setCurrentInputMode(currentController == null ? InputMode.KEYBOARD_MOUSE : InputMode.CONTROLLER);
if (controller != null) {
setCurrentController(Controller.CONTROLLERS.values().stream().filter(Controller::connected).findFirst().orElse(null));
LOGGER.info("Controller disconnected: " + controller.name());
this.setCurrentInputMode(currentController == null ? InputMode.KEYBOARD_MOUSE : InputMode.CONTROLLER);
minecraft.getToasts().addToast(SystemToast.multiline(
minecraft,
SystemToast.SystemToastIds.PERIODIC_NOTIFICATION,
Component.translatable("controlify.toast.controller_disconnected.title"),
Component.translatable("controlify.toast.controller_disconnected.description", controller.name())
));
minecraft.getToasts().addToast(SystemToast.multiline(
minecraft,
SystemToast.SystemToastIds.PERIODIC_NOTIFICATION,
Component.translatable("controlify.toast.controller_disconnected.title"),
Component.translatable("controlify.toast.controller_disconnected.description", controller.name())
));
}
}
});

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

@ -28,12 +28,10 @@ public enum Bind {
private final BiFunction<ControllerState, Controller, Boolean> state;
private final String identifier;
private final ResourceLocation textureLocation;
Bind(BiFunction<ControllerState, Controller, Boolean> state, String identifier) {
this.state = state;
this.identifier = identifier;
this.textureLocation = new ResourceLocation("controlify", "textures/gui/buttons/xbox/" + identifier + ".png");
}
Bind(Function<ControllerState, Boolean> state, String identifier) {
@ -48,8 +46,8 @@ public enum Bind {
return identifier;
}
public ResourceLocation textureLocation() {
return textureLocation;
public ResourceLocation textureLocation(Controller controller) {
return new ResourceLocation("controlify", "textures/gui/buttons/" + controller.config().theme.id(controller) + "/" + identifier + ".png");
}
public static Bind fromIdentifier(String identifier) {

28
src/main/java/dev/isxander/controlify/bindings/ControllerTheme.java Normal file
View File

@ -0,0 +1,28 @@
package dev.isxander.controlify.bindings;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.yacl.api.NameableEnum;
import net.minecraft.network.chat.Component;
import java.util.function.Function;
public enum ControllerTheme implements NameableEnum {
AUTO(c -> c.type().theme().id(c)),
XBOX_ONE(c -> "xbox"),
DUALSHOCK4(c -> "dualshock4");
private final Function<Controller, String> idGetter;
ControllerTheme(Function<Controller, String> idGetter) {
this.idGetter = idGetter;
}
public String id(Controller controller) {
return idGetter.apply(controller);
}
@Override
public Component getDisplayName() {
return Component.translatable("controlify.controller_theme." + name().toLowerCase());
}
}

4
src/main/java/dev/isxander/controlify/config/ControlifyConfig.java
View File

@ -57,7 +57,7 @@ public class ControlifyConfig {
for (var controller : Controller.CONTROLLERS.values()) {
// `add` replaces if already existing
// TODO: find a better way to identify controllers, GUID will report the same for multiple controllers of the same model
newControllerData.add(controller.guid(), generateControllerConfig(controller));
newControllerData.add(controller.uid(), generateControllerConfig(controller));
}
controllerData = newControllerData;
@ -84,7 +84,7 @@ public class ControlifyConfig {
JsonObject controllers = object.getAsJsonObject("controllers");
if (controllers != null) {
for (var controller : Controller.CONTROLLERS.values()) {
var settings = controllers.getAsJsonObject(controller.guid());
var settings = controllers.getAsJsonObject(controller.uid());
if (settings != null) {
applyControllerConfig(controller, settings);
}

6
src/main/java/dev/isxander/controlify/config/gui/BindButtonController.java
View File

@ -19,9 +19,11 @@ import org.lwjgl.glfw.GLFW;
public class BindButtonController implements Controller<Bind> {
private final Option<Bind> option;
private final dev.isxander.controlify.controller.Controller controller;
public BindButtonController(Option<Bind> option) {
public BindButtonController(Option<Bind> option, dev.isxander.controlify.controller.Controller controller) {
this.option = option;
this.controller = controller;
}
@Override
@ -52,7 +54,7 @@ public class BindButtonController implements Controller<Bind> {
if (awaitingControllerInput) {
textRenderer.drawShadow(matrices, awaitingText, getDimension().xLimit() - textRenderer.width(awaitingText) - getXPadding(), getDimension().centerY() - textRenderer.lineHeight / 2f, 0xFFFFFF);
} else {
ButtonRenderer.drawButton(control.option().pendingValue(), matrices, getDimension().xLimit() - ButtonRenderer.BUTTON_SIZE / 2, getDimension().centerY(), ButtonRenderer.BUTTON_SIZE);
ButtonRenderer.drawButton(control.option().pendingValue(), control.controller, matrices, getDimension().xLimit() - ButtonRenderer.BUTTON_SIZE / 2, getDimension().centerY(), ButtonRenderer.BUTTON_SIZE);
}
}

11
src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java
View File

@ -2,11 +2,13 @@ package dev.isxander.controlify.config.gui;
import dev.isxander.controlify.Controlify;
import dev.isxander.controlify.bindings.Bind;
import dev.isxander.controlify.bindings.ControllerTheme;
import dev.isxander.controlify.config.GlobalSettings;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.controller.ControllerConfig;
import dev.isxander.yacl.api.*;
import dev.isxander.yacl.gui.controllers.cycling.CyclingListController;
import dev.isxander.yacl.gui.controllers.cycling.EnumController;
import dev.isxander.yacl.gui.controllers.slider.FloatSliderController;
import dev.isxander.yacl.gui.controllers.slider.IntegerSliderController;
import dev.isxander.yacl.gui.controllers.string.StringController;
@ -102,6 +104,13 @@ public class YACLHelper {
.tooltip(Component.translatable("controlify.gui.right_trigger_threshold.tooltip"))
.binding(def.rightTriggerActivationThreshold, () -> config.rightTriggerActivationThreshold, v -> config.rightTriggerActivationThreshold = v)
.controller(opt -> new FloatSliderController(opt, 0, 1, 0.05f, v -> Component.literal(String.format("%.0f%%", v*100))))
.build())
.option(Option.createBuilder(ControllerTheme.class)
.name(Component.translatable("controlify.gui.controller_theme"))
.tooltip(Component.translatable("controlify.gui.controller_theme.tooltip"))
.binding(def.theme, () -> config.theme, v -> config.theme = v)
.controller(EnumController::new)
.instant(true)
.build());
category.group(configGroup.build());
@ -111,7 +120,7 @@ public class YACLHelper {
controlsGroup.option(Option.createBuilder(Bind.class)
.name(control.name())
.binding(control.defaultBind(), control::currentBind, control::setCurrentBind)
.controller(BindButtonController::new)
.controller(opt -> new BindButtonController(opt, controller))
.build());
}
category.group(controlsGroup.build());

43
src/main/java/dev/isxander/controlify/controller/Controller.java
View File

@ -1,7 +1,10 @@
package dev.isxander.controlify.controller;
import dev.isxander.controlify.bindings.ControllerBindings;
import dev.isxander.controlify.bindings.ControllerTheme;
import dev.isxander.controlify.controller.hid.HIDIdentifier;
import dev.isxander.controlify.event.ControlifyEvents;
import org.hid4java.HidDevice;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.glfw.GLFWGamepadState;
@ -11,12 +14,14 @@ import java.util.Objects;
public final class Controller {
public static final Map<Integer, Controller> CONTROLLERS = new HashMap<>();
public static final Controller DUMMY = new Controller(-1, "DUMMY", "DUMMY", false);
public static final Controller DUMMY = new Controller(-1, "DUMMY", "DUMMY", false, "DUMMY", ControllerType.UNKNOWN);
private final int id;
private final int joystickId;
private final String guid;
private final String name;
private final boolean gamepad;
private final String uid;
private final ControllerType type;
private ControllerState state = ControllerState.EMPTY;
private ControllerState prevState = ControllerState.EMPTY;
@ -24,11 +29,13 @@ public final class Controller {
private final ControllerBindings bindings = new ControllerBindings(this);
private ControllerConfig config = new ControllerConfig();
public Controller(int id, String guid, String name, boolean gamepad) {
this.id = id;
public Controller(int joystickId, String guid, String name, boolean gamepad, String uid, ControllerType type) {
this.joystickId = joystickId;
this.guid = guid;
this.name = name;
this.gamepad = gamepad;
this.uid = uid;
this.type = type;
}
public ControllerState state() {
@ -63,24 +70,32 @@ public final class Controller {
}
public boolean connected() {
return GLFW.glfwJoystickPresent(id);
return GLFW.glfwJoystickPresent(joystickId);
}
GLFWGamepadState getGamepadState() {
GLFWGamepadState state = GLFWGamepadState.create();
if (gamepad)
GLFW.glfwGetGamepadState(id, state);
GLFW.glfwGetGamepadState(joystickId, state);
return state;
}
public int id() {
return id;
return joystickId;
}
public String guid() {
return guid;
}
public String uid() {
return uid;
}
public ControllerType type() {
return type;
}
public String name() {
if (config().customName != null)
return config().customName;
@ -112,7 +127,7 @@ public final class Controller {
return Objects.hash(guid);
}
public static Controller byId(int id) {
public static Controller create(int id, HidDevice device) {
if (id > GLFW.GLFW_JOYSTICK_LAST)
throw new IllegalArgumentException("Invalid joystick id: " + id);
if (CONTROLLERS.containsKey(id))
@ -120,10 +135,16 @@ public final class Controller {
String guid = GLFW.glfwGetJoystickGUID(id);
boolean gamepad = GLFW.glfwJoystickIsGamepad(id);
String name = gamepad ? GLFW.glfwGetGamepadName(id) : GLFW.glfwGetJoystickName(id);
if (name == null) name = Integer.toString(id);
String fallbackName = gamepad ? GLFW.glfwGetGamepadName(id) : GLFW.glfwGetJoystickName(id);
String uid = device.getPath();
ControllerType type = ControllerType.getTypeForHID(new HIDIdentifier(device.getVendorId(), device.getProductId()));
String name = type != ControllerType.UNKNOWN || fallbackName == null ? type.friendlyName() : fallbackName;
int tries = 1;
while (CONTROLLERS.values().stream().map(Controller::name).anyMatch(name::equals)) {
name = type.friendlyName() + " (" + tries++ + ")";
}
Controller controller = new Controller(id, guid, name, gamepad);
Controller controller = new Controller(id, guid, name, gamepad, uid, type);
CONTROLLERS.put(id, controller);
return controller;

4
src/main/java/dev/isxander/controlify/controller/ControllerConfig.java
View File

@ -1,5 +1,7 @@
package dev.isxander.controlify.controller;
import dev.isxander.controlify.bindings.ControllerTheme;
public class ControllerConfig {
public static final ControllerConfig DEFAULT = new ControllerConfig();
@ -20,5 +22,7 @@ public class ControllerConfig {
public float virtualMouseSensitivity = 1f;
public ControllerTheme theme = ControllerTheme.AUTO;
public String customName = null;
}

63
src/main/java/dev/isxander/controlify/controller/ControllerType.java Normal file
View File

@ -0,0 +1,63 @@
package dev.isxander.controlify.controller;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import dev.isxander.controlify.bindings.ControllerTheme;
import dev.isxander.controlify.controller.hid.HIDIdentifier;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Map;
public enum ControllerType {
UNKNOWN("Unknown Controller", ControllerTheme.XBOX_ONE),
XBOX_ONE("Xbox Controller", ControllerTheme.XBOX_ONE),
XBOX_360("Xbox 360 Controller", ControllerTheme.XBOX_ONE),
DUALSHOCK4("PS4 Controller", ControllerTheme.DUALSHOCK4);
private static final Gson GSON = new GsonBuilder().setLenient().create();
private static Map<HIDIdentifier, ControllerType> typeMap = null;
private final String friendlyName;
private final ControllerTheme theme;
ControllerType(String friendlyName, ControllerTheme theme) {
this.friendlyName = friendlyName;
this.theme = theme;
}
public String friendlyName() {
return friendlyName;
}
public ControllerTheme theme() {
return theme;
}
public static ControllerType getTypeForHID(HIDIdentifier hid) {
if (typeMap != null) return typeMap.getOrDefault(hid, UNKNOWN);
typeMap = new HashMap<>();
try {
try (var hidDb = ControllerType.class.getResourceAsStream("/hiddb.json5")) {
var json = GSON.fromJson(new InputStreamReader(hidDb), JsonObject.class);
for (var type : ControllerType.values()) {
if (!json.has(type.name().toLowerCase())) continue;
var themeJson = json.getAsJsonObject(type.name().toLowerCase());
int vendorId = themeJson.get("vendor").getAsInt();
for (var productIdEntry : themeJson.getAsJsonArray("product")) {
int productId = productIdEntry.getAsInt();
typeMap.put(new HIDIdentifier(vendorId, productId), type);
}
}
}
} catch (Exception e) {
e.printStackTrace();
}
return typeMap.getOrDefault(hid, UNKNOWN);
}
}

68
src/main/java/dev/isxander/controlify/controller/hid/ControllerHIDService.java Normal file
View File

@ -0,0 +1,68 @@
package dev.isxander.controlify.controller.hid;
import dev.isxander.controlify.Controlify;
import org.hid4java.*;
import org.hid4java.event.HidServicesEvent;
import java.util.ArrayDeque;
import java.util.Queue;
import java.util.Set;
import java.util.function.Consumer;
public class ControllerHIDService implements HidServicesListener {
// https://learn.microsoft.com/en-us/windows-hardware/drivers/hid/hid-usages#usage-page
private static final Set<Integer> CONTROLLER_USAGE_IDS = Set.of(
0x04, // Joystick
0x05, // Gamepad
0x08 // Multi-axis Controller
);
private final HidServicesSpecification specification;
private final Queue<Consumer<HidDevice>> deviceQueue;
public ControllerHIDService() {
this.deviceQueue = new ArrayDeque<>();
this.specification = new HidServicesSpecification();
specification.setAutoStart(false);
specification.setScanInterval(2000); // long interval, so we can guarantee this runs after GLFW hook
}
public void start() {
var services = HidManager.getHidServices(specification);
services.addHidServicesListener(this);
services.start();
}
public void awaitNextDevice(Consumer<HidDevice> consumer) {
deviceQueue.add(consumer);
}
@Override
public void hidDeviceAttached(HidServicesEvent event) {
var device = event.getHidDevice();
if (isController(device)) {
if (deviceQueue.peek() != null) {
deviceQueue.poll().accept(event.getHidDevice());
}
}
}
private boolean isController(HidDevice device) {
var isGenericDesktopControlOrGameControl = device.getUsagePage() == 0x1 || device.getUsagePage() == 0x5;
var isController = CONTROLLER_USAGE_IDS.contains(device.getUsage());
return isGenericDesktopControlOrGameControl && isController;
}
@Override
public void hidDeviceDetached(HidServicesEvent event) {
}
@Override
public void hidFailure(HidServicesEvent event) {
}
}

4
src/main/java/dev/isxander/controlify/controller/hid/HIDIdentifier.java Normal file
View File

@ -0,0 +1,4 @@
package dev.isxander.controlify.controller.hid;
public record HIDIdentifier(int vendorId, int productId) {
}

5
src/main/java/dev/isxander/controlify/gui/ButtonRenderer.java
View File

@ -3,13 +3,14 @@ package dev.isxander.controlify.gui;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import dev.isxander.controlify.bindings.Bind;
import dev.isxander.controlify.controller.Controller;
import net.minecraft.client.gui.GuiComponent;
public class ButtonRenderer {
public static final int BUTTON_SIZE = 22;
public static void drawButton(Bind button, PoseStack poseStack, int x, int y, int size) {
RenderSystem.setShaderTexture(0, button.textureLocation());
public static void drawButton(Bind button, Controller controller, PoseStack poseStack, int x, int y, int size) {
RenderSystem.setShaderTexture(0, button.textureLocation(controller));
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
GuiComponent.blit(poseStack, x - size / 2, y - size / 2, 0, 0, BUTTON_SIZE, BUTTON_SIZE, BUTTON_SIZE, BUTTON_SIZE);