Only load stage1 UI if downloading is required

Author: Wyvest

stage0/build.gradle.kts

@@ -1,6 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
-version = "1.1.0-alpha.46"
+version = "1.1.0-alpha.47"
 
 val include by configurations
 

stage1/build.gradle.kts

@@ -1,4 +1,4 @@
-version = "1.1.0-alpha.47"
+version = "1.1.0-alpha.48" // When you bump this, you should also bump stage0, cause stage0 includes a copy of stage1 too
 
 sourceSets {
     val main by this

stage1/src/main/java/org/polyfrost/oneconfig/loader/stage1/Stage1Loader.java

@@ -62,6 +62,8 @@ public class Stage1Loader extends LoaderBase {
 	private Class<?> oneconfigMainClass;
 	private Object oneconfigMainInstance;
 
+	private LoaderFrame loaderFrame = null;
+
 	public Stage1Loader(Capabilities capabilities) {
 		super(
 				"stage1",
@@ -80,16 +82,14 @@ public void load() {
 		String targetSpecifier = gameMetadata.getTargetSpecifier();
 		log.info("Target specifier: {}", targetSpecifier);
 
-		log.info("Creating UI");
-		LoaderFrame loaderFrame = new LoaderFrame();
-		loaderFrame.display();
-
-		checkForUpdates(loaderFrame);
-		maybeDownloadRelaunch(loaderFrame);
-		downloadOneConfigArtifacts(loaderFrame);
+		checkForUpdates();
+		maybeDownloadRelaunch();
+		downloadOneConfigArtifacts();
 
 		// Close our updater window, we're done
-		loaderFrame.destroy();
+		if (this.loaderFrame != null) {
+			this.loaderFrame.destroy();
+		}
 
 		try {
 			ClassLoader classLoader = runtimeAccess.getClassLoader();
@@ -119,7 +119,7 @@ public void postLoad() {
 		}
     }
 
-	private void checkForUpdates(LoaderFrame loaderFrame) {
+	private void checkForUpdates() {
 		if (isUpdateChecked) {
 			return;
 		}
@@ -141,6 +141,7 @@ private void checkForUpdates(LoaderFrame loaderFrame) {
 		Path selfFile = dataDir.resolve("stage1.jar");
 
 		if (!stage1Artifact.checksum.isMatching(selfFile)) {
+			requestLoaderFrame();
 			loaderFrame.updateMessage("Downloading OneConfig Loader stage 1...");
 			stage1Artifact.downloadTo(getRequestHelper(), dataDir.resolve("stage1.update.jar"), loaderFrame::updateProgress);
 
@@ -151,7 +152,7 @@ private void checkForUpdates(LoaderFrame loaderFrame) {
 	}
 
 	@SneakyThrows
-	private void maybeDownloadRelaunch(LoaderFrame loaderFrame) {
+	private void maybeDownloadRelaunch() {
 		if (isRelaunchDownloaded) {
 			return;
 		}
@@ -176,6 +177,7 @@ private void maybeDownloadRelaunch(LoaderFrame loaderFrame) {
 		Path relaunchFile = dataDir.resolve("relaunch.jar");
 
 		if (!Files.exists(relaunchFile) || !relaunchArtifact.checksum.isMatching(relaunchFile)) {
+			requestLoaderFrame();
 			loaderFrame.updateMessage("Downloading OneConfig Loader Relaunch...");
 			relaunchArtifact.downloadTo(getRequestHelper(), relaunchFile, loaderFrame::updateProgress);
 		}
@@ -185,7 +187,7 @@ private void maybeDownloadRelaunch(LoaderFrame loaderFrame) {
 	}
 
 	@SneakyThrows
-	private void downloadOneConfigArtifacts(LoaderFrame loaderFrame) {
+	private void downloadOneConfigArtifacts() {
 		if (isOneConfigDownloaded) {
 			return;
 		}
@@ -232,6 +234,7 @@ private void downloadOneConfigArtifacts(LoaderFrame loaderFrame) {
 		for (BackendArtifact artifact : artifacts) {
 			Path artifactFile = dataDir.resolve(artifact.name + ".jar");
 			if (!Files.exists(artifactFile) || !artifact.checksum.isMatching(artifactFile)) {
+				requestLoaderFrame();
 				loaderFrame.updateMessage("Downloading OneConfig artifact: " + artifact.name);
 				artifact.downloadTo(getRequestHelper(), artifactFile, loaderFrame::updateProgress);
 			}
@@ -283,6 +286,14 @@ private void downloadOneConfigArtifacts(LoaderFrame loaderFrame) {
 		isOneConfigDownloaded = true;
 	}
 
+	private void requestLoaderFrame() {
+		if (this.loaderFrame == null) {
+			log.info("Creating UI");
+			loaderFrame = new LoaderFrame();
+			loaderFrame.display();
+		}
+	}
+
 	@SneakyThrows
 	private BackendArtifact readArtifactAt(String url) {
 		URLConnection connection = getRequestHelper().establishConnection(URI.create(url).toURL());