Add Guava and Apache to LaunchClassLoader exclusion list on server
Move exclusions to common place. Less likely to get out of sync
This commit is contained in:
parent
57d575f941
commit
b312584ca4
|
@ -16,11 +16,6 @@ public class FMLServerTweaker extends FMLTweaker {
|
||||||
// The log4j2 queue is excluded so it is correctly visible from the obfuscated
|
// 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
|
// and deobfuscated parts of the code. Without, the UI won't show anything
|
||||||
classLoader.addClassLoaderExclusion("com.mojang.util.QueueLogAppender");
|
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.configureForServerLaunch(classLoader, this);
|
||||||
FMLLaunchHandler.appendCoreMods();
|
FMLLaunchHandler.appendCoreMods();
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,13 +116,6 @@ public class FMLTweaker implements ITweaker {
|
||||||
@Override
|
@Override
|
||||||
public void injectIntoClassLoader(LaunchClassLoader classLoader)
|
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.configureForClientLaunch(classLoader, this);
|
||||||
FMLLaunchHandler.appendCoreMods();
|
FMLLaunchHandler.appendCoreMods();
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,8 +56,13 @@ public class FMLLaunchHandler
|
||||||
this.minecraftHome = tweaker.getGameDir();
|
this.minecraftHome = tweaker.getGameDir();
|
||||||
this.classLoader.addClassLoaderExclusion("net.minecraftforge.fml.relauncher.");
|
this.classLoader.addClassLoaderExclusion("net.minecraftforge.fml.relauncher.");
|
||||||
this.classLoader.addClassLoaderExclusion("net.minecraftforge.classloading.");
|
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.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()
|
private void setupClient()
|
||||||
|
|
Loading…
Reference in New Issue