From 5313585f3e2d0f0f647d14d56bad51f4c379b555 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sun, 11 Aug 2024 10:05:39 -0400 Subject: [PATCH] update neoforge & fix mixins --- .../engine_room/flywheel/impl/mixin/LevelRendererMixin.java | 2 +- .../dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java | 2 +- gradle.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java index 5fd4a1d4f..0451150b9 100644 --- a/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java +++ b/common/src/main/java/dev/engine_room/flywheel/impl/mixin/LevelRendererMixin.java @@ -98,7 +98,7 @@ abstract class LevelRendererMixin { } } - @Group(name = "afterParticles", min = 2, max = 2) + @Group(name = "afterParticles", min = 2, max = 3) @Inject(method = "renderLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleEngine;render(Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;F)V", shift = Shift.AFTER)) private void flywheel$afterParticles$fabric(CallbackInfo ci) { if (flywheel$renderContext != null) { diff --git a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java index 15f884c12..a248d541d 100644 --- a/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java +++ b/forge/src/main/java/dev/engine_room/flywheel/impl/mixin/MinecraftMixin.java @@ -37,7 +37,7 @@ abstract class MinecraftMixin { NeoForge.EVENT_BUS.post(new EndClientResourceReloadEvent((Minecraft) (Object) this, resourceManager, true, error)); } - @Inject(method = "lambda$reloadResourcePacks$22", at = @At("HEAD")) + @Inject(method = "lambda$reloadResourcePacks$21", at = @At("HEAD")) private void flywheel$onEndManualResourceReload(boolean recovery, @Coerce Object gameLoadCookie, CompletableFuture completablefuture, Optional error, CallbackInfo ci) { NeoForge.EVENT_BUS.post(new EndClientResourceReloadEvent((Minecraft) (Object) this, resourceManager, false, error)); } diff --git a/gradle.properties b/gradle.properties index 7dc5dc633..a8b43738f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ mod_homepage = https://github.com/Jozufozu/Flywheel minecraft_semver_version_range = >=1.21 <1.21.1 minecraft_maven_version_range = [1.21,1.21.1) fabric_api_version_range = >=0.100.6 -neoforge_version_range = [21.0.95-beta,) +neoforge_version_range = [21.0.167,) # General build dependency versions java_version = 21 @@ -25,7 +25,7 @@ parchment_version = 2024.07.07 # Minecraft build dependency versions minecraft_version = 1.21 -neoforge_version = 21.0.95-beta +neoforge_version = 21.0.167 fabric_loader_version = 0.15.11 fabric_api_version = 0.100.6+1.21