Fix insertAutoGeneratedMappings

buildSrc/src/main/java/quilt/internal/tasks/build/AddProposedMappingsTask.java

@@ -2,6 +2,7 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.PrintWriter;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -11,20 +12,18 @@
 import java.util.Locale;
 import java.util.Objects;
 
-import com.google.common.collect.Streams;
 import org.quiltmc.enigma.api.Enigma;
 import org.quiltmc.enigma.api.EnigmaProfile;
 import org.quiltmc.enigma.api.EnigmaProject;
-import org.quiltmc.enigma.api.service.NameProposalService;
 import org.quiltmc.enigma.command.Command;
 import org.quiltmc.enigma.command.FillClassMappingsCommand;
-import org.quiltmc.enigma.command.InsertProposedMappingsCommand;
 import org.quiltmc.enigma.command.MappingCommandsUtil;
 import org.quiltmc.enigma.api.translation.mapping.EntryMapping;
 import org.quiltmc.enigma.api.translation.mapping.MappingDelta;
 import org.quiltmc.enigma.api.translation.mapping.serde.MappingSaveParameters;
 import org.quiltmc.enigma.api.translation.mapping.tree.DeltaTrackingTree;
 import org.quiltmc.enigma.api.translation.mapping.tree.EntryTree;
+import org.quiltmc.enigma.util.EntryTreePrinter;
 import org.quiltmc.enigma.util.Utils;
 import net.fabricmc.mappingio.MappingWriter;
 import net.fabricmc.mappingio.adapter.MappingDstNsReorder;
@@ -114,25 +113,24 @@ private static void runCommands(Path jar, Path input, Path output, String result
         Enigma enigma = Command.createEnigma(profile, null);
 
         EnigmaProject project = Command.openProject(jar, input, enigma);
-        NameProposalService[] nameProposalServices = enigma.getServices().get(NameProposalService.TYPE).toArray(new NameProposalService[0]);
 
         boolean debug = System.getProperty("qm.addProposedMappings.debug", "false").toLowerCase(Locale.ROOT).equals("true");
-        EntryTree<EntryMapping> withProposals = InsertProposedMappingsCommand.exec(nameProposalServices, project);
+        EntryTree<EntryMapping> withProposals = project.getRemapper().getMappings(); // Proposed names are automatically added when opening a project
 
         // TODO: Disable fillAll after fixing the tiny v2 writer to avoid adding unnecessary class names
         EntryTree<EntryMapping> result = FillClassMappingsCommand.exec(project.getJarIndex(), withProposals, true, debug);
 
         Utils.delete(output);
-        MappingSaveParameters saveParameters = enigma.getProfile().getMappingSaveParameters();
+        MappingSaveParameters profileParameters = enigma.getProfile().getMappingSaveParameters();
+        MappingSaveParameters saveParameters = new MappingSaveParameters(profileParameters.fileNameFormat(), /*writeProposedNames*/ true);
         MappingCommandsUtil.getWriter(resultFormat).write(result, output, saveParameters);
 
         if (debug) {
-            Path debugFile = output.getParent().resolve(output.getFileName().toString() + "-delta.txt");
-            MappingDelta<EntryMapping> proposalsDelta = ((DeltaTrackingTree<EntryMapping>) withProposals).takeDelta();
+            Path deltaFile = output.getParent().resolve(output.getFileName().toString() + "-fill-delta.txt");
             MappingDelta<EntryMapping> fillDelta = ((DeltaTrackingTree<EntryMapping>) result).takeDelta();
 
-            try (BufferedWriter writer = Files.newBufferedWriter(debugFile)) {
-                List<String> content = Streams.concat(proposalsDelta.getChanges().getAllEntries(), fillDelta.getChanges().getAllEntries())
+            try (BufferedWriter writer = Files.newBufferedWriter(deltaFile)) {
+                List<String> content = fillDelta.getChanges().getAllEntries()
                         .map(Objects::toString)
                         .toList();
 
@@ -141,6 +139,11 @@ private static void runCommands(Path jar, Path input, Path output, String result
                     writer.newLine();
                 }
             }
+
+            Path debugFile = output.getParent().resolve(output.getFileName().toString() + "-tree.txt");
+            try (BufferedWriter writer = Files.newBufferedWriter(debugFile)) {
+                EntryTreePrinter.print(new PrintWriter(writer), project.getRemapper().getProposedMappings());
+            }
         }
     }