R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.16 into 1.18

Browse Source
This commit is contained in:
embeddedt 2023-06-19 20:58:11 -04:00
commit ce9d5f78e2
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java Normal file
View File

@ -0,0 +1,26 @@
package org.embeddedt.modernfix.forge.classloading;
/**
* Sometimes mods have classes that circularly reference each other. If each of these classes ends up being loaded
* from two mods, a deadlock occurs.
*
* To avoid this problem we maintain a list of classes that should be loaded early and do it via Class.forName.
*/
public class ClassLoadHack {
private static final String[] classesToLoadEarly = new String[] {
"team.creative.creativecore.common.config.ConfigTypeConveration",
"team.creative.creativecore.common.util.ingredient.CreativeIngredient"
};
public static void loadModClasses() {
for(String clzName : classesToLoadEarly) {
try {
Class.forName(clzName);
} catch(Throwable e) {
if(!(e instanceof ClassNotFoundException)) {
e.printStackTrace();
}
}
}
}
}

2
forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java
View File

@ -20,6 +20,7 @@ import net.minecraftforge.network.NetworkConstants;
import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.server.ServerLifecycleHooks; import net.minecraftforge.server.ServerLifecycleHooks;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.forge.classloading.ClassLoadHack;
import org.embeddedt.modernfix.forge.classloading.ModFileScanDataDeduplicator; import org.embeddedt.modernfix.forge.classloading.ModFileScanDataDeduplicator;
import org.embeddedt.modernfix.forge.ModernFixConfig; import org.embeddedt.modernfix.forge.ModernFixConfig;
import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler; import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler;
@ -42,6 +43,7 @@ public class ModernFixForge {
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
PacketHandler.register(); PacketHandler.register();
ModFileScanDataDeduplicator.deduplicate(); ModFileScanDataDeduplicator.deduplicate();
ClassLoadHack.loadModClasses();
} }
@SubscribeEvent @SubscribeEvent