Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,8 @@ public static boolean isInstanceOf(ClassReader reader, String obfuscated, boolea
} else {
ClassReader superReader = new ClassReader(superClass);
if (disallowMixinSupers) {
ClassNode superClassNode = new ClassNode();
superReader.accept(superClassNode, 0);
if (superClassNode.invisibleAnnotations != null) {
for (AnnotationNode annotation : superClassNode.invisibleAnnotations) {
if (annotation.desc.equals("Lorg/spongepowered/asm/mixin/Mixin;")) {
return false;
}
}
if (hasMixinAnnotation(superReader)) {
return false;
}
}
if (isInstanceOf(superReader, obfuscated, disallowMixinSupers)) {
Expand Down Expand Up @@ -164,10 +158,22 @@ public static <R> R performOnMappedSource(String source, Function<ClassReader, R
return callable.apply(new ClassReader(Compatibility.OrderedArrayList.INSTANCE.transformAsPureFML(obfName, transformedName, data)));
}

public static boolean hasMixinAnnotation(ClassReader classReader) {
ClassNode classNode = new ClassNode();
classReader.accept(classNode, 0);
return hasMixinAnnotation(classNode);
}





private static boolean hasMixinAnnotation(ClassNode classNode) {
if (classNode.invisibleAnnotations == null) {
return false;
}
for (AnnotationNode annotation : classNode.invisibleAnnotations) {
if (annotation.desc.equals("Lorg/spongepowered/asm/mixin/Mixin;")) {
return true;
}
}
return false;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
return null;
}
ClassReader reader = new ClassReader(basicClass);
if (ClassSniffer.isInstanceOf(reader, BLOCK_CLASS_OBF) == false) {
if (ClassSniffer.hasMixinAnnotation(reader) || !ClassSniffer.isInstanceOf(reader, BLOCK_CLASS_OBF)) {
return basicClass;
}
String className = reader.getClassName();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
return null;
}
ClassReader reader = new ClassReader(basicClass);
if (ClassSniffer.isInstanceOf(reader, ENTITY_CLASS_OBF) == false) {
if (ClassSniffer.hasMixinAnnotation(reader) || !ClassSniffer.isInstanceOf(reader, ENTITY_CLASS_OBF)) {
return basicClass;
}
boolean dirty = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
}
ClassReader reader = new ClassReader(basicClass);

if (ClassSniffer.isInstanceOf(reader, INTERFACE_CLASS_OBF) == false) {
if (ClassSniffer.hasMixinAnnotation(reader) || !ClassSniffer.isInstanceOf(reader, INTERFACE_CLASS_OBF)) {
return basicClass;
}

Expand Down