Only apply mixin processing to inputs (#123)

FabricMC · Jan 3, 2024 · 979f50c · 979f50c
1 parent cc0e3dd
commit 979f50c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/src/main/java/net/fabricmc/tinyremapper/ClassInstance.java b/src/main/java/net/fabricmc/tinyremapper/ClassInstance.java
@@ -872,6 +872,11 @@ public void accept(ClassVisitor cv, int readerFlags) {
 		new ClassReader(data).accept(cv, readerFlags);
 	}
 
+	@Override
+	public boolean isInput() {
+		return isInput;
+	}
+
 	@Override
 	public String toString() {
 		return name;

diff --git a/src/main/java/net/fabricmc/tinyremapper/TinyRemapper.java b/src/main/java/net/fabricmc/tinyremapper/TinyRemapper.java
@@ -259,11 +259,23 @@ public interface Extension {
 	}
 
 	public interface AnalyzeVisitorProvider {
+		/**
+		 * @deprecated use {@link #insertAnalyzeVisitor(boolean, int, String, ClassVisitor, InputTag[])} instead
+		 */
+		@Deprecated
 		ClassVisitor insertAnalyzeVisitor(int mrjVersion, String className, ClassVisitor next);
 
+		/**
+		 * @deprecated use {@link #insertAnalyzeVisitor(boolean, int, String, ClassVisitor, InputTag[])} instead
+		 */
+		@Deprecated
 		default ClassVisitor insertAnalyzeVisitor(int mrjVersion, String className, ClassVisitor next, /* @Nullable */ InputTag[] inputTags) {
 			return insertAnalyzeVisitor(mrjVersion, className, next);
 		}
+
+		default ClassVisitor insertAnalyzeVisitor(boolean isInput, int mrjVersion, String className, ClassVisitor next, /* @Nullable */ InputTag[] inputTags) {
+			return insertAnalyzeVisitor(mrjVersion, className, next, inputTags);
+		}
 	}
 
 	public interface StateProcessor {
@@ -623,7 +635,7 @@ public FieldVisitor visitField(int access, String name, String desc, String sign
 		};
 
 		for (int i = analyzeVisitors.size() - 1; i >= 0; i--) {
-			cv = analyzeVisitors.get(i).insertAnalyzeVisitor(mrjVersion, name, cv, tags);
+			cv = analyzeVisitors.get(i).insertAnalyzeVisitor(isInput, mrjVersion, name, cv, tags);
 		}
 
 		reader.accept(cv, ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES | ClassReader.SKIP_CODE);

diff --git a/src/main/java/net/fabricmc/tinyremapper/api/TrClass.java b/src/main/java/net/fabricmc/tinyremapper/api/TrClass.java
@@ -142,4 +142,9 @@ default boolean isRecord() {
 	default boolean isModule() {
 		return (getAccess() & Opcodes.ACC_MODULE) != 0;
 	}
+
+	/**
+	 * Return true when this class is from an input, and not just on the classpath.
+	 */
+	boolean isInput();
 }
diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/MixinExtension.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/MixinExtension.java
@@ -146,6 +146,15 @@ public ClassVisitor insertAnalyzeVisitor(int mrjVersion, String className, Class
 				return next;
 			}
 		}
+
+		@Override
+		public ClassVisitor insertAnalyzeVisitor(boolean isInput, int mrjVersion, String className, ClassVisitor next, InputTag[] inputTags) {
+			if (!isInput) {
+				return next;
+			}
+
+			return insertAnalyzeVisitor(mrjVersion, className, next, inputTags);
+		}
 	}
 
 	/**
@@ -159,7 +168,9 @@ public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next) {
 
 		@Override
 		public ClassVisitor insertApplyVisitor(TrClass cls, ClassVisitor next, InputTag[] inputTags) {
-			if (inputTagFilter == null || inputTags == null) {
+			if (!cls.isInput()) {
+				return next;
+			} else if (inputTagFilter == null || inputTags == null) {
 				return insertApplyVisitor(cls, next);
 			} else {
 				for (InputTag tag : inputTags) {