1.21.3 fixes

Vivecraft · Jan 12, 2025 · 836cd46 · 836cd46
1 parent 635b0bf
commit 836cd46
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 46 deletions.
diff --git a/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java b/common/src/main/java/org/vivecraft/client_vr/provider/VRRenderer.java
@@ -520,14 +520,17 @@ public void setupRenderConfiguration() throws RenderConfigException, IOException
             this.reinitFrameBuffers("gfx setting changed to: " + this.previousGraphics);
         }
 
-        if (minecraft.options.graphicsMode().get() == GraphicsStatus.FABULOUS &&
-            minecraft.getShaderManager().getProgram(VRShaders.VR_TRANSPARENCY_SHADER) == null)
-        {
-            // fabulous shader didn't compile
-            minecraft.gui.getChat().addMessage(Component.translatable("vivecraft.messages.fabulousFailed"));
-            minecraft.options.graphicsMode().set(GraphicsStatus.FAST);
-            minecraft.levelRenderer.allChanged();
-            this.reinitFrameBuffers("fabulous missing");
+        if (minecraft.options.graphicsMode().get() == GraphicsStatus.FABULOUS) {
+            try {
+                minecraft.getShaderManager().getProgramForLoading(VRShaders.VR_TRANSPARENCY_SHADER);
+            } catch (Exception e) {
+                // fabulous shader didn't compile
+                VRSettings.LOGGER.error("Failed to load fabulous vr shader program: ", e);
+                minecraft.gui.getChat().addMessage(Component.translatable("vivecraft.messages.fabulousFailed"));
+                minecraft.options.graphicsMode().set(GraphicsStatus.FAST);
+                minecraft.levelRenderer.allChanged();
+                this.reinitFrameBuffers("fabulous missing");
+            }
         }
 
         if (this.resizeFrameBuffers && !this.reinitFrameBuffers) {

diff --git a/common/src/main/java/org/vivecraft/mixin/client/renderer/ShaderManagerMixin.java b/common/src/main/java/org/vivecraft/mixin/client/renderer/ShaderManagerMixin.java
diff --git a/...n/src/main/java/org/vivecraft/mixin/client/renderer/entity/LivingEntityRendererMixin.java b/...n/src/main/java/org/vivecraft/mixin/client/renderer/entity/LivingEntityRendererMixin.java
@@ -62,7 +62,7 @@ protected LivingEntityRendererMixin(EntityRendererProvider.Context context) {
         {
             ItemStack otherStack = original.call(instance, humanoidArm.getOpposite());
             if (ClimbTracker.isClaws(otherStack) &&
-                !ClientVRPlayers.getInstance().getRotationsForPlayer(instance.getUUID()).seated)
+                !ClientVRPlayers.getInstance().isVRAndSeated(instance.getUUID()))
             {
                 return otherStack;
             }

diff --git a/common/src/main/resources/vivecraft.accesswidener b/common/src/main/resources/vivecraft.accesswidener
@@ -96,6 +96,3 @@ accessible method net/minecraft/world/item/BrushItem spawnDustParticles (Lnet/mi
 
 # do not kick climbing players
 accessible field net/minecraft/server/network/ServerGamePacketListenerImpl aboveGroundTickCount I
-# to let the vr transparancy shader fail to compile
-accessible class net/minecraft/client/renderer/ShaderManager$CompilationCache
-accessible field net/minecraft/client/renderer/ShaderManager$CompilationCache programs Ljava/util/Map;
diff --git a/common/src/main/resources/vivecraft.mixins.json b/common/src/main/resources/vivecraft.mixins.json
@@ -20,7 +20,6 @@
     "client.player.AbstractClientPlayerMixin",
     "client.renderer.ItemBlockRenderTypesMixin",
     "client.renderer.RenderStateShardAccessor",
-    "client.renderer.ShaderManagerMixin",
     "client.renderer.block.LiquidBlockRendererMixin",
     "client.renderer.entity.EntityRenderDispatcherMixin",
     "client.renderer.entity.ItemRendererVRMixin",