remove equivalent entries in MappingValidator

Author: ix0rai

enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/EntryRemapper.java

@@ -56,7 +56,7 @@ private EntryRemapper(JarIndex jarIndex, MappingsIndex mappingsIndex, EntryTree<
 		this.jarIndex = jarIndex;
 		this.mappingsIndex = mappingsIndex;
 
-		this.validator = new MappingValidator(this.deobfuscator, jarIndex, mappingsIndex);
+		this.validator = new MappingValidator(this.obfResolver, this.deobfuscator, jarIndex, mappingsIndex);
 		this.proposalServices = proposalServices;
 	}
 

enigma/src/main/java/org/quiltmc/enigma/api/translation/mapping/MappingValidator.java

@@ -26,11 +26,13 @@
 import java.util.stream.Collectors;
 
 public class MappingValidator {
+	private final EntryResolver resolver;
 	private final Translator deobfuscator;
 	private final JarIndex jarIndex;
 	private final MappingsIndex mappingsIndex;
 
-	public MappingValidator(Translator deobfuscator, JarIndex jarIndex, MappingsIndex mappingsIndex) {
+	public MappingValidator(EntryResolver resolver, Translator deobfuscator, JarIndex jarIndex, MappingsIndex mappingsIndex) {
+		this.resolver = resolver;
 		this.deobfuscator = deobfuscator;
 		this.jarIndex = jarIndex;
 		this.mappingsIndex = mappingsIndex;
@@ -92,6 +94,10 @@ private boolean validateUnique(ValidationContext context, Entry<?> entry, String
 			siblings.addAll(this.jarIndex.getChildrenByClass().get(ancestor));
 		}
 
+		// remove equivalent entries -- this can sometimes happen and break mark as deobf/obf
+		// noinspection all
+		siblings.removeAll(this.resolver.resolveEquivalentEntries(entry));
+
 		// collect deobfuscated versions
 		Map<Entry<?>, Entry<?>> deobfSiblings = siblings.stream()
 				.distinct() // May throw IllegalStateException otherwise