From 5405d3a67a90867fdc1f7db9b1d5e86a69dcdbd5 Mon Sep 17 00:00:00 2001 From: Schmarni Date: Tue, 10 Dec 2024 18:15:12 +0100 Subject: [PATCH 1/3] make ./gradlew executable Signed-off-by: Schmarni --- gradlew | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 412229c81900b5e29a7cca7ac2fa1fed9104a99b Mon Sep 17 00:00:00 2001 From: Schmarni Date: Tue, 10 Dec 2024 20:00:05 +0100 Subject: [PATCH 2/3] improve and suggest quest bindings on non meta runtimes Signed-off-by: Schmarni --- .../client_vr/provider/openxr/XRBindings.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openxr/XRBindings.java b/common/src/main/java/org/vivecraft/client_vr/provider/openxr/XRBindings.java index 8a3a684a6..674061d45 100644 --- a/common/src/main/java/org/vivecraft/client_vr/provider/openxr/XRBindings.java +++ b/common/src/main/java/org/vivecraft/client_vr/provider/openxr/XRBindings.java @@ -9,10 +9,7 @@ public class XRBindings { public static HashSet supportedHeadsets() { HashSet set = new HashSet<>(); - if (MCOpenXR.get().systemName.toLowerCase().contains("oculus") || MCOpenXR.get().systemName.toLowerCase().contains("meta")) { - set.add("/interaction_profiles/oculus/touch_controller"); - return set; - } + set.add("/interaction_profiles/oculus/touch_controller"); if (MCOpenXR.get().session.getCapabilities().XR_HTC_vive_cosmos_controller_interaction) { set.add("/interaction_profiles/htc/vive_cosmos_controller"); } @@ -29,26 +26,26 @@ private static HashSet> quest2Bindings() { set.add(new MutablePair<>("/actions/gui/in/vivecraft.key.guiShift", "/user/hand/left/input/squeeze")); set.add(new MutablePair<>("/actions/gui/in/vivecraft.key.guiMiddleClick", "/user/hand/right/input/squeeze")); - set.add(new MutablePair<>("/actions/gui/in/vivecraft.key.guiLeftClick", "/user/hand/right/input/trigger")); + set.add(new MutablePair<>("/actions/gui/in/vivecraft.key.guiLeftClick", "/user/hand/right/input/trigger/value")); set.add(new MutablePair<>("/actions/gui/in/vivecraft.key.guiRightClick", "/user/hand/right/input/a/click")); set.add(new MutablePair<>("/actions/gui/in/vivecraft.key.guiScrollAxis", "/user/hand/right/input/thumbstick/y")); set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.hotbarPrev", "/user/hand/left/input/squeeze")); set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.hotbarNext", "/user/hand/right/input/squeeze")); - set.add(new MutablePair<>("/actions/ingame/in/key.attack", "/user/hand/right/input/trigger")); - set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.teleport", "/user/hand/left/input/trigger")); + set.add(new MutablePair<>("/actions/ingame/in/key.attack", "/user/hand/right/input/trigger/value")); + set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.teleport", "/user/hand/left/input/trigger/value")); set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.radialMenu", "/user/hand/right/input/b/click")); set.add(new MutablePair<>("/actions/ingame/in/key.use", "/user/hand/right/input/a/click")); set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.teleportFallback", "/user/hand/left/input/trigger/value")); - set.add(new MutablePair<>("/actions/ingame/in/key.jump", "/user/hand/left/input/thumbstick")); + set.add(new MutablePair<>("/actions/ingame/in/key.jump", "/user/hand/left/input/thumbstick/click")); set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.freeMoveStrafe", "/user/hand/left/input/thumbstick")); - set.add(new MutablePair<>("/actions/ingame/in/key.sneak", "/user/hand/right/input/thumbstick")); + set.add(new MutablePair<>("/actions/ingame/in/key.sneak", "/user/hand/right/input/thumbstick/click")); set.add(new MutablePair<>("/actions/ingame/in/vivecraft.key.rotateAxis", "/user/hand/right/input/thumbstick")); set.add(new MutablePair<>("/actions/keyboard/in/vivecraft.key.keyboardShift", "/user/hand/left/input/squeeze")); set.add(new MutablePair<>("/actions/keyboard/in/vivecraft.key.keyboardShift", "/user/hand/right/input/squeeze")); - set.add(new MutablePair<>("/actions/keyboard/in/vivecraft.key.keyboardClick", "/user/hand/left/input/trigger")); - set.add(new MutablePair<>("/actions/keyboard/in/vivecraft.key.keyboardClick", "/user/hand/right/input/trigger")); + set.add(new MutablePair<>("/actions/keyboard/in/vivecraft.key.keyboardClick", "/user/hand/left/input/trigger/value")); + set.add(new MutablePair<>("/actions/keyboard/in/vivecraft.key.keyboardClick", "/user/hand/right/input/trigger/value")); return set; } From 9ec7228f0e23180b3e96dda12c124cee9a6dedc4 Mon Sep 17 00:00:00 2001 From: Schmarni Date: Tue, 10 Dec 2024 20:00:55 +0100 Subject: [PATCH 3/3] handle null error in getOriginName since WiVRn returns a null pointer Signed-off-by: Schmarni --- .../org/vivecraft/client_vr/provider/openxr/MCOpenXR.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/openxr/MCOpenXR.java b/common/src/main/java/org/vivecraft/client_vr/provider/openxr/MCOpenXR.java index 7df540539..380056e3d 100644 --- a/common/src/main/java/org/vivecraft/client_vr/provider/openxr/MCOpenXR.java +++ b/common/src/main/java/org/vivecraft/client_vr/provider/openxr/MCOpenXR.java @@ -913,7 +913,11 @@ public String getOriginName(long l) { ByteBuffer byteBuffer = stack.calloc(size); error = XR10.xrGetInputSourceLocalizedName(session, info, buf, byteBuffer); logError(error, "xrGetInputSourceLocalizedName", "get String"); - return new String(byteBuffer.array()); + try { + return new String(byteBuffer.array()); + } catch (UnsupportedOperationException e) { + return "ERROR"; + } } }