Feature/mixin improvements

src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/ResolveUtility.java

@@ -31,7 +31,6 @@
 import net.fabricmc.tinyremapper.api.TrMember;
 import net.fabricmc.tinyremapper.api.TrMember.MemberType;
 import net.fabricmc.tinyremapper.api.TrMethod;
-import net.fabricmc.tinyremapper.extension.mixin.common.data.Message;
 
 public final class ResolveUtility {
 	/**
@@ -61,11 +60,6 @@ public ResolveUtility(TrEnvironment environment) {
 
 	public Optional<TrClass> resolveClass(String name) {
 		TrClass _class = environment.getClass(name);
-
-		if (_class == null && !StringUtility.isInternalClassName(name)) {
-			logger.error(Message.CANNOT_RESOLVE_CLASS, name);
-		}
-
 		return Optional.ofNullable(_class);
 	}
 

src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/HardTargetMixinClassVisitor.java

@@ -23,7 +23,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
 import org.objectweb.asm.AnnotationVisitor;
@@ -46,7 +45,6 @@ public class HardTargetMixinClassVisitor extends ClassVisitor {
 	private MxClass _class;
 
 	// @Mixin
-	private final AtomicBoolean remap = new AtomicBoolean();
 	private final List<String> targets = new ArrayList<>();
 
 	// @Implements
@@ -74,7 +72,7 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
 		AnnotationVisitor av = super.visitAnnotation(descriptor, visible);
 
 		if (Annotation.MIXIN.equals(descriptor)) {
-			av = new MixinAnnotationVisitor(av, remap, targets);
+			av = new MixinAnnotationVisitor(av, targets);
 		} else if (Annotation.IMPLEMENTS.equals(descriptor)) {
 			av = new ImplementsAnnotationVisitor(av, interfaces);
 		}
@@ -90,7 +88,7 @@ public FieldVisitor visitField(int access, String name, String descriptor, Strin
 		if (targets.isEmpty()) {
 			return fv;
 		} else {
-			return new HardTargetMixinFieldVisitor(tasks, fv, field, remap.get(), Collections.unmodifiableList(targets));
+			return new HardTargetMixinFieldVisitor(tasks, fv, field, Collections.unmodifiableList(targets));
 		}
 	}
 
@@ -106,7 +104,7 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
 		if (targets.isEmpty()) {
 			return mv;
 		} else {
-			return new HardTargetMixinMethodVisitor(tasks, mv, method, remap.get(), Collections.unmodifiableList(targets));
+			return new HardTargetMixinMethodVisitor(tasks, mv, method, Collections.unmodifiableList(targets));
 		}
 	}
 }

src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/HardTargetMixinFieldVisitor.java

@@ -36,16 +36,14 @@ class HardTargetMixinFieldVisitor extends FieldVisitor {
 	private final Collection<Consumer<CommonData>> tasks;
 	private final MxMember field;
 
-	private final boolean remap;
 	private final List<String> targets;
 
 	HardTargetMixinFieldVisitor(Collection<Consumer<CommonData>> tasks, FieldVisitor delegate, MxMember field,
-								boolean remap, List<String> targets) {
+								List<String> targets) {
 		super(Constant.ASM_VERSION, delegate);
 		this.tasks = Objects.requireNonNull(tasks);
 		this.field = Objects.requireNonNull(field);
 
-		this.remap = remap;
 		this.targets = Objects.requireNonNull(targets);
 	}
 
@@ -54,7 +52,7 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
 		AnnotationVisitor av = super.visitAnnotation(descriptor, visible);
 
 		if (Annotation.SHADOW.equals(descriptor)) {
-			av = new ShadowAnnotationVisitor(tasks, av, field, remap, targets);
+			av = new ShadowAnnotationVisitor(tasks, av, field, targets);
 		}
 
 		return av;

src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/HardTargetMixinMethodVisitor.java

@@ -30,24 +30,20 @@
 import net.fabricmc.tinyremapper.extension.mixin.common.data.CommonData;
 import net.fabricmc.tinyremapper.extension.mixin.common.data.Constant;
 import net.fabricmc.tinyremapper.extension.mixin.common.data.MxMember;
-import net.fabricmc.tinyremapper.extension.mixin.hard.annotation.AccessorAnnotationVisitor;
-import net.fabricmc.tinyremapper.extension.mixin.hard.annotation.InvokerAnnotationVisitor;
 import net.fabricmc.tinyremapper.extension.mixin.hard.annotation.OverwriteAnnotationVisitor;
 import net.fabricmc.tinyremapper.extension.mixin.hard.annotation.ShadowAnnotationVisitor;
 
 class HardTargetMixinMethodVisitor extends MethodVisitor {
 	private final Collection<Consumer<CommonData>> data;
 	private final MxMember method;
 
-	private final boolean remap;
 	private final List<String> targets;
 
-	HardTargetMixinMethodVisitor(Collection<Consumer<CommonData>> data, MethodVisitor delegate, MxMember method, boolean remap, List<String> targets) {
+	HardTargetMixinMethodVisitor(Collection<Consumer<CommonData>> data, MethodVisitor delegate, MxMember method, List<String> targets) {
 		super(Constant.ASM_VERSION, delegate);
 		this.data = Objects.requireNonNull(data);
 		this.method = Objects.requireNonNull(method);
 
-		this.remap = remap;
 		this.targets = Objects.requireNonNull(targets);
 	}
 
@@ -56,13 +52,9 @@ public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
 		AnnotationVisitor av = super.visitAnnotation(descriptor, visible);
 
 		if (Annotation.SHADOW.equals(descriptor)) {
-			av = new ShadowAnnotationVisitor(data, av, method, remap, targets);
+			av = new ShadowAnnotationVisitor(data, av, method, targets);
 		} else if (Annotation.OVERWRITE.equals(descriptor)) {
-			av = new OverwriteAnnotationVisitor(data, av, method, remap, targets);
-		} else if (Annotation.ACCESSOR.equals(descriptor)) {
-			av = new AccessorAnnotationVisitor(data, av, method, remap, targets);
-		} else if (Annotation.INVOKER.equals(descriptor)) {
-			av = new InvokerAnnotationVisitor(data, av, method, remap, targets);
+			av = new OverwriteAnnotationVisitor(data, av, method, targets);
 		}
 
 		return av;