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 index 38c5637f9..07642dc4b 100644 --- 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 index 75564b2b4..42c765443 100644 --- 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,9 +27,6 @@ private CommonRuntimeTaskUtils() { } public static TaskProvider createAccessTransformer(Definition definition, String namePreFix, File workspaceDirectory, Consumer> dependentTaskConfigurationHandler, FileTree files, Collection data) { - final ConfigurableFileCollection ats = definition.getSpecification().getProject().getObjects().fileCollection(); - ats.from(files); - final TaskProvider generator; if (!data.isEmpty()) { generator = definition.getSpecification().getProject().getTasks().register(CommonRuntimeUtils.buildTaskName(definition.getSpecification(), namePreFix + "AccessTransformerGenerator"), AccessTransformerFileGenerator.class, task -> { @@ -37,15 +34,14 @@ public static TaskProvider createAccessTransformer( 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); } });