replace Default/TaskedMappingsProjectPlugin/DefaultTaskedMappingsProj…

…ectPlugin with DefaultExtensionedMappingsProjectPlugin + Default/TaskedExtension

access Tasks objects and MapIntermediaryPlugin's intermediaryFile via extension instances obtained via plugin instances instead of directly via plugin instances

build.gradle

@@ -1,7 +1,6 @@
 import org.gradle.api.internal.file.FileOperations
 import quilt.internal.constants.Classifiers
 import quilt.internal.constants.Constants
-import quilt.internal.plugin.MapIntermediaryPlugin
 
 import static org.gradle.api.plugins.JavaPlugin.JAVADOC_TASK_NAME
 
@@ -11,8 +10,6 @@ plugins {
 	alias libs.plugins.licenser
 }
 
-final INTERMEDIARY_PROVIDER = plugins.apply(MapIntermediaryPlugin).provideIntermediary()
-
 final USE_SNAPSHOT_HASHES = false
 
 final ENV = System.getenv()
@@ -272,11 +269,11 @@ publishing {
 }
 
 tasks.withType(AbstractPublishToMaven).configureEach {
-	// Won't run if INTERMEDIARY_PROVIDER is absent
+	// Won't run if mapIntermediary.intermediaryFile is absent
 	dependsOn buildIntermediary
 
 	doFirst {
-		if (INTERMEDIARY_PROVIDER.isPresent()) {
+		if (mapIntermediary.intermediaryFile.isPresent()) {
 			final addArtifact = { Task task, String artifactClassifier ->
 				if (publication.artifacts.findAll { it.classifier == artifactClassifier }.isEmpty()) {
 					publication.artifact(task) {

buildSrc/src/main/java/quilt/internal/extension/MapIntermediaryExtension.java

@@ -0,0 +1,18 @@
+package quilt.internal.extension;
+
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.provider.Provider;
+
+public abstract class MapIntermediaryExtension {
+    public static final String NAME = "mapIntermediary";
+
+    private final Provider<RegularFile> intermediaryFile;
+
+    public Provider<RegularFile> getIntermediaryFile() {
+        return this.intermediaryFile;
+    }
+
+    public MapIntermediaryExtension(Provider<RegularFile> intermediaryFile) {
+        this.intermediaryFile = intermediaryFile;
+    }
+}

buildSrc/src/main/java/quilt/internal/extension/MapMinecraftJarsExtension.java

@@ -0,0 +1,12 @@
+package quilt.internal.extension;
+
+import quilt.internal.extension.abstraction.DefaultTaskedExtension;
+import quilt.internal.plugin.MapMinecraftJarsPlugin;
+
+public abstract class MapMinecraftJarsExtension extends DefaultTaskedExtension<MapMinecraftJarsPlugin.Tasks> {
+    public static final String NAME = "mapMinecraftJars";
+
+    public MapMinecraftJarsExtension(MapMinecraftJarsPlugin.Tasks tasks) {
+        super(tasks);
+    }
+}

buildSrc/src/main/java/quilt/internal/extension/MapV2Extension.java

@@ -0,0 +1,12 @@
+package quilt.internal.extension;
+
+import quilt.internal.extension.abstraction.DefaultTaskedExtension;
+import quilt.internal.plugin.MapV2Plugin;
+
+public abstract class MapV2Extension extends DefaultTaskedExtension<MapV2Plugin.Tasks> {
+    public static final String NAME = "mapV2";
+
+    public MapV2Extension(MapV2Plugin.Tasks tasks) {
+        super(tasks);
+    }
+}

buildSrc/src/main/java/quilt/internal/extension/MinecraftJarsExtension.java

@@ -0,0 +1,12 @@
+package quilt.internal.extension;
+
+import quilt.internal.extension.abstraction.DefaultTaskedExtension;
+import quilt.internal.plugin.MinecraftJarsPlugin;
+
+public abstract class MinecraftJarsExtension extends DefaultTaskedExtension<MinecraftJarsPlugin.Tasks> {
+    public static final String NAME = "minecraftJars";
+
+    public MinecraftJarsExtension(MinecraftJarsPlugin.Tasks tasks) {
+        super(tasks);
+    }
+}

buildSrc/src/main/java/quilt/internal/extension/ProcessMappingsExtension.java

@@ -0,0 +1,12 @@
+package quilt.internal.extension;
+
+import quilt.internal.extension.abstraction.DefaultTaskedExtension;
+import quilt.internal.plugin.ProcessMappingsPlugin;
+
+public abstract class ProcessMappingsExtension extends DefaultTaskedExtension<ProcessMappingsPlugin.Tasks> {
+    public static final String NAME = "processMappings";
+
+    public ProcessMappingsExtension(ProcessMappingsPlugin.Tasks tasks) {
+        super(tasks);
+    }
+}

buildSrc/src/main/java/quilt/internal/QuiltMappingsExtension.java → buildSrc/src/main/java/quilt/internal/extension/QuiltMappingsExtension.java

@@ -1,4 +1,4 @@
-package quilt.internal;
+package quilt.internal.extension;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -23,7 +23,7 @@ public abstract class QuiltMappingsExtension {
     /**
      * {@linkplain ExtensionContainer#create Created} by {@link QuiltMappingsBasePlugin}.
      */
-    public static final String EXTENSION_NAME = "quiltMappings";
+    public static final String NAME = "quiltMappings";
 
     private static final String DEFAULT_CATALOG_NAME = "libs";
 

buildSrc/src/main/java/quilt/internal/extension/abstraction/DefaultTaskedExtension.java

@@ -0,0 +1,24 @@
+package quilt.internal.extension.abstraction;
+
+import org.gradle.api.plugins.ExtensionContainer;
+
+/**
+ * Aids in a common pattern for implementing {@link TaskedExtension}.
+ * <p>
+ * Plugins that create {@code DefaultTaskedExtension}s must pass their {@code tasks} instance as a
+ * {@link ExtensionContainer#create(String, Class, Object...) construction argument} when creating their extension.
+ *
+ * @param <T> a type that provides access to some of the tasks registered by the plugin that creates this extension
+ */
+public abstract class DefaultTaskedExtension<T> implements TaskedExtension<T> {
+    private final T tasks;
+
+    @Override
+    public final T getTasks() {
+        return this.tasks;
+    }
+
+    public DefaultTaskedExtension(T tasks) {
+        this.tasks = tasks;
+    }
+}

buildSrc/src/main/java/quilt/internal/extension/abstraction/TaskedExtension.java

@@ -0,0 +1,22 @@
+package quilt.internal.extension.abstraction;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Task;
+import org.gradle.api.plugins.ExtensionContainer;
+import org.gradle.api.tasks.TaskContainer;
+import quilt.internal.plugin.abstraction.ExtensionedMappingsProjectPlugin;
+
+/**
+ * An extension that provides access to some of the {@link Task}s {@linkplain TaskContainer#register registered}
+ * by the {@link Plugin plugin} that {@linkplain ExtensionContainer#create creates} it.
+ * <p>
+ * Prefer retrieving {@link Task}s via {@link #getTasks()} to {@link TaskContainer#named} methods.
+ *
+ * @param <T> a type that provides access to some of the tasks registered by the plugin that creates this extension
+ *
+ * @see DefaultTaskedExtension
+ * @see ExtensionedMappingsProjectPlugin
+ */
+public interface TaskedExtension<T> {
+    T getTasks();
+}

buildSrc/src/main/java/quilt/internal/plugin/EnigmaMappingsPlugin.java

@@ -91,15 +91,15 @@ public void apply(@NotNull Project project) {
 
         // configures EnigmaProfileConsumingTasks + MappingsDirConsumingTasks
         //  (mappings, mappingsUnpicked, mappingsServer, mappingsUnpickedServer)
-        plugins.apply(QuiltMappingsBasePlugin.class).getExt();
+        plugins.apply(QuiltMappingsBasePlugin.class);
 
         final MapMinecraftJarsPlugin.Tasks mapMinecraftJarsTasks =
-            plugins.apply(MapMinecraftJarsPlugin.class).getTasks();
+            plugins.apply(MapMinecraftJarsPlugin.class).getExt().getTasks();
         final TaskProvider<MapPerVersionMappingsJarTask> mapPerVersionMappingsJar =
             mapMinecraftJarsTasks.mapPerVersionMappingsJar();
 
         final MapV2Plugin.Tasks mappingsV2Tasks =
-            plugins.apply(MapV2Plugin.class).getTasks();
+            plugins.apply(MapV2Plugin.class).getExt().getTasks();
         final TaskProvider<UnpickJarTask> unpickHashedJar =
             mappingsV2Tasks.unpickHashedJar();
 

buildSrc/src/main/java/quilt/internal/plugin/MapIntermediaryPlugin.java

@@ -12,12 +12,12 @@
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import quilt.internal.constants.Classifiers;
 import quilt.internal.constants.Extensions;
-import quilt.internal.QuiltMappingsExtension;
+import quilt.internal.extension.MapIntermediaryExtension;
+import quilt.internal.extension.QuiltMappingsExtension;
 import quilt.internal.constants.Namespaces;
-import quilt.internal.plugin.abstraction.MappingsProjectPlugin;
+import quilt.internal.plugin.abstraction.DefaultExtensionedMappingsProjectPlugin;
 import quilt.internal.task.build.BuildIntermediaryTask;
 import quilt.internal.task.build.IntermediaryMappingsV2JarTask;
 import quilt.internal.task.build.MergeIntermediaryTask;
@@ -27,8 +27,6 @@
 import quilt.internal.task.setup.ExtractTinyMappingsTask;
 import quilt.internal.task.setup.IntermediaryDependantTask;
 
-import java.util.Objects;
-
 /**
  * {@linkplain TaskContainer#register Registers} tasks related to {@value Namespaces#INTERMEDIARY} mappings.
  * <p>
@@ -49,24 +47,11 @@
  *          successfully {@linkplain Configuration#resolve() resolves}
  * </ul>
  */
-public abstract class MapIntermediaryPlugin implements MappingsProjectPlugin {
+public abstract class MapIntermediaryPlugin extends DefaultExtensionedMappingsProjectPlugin<MapIntermediaryExtension> {
     public static final String INTERMEDIARY_MAPPINGS_CONFIGURATION_NAME = Namespaces.INTERMEDIARY;
 
-    @Nullable
-    private Provider<RegularFile> intermediaryProvider;
-
-    /**
-     * @throws NullPointerException if this plugin hasn't finished {@linkplain #apply(Project) applying}
-     */
-    public Provider<RegularFile> provideIntermediary() {
-        return Objects.requireNonNull(
-            this.intermediaryProvider,
-            Namespaces.INTERMEDIARY + " not yet populated"
-        );
-    }
-
     @Override
-    public void apply(@NotNull Project project) {
+    protected MapIntermediaryExtension applyImpl(@NotNull Project project) {
         final ConfigurationContainer configurations = project.getConfigurations();
         final Configuration intermediaryMappings = configurations.create(INTERMEDIARY_MAPPINGS_CONFIGURATION_NAME);
 
@@ -76,7 +61,7 @@ public void apply(@NotNull Project project) {
         final QuiltMappingsExtension ext = plugins.apply(QuiltMappingsBasePlugin.class).getExt();
 
         final MapV2Plugin.Tasks mappingsV2Tasks =
-            plugins.apply(MapV2Plugin.class).getTasks();
+            plugins.apply(MapV2Plugin.class).getExt().getTasks();
         final TaskProvider<MergeTinyV2Task> mergeTinyV2 =
             mappingsV2Tasks.mergeTinyV2();
 
@@ -93,19 +78,20 @@ public void apply(@NotNull Project project) {
             }
         );
 
+        final Provider<RegularFile> intermediaryFile;
         {
             final Property<RegularFile> intermediaryProperty = this.getObjects().fileProperty();
             intermediaryProperty.set(this.provideOptionalFile(intermediaryMappings));
 
-            this.intermediaryProvider = intermediaryProperty;
+            intermediaryFile = intermediaryProperty;
         }
 
         tasks.withType(IntermediaryDependantTask.class).configureEach(task -> {
-            task.onlyIf(unused -> this.intermediaryProvider.isPresent());
+            task.onlyIf(unused -> intermediaryFile.isPresent());
         });
 
         extractTinyIntermediaryMappings.configure(task -> {
-            task.getZippedFile().convention(this.intermediaryProvider);
+            task.getZippedFile().convention(intermediaryFile);
         });
 
         final var mergeIntermediary = tasks.register(
@@ -165,5 +151,9 @@ public void apply(@NotNull Project project) {
                 task.dependsOn(intermediaryV2MappingsJar, intermediaryV2MergedMappingsJar);
             }
         );
+
+        return project.getExtensions().create(
+            MapIntermediaryExtension.NAME, MapIntermediaryExtension.class, intermediaryFile
+        );
     }
 }

buildSrc/src/main/java/quilt/internal/plugin/MapMinecraftJarsPlugin.java

@@ -14,9 +14,10 @@
 import quilt.internal.constants.Constants;
 import quilt.internal.constants.Classifiers;
 import quilt.internal.constants.Extensions;
-import quilt.internal.QuiltMappingsExtension;
+import quilt.internal.extension.MapMinecraftJarsExtension;
+import quilt.internal.extension.QuiltMappingsExtension;
 import quilt.internal.constants.Namespaces;
-import quilt.internal.plugin.abstraction.DefaultTaskedMappingsProjectPlugin;
+import quilt.internal.plugin.abstraction.DefaultExtensionedMappingsProjectPlugin;
 import quilt.internal.task.build.AddProposedMappingsTask;
 import quilt.internal.task.build.BuildMappingsTinyTask;
 import quilt.internal.task.build.CompressTinyTask;
@@ -68,11 +69,12 @@
  *     <li> {@value Namespaces#INTERMEDIARY} mappings are created by {@link MapIntermediaryPlugin} tasks
  * </ul>
  */
-public abstract class MapMinecraftJarsPlugin extends DefaultTaskedMappingsProjectPlugin<MapMinecraftJarsPlugin.Tasks> {
+public abstract class MapMinecraftJarsPlugin extends
+        DefaultExtensionedMappingsProjectPlugin<MapMinecraftJarsExtension> {
     public static final String INTERMEDIATE_MAPPINGS_CONFIGURATION_NAME = Namespaces.INTERMEDIATE;
 
     @Override
-    protected Tasks applyImpl(@NotNull Project project) {
+    protected MapMinecraftJarsExtension applyImpl(@NotNull Project project) {
         final Configuration perVersionMappings =
             project.getConfigurations().create(INTERMEDIATE_MAPPINGS_CONFIGURATION_NAME);
 
@@ -86,7 +88,7 @@ protected Tasks applyImpl(@NotNull Project project) {
         final QuiltMappingsExtension ext = plugins.apply(QuiltMappingsBasePlugin.class).getExt();
 
         final MinecraftJarsPlugin.Tasks minecraftJarsTasks =
-            plugins.apply(MinecraftJarsPlugin.class).getTasks();
+            plugins.apply(MinecraftJarsPlugin.class).getExt().getTasks();
         final TaskProvider<DownloadMinecraftLibrariesTask> downloadMinecraftLibraries =
             minecraftJarsTasks.downloadMinecraftLibraries();
         final TaskProvider<MergeJarsTask> mergeJars =
@@ -239,7 +241,9 @@ protected Tasks applyImpl(@NotNull Project project) {
             GeneratePackageInfoMappingsTask.GENERATE_PACKAGE_INFO_MAPPINGS_TASK_NAME,
             GeneratePackageInfoMappingsTask.class,
             task -> {
-                task.getInputJar().convention(mapPerVersionMappingsJar.flatMap(MapPerVersionMappingsJarTask::getOutputJar));
+                task.getInputJar().convention(
+                    mapPerVersionMappingsJar.flatMap(MapPerVersionMappingsJarTask::getOutputJar)
+                );
             }
         );
 
@@ -282,7 +286,10 @@ protected Tasks applyImpl(@NotNull Project project) {
             tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(task -> task.dependsOn(mappingLint));
         });
 
-        return new Tasks(mapPerVersionMappingsJar, invertPerVersionMappings, insertAutoGeneratedMappings);
+        return project.getExtensions().create(
+            MapMinecraftJarsExtension.NAME, MapMinecraftJarsExtension.class,
+            new Tasks(mapPerVersionMappingsJar, invertPerVersionMappings, insertAutoGeneratedMappings)
+        );
     }
 
     public record Tasks(