Added mappings argument for MavenTask

This effectively deprecates the parchment argument. Mappings are
formatted as channel:version, defaulting to just channel if no version
is specified (i.e. notch, official:1.21.5). MavenTask uses "official" by
default.

Author: Jonathing

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

@@ -47,7 +47,7 @@ public static void run(String[] args) throws Exception {
             "Directory to store jdks downloaded from the disoco api")
             .withRequiredArg().ofType(File.class).defaultsTo(new File("cache/jdks"));
 
-        // root output directory
+        // mcp artifact output
         var outputO = parser.accepts("output",
             "Root directory to generate the maven repository")
             .withRequiredArg().ofType(File.class).defaultsTo(new File("output.jar"));

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

@@ -66,6 +66,10 @@ static void run(String[] args) throws Exception {
         var cacheOnlyO = parser.accepts("cache-only",
             "Only use caches, fail if any downloads need to occur or if a task needs to do work");
 
+        var mappingsO = parser.accepts("mappings",
+            "Mappings to use for this artifact. Formatted as channel:version")
+            .withRequiredArg().ofType(String.class).defaultsTo("official");
+
         var parchmentO = parser.accepts("parchment",
             "Version of parchment mappings to use, snapshots are not supported")
             .withRequiredArg();
@@ -131,7 +135,7 @@ static void run(String[] args) throws Exception {
 
         var mappings = options.has(parchmentO)
             ? new ParchmentMappings(options.valueOf(parchmentO))
-            : new Mappings("official", null);
+            : Mappings.of(options.valueOf(mappingsO));
 
         var mcmaven = new MinecraftMaven(output, cache, jdkCache, mappings);
         mcmaven.run(artifact);

src/main/java/net/minecraftforge/mcmaven/impl/mappings/Mappings.java

@@ -28,6 +28,16 @@ public class Mappings {
     private final String channel;
     private final @Nullable String version;
 
+    public static Mappings of(String mappingsNotation) {
+        var split = mappingsNotation.split(":", 2);
+        var channel = split[0];
+        var version = split.length > 1 ? split[1] : null;
+
+        return "parchment".equalsIgnoreCase(channel)
+            ? new ParchmentMappings(version)
+            : new Mappings(channel, version);
+    }
+
     public Mappings(String channel, @Nullable String version) {
         this.channel = channel;
         this.version = version;

src/main/java/net/minecraftforge/mcmaven/impl/mappings/ParchmentMappings.java

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
@@ -32,12 +33,13 @@
 import net.minecraftforge.srgutils.IMappingFile;
 import net.minecraftforge.util.file.FileUtils;
 import net.minecraftforge.util.hash.HashStore;
+import org.jetbrains.annotations.Nullable;
 
 public class ParchmentMappings extends Mappings {
     private Task downloadTask;
 
     public ParchmentMappings(String version) {
-        super("parchment", version);
+        super("parchment", Objects.requireNonNull(version, "Parchment mappings version must be present"));
         if (version.contains("-SNAPSHOT"))
             throw new IllegalArgumentException("Parchment snapshots are not supported: " + version);
     }

src/main/java/net/minecraftforge/mcmaven/impl/repo/Repo.java

@@ -88,7 +88,7 @@ protected static Task variantTask(Task parent, Supplier<GradleModule.Variant[]>
         });
     }
 
-    protected Supplier<GradleModule.Variant[]> classVariant(String name, Mappings mappings) {
+    protected Supplier<GradleModule.Variant[]> simpleVariant(String name, Mappings mappings) {
         return () -> new GradleModule.Variant[] {
             GradleModule.Variant
                 .of(name)

src/main/java/net/minecraftforge/mcmaven/impl/repo/mcpconfig/MCPConfigRepo.java

@@ -16,7 +16,6 @@
 import net.minecraftforge.mcmaven.impl.util.Util;
 import net.minecraftforge.util.file.FileUtils;
 import net.minecraftforge.util.hash.HashStore;
-import org.jetbrains.annotations.Nullable;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
@@ -86,12 +85,8 @@ public MinecraftTasks getMCTasks(String version) {
         return this.mcTasks.computeIfAbsent(version, k -> new MinecraftTasks(this.cache.root(), version));
     }
 
-    public List<PendingArtifact> process(Artifact artifact) {
-        return this.process(artifact, null);
-    }
-
     @Override
-    public List<PendingArtifact> process(Artifact artifact, @Nullable Mappings mappings) {
+    public List<PendingArtifact> process(Artifact artifact, Mappings mappings) {
         var module = artifact.getGroup() + ':' + artifact.getName();
         var version = artifact.getVersion();
         if (!module.startsWith("net.minecraft:"))
@@ -105,31 +100,31 @@ public List<PendingArtifact> process(Artifact artifact, @Nullable Mappings mappi
         var build = mcpSide.getBuildFolder();
         var name = Artifact.from("net.minecraft", side, version);
 
-        var notchObf = pending("Notch-obf Classes", mcpTasks.getRawJar(), name.withClassifier("raw"), classVariant("obf-notch", new Mappings("notch", null)));
-        var srgObf = pending("SRG-obf Classes", mcpTasks.getSrgJar(), name.withClassifier("srg"), classVariant("obf-searge", new Mappings("searge", null)));
-        var pending = new ArrayList<>(List.of(
-            notchObf, srgObf
-        ));
-
-        if (mappings != null) {
-            var sourcesTask = new RenameTask(build, name, mcpSide, mcpSide.getSources(), mappings);
-            var recompile = new RecompileTask(build, name, mcpSide.getMCP(), mcpSide::getClasspath, sourcesTask.get(), mappings);
-            var classesTask = mergeExtra(build, side, recompile.get(), mcpSide.getTasks().getExtra(), mappings);
-
-            var sources = pending("Sources", sourcesTask.get(), name.withClassifier("sources"), sourceVariant(mappings));
-            var classes = pending("Classes", classesTask, name, () -> classVariants(mappings, mcpSide));
-            var metadata = pending("Metadata", metadata(build, mcpSide), name.withClassifier("metadata").withExtension("zip"));
-            pending.addAll(List.of(
-                sources, classes, metadata
-            ));
-
-            if (mappings.isPrimary()) {
-                var pom = pending("Maven POM", pom(build, side, mcpSide, version), name.withExtension("pom"));
-                pending.add(pom);
-            }
-        }
+        return switch (mappings.channel()) {
+            case "notch" -> List.of(pending("Classes", mcpTasks.getRawJar(), name.withClassifier("raw"), simpleVariant("obf-notch", new Mappings("notch", null))));
+            case "srg", "searge" -> List.of(pending("Classes", mcpTasks.getSrgJar(), name.withClassifier("srg"), simpleVariant("obf-searge", new Mappings("searge", null))));
+            default -> {
+                var pending = new ArrayList<PendingArtifact>();
+
+                var sourcesTask = new RenameTask(build, name, mcpSide, mcpSide.getSources(), mappings);
+                var recompile = new RecompileTask(build, name, mcpSide.getMCP(), mcpSide::getClasspath, sourcesTask.get(), mappings);
+                var classesTask = mergeExtra(build, side, recompile.get(), mcpSide.getTasks().getExtra(), mappings);
+
+                var sources = pending("Sources", sourcesTask.get(), name.withClassifier("sources"), sourceVariant(mappings));
+                var classes = pending("Classes", classesTask, name, () -> classVariants(mappings, mcpSide));
+                var metadata = pending("Metadata", metadata(build, mcpSide), name.withClassifier("metadata").withExtension("zip"));
+                pending.addAll(List.of(
+                    sources, classes, metadata
+                ));
+
+                if (mappings.isPrimary()) {
+                    var pom = pending("Maven POM", pom(build, side, mcpSide, version), name.withExtension("pom"));
+                    pending.add(pom);
+                }
 
-        return pending;
+                yield pending;
+            }
+        };
     }
 
     public List<PendingArtifact> processExtra(String module, String version) {