Revert "Fix unobfuscated names not having params or docs. (#532)"

Signed-off-by: shedaniel <daniel@shedaniel.me>

1 files changed, 6 insertions, 10 deletions

diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
index 550ab640..0b8981ea 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java
@@ -445,22 +445,18 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings
 		Stopwatch stopwatch = Stopwatch.createStarted();
 		project.getLogger().info(":merging mappings");
 
-		MemoryMappingTree intermediaryTree = new MemoryMappingTree();
-		readIntermediaryTree().accept(new MappingSourceNsSwitch(intermediaryTree, MappingsNamespace.INTERMEDIARY.toString()));
+		MemoryMappingTree tree = new MemoryMappingTree();
+		MappingSourceNsSwitch sourceNsSwitch = new MappingSourceNsSwitch(tree, MappingsNamespace.OFFICIAL.toString());
+		readIntermediaryTree().accept(sourceNsSwitch);
 
 		try (BufferedReader reader = Files.newBufferedReader(from, StandardCharsets.UTF_8)) {
-			Tiny2Reader.read(reader, intermediaryTree);
+			Tiny2Reader.read(reader, tree);
 		}
 
-		MemoryMappingTree officialTree = new MemoryMappingTree();
-		MappingNsCompleter nsCompleter = new MappingNsCompleter(officialTree, Map.of(MappingsNamespace.OFFICIAL.toString(), MappingsNamespace.INTERMEDIARY.toString()));
-		MappingSourceNsSwitch nsSwitch = new MappingSourceNsSwitch(nsCompleter, MappingsNamespace.OFFICIAL.toString());
-		intermediaryTree.accept(nsSwitch);
-
-		inheritMappedNamesOfEnclosingClasses(officialTree);
+		inheritMappedNamesOfEnclosingClasses(tree);
 
 		try (Tiny2Writer writer = new Tiny2Writer(Files.newBufferedWriter(out, StandardCharsets.UTF_8), false)) {
-			officialTree.accept(writer);
+			tree.accept(writer);
 		}
 
 		project.getLogger().info(":merged mappings in " + stopwatch.stop());