keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #2022 from simon816/guava-apache-lcl-exclusion

Browse source 
Add Guava and Apache to LaunchClassLoader exclusion list on server
This commit is contained in:
LexManos 2015-10-12 12:29:45 -07:00
commit ebe9b6d4cb
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java
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();
}

7
src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java
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();
}

7
src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java
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()