From 552181ad04d8a3c4cdcba74d02acb5ddb2556ee8 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 12 Jan 2015 21:59:07 +0000 Subject: [PATCH] Skip FML's event transformer when processing the transformer chain --- .../spongepowered/asm/mixin/transformer/TreeInfo.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java index 587ad6c5..b69b70e6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/TreeInfo.java @@ -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 reEntrantTransformers = ImmutableSet.of( + "net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer" + ); + private static IClassNameTransformer nameTransformer; static { @@ -124,7 +131,7 @@ abstract class TreeInfo { final List 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); } }