Attempt to fix slf4j classloading issue on Hytale

This commit is contained in:
Luck committed 2026-02-05 19:37:24 +00:00
1 parent 8c22dd7159
commit 71035d96ea
4 files changed
+62 -4

No files matched your search

@@ -35,6 +35,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.List;
/**
* Classloader that can load a jar from within another jar file.
@@ -50,6 +51,11 @@ public class JarInJarClassLoader extends URLClassLoader {
ClassLoader.registerAsParallelCapable();
}
/**
* A list of package prefixes to attempt to load from the URLs first, before delegating to the parent classloader.
*/
private List<String> priorityPackagePrefixes = null;
/**
* Creates a new jar-in-jar class loader.
*
@@ -65,6 +71,10 @@ public class JarInJarClassLoader extends URLClassLoader {
addURL(url);
}
public void setPriorityPackagePrefixes(List<String> priorityPackagePrefixes) {
this.priorityPackagePrefixes = priorityPackagePrefixes;
}
public void deleteJarResource() {
URL[] urls = getURLs();
if (urls.length == 0) {
@@ -152,4 +162,41 @@ public class JarInJarClassLoader extends URLClassLoader {
}
}
private boolean shouldLoadFromUrlsFirst(String name) {
if (this.priorityPackagePrefixes == null) {
return false;
}
for (String prefix : this.priorityPackagePrefixes) {
if (name.startsWith(prefix)) {
return true;
}
}
return false;
}
@Override
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
if (!shouldLoadFromUrlsFirst(name)) {
return super.loadClass(name, resolve);
}
synchronized (getClassLoadingLock(name)) {
Class<?> clazz = findLoadedClass(name);
if (clazz != null) {
return clazz;
}
try {
clazz = findClass(name);
} catch (ClassNotFoundException e) {
clazz = super.loadClass(name, false);
}
if (resolve) {
resolveClass(clazz);
}
return clazz;
}
}
}
@@ -134,6 +134,15 @@ public class DependencyRegistry {
}
}
private boolean slf4jPresent() {
if (this.platformType == Platform.Type.HYTALE) {
// always load SLf4J on hytale, as it's not provided by the platform, and we don't want to
// accidentally use a version shaded in a different plugin
return false;
}
return classExists("org.slf4j.Logger") && classExists("org.slf4j.LoggerFactory");
}
@SuppressWarnings("ConstantConditions")
public static boolean isGsonRelocated() {
return JsonElement.class.getName().startsWith("me.lucko");
@@ -148,8 +157,4 @@ public class DependencyRegistry {
}
}
private static boolean slf4jPresent() {
return classExists("org.slf4j.Logger") && classExists("org.slf4j.LoggerFactory");
}
}
@@ -31,6 +31,8 @@ import me.lucko.luckperms.common.loader.JarInJarClassLoader;
import me.lucko.luckperms.common.loader.LoaderBootstrap;
import org.checkerframework.checker.nullness.compatqual.NonNullDecl;
import java.util.List;
public class HytaleLoaderPlugin extends JavaPlugin {
// marker field to indicate to the plugin that dependencies should be loaded from the jar
// read using reflection in LPHytalePlugin#createDependencyManager
@@ -44,6 +46,7 @@ public class HytaleLoaderPlugin extends JavaPlugin {
public HytaleLoaderPlugin(@NonNullDecl JavaPluginInit init) {
super(init);
JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME);
loader.setPriorityPackagePrefixes(List.of("org.slf4j"));
this.plugin = loader.instantiatePlugin(BOOTSTRAP_CLASS, JavaPlugin.class, this);
}
@@ -31,6 +31,8 @@ import me.lucko.luckperms.common.loader.JarInJarClassLoader;
import me.lucko.luckperms.common.loader.LoaderBootstrap;
import org.checkerframework.checker.nullness.compatqual.NonNullDecl;
import java.util.List;
public class HytaleLoaderPlugin extends JavaPlugin {
private static final String JAR_NAME = "luckperms-hytale.jarinjar";
private static final String BOOTSTRAP_CLASS = "me.lucko.luckperms.hytale.LPHytaleBootstrap";
@@ -40,6 +42,7 @@ public class HytaleLoaderPlugin extends JavaPlugin {
public HytaleLoaderPlugin(@NonNullDecl JavaPluginInit init) {
super(init);
JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME);
loader.setPriorityPackagePrefixes(List.of("org.slf4j"));
this.plugin = loader.instantiatePlugin(BOOTSTRAP_CLASS, JavaPlugin.class, this);
}