Merge remote-tracking branch 'remotes/origin/Multiloader-1.21' into M…

…ultiloader-1.20.5
Vivecraft · Jan 13, 2025 · 72a5891 · 72a5891
2 parents 17467a5 + 707113f
commit 72a5891
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/GameRendererVRMixin.java b/common/src/main/java/org/vivecraft/mixin/client_vr/renderer/GameRendererVRMixin.java
@@ -203,7 +203,7 @@ public abstract class GameRendererVRMixin
     private Matrix4f vivecraft$customProjectionMatrix(
         Matrix4f instance, float fovy, float aspect, float zNear, float zFar, Operation<Matrix4f> original)
     {
-        if (VRState.VR_RUNNING) {
+        if (!RenderPassType.isVanilla()) {
             zNear = vivecraft$MIN_CLIP_DISTANCE;
             if (MethodHolder.isInMenuRoom()) {
                 // use 16 Chunks as minimum, to have no issues with clipping in the menuworld
@@ -278,7 +278,7 @@ public abstract class GameRendererVRMixin
         GameRenderer instance, float partialTick, long finishTimeNano, Operation<Void> original)
     {
         original.call(instance, partialTick, finishTimeNano);
-        if (VRState.VR_RUNNING && vivecraft$DATA_HOLDER.currentPass != RenderPass.THIRD &&
+        if (!RenderPassType.isVanilla() && vivecraft$DATA_HOLDER.currentPass != RenderPass.THIRD &&
             vivecraft$DATA_HOLDER.currentPass != RenderPass.CAMERA)
         {
             VREffectsHelper.renderFaceOverlay(partialTick);

diff --git a/common/src/main/java/org/vivecraft/mod_compat_vr/emf/mixin/EMFModelPartWithStateVRMixin.java b/common/src/main/java/org/vivecraft/mod_compat_vr/emf/mixin/EMFModelPartWithStateVRMixin.java
@@ -14,12 +14,12 @@
     "traben.entity_model_features.models.EMFModelPartWithState"
 }, remap = false)
 public class EMFModelPartWithStateVRMixin {
-    @WrapWithCondition(method = {"render", "method_22699", "m_104301_"}, at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V"))
+    @WrapWithCondition(method = {"render", "method_22699", "m_104306_"}, at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V"))
     private boolean vivecraft$noRenderEventForFirstPerson(Runnable instance) {
         return !VRState.VR_RUNNING || !ClientDataHolderVR.IS_FP_HAND;
     }
 
-    @WrapWithCondition(method = {"render", "method_22699", "m_104301_"}, at = @At(value = "INVOKE", target = "Ltraben/entity_model_features/models/parts/EMFModelPart$Animator;run()V"))
+    @WrapWithCondition(method = {"render", "method_22699", "m_104306_"}, at = @At(value = "INVOKE", target = "Ltraben/entity_model_features/models/parts/EMFModelPart$Animator;run()V"))
     private boolean vivecraft$noAnimationForFirstPerson(EMFModelPart.Animator original) {
         return !VRState.VR_RUNNING || !ClientDataHolderVR.IS_FP_HAND;
     }