Resolve merge conflicts

pom.xml

@@ -300,12 +300,6 @@
 			<artifactId>maven-jdk-tools-wrapper</artifactId>
 			<version>0.1</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.nqzero/permit-reflect -->
-		<dependency>
-			<groupId>com.nqzero</groupId>
-			<artifactId>permit-reflect</artifactId>
-			<version>0.4</version>
-		</dependency>
 		<!--- Testing -->
 		<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
 		<dependency>
@@ -525,6 +519,15 @@
                     <target>8</target>
                 </configuration>
             </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>java/**</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
             <!-- Bug/quality enforcement
                  mvn spotbugs:spotbugs - create report
                  mvn spotbugs:gui - show gui

src/main/java/java/lang/Module.java

@@ -0,0 +1,16 @@
+package java.lang;
+
+import java.util.Set;
+
+/**
+ * Dummy java compatibility class
+ *
+ * @author Matt
+ */
+public abstract class Module {
+
+  //CHECKSTYLE:OFF
+  public ModuleLayer getLayer() { throw new UnsupportedOperationException(); }
+  public Set<String> getPackages() { throw new UnsupportedOperationException(); }
+  //CHECKSTYLE:ON
+}

src/main/java/java/lang/ModuleLayer.java

@@ -0,0 +1,20 @@
+package java.lang;
+
+import java.util.Set;
+
+/**
+ * Dummy java compatibility class
+ *
+ * @author xxDark
+ */
+public abstract class ModuleLayer {
+
+  //CHECKSTYLE:OFF
+  public Set<Module> modules() {
+    throw new UnsupportedOperationException();
+  }
+  public static ModuleLayer boot() {
+    throw new UnsupportedOperationException();
+  }
+  //CHECKSTYLE:ON
+}

src/main/java/java/lang/module/ModuleFinder.java

@@ -10,7 +10,7 @@
 public interface ModuleFinder {
     //CHECKSTYLE:OFF
     static ModuleFinder ofSystem() {
-        return null;
+        throw new UnsupportedOperationException();
     }
     Set<ModuleReference> findAll();
     //CHECKSTYLE:ON

src/main/java/me/coley/recaf/util/Java9Util.java

@@ -0,0 +1,65 @@
+package me.coley.recaf.util;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import java.lang.reflect.Field;
+
+/**
+ * Package-private util to deal with modules.
+ *
+ * @author xxDark
+ */
+final class Java9Util {
+
+    private static final MethodHandle CLASS_MODULE;
+    private static final MethodHandle CLASS_LOADER_MDOULE;
+
+    /**
+     * Deny all constructions.
+     */
+    private Java9Util() {
+    }
+
+    /**
+     * @param klass {@link Class} to get module from.
+     * @return {@link Module} of the class.
+     */
+    static Module getClassModule(Class<?> klass) {
+        try {
+            return (Module) CLASS_MODULE.invokeExact(klass);
+        } catch (Throwable t) {
+            // That should never happen.
+            throw new AssertionError(t);
+        }
+    }
+
+
+    /**
+     * @param loader {@link ClassLoader} to get module from.
+     * @return {@link Module} of the class.
+     */
+    static Module getLoaderModule(ClassLoader loader) {
+        try {
+            return (Module) CLASS_LOADER_MDOULE.invokeExact(loader);
+        } catch (Throwable t) {
+            // That should never happen.
+            throw new AssertionError(t);
+        }
+    }
+
+    static {
+        try {
+            Field field = Lookup.class.getDeclaredField("IMPL_LOOKUP");
+            field.setAccessible(true);
+            MethodHandles.publicLookup();
+            Lookup lookup = (Lookup) field.get(null);
+            MethodType type = MethodType.methodType(Module.class);
+            CLASS_MODULE = lookup.findVirtual(Class.class, "getModule", type);
+            CLASS_LOADER_MDOULE = lookup.findVirtual(ClassLoader.class, "getUnnamedModule", type);
+        } catch (NoSuchMethodException | IllegalAccessException | NoSuchFieldException ex) {
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
+}

src/main/java/me/coley/recaf/util/VMUtil.java

@@ -1,7 +1,7 @@
 package me.coley.recaf.util;
 
-import com.nqzero.permit.Permit;
 import com.sun.javafx.application.PlatformImpl;
+import java.util.HashSet;
 import javafx.application.Platform;
 
 import java.io.IOException;
@@ -212,12 +212,41 @@ public static Path getJavaPath() {
      */
     public static void patch() {
         if (getVmVersion() > 8) {
-            Permit.godMode();
-            Permit.unLog();
+            openPackages();
             patchReflectionFilters();
         }
     }
 
+    /**
+     * Opens all packages.
+     */
+    private static void openPackages() {
+        try {
+            Method export = Module.class.getDeclaredMethod("implAddOpens",String.class);
+            export.setAccessible(true);
+            HashSet<Module> modules = new HashSet<>();
+            Class<?> classBase = VMUtil.class;
+            Module base = Java9Util.getClassModule(classBase);
+            if (base.getLayer() != null)
+                modules.addAll(base.getLayer().modules());
+            modules.addAll(ModuleLayer.boot().modules());
+            for (ClassLoader cl = classBase.getClassLoader(); cl != null; cl = cl.getParent()) {
+                modules.add(Java9Util.getLoaderModule(cl));
+            }
+            for (Module module : modules) {
+                for (String name : module.getPackages()) {
+                    try {
+                        export.invoke(module, name);
+                    } catch (Exception ex) {
+                        Log.error(ex, "Could not export package {} in module {}", name, module);
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            Log.error(ex, "Could not export packages");
+        }
+    }
+
     /**
      * Patches reflection filters.
      */

src/main/java/me/coley/recaf/workspace/InstrumentationResource.java

@@ -19,7 +19,6 @@
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
 import java.lang.instrument.UnmodifiableClassException;
-import java.lang.module.Module;
 import java.security.ProtectionDomain;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;