1.20.6 fixes

Vivecraft · Feb 19, 2025 · e236b02 · e236b02
1 parent 49e366c
commit e236b02
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/RenderHelper.java
@@ -474,27 +474,31 @@ public static void drawSizedQuadWithLightmap(
         RenderSystem.setShaderLights(normal, normal);
         RenderSystem.setupShaderLights(RenderSystem.getShader());
 
-        bufferbuilder.addVertex(matrix, -sizeX, -sizeY, 0)
-            .setColor(color[0], color[1], color[2], color[3])
-            .setUv(0.0F, flipY ? 1.0F : 0.0F)
-            .setOverlay(OverlayTexture.NO_OVERLAY).setLight(packedLight)
-            .setNormal(normal.x, normal.y, normal.z);
-        bufferbuilder.addVertex(matrix, sizeX, -sizeY, 0)
-            .setColor(color[0], color[1], color[2], color[3])
-            .setUv(1.0F, flipY ? 1.0F : 0.0F)
-            .setOverlay(OverlayTexture.NO_OVERLAY).setLight(packedLight)
-            .setNormal(normal.x, normal.y, normal.z);
-        bufferbuilder.addVertex(matrix, sizeX, sizeY, 0)
-            .setColor(color[0], color[1], color[2], color[3])
-            .setUv(1.0F, flipY ? 0.0F : 1.0F)
-            .setOverlay(OverlayTexture.NO_OVERLAY).setLight(packedLight)
-            .setNormal(normal.x, normal.y, normal.z);
-        bufferbuilder.addVertex(matrix, -sizeX, sizeY, 0)
-            .setColor(color[0], color[1], color[2], color[3])
-            .setUv(0.0F, flipY ? 0.0F : 1.0F)
-            .setOverlay(OverlayTexture.NO_OVERLAY).setLight(packedLight)
-            .setNormal(normal.x, normal.y, normal.z);
-        BufferUploader.drawWithShader(bufferbuilder.buildOrThrow());
+        bufferbuilder.vertex(matrix, -sizeX, -sizeY, 0)
+            .color(color[0], color[1], color[2], color[3])
+            .uv(0.0F, flipY ? 1.0F : 0.0F)
+            .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(packedLight)
+            .normal(normal.x, normal.y, normal.z)
+            .endVertex();
+        bufferbuilder.vertex(matrix, sizeX, -sizeY, 0)
+            .color(color[0], color[1], color[2], color[3])
+            .uv(1.0F, flipY ? 1.0F : 0.0F)
+            .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(packedLight)
+            .normal(normal.x, normal.y, normal.z)
+            .endVertex();
+        bufferbuilder.vertex(matrix, sizeX, sizeY, 0)
+            .color(color[0], color[1], color[2], color[3])
+            .uv(1.0F, flipY ? 0.0F : 1.0F)
+            .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(packedLight)
+            .normal(normal.x, normal.y, normal.z)
+            .endVertex();
+        bufferbuilder.vertex(matrix, -sizeX, sizeY, 0)
+            .color(color[0], color[1], color[2], color[3])
+            .uv(0.0F, flipY ? 0.0F : 1.0F)
+            .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(packedLight)
+            .normal(normal.x, normal.y, normal.z)
+            .endVertex();
+        BufferUploader.drawWithShader(bufferbuilder.end());
 
         MC.gameRenderer.lightTexture().turnOffLightLayer();
 

diff --git a/common/src/main/java/org/vivecraft/client_vr/render/helpers/VREffectsHelper.java b/common/src/main/java/org/vivecraft/client_vr/render/helpers/VREffectsHelper.java
@@ -1188,11 +1188,11 @@ public static void renderFaceInBlock() {
         RenderSystem.disableCull();
         bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
         // render a big quad 2 meters in front
-        bufferbuilder.addVertex(-100.F, -100.F, -2.0F);
-        bufferbuilder.addVertex(100.F, -100.F, -2.0F);
-        bufferbuilder.addVertex(100.F, 100.F, -2.0F);
-        bufferbuilder.addVertex(-100.F, 100.F, -2.0F);
-        BufferUploader.drawWithShader(bufferbuilder.buildOrThrow());
+        bufferbuilder.vertex(-100.F, -100.F, -2.0F).endVertex();
+        bufferbuilder.vertex(100.F, -100.F, -2.0F).endVertex();
+        bufferbuilder.vertex(100.F, 100.F, -2.0F).endVertex();
+        bufferbuilder.vertex(-100.F, 100.F, -2.0F).endVertex();
+        tesselator.end();
         RenderSystem.depthFunc(GL11C.GL_LEQUAL);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
     }

diff --git a/fabric/src/main/java/org/vivecraft/fabric/mixin/FabricMinecraftVRMixin.java b/fabric/src/main/java/org/vivecraft/fabric/mixin/FabricMinecraftVRMixin.java
@@ -2,8 +2,8 @@
 
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.Timer;
 import net.minecraft.client.ResourceLoadStateTracker;
+import net.minecraft.client.Timer;
 import net.minecraft.server.packs.resources.ReloadableResourceManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;