fix: Build on 1.21.5 with some less compat layers enabled

3 files changed, 5 insertions, 8 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index b6fc54d..36f1125 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -227,7 +227,7 @@ val yaclSourceSet = createIsolatedSourceSet("yacl")
 val explosiveEnhancementSourceSet =
 	createIsolatedSourceSet("explosiveEnhancement", isEnabled = false) // TODO: wait for their port
 val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender", isEnabled = false)
-val jadeSourceSet = createIsolatedSourceSet("jade")
+val jadeSourceSet = createIsolatedSourceSet("jade", isEnabled = false)
 val modmenuSourceSet = createIsolatedSourceSet("modmenu")
 val reiSourceSet = createIsolatedSourceSet("rei", isEnabled = false)
 val moulconfigSourceSet = createIsolatedSourceSet("moulconfig")
@@ -269,7 +269,6 @@ dependencies {
 
 	modCompileOnly(libs.fabric.api)
 	modRuntimeOnly(libs.fabric.api.deprecated)
-	modApi(libs.architectury)
 	modCompileOnly(libs.jarvis.api)
 	include(libs.jarvis.fabric)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cfd59a7..bdd8a6b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -34,7 +34,7 @@ sodium = "mc1.21.5-0.6.11-fabric"
 freecammod = "1.3.2+mc1.21.4"
 
 # Update from https://modrinth.com/mod/no-chat-reports/versions?l=fabric
-ncr = "Fabric-1.21.4-v2.11.0"
+ncr = "Fabric-1.21.5-v2.12.0"
 
 # Update from https://modrinth.com/mod/female-gender/versions?l=fabric
 femalegender = "4.3.3+1.21.4"
@@ -139,7 +139,7 @@ asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 
 [bundles]
 runtime_required = [
-	"rei_fabric",
+	#	"rei_fabric",
 	#	"notenoughanimations",
 	"hypixelmodapi_fabric",
 ]
diff --git a/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java b/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
index 847fb4d..3ed8c1b 100644
--- a/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
@@ -2,11 +2,9 @@
 
 package moe.nea.firmament.mixins;
 
-import com.llamalad7.mixinextras.sugar.Local;
 import moe.nea.firmament.events.WorldRenderLastEvent;
 import net.minecraft.client.render.*;
 import net.minecraft.client.util.Handle;
-import net.minecraft.client.util.ObjectAllocator;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.profiler.Profiler;
 import org.joml.Matrix4f;
@@ -31,12 +29,12 @@ public abstract class WorldRenderLastEventPatch {
 	protected abstract void checkEmpty(MatrixStack matrices);
 
 	@Inject(method = "method_62214", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V", shift = At.Shift.AFTER))
-	public void onWorldRenderLast(Fog fog, RenderTickCounter tickCounter, Camera camera, Profiler profiler, Matrix4f matrix4f, Matrix4f matrix4f2, Handle handle, Handle handle2, Handle handle3, Handle handle4, boolean bl, Frustum frustum, Handle handle5, CallbackInfo ci) {
+	public void onWorldRenderLast(Fog fog, RenderTickCounter renderTickCounter, Camera camera, Profiler profiler, Matrix4f matrix4f, Matrix4f matrix4f2, Handle handle, Handle handle2, boolean bl, Frustum frustum, Handle handle3, Handle handle4, CallbackInfo ci) {
 		var imm = this.bufferBuilders.getEntityVertexConsumers();
 		var stack = new MatrixStack();
 		// TODO: pre-cancel this event if F1 is active
 		var event = new WorldRenderLastEvent(
-			stack, tickCounter,
+			stack, renderTickCounter,
 			camera,
 			imm
 		);