diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java index b61c0235..7f521ec1 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinClassWriter.java @@ -53,10 +53,10 @@ public class MixinClassWriter extends ClassWriter { ClassInfo d = ClassInfo.forName(type2); if (c.hasSuperClass(d)) { - return type1; + return type2; } if (d.hasSuperClass(c)) { - return type2; + return type1; } if (c.isInterface() || d.isInterface()) { return MixinClassWriter.JAVA_LANG_OBJECT; @@ -68,7 +68,7 @@ public class MixinClassWriter extends ClassWriter { return MixinClassWriter.JAVA_LANG_OBJECT; } - } while (!c.hasSuperClass(d)); + } while (!d.hasSuperClass(c)); return c.getName(); } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java index 769da82d..53a4c4aa 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinPreProcessor.java @@ -130,6 +130,7 @@ class MixinPreProcessor { MixinTargetContext createContextFor(ClassNode target) { this.prepare(); MixinTargetContext context = new MixinTargetContext(this.mixin, this.classNode, target); + target.version = Math.max(this.classNode.version, target.version); this.attach(context); return context; } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java index 3f4af6f4..27d20f29 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java @@ -392,7 +392,6 @@ public class MixinTargetContext implements IReferenceMapperContext { * @param handle Handle to transform */ private Handle transformHandle(MethodNode method, Iterator iter, Handle handle) { - this.targetClass.version = Constants.JAVA8_CLASSFILE_VERSION; MemberRef.HandleRef memberRef = new MemberRef.HandleRef(handle); if (memberRef.isField()) { this.transformFieldRef(method, iter, memberRef); diff --git a/src/main/java/org/spongepowered/asm/util/Constants.java b/src/main/java/org/spongepowered/asm/util/Constants.java index f720f090..ce791d4b 100644 --- a/src/main/java/org/spongepowered/asm/util/Constants.java +++ b/src/main/java/org/spongepowered/asm/util/Constants.java @@ -32,7 +32,6 @@ import org.spongepowered.asm.mixin.Mixin; */ public abstract class Constants { - public static final int JAVA8_CLASSFILE_VERSION = 52; public static final String INIT = ""; public static final String CLINIT = ""; public static final String IMAGINARY_SUPER = "super$";