diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java index e4f0fa57..cb661adf 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java @@ -22,7 +22,7 @@ public class MinecraftMixin { /** * To mitigate the effect of leaked client worlds, clear most of the data structures that waste memory. */ - @Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/Minecraft;level:Lnet/minecraft/client/multiplayer/ClientLevel;")) + @Inject(method = "disconnect(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/Minecraft;level:Lnet/minecraft/client/multiplayer/ClientLevel;")) private void clearLevelDataForLeaks(CallbackInfo ci) { if(this.level != null) { try { diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java index 0c4f5a48..5d287c8b 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java @@ -12,7 +12,7 @@ import java.util.concurrent.ExecutorService; @Mixin(Minecraft.class) @ClientOnlyMixin public class MinecraftMixin { - @Redirect(method = { "", "reloadResourcePacks(Z)Ljava/util/concurrent/CompletableFuture;" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;backgroundExecutor()Ljava/util/concurrent/ExecutorService;", ordinal = 0)) + @Redirect(method = { "", "reloadResourcePacks(ZLnet/minecraft/client/Minecraft$GameLoadCookie;)Ljava/util/concurrent/CompletableFuture;" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;backgroundExecutor()Ljava/util/concurrent/ExecutorService;", ordinal = 0)) private ExecutorService getResourceReloadExecutor() { return ModernFix.resourceReloadExecutor(); } diff --git a/gradle.properties b/gradle.properties index 8d90fa48..11266e3a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ junit_version=5.10.0-M1 mixinextras_version=0.2.0-beta.9 mod_id=modernfix -minecraft_version=23w32a +minecraft_version=23w33a enabled_platforms=fabric forge_version=1.20.1-47.0.14 # parchment_version=2023.07.09 @@ -15,7 +15,7 @@ rei_version=11.0.597 ctm_version=1.20.1-1.1.8+4 kubejs_version=1902.6.0-build.142 rhino_version=1902.2.2-build.268 -supported_minecraft_versions=23w32a +supported_minecraft_versions=23w33a fabric_loader_version=0.14.22 fabric_api_version=0.86.1+1.20.2 @@ -27,4 +27,4 @@ diagonal_fences_version=4558828 spark_version=4587310 -use_fabric_api_at_runtime=true +use_fabric_api_at_runtime=false