From c3b1a43bebd5d5fdd573cd2596ec9356c8ab9790 Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Sun, 10 Jul 2022 15:22:02 -0400
Subject: [PATCH] One more thing...

 - Missed a level param in LightVolume
 - Public removeAndMark
 - Remove batching warning
 - Bump forge and parchment builds
---
 gradle.properties                                    |  4 ++--
 .../backend/instancing/AbstractInstance.java         |  2 +-
 .../com/jozufozu/flywheel/config/FlwCommands.java    | 12 +-----------
 .../com/jozufozu/flywheel/light/GPULightVolume.java  |  5 ++---
 .../com/jozufozu/flywheel/light/LightVolume.java     |  2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5ab61dd67..42e95d776 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon = false
 mod_version = 0.6.4
 mc_update_version = 1.18
 minecraft_version = 1.18.2
-forge_version = 40.0.15
+forge_version = 40.1.60
 
 # build dependency versions
 forgegradle_version = 5.1.+
@@ -13,7 +13,7 @@ mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
 librarian_version = 1.+
 cursegradle_version = 1.4.0
-parchment_version = 2022.03.13
+parchment_version = 2022.07.10
 
 # curseforge info
 projectId = 486392
diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java
index d039f402e..deb007634 100644
--- a/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/AbstractInstance.java
@@ -38,7 +38,7 @@ public abstract class AbstractInstance implements Instance, LightListener {
 
 	}
 
-	final void removeAndMark() {
+	public final void removeAndMark() {
 		if (removed) {
 			return;
 		}
diff --git a/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java b/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
index 7575111e0..ce0ea95d7 100644
--- a/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
+++ b/src/main/java/com/jozufozu/flywheel/config/FlwCommands.java
@@ -118,17 +118,7 @@ public class FlwCommands {
 		return switch (type) {
 			case OFF -> new TextComponent("Disabled Flywheel").withStyle(ChatFormatting.RED);
 			case INSTANCING -> new TextComponent("Using Instancing Engine").withStyle(ChatFormatting.GREEN);
-			case BATCHING -> {
-				MutableComponent msg = new TextComponent("Using Batching Engine").withStyle(ChatFormatting.GREEN);
-
-				if (ModList.get()
-						.isLoaded("create")) {
-					// FIXME: batching engine contraption lighting issues
-					msg.append(new TextComponent("\nWARNING: May cause issues with Create Contraptions").withStyle(ChatFormatting.RED));
-				}
-
-				yield msg;
-			}
+			case BATCHING ->  new TextComponent("Using Batching Engine").withStyle(ChatFormatting.GREEN);
 		};
 	}
 
diff --git a/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java b/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java
index 6064f5e8d..673670973 100644
--- a/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java
+++ b/src/main/java/com/jozufozu/flywheel/light/GPULightVolume.java
@@ -27,7 +27,6 @@ import com.jozufozu.flywheel.util.box.GridAlignedBB;
 import com.jozufozu.flywheel.util.box.ImmutableBox;
 
 import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.LightLayer;
 
 public class GPULightVolume extends LightVolume {
 
@@ -111,14 +110,14 @@ public class GPULightVolume extends LightVolume {
 		glTexture.delete();
 	}
 
-	public void move(BlockAndTintGetter level, ImmutableBox newSampleVolume) {
+	public void move(ImmutableBox newSampleVolume) {
 		if (lightData == null) return;
 
 		if (box.contains(newSampleVolume)) {
 			sampleVolume.assign(newSampleVolume);
 			initialize();
 		} else {
-			super.move(level, newSampleVolume);
+			super.move(newSampleVolume);
 		}
 	}
 
diff --git a/src/main/java/com/jozufozu/flywheel/light/LightVolume.java b/src/main/java/com/jozufozu/flywheel/light/LightVolume.java
index e2fc15d13..31245dea9 100644
--- a/src/main/java/com/jozufozu/flywheel/light/LightVolume.java
+++ b/src/main/java/com/jozufozu/flywheel/light/LightVolume.java
@@ -60,7 +60,7 @@ public class LightVolume implements ImmutableBox, LightListener {
 		return box.getMaxZ();
 	}
 
-	public void move(BlockAndTintGetter level, ImmutableBox newSampleVolume) {
+	public void move(ImmutableBox newSampleVolume) {
 		if (lightData == null) return;
 
 		setBox(newSampleVolume);