From 6a189458acdeef006a623f2008f396892daae172 Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Thu, 13 Jan 2022 13:35:15 -0800
Subject: [PATCH] Fix visual artifacts and gl log spam with contraptions and
 batching engine

---
 .../structureMovement/render/FlwContraptionManager.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 8ad5929cc..5831d17fd 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
@@ -5,8 +5,8 @@ import static org.lwjgl.opengl.GL12.GL_TEXTURE_3D;
 
 import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.RenderLayer;
+import com.jozufozu.flywheel.backend.gl.GlStateTracker;
 import com.jozufozu.flywheel.backend.gl.GlTextureUnit;
-import com.jozufozu.flywheel.backend.gl.GlVertexArray;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.event.RenderLayerEvent;
 import com.jozufozu.flywheel.util.Textures;
@@ -38,6 +38,7 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 
 		if (visible.isEmpty()) return;
 
+		GlStateTracker.State restoreState = GlStateTracker.getRestoreState();
 		GlTextureUnit active = GlTextureUnit.getActive();
 
 		RenderType layer = event.getType();
@@ -56,7 +57,7 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 			flwContraption.renderStructureLayer(layer, structureShader);
 		}
 
-		GlVertexArray.unbind();
+		restoreState.restore();
 
         if (Backend.isOn()) {
 			RenderLayer renderLayer = event.getLayer();