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

🐛 Catch errors with controller detection, so they still load on failure

Browse Source
This commit is contained in:
isXander
2023-08-06 23:28:04 +01:00
parent 2069f1ab6d
commit 372cfa69c3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ public class Controlify implements ControlifyApi {
this.onControllerDisconnect(jid); this.onControllerDisconnect(jid);
} }
}); });
} catch (Exception e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();
} }
}); });
@ -203,7 +203,7 @@ public class Controlify implements ControlifyApi {
FabricLoader.getInstance().getEntrypoints("controlify", ControlifyEntrypoint.class).forEach(entrypoint -> { FabricLoader.getInstance().getEntrypoints("controlify", ControlifyEntrypoint.class).forEach(entrypoint -> {
try { try {
entrypoint.onControllersDiscovered(this); entrypoint.onControllersDiscovered(this);
} catch (Exception e) { } catch (Throwable e) {
Log.LOGGER.error("Failed to run `onControllersDiscovered` on Controlify entrypoint: " + entrypoint.getClass().getName(), e); Log.LOGGER.error("Failed to run `onControllersDiscovered` on Controlify entrypoint: " + entrypoint.getClass().getName(), e);
} }
}); });

10
src/main/java/dev/isxander/controlify/hid/ControllerHIDService.java
View File

@ -48,13 +48,21 @@ public class ControllerHIDService {
} }
public ControllerHIDInfo fetchType(int jid) { public ControllerHIDInfo fetchType(int jid) {
ControllerHIDInfo info = fetchType0(jid); ControllerHIDInfo info;
try {
info = fetchType0(jid);
} catch (Throwable e) {
Log.LOGGER.error("Failed to fetch controller type!", e);
info = new ControllerHIDInfo(ControllerType.UNKNOWN, Optional.empty());
}
if (DebugProperties.PRINT_VID_PID) { if (DebugProperties.PRINT_VID_PID) {
info.hidDevice.ifPresent(hid -> { info.hidDevice.ifPresent(hid -> {
var hex = HexFormat.of().withPrefix("0x"); var hex = HexFormat.of().withPrefix("0x");
Log.LOGGER.info("VID: {}, PID: {}", hex.toHexDigits(hid.vendorID()), hex.toHexDigits(hid.productID())); Log.LOGGER.info("VID: {}, PID: {}", hex.toHexDigits(hid.vendorID()), hex.toHexDigits(hid.productID()));
}); });
} }
return info; return info;
} }