From a54b97d04ba55ced79afb7c1d62e60f74b205b5d Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sun, 19 Oct 2025 11:07:45 +1000 Subject: [PATCH] Vivecraft update --- build.gradle | 2 +- .../voxy/client/core/rendering/ViewportSelector.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 23dcc271..0e43d607 100644 --- a/build.gradle +++ b/build.gradle @@ -133,7 +133,7 @@ dependencies { //modImplementation('io.github.douira:glsl-transformer:2.0.1') - modCompileOnly("maven.modrinth:vivecraft:1.21.8-1.2.5-b6-fabric") + modCompileOnly("maven.modrinth:vivecraft:1.21.9-1.3.2-fabric") modCompileOnly("maven.modrinth:flashback:rNCr1Rbs") } diff --git a/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java b/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java index 4020324e..f23e9324 100644 --- a/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java +++ b/src/main/java/me/cortex/voxy/client/core/rendering/ViewportSelector.java @@ -2,7 +2,7 @@ package me.cortex.voxy.client.core.rendering; import me.cortex.voxy.client.core.util.IrisUtil; import net.fabricmc.loader.api.FabricLoader; -import org.vivecraft.client_vr.ClientDataHolderVR; +import org.vivecraft.api.client.VRRenderingAPI; import java.util.HashMap; import java.util.Map; @@ -13,7 +13,7 @@ public class ViewportSelector > { private final Supplier creator; private final T defaultViewport; - private final Map extraViewports = new HashMap<>(); + private final Map extraViewports = new HashMap<>();//TODO should maybe be a weak hashmap with value cleanup queue thing? public ViewportSelector(Supplier viewportCreator) { this.creator = viewportCreator; @@ -25,8 +25,11 @@ public class ViewportSelector > { } private T getVivecraftViewport() { - var cdh = ClientDataHolderVR.getInstance(); - var pass = cdh.currentPass; + var rApi = VRRenderingAPI.instance(); + if (rApi == null) { + return this.defaultViewport; + } + var pass = rApi.getCurrentRenderPass(); if (pass == null) { return this.defaultViewport; }