Fixed loading of jars not using the plugin's ClassLoader causing issu…

…es when these jars try to load classes
BG-Software-LLC · Aug 20, 2022 · 038e820 · 038e820
1 parent 38f28ee
commit 038e820
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java b/src/main/java/com/bgsoftware/superiorskyblock/SuperiorSkyblockPlugin.java
@@ -1,6 +1,7 @@
 package com.bgsoftware.superiorskyblock;
 
 import com.bgsoftware.common.mappings.MappingsChecker;
+import com.bgsoftware.common.remaps.TestRemaps;
 import com.bgsoftware.common.updater.Updater;
 import com.bgsoftware.superiorskyblock.api.SuperiorSkyblock;
 import com.bgsoftware.superiorskyblock.api.SuperiorSkyblockAPI;
@@ -69,7 +70,6 @@
 import com.bgsoftware.superiorskyblock.nms.NMSPlayers;
 import com.bgsoftware.superiorskyblock.nms.NMSTags;
 import com.bgsoftware.superiorskyblock.nms.NMSWorld;
-import com.bgsoftware.common.remaps.TestRemaps;
 import com.bgsoftware.superiorskyblock.player.PlayersManagerImpl;
 import com.bgsoftware.superiorskyblock.player.container.DefaultPlayersContainer;
 import com.bgsoftware.superiorskyblock.service.ServicesHandler;
@@ -379,6 +379,10 @@ public Updater getUpdater() {
         return updater;
     }
 
+    public ClassLoader getPluginClassLoader() {
+        return super.getClassLoader();
+    }
+
     private boolean loadNMSAdapter() {
         String version = getServer().getClass().getPackage().getName().split("\\.")[3];
         try {
@@ -460,7 +464,7 @@ private void loadGeneratorFromFile() {
                 if (generatorsFilesList != null) {
                     for (File file : generatorsFilesList) {
                         //noinspection deprecation
-                        Class<?> generatorClass = JarFiles.getClass(file.toURL(), ChunkGenerator.class);
+                        Class<?> generatorClass = JarFiles.getClass(file.toURL(), ChunkGenerator.class, getClassLoader());
                         if (generatorClass != null) {
                             for (Constructor<?> constructor : generatorClass.getConstructors()) {
                                 if (constructor.getParameterCount() == 0) {

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/CommandsManagerImpl.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/CommandsManagerImpl.java
@@ -183,7 +183,7 @@ private void loadCommands() {
 
             try {
                 //noinspection deprecation
-                Class<?> commandClass = JarFiles.getClass(file.toURL(), SuperiorCommand.class);
+                Class<?> commandClass = JarFiles.getClass(file.toURL(), SuperiorCommand.class, plugin.getPluginClassLoader());
 
                 if (commandClass == null)
                     continue;

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/core/io/JarFiles.java b/src/main/java/com/bgsoftware/superiorskyblock/core/io/JarFiles.java
@@ -12,11 +12,6 @@ private JarFiles() {
 
     }
 
-    @Nullable
-    public static Class<?> getClass(URL jar, Class<?> clazz) {
-        return getClass(jar, clazz, clazz.getClassLoader());
-    }
-
     @Nullable
     public static Class<?> getClass(URL jar, Class<?> clazz, ClassLoader classLoader) {
         try (URLClassLoader cl = new URLClassLoader(new URL[]{jar}, classLoader); JarInputStream jis = new JarInputStream(jar.openStream())) {

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/mission/MissionsManagerImpl.java b/src/main/java/com/bgsoftware/superiorskyblock/mission/MissionsManagerImpl.java
@@ -445,7 +445,8 @@ public Mission<?> loadMission(String missionName, File missionsFolder, Configura
 
             if (mission == null) {
                 File missionJar = new File(missionsFolder, missionSection.getString("mission-file") + ".jar");
-                Class<?> missionClass = Objects.requireNonNull(JarFiles.getClass(missionJar.toURL(), Mission.class),
+                Class<?> missionClass = Objects.requireNonNull(JarFiles.getClass(missionJar.toURL(), Mission.class,
+                                plugin.getPluginClassLoader()),
                         "The mission file " + missionJar.getName() + " is not valid.");
 
                 boolean islandMission = missionSection.getBoolean("island", false);

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/module/ModuleClassLoader.java b/src/main/java/com/bgsoftware/superiorskyblock/module/ModuleClassLoader.java
@@ -25,8 +25,8 @@ public class ModuleClassLoader extends URLClassLoader {
     private final Manifest manifest;
     private final URL url;
 
-    public ModuleClassLoader(File file) throws IOException {
-        super(new URL[]{file.toURI().toURL()}, PluginModule.class.getClassLoader());
+    public ModuleClassLoader(File file, ClassLoader pluginClassLoader) throws IOException {
+        super(new URL[]{file.toURI().toURL()}, pluginClassLoader);
 
         this.jar = new JarFile(file);
         this.manifest = jar.getManifest();

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/module/ModulesManagerImpl.java b/src/main/java/com/bgsoftware/superiorskyblock/module/ModulesManagerImpl.java
@@ -64,7 +64,7 @@ public PluginModule registerModule(File moduleFile) throws IOException, Reflecti
 
         String moduleName = moduleFile.getName().replace(".jar", "");
 
-        ModuleClassLoader moduleClassLoader = new ModuleClassLoader(moduleFile);
+        ModuleClassLoader moduleClassLoader = new ModuleClassLoader(moduleFile, plugin.getPluginClassLoader());
 
         //noinspection deprecation
         Class<?> moduleClass = JarFiles.getClass(moduleFile.toURL(), PluginModule.class, moduleClassLoader);