From aa96a28f0bc5c669736b8a32e25f9bc15b93eab3 Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Tue, 21 Dec 2021 22:47:30 -0800
Subject: [PATCH] Make the BatchingEngine not jittery

 - Stop having threads compete for a single BufferBuilder
 - ...by skirting around minecraft's BufferSource
 - Begin work on making vertex writing sane
---
 .../structureMovement/glue/GlueInstance.java         |  8 --------
 .../render/FlwContraptionManager.java                |  2 +-
 .../create/foundation/render/SuperByteBuffer.java    | 12 ++++++------
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java
index 46a053521..cb4cf3e2f 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/GlueInstance.java
@@ -4,9 +4,7 @@ import com.jozufozu.flywheel.api.Instancer;
 import com.jozufozu.flywheel.api.MaterialGroup;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.api.instance.ITickableInstance;
-import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.instancing.entity.EntityInstance;
-import com.jozufozu.flywheel.core.Formats;
 import com.jozufozu.flywheel.core.Materials;
 import com.jozufozu.flywheel.core.instancing.ConditionalInstance;
 import com.jozufozu.flywheel.core.materials.oriented.OrientedData;
@@ -103,7 +101,6 @@ public class GlueInstance extends EntityInstance<SuperGlueEntity> implements ITi
 			return "glue";
 		}
 
-		@Override
 		public void buffer(VertexConsumer buffer) {
 			Vec3 diff = Vec3.atLowerCornerOf(Direction.SOUTH.getNormal());
 			Vec3 extension = diff.normalize()
@@ -162,11 +159,6 @@ public class GlueInstance extends EntityInstance<SuperGlueEntity> implements ITi
 			return 8;
 		}
 
-		@Override
-		public VertexFormat format() {
-			return Formats.UNLIT_MODEL;
-		}
-
 		@Override
 		public ModelReader getReader() {
 			return this;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
index f4794fa75..a3b438224 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
@@ -62,7 +62,7 @@ public class FlwContraptionManager extends ContraptionRenderManager<RenderedCont
 			RenderLayer renderLayer = event.getLayer();
 			if (renderLayer != null) {
 				for (RenderedContraption renderer : visible) {
-					renderer.engine.render(event, event.buffers.bufferSource());
+					renderer.engine.render(event);
 				}
 			}
 		}
diff --git a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
index 7cb2197cd..9efc4b3fa 100644
--- a/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
+++ b/src/main/java/com/simibubi/create/foundation/render/SuperByteBuffer.java
@@ -1,8 +1,7 @@
 package com.simibubi.create.foundation.render;
 
-import com.jozufozu.flywheel.util.BufferBuilderReader;
+import com.jozufozu.flywheel.util.BlockFormatReader;
 import com.jozufozu.flywheel.util.ModelReader;
-import com.jozufozu.flywheel.util.RenderMath;
 import com.jozufozu.flywheel.util.transform.Rotate;
 import com.jozufozu.flywheel.util.transform.Scale;
 import com.jozufozu.flywheel.util.transform.TStack;
@@ -63,12 +62,9 @@ public class SuperByteBuffer implements Scale<SuperByteBuffer>, Translate<SuperB
 
 	// Temporary
 	private static final Long2IntMap WORLD_LIGHT_CACHE = new Long2IntOpenHashMap();
-	private final Vector4f pos = new Vector4f();
-	private final Vector3f normal = new Vector3f();
-	private final Vector4f lightPos = new Vector4f();
 
 	public SuperByteBuffer(BufferBuilder buf) {
-		template = new BufferBuilderReader(buf);
+		template = new BlockFormatReader(buf);
 		transforms = new PoseStack();
 		transforms.pushPose();
 	}
@@ -107,6 +103,10 @@ public class SuperByteBuffer implements Scale<SuperByteBuffer>, Translate<SuperB
 			WORLD_LIGHT_CACHE.clear();
 		}
 
+		final Vector4f pos = new Vector4f();
+		final Vector3f normal = new Vector3f();
+		final Vector4f lightPos = new Vector4f();
+
 		float f = .5f;
 		int vertexCount = template.getVertexCount();
 		for (int i = 0; i < vertexCount; i++) {