Make librayloading compatible with more legacy bukkit builds

Author: KotlinFactory

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;
@@ -13,7 +14,6 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Function;
@@ -23,13 +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;
+    javaVersion = Version.parse(System.getProperty("java.version"));
+
   }
 
   @Override
@@ -67,7 +70,14 @@ public void loadLibraryEncapsulated(@NonNull File file, @NotNull Class<?> owner)
       if (files.contains(file)) {
         return;
       }
-      ClassLoader classLoader = createClassLoader(file);
+      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()

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

@@ -2,6 +2,7 @@
 
 import com.google.common.io.ByteStreams;
 import dev.simplix.core.common.libloader.SimplixClassLoader;
+import dev.simplix.core.common.updater.Version;
 import dev.simplix.core.minecraft.spigot.plugin.SimplixPlugin;
 import java.io.File;
 import java.lang.reflect.Constructor;
@@ -30,6 +31,7 @@
 public final class PluginClassLoaderFabricator implements Function<File, ClassLoader> {
 
   private static ClassLoader cachedResult;
+  private final Version javaVersion = Version.parse(System.getProperty("os.version"));
 
   private void unfinalize(@NonNull Field loadersField)
       throws NoSuchFieldException, IllegalAccessException {
@@ -76,64 +78,87 @@ public ClassLoader apply(@NonNull File file) {
         );
         out = (ClassLoader) pluginClassloader;
       } catch (Throwable throwable) {
-        // Spigot 1.16 - Compatible with Java16
-        Class<?> classLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader");
-        Constructor<?> constructor = classLoaderClass.getDeclaredConstructor(
-            JavaPluginLoader.class,
-            ClassLoader.class,
-            PluginDescriptionFile.class,
-            File.class,
-            File.class,
-            ClassLoader.class
-        );
-        constructor.setAccessible(true);
-
-        final ClassLoader simplixCoreClassLoader = Bukkit
-            .getPluginManager()
-            .getPlugin("SimplixCore")
-            .getClass()
-            .getClassLoader();
-
-        final Method loadClass0 = simplixCoreClassLoader
-            .getClass()
-            .getDeclaredMethod(
-                "loadClass0",
-                String.class,
-                boolean.class,
-                boolean.class,
-                boolean.class);
-
-        ClassLoader parentLoader = new URLClassLoader(new URL[]{
-        }) {
-          @Override
-          public Class<?> loadClass(String name) throws ClassNotFoundException {
-            try {
-              return (Class<?>) loadClass0.invoke(
-                  plugin.getPluginLoader(),
-                  name,
-                  false,
-                  true,
-                  false);
-            } catch (Exception exception) {
-              throw new ClassNotFoundException(name);
+        if (javaVersion.olderThen(Version.parse("16.0.0"))) {
+          // Spigot 1.16 or newer using old reflection
+          Class<?> classLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader");
+          Constructor<?> constructor = classLoaderClass.getDeclaredConstructor(
+              JavaPluginLoader.class,
+              ClassLoader.class,
+              PluginDescriptionFile.class,
+              File.class,
+              File.class,
+              ClassLoader.class
+          );
+          constructor.setAccessible(true);
+          pluginClassloader = constructor.newInstance(
+              plugin.getPluginLoader(),
+              plugin.getClass().getClassLoader().getParent(),
+              pluginDescriptionFile,
+              plugin.getDataFolder(),
+              file,
+              null
+          );
+          out = (ClassLoader) pluginClassloader;
+        } else {
+          // Spigot 1.16 newer - Compatible with Java16
+          Class<?> classLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader");
+          Constructor<?> constructor = classLoaderClass.getDeclaredConstructor(
+              JavaPluginLoader.class,
+              ClassLoader.class,
+              PluginDescriptionFile.class,
+              File.class,
+              File.class,
+              ClassLoader.class
+          );
+          constructor.setAccessible(true);
+
+          final ClassLoader simplixCoreClassLoader = Bukkit
+              .getPluginManager()
+              .getPlugin("SimplixCore")
+              .getClass()
+              .getClassLoader();
+
+          final Method loadClass0 = simplixCoreClassLoader
+              .getClass()
+              .getDeclaredMethod(
+                  "loadClass0",
+                  String.class,
+                  boolean.class,
+                  boolean.class,
+                  boolean.class);
+
+          ClassLoader parentLoader = new URLClassLoader(new URL[]{
+          }) {
+            @Override
+            public Class<?> loadClass(String name) throws ClassNotFoundException {
+              try {
+                return (Class<?>) loadClass0.invoke(
+                    plugin.getPluginLoader(),
+                    name,
+                    false,
+                    true,
+                    false);
+              } catch (Exception exception) {
+                throw new ClassNotFoundException(name);
+              }
             }
-          }
-        };
-
-        final SimplixClassLoader simplixClassLoader = new SimplixClassLoader(
-            new URL[0],
-            parentLoader);
-
-        pluginClassloader = constructor.newInstance(
-            plugin.getPluginLoader(),
-            plugin.getClass().getClassLoader().getParent(),
-            pluginDescriptionFile,
-            plugin.getDataFolder(),
-            file,
-            simplixClassLoader
-        );
-        out = simplixClassLoader;
-        cachedResult = simplixClassLoader;
+          };
+
+          final SimplixClassLoader simplixClassLoader = new SimplixClassLoader(
+              new URL[0],
+              parentLoader);
+
+          pluginClassloader = constructor.newInstance(
+              plugin.getPluginLoader(),
+              plugin.getClass().getClassLoader().getParent(),
+              pluginDescriptionFile,
+              plugin.getDataFolder(),
+              file,
+              simplixClassLoader
+          );
+          out = simplixClassLoader;
+          cachedResult = simplixClassLoader;
+        }
       }
 
       Field loadersField = JavaPluginLoader.class.getDeclaredField("loaders");
@@ -182,4 +207,4 @@ private void injectFakeClass(@NonNull File file) {
     }
   }
 
-}
+}