Remove the legacy part due to all forge installers are upgraded.

build.gradle

@@ -32,13 +32,12 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.google.code.gson:gson:2.8.5"
+    compileOnly "com.google.code.gson:gson:2.8.7"
     compileOnly "cpw.mods:modlauncher:8.0.9"
-    compileOnly "net.minecraftforge:installer:2.1.4"
+    compileOnly "net.minecraftforge:installer:2.1.9"
     compileOnly "net.sf.jopt-simple:jopt-simple:5.0.4"
 
     provided project(":common")
-    provided project(":legacy")
     multirelase project(":jigsaw")
 }
 

converter/build.gradle

@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.google.code.gson:gson:2.8.5"
+    compileOnly "com.google.code.gson:gson:2.8.7"
     provided rootProject
 }
 

converter/src/main/java/io/github/zekerzhayard/forgewrapper/converter/Converter.java

@@ -75,7 +75,7 @@ public static JsonObject getJsonFromZip(Path path, String json) {
                 throw new RuntimeException("The zip file is invalid!");
             }
             InputStreamReader isr = new InputStreamReader(zf.getInputStream(versionFile), StandardCharsets.UTF_8);
-            return new JsonParser().parse(isr).getAsJsonObject();
+            return JsonParser.parseReader(isr).getAsJsonObject();
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -84,7 +84,7 @@ public static JsonObject getJsonFromZip(Path path, String json) {
     // Convert mmc-pack.json:
     //   - Replace Minecraft version
     private static JsonObject convertPackJson(String mcVersion) {
-        JsonObject pack = new JsonParser().parse(new InputStreamReader(Converter.class.getResourceAsStream("/mmc-pack.json"))).getAsJsonObject();
+        JsonObject pack = JsonParser.parseReader(new InputStreamReader(Converter.class.getResourceAsStream("/mmc-pack.json"))).getAsJsonObject();
 
         for (JsonElement component : getElement(pack, "components").getAsJsonArray()) {
             JsonObject componentObject = component.getAsJsonObject();
@@ -101,7 +101,7 @@ private static JsonObject convertPackJson(String mcVersion) {
     //   - Add forge-launcher url
     //   - Replace Minecraft & Forge versions
     private static JsonObject convertPatchesJson(JsonObject installer, JsonObject installProfile, String mcVersion, String forgeVersion, StringBuilder wrapperVersion) {
-        JsonObject patches = new JsonParser().parse(new InputStreamReader(Converter.class.getResourceAsStream("/patches/net.minecraftforge.json"))).getAsJsonObject();
+        JsonObject patches = JsonParser.parseReader(new InputStreamReader(Converter.class.getResourceAsStream("/patches/net.minecraftforge.json"))).getAsJsonObject();
         JsonArray mavenFiles = getElement(patches, "mavenFiles").getAsJsonArray();
         JsonArray libraries = getElement(patches, "libraries").getAsJsonArray();
 

converter/src/main/resources/patches/net.minecraftforge.json

@@ -15,7 +15,7 @@
   "mavenFiles": [
     {
       "name": "net.minecraftforge:forge:{VERSION}-{FORGE_VERSION}:installer",
-      "url": "https://files.minecraftforge.net/maven/"
+      "url": "https://maven.minecraftforge.net/"
     }
   ],
   "libraries": [

gradle.properties

@@ -1,4 +1,4 @@
 
 org.gradle.daemon = false
 
-fw_version = 1.5.2
+fw_version = 1.5.3

jigsaw/src/main/java/io/github/zekerzhayard/forgewrapper/installer/util/ModuleUtil.java

@@ -102,6 +102,10 @@ public static void addOpens(List<String> opens) {
         TypeToAdd.OPENS.implAdd(opens);
     }
 
+    public static ClassLoader getPlatformClassLoader() {
+        return ClassLoader.getPlatformClassLoader();
+    }
+
     private enum TypeToAdd {
         EXPORTS("Exports"),
         OPENS("Opens");

settings.gradle

@@ -3,4 +3,3 @@ rootProject.name = 'ForgeWrapper'
 include 'common'
 include 'converter'
 include 'jigsaw'
-include 'legacy'

src/main/java/io/github/zekerzhayard/forgewrapper/installer/Installer.java

@@ -2,14 +2,14 @@
 
 import java.io.File;
 
-import io.github.zekerzhayard.forgewrapper.installer.util.InstallerUtil;
 import net.minecraftforge.installer.actions.ProgressCallback;
 import net.minecraftforge.installer.json.Install;
+import net.minecraftforge.installer.json.Util;
 
 public class Installer {
     public static boolean install(File libraryDir, File minecraftJar, File installerJar, String forgeVersion) {
         ProgressCallback monitor = ProgressCallback.withOutputs(System.out);
-        Install install = InstallerUtil.loadInstallProfile(forgeVersion);
+        Install profile = Util.loadInstallProfile();
         if (System.getProperty("java.net.preferIPv4Stack") == null) {
             System.setProperty("java.net.preferIPv4Stack", "true");
         }
@@ -18,6 +18,6 @@ public static boolean install(File libraryDir, File minecraftJar, File installer
         String jvmVersion = System.getProperty("java.vm.version", "missing jvm version");
         monitor.message(String.format("JVM info: %s - %s - %s", vendor, javaVersion, jvmVersion));
         monitor.message("java.net.preferIPv4Stack=" + System.getProperty("java.net.preferIPv4Stack"));
-        return InstallerUtil.runClientInstall(forgeVersion, install, monitor, libraryDir, minecraftJar, installerJar);
+        return new ClientInstall4MultiMC(profile, monitor, libraryDir, minecraftJar).run(null, input -> true, installerJar);
     }
 }

src/main/java/io/github/zekerzhayard/forgewrapper/installer/Main.java

@@ -21,9 +21,13 @@ public static void main(String[] args) throws Throwable {
         String forgeFullVersion = mcVersion + "-" + forgeVersion;
 
         IFileDetector detector = DetectorLoader.loadDetector();
-        Bootstrap.bootstrap(detector.getJvmArgs(forgeFullVersion), detector.getMinecraftJar(mcVersion).getFileName().toString(), detector.getLibraryDir().toAbsolutePath().toString());
+        try {
+            Bootstrap.bootstrap(detector.getJvmArgs(forgeFullVersion), detector.getMinecraftJar(mcVersion).getFileName().toString(), detector.getLibraryDir().toAbsolutePath().toString());
+        } catch (Throwable ignored) {
+            // Avoid this bunch of hacks that nuke the whole wrapper.
+        }
         if (!detector.checkExtraFiles(forgeFullVersion)) {
-            System.out.println("Some extra libraries are missing! Run the installer to generate them now.");
+            System.out.println("Some extra libraries are missing! Running the installer to generate them now.");
 
             // Check installer jar.
             Path installerJar = detector.getInstallerJar(forgeFullVersion);
@@ -41,7 +45,7 @@ public static void main(String[] args) throws Throwable {
                 Main.class.getProtectionDomain().getCodeSource().getLocation(),
                 Launcher.class.getProtectionDomain().getCodeSource().getLocation(),
                 installerJar.toUri().toURL()
-            }, getParentClassLoader())) {
+            }, ModuleUtil.getPlatformClassLoader())) {
                 Class<?> installer = ucl.loadClass("io.github.zekerzhayard.forgewrapper.installer.Installer");
                 if (!(boolean) installer.getMethod("install", File.class, File.class, File.class, String.class).invoke(null, detector.getLibraryDir().toFile(), minecraftJar.toFile(), installerJar.toFile(), forgeVersion)) {
                     return;
@@ -52,16 +56,4 @@ public static void main(String[] args) throws Throwable {
         Class<?> mainClass = ModuleUtil.setupBootstrapLauncher(Class.forName(detector.getMainClass(forgeFullVersion)));
         mainClass.getMethod("main", String[].class).invoke(null, new Object[] { args });
     }
-
-    // https://github.com/MinecraftForge/Installer/blob/fe18a164b5ebb15b5f8f33f6a149cc224f446dc2/src/main/java/net/minecraftforge/installer/actions/PostProcessors.java#L287-L303
-    private static ClassLoader getParentClassLoader() {
-        if (!System.getProperty("java.version").startsWith("1.")) {
-            try {
-                return (ClassLoader) ClassLoader.class.getDeclaredMethod("getPlatformClassLoader").invoke(null);
-            } catch (Exception e) {
-                System.out.println("No platform classloader: " + System.getProperty("java.version"));
-            }
-        }
-        return null;
-    }
 }

src/main/java/io/github/zekerzhayard/forgewrapper/installer/util/ModuleUtil.java

@@ -19,4 +19,9 @@ public static Class<?> setupBootstrapLauncher(Class<?> mainClass) {
         // nothing to do with Java 8
         return mainClass;
     }
+
+    public static ClassLoader getPlatformClassLoader() {
+        // PlatformClassLoader does not exist in Java 8
+        return null;
+    }
 }