Review comments

Author: shartte

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/Obfuscation.java renamed to src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/Obfuscation.java

@@ -1,5 +1,8 @@
-package net.neoforged.moddevgradle.legacyforge.internal;
+package net.neoforged.moddevgradle.legacyforge.dsl;
 
+import net.neoforged.moddevgradle.legacyforge.internal.LegacyForgeModDevPlugin;
+import net.neoforged.moddevgradle.legacyforge.tasks.RemapJar;
+import net.neoforged.moddevgradle.legacyforge.tasks.RemapOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
@@ -14,37 +17,56 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.bundling.AbstractArchiveTask;
+import org.jetbrains.annotations.ApiStatus;
 
 import javax.inject.Inject;
 import java.util.List;
 
-abstract class Obfuscation {
+public abstract class Obfuscation {
     private final Project project;
-    final Provider<RegularFile> officialToSrg, mappingsCsv;
-    final Configuration autoRenamingToolRuntime;
-    final Configuration installerToolsRuntime;
+    private final Provider<RegularFile> officialToSrg;
+    private final Provider<RegularFile> mappingsCsv;
+    private final Configuration autoRenamingToolRuntime;
+    private final Configuration installerToolsRuntime;
 
     @Inject
-    public Obfuscation(Project project, Provider<RegularFile> officialToSrg, Provider<RegularFile> mappingsCsv, Configuration autoRenamingToolRuntime, Configuration installerToolsRuntime) {
+    public Obfuscation(Project project,
+                       Provider<RegularFile> officialToSrg,
+                       Provider<RegularFile> mappingsCsv,
+                       Configuration autoRenamingToolRuntime,
+                       Configuration installerToolsRuntime) {
         this.project = project;
         this.officialToSrg = officialToSrg;
         this.mappingsCsv = mappingsCsv;
         this.autoRenamingToolRuntime = autoRenamingToolRuntime;
         this.installerToolsRuntime = installerToolsRuntime;
     }
 
+    @ApiStatus.Internal
+    public void configureAutoRenamingToolOperation(RemapOperation operation) {
+        operation.getToolType().set(RemapOperation.ToolType.ART);
+        operation.getToolClasspath().from(autoRenamingToolRuntime);
+        operation.getMappings().from(officialToSrg);
+    }
+
+    @ApiStatus.Internal
+    public void configureInstallerToolsOperation(RemapOperation operation) {
+        operation.getToolType().set(RemapOperation.ToolType.INSTALLER_TOOLS);
+        operation.getToolClasspath().from(installerToolsRuntime);
+        operation.getMappings().from(mappingsCsv);
+    }
+
     /**
-     * Create a configure a reobfuscation task.
+     * Create and configure a reobfuscation task.
      *
      * @param jar           the jar task to reobfuscate
      * @param sourceSet     the source set whose classpath to use when remapping inherited methods
      * @param configuration an action used to configure the rebfuscation task
      * @return a provider of the created task
      */
     public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchiveTask> jar,
-                                                  SourceSet sourceSet,
-                                                  Action<RemapJar> configuration) {
-
+                                              SourceSet sourceSet,
+                                              Action<RemapJar> configuration) {
 
         var reobf = project.getTasks().register("reobf" + StringUtils.capitalize(jar.getName()), RemapJar.class, task -> {
             task.getInput().set(jar.flatMap(AbstractArchiveTask::getArchiveFile));
@@ -54,7 +76,7 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
             task.getArchiveClassifier().convention(jar.flatMap(AbstractArchiveTask::getArchiveClassifier));
             task.getArchiveAppendix().convention(jar.flatMap(AbstractArchiveTask::getArchiveAppendix));
             task.getLibraries().from(sourceSet.getCompileClasspath());
-            task.getParameters().from(this, RemapParameters.ToolType.ART);
+            configureAutoRenamingToolOperation(task.getRemapOperation());
             configuration.execute(task);
         });
 
@@ -78,6 +100,7 @@ public TaskProvider<RemapJar> reobfuscate(TaskProvider<? extends AbstractArchive
 
     /**
      * Creates a configuration that will remap its dependencies, and adds it as a children of the provided {@code parent}.
+     * The created configuration uses the name of its parent capitalized and prefixed by "mod".
      */
     public Configuration createRemappingConfiguration(Configuration parent) {
         var remappingConfig = project.getConfigurations().create("mod" + StringUtils.capitalize(parent.getName()), spec -> {

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java

@@ -4,6 +4,7 @@
 import net.neoforged.moddevgradle.internal.LegacyForgeFacade;
 import net.neoforged.moddevgradle.internal.ModDevPlugin;
 import net.neoforged.moddevgradle.legacyforge.dsl.MixinExtension;
+import net.neoforged.moddevgradle.legacyforge.dsl.Obfuscation;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
@@ -13,14 +14,19 @@
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.jvm.tasks.Jar;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.net.URI;
 import java.util.Map;
 import java.util.stream.Stream;
 
+@ApiStatus.Internal
 public class LegacyForgeModDevPlugin implements Plugin<Project> {
     public static final Attribute<Boolean> REMAPPED = Attribute.of("net.neoforged.moddevgradle.legacy.remapped", Boolean.class);
 
+    public static final String CONFIGURATION_TOOL_ART = "autoRenamingToolRuntime";
+    public static final String CONFIGURATION_TOOL_INSTALLERTOOLS = "installerToolsRuntime";
+
     @Override
     public void apply(Project project) {
         project.getPlugins().apply(ModDevPlugin.class);
@@ -36,14 +42,14 @@ public void apply(Project project) {
         project.getDependencies().getComponents().withModule("de.oceanlabs.mcp:mcp_config", McpMetadataTransform.class);
 
         var depFactory = project.getDependencyFactory();
-        var autoRenamingToolRuntime = project.getConfigurations().create("autoRenamingToolRuntime", spec -> {
+        var autoRenamingToolRuntime = project.getConfigurations().create(CONFIGURATION_TOOL_ART, spec -> {
             spec.setDescription("The AutoRenamingTool CLI tool");
             spec.setCanBeConsumed(false);
             spec.setCanBeResolved(true);
             spec.setTransitive(false);
             spec.getDependencies().add(depFactory.create("net.neoforged:AutoRenamingTool:2.0.4:all"));
         });
-        var installerToolsRuntime = project.getConfigurations().create("installerToolsRuntime", spec -> {
+        var installerToolsRuntime = project.getConfigurations().create(CONFIGURATION_TOOL_INSTALLERTOOLS, spec -> {
             spec.setDescription("The InstallerTools CLI tool");
             spec.setCanBeConsumed(false);
             spec.setCanBeResolved(true);
@@ -85,7 +91,7 @@ public void apply(Project project) {
                 project.getTasks().named(JavaPlugin.JAR_TASK_NAME, Jar.class),
                 project.getExtensions().getByType(SourceSetContainer.class).getByName(SourceSet.MAIN_SOURCE_SET_NAME),
                 task -> {
-                    task.getParameters().getMappings().from(extraMixinMappings);
+                    task.getRemapOperation().getMappings().from(extraMixinMappings);
                 }
         );
 
@@ -115,11 +121,7 @@ public void apply(Project project) {
 
         project.getDependencies().registerTransform(RemappingTransform.class, params -> {
             params.parameters(parameters -> {
-                parameters.getParameters().set(project.provider(() -> {
-                    var p = project.getObjects().newInstance(RemapParameters.class);
-                    p.from(obf, RemapParameters.ToolType.INSTALLER_TOOLS);
-                    return p;
-                }));
+                obf.configureInstallerToolsOperation(parameters.getRemapOperation());
                 parameters.getMinecraftDependencies().from(remapDeps);
             });
             params.getFrom()

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/McpMetadataTransform.java

@@ -7,7 +7,6 @@
 import org.gradle.api.artifacts.ComponentMetadataContext;
 import org.gradle.api.artifacts.DirectDependenciesMetadata;
 import org.gradle.api.artifacts.repositories.RepositoryResourceAccessor;
-import org.gradle.api.artifacts.transform.CacheableTransform;
 import org.gradle.api.attributes.Usage;
 import org.gradle.api.attributes.java.TargetJvmVersion;
 import org.gradle.api.model.ObjectFactory;

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/RemappingTransform.java

@@ -1,5 +1,6 @@
 package net.neoforged.moddevgradle.legacyforge.internal;
 
+import net.neoforged.moddevgradle.legacyforge.tasks.RemapOperation;
 import org.gradle.api.artifacts.transform.CacheableTransform;
 import org.gradle.api.artifacts.transform.InputArtifact;
 import org.gradle.api.artifacts.transform.InputArtifactDependencies;
@@ -9,7 +10,6 @@
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.file.FileSystemLocation;
-import org.gradle.api.provider.Property;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.CompileClasspath;
 import org.gradle.api.tasks.InputFiles;
@@ -46,7 +46,7 @@ public void transform(TransformOutputs outputs) {
 
         var mappedFile = outputs.file(inputFile.getName());
         try {
-            getParameters().getParameters().get()
+            getParameters().getRemapOperation()
                     .execute(
                             getExecOperations(),
                             inputFile,
@@ -60,7 +60,7 @@ public void transform(TransformOutputs outputs) {
 
     public interface Parameters extends TransformParameters {
         @Nested
-        Property<RemapParameters> getParameters();
+        RemapOperation getRemapOperation();
 
         @InputFiles
         @PathSensitive(PathSensitivity.NONE)

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/RemapJar.java renamed to src/legacy/java/net/neoforged/moddevgradle/legacyforge/tasks/RemapJar.java

@@ -1,4 +1,4 @@
-package net.neoforged.moddevgradle.legacyforge.internal;
+package net.neoforged.moddevgradle.legacyforge.tasks;
 
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
@@ -16,14 +16,10 @@
 /**
  * Task used to remap a jar using AutoRenamingTool.
  */
-abstract class RemapJar extends Jar {
+public abstract class RemapJar extends Jar {
 
     @Nested
-    protected abstract RemapParameters getParameters();
-
-    @Inject
-    public RemapJar() {
-    }
+    public abstract RemapOperation getRemapOperation();
 
     /**
      * The libraries to use for inheritance data during the renaming process.
@@ -38,9 +34,12 @@ public RemapJar() {
     @Inject
     protected abstract ExecOperations getExecOperations();
 
+    @Inject
+    public RemapJar() {
+    }
+
     @TaskAction
     public void remap() throws IOException {
-
-        getParameters().execute(getExecOperations(), getInput().getAsFile().get(), getArchiveFile().get().getAsFile(), getLibraries());
+        getRemapOperation().execute(getExecOperations(), getInput().getAsFile().get(), getArchiveFile().get().getAsFile(), getLibraries());
     }
 }

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/RemapParameters.java renamed to src/legacy/java/net/neoforged/moddevgradle/legacyforge/tasks/RemapOperation.java

@@ -1,4 +1,4 @@
-package net.neoforged.moddevgradle.legacyforge.internal;
+package net.neoforged.moddevgradle.legacyforge.tasks;
 
 import net.neoforged.moddevgradle.internal.utils.NetworkSettingPassthrough;
 import org.gradle.api.file.ConfigurableFileCollection;
@@ -23,35 +23,24 @@
 import java.util.Arrays;
 import java.util.List;
 
-abstract class RemapParameters implements Serializable {
+public abstract class RemapOperation implements Serializable {
     @Inject
-    public RemapParameters() {}
+    public RemapOperation() {}
+
+    @Input
+    public abstract Property<ToolType> getToolType();
 
     @Classpath
     @InputFiles
-    protected abstract ConfigurableFileCollection getToolClasspath();
+    public abstract ConfigurableFileCollection getToolClasspath();
+
+    @Internal
+    protected abstract RegularFileProperty getLogFile();
 
     @InputFiles
     @PathSensitive(PathSensitivity.NONE)
     public abstract ConfigurableFileCollection getMappings();
 
-    @Internal
-    public abstract RegularFileProperty getLogFile();
-
-    @Input
-    public abstract Property<ToolType> getToolType();
-
-    public void from(Obfuscation reobfuscation, ToolType toolType) {
-        getToolType().set(toolType);
-        if (toolType == ToolType.ART) {
-            getToolClasspath().from(reobfuscation.autoRenamingToolRuntime);
-            getMappings().from(reobfuscation.officialToSrg);
-        } else {
-            getToolClasspath().from(reobfuscation.installerToolsRuntime);
-            getMappings().from(reobfuscation.mappingsCsv);
-        }
-    }
-
     public void execute(ExecOperations operations, File input, File output, FileCollection libraries) throws IOException {
         final List<String> args = new ArrayList<>();
 

src/main/java/net/neoforged/moddevgradle/dsl/InternalModelHelper.java

@@ -1,7 +1,6 @@
 package net.neoforged.moddevgradle.dsl;
 
 import net.neoforged.moddevgradle.internal.utils.StringUtils;
-import org.gradle.api.artifacts.Configuration;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/net/neoforged/moddevgradle/internal/RunGameTask.java

@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;
-import java.util.HashMap;
 
 /**
  * By extending JavaExec, we allow IntelliJ to automatically attach a debugger to the forked JVM, making

src/main/java/net/neoforged/moddevgradle/internal/RunUtils.java

@@ -38,7 +38,6 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.function.BiConsumer;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 final class RunUtils {

src/main/java/net/neoforged/moddevgradle/internal/WriteLegacyClasspath.java

@@ -2,11 +2,9 @@
 
 import net.neoforged.moddevgradle.internal.utils.FileUtils;
 import org.gradle.api.DefaultTask;
-import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 

src/main/java/net/neoforged/moddevgradle/internal/jarjar/ResolvedJarJarArtifact.java

@@ -10,7 +10,6 @@
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.PathSensitive;
 import org.gradle.api.tasks.PathSensitivity;
-import org.gradle.api.tasks.SourceSet;
 
 import java.io.File;
 import java.io.IOException;

src/test/java/net/neoforged/moddevgradle/functional/KotlinScriptTest.java

@@ -3,13 +3,8 @@
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.gradle.testkit.runner.TaskOutcome;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;

src/test/java/net/neoforged/moddevgradle/functional/ValidationTests.java

@@ -4,9 +4,7 @@
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;