Remove runtime data in an effort to reduce task inputs

common/src/main/java/net/neoforged/gradle/common/runtime/extensions/CommonRuntimeExtension.java

@@ -15,7 +15,6 @@
 import net.neoforged.gradle.dsl.common.tasks.WithOutput;
 import net.neoforged.gradle.dsl.common.util.CacheableMinecraftVersion;
 import net.neoforged.gradle.dsl.common.util.CommonRuntimeUtils;
-import net.neoforged.gradle.dsl.common.util.DistributionType;
 import net.neoforged.gradle.dsl.common.util.GameArtifact;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
@@ -28,7 +27,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -44,9 +43,8 @@ protected CommonRuntimeExtension(Project project) {
         this.project.getExtensions().getByType(RuntimesExtension.class).add(this);
     }
 
-    public static void configureCommonRuntimeTaskParameters(Runtime runtimeTask, Map<String, File> dataFiles, Map<String, File> dataDirectories, String step, Specification spec, File runtimeDirectory) {
-        runtimeTask.getData().putAllFiles(dataFiles);
-        runtimeTask.getData().putAllDirectories(dataDirectories);
+    public static void configureCommonRuntimeTaskParameters(Runtime runtimeTask, Map<String, String> symbolicDataSources, String step, Specification spec, File runtimeDirectory) {
+        runtimeTask.getSymbolicDataSources().set(symbolicDataSources);
         runtimeTask.getStepName().set(step);
         runtimeTask.getDistribution().set(spec.getDistribution());
         runtimeTask.getMinecraftVersion().set(CacheableMinecraftVersion.from(spec.getMinecraftVersion(), spec.getProject()));
@@ -59,25 +57,18 @@ public static void configureCommonRuntimeTaskParameters(Runtime runtimeTask, Map
         }
     }
 
-    public static void configureCommonRuntimeTaskParameters(Runtime mcpRuntimeTask, Map<String, File> dataFiles, Map<String, File> dataDirectories, String step, DistributionType distributionType, String minecraftVersion, Project project, File runtimeDirectory) {
-        mcpRuntimeTask.getData().putAllFiles(dataFiles);
-        mcpRuntimeTask.getData().putAllDirectories(dataDirectories);
-        mcpRuntimeTask.getStepName().set(step);
-        mcpRuntimeTask.getDistribution().set(distributionType);
-        mcpRuntimeTask.getMinecraftVersion().set(CacheableMinecraftVersion.from(minecraftVersion, project));
-        mcpRuntimeTask.getRuntimeDirectory().set(runtimeDirectory);
-        mcpRuntimeTask.getRuntimeName().set("unknown");
-        mcpRuntimeTask.getJavaVersion().convention(project.getExtensions().getByType(JavaPluginExtension.class).getToolchain().getLanguageVersion());
-    }
-
     public static void configureCommonRuntimeTaskParameters(Runtime runtime, CommonRuntimeDefinition<?> runtimeDefinition, File workingDirectory) {
         configureCommonRuntimeTaskParameters(runtime, runtimeDefinition.getSpecification(), workingDirectory);
     }
-
+
+    public static void configureCommonRuntimeTaskParameters(Runtime runtime, String stepName, CommonRuntimeSpecification specification, File workingDirectory) {
+        configureCommonRuntimeTaskParameters(runtime, Collections.emptyMap(), stepName, specification, workingDirectory);
+    }
+
     private static void configureCommonRuntimeTaskParameters(Runtime runtime, CommonRuntimeSpecification specification, File workingDirectory) {
-        configureCommonRuntimeTaskParameters(runtime, new HashMap<>(), new HashMap<>(), runtime.getName(), specification, workingDirectory);
+        configureCommonRuntimeTaskParameters(runtime, runtime.getName(), specification, workingDirectory);
     }
-    
+
     public static Map<GameArtifact, TaskProvider<? extends WithOutput>> buildDefaultArtifactProviderTasks(final Specification spec) {
         final MinecraftArtifactCache artifactCache = spec.getProject().getExtensions().getByType(MinecraftArtifactCache.class);
         return artifactCache.cacheGameVersionTasks(spec.getProject(), spec.getMinecraftVersion(), spec.getDistribution());
@@ -191,20 +182,28 @@ public Set<D> findIn(final Configuration configuration) {
                 .collect(Collectors.toSet());
     }
 
-    protected final TaskProvider<DownloadAssets> createDownloadAssetsTasks(final CommonRuntimeSpecification specification, final Map<String, File> dataFiles, final Map<String, File> dataDirectories, final File runtimeDirectory, final VersionJson versionJson) {
+    protected final TaskProvider<DownloadAssets> createDownloadAssetsTasks(final CommonRuntimeSpecification specification, final Map<String, String> symbolicDataSources, final File runtimeDirectory, final VersionJson versionJson) {
         return specification.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(specification, "downloadAssets"), DownloadAssets.class, task -> {
             task.getVersionJson().set(versionJson);
 
-            configureCommonRuntimeTaskParameters(task, dataFiles, dataDirectories, "downloadAssets", specification, runtimeDirectory);
+            configureCommonRuntimeTaskParameters(task, symbolicDataSources, "downloadAssets", specification, runtimeDirectory);
         });
     }
 
-    protected final TaskProvider<ExtractNatives> createExtractNativesTasks(final CommonRuntimeSpecification specification, final Map<String, File> dataFiles, final Map<String, File> dataDirectories, final File runtimeDirectory, final VersionJson versionJson) {
+    protected final TaskProvider<DownloadAssets> createDownloadAssetsTasks(final CommonRuntimeSpecification specification, final File runtimeDirectory, final VersionJson versionJson) {
+        return createDownloadAssetsTasks(specification, Collections.emptyMap(), runtimeDirectory, versionJson);
+    }
+
+    protected final TaskProvider<ExtractNatives> createExtractNativesTasks(final CommonRuntimeSpecification specification, final Map<String, String> symbolicDataSources, final File runtimeDirectory, final VersionJson versionJson) {
         return specification.getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(specification, "extractNatives"), ExtractNatives.class, task -> {
             task.getVersionJson().set(versionJson);
 
-            configureCommonRuntimeTaskParameters(task, dataFiles, dataDirectories, "extractNatives", specification, runtimeDirectory);
+            configureCommonRuntimeTaskParameters(task, symbolicDataSources, "extractNatives", specification, runtimeDirectory);
             task.getOutputDirectory().set(task.getStepsDirectory().map(dir -> dir.dir("extractNatives")));
         });
     }
+
+    protected final TaskProvider<ExtractNatives> createExtractNativesTasks(final CommonRuntimeSpecification specification, final File runtimeDirectory, final VersionJson versionJson) {
+        return createExtractNativesTasks(specification, Collections.emptyMap(), runtimeDirectory, versionJson);
+    }
 }

common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DefaultRuntime.java

@@ -1,7 +1,6 @@
 package net.neoforged.gradle.common.runtime.tasks;
 
 import net.neoforged.gradle.common.tasks.JavaRuntimeTask;
-import net.neoforged.gradle.dsl.common.runtime.tasks.RuntimeData;
 import net.neoforged.gradle.dsl.common.runtime.tasks.Runtime;
 import net.neoforged.gradle.dsl.common.runtime.tasks.RuntimeArguments;
 import net.neoforged.gradle.dsl.common.runtime.tasks.RuntimeMultiArguments;
@@ -15,18 +14,17 @@
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @CacheableTask
 public abstract class DefaultRuntime extends JavaRuntimeTask implements Runtime {
 
-    private final RuntimeData data;
     private final RuntimeArguments arguments;
     private final RuntimeMultiArguments multiArguments;
 
     public DefaultRuntime() {
         super();
 
-        data = getObjectFactory().newInstance(RuntimeDataImpl.class, getProviderFactory());
         arguments = getObjectFactory().newInstance(RuntimeArgumentsImpl.class, getProviderFactory());
         multiArguments = getObjectFactory().newInstance(RuntimeMultiArgumentsImpl.class, getProviderFactory());
 
@@ -49,21 +47,17 @@ public DefaultRuntime() {
             buildRuntimeArguments(result);
             return result;
         }));
-        getRuntimeData().convention(getData().asMap().map(data -> {
+        getRuntimeData().convention(getSymbolicDataSources().map(dataSources -> {
             final Directory unpackedMcpDirectory = getUnpackedMcpZipDirectory().get();
-            final Map<String, Provider<File>> result = new HashMap<>();
-            data.forEach((key, value) -> result.put(key, unpackedMcpDirectory.file(value.map(File::getAbsolutePath)).map(RegularFile::getAsFile)));
-            return result;
+            return dataSources.entrySet().stream().collect(Collectors.toMap(
+                    Map.Entry::getKey,
+                    entry -> getProject().provider(() -> unpackedMcpDirectory.file(entry.getValue()).getAsFile())
+            ));
         }));
 
         getOutputDirectory().finalizeValueOnRead();
     }
-
-    @Override
-    public RuntimeData getData() {
-        return data;
-    }
-
+
     @Override
     public RuntimeArguments getArguments() {
         return arguments;

dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/Runtime.groovy

@@ -8,6 +8,7 @@ import net.neoforged.gradle.dsl.common.tasks.WithWorkspace
 import net.neoforged.gradle.dsl.common.util.CacheableMinecraftVersion
 import net.neoforged.gradle.dsl.common.util.DistributionType
 import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
@@ -77,13 +78,11 @@ trait Runtime implements WithOutput, WithWorkspace, WithJavaVersion {
     abstract Property<CacheableMinecraftVersion> getMinecraftVersion();
 
     /**
-     * The custom pipeline file pointer data.
-     *
-     * @return The custom pipeline file pointer data.
+     * Symbolic data source references defined by the NeoForm package, already adjusted for the
+     * current {@link #getDistribution()}.
      */
-    @Nested
-    @DSLProperty
-    abstract RuntimeData getData();
+    @Internal
+    abstract MapProperty<String, String> getSymbolicDataSources();
 
     /**
      * The arguments for this step.