1.21.11 Open XR support

README.md

@@ -22,7 +22,7 @@ Mod compatibility is important to us. If you find any issues, don't be afraid to
 - [X] Iris support
 - [X] In game VR switching
 - [X] API, details [here](https://github.com/Vivecraft/VivecraftMod/wiki/Mod-API)
-- [ ] OpenXR support
+- [X] OpenXR support
 
 [Vivecraft Discord server](https://discord.gg/2x3QCk8qa9)\
 [Development Discord server](https://discord.gg/jYyyv7zhSW)

build.gradle

@@ -40,6 +40,10 @@ subprojects {
         implementation("org.lwjgl:lwjgl-openvr:${rootProject.lwjgl_version}:natives-macos") { transitive = false }
         implementation("org.lwjgl:lwjgl-openvr:${rootProject.lwjgl_version}:natives-windows") { transitive = false }
 
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}") { transitive = false }
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}:natives-linux") { transitive = false }
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}:natives-windows") { transitive = false }
+
         // for OSC tracker support
         implementation("com.illposed.osc:javaosc-core:0.9")
 

common/src/main/java/org/vivecraft/client_vr/VRState.java

@@ -13,6 +13,7 @@
 import org.vivecraft.client_vr.gameplay.VRPlayer;
 import org.vivecraft.client_vr.menuworlds.MenuWorldRenderer;
 import org.vivecraft.client_vr.provider.nullvr.NullVR;
+import org.vivecraft.client_vr.provider.openxr_lwjgl.MCOpenXR;
 import org.vivecraft.client_vr.provider.openvr_lwjgl.MCOpenVR;
 import org.vivecraft.client_vr.render.RenderConfigException;
 import org.vivecraft.client_vr.render.VRShaders;
@@ -64,9 +65,20 @@ public static void initializeVR() {
             }
 
             ClientDataHolderVR dh = ClientDataHolderVR.getInstance();
+            VRSettings.LOGGER.info("Vivecraft: VR Provider setting = {}", dh.vrSettings.stereoProviderPluginID);
+
+            // Force OpenXR for all VR modes - OpenVR/SteamVR is no longer used
             if (dh.vrSettings.stereoProviderPluginID == VRSettings.VRProvider.OPENVR) {
-                dh.vr = new MCOpenVR(Minecraft.getInstance(), dh);
+                VRSettings.LOGGER.info("Vivecraft: OpenVR setting detected, overriding to OpenXR (SteamVR bypass)");
+                dh.vrSettings.stereoProviderPluginID = VRSettings.VRProvider.OPENXR;
+                dh.vrSettings.saveOptions();
+            }
+
+            if (dh.vrSettings.stereoProviderPluginID == VRSettings.VRProvider.OPENXR) {
+                VRSettings.LOGGER.info("Vivecraft: Using OpenXR provider (bypassing SteamVR)");
+                dh.vr = new MCOpenXR(Minecraft.getInstance(), dh);
             } else {
+                VRSettings.LOGGER.info("Vivecraft: Using NullVR provider");
                 dh.vr = new NullVR(Minecraft.getInstance(), dh);
             }
             if (!dh.vr.init()) {

common/src/main/java/org/vivecraft/client_vr/provider/DeviceSource.java

@@ -56,6 +56,7 @@ public boolean equals(Object o) {
     public enum Source {
         NULL,
         OPENVR,
+        OPENXR,
         OSC
     }
 }

common/src/main/java/org/vivecraft/client_vr/provider/MCVR.java

@@ -1536,4 +1536,10 @@ public boolean capFPS() {
      * @return the name of the VR runtime
      */
     public abstract String getRuntimeName();
+
+    /**
+     * @param inputValueHandle the origin handle from the VR runtime
+     * @return which controller the origin belongs to, or {@code null} if unknown
+     */
+    public abstract ControllerType getOriginControllerType(long inputValueHandle);
 }

common/src/main/java/org/vivecraft/client_vr/provider/nullvr/NullVR.java

@@ -289,6 +289,11 @@ public String getRuntimeName() {
         return "Null";
     }
 
+    @Override
+    public ControllerType getOriginControllerType(long inputValueHandle) {
+        return null;
+    }
+
     @Override
     public boolean handleKeyboardInputs(int key, int scanCode, int action, int modifiers) {
         boolean triggered = false;

common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/MCOpenVR.java

@@ -1701,7 +1701,8 @@ private long getInputSourceHandle(String path) {
      * @param inputValueHandle inputHandle to check
      * @return what controller the inputHandle is on, {@code null} if the handle or device is invalid
      */
-    protected ControllerType getOriginControllerType(long inputValueHandle) {
+    @Override
+    public ControllerType getOriginControllerType(long inputValueHandle) {
         if (inputValueHandle != k_ulInvalidInputValueHandle) {
             this.readOriginInfo(inputValueHandle);
 

common/src/main/java/org/vivecraft/client_vr/provider/openvr_lwjgl/VRInputAction.java

@@ -217,15 +217,15 @@ public VRInputAction setPriority(int priority) {
      */
     public boolean isEnabled() {
         if (!this.isEnabledRaw(this.currentHand)) return false;
-        if (MCOpenVR.get() == null) return false;
+        if (MCVR.get() == null) return false;
 
         long lastOrigin = this.getLastOrigin();
-        ControllerType hand = MCOpenVR.get().getOriginControllerType(lastOrigin);
+        ControllerType hand = MCVR.get().getOriginControllerType(lastOrigin);
 
         if (hand == null && this.isHanded()) return false;
 
         // iterate over all actions, and check if another action has a higher priority
-        for (VRInputAction action : MCOpenVR.get().getInputActions()) {
+        for (VRInputAction action : MCVR.get().getInputActions()) {
             if (action != this && action.isEnabledRaw(hand) && action.isActive() &&
                 action.getPriority() > this.getPriority() && MCVR.get().getOrigins(action).contains(lastOrigin))
             {