Microsoft Store launcher support (IrisShaders#15)

* Experimental game pass support

* Only run the Microsoft Store check on Windows

* Misc fixes, update to 2.0.1

* Log launcher installed

* Finalize some code, add better logging

* Clean code, remove redundant cast

* Fix more issues

* Fix even more issues

Made installToLauncher a boolean so we can pass the success result.

* Fix punctuation, use enum

Author: IMS

build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation "org.json:json:20210307"
     implementation "com.formdev:flatlaf:1.1.2"
 
-    implementation "net.fabricmc:fabric-installer:0.7.3"
+    implementation "net.fabricmc:fabric-installer:0.9.0"
 }
 
 application {
@@ -36,7 +36,7 @@ class FileOutput extends DefaultTask {
     File output
 }
 
-def bootstrapVersion = "0.1.2"
+def bootstrapVersion = "0.2.0"
 def bootstrapArch = "i686"
 
 task downloadBootstrap(type: Download) {

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Version and packaging info
-version=2.0.0
+version=2.0.1
 maven_group=net.hypercubemc
 archives_base_name=Iris-Installer
 

src/main/java/net/hypercubemc/iris_installer/Installer.java

@@ -215,7 +215,11 @@ public void start() {
             try {
                 URL loaderVersionUrl = new URL("https://raw.githubusercontent.com/IrisShaders/Iris-Installer-Maven/master/latest-loader");
                 String loaderVersion = installAsMod ? Main.LOADER_META.getLatestVersion(false).getVersion() : Utils.readTextFile(loaderVersionUrl);
-                VanillaLauncherIntegration.installToLauncher(getVanillaGameDir(), getInstallDir(), installAsMod ? "Fabric Loader " + selectedVersion : selectedEditionDisplayName, selectedVersion, loaderName, loaderVersion, installAsMod ? VanillaLauncherIntegration.Icon.FABRIC: VanillaLauncherIntegration.Icon.IRIS);
+                boolean success = VanillaLauncherIntegration.installToLauncher(getVanillaGameDir(), getInstallDir(), installAsMod ? "Fabric Loader " + selectedVersion : selectedEditionDisplayName, selectedVersion, loaderName, loaderVersion, installAsMod ? VanillaLauncherIntegration.Icon.FABRIC: VanillaLauncherIntegration.Icon.IRIS);
+                if (!success) {
+                    System.out.println("Failed to install to launcher, canceling!");
+                    return;
+                }
             } catch (IOException e) {
                 System.out.println("Failed to install version and profile to vanilla launcher!");
                 e.printStackTrace();

src/main/java/net/hypercubemc/iris_installer/VanillaLauncherIntegration.java

@@ -1,26 +1,36 @@
 package net.hypercubemc.iris_installer;
 
+import net.fabricmc.installer.client.ProfileInstaller;
 import net.fabricmc.installer.util.Reference;
 import net.fabricmc.installer.util.Utils;
 import org.json.JSONObject;
 
+import javax.swing.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class VanillaLauncherIntegration {
-    public static void installToLauncher(Path vanillaGameDir, Path instanceDir, String profileName, String gameVersion, String loaderName, String loaderVersion, Icon icon) throws IOException {
+    public static boolean installToLauncher(Path vanillaGameDir, Path instanceDir, String profileName, String gameVersion, String loaderName, String loaderVersion, Icon icon) throws IOException {
         String versionId = String.format("%s-%s-%s", loaderName, loaderVersion, gameVersion);
 
-        installVersion(vanillaGameDir, gameVersion, loaderName, loaderVersion);
-        installProfile(vanillaGameDir, instanceDir, profileName, versionId, icon);
+        ProfileInstaller.LauncherType launcherType = System.getProperty("os.name").contains("Windows") ? getLauncherType(vanillaGameDir) : /* Return standalone if we aren't on Windows.*/ ProfileInstaller.LauncherType.WIN32;
+        if (launcherType == null) {
+            // The installation has been canceled via closing the window, most likely.
+            return false;
+        }
+        installVersion(vanillaGameDir, gameVersion, loaderName, loaderVersion, launcherType);
+        installProfile(vanillaGameDir, instanceDir, profileName, versionId, icon, launcherType);
+        return true;
     }
 
-    public static void installVersion(Path mcDir, String gameVersion, String loaderName, String loaderVersion) throws IOException {
-        System.out.println("Installing " + gameVersion + " with fabric " + loaderVersion);
+    public static void installVersion(Path mcDir, String gameVersion, String loaderName, String loaderVersion, ProfileInstaller.LauncherType launcherType) throws IOException {
+        System.out.println("Installing " + gameVersion + " with fabric " + loaderVersion + " to launcher " + launcherType);
         String versionId = String.format("%s-%s-%s", loaderName, loaderVersion, gameVersion);
         Path versionsDir = mcDir.resolve("versions");
         Path profileDir = versionsDir.resolve(versionId);
@@ -36,8 +46,8 @@ public static void installVersion(Path mcDir, String gameVersion, String loaderN
         Utils.downloadFile(profileUrl, profileJson);
     }
 
-    private static void installProfile(Path mcDir, Path instanceDir, String profileName, String versionId, Icon icon) throws IOException {
-        Path launcherProfiles = mcDir.resolve("launcher_profiles.json");
+    private static void installProfile(Path mcDir, Path instanceDir, String profileName, String versionId, Icon icon, ProfileInstaller.LauncherType launcherType) throws IOException {
+        Path launcherProfiles = mcDir.resolve(launcherType.profileJsonName);
         if (!Files.exists(launcherProfiles)) {
             System.out.println("Could not find launcher_profiles");
             return;
@@ -129,6 +139,43 @@ private static String getProfileIcon(Icon icon) {
         }
     }
 
+
+    private static ProfileInstaller.LauncherType showLauncherTypeSelection() {
+        String[] options = new String[]{Utils.BUNDLE.getString("prompt.launcher.type.xbox"), Utils.BUNDLE.getString("prompt.launcher.type.win32")};
+        int result = JOptionPane.showOptionDialog(null, Utils.BUNDLE.getString("prompt.launcher.type.body"), Utils.BUNDLE.getString("installer.title"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
+        if (result == JOptionPane.CLOSED_OPTION) {
+            return null;
+        } else {
+            return result == JOptionPane.YES_OPTION ? ProfileInstaller.LauncherType.MICROSOFT_STORE : ProfileInstaller.LauncherType.WIN32;
+        }
+    }
+
+    public static ProfileInstaller.LauncherType getLauncherType(Path vanillaGameDir) {
+        ProfileInstaller.LauncherType launcherType;
+        List<ProfileInstaller.LauncherType> types = getInstalledLauncherTypes(vanillaGameDir);
+        if (types.size() == 0) {
+            // Default to WIN32, since nothing will happen anyway
+            System.out.println("No launchers found, profile installation will not take place!");
+            launcherType = ProfileInstaller.LauncherType.WIN32;
+        } else if (types.size() == 1) {
+            System.out.println("Found only one launcher (" + types.get(0) + "), will proceed with that!");
+            launcherType = types.get(0);
+        } else {
+            System.out.println("Multiple launchers found, showing selection screen!");
+            launcherType = showLauncherTypeSelection();
+            if (launcherType == null) {
+                System.out.println(Utils.BUNDLE.getString("prompt.ready.install"));
+                launcherType = ProfileInstaller.LauncherType.WIN32;
+            }
+        }
+
+        return launcherType;
+    }
+
+    public static List<ProfileInstaller.LauncherType> getInstalledLauncherTypes(Path mcDir) {
+        return Arrays.stream(ProfileInstaller.LauncherType.values()).filter((launcherType) -> Files.exists(mcDir.resolve(launcherType.profileJsonName))).collect(Collectors.toList());
+    }
+
     public enum Icon {
         IRIS,
         FABRIC