From eded055be8aca1b43c4974fa831d0734ca7795a9 Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Wed, 28 Jul 2021 14:18:24 -0700
Subject: [PATCH] More info in RenderLayerEvent

---
 .../flywheel/event/RenderLayerEvent.java        | 17 +++++++++++++++--
 .../flywheel/mixin/RenderHooksMixin.java        | 17 +++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java b/src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java
index fafcfbf75..e47f2886c 100644
--- a/src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java
+++ b/src/main/java/com/jozufozu/flywheel/event/RenderLayerEvent.java
@@ -2,9 +2,12 @@ package com.jozufozu.flywheel.event;
 
 import javax.annotation.Nullable;
 
+import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.state.RenderLayer;
+import com.mojang.blaze3d.matrix.MatrixStack;
 
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderTypeBuffers;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.vector.Matrix4f;
 import net.minecraftforge.eventbus.api.Event;
@@ -12,16 +15,26 @@ import net.minecraftforge.eventbus.api.Event;
 public class RenderLayerEvent extends Event {
 	private final ClientWorld world;
 	public final RenderType type;
+	public final MatrixStack stack;
 	public final Matrix4f viewProjection;
+	public final RenderTypeBuffers buffers;
 	public final double camX;
 	public final double camY;
 	public final double camZ;
 	public final RenderLayer layer;
 
-	public RenderLayerEvent(ClientWorld world, RenderType type, Matrix4f viewProjection, double camX, double camY, double camZ) {
+	public RenderLayerEvent(ClientWorld world, RenderType type, MatrixStack stack, RenderTypeBuffers buffers, double camX, double camY, double camZ) {
 		this.world = world;
 		this.type = type;
-		this.viewProjection = viewProjection;
+		this.stack = stack;
+
+		viewProjection = stack.last()
+				.pose()
+				.copy();
+		viewProjection.multiplyBackward(Backend.getInstance()
+				.getProjectionMatrix());
+
+		this.buffers = buffers;
 		this.camX = camX;
 		this.camY = camY;
 		this.camZ = camZ;
diff --git a/src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java b/src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
index 056efaa7b..238e478b6 100644
--- a/src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
+++ b/src/main/java/com/jozufozu/flywheel/mixin/RenderHooksMixin.java
@@ -1,6 +1,7 @@
 package com.jozufozu.flywheel.mixin;
 
 import org.lwjgl.opengl.GL20;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -21,6 +22,7 @@ import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderTypeBuffers;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.BlockPos;
@@ -37,6 +39,10 @@ public class RenderHooksMixin {
 	@Shadow
 	private ClientWorld level;
 
+	@Shadow
+	@Final
+	private RenderTypeBuffers renderBuffers;
+
 	@Inject(at = @At(value = "INVOKE", target = "net.minecraft.client.renderer.WorldRenderer.compileChunksUntil(J)V"), method = "renderLevel")
 	private void setupFrame(MatrixStack stack, float p_228426_2_, long p_228426_3_, boolean p_228426_5_, ActiveRenderInfo info, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f p_228426_9_, CallbackInfo ci) {
 		MinecraftForge.EVENT_BUS.post(new BeginFrameEvent(level, stack, info, gameRenderer, lightTexture));
@@ -49,15 +55,14 @@ public class RenderHooksMixin {
 	 */
 	@Inject(at = @At("TAIL"), method = "renderChunkLayer")
 	private void renderLayer(RenderType type, MatrixStack stack, double camX, double camY, double camZ, CallbackInfo ci) {
-		Matrix4f view = stack.last()
-				.pose();
-		Matrix4f viewProjection = view.copy();
-		viewProjection.multiplyBackward(Backend.getInstance()
-												.getProjectionMatrix());
 
-		MinecraftForge.EVENT_BUS.post(new RenderLayerEvent(level, type, viewProjection, camX, camY, camZ));
+		RenderTypeBuffers renderBuffers = this.renderBuffers;
+
+		MinecraftForge.EVENT_BUS.post(new RenderLayerEvent(level, type, stack, renderBuffers, camX, camY, camZ));
 
 		if (!OptifineHandler.usingShaders()) GL20.glUseProgram(0);
+
+		renderBuffers.bufferSource().endBatch(type);
 	}
 
 	@Inject(at = @At("TAIL"), method = "allChanged")