From d7b63fd6f2ea6d76a19b1c6fbb124ac93170b4d0 Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Thu, 7 Apr 2022 14:28:13 -0700
Subject: [PATCH] Spinning up the wheel

 - Bump flywheel build - 0.6.2.65
---
 gradle.properties                                            | 2 +-
 .../components/structureMovement/render/FlwContraption.java  | 2 +-
 .../structureMovement/render/FlwContraptionManager.java      | 4 ++--
 .../content/logistics/trains/entity/BogeyInstance.java       | 3 ---
 .../trains/entity/CarriageContraptionEntityRenderer.java     | 4 +---
 .../logistics/trains/entity/CarriageContraptionInstance.java | 5 -----
 src/main/java/com/simibubi/create/events/ClientEvents.java   | 1 -
 7 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5c5f59c11..05d998f8b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ parchment_version = 2022.03.13
 
 # dependency versions
 registrate_version = MC1.18.2-1.0.24
-flywheel_version = 1.18-0.6.2.64
+flywheel_version = 1.18-0.6.2.65
 jei_minecraft_version = 1.18.2
 jei_version = 9.5.3.143
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java
index 01cbb7d95..969f2adef 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraption.java
@@ -182,7 +182,7 @@ public class FlwContraption extends ContraptionRenderInfo {
 		private final ContraptionInstanceManager tileInstanceManager;
 
 		public ContraptionInstanceWorld(FlwContraption parent) {
-			switch (Backend.getEngine()) {
+			switch (Backend.getBackendType()) {
 			case INSTANCING -> {
 				InstancingEngine<ContraptionProgram> engine = InstancingEngine.builder(CreateContexts.CWORLD)
 						.setGroupFactory(ContraptionGroup.forContraption(parent))
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 4b68fd1a8..2f0b5d64d 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,7 +7,7 @@ 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.config.FlwEngine;
+import com.jozufozu.flywheel.config.BackendType;
 import com.jozufozu.flywheel.core.Formats;
 import com.jozufozu.flywheel.core.Materials;
 import com.jozufozu.flywheel.core.compile.ProgramContext;
@@ -43,7 +43,7 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 		GlStateTracker.State restoreState = GlStateTracker.getRestoreState();
 		GlTextureUnit active = GlTextureUnit.getActive();
 
-		if (Backend.getEngine() != FlwEngine.BATCHING) {
+		if (Backend.getBackendType() != BackendType.BATCHING) {
 			renderStructures(event);
 		}
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java
index fde1ee81e..caf75f6f8 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyInstance.java
@@ -1,7 +1,5 @@
 package com.simibubi.create.content.logistics.trains.entity;
 
-import org.jetbrains.annotations.Nullable;
-
 import com.jozufozu.flywheel.api.Material;
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.Materials;
@@ -11,7 +9,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock;
-import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.utility.AngleHelper;
 import com.simibubi.create.foundation.utility.Iterate;
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java
index 2f91c04b1..28c625ab0 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java
@@ -43,8 +43,6 @@ public class CarriageContraptionEntityRenderer extends ContraptionEntityRenderer
 		if (carriage == null)
 			return;
 
-		boolean usingFlywheel = Backend.isOn();
-
 		Vec3 position = entity.getPosition(partialTicks);
 
 		float viewYRot = entity.getViewYRot(partialTicks);
@@ -55,7 +53,7 @@ public class CarriageContraptionEntityRenderer extends ContraptionEntityRenderer
 			if (bogey == null)
 				return;
 
-			if (!usingFlywheel) {
+			if (!Backend.isOn()) {
 				ms.pushPose();
 				translateBogey(ms, bogey, bogeySpacing, viewYRot, viewXRot, partialTicks);
 
diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java
index 77fee5118..eeb25566d 100644
--- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java
+++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionInstance.java
@@ -8,11 +8,6 @@ import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.foundation.utility.Couple;
 
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.phys.Vec3;
-
 public class CarriageContraptionInstance extends EntityInstance<CarriageContraptionEntity> implements DynamicInstance {
 
 	private final PoseStack ms = new PoseStack();
diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java
index 08f3df72d..30d3d4b22 100644
--- a/src/main/java/com/simibubi/create/events/ClientEvents.java
+++ b/src/main/java/com/simibubi/create/events/ClientEvents.java
@@ -211,7 +211,6 @@ public class ClientEvents {
 		CreateClient.GHOST_BLOCKS.renderAll(ms, buffer);
 
 		CreateClient.OUTLINER.renderOutlines(ms, buffer, pt);
-		// LightVolumeDebugger.render(ms, buffer);
 		buffer.draw();
 		RenderSystem.enableCull();