From bb20ce047a2e20866b9532c441c7433b1973ba5b Mon Sep 17 00:00:00 2001
From: gegy1000
Date: Sat, 23 Feb 2019 19:42:00 +0200
Subject: Fix #110 and remap indices with matched bridge method names

---
 src/main/java/cuchaz/enigma/Deobfuscator.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/Deobfuscator.java')

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index 47cd05c..b4736d8 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -126,23 +126,27 @@ public class Deobfuscator {
 	}
 
 	public void setMappings(EntryTree<EntryMapping> mappings) {
+		setMappings(mappings, ProgressListener.VOID);
+	}
+
+	public void setMappings(EntryTree<EntryMapping> mappings, ProgressListener progress) {
 		if (mappings != null) {
-			Collection<Entry<?>> dropped = dropMappings(mappings);
+			Collection<Entry<?>> dropped = dropMappings(mappings, progress);
 			mapper = new EntryRemapper(jarIndex, mappings);
 
 			DeltaTrackingTree<EntryMapping> obfToDeobf = mapper.getObfToDeobf();
 			for (Entry<?> entry : dropped) {
-				obfToDeobf.trackDeletion(entry);
+				obfToDeobf.trackChange(entry);
 			}
 		} else {
 			mapper = new EntryRemapper(jarIndex);
 		}
 	}
 
-	private Collection<Entry<?>> dropMappings(EntryTree<EntryMapping> mappings) {
+	private Collection<Entry<?>> dropMappings(EntryTree<EntryMapping> mappings, ProgressListener progress) {
 		// drop mappings that don't match the jar
 		MappingsChecker checker = new MappingsChecker(jarIndex, mappings);
-		MappingsChecker.Dropped dropped = checker.dropBrokenMappings();
+		MappingsChecker.Dropped dropped = checker.dropBrokenMappings(progress);
 
 		Map<Entry<?>, String> droppedMappings = dropped.getDroppedMappings();
 		for (Map.Entry<Entry<?>, String> mapping : droppedMappings.entrySet()) {
-- 
cgit v1.2.3