Fix multiple access transformers with the same name.

Add a set of unit tests to cover access transformer management in userdev.
neoforged · Apr 28, 2024 · 7e0b0e4 · 7e0b0e4
1 parent b11db6f
commit 7e0b0e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/AccessTransformer.java b/common/src/main/java/net/neoforged/gradle/common/runtime/tasks/AccessTransformer.java
@@ -50,7 +50,6 @@ public AccessTransformer() {
     @PathSensitive(PathSensitivity.NONE)
     public abstract RegularFileProperty getInputFile();
 
-
     @InputFiles
     @PathSensitive(PathSensitivity.NONE)
     public abstract ConfigurableFileCollection getTransformers();

diff --git a/common/src/main/java/net/neoforged/gradle/common/util/CommonRuntimeTaskUtils.java b/common/src/main/java/net/neoforged/gradle/common/util/CommonRuntimeTaskUtils.java
@@ -27,25 +27,21 @@ private CommonRuntimeTaskUtils() {
     }
 
     public static TaskProvider<? extends AccessTransformer> createAccessTransformer(Definition<?> definition, String namePreFix, File workspaceDirectory, Consumer<TaskProvider<? extends Runtime>> dependentTaskConfigurationHandler, FileTree files, Collection<String> data) {
-        final ConfigurableFileCollection ats = definition.getSpecification().getProject().getObjects().fileCollection();
-        ats.from(files);
-
         final TaskProvider<AccessTransformerFileGenerator> generator;
         if (!data.isEmpty()) {
             generator = definition.getSpecification().getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(definition.getSpecification(), namePreFix + "AccessTransformerGenerator"), AccessTransformerFileGenerator.class, task -> {
                 task.getOutput().set(new File(workspaceDirectory, "accesstransformers/" + namePreFix + "/_script-access-transformer.cfg"));
                 task.getAdditionalTransformers().set(data);
             });
             dependentTaskConfigurationHandler.accept(generator);
-
-            ats.from(generator.flatMap(WithOutput::getOutput));
         } else {
             generator = null;
         }
 
         return definition.getSpecification().getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(definition.getSpecification(), String.format("apply%sAccessTransformer", StringCapitalizationUtils.capitalize(namePreFix))), AccessTransformer.class, task -> {
-            task.getTransformers().from(ats);
+            task.getTransformers().from(files);
             if (generator != null) {
+                task.getTransformers().from(generator.flatMap(WithOutput::getOutput));
                 task.dependsOn(generator);
             }
         });