From 65ab79cf694cf755294fe6934faa8f864da045a3 Mon Sep 17 00:00:00 2001 From: cpw Date: Mon, 4 May 2015 08:49:46 -0400 Subject: [PATCH] Revert "Merge pull request #650 from luacs1998/1.7.10" This undoes the seriously broken change from Sponge to support Mixins, that breaks a wide variety of coremods. Given the widespread incompatibility it introduces, it won't be re-added at 1.7.10. This reverts commit 8ccfa24764a3f4854f5334c0da1224286175e13b, reversing changes made to 7c10b93a2ded2799d41b73b67a2766c31e992d8a. --- .../main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java | 1 - fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java | 1 - 2 files changed, 2 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java b/fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java index a74693061..2c2429624 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java +++ b/fml/src/main/java/cpw/mods/fml/common/launcher/FMLServerTweaker.java @@ -16,7 +16,6 @@ public class FMLServerTweaker extends FMLTweaker { // The mojang packages are excluded so the log4j2 queue is correctly visible from // the obfuscated and deobfuscated parts of the code. Without, the UI won't show anything classLoader.addClassLoaderExclusion("com.mojang."); - classLoader.addClassLoaderExclusion("org.objectweb.asm."); classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers."); diff --git a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java b/fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java index 3cb89af75..bd1e2e2f3 100644 --- a/fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java +++ b/fml/src/main/java/cpw/mods/fml/common/launcher/FMLTweaker.java @@ -119,7 +119,6 @@ public class FMLTweaker implements ITweaker { { classLoader.addClassLoaderExclusion("org.apache."); classLoader.addClassLoaderExclusion("com.google.common."); - classLoader.addClassLoaderExclusion("org.objectweb.asm."); classLoader.addTransformerExclusion("cpw.mods.fml.repackage."); classLoader.addTransformerExclusion("cpw.mods.fml.relauncher."); classLoader.addTransformerExclusion("cpw.mods.fml.common.asm.transformers.");