Fix MojangMappingsMerger having incomplete names

architectury · Nov 2, 2023 · 93c88cf · 93c88cf
1 parent 04074fb
commit 93c88cf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/dev/architectury/loom/neoforge/MojangMappingsMerger.java b/src/main/java/dev/architectury/loom/neoforge/MojangMappingsMerger.java
@@ -44,7 +44,9 @@ public static MemoryMappingTree mergeMojangMappings(MappingContext context, Path
 			MemoryMappingTree incomplete = processor.getMappings(List.of(inputLayer, renamedMojangLayer));
 			MemoryMappingTree result = new MemoryMappingTree();
 			MappingVisitor visitor = new MappingSourceNsSwitch(result, MappingsNamespace.OFFICIAL.toString());
-			Map<String, String> toComplete = Map.of(MappingsNamespace.INTERMEDIARY.toString(), MappingsNamespace.OFFICIAL.toString());
+			// Run via intermediary first to drop any missing names.
+			visitor = new MappingSourceNsSwitch(visitor, MappingsNamespace.INTERMEDIARY.toString(), true);
+			Map<String, String> toComplete = Map.of(MappingsNamespace.MOJANG.toString(), MappingsNamespace.OFFICIAL.toString());
 			visitor = new MappingNsCompleter(visitor, toComplete);
 			incomplete.accept(visitor);
 			return result;