wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashing on MC 1.20.1 and older when updates aren't found

Browse Source
This commit is contained in:
James Seibel
2025-03-01 09:13:47 -06:00
parent 492a051a3b
commit f251c90472
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java
+14 -6
View File
@@ -76,10 +76,19 @@ public abstract class MixinMinecraft
if (SelfUpdater.onStart() || DEBUG_ALWAYS_SHOW_UPDATER) if (SelfUpdater.onStart() || DEBUG_ALWAYS_SHOW_UPDATER)
{ {
instance.setScreen(new UpdateModScreen( try
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")) instance.setScreen(new UpdateModScreen(
)); 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"))
));
}
catch (Exception e)
{
// info instead of error since this can be ignored and probably just means
// there isn't a new DH version available
LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"].");
}
} }
else else
{ {
@@ -124,14 +133,13 @@ public abstract class MixinMinecraft
{ {
try try
{ {
Minecraft.getInstance().setScreen(new UpdateModScreen( Minecraft.getInstance().setScreen(new UpdateModScreen(
// TODO: Change to runnable, instead of tittle screen // TODO: Change to runnable, instead of tittle screen
new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
versionId versionId
)); ));
} }
catch (IllegalArgumentException e) catch (Exception e)
{ {
// info instead of error since this can be ignored and probably just means // info instead of error since this can be ignored and probably just means
// there isn't a new DH version available // there isn't a new DH version available
forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java
+14 -5
View File
@@ -57,10 +57,19 @@ public class MixinMinecraft
if (SelfUpdater.onStart()) if (SelfUpdater.onStart())
{ {
instance.setScreen(new UpdateModScreen( try
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")) instance.setScreen(new UpdateModScreen(
)); 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"))
));
}
catch (Exception e)
{
// info instead of error since this can be ignored and probably just means
// there isn't a new DH version available
LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"].");
}
} }
else else
{ {
@@ -108,7 +117,7 @@ public class MixinMinecraft
versionId versionId
)); ));
} }
catch (IllegalArgumentException e) catch (Exception e)
{ {
// info instead of error since this can be ignored and probably just means // info instead of error since this can be ignored and probably just means
// there isn't a new DH version available // there isn't a new DH version available
neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java
+1 -2
View File
@@ -76,14 +76,13 @@ public class MixinMinecraft
{ {
try try
{ {
Minecraft.getInstance().setScreen(new UpdateModScreen( Minecraft.getInstance().setScreen(new UpdateModScreen(
// TODO: Change to runnable, instead of tittle screen // TODO: Change to runnable, instead of tittle screen
new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
versionId versionId
)); ));
} }
catch (IllegalArgumentException e) catch (Exception e)
{ {
// info instead of error since this can be ignored and probably just means // info instead of error since this can be ignored and probably just means
// there isn't a new DH version available // there isn't a new DH version available