Merge pull request #1 from phit/master

Merge upstream updates

Author: peterix

converter/build.gradle

@@ -1,4 +1,4 @@
 
 org.gradle.daemon = false
 
-fw_version = mmc3
+fw_version = mmc4

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

@@ -9,6 +9,7 @@
 import java.lang.module.ModuleReference;
 import java.lang.module.ResolvedModule;
 import java.lang.reflect.Field;
+import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
@@ -159,6 +160,15 @@ private static class ParserData {
         }
     }
 
+    public static void setupClassPath(Path libraryDir, List<String> paths) throws Throwable {
+        Class<?> urlClassPathClass = Class.forName("jdk.internal.loader.URLClassPath");
+        Object ucp = IMPL_LOOKUP.findGetter(Class.forName("jdk.internal.loader.BuiltinClassLoader"), "ucp", urlClassPathClass).invokeWithArguments(ClassLoader.getSystemClassLoader());
+        MethodHandle addURLMH = IMPL_LOOKUP.findVirtual(urlClassPathClass, "addURL", MethodType.methodType(void.class, URL.class));
+        for (String path : paths) {
+            addURLMH.invokeWithArguments(ucp, libraryDir.resolve(path).toUri().toURL());
+        }
+    }
+
     // ForgeWrapper need some extra settings to invoke BootstrapLauncher.
     public static Class<?> setupBootstrapLauncher(Class<?> mainClass) throws Throwable {
         if (!mainClass.getModule().isOpen(mainClass.getPackageName(), ModuleUtil.class.getModule())) {

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

@@ -4,6 +4,11 @@ plugins {
     id "eclipse"
 }
 
+sourceCompatibility = targetCompatibility = 1.8
+compileJava {
+    sourceCompatibility = targetCompatibility = 1.8
+}
+
 repositories {
     mavenCentral()
     maven {

converter/src/main/resources/mmc-pack.json

@@ -1,6 +1,5 @@
 rootProject.name = 'ForgeWrapper'
 
 include 'common'
-include 'converter'
 include 'legacy'
 include 'jigsaw'

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

@@ -15,6 +15,15 @@ public static void bootstrap(List<String> jvmArgs, String minecraftJar, String l
         }
         jvmArgs = replacedJvmArgs;
 
+        // Remove NewLaunch.jar from property to prevent Forge from adding it to the module path
+        StringBuilder newCP = new StringBuilder();
+        for (String path : System.getProperty("java.class.path").split(File.pathSeparator)) {
+            if (!path.endsWith("NewLaunch.jar")) {
+                newCP.append(path).append(File.pathSeparator);
+            }
+        }
+        System.setProperty("java.class.path", newCP.substring(0, newCP.length() - 1));
+
         String modulePath = null;
         List<String> addExports = new ArrayList<>();
         List<String> addOpens = new ArrayList<>();