move generated unpick definition outputs to fileConstants.buildDir

move unpick.json to unpick/ and unpick definitions to unpick/definitions/
add UnpickGenTask::getGeneratedUnpickDefinitions
refine CombineUnpickDefinitionsTask and its configuration
add unpick/definitions/ to CombineUnpickDefinitionsTask's input in build.gradle
rename OpenGlConstantUnpickGeneratorTask -> OpenGlConstantUnpickGenTask
make unpick.json's location configurable via MappingsExtension and configure it in build.gradle
remove all unpick-related files from FileConstants (obsolete, or only used once in which case inlined)

build.gradle

@@ -33,7 +33,14 @@ plugins {
 }
 
 mappings {
-	enigmaProfile = file("enigma_profile.json")
+	enigmaProfile = file('enigma_profile.json')
+
+	unpick = file('unpick/unpick.json')
+}
+
+combineUnpickDefinitions {
+	// add static unpick definitions
+	unpickDefinitions.from 'unpick/definitions/'
 }
 
 def USE_SNAPSHOT_HASHES = false
@@ -111,8 +118,8 @@ import quilt.internal.util.MappingsJavadocProvider
 // TODO consider moving cleanable things to build/ so this isn't necessary,
 //  or put them in .gradle/cleanable/ and only add that here (or MappingsPlugin)
 clean.doFirst {
-	delete mappings.fileConstants.tempDir, mappings.fileConstants.cacheFilesMinecraft,
-			mappings.fileConstants.unpickGlDefinitions, mappings.fileConstants.unpickGlStateManagerDefinitions
+	delete mappings.fileConstants.tempDir, mappings.fileConstants.cacheFilesMinecraft
+	// , mappings.fileConstants.generatedUnpickDefinitions
 }
 
 tasks.build.dependsOn "compressTiny", "tinyJar", "v2UnmergedMappingsJar", "v2MergedMappingsJar"

buildSrc/src/main/java/quilt/internal/FileConstants.java

@@ -17,27 +17,21 @@ public class FileConstants {
     public final File dictionaryDir;
     public final File dictionaryFile;
 
-    public final File unpickDefinitions;
-    public final File unpickMeta;
-    public final File unpickGlDefinitions;
-    public final File unpickGlStateManagerDefinitions;
-
     public FileConstants(Project project) {
-        buildDir = project.file("build/mappings");
-        cacheFilesMinecraft = project.file(".gradle/minecraft");
-        tempDir = project.file(".gradle/temp");
-        libraries = new File(cacheFilesMinecraft, "libraries");
-
-        perVersionMappingsJar = project.file(Constants.MINECRAFT_VERSION + "-" + Constants.PER_VERSION_MAPPINGS_NAME + ".jar");
-        unpickedJar = project.file(Constants.MINECRAFT_VERSION + "-" + Constants.PER_VERSION_MAPPINGS_NAME + "-unpicked.jar");
-        namedJar = project.file(Constants.MINECRAFT_VERSION + "-named.jar");
-
-        dictionaryDir = project.file(".gradle/lint/dictionary");
-        dictionaryFile = project.file(dictionaryDir.toPath().resolve(DownloadDictionaryFileTask.REVISION + ".txt"));
-
-        unpickDefinitions = project.file("unpick-definitions");
-        unpickMeta = new File(unpickDefinitions, "unpick.json");
-        unpickGlDefinitions = new File(unpickDefinitions, "unpick_gl.unpick");
-        unpickGlStateManagerDefinitions = new File(unpickDefinitions, "unpick_glstatemanager.unpick");
+        this.buildDir = project.file("build/mappings");
+        this.cacheFilesMinecraft = project.file(".gradle/minecraft");
+        this.tempDir = project.file(".gradle/temp");
+        this.libraries = new File(this.cacheFilesMinecraft, "libraries");
+
+        this.perVersionMappingsJar =
+            project.file(Constants.MINECRAFT_VERSION + "-" + Constants.PER_VERSION_MAPPINGS_NAME + ".jar");
+        this.unpickedJar = project.file(
+            Constants.MINECRAFT_VERSION + "-" + Constants.PER_VERSION_MAPPINGS_NAME + "-unpicked.jar"
+        );
+        this.namedJar = project.file(Constants.MINECRAFT_VERSION + "-named.jar");
+
+        this.dictionaryDir = project.file(".gradle/lint/dictionary");
+        this.dictionaryFile =
+            project.file(this.dictionaryDir.toPath().resolve(DownloadDictionaryFileTask.REVISION + ".txt"));
     }
 }

buildSrc/src/main/java/quilt/internal/MappingsExtension.java

@@ -2,6 +2,7 @@
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Provider;
@@ -18,6 +19,8 @@ public abstract class MappingsExtension {
      */
     public final Provider<EnigmaProfile> enigmaProfile;
 
+    public abstract RegularFileProperty getUnpick();
+
     private final FileConstants fileConstants;
 
     public static MappingsExtension get(Project project) {

buildSrc/src/main/java/quilt/internal/MappingsPlugin.java

@@ -56,7 +56,7 @@
 import quilt.internal.tasks.unpick.CombineUnpickDefinitionsTask;
 import quilt.internal.tasks.unpick.RemapUnpickDefinitionsTask;
 import quilt.internal.tasks.unpick.UnpickJarTask;
-import quilt.internal.tasks.unpick.gen.OpenGlConstantUnpickGeneratorTask;
+import quilt.internal.tasks.unpick.gen.OpenGlConstantUnpickGenTask;
 import quilt.internal.tasks.unpick.gen.UnpickGenTask;
 
 import java.io.File;
@@ -276,7 +276,7 @@ public void apply(@NotNull Project project) {
 
         tasks.register(DropInvalidMappingsTask.TASK_NAME, DropInvalidMappingsTask.class);
 
-        tasks.register(OpenGlConstantUnpickGeneratorTask.TASK_NAME, OpenGlConstantUnpickGeneratorTask.class, task -> {
+        tasks.register(OpenGlConstantUnpickGenTask.TASK_NAME, OpenGlConstantUnpickGenTask.class, task -> {
             task.getVersionFile().convention(
                 downloadMinecraftLibraries.flatMap(DownloadMinecraftLibrariesTask::getVersionFile)
             );
@@ -289,21 +289,29 @@ public void apply(@NotNull Project project) {
                 downloadMinecraftLibraries.flatMap(DownloadMinecraftLibrariesTask::getArtifactsByUrl)
             );
 
-            task.getUnpickGlStateManagerDefinitions().convention(() ->
-                ext.getFileConstants().unpickGlStateManagerDefinitions
+            final Provider<Directory> buildDirProvider = provideProjectDir(project, ext.getFileConstants().buildDir);
+
+            task.getUnpickGlStateManagerDefinitions().convention(
+                buildDirProvider.map(dir -> dir.file("unpick_glstatemanager.unpick"))
+                // ext.getFileConstants().generatedUnpickDefinitions.map(dir -> dir.file("unpick_glstatemanager.unpick"))
             );
 
-            task.getUnpickGlDefinitions().convention(() -> ext.getFileConstants().unpickGlDefinitions);
+            task.getUnpickGlDefinitions().convention(
+                buildDirProvider.map(dir -> dir.file("unpick_gl.unpick"))
+                // ext.getFileConstants().generatedUnpickDefinitions.map(dir -> dir.file("unpick_gl.unpick"))
+            );
         });
 
         final var combineUnpickDefinitions = tasks.register(
             CombineUnpickDefinitionsTask.TASK_NAME, CombineUnpickDefinitionsTask.class,
             task -> {
-                // TODO eliminate this
-                task.dependsOn(project.getTasks().withType(UnpickGenTask.class));
+                // task.getUnpickDefinitions().builtBy(project.getTasks().withType(UnpickGenTask.class));
 
-                // TODO make this a FileCollection of all the outputs of UnpickGen tasks
-                task.getInput().convention(provideProjectDir(project, ext.getFileConstants().unpickDefinitions));
+                task.getUnpickDefinitions().from(project.provider(() ->
+                    project.getTasks().withType(UnpickGenTask.class).stream()
+                        .map(UnpickGenTask::getGeneratedUnpickDefinitions)
+                        .toList()
+                ));
 
                 task.getOutput().convention(
                     provideProjectDir(project, ext.getFileConstants().buildDir)
@@ -349,16 +357,13 @@ public void apply(@NotNull Project project) {
 
         final var removeIntermediary = tasks.register(RemoveIntermediaryTask.TASK_NAME, RemoveIntermediaryTask.class);
 
-        final var v2UnmergedMappingsJar = tasks.register(
-            V_2_UNMERGED_MAPPINGS_JAR_TASK_NAME, MappingsV2JarTask.class,
-            task -> {
-                task.getMappings().convention(
-                    insertAutoGeneratedMappings.flatMap(AddProposedMappingsTask::getOutputMappings)
-                );
+        tasks.register(V_2_UNMERGED_MAPPINGS_JAR_TASK_NAME, MappingsV2JarTask.class, task -> {
+            task.getMappings().convention(
+                insertAutoGeneratedMappings.flatMap(AddProposedMappingsTask::getOutputMappings)
+            );
 
-                task.getArchiveFileName().convention(ARCHIVE_FILE_NAME_PREFIX + "v2.jar");
-            }
-        );
+            task.getArchiveFileName().convention(ARCHIVE_FILE_NAME_PREFIX + "v2.jar");
+        });
 
         tasks.register(INTERMEDIARY_V_2_MAPPINGS_JAR_TASK_NAME, MappingsV2JarTask.class, task -> {
             task.getArchiveFileName().convention(ARCHIVE_FILE_NAME_PREFIX + "intermediary-v2.jar");
@@ -371,7 +376,7 @@ public void apply(@NotNull Project project) {
         });
 
         final var mergeTinyV2 = tasks.register(MergeTinyV2Task.TASK_NAME, MergeTinyV2Task.class, task -> {
-            // this used to be dependent on v2UnmergedMappingsJar but afaict that was unnecessary
+            // TODO this used to be dependent on v2UnmergedMappingsJar, but afaict it has no effect on this task
 
             task.getInput().convention(
                 insertAutoGeneratedMappings.flatMap(AddProposedMappingsTask::getOutputMappings)

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

@@ -20,8 +20,8 @@ public MappingsV2JarTask() {
         this.outputsNeverUpToDate();
         this.getDestinationDirectory().set(this.getProject().file("build/libs"));
 
-        // TODO make this an input, make it configurable via MappingsExtension
-        final File unpickMetaFile = this.mappingsExt().getFileConstants().unpickMeta;
+        // TODO make this an input
+        final File unpickMetaFile = this.mappingsExt().getUnpick().get().getAsFile();
         final String version = this.libs().findVersion("unpick").map(VersionConstraint::getRequiredVersion)
             .orElseThrow(() -> new RuntimeException("Could not find unpick version"));
 
@@ -30,6 +30,7 @@ public MappingsV2JarTask() {
             copySpec.rename(unpickMetaFile.getName(), "extras/unpick.json");
         });
 
+        // TODO move this to a configureEach in MappingsPlugin
         final RegularFileProperty combineUnpickDefinitions =
             this.getTaskNamed(CombineUnpickDefinitionsTask.TASK_NAME, CombineUnpickDefinitionsTask.class).getOutput();
         this.from(combineUnpickDefinitions, copySpec ->

buildSrc/src/main/java/quilt/internal/tasks/unpick/CombineUnpickDefinitionsTask.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
@@ -15,9 +16,11 @@
 import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Reader;
 import daomephsta.unpick.constantmappers.datadriven.parser.v2.UnpickV2Writer;
 import javax.inject.Inject;
-import org.gradle.api.file.DirectoryProperty;
+
+import org.gradle.api.GradleException;
+import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.workers.WorkAction;
@@ -29,12 +32,18 @@
 import quilt.internal.tasks.DefaultMappingsTask;
 import quilt.internal.util.UnpickUtil;
 
+/**
+ * Combines many unpick definition files into one new file.
+ * <p>
+ * If {@link quilt.internal.MappingsPlugin} is applied, the
+ * {@linkplain quilt.internal.tasks.unpick.gen.UnpickGenTask#getGeneratedUnpickDefinitions() generated definitions}
+ * from all {@link quilt.internal.tasks.unpick.gen.UnpickGenTask UnpickGenTask}s will be amongst those combined.
+ */
 public abstract class CombineUnpickDefinitionsTask extends DefaultMappingsTask {
     public static final String TASK_NAME = "combineUnpickDefinitions";
 
-    // TODO convert this to a FileCollection
-    @InputDirectory
-    public abstract DirectoryProperty getInput();
+    @InputFiles
+    public abstract ConfigurableFileCollection getUnpickDefinitions();
 
     @OutputFile
     public abstract RegularFileProperty getOutput();
@@ -48,34 +57,30 @@ public CombineUnpickDefinitionsTask() {
 
     @TaskAction
     public void run() {
-        final WorkQueue workQueue = this.getWorkerExecutor().noIsolation();
-        workQueue.submit(CombineAction.class, parameters -> {
-            parameters.getInput().set(this.getInput());
+        this.getWorkerExecutor().noIsolation().submit(CombineAction.class, parameters -> {
+            parameters.getInput().from(this.getUnpickDefinitions());
             parameters.getOutput().set(this.getOutput());
         });
     }
 
     @VisibleForTesting
     public static void combineUnpickDefinitions(Collection<File> input, Path output) {
         try {
-            Files.deleteIfExists(output);
-
             final UnpickV2Writer writer = new UnpickV2Writer();
 
-            // TODO make this use a stream instead
-            // Sort inputs to get reproducible outputs (also for testing)
-            final List<File> files = new ArrayList<>(input);
-            files.sort(Comparator.comparing(File::getName));
+            input.stream()
+                .filter(file -> file.getName().endsWith(".unpick"))
+                // Sort inputs to get reproducible outputs (also for testing)
+                .sorted(Comparator.comparing(File::getName))
+                .forEach(file -> {
+                    try (UnpickV2Reader reader = new UnpickV2Reader(new FileInputStream(file))) {
+                        reader.accept(writer);
+                    } catch (IOException e) {
+                        throw new GradleException("Failed to read unpick definition", e);
+                    }
+                });
 
-            for (final File file : files) {
-                if (!file.getName().endsWith(".unpick")) {
-                    continue;
-                }
-
-                try (UnpickV2Reader reader = new UnpickV2Reader(new FileInputStream(file))) {
-                    reader.accept(writer);
-                }
-            }
+            Files.deleteIfExists(output);
 
             Files.writeString(output, UnpickUtil.getLfOutput(writer));
         } catch (IOException e) {
@@ -84,21 +89,23 @@ public static void combineUnpickDefinitions(Collection<File> input, Path output)
     }
 
     public interface CombineParameters extends WorkParameters {
-        @InputDirectory
-        DirectoryProperty getInput();
+        @InputFiles
+        ConfigurableFileCollection getInput();
 
         @OutputFile
         RegularFileProperty getOutput();
     }
 
     public abstract static class CombineAction implements WorkAction<CombineParameters> {
         @Inject
-        public CombineAction() {
-        }
+        public CombineAction() { }
 
         @Override
         public void execute() {
-            final Set<File> input = this.getParameters().getInput().getAsFileTree().getFiles();
+            final Set<File> input = this.getParameters().getInput()
+                // this is to flatten the contents of directories
+                .getAsFileTree()
+                .getFiles();
             final Path output = this.getParameters().getOutput().getAsFile().get().toPath();
             combineUnpickDefinitions(input, output);
         }

buildSrc/src/main/java/quilt/internal/tasks/unpick/gen/OpenGlConstantUnpickGeneratorTask.java → buildSrc/src/main/java/quilt/internal/tasks/unpick/gen/OpenGlConstantUnpickGenTask.java

@@ -21,11 +21,14 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import org.apache.commons.io.FileUtils;
+import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.OutputFile;
+import org.gradle.api.tasks.OutputFiles;
 import org.gradle.api.tasks.TaskAction;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -38,7 +41,7 @@
 import quilt.internal.Constants;
 import quilt.internal.tasks.DefaultMappingsTask;
 
-public abstract class OpenGlConstantUnpickGeneratorTask extends DefaultMappingsTask implements UnpickGenTask {
+public abstract class OpenGlConstantUnpickGenTask extends DefaultMappingsTask implements UnpickGenTask {
     public static final String TASK_NAME = "openGlUnpickGen";
     public static final String OPEN_GL_REGISTRY =
         "https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry/main/xml/gl.xml";
@@ -56,6 +59,7 @@ public abstract class OpenGlConstantUnpickGeneratorTask extends DefaultMappingsT
     @InputFile
     public abstract RegularFileProperty getPerVersionMappingsJar();
 
+    // TODO rework this
     @Input
     public abstract MapProperty<String, File> getArtifactsByUrl();
 
@@ -65,13 +69,28 @@ public abstract class OpenGlConstantUnpickGeneratorTask extends DefaultMappingsT
     @OutputFile
     public abstract RegularFileProperty getUnpickGlDefinitions();
 
-    public OpenGlConstantUnpickGeneratorTask() {
+    @Override
+    public FileCollection getGeneratedUnpickDefinitions() {
+        return this.getGeneratedUnpickDefinitionsImpl();
+    }
+
+    @OutputFiles
+    protected abstract ConfigurableFileCollection getGeneratedUnpickDefinitionsImpl();
+
+    public OpenGlConstantUnpickGenTask() {
         super(Constants.Groups.UNPICK_GEN);
 
+        // TODO is this necessary?
+        //  If things changed, wouldn't we actually *want* to overwrite them?
         this.onlyIf(unused ->
             !this.getUnpickGlDefinitions().get().getAsFile().exists()
                 || !this.getUnpickGlStateManagerDefinitions().get().getAsFile().exists()
         );
+
+        this.getGeneratedUnpickDefinitionsImpl().from(
+            this.getUnpickGlStateManagerDefinitions(),
+            this.getUnpickGlDefinitions()
+        );
     }
 
     @TaskAction

buildSrc/src/main/java/quilt/internal/tasks/unpick/gen/UnpickGenTask.java

@@ -1,7 +1,13 @@
 package quilt.internal.tasks.unpick.gen;
 
 import org.gradle.api.Task;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.tasks.OutputFiles;
 
 public interface UnpickGenTask extends Task {
-    // TODO add a way to retrieve output unpick files
+    // TODO would it be better to just assume UnpickGenTasks *only* output unpick definitions?
+    //  Then in MappingsPlugin we could just do:
+    //  combineUnpickDefinitions.getUnpickDefinitions().builtBy(project.getTasks().withType(UnpickGenTask.class));
+    @OutputFiles
+    FileCollection getGeneratedUnpickDefinitions();
 }