upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Guava and Apache to LaunchClassLoader exclusion list on server

Browse Source 
Move exclusions to common place. Less likely to get out of sync
This commit is contained in:
simon816 committed 2015-08-31 03:15:30 +01:00
1 parent 57d575f941
commit b312584ca4
3 files changed
+6 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java
-5
View File
@@ -16,11 +16,6 @@ public class FMLServerTweaker extends FMLTweaker {
// The log4j2 queue is excluded so it is correctly visible from the obfuscated
// and deobfuscated parts of the code. Without, the UI won't show anything
classLoader.addClassLoaderExclusion("com.mojang.util.QueueLogAppender");
classLoader.addClassLoaderExclusion("org.objectweb.asm.");
classLoader.addTransformerExclusion("net.minecraftforge.fml.repackage.");
classLoader.addTransformerExclusion("net.minecraftforge.fml.relauncher.");
classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers.");
classLoader.addClassLoaderExclusion("LZMA.");
FMLLaunchHandler.configureForServerLaunch(classLoader, this);
FMLLaunchHandler.appendCoreMods();
}
src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java
-7
View File
@@ -116,13 +116,6 @@ public class FMLTweaker implements ITweaker {
@Override
public void injectIntoClassLoader(LaunchClassLoader classLoader)
{
classLoader.addClassLoaderExclusion("org.apache.");
classLoader.addClassLoaderExclusion("com.google.common.");
classLoader.addClassLoaderExclusion("org.objectweb.asm.");
classLoader.addTransformerExclusion("net.minecraftforge.fml.repackage.");
classLoader.addTransformerExclusion("net.minecraftforge.fml.relauncher.");
classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers.");
classLoader.addClassLoaderExclusion("LZMA.");
FMLLaunchHandler.configureForClientLaunch(classLoader, this);
FMLLaunchHandler.appendCoreMods();
}
src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java
+6 -1
View File
@@ -56,8 +56,13 @@ public class FMLLaunchHandler
this.minecraftHome = tweaker.getGameDir();
this.classLoader.addClassLoaderExclusion("net.minecraftforge.fml.relauncher.");
this.classLoader.addClassLoaderExclusion("net.minecraftforge.classloading.");
this.classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers.deobf.");
this.classLoader.addTransformerExclusion("net.minecraftforge.fml.common.asm.transformers.");
this.classLoader.addTransformerExclusion("net.minecraftforge.fml.common.patcher.");
this.classLoader.addTransformerExclusion("net.minecraftforge.fml.repackage.");
this.classLoader.addClassLoaderExclusion("org.apache.");
this.classLoader.addClassLoaderExclusion("com.google.common.");
this.classLoader.addClassLoaderExclusion("org.objectweb.asm.");
this.classLoader.addClassLoaderExclusion("LZMA.");
}
private void setupClient()