Skip to content

Commit fc9567d

Browse files
committed
Allow cyclic access on NeoForge between plugin and non-plugin classloaders
1 parent 1ebd72f commit fc9567d

2 files changed

Lines changed: 29 additions & 9 deletions

File tree

‎src/avoid_loader/java/pl/olafcio/avoid_loader/ModClassLoader.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package pl.olafcio.avoid_loader;
22

33
import org.jetbrains.annotations.ApiStatus;
4+
import org.jetbrains.annotations.Nullable;
45

56
import java.net.URL;
67
import java.net.URLClassLoader;
@@ -21,20 +22,33 @@ public ModClassLoader(URL[] urls, ClassLoader parent, boolean startup) {
2122
private final HashSet<String> loaded
2223
= new HashSet<>();
2324

25+
@Nullable
26+
public ModClassLoader parent;
27+
28+
public boolean shouldOverrideParent(String name) {
29+
return isClassLoaded(name);
30+
}
31+
2432
@Override
2533
protected Class<?> loadClass(String name, boolean resolve)
2634
throws ClassNotFoundException
2735
{
2836
if (startup && name.startsWith("net.minecraft."))
2937
throw new ClassNotFoundException("Cannot load Minecraft classes during subloading!");
3038

39+
if (parent != null && parent.shouldOverrideParent(name) && !isClassLoaded(name))
40+
return parent.loadClass(name, resolve);
41+
3142
var result = super.loadClass(name, resolve); // Deferring the adding so that non-existent classes don't count
3243
loaded.add(name);
3344
return result;
3445
}
3546

3647
@Override
3748
protected Class<?> findClass(String name) throws ClassNotFoundException {
49+
if (parent != null && parent.shouldOverrideParent(name) && !isClassLoaded(name))
50+
return parent.findClass(name);
51+
3852
var result = super.findClass(name); // Deferring the adding so that non-existent classes don't count
3953
loaded.add(name);
4054
return result;
@@ -48,4 +62,18 @@ public void addURL(URL url) {
4862
public boolean isClassLoaded(String className) {
4963
return loaded.contains(className);
5064
}
65+
66+
public ModClassLoader wrap(ClassLoader classLoader) {
67+
var wrapped = new ModClassLoader(this.getURLs(), classLoader) {
68+
@Override
69+
public boolean shouldOverrideParent(String name) {
70+
return true;
71+
}
72+
};
73+
74+
wrapped.parent = this;
75+
this.parent = wrapped;
76+
77+
return wrapped;
78+
}
5179
}

‎versions/neoforge/java/pl/olafcio/avoid_impl/mods/loader/ModLoad.fp-java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,5 @@ import pl.olafcio.avoid_loader.ModClassLoader;
77

88
// Extending ModClassLoader because it genuinely makes manipulating classloading easier.
99
var pluginCL = container.classLoader();
10-
var classLoader = new ModClassLoader(pluginCL.getURLs(), this.getClass().getClassLoader()) {
11-
@Override
12-
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
13-
if (pluginCL.isClassLoaded(name))
14-
return pluginCL.loadClass(name);
15-
16-
return super.loadClass(name, resolve);
17-
}
18-
};
10+
var classLoader = pluginCL.wrap(this.getClass().getClassLoader());
1911
}

0 commit comments

Comments
 (0)