Skip FML's event transformer when processing the transformer chain

This commit is contained in:
Mumfrey committed 2015-01-12 21:59:07 +00:00
1 parent d53bd8d259
commit 552181ad04
1 file changed
+8 -1
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URLClassLoader;
import java.util.List;
import java.util.Set;
import net.minecraft.launchwrapper.IClassNameTransformer;
import net.minecraft.launchwrapper.IClassTransformer;
@@ -37,11 +38,17 @@ import org.apache.commons.io.IOUtils;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.tree.ClassNode;
import com.google.common.collect.ImmutableSet;
/**
* Base class for "info" objects which use ASM tree API to do stuff, with things
*/
abstract class TreeInfo {
private static final Set<String> reEntrantTransformers = ImmutableSet.<String>of(
"net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer"
);
private static IClassNameTransformer nameTransformer;
static {
@@ -124,7 +131,7 @@ abstract class TreeInfo {
final List<IClassTransformer> transformers = Launch.classLoader.getTransformers();
for (final IClassTransformer transformer : transformers) {
if (!(transformer instanceof MixinTransformer)) {
if (!(transformer instanceof MixinTransformer) && !TreeInfo.reEntrantTransformers.contains(transformer.getClass().getName())) {
basicClass = transformer.transform(name, name, basicClass);
}
}