Add optional mappings to MCPTask

Must be enabled with the `--mappings` flag. Also added the `--parchment`
flag because dear god, we need parameter names in ForgeDev soon.

Author: Jonathing

src/main/java/net/minecraftforge/mcmaven/cli/MCPTask.java

@@ -8,16 +8,21 @@
 import java.util.Set;
 
 import joptsimple.OptionParser;
+import net.minecraftforge.mcmaven.impl.MinecraftMaven;
 import net.minecraftforge.mcmaven.impl.cache.Cache;
+import net.minecraftforge.mcmaven.impl.mappings.Mappings;
+import net.minecraftforge.mcmaven.impl.mappings.ParchmentMappings;
 import net.minecraftforge.mcmaven.impl.repo.forge.Patcher;
 import net.minecraftforge.mcmaven.impl.repo.mcpconfig.MCPConfigRepo;
+import net.minecraftforge.mcmaven.impl.tasks.RenameTask;
 import net.minecraftforge.mcmaven.impl.util.Artifact;
 import net.minecraftforge.mcmaven.impl.util.Task;
 import net.minecraftforge.mcmaven.impl.util.Util;
 import net.minecraftforge.util.hash.HashFunction;
 import net.minecraftforge.util.hash.HashStore;
 import net.minecraftforge.util.logging.Log;
 
+// TODO [Mavenizer][MCPTask] Cleanup. Works well but is a mess.
 public class MCPTask {
     public static void run(String[] args) throws Exception {
         // TODO [MCMavenizer] Make this into a --log [level] option
@@ -61,11 +66,18 @@ public static void run(String[] args) throws Exception {
 
         var atO = parser.accepts("at",
             "Access Transformer config file to apply")
-            .withRequiredArg().ofType(File.class);
+            .withOptionalArg().ofType(File.class);
 
         var sasO = parser.accepts("sas",
             "Side Annotation Stripper confg file to apply")
-            .withRequiredArg().ofType(File.class);
+            .withOptionalArg().ofType(File.class);
+
+        var mappingsO = parser.accepts("mappings",
+            "Use to enable using official mappings");
+
+        var parchmentO = parser.accepts("parchment",
+            "Version of parchment mappings to use, snapshots are not supported")
+            .availableIf(mappingsO).withRequiredArg();
         //@formatter:on
 
         var options = parser.parse(args);
@@ -130,17 +142,36 @@ public static void run(String[] args) throws Exception {
         }
 
         File sources = null;
-        Log.info("Creating MCP Source Jar");
-        var indent = Log.push();
-        try {
-            sources = sourcesTask.get();
-        } finally {
-             Log.pop(indent);
+        {
+            Log.info("Creating MCP Source Jar");
+            var indent = Log.push();
+            try {
+                sources = sourcesTask.execute();
+            } finally {
+                Log.pop(indent);
+            }
         }
 
         var cache = HashStore.fromFile(output)
             .add("sources", sources);
 
+        if (options.has(mappingsO)) {
+            Log.info("Renaming MCP Source Jar");
+            var indent = Log.push();
+            try {
+                var mappings = options.has(parchmentO)
+                    ? new ParchmentMappings(options.valueOf(parchmentO))
+                    : new Mappings("official", null).withMCVersion(MinecraftMaven.mcpToMcVersion(artifact.getVersion()));
+
+                var renameTask = new RenameTask(side.getBuildFolder(), pipeline, side, Task.existing("sources", sources), mappings).get();
+                sources = renameTask.execute();
+            } finally {
+                Log.pop(indent);
+            }
+
+            cache.add("renamed", sources);
+        }
+
         if (!output.exists() || !cache.isSame()) {
             try {
                 org.apache.commons.io.FileUtils.copyFile(sources, output);

src/main/java/net/minecraftforge/mcmaven/impl/MinecraftMaven.java

@@ -101,7 +101,7 @@ private static String forgeToMcVersion(String version) {
         return version.substring(0, idx).replace('_', '-');
     }
 
-    private static String mcpToMcVersion(String version) {
+    public static String mcpToMcVersion(String version) {
         // MCP names can either be {MCVersion} or {MCVersion}-{Timestamp}, EXA: 1.21.1-20240808.132146
         // So lets see if the thing following the last - matches a timestamp
         int idx = version.lastIndexOf('-');

src/main/java/net/minecraftforge/mcmaven/impl/tasks/RenameTask.java

@@ -31,7 +31,7 @@
  * Applies mappings provided by a ziped csv file to them and returns the new sources.
  */
 public final class RenameTask implements Supplier<Task> {
-    private final Artifact name;
+    private final String name;
     private final MCPSide side;
     private final Task task;
 
@@ -43,6 +43,17 @@ public final class RenameTask implements Supplier<Task> {
      * @param sources The task that creates the unnamed sources
      */
     public RenameTask(File build, Artifact name, MCPSide side, Task sources, Mappings mappings) {
+        this(build, name.getName(), side, sources, mappings);
+    }
+
+    /**
+     * Creates a new renamer for the given patcher.
+     *
+     * @param build   The directory where the output will be stored
+     * @param name    The development artifact, only used for the task name
+     * @param sources The task that creates the unnamed sources
+     */
+    public RenameTask(File build, String name, MCPSide side, Task sources, Mappings mappings) {
         this.name = name;
         this.side = side;
         this.task = this.remapSources(sources, mappings.getFolder(build), mappings);
@@ -56,7 +67,7 @@ public Task get() {
     private Task remapSources(Task input, File outputDir, Mappings provider) {
         var output = new File(outputDir, "remapped.jar");
         var mappings = provider.getCsvZip(side);
-        return Task.named("remap[" + this.name.getName() + "][" + provider + ']',
+        return Task.named("remap[" + this.name + "][" + provider + ']',
             Set.of(input, mappings),
             () -> remapSourcesImpl(input, mappings, output)
         );

src/main/java/net/minecraftforge/mcmaven/impl/util/Task.java

@@ -10,15 +10,20 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
 /** Represents a task that can be executed. Tasks in this tool <strong>will always</strong> provide a file. */
-public sealed interface Task extends Supplier<File> permits Task.Simple {
-    static Task named(String name, ThrowingSupplier<File> supplier) {
+public sealed interface Task extends Supplier<File> permits Task.Existing, Task.Simple {
+    static Task existing(String name, File file) {
+        return new Existing(name, file);
+    }
+
+    static Task named(String name, Callable<File> supplier) {
         return named(name, Set.of(), supplier);
     }
 
-    static Task named(String name, Iterable<? extends Task> deps, ThrowingSupplier<File> supplier) {
+    static Task named(String name, Iterable<? extends Task> deps, Callable<File> supplier) {
         return new Simple(name, deps, supplier);
     }
 
@@ -66,17 +71,13 @@ default File get() {
         return this.execute();
     }
 
-    interface ThrowingSupplier<T> {
-        T get() throws Exception;
-    }
-
     final class Simple implements Task {
         private final String name;
         private final Iterable<? extends Task> deps;
-        private final ThrowingSupplier<File> supplier;
+        private final Callable<File> supplier;
         private File file;
 
-        private Simple(String name, Iterable<? extends Task> deps, ThrowingSupplier<File> supplier) {
+        private Simple(String name, Iterable<? extends Task> deps, Callable<File> supplier) {
             this.name = name;
             this.deps = deps;
             this.supplier = supplier;
@@ -90,7 +91,7 @@ public File execute() {
                 Log.info(name);
                 Log.push();
                 try {
-                    this.file = supplier.get();
+                    this.file = supplier.call();
                 } catch (Exception e) {
                     Util.sneak(e);
                 }
@@ -116,4 +117,16 @@ public String toString() {
             return "Task[" + this.name + ']';
         }
     }
+
+    record Existing(String name, File execute) implements Task {
+        @Override
+        public boolean resolved() {
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return "Task[" + this.name + ']';
+        }
+    }
 }