Upstream
/
SongodaCore
mirror of https://github.com/songoda/SongodaCore.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix DependencyLoader if the ClassLoader is URLClassLoader

This commit is contained in:
Christian Koop 2024-02-21 21:54:42 +01:00
parent 8289dae0f8
commit 0592bf4abf
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Core/src/main/java/com/craftaro/core/dependency/DependencyLoader.java
View File

@ -4,8 +4,6 @@ import com.craftaro.core.CraftaroCoreConstants;
import com.craftaro.core.SongodaCore;
import com.georgev22.api.libraryloader.ClassLoaderAccess;
import com.georgev22.api.libraryloader.LibraryLoader;
import com.georgev22.api.libraryloader.exceptions.InvalidDependencyException;
import com.georgev22.api.libraryloader.exceptions.UnknownDependencyException;
import me.lucko.jarrelocator.JarRelocator;
import me.lucko.jarrelocator.Relocation;
import org.bukkit.plugin.Plugin;
@ -13,8 +11,6 @@ import org.bukkit.plugin.Plugin;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
@ -30,6 +26,7 @@ public class DependencyLoader {
private final LibraryLoader libraryLoader;
private final ClassLoaderAccess parentClassLoaderAccess;
public DependencyLoader(Plugin plugin) {
//Bind loaded dependencies to the plugin's parent class loader so classes could be accessed across plugins
ClassLoader parentClassLoader = plugin.getClass().getClassLoader().getParent();
@ -39,6 +36,7 @@ public class DependencyLoader {
new File(plugin.getDataFolder().getParentFile(), CraftaroCoreConstants.getProjectName() + "/dependencies/v" + DEPENDENCY_VERSION),
SongodaCore.getLogger()
);
this.parentClassLoaderAccess = new ClassLoaderAccess((URLClassLoader) parentClassLoader);
} else {
//We have AppClassLoader here
this.libraryLoader = new LibraryLoader(
@ -46,9 +44,8 @@ public class DependencyLoader {
new File(plugin.getDataFolder().getParentFile(), CraftaroCoreConstants.getProjectName() + "/dependencies/v" + DEPENDENCY_VERSION),
SongodaCore.getLogger()
);
this.parentClassLoaderAccess = new ClassLoaderAccess(parentClassLoader);
}
this.parentClassLoaderAccess = new ClassLoaderAccess(parentClassLoader);
}
public void loadDependencies(Collection<Dependency> dependencies) throws IOException {