Fix toggling obf on bridge method params

QuiltMC · Jan 3, 2024 · ea1e1b2 · ea1e1b2
1 parent 60415e1
commit ea1e1b2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/Gui.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/Gui.java
@@ -6,6 +6,7 @@
 import org.quiltmc.enigma.api.source.TokenType;
 import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
 import org.quiltmc.enigma.api.translation.mapping.EntryRemapper;
+import org.quiltmc.enigma.api.translation.mapping.ResolutionStrategy;
 import org.quiltmc.enigma.gui.config.Config;
 import org.quiltmc.enigma.gui.dialog.JavadocDialog;
 import org.quiltmc.enigma.gui.dialog.SearchDialog;
@@ -456,15 +457,16 @@ public void toggleMapping(EditorPanel editor) {
 	}
 
 	public void toggleMappingFromEntry(Entry<?> obfEntry) {
-		EntryMapping mapping = this.controller.getProject().getRemapper().getMapping(obfEntry);
+		EntryRemapper remapper = this.controller.getProject().getRemapper();
+		Entry<?> resolvedEntry = remapper.getObfResolver().resolveFirstEntry(obfEntry, ResolutionStrategy.RESOLVE_ROOT);
+		EntryMapping mapping = remapper.getMapping(resolvedEntry);
 
-		EntryChange<?> change = EntryChange.modify(obfEntry);
+		EntryChange<?> change = EntryChange.modify(resolvedEntry);
 		if (mapping.targetName() != null) {
 			if (mapping.tokenType().isProposed()) {
 				change = change.withTokenType(TokenType.DEOBFUSCATED).clearSourcePluginId();
 			} else {
-				EntryRemapper remapper = this.controller.getProject().getRemapper();
-				EntryMapping proposedMapping = remapper.getProposedMappings().get(obfEntry);
+				EntryMapping proposedMapping = remapper.getProposedMappings().get(resolvedEntry);
 				if (proposedMapping != null) {
 					change = change.withDeobfName(proposedMapping.targetName()).withTokenType(proposedMapping.tokenType()).withSourcePluginId(proposedMapping.sourcePluginId());
 				} else {