Merge pull request #15 from Simplix-Softworks/java16

Java16

Author: KotlinFactory

simplixcore-common/pom.xml

@@ -24,7 +24,7 @@
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>4.1.0</version>
+      <version>5.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject.extensions</groupId>

simplixcore-common/simplixcore-common-api/src/main/java/dev/simplix/core/common/libloader/SimplixClassLoader.java

@@ -0,0 +1,58 @@
+package dev.simplix.core.common.libloader;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLStreamHandlerFactory;
+
+public class SimplixClassLoader extends URLClassLoader {
+
+  private final ClassLoader parentLoader;
+
+  public SimplixClassLoader(URL[] urls, ClassLoader parent) {
+    super(urls);
+    this.parentLoader = parent;
+  }
+
+  public SimplixClassLoader(URL[] urls) {
+    super(urls);
+    this.parentLoader = null;
+  }
+
+  public SimplixClassLoader(
+      URL[] urls,
+      ClassLoader parent,
+      URLStreamHandlerFactory factory) {
+    super(urls, null, factory);
+    this.parentLoader = parent;
+  }
+
+  @Override
+  public void addURL(URL url) {
+    super.addURL(url);
+  }
+
+  @Override
+  public Class<?> loadClass(String name) throws ClassNotFoundException {
+    return loadClass(name, false);
+  }
+
+  @Override
+  protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+    return loadClass(name, resolve, true);
+  }
+
+  public Class<?> loadClass(String name, boolean resolve, boolean useParent)
+      throws ClassNotFoundException {
+    try {
+      return super.loadClass(name, resolve);
+    } catch (Throwable ignored) {
+      if (parentLoader != null && useParent) {
+        try {
+          return parentLoader.loadClass(name);
+        } catch (Throwable ignored1) {
+        }
+      }
+    }
+    throw new ClassNotFoundException(name);
+  }
+}

simplixcore-common/simplixcore-common-implementation/src/main/java/dev/simplix/core/common/libloader/SimpleLibraryLoader.java

@@ -4,6 +4,7 @@
 import com.google.gson.GsonBuilder;
 import dev.simplix.core.common.aop.SimplixApplication;
 import dev.simplix.core.common.inject.SimplixInstaller;
+import dev.simplix.core.common.updater.Version;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,19 +23,16 @@
 
 public class SimpleLibraryLoader implements LibraryLoader {
 
+  private final Version javaVersion;
   private final Logger log;
   private final Gson gson = new GsonBuilder().create();
   private final Set<File> files = new HashSet<>();
   private Method addMethod;
 
   public SimpleLibraryLoader(@NonNull Logger log) {
     this.log = log;
-    try {
-      addMethod = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-      addMethod.setAccessible(true);
-    } catch (Exception exception) {
-      log.error("Cannot initialize LibraryLoader", exception);
-    }
+    javaVersion = Version.parse(System.getProperty("java.version"));
+
   }
 
   @Override
@@ -59,6 +57,7 @@ public void loadLibrary(File file) {
         return;
       }
       log.info("[Simplix | LibLoader] Loaded library " + file.getName());
+      addUrlToClassLoader((URLClassLoader) classLoader, file);
       checkAndLoadSimplixApplication(file, classLoader);
     } catch (Exception ex) {
       log.info("[Simplix | LibLoader] Unable to load library " + file.getName(), ex);
@@ -71,7 +70,14 @@ public void loadLibraryEncapsulated(@NonNull File file, @NotNull Class<?> owner)
       if (files.contains(file)) {
         return;
       }
-      ClassLoader classLoader = owner.getClassLoader();
+      ClassLoader classLoader;
+
+      if (javaVersion.olderThen(Version.parse("16.0.0"))) {
+        classLoader = owner.getClassLoader();
+      } else {
+        classLoader = createClassLoader(file);
+      }
+
       if (!(classLoader instanceof URLClassLoader)) {
         log.warn("[Simplix | LibLoader] "
                  + owner.getSimpleName()
@@ -89,6 +95,7 @@ public void loadLibraryEncapsulated(@NonNull File file, @NotNull Class<?> owner)
     } catch (Exception ex) {
       log.info("[Simplix | LibLoader] Unable to load encapsulated library " + file.getName() +
                " for application " + owner.getSimpleName(), ex);
+
     }
   }
 
@@ -131,6 +138,16 @@ private void checkAndLoadSimplixApplication(@NonNull File file, ClassLoader clas
 
   private void addUrlToClassLoader(URLClassLoader classLoader, File file)
       throws ReflectiveOperationException, MalformedURLException {
+
+    if (classLoader instanceof SimplixClassLoader) {
+      ((SimplixClassLoader) classLoader).addURL(file.toURI().toURL());
+      return;
+    }
+
+    if (addMethod == null) {
+      addMethod = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+      addMethod.setAccessible(true);
+    }
     addMethod.invoke(classLoader, file.toURI().toURL());
   }
 

simplixcore-minecraft/simplixcore-minecraft-bungeecord/simplixcore-minecraft-bungeecord-plugin/pom.xml

@@ -9,17 +9,24 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>simplixcore-minecraft-bungeecord-plugin</artifactId>
-  <version>1.0.${build.number}</version>
-
   <repositories>
     <repository>
-      <id>BungeeCord</id>
-      <url>https://oss.sonatype.org/content/groups/public/</url>
+      <id>simplixsoft-public</id>
+      <url>https://repo.simplix.dev/repository/simplixsoft-public/</url>
     </repository>
   </repositories>
 
+  <artifactId>simplixcore-minecraft-bungeecord-plugin</artifactId>
+  <version>1.0.${build.number}</version>
+
   <dependencies>
+    <dependency>
+      <groupId>dev.simplix</groupId>
+      <artifactId>bungee</artifactId>
+      <version>1.0.0</version>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- Simple logging facade for java -->
     <dependency>
       <groupId>dev.simplix.core</groupId>

simplixcore-minecraft/simplixcore-minecraft-bungeecord/simplixcore-minecraft-bungeecord-plugin/src/main/java/dev/simplix/core/minecraft/bungeecord/plugin/libloader/PluginClassLoaderFabricator.java

@@ -1,9 +1,13 @@
 package dev.simplix.core.minecraft.bungeecord.plugin.libloader;
 
+import dev.simplix.core.common.libloader.SimplixClassLoader;
 import java.io.File;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Set;
 import java.util.function.Function;
 import lombok.NonNull;
@@ -14,16 +18,22 @@
 @Slf4j
 public class PluginClassLoaderFabricator implements Function<File, ClassLoader> {
 
-  private void unfinalize(@NonNull Field loadersField)
-      throws NoSuchFieldException, IllegalAccessException {
-    Field modifiersField = Field.class.getDeclaredField("modifiers");
-    modifiersField.setAccessible(true);
-    modifiersField.set(loadersField, loadersField.getModifiers() & ~Modifier.FINAL);
-  }
+  private static ClassLoader result = null;
+
+//  private void unfinalize(@NonNull Field loadersField)
+//      throws NoSuchFieldException, IllegalAccessException {
+//    Field modifiersField = Field.class.getDeclaredField("modifiers");
+//    modifiersField.setAccessible(true);
+//    modifiersField.set(loadersField, loadersField.getModifiers() & ~Modifier.FINAL);
+//  }
 
   @Override
   public ClassLoader apply(@NonNull File file) {
 
+    if (result != null) {
+      return result;
+    }
+
     try {
       Class<?> classLoaderClass = Class.forName("net.md_5.bungee.api.plugin.PluginClassloader",
           false, ClassLoader.getSystemClassLoader());
@@ -35,28 +45,59 @@ public ClassLoader apply(@NonNull File file) {
       );
       constructor.setAccessible(true);
 
+      PluginDescription pluginDescription = new PluginDescription();
+      pluginDescription.setName("SimplixBridge");
 
+      final ClassLoader simplixPluginClassLoader = ProxyServer
+          .getInstance()
+          .getPluginManager()
+          .getPlugin("SimplixCore")
+          .getClass()
+          .getClassLoader();
 
+      final Method loadClass0 = simplixPluginClassLoader
+          .getClass()
+          .getDeclaredMethod(
+              "loadClass0",
+              String.class,
+              boolean.class,
+              boolean.class,
+              boolean.class);
 
-      PluginDescription pluginDescription = new PluginDescription();
+      loadClass0.setAccessible(true);
 
+      ClassLoader parentLoader = new URLClassLoader(new URL[]{
+      }) {
+        @Override
+        public Class<?> loadClass(String name) throws ClassNotFoundException {
+          try {
+            return (Class<?>) loadClass0.invoke(simplixPluginClassLoader, name, false, true, false);
+          } catch (IllegalAccessException | InvocationTargetException reflectiveOperationException) {
+            throw new ClassNotFoundException(name);
+          }
+        }
+      };
+
+      final SimplixClassLoader simplixClassLoader = new SimplixClassLoader(
+          new URL[0],
+          parentLoader);
       Object loader = constructor.newInstance(
           ProxyServer.getInstance(),
           pluginDescription,
           file,
-          ClassLoader.getSystemClassLoader()
+          simplixClassLoader
       );
 
       Field loadersField = classLoaderClass.getDeclaredField("allLoaders");
       loadersField.setAccessible(true);
-      if (Modifier.isFinal(loadersField.getModifiers())) {
-        unfinalize(loadersField);
-      }
 
       Set<Object> loaders = (Set<Object>) loadersField.get(null);
       loaders.add(loader);
-      loadersField.set(null, loaders);
-      return (ClassLoader) loader;
+//      loadersField.set(null, loaders);
+
+//      ProxyServer.getInstance().getPluginManager().
+      result = simplixClassLoader;
+      return simplixClassLoader;
     } catch (Exception exception) {
       log.error("[Simplix | LibLoader] Cannot fabricate PluginClassLoader", exception);
     }

simplixcore-minecraft/simplixcore-minecraft-spigot/simplixcore-minecraft-spigot-implementation/src/main/java/dev/simplix/core/minecraft/spigot/util/ReflectionUtil.java

@@ -32,10 +32,21 @@ public final class ReflectionUtil {
 
   public static Class<?> getClass(String classname) throws ClassNotFoundException {
     String path = classname
-        .replace("{nms}", "net.minecraft.server." + serverVersion())
-        .replace("{obc}", "org.bukkit.craftbukkit." + serverVersion())
-        .replace("{nm}", "net.minecraft." + serverVersion());
+        .replace(
+            "{nm}",
+            "net.minecraft" + (
+                Bukkit.getBukkitVersion().startsWith("1.17")
+                    ? ""
+                    : "." + serverVersion()))
+        .replace(
+            "{nms}",
+            "net.minecraft.server" + (
+                Bukkit.getBukkitVersion().startsWith("1.17")
+                    ? ""
+                    : "." + serverVersion()))
+        .replace("{obc}", "org.bukkit.craftbukkit." + serverVersion());
     Class<?> out = CACHED_CLASSES.get(path);
+
     if (out == null) {
       out = Class.forName(path);
       CACHED_CLASSES.put(path, out);