From 0fba015f548cf3df65fa2c0a8161e3b537baeb09 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 1 Mar 2025 09:19:52 -0600 Subject: [PATCH] Fix crashing on MC 1.20.1 and older when updates aren't found 2 --- .../fabric/mixins/client/MixinMinecraft.java | 9 +++++---- .../forge/mixins/client/MixinMinecraft.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) 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 815fa8ec3..a6fc3334b 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 @@ -82,6 +82,7 @@ public abstract class MixinMinecraft new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); + return; } catch (Exception e) { @@ -90,10 +91,10 @@ public abstract class MixinMinecraft LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"]."); } } - else - { - instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened - } + + // Sets the screen back to the vanilla screen as if nothing ever happened + // if not done the game will crash + instance.setScreen(guiScreen); } #endif diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java index f479194d3..d79fa5aac 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java @@ -63,6 +63,7 @@ public class MixinMinecraft new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha")) )); + return; } catch (Exception e) { @@ -71,10 +72,10 @@ public class MixinMinecraft LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"]."); } } - else - { - instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened - } + + // Sets the screen back to the vanilla screen as if nothing ever happened + // if not done the game will crash + instance.setScreen(guiScreen); } #endif