Fix double annotation value remapping

There are issues with AsmAnnotationRemapper remapping annotation values twice, the underlying AnnotationRemapper does the value remapping. However, the parent visitor to AnnotationRemapper is an AnnotationRemapper as well, thus making AsmAnnotationRemapper remap once, and the original remapper remap again.

Author: shedaniel

build.gradle

@@ -8,7 +8,7 @@ plugins {
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-version = '0.3.2-architectury.4'
+version = '0.3.2-architectury.5'
 
 def ENV = System.getenv()
 version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")

src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java

@@ -95,7 +95,7 @@ public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, Str
 		return createAsmAnnotationRemapper(descriptor, super.visitTypeAnnotation(typeRef, typePath, descriptor, visible), remapper);
 	}
 
-	public static AnnotationRemapper createAsmAnnotationRemapper(String desc, AnnotationVisitor annotationVisitor, Remapper remapper) {
+	public static AnnotationVisitor createAsmAnnotationRemapper(String desc, AnnotationVisitor annotationVisitor, Remapper remapper) {
 		return annotationVisitor == null ? null : new AsmAnnotationRemapper(annotationVisitor, remapper, desc);
 	}
 
@@ -585,9 +585,12 @@ private static boolean isJavaKeyword(String s) {
 		private final boolean renameInvalidLocals;
 	}
 
-	private static class AsmAnnotationRemapper extends AnnotationRemapper {
+	private static class AsmAnnotationRemapper extends AnnotationVisitor {
+		protected final Remapper remapper;
+
 		public AsmAnnotationRemapper(AnnotationVisitor annotationVisitor, Remapper remapper, String annotationDesc) {
-			super(annotationVisitor, remapper);
+			super(Opcodes.ASM9, annotationVisitor);
+			this.remapper = remapper;
 
 			annotationClass = Type.getType(annotationDesc).getInternalName();
 		}