From b312584ca4ada008c0551b7e780eb6e35d4abb42 Mon Sep 17 00:00:00 2001 From: simon816 Date: Thu, 16 Jul 2015 05:21:13 +0100 Subject: [PATCH] Add Guava and Apache to LaunchClassLoader exclusion list on server Move exclusions to common place. Less likely to get out of sync --- .../fml/common/launcher/FMLServerTweaker.java | 5 ----- .../net/minecraftforge/fml/common/launcher/FMLTweaker.java | 7 ------- .../minecraftforge/fml/relauncher/FMLLaunchHandler.java | 7 ++++++- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java b/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java index 21fe16d36..7eeed4352 100644 --- a/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java +++ b/src/main/java/net/minecraftforge/fml/common/launcher/FMLServerTweaker.java @@ -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(); } diff --git a/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java b/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java index 4e5fdf727..062783dca 100644 --- a/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java +++ b/src/main/java/net/minecraftforge/fml/common/launcher/FMLTweaker.java @@ -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(); } diff --git a/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java b/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java index 8a2a3031e..8963ef63e 100644 --- a/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java +++ b/src/main/java/net/minecraftforge/fml/relauncher/FMLLaunchHandler.java @@ -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()