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 5160cb16..8979634a 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ClassInfo.java @@ -353,7 +353,7 @@ class ClassInfo extends TreeInfo { /** * Interfaces */ - private final List interfaces; + private final Set interfaces; /** * Public and protected methods (instance) methods in this class @@ -429,7 +429,7 @@ class ClassInfo extends TreeInfo { ); this.fields = Collections.emptySet(); this.isInterface = false; - this.interfaces = Collections.emptyList(); + this.interfaces = Collections.emptySet(); this.access = Opcodes.ACC_PUBLIC; this.isMixin = false; this.mixin = null; @@ -446,10 +446,12 @@ class ClassInfo extends TreeInfo { this.methods = new HashSet(); this.fields = new HashSet(); this.isInterface = ((classNode.access & Opcodes.ACC_INTERFACE) != 0); - this.interfaces = Collections.unmodifiableList(classNode.interfaces); + this.interfaces = new HashSet(); this.access = classNode.access; this.isMixin = classNode instanceof MixinClassNode; this.mixin = this.isMixin ? ((MixinClassNode)classNode).getMixin() : null; + + this.interfaces.addAll(classNode.interfaces); for (MethodNode method : classNode.methods) { this.addMethod(method, this.isMixin); @@ -478,6 +480,10 @@ class ClassInfo extends TreeInfo { this.isProbablyStatic = isProbablyStatic; this.outerName = outerName; } + + void addInterface(String iface) { + this.interfaces.add(iface); + } void addMethod(MethodNode method) { this.addMethod(method, true); @@ -558,8 +564,8 @@ class ClassInfo extends TreeInfo { /** * Returns the answer to life, the universe and everything */ - public List getInterfaces() { - return this.interfaces; + public Set getInterfaces() { + return Collections.unmodifiableSet(this.interfaces); } @Override diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index 5ff115df..548374e6 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -336,6 +336,7 @@ class MixinInfo extends TreeInfo implements Comparable, IMixinInfo { InterfaceInfo interfaceInfo = InterfaceInfo.fromAnnotation(this, interfaceNode); this.softImplements.add(interfaceInfo); this.interfaces.add(interfaceInfo.getInternalName()); + this.classInfo.addInterface(interfaceInfo.getInternalName()); } }