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

🐛 Fix hotplugging controllers when no controllers were connected on startup

Browse Source
This commit is contained in:
isXander
2023-06-11 21:51:01 +01:00
parent 35c17bde33
commit 3c9d6f2b53
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,8 @@ public class Controlify implements ControlifyApi {
} }
} }
ClientTickEvents.START_CLIENT_TICK.register(this::tick);
// listen for new controllers // listen for new controllers
GLFW.glfwSetJoystickCallback((jid, event) -> { GLFW.glfwSetJoystickCallback((jid, event) -> {
try { try {
@ -119,7 +121,11 @@ public class Controlify implements ControlifyApi {
if (nativeOnboardingFuture != null) return nativeOnboardingFuture; if (nativeOnboardingFuture != null) return nativeOnboardingFuture;
if (config().globalSettings().vibrationOnboarded) { if (config().globalSettings().vibrationOnboarded) {
return CompletableFuture.completedFuture(config().globalSettings().loadVibrationNatives); boolean loadNatives = config().globalSettings().loadVibrationNatives;
if (loadNatives && !SDL2NativesManager.isInitialised()) {
SDL2NativesManager.initialise();
}
return CompletableFuture.completedFuture(loadNatives);
} }
nativeOnboardingFuture = new CompletableFuture<>(); nativeOnboardingFuture = new CompletableFuture<>();
@ -180,8 +186,6 @@ public class Controlify implements ControlifyApi {
config().saveIfDirty(); config().saveIfDirty();
} }
ClientTickEvents.START_CLIENT_TICK.register(this::tick);
FabricLoader.getInstance().getEntrypoints("controlify", ControlifyEntrypoint.class).forEach(entrypoint -> { FabricLoader.getInstance().getEntrypoints("controlify", ControlifyEntrypoint.class).forEach(entrypoint -> {
try { try {
entrypoint.onControllersDiscovered(this); entrypoint.onControllersDiscovered(this);

8
src/main/java/dev/isxander/controlify/controller/sdl2/SDL2NativesManager.java
View File

@ -31,9 +31,11 @@ public class SDL2NativesManager {
private static final String NATIVE_LIBRARY_URL = "https://maven.isxander.dev/releases/dev/isxander/sdl2-jni-natives/%s/".formatted(SDL2_VERSION); private static final String NATIVE_LIBRARY_URL = "https://maven.isxander.dev/releases/dev/isxander/sdl2-jni-natives/%s/".formatted(SDL2_VERSION);
private static boolean loaded = false; private static boolean loaded = false;
private static boolean initialised = false;
public static void initialise() { public static void initialise() {
if (loaded) return; if (initialised) return;
initialised = true;
DebugLog.log("Initialising SDL2 native library"); DebugLog.log("Initialising SDL2 native library");
@ -124,6 +126,10 @@ public class SDL2NativesManager {
return loaded; return loaded;
} }
public static boolean isInitialised() {
return initialised;
}
private record Target(Util.OS os, boolean is64Bit, boolean isARM) { private record Target(Util.OS os, boolean is64Bit, boolean isARM) {
public static final Target CURRENT = Util.make(() -> { public static final Target CURRENT = Util.make(() -> {
Util.OS os = Util.getPlatform(); Util.OS os = Util.getPlatform();