Further improve Java16 support

Author: KotlinFactory

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

@@ -45,12 +45,11 @@ public Class<?> loadClass(String name, boolean resolve, boolean useParent)
       throws ClassNotFoundException {
     try {
       return super.loadClass(name, resolve);
-    } catch (ClassNotFoundException ignored) {
+    } catch (Throwable ignored) {
       if (parentLoader != null && useParent) {
         try {
           return parentLoader.loadClass(name);
-        } catch (ClassNotFoundException ignored1) {
-
+        } catch (Throwable ignored1) {
         }
       }
     }

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

@@ -8,13 +8,11 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Arrays;
 import java.util.Set;
 import java.util.function.Function;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginDescription;
 
 @Slf4j
@@ -50,16 +48,21 @@ public ClassLoader apply(@NonNull File file) {
       PluginDescription pluginDescription = new PluginDescription();
       pluginDescription.setName("SimplixBridge");
 
-      final ClassLoader pluginClassloader = ProxyServer
+      final ClassLoader simplixPluginClassLoader = ProxyServer
           .getInstance()
           .getPluginManager()
           .getPlugin("SimplixCore")
           .getClass()
           .getClassLoader();
 
-      final Method loadClass0 = pluginClassloader
+      final Method loadClass0 = simplixPluginClassLoader
           .getClass()
-          .getDeclaredMethod("loadClass0", String.class, boolean.class, boolean.class, boolean.class);
+          .getDeclaredMethod(
+              "loadClass0",
+              String.class,
+              boolean.class,
+              boolean.class,
+              boolean.class);
 
       loadClass0.setAccessible(true);
 
@@ -68,8 +71,8 @@ public ClassLoader apply(@NonNull File file) {
         @Override
         public Class<?> loadClass(String name) throws ClassNotFoundException {
           try {
-            return (Class<?>) loadClass0.invoke(pluginClassloader, name, false, true, false);
-          } catch (IllegalAccessException | InvocationTargetException e) {
+            return (Class<?>) loadClass0.invoke(simplixPluginClassLoader, name, false, true, false);
+          } catch (IllegalAccessException | InvocationTargetException reflectiveOperationException) {
             throw new ClassNotFoundException(name);
           }
         }

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

@@ -32,9 +32,19 @@ 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);

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

@@ -5,10 +5,7 @@
 import dev.simplix.core.common.updater.Version;
 import dev.simplix.core.minecraft.spigot.plugin.SimplixPlugin;
 import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+import java.lang.reflect.*;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -31,7 +28,7 @@
 public final class PluginClassLoaderFabricator implements Function<File, ClassLoader> {
 
   private static ClassLoader cachedResult;
-  private final Version javaVersion = Version.parse(System.getProperty("os.version"));
+  private final Version javaVersion = Version.parse(System.getProperty("java.version"));
 
   private void unfinalize(@NonNull Field loadersField)
       throws NoSuchFieldException, IllegalAccessException {
@@ -42,7 +39,6 @@ private void unfinalize(@NonNull Field loadersField)
 
   @Override
   public ClassLoader apply(@NonNull File file) {
-
     // We don't to create a SimplixClassLoader twice if on 1.16 & Java16
     if (cachedResult != null) {
       return cachedResult;
@@ -79,6 +75,7 @@ public ClassLoader apply(@NonNull File file) {
         out = (ClassLoader) pluginClassloader;
       } catch (Throwable throwable) {
         if (javaVersion.olderThen(Version.parse("16.0.0"))) {
+          log.info("Used Java11 fabricator");
           // Spigot 1.16 or newer using old reflection
           Class<?> classLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader");
           Constructor<?> constructor = classLoaderClass.getDeclaredConstructor(
@@ -100,6 +97,7 @@ public ClassLoader apply(@NonNull File file) {
           );
           out = (ClassLoader) pluginClassloader;
         } else {
+          log.info("Used Java16 fabricator");
           // Spigot 1.16 newer - Compatible with Java16
           Class<?> classLoaderClass = Class.forName("org.bukkit.plugin.java.PluginClassLoader");
           Constructor<?> constructor = classLoaderClass.getDeclaredConstructor(
@@ -127,18 +125,28 @@ public ClassLoader apply(@NonNull File file) {
                   boolean.class,
                   boolean.class);
 
+          loadClass0.setAccessible(true);
+
           ClassLoader parentLoader = new URLClassLoader(new URL[]{
           }) {
             @Override
             public Class<?> loadClass(String name) throws ClassNotFoundException {
               try {
-                return (Class<?>) loadClass0.invoke(
-                    plugin.getPluginLoader(),
+                final Object invoke = loadClass0.invoke(
+                    simplixCoreClassLoader,
                     name,
                     false,
                     true,
                     false);
-              } catch (Exception exception) {
+                return (Class<?>) invoke;
+              } catch (IllegalAccessException reflectiveOperationException) {
+                reflectiveOperationException.printStackTrace();
+                throw new ClassNotFoundException(name);
+              } catch (InvocationTargetException invocationTargetException) {
+                if (invocationTargetException.getCause() instanceof ClassNotFoundException) {
+                  throw (ClassNotFoundException) invocationTargetException.getCause();
+                }
+                invocationTargetException.printStackTrace();
                 throw new ClassNotFoundException(name);
               }
             }

simplixcore-minecraft/simplixcore-minecraft-spigot/simplixcore-minecraft-spigot-plugin/src/main/resources/fakeplugin.yml

@@ -4,4 +4,4 @@ authors: [ SimplixSoftworks ]
 
 main: dev.simplix.core.minecraft.spigot.fake.FakeJavaPlugin
 
-api-version: 1.16
+api-version: 1.16