From d5dfb184175531f558de2ea9d952ae8d062b23d8 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sat, 22 Jun 2024 21:06:21 +0200 Subject: [PATCH] fix(cli): do not start MDS thread if not needed --- .../jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt | 3 +++ .../java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java | 1 + .../inceptum/launcher/system/setup/steps/RunMdsStep.java | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt index a4183cf..84165e6 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt @@ -2,6 +2,7 @@ package io.gitlab.jfronny.inceptum.gtk.window.create import io.gitlab.jfronny.commons.StringFormatter import io.gitlab.jfronny.inceptum.common.InceptumConfig +import io.gitlab.jfronny.inceptum.common.MetaHolder import io.gitlab.jfronny.inceptum.gtk.backgroundTask import io.gitlab.jfronny.inceptum.gtk.control.KDropDown import io.gitlab.jfronny.inceptum.gtk.control.KEntry @@ -16,6 +17,7 @@ import io.gitlab.jfronny.inceptum.launcher.api.FabricMetaApi import io.gitlab.jfronny.inceptum.launcher.api.McApi import io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricVersionLoaderInfo import io.gitlab.jfronny.inceptum.launcher.model.mojang.VersionsListInfo +import io.gitlab.jfronny.inceptum.launcher.system.instance.InstanceList import io.gitlab.jfronny.inceptum.launcher.system.instance.InstanceNameTool import io.gitlab.jfronny.inceptum.launcher.system.instance.LoaderInfo import io.gitlab.jfronny.inceptum.launcher.system.setup.SetupStepInfo @@ -149,6 +151,7 @@ class NewInstanceWindow(app: Application) : KAssistant(app) { step.execute(state) } state.clearSetupLock() + InstanceList.read(MetaHolder.INSTANCE_DIR.resolve(state.name)).mds.start() } catch (e: Throwable) { pState.cancel() Log.error("Could not create instance") diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java index f0bfe27..5992732 100644 --- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java +++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/GuiUtil.java @@ -50,6 +50,7 @@ public class GuiUtil { step.execute(state); } state.clearSetupLock(); + InstanceList.read(MetaHolder.INSTANCE_DIR.resolve(state.name())).mds().start(); LauncherEnv.showInfo("The instance was successfully created. You can now launch it using the main menu", "Successfully installed"); }, t -> state.tryRemoveInstance())); } diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java index a91a136..1bcb50a 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java @@ -19,7 +19,6 @@ public class RunMdsStep implements Step { Path instance = MetaHolder.INSTANCE_DIR.resolve(info.name()); var mds = ModsDirScanner.get(instance.resolve("mods"), GC_InstanceMeta.deserialize(instance.resolve(Instance.CONFIG_NAME), GsonPreset.CONFIG)); mds.runOnce(ScanStage.DOWNLOAD, (path, iwModDescription) -> info.setState("Scanned " + path)); - mds.start(); } @Override