Skip to content

Commit aa3fa93

Browse files
committed
Add framework to load specific mod classes sequentially, preventing deadlocks
1 parent 5d2310b commit aa3fa93

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package org.embeddedt.modernfix.forge.classloading;
2+
3+
/**
4+
* Sometimes mods have classes that circularly reference each other. If each of these classes ends up being loaded
5+
* from two mods, a deadlock occurs.
6+
*
7+
* To avoid this problem we maintain a list of classes that should be loaded early and do it via Class.forName.
8+
*/
9+
public class ClassLoadHack {
10+
private static final String[] classesToLoadEarly = new String[] {
11+
"team.creative.creativecore.common.config.ConfigTypeConveration",
12+
"team.creative.creativecore.common.util.ingredient.CreativeIngredient"
13+
};
14+
15+
public static void loadModClasses() {
16+
for(String clzName : classesToLoadEarly) {
17+
try {
18+
Class.forName(clzName);
19+
} catch(Throwable e) {
20+
if(!(e instanceof ClassNotFoundException)) {
21+
e.printStackTrace();
22+
}
23+
}
24+
}
25+
}
26+
}

forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import net.minecraftforge.registries.ForgeRegistries;
2222
import org.apache.commons.lang3.tuple.Pair;
2323
import org.embeddedt.modernfix.ModernFix;
24+
import org.embeddedt.modernfix.forge.classloading.ClassLoadHack;
2425
import org.embeddedt.modernfix.forge.classloading.ModFileScanDataDeduplicator;
2526
import org.embeddedt.modernfix.forge.ModernFixConfig;
2627
import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler;
@@ -46,6 +47,7 @@ public ModernFixForge() {
4647
MinecraftForge.EVENT_BUS.register(KubeUtil.class);
4748
PacketHandler.register();
4849
ModFileScanDataDeduplicator.deduplicate();
50+
ClassLoadHack.loadModClasses();
4951
}
5052

5153
@SubscribeEvent

0 commit comments

Comments
 (0)