Fix AT apply in and add tests for it when in binpatch mode.

marchermans · marchermans · commit 7c7850b91605 · 2025-12-02T22:05:04.000+01:00
diff --git a/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/AndTaskTreeAdapter.groovy b/dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/runtime/tasks/tree/AndTaskTreeAdapter.groovy
@@ -31,7 +31,7 @@ class AndTaskTreeAdapter implements TaskTreeAdapter {
         if (currentAdapted != null)
             dependentTaskConfigurationHandler.accept(currentAdapted);
 
-        final TaskProvider<? extends Runtime> afterAdapted = right.adapt(definition, currentAdapted, runtimeWorkspace, gameArtifacts, mappingVersionData, dependentTaskConfigurationHandler);
+        final TaskProvider<? extends Runtime> afterAdapted = right.adapt(definition, currentAdapted != null ? currentAdapted : previousTasksOutput, runtimeWorkspace, gameArtifacts, mappingVersionData, dependentTaskConfigurationHandler);
 
         if (currentAdapted != null && afterAdapted == null)
             return currentAdapted;
diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/AccessTransformerTests.groovy
@@ -58,6 +58,56 @@ class AccessTransformerTests  extends BuilderBasedTestSpecification {
         initialRun.task(":compileJava").outcome == TaskOutcome.SUCCESS
     }
 
+    @Override
+    protected File getTestTempDirectory() {
+        return new File("tests")
+    }
+
+    def "the userdev runtime supports loading ats from a file with the decompiler disabled"() {
+        given:
+        def project = create("userdev_supports_ats_from_file_decompiler_disabled", {
+            it.build("""
+            java {
+                toolchain {
+                    languageVersion = JavaLanguageVersion.of(21)
+                }
+            }
+            
+            minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
+            
+            dependencies {
+                implementation 'net.neoforged:neoforge:+'
+            }
+            """)
+            it.file("src/main/resources/META-INF/accesstransformer.cfg", """public-f net.minecraft.client.Minecraft fixerUpper # fixerUpper""")
+            it.file("src/main/java/net/neoforged/gradle/userdev/FunctionalTests.java", """
+                package net.neoforged.gradle.userdev;
+                
+                import net.minecraft.client.Minecraft;
+                
+                public class FunctionalTests {
+                    public static void main(String[] args) {
+                        System.out.println(Minecraft.getInstance().fixerUpper.getClass().toString());
+                    }
+                }
+            """)
+            it.withToolchains()
+            it.withGlobalCacheDirectory(tempDir)
+            it.parallel()
+            it.property("neogradle.subsystems.decompiler.enabled", "false")
+        })
+
+        when:
+        def initialRun = project.run {
+            it.tasks('compileJava')
+            it.stacktrace()
+        }
+
+        then:
+        initialRun.task(":compileJava").outcome == TaskOutcome.SUCCESS
+        initialRun.task(":neoFormDecompile") == null
+    }
+
     def "the userdev runtime supports loading ats from a file after the dependencies block"() {
         given:
         def project = create("userdev_supports_ats_from_file", {
diff --git a/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/extension/UserDevRuntimeExtension.java b/userdev/src/main/java/net/neoforged/gradle/userdev/runtime/extension/UserDevRuntimeExtension.java
@@ -2,8 +2,11 @@
 
 import net.neoforged.gradle.common.dependency.ExtraJarDependencyManager;
 import net.neoforged.gradle.common.runtime.extensions.CommonRuntimeExtension;
+import net.neoforged.gradle.common.runtime.tasks.BinaryAccessTransformer;
 import net.neoforged.gradle.common.util.*;
 import net.neoforged.gradle.common.util.run.TypesUtil;
+import net.neoforged.gradle.dsl.common.extensions.AccessTransformers;
+import net.neoforged.gradle.dsl.common.extensions.Minecraft;
 import net.neoforged.gradle.dsl.common.extensions.subsystems.Conventions;
 import net.neoforged.gradle.dsl.common.extensions.subsystems.Decompiler;
 import net.neoforged.gradle.dsl.common.extensions.subsystems.Subsystems;
@@ -26,6 +29,7 @@
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.FileTree;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.TaskProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -47,6 +51,8 @@ public UserDevRuntimeExtension(Project project)
     protected @NotNull UserDevRuntimeDefinition doCreate(UserDevRuntimeSpecification spec)
     {
         final NeoFormRuntimeExtension neoFormRuntimeExtension = getProject().getExtensions().getByType(NeoFormRuntimeExtension.class);
+        final Decompiler decompilerSubsystemConfiguration = getProject().getExtensions().getByType(Subsystems.class).getDecompiler();
+        final Minecraft minecraftExtension = getProject().getExtensions().getByType(Minecraft.class);
 
         final UserdevProfile userDevProfile = spec.getProfile();
         final FileTree userDevJar = spec.getUserDevArchive();
@@ -56,7 +62,7 @@ public UserDevRuntimeExtension(Project project)
             "AdditionalDependenciesFor" + spec.getIdentifier()
         );
 
-        if (useCombinedJarWithNeoForgeOnRecompile(spec, userDevProfile))
+        if (useCombinedJarWithNeoForgeOnRecompile(userDevProfile))
         {
             userDevAdditionalDependenciesConfiguration.getDependencies().addLater(
                 userDevProfile.getUniversalJarArtifactCoordinate().map(spec.getProject().getDependencies()::create)
@@ -86,7 +92,7 @@ public UserDevRuntimeExtension(Project project)
 
             builder.withPostTaskAdapter("patch", createPatchAdapter(userDevJar, userDevProfile.getSourcePatchesDirectory().get()));
 
-            if (!useCombinedJarWithNeoForgeOnRecompile(spec, userDevProfile))
+            if (!useCombinedJarWithNeoForgeOnRecompile(userDevProfile))
             {
                 builder.withTaskCustomizer("inject", InjectZipContent.class, task -> {
                     FileTree injectionDirectoryTree;
@@ -106,12 +112,35 @@ public UserDevRuntimeExtension(Project project)
                         ConfigurationUtils.getArtifactProvider(getProject(), "NeoForgeRawLookupFor" + spec.getIdentifier(), userDevProfile.getUniversalJarArtifactCoordinate())
                     );
                 });
+            } else if (decompilerSubsystemConfiguration.getIsDisabled().get()){
+                builder.withPostTaskAdapter("setup", (definition, previousTasksOutput, runtimeWorkspace, gameArtifacts, mappingVersionData, dependentTaskConfigurationHandler) -> {
+                    final AccessTransformers userAts = minecraftExtension.getAccessTransformers();
+
+                    if (accessTransformerFiles.getFiles().isEmpty()) {
+                        return null;
+                    }
+
+                    final TaskProvider<? extends BinaryAccessTransformer> task = CommonRuntimeTaskUtils.createBinaryAccessTransformer(
+                        definition,
+                        "",
+                        userAts.getFiles().getAsFileTree()
+                    );
+
+                    task.configure(t -> {
+                        t.getInputFile().set(previousTasksOutput.flatMap(WithOutput::getOutput));
+                        t.dependsOn(previousTasksOutput);
+                    });
+
+                    dependentTaskConfigurationHandler.accept(task);
+
+                    return task;
+                });
             }
         });
 
         spec.setMinecraftVersion(neoFormRuntimeDefinition.getSpecification().getMinecraftVersion());
 
-        if (!useCombinedJarWithNeoForgeOnRecompile(spec, userDevProfile))
+        if (!useCombinedJarWithNeoForgeOnRecompile(userDevProfile))
         {
             //Create the client-extra jar dependency.
             final Dependency clientExtraJar = spec.getProject().getDependencies().create(
@@ -139,7 +168,7 @@ public UserDevRuntimeExtension(Project project)
         final FileTree userDevJar)
     {
         return (steps, functions) -> {
-            if (!useCombinedJarWithNeoForgeOnRecompile(spec, userDevProfile))
+            if (!useCombinedJarWithNeoForgeOnRecompile(userDevProfile))
             {
                 return;
             }
@@ -170,7 +199,6 @@ public UserDevRuntimeExtension(Project project)
 
             final Subsystems subsystems = spec.getProject().getExtensions().getByType(Subsystems.class);
             final SetupConfiguration configuration = buildSetupConfiguration(
-                spec,
                 userDevProfile,
                 userDevJar
             );
@@ -199,10 +227,10 @@ private record SetupConfiguration(
         List<String> arguments,
         Map<String, String> values) {}
 
-    private SetupConfiguration buildSetupConfiguration(UserDevRuntimeSpecification spec, final UserdevProfile userDevProfile, final FileTree userDevJar)
+    private SetupConfiguration buildSetupConfiguration(final UserdevProfile userDevProfile, final FileTree userDevJar)
     {
         final Decompiler decompilerSubsystemConfiguration = getProject().getExtensions().getByType(Subsystems.class).getDecompiler();
-        if (decompilerSubsystemConfiguration.getIsDisabled().get() && useCombinedJarWithNeoForgeOnRecompile(spec, userDevProfile))
+        if (decompilerSubsystemConfiguration.getIsDisabled().get() && useCombinedJarWithNeoForgeOnRecompile(userDevProfile))
         {
             return new SetupConfiguration(
                 List.of(
@@ -245,7 +273,7 @@ private SetupConfiguration buildSetupConfiguration(UserDevRuntimeSpecification s
         );
     }
 
-    private boolean useCombinedJarWithNeoForgeOnRecompile(final UserDevRuntimeSpecification specification, final UserdevProfile userDevProfile)
+    private boolean useCombinedJarWithNeoForgeOnRecompile(final UserdevProfile userDevProfile)
     {
         return userDevProfile.getFeatures()
             .flatMap(UserdevProfile.Features::getUsesCombinedBinaryPatches)
@@ -293,7 +321,7 @@ protected void afterRegistration(UserDevRuntimeDefinition runtime)
     private void bakeDefinition(UserDevRuntimeDefinition definition)
     {
         final Decompiler decompilerSubsystemConfiguration = this.getProject().getExtensions().getByType(Subsystems.class).getDecompiler();
-        if (decompilerSubsystemConfiguration.getIsDisabled().get() && useCombinedJarWithNeoForgeOnRecompile(definition.getSpecification(), definition.getUserdevConfiguration()))
+        if (decompilerSubsystemConfiguration.getIsDisabled().get() && useCombinedJarWithNeoForgeOnRecompile(definition.getUserdevConfiguration()))
         {
             definition.getNeoFormRuntimeDefinition().getRawJarTask().configure(task -> {
                 task.getInput().set(definition.getNeoFormRuntimeDefinition().getTask("setup").flatMap(WithOutput::getOutput));
diff --git a/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/build.gradle b/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/build.gradle
@@ -0,0 +1,17 @@
+plugins {
+   id 'net.neoforged.gradle.userdev'
+} 
+
+
+            java {
+                toolchain {
+                    languageVersion = JavaLanguageVersion.of(21)
+                }
+            }
+            
+            minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
+            
+            dependencies {
+                implementation 'net.neoforged:neoforge:+'
+            }
+            
diff --git a/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/gradle.properties b/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/gradle.properties
@@ -0,0 +1,5 @@
+neogradle.subsystems.decompiler.enabled=false
+org.gradle.parallel=true
+net.neoforged.gradle.caching.cacheDirectory=/tmp/spock_the_userdev_runtime_0_tempDir6195734133791547284/.ng-cache
+org.gradle.console=rich
+org.gradle.jvmargs=-Xmx8000m
diff --git a/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/settings.gradle b/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/settings.gradle
@@ -0,0 +1,6 @@
+plugins {
+   id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+} 
+
+rootProject.name = 'userdev_supports_ats_from_file_decompiler_disabled'
+
diff --git a/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/src/main/java/net/neoforged/gradle/userdev/FunctionalTests.java b/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/src/main/java/net/neoforged/gradle/userdev/FunctionalTests.java
@@ -0,0 +1,11 @@
+
+                package net.neoforged.gradle.userdev;
+                
+                import net.minecraft.client.Minecraft;
+                
+                public class FunctionalTests {
+                    public static void main(String[] args) {
+                        System.out.println(Minecraft.getInstance().fixerUpper.getClass().toString());
+                    }
+                }
+            
diff --git a/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/src/main/resources/META-INF/accesstransformer.cfg b/userdev/tests/userdev_supports_ats_from_file_decompiler_disabled/src/main/resources/META-INF/accesstransformer.cfg
@@ -0,0 +1 @@
+public-f net.minecraft.client.Minecraft fixerUpper # fixerUpper

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+public-f net.minecraft.client.Minecraft fixerUpper # fixerUpper`