From e8cddfdfea36e589009211747ceebd4a44b584a0 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Tue, 9 Nov 2021 16:53:52 -0800 Subject: [PATCH] Fix textures on contraptions - bump flywheel build --- gradle.properties | 2 +- .../structureMovement/render/ContraptionRenderDispatcher.java | 3 +++ .../structureMovement/render/FlwContraptionManager.java | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e86f15d95..1174d8dfd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ parchment_version = 2021.10.31 # dependency versions registrate_version = MC1.17.1-1.0.13 -flywheel_version = 1.17-0.3.0.11 +flywheel_version = 1.17-0.3.0.12 jei_version = 8.1.0.31 # curseforge information diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java index 4fc91b53f..8b9ec1f5a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java @@ -5,6 +5,7 @@ import java.util.Collection; import org.apache.commons.lang3.tuple.Pair; import com.jozufozu.flywheel.backend.Backend; +import com.jozufozu.flywheel.backend.gl.error.GlError; import com.jozufozu.flywheel.core.model.ModelUtil; import com.jozufozu.flywheel.event.BeginFrameEvent; import com.jozufozu.flywheel.event.GatherContextEvent; @@ -68,6 +69,8 @@ public class ContraptionRenderDispatcher { @SubscribeEvent public static void renderLayer(RenderLayerEvent event) { WORLDS.get(event.getWorld()).renderLayer(event); + + GlError.pollAndThrow(() -> "contraption layer: " + event.getLayer()); } @SubscribeEvent 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 6da48286e..af83a58e6 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 @@ -7,6 +7,7 @@ import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.backend.gl.GlTextureUnit; import com.jozufozu.flywheel.backend.state.RenderLayer; import com.jozufozu.flywheel.event.RenderLayerEvent; +import com.jozufozu.flywheel.util.TextureBinder; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.foundation.render.AllProgramSpecs; import com.simibubi.create.foundation.render.CreateContexts; @@ -40,6 +41,8 @@ public class FlwContraptionManager extends ContraptionRenderManager