Provide fallback install when java not in path (#179 #209)

IzzelAliz · Apr 18, 2021 · 2f13fc4 · 2f13fc4
1 parent 5f82080
commit 2f13fc4
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java b/forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java
@@ -17,6 +17,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -65,11 +66,19 @@ public static void install() throws Throwable {
                 CompletableFuture<?>[] futures = installForge(installInfo, pool);
                 handleFutures(futures);
                 ArclightLocale.info("downloader.forge-install");
-                ProcessBuilder builder = new ProcessBuilder();
-                builder.command("java", "-Djava.net.useSystemProxies=true", "-jar", String.format("forge-%s-%s-installer.jar", installInfo.installer.minecraft, installInfo.installer.forge), "--installServer", ".");
-                builder.inheritIO();
-                Process process = builder.start();
-                process.waitFor();
+                try {
+                    ProcessBuilder builder = new ProcessBuilder();
+                    builder.command("java", "-Djava.net.useSystemProxies=true", "-jar", String.format("forge-%s-%s-installer.jar", installInfo.installer.minecraft, installInfo.installer.forge), "--installServer", ".");
+                    builder.inheritIO();
+                    Process process = builder.start();
+                    process.waitFor();
+                } catch (IOException e) {
+                    URLClassLoader loader = new URLClassLoader(
+                        new URL[]{new File(String.format("forge-%s-%s-installer.jar", installInfo.installer.minecraft, installInfo.installer.forge)).toURI().toURL()},
+                        ForgeInstaller.class.getClassLoader().getParent());
+                    Method method = loader.loadClass("net.minecraftforge.installer.SimpleInstaller").getMethod("main", String[].class);
+                    method.invoke(null, (Object) new String[]{"--installServer", "."});
+                }
             }
             handleFutures(array);
             pool.shutdownNow();