Trust the system

- Use the mode/vertex format from the RenderType in MeshEmitter

Author: Jozufozu

common/src/lib/java/dev/engine_room/flywheel/lib/model/baked/MeshEmitter.java

@@ -7,17 +7,17 @@
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.ByteBufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.VertexFormat;
 
 import dev.engine_room.flywheel.api.material.Material;
 import dev.engine_room.flywheel.api.model.Mesh;
 import dev.engine_room.flywheel.api.model.Model;
+import net.minecraft.client.renderer.RenderType;
 
 class MeshEmitter {
 	private static final int INITIAL_CAPACITY = 1;
 
 	private final ByteBufferBuilderStack byteBufferBuilderStack;
+	private final RenderType renderType;
 
 	private Material @UnknownNullability [] materials = new Material[INITIAL_CAPACITY];
 	private BufferBuilder @UnknownNullability [] bufferBuilders = new BufferBuilder[INITIAL_CAPACITY];
@@ -30,8 +30,9 @@ class MeshEmitter {
 
 	private int currentIndex = 0;
 
-	MeshEmitter(ByteBufferBuilderStack byteBufferBuilderStack) {
+	MeshEmitter(ByteBufferBuilderStack byteBufferBuilderStack, RenderType renderType) {
 		this.byteBufferBuilderStack = byteBufferBuilderStack;
+		this.renderType = renderType;
 	}
 
 	public void prepare(BlockMaterialFunction blockMaterialFunction) {
@@ -88,8 +89,8 @@ public BufferBuilder getBuffer(Material material) {
 
 		ByteBufferBuilder byteBufferBuilder = byteBufferBuilderStack.nextOrCreate();
 
-		// This is only used for block models in the 5 chunk render types, so we can hard-code the mode and format.
-		BufferBuilder bufferBuilder = new BufferBuilder(byteBufferBuilder, VertexFormat.Mode.TRIANGLES, DefaultVertexFormat.BLOCK);
+		// Trust that the RenderType mode/format don't change out from underneath us.
+		BufferBuilder bufferBuilder = new BufferBuilder(byteBufferBuilder, renderType.mode(), renderType.format());
 
 		// currentIndex == numBufferBuildersPopulated here.
 		materials[currentIndex] = material;

fabric/src/lib/java/dev/engine_room/flywheel/lib/model/baked/FabricMeshEmitterManager.java

@@ -34,7 +34,7 @@ class FabricMeshEmitterManager extends MeshEmitterManager<MeshEmitter> implement
 	private BufferBuilder currentDelegate;
 
 	FabricMeshEmitterManager() {
-		super((bufferBuilderStack, $) -> new MeshEmitter(bufferBuilderStack));
+		super(MeshEmitter::new);
 	}
 
 	public BakedModel prepareForModel(BakedModel model, RenderType defaultLayer, boolean useAo, boolean defaultAo) {

neoforge/src/lib/java/dev/engine_room/flywheel/lib/model/baked/NeoforgeMeshEmitter.java

@@ -19,7 +19,7 @@ public class NeoforgeMeshEmitter extends MeshEmitter implements VertexConsumer {
 	private boolean defaultAo;
 
 	NeoforgeMeshEmitter(ByteBufferBuilderStack byteBufferBuilderStack, RenderType renderType) {
-		super(byteBufferBuilderStack);
+		super(byteBufferBuilderStack, renderType);
 		this.renderType = renderType;
 	}