diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java
index 3ab1a80b..3ac64fa6 100644
--- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java
+++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java
@@ -245,6 +245,10 @@ public class ClassInfo extends TreeInfo {
// Abstract because this has to be static in order to contain the enum
public abstract ClassInfo getOwner();
+
+ public ClassInfo getImplementor() {
+ return this.getOwner();
+ }
public int getAccess() {
return this.modifiers;
@@ -352,6 +356,31 @@ public class ClassInfo extends TreeInfo {
return super.equals(obj);
}
}
+
+ /**
+ * A method resolved in an interface via a class, return the member
+ * wrapped so that the implementing class can be retrieved.
+ */
+ public class InterfaceMethod extends Method {
+
+ private final ClassInfo owner;
+
+ public InterfaceMethod(Member member) {
+ super(member);
+ this.owner = member.getOwner();
+ }
+
+ @Override
+ public ClassInfo getOwner() {
+ return this.owner;
+ }
+
+ @Override
+ public ClassInfo getImplementor() {
+ return ClassInfo.this;
+ }
+
+ }
/**
* A field
@@ -1177,6 +1206,7 @@ public class ClassInfo extends TreeInfo {
* @param type Type of member to search for (field or method)
* @return the discovered member or null if the member could not be resolved
*/
+ @SuppressWarnings("unchecked")
private M findInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal, int flags, Type type) {
if (includeThisClass) {
M member = this.findMember(name, desc, flags, type);
@@ -1204,7 +1234,7 @@ public class ClassInfo extends TreeInfo {
}
}
- if (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces()) {
+ if (type == Type.METHOD && (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces())) {
for (String implemented : this.interfaces) {
ClassInfo iface = ClassInfo.forName(implemented);
if (iface == null) {
@@ -1212,7 +1242,7 @@ public class ClassInfo extends TreeInfo {
}
M member = iface.findInHierarchy(name, desc, true, traversal.next(), flags & ~ClassInfo.INCLUDE_PRIVATE, type);
if (member != null) {
- return member;
+ return this.isInterface ? member : (M)new InterfaceMethod(member);
}
}
}
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 51bd7c61..b8b54eff 100644
--- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java
+++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinTargetContext.java
@@ -498,7 +498,7 @@ public class MixinTargetContext implements IReferenceMapperContext {
throw new InvalidMixinException(this, "Invalid " + methodRef + " in " + this + " resolved " + superMethod.getOwner()
+ " but is mixin.");
}
- methodRef.setOwner(superMethod.getOwner().getName());
+ methodRef.setOwner(superMethod.getImplementor().getName());
} else if (ClassInfo.forName(methodRef.getOwner()).isMixin()) {
throw new MixinTransformerError("Error resolving " + methodRef + " in " + this);
}