Openxr 1.21.4

build.gradle

@@ -22,10 +22,8 @@ subprojects {
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.layered() {
-            // The following line declares the mojmap mappings, you may use other mappings as well
+            // The following line declares the mojmap mappings
             officialMojangMappings()
-            // The following line declares the yarn mappings you may select this one as well.
-            // "net.fabricmc:yarn:1.18.2+build.4:v2"
             // parchment mappings as backup
             parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
         }
@@ -34,6 +32,13 @@ 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 }
 
+        // Use custom OpenXR lib for Android and GLES bindings
+        //implementation("QuestCraftPlusPlus:lwjgl3:${rootProject.lwjgl_version}:lwjgl-openxr-${rootProject.lwjgl_version}")
+
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}")
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}:natives-linux")
+        implementation("org.lwjgl:lwjgl-openxr:${rootProject.lwjgl_version}:natives-windows")
+
         // for OSC tracker support
         implementation("com.illposed.osc:javaosc-core:0.9")
 
@@ -186,17 +191,16 @@ allprojects {
         exclusiveContent {
             forRepository {
                 ivy {
-                    name = "Discord"
-                    url = "https://cdn.discordapp.com/attachments/"
+                    name = "GitHub"
+                    url = "https://github.com/"
                     patternLayout {
-                        artifact '/[organisation]/[module]/[revision].[ext]'
+                        artifact '/[organisation]/[module]/releases/download/[revision]/[classifier].jar'
                     }
                     metadataSources { artifact() }
                 }
             }
             filter {
-                // discords are always just numbers
-                includeGroupByRegex "^\\d*\$"
+
             }
         }
     }

common/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     compileOnly('com.electronwill.night-config:toml:3.6.6')
 
     //LaunchPopup
-    implementation 'com.github.Vivecraft:LaunchPopup:1.1.1'
+    implementation 'Vivecraft:LaunchPopup:1.1.1:LaunchPopup-1.1.1'
 }
 // extract the LaunchPopup classes
 jar {

common/src/main/java/org/vivecraft/Xloader.java

@@ -2,7 +2,10 @@
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Path;
+import java.util.List;
 
 /**
  * Xplat for stuff that only references modloader classes
@@ -66,10 +69,18 @@ static Path getConfigPath(String file) {
     }
 
     /**
-     * @return path to access files inside the mod jar
+     * @return InputStream corresponding to the given filepath inside the mod jar
      */
     @ExpectPlatform
-    static Path getJarPath() {
+    static InputStream getInJarFile(String sourcePath) throws IOException {
+        throw new AssertionError();
+    }
+
+    /**
+     * @return List of all files in the given folder inside the mod jar
+     */
+    @ExpectPlatform
+    static List<Path> getInJarFolderFiles(String folder) throws IOException {
         throw new AssertionError();
     }
 

common/src/main/java/org/vivecraft/api/VRAPI.java

@@ -35,7 +35,8 @@ static VRAPI instance() {
 
     /**
      * Returns the VR pose for the given player. Will return {@code null} if the player isn't in VR,
-     * or if being called from the client and the client has yet to receive any data for the player.
+     * or if no data for the player has been received yet. The VRPose can still be {@code null} if
+     * {@link VRAPI#isVRPlayer(Player)} returned true, since those two properties are independent of each other.
      *
      * @param player Player to get the VR pose of.
      * @return The VR pose for a player, or {@code null} if the player isn't in VR or no data has been received for said player.

common/src/main/java/org/vivecraft/api/data/VRPoseHistory.java

@@ -11,6 +11,12 @@
  * <br>
  * Vivecraft will store data for players going up to 200 ticks into the past. Attempting to retrieve history before
  * this far back will throw an {@link IllegalArgumentException}.
+ * <br>
+ * Many methods in this class accept the parameter {@code playerPositionRelative}. When this is {@code true}, all
+ * calculations are done relative to the player, while if {@code false}, calculations are done in world space. For
+ * example, the net movement of a player who moved from (0, 0, 0) to (3, 0, 0) but did NOT move their head, hands, etc.
+ * would be (3, 0, 0) if {@code playerPositionRelative} is {@code false} and would be (0, 0, 0) if
+ * {@code playerPositionRelative} is {@code true}.
  *
  * @since 1.3.0
  */
@@ -35,18 +41,31 @@ public interface VRPoseHistory {
     List<VRPose> getAllHistoricalData();
 
     /**
-     * Gets the pose from {@code ticksBack} ticks back, or {@code null} if such data isn't available.
+     * Gets the pose from {@code ticksBack} ticks back in world space, or {@code null} if such data isn't available.
      *
      * @param ticksBack Ticks back to retrieve data from.
      * @return A {@link VRPose} instance from {@code ticksBack} ticks ago, or {@code null} if that data isn't available.
      * @throws IllegalArgumentException Thrown when {@code ticksBack} is outside the range [0,200].
      * @since 1.3.0
      */
-    VRPose getHistoricalData(int ticksBack) throws IllegalArgumentException;
+    default VRPose getHistoricalData(int ticksBack) throws IllegalArgumentException {
+        return getHistoricalData(ticksBack, false);
+    }
 
     /**
-     * Gets the net movement between the most recent VRPose in this instance and the oldest VRPose that can be
-     * retrieved, going no farther back than {@code maxTicksBack}.
+     * Gets the pose from {@code ticksBack} ticks back, or {@code null} if such data isn't available.
+     *
+     * @param ticksBack              Ticks back to retrieve data from.
+     * @param playerPositionRelative Whether to get the historical data with position relative to the player's position.
+     * @return A {@link VRPose} instance from {@code ticksBack} ticks ago, or {@code null} if that data isn't available.
+     * @throws IllegalArgumentException Thrown when {@code ticksBack} is outside the range [0,200].
+     * @since 1.3.3
+     */
+    VRPose getHistoricalData(int ticksBack, boolean playerPositionRelative) throws IllegalArgumentException;
+
+    /**
+     * Gets the net movement in world space between the most recent VRPose in this instance and the oldest VRPose that
+     * can be retrieved, going no farther back than {@code maxTicksBack}.
      *
      * @param bodyPart     The body part to get the net movement for.
      * @param maxTicksBack The maximum number of ticks back to compare the most recent data with.
@@ -57,11 +76,30 @@ public interface VRPoseHistory {
      * @since 1.3.0
      */
     @Nullable
-    Vec3 netMovement(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException;
+    default Vec3 netMovement(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException {
+        return netMovement(bodyPart, maxTicksBack, false);
+    }
 
     /**
-     * Gets the average velocity in blocks/tick between the most recent VRPose in this instance and the oldest VRPose
-     * that can be retrieved, going no farther back than {@code maxTicksBack}.
+     * Gets the net movement between the most recent VRPose in this instance and the oldest VRPose that can be
+     * retrieved, going no farther back than {@code maxTicksBack}.
+     *
+     * @param bodyPart               The body part to get the net movement for.
+     * @param maxTicksBack           The maximum number of ticks back to compare the most recent data with.
+     * @param playerPositionRelative Whether net movement should be calculated relative to the player position.
+     * @return The aforementioned net movement. Note that this will return zero change on all axes if only zero ticks
+     * can be looked back. Will be {@code null} if the body part requested isn't available.
+     * @throws IllegalArgumentException Thrown when {@code maxTicksBack} is outside the range [0,200] or an invalid
+     *                                  {@code bodyPart} is supplied.
+     * @since 1.3.3
+     */
+    @Nullable
+    Vec3 netMovement(
+        VRBodyPart bodyPart, int maxTicksBack, boolean playerPositionRelative) throws IllegalArgumentException;
+
+    /**
+     * Gets the average velocity in world space in blocks/tick between the most recent VRPose in this instance and the
+     * oldest VRPose that can be retrieved, going no farther back than {@code maxTicksBack}.
      *
      * @param bodyPart     The body part to get the average velocity for.
      * @param maxTicksBack The maximum number of ticks back to calculate velocity with.
@@ -72,12 +110,31 @@ public interface VRPoseHistory {
      * @since 1.3.0
      */
     @Nullable
-    Vec3 averageVelocity(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException;
+    default Vec3 averageVelocity(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException {
+        return averageVelocity(bodyPart, maxTicksBack, false);
+    }
 
     /**
-     * Gets the average speed in blocks/tick between the most recent VRPose in this instance and the oldest VRPose
+     * Gets the average velocity in blocks/tick between the most recent VRPose in this instance and the oldest VRPose
      * that can be retrieved, going no farther back than {@code maxTicksBack}.
      *
+     * @param bodyPart               The body part to get the average velocity for.
+     * @param maxTicksBack           The maximum number of ticks back to calculate velocity with.
+     * @param playerPositionRelative Whether velocity should be calculated to the player position.
+     * @return The aforementioned average velocity on each axis. Note that this will return zero velocity on all axes
+     * if only zero ticks can be looked back. Will be {@code null} if the body part requested isn't available.
+     * @throws IllegalArgumentException Thrown when {@code maxTicksBack} is outside the range [0,200] or an invalid
+     *                                  {@code bodyPart} is supplied.
+     * @since 1.3.3
+     */
+    @Nullable
+    Vec3 averageVelocity(
+        VRBodyPart bodyPart, int maxTicksBack, boolean playerPositionRelative) throws IllegalArgumentException;
+
+    /**
+     * Gets the average speed in world space in blocks/tick between the most recent VRPose in this instance and the
+     * oldest VRPose that can be retrieved, going no farther back than {@code maxTicksBack}.
+     *
      * @param bodyPart     The body part to get the average speed for.
      * @param maxTicksBack The maximum number of ticks back to calculate speed with.
      * @return The aforementioned average speed on each axis. Note that this will return zero speed if only zero ticks
@@ -86,11 +143,29 @@ public interface VRPoseHistory {
      *                                  {@code bodyPart} is supplied.
      * @since 1.3.0
      */
-    double averageSpeed(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException;
+    default double averageSpeed(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException {
+        return averageSpeed(bodyPart, maxTicksBack, false);
+    }
 
     /**
-     * Gets the average position between the most recent VRPose in this instance and the oldest VRPose that can be
-     * retrieved, going no farther back than {@code maxTicksBack}.
+     * Gets the average speed in blocks/tick between the most recent VRPose in this instance and the oldest VRPose
+     * that can be retrieved, going no farther back than {@code maxTicksBack}.
+     *
+     * @param bodyPart               The body part to get the average speed for.
+     * @param maxTicksBack           The maximum number of ticks back to calculate speed with.
+     * @param playerPositionRelative Whether the speed should be calculated relative to the player position.
+     * @return The aforementioned average speed on each axis. Note that this will return zero speed if only zero ticks
+     * can be looked back, or if the body part requested isn't available.
+     * @throws IllegalArgumentException Thrown when {@code maxTicksBack} is outside the range [0,200] or an invalid
+     *                                  {@code bodyPart} is supplied.
+     * @since 1.3.3
+     */
+    double averageSpeed(
+        VRBodyPart bodyPart, int maxTicksBack, boolean playerPositionRelative) throws IllegalArgumentException;
+
+    /**
+     * Gets the average position in world space between the most recent VRPose in this instance and the oldest VRPose
+     * that can be retrieved, going no farther back than {@code maxTicksBack}.
      *
      * @param bodyPart     The body part to get the average position for.
      * @param maxTicksBack The maximum number of ticks back to calculate the position with.
@@ -101,5 +176,24 @@ public interface VRPoseHistory {
      * @since 1.3.0
      */
     @Nullable
-    Vec3 averagePosition(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException;
+    default Vec3 averagePosition(VRBodyPart bodyPart, int maxTicksBack) throws IllegalArgumentException {
+        return averagePosition(bodyPart, maxTicksBack, false);
+    }
+
+    /**
+     * Gets the average position between the most recent VRPose in this instance and the oldest VRPose that can be
+     * retrieved, going no farther back than {@code maxTicksBack}.
+     *
+     * @param bodyPart               The body part to get the average position for.
+     * @param maxTicksBack           The maximum number of ticks back to calculate the position with.
+     * @param playerPositionRelative Whether the positions should be relative to the player's position.
+     * @return The aforementioned average position. Note that this will return the current position if only zero ticks
+     * can be looked back. Will be {@code null} if the body part requested isn't available.
+     * @throws IllegalArgumentException Thrown when {@code maxTicksBack} is outside the range [0,200] or an invalid
+     *                                  {@code bodyPart} is supplied.
+     * @since 1.3.3
+     */
+    @Nullable
+    Vec3 averagePosition(
+        VRBodyPart bodyPart, int maxTicksBack, boolean playerPositionRelative) throws IllegalArgumentException;
 }

common/src/main/java/org/vivecraft/client/ClientVRPlayers.java

@@ -199,7 +199,8 @@ public void update(
         if (!localPlayer) {
             Player otherPlayer = this.mc.level.getPlayerByUUID(uuid);
             if (otherPlayer != null) {
-                VRAPIImpl.INSTANCE.addPoseToHistory(uuid, rotInfo.asVRPose(otherPlayer.position()), true);
+                VRAPIImpl.INSTANCE.addPoseToHistory(uuid, rotInfo.asVRPose(otherPlayer.position()),
+                    otherPlayer.position(), true);
             }
         }
 

common/src/main/java/org/vivecraft/client/VivecraftVRMod.java

@@ -5,9 +5,12 @@
 import net.minecraft.resources.ResourceLocation;
 import org.apache.commons.lang3.ArrayUtils;
 import org.vivecraft.client_vr.gameplay.screenhandlers.GuiHandler;
-import org.vivecraft.client_vr.provider.HandedKeyBinding;
+import org.vivecraft.client_vr.provider.control.HandedKeyBinding;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 public class VivecraftVRMod {
 

common/src/main/java/org/vivecraft/client/api_impl/VRClientAPIImpl.java

@@ -1,5 +1,6 @@
 package org.vivecraft.client.api_impl;
 
+import net.minecraft.world.phys.Vec3;
 import org.vivecraft.api.client.VRClientAPI;
 import org.vivecraft.api.client.data.CloseKeyboardContext;
 import org.vivecraft.api.client.data.OpenKeyboardContext;
@@ -34,8 +35,8 @@ public void clearPoseHistory() {
         this.poseHistory.clear();
     }
 
-    public void addPoseToHistory(VRPose pose) {
-        this.poseHistory.addPose(pose);
+    public void addPoseToHistory(VRPose pose, Vec3 playerPos) {
+        this.poseHistory.addPose(pose, playerPos);
     }
 
     public void processRegistrationEvent() {