From 2124f4f1a07bb206999ec9a88e4428c32186c016 Mon Sep 17 00:00:00 2001 From: Kobata Date: Wed, 17 Dec 2014 03:26:11 -0500 Subject: [PATCH] Allow mixins to extend Object as well as target super Anything extending Object won't be able to meaningully use "super.", so a mismatch is not a big deal. However, given that we cannot alter source access levels in Sponge of things that are not MC (notably Forge and FML), there are mixins that cannot extend the appropriate class as that class has only private constructors. --- .../spongepowered/asm/mixin/transformer/MixinTransformer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java index 47704168..e3823c52 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTransformer.java @@ -195,7 +195,7 @@ public class MixinTransformer extends TreeTransformer { */ protected void verifyClasses(ClassNode targetClass, MixinData mixin) { String superName = mixin.getClassNode().superName; - if (targetClass.superName == null || superName == null || !targetClass.superName.equals(superName)) { + if (targetClass.superName == null || superName == null || !(targetClass.superName.equals(superName) || "java/lang/Object".equals(superName))) { throw new InvalidMixinException("Mixin classes must have the same superclass as their target class"); } }