From 71035d96eacf81285818e5be2d32a5ee971dc82a Mon Sep 17 00:00:00 2001 From: Luck Date: Thu, 5 Feb 2026 19:37:24 +0000 Subject: [PATCH] Attempt to fix slf4j classloading issue on Hytale --- .../common/loader/JarInJarClassLoader.java | 47 +++++++++++++++++++ .../dependencies/DependencyRegistry.java | 13 +++-- .../hytale/loader/HytaleLoaderPlugin.java | 3 ++ .../hytale/loader/HytaleLoaderPlugin.java | 3 ++ 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/common/loader-utils/src/main/java/me/lucko/luckperms/common/loader/JarInJarClassLoader.java b/common/loader-utils/src/main/java/me/lucko/luckperms/common/loader/JarInJarClassLoader.java index 6bcf98269..2d2f6c8d0 100644 --- a/common/loader-utils/src/main/java/me/lucko/luckperms/common/loader/JarInJarClassLoader.java +++ b/common/loader-utils/src/main/java/me/lucko/luckperms/common/loader/JarInJarClassLoader.java @@ -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 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 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; + } + } + } diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java index 569b012dc..088b25caa 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/DependencyRegistry.java @@ -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"); - } - } diff --git a/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java b/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java index 8eb801714..4883579af 100644 --- a/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java +++ b/hytale/loader-with-deps/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java @@ -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); } diff --git a/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java b/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java index 85d2ebe4f..af7d7fa99 100644 --- a/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java +++ b/hytale/loader/src/main/java/me/lucko/luckperms/hytale/loader/HytaleLoaderPlugin.java @@ -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); }