From b5f1ade7e4db92098b601ce8fbb093ba180b8b0a Mon Sep 17 00:00:00 2001
From: Thomas Pakh <git@tommsy.com>
Date: Sun, 5 Jul 2020 19:23:49 -0400
Subject: [PATCH] Don't run transformers on classes with @Mixin annotation

---
 .../tickcentral/api/ClassSniffer.java         | 30 +++++++++++--------
 .../tickcentral/asm/BlockTransformer.java     |  2 +-
 .../tickcentral/asm/EntityTransformer.java    |  2 +-
 .../tickcentral/asm/ITickableTransformer.java |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/github/terminatornl/tickcentral/api/ClassSniffer.java b/src/main/java/com/github/terminatornl/tickcentral/api/ClassSniffer.java
index f36df98..35a7716 100644
--- a/src/main/java/com/github/terminatornl/tickcentral/api/ClassSniffer.java
+++ b/src/main/java/com/github/terminatornl/tickcentral/api/ClassSniffer.java
@@ -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)) {
@@ -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;
+	}
 
 }
diff --git a/src/main/java/com/github/terminatornl/tickcentral/asm/BlockTransformer.java b/src/main/java/com/github/terminatornl/tickcentral/asm/BlockTransformer.java
index 581de92..e4f6a23 100644
--- a/src/main/java/com/github/terminatornl/tickcentral/asm/BlockTransformer.java
+++ b/src/main/java/com/github/terminatornl/tickcentral/asm/BlockTransformer.java
@@ -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();
diff --git a/src/main/java/com/github/terminatornl/tickcentral/asm/EntityTransformer.java b/src/main/java/com/github/terminatornl/tickcentral/asm/EntityTransformer.java
index c838165..9f67897 100644
--- a/src/main/java/com/github/terminatornl/tickcentral/asm/EntityTransformer.java
+++ b/src/main/java/com/github/terminatornl/tickcentral/asm/EntityTransformer.java
@@ -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;
diff --git a/src/main/java/com/github/terminatornl/tickcentral/asm/ITickableTransformer.java b/src/main/java/com/github/terminatornl/tickcentral/asm/ITickableTransformer.java
index 1a77d75..f335798 100644
--- a/src/main/java/com/github/terminatornl/tickcentral/asm/ITickableTransformer.java
+++ b/src/main/java/com/github/terminatornl/tickcentral/asm/ITickableTransformer.java
@@ -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;
 			}