From 9e234444f1154570b21e3d478196945296364c84 Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:52:01 -0700 Subject: [PATCH] Less clunky Don't display the reload exit message before checking dependencies. --- core/src/mindustry/mod/Mods.java | 7 +++++-- core/src/mindustry/ui/dialogs/ModsDialog.java | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/mod/Mods.java b/core/src/mindustry/mod/Mods.java index 7a406d968d..bee900aa23 100644 --- a/core/src/mindustry/mod/Mods.java +++ b/core/src/mindustry/mod/Mods.java @@ -657,6 +657,7 @@ public class Mods implements Loadable{ } } + /** Assume mods in toCheck are missing dependencies. */ private void checkDependencies(Seq toCheck){ new Dialog(""){{ setFillParent(true); @@ -756,8 +757,10 @@ public class Mods implements Loadable{ if(newImports.any()){ checkDependencies(newImports); }else{ - Log.info("Exiting to reload mods."); - Core.app.exit(); + ui.showInfoOnHidden("@mods.reloadexit", () -> { + Log.info("Exiting to reload mods."); + Core.app.exit(); + }); } } diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index f69dce3b16..0ec929d3e7 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -93,7 +93,7 @@ public class ModsDialog extends BaseDialog{ hidden(() -> { if(mods.requiresReload()){ - reload(); + mods.reload(); } }); @@ -361,10 +361,6 @@ public class ModsDialog extends BaseDialog{ return null; } - private void reload(){ - ui.showInfoOnHidden("@mods.reloadexit", () -> mods.reload()); - } - private void showMod(LoadedMod mod){ BaseDialog dialog = new BaseDialog(mod.meta.displayName);