From 2856594cc8ed0744b8cb397a29e1a6046d7eae8b Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Sat, 1 Jan 2022 15:20:20 -0800
Subject: [PATCH] Pass RenderLayer into contraption structure context

---
 .../render/FlwContraptionManager.java                  | 10 +++++-----
 .../foundation/render/RainbowDebugStateProvider.java   |  4 ++--
 .../create/flywheel/shaders/context/contraption.glsl   |  1 -
 3 files changed, 7 insertions(+), 8 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 d6da7a316..9b6c53813 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
@@ -43,20 +43,20 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 		GlStateTracker.State restoreState = GlStateTracker.getRestoreState();
 		GlTextureUnit active = GlTextureUnit.getActive();
 
-		RenderType layer = event.getType();
+		RenderType type = event.getType();
 
-		layer.setupRenderState();
+		type.setupRenderState();
 
 		Textures.bindActiveTextures();
 
-		ContraptionProgram structureShader = CreateContexts.STRUCTURE.getProgram(AllProgramSpecs.PASSTHRU, Formats.BLOCK);
+		ContraptionProgram structureShader = CreateContexts.STRUCTURE.getProgram(AllProgramSpecs.PASSTHRU, Formats.BLOCK, RenderLayer.CUTOUT);
 
 		structureShader.bind();
 		structureShader.uploadViewProjection(event.viewProjection);
 		structureShader.uploadCameraPos(event.camX, event.camY, event.camZ);
 
 		for (FlwContraption flwContraption : visible) {
-			flwContraption.renderStructureLayer(layer, structureShader);
+			flwContraption.renderStructureLayer(type, structureShader);
 		}
 
 		restoreState.restore();
@@ -76,7 +76,7 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 		GlTextureUnit.T4.makeActive();
 		glBindTexture(GL_TEXTURE_3D, 0);
 
-		layer.clearRenderState();
+		type.clearRenderState();
 		active.makeActive();
 		restoreState.restore();
 	}
diff --git a/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java b/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java
index 21c1eeab9..84e4e961a 100644
--- a/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java
+++ b/src/main/java/com/simibubi/create/foundation/render/RainbowDebugStateProvider.java
@@ -1,12 +1,12 @@
 package com.simibubi.create.foundation.render;
 
-import com.jozufozu.flywheel.core.shader.gamestate.IGameStateProvider;
+import com.jozufozu.flywheel.core.shader.GameStateProvider;
 import com.simibubi.create.Create;
 import com.simibubi.create.content.contraptions.KineticDebugger;
 
 import net.minecraft.resources.ResourceLocation;
 
-public class RainbowDebugStateProvider implements IGameStateProvider {
+public class RainbowDebugStateProvider implements GameStateProvider {
 
 	public static final RainbowDebugStateProvider INSTANCE = new RainbowDebugStateProvider();
 	public static final ResourceLocation NAME = Create.asResource("rainbow_debug");
diff --git a/src/main/resources/assets/create/flywheel/shaders/context/contraption.glsl b/src/main/resources/assets/create/flywheel/shaders/context/contraption.glsl
index 73441985c..aaec87699 100644
--- a/src/main/resources/assets/create/flywheel/shaders/context/contraption.glsl
+++ b/src/main/resources/assets/create/flywheel/shaders/context/contraption.glsl
@@ -38,7 +38,6 @@ vec4 FLWVertex(inout Vertex v) {
 #elif defined(FRAGMENT_SHADER)
 #use "flywheel:core/lightutil.glsl"
 
-#define ALPHA_DISCARD 0.1
 // optimize discard usage
 #if defined(ALPHA_DISCARD)
 #if defined(GL_ARB_conservative_depth)