From b792487b6043636830f67eb0b73e8fe763e0876f Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 16 May 2026 18:55:52 -0500 Subject: [PATCH] fix auto update screen on MC 26.2 --- coreSubProjects | 2 +- .../fabric/mixins/client/MixinMinecraft.java | 31 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index ec6f8255b..21136ba1e 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit ec6f8255b5cc823ad2fa9ddd7fd9ca1894adea09 +Subproject commit 21136ba1ef7e54fe4ee94072e874150038fe8539 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index 5dc71a446..e3abc9e52 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -87,18 +87,25 @@ public abstract class MixinMinecraft } #endif - // TODO vulkan - //#if MC_VER >= MC_1_20_2 - //@Redirect( - // method = "Lnet/minecraft/client/Minecraft;onGameLoadFinished(Lnet/minecraft/client/Minecraft$GameLoadCookie;)V", - // at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V") - //) - //private void buildInitialScreens(Runnable runnable) - //{ - // DhUpdateScreenBase.tryShowUpdateScreenAndRunAutoUpdateStartup(runnable); - // runnable.run(); - //} - //#endif + #if MC_VER >= MC_1_20_2 + #if MC_VER <= MC_26_1_2 + @Redirect( + method = "Lnet/minecraft/client/Minecraft;onGameLoadFinished(Lnet/minecraft/client/Minecraft$GameLoadCookie;)V", + at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V") + ) + private void buildInitialScreens(Runnable runnable) + #else + @Redirect( + method = "Lnet/minecraft/client/Minecraft;onGameLoadFinished(Lnet/minecraft/client/GameLoadCookie;)V", + at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V") + ) + private void buildInitialScreens(Runnable runnable) + #endif + { + DhUpdateScreenBase.tryShowUpdateScreenAndRunAutoUpdateStartup(runnable); + runnable.run(); + } + #endif @Inject(at = @At("HEAD"), method = "updateLevelInEngines") public void updateLevelInEngines(ClientLevel level, CallbackInfo ci)