Fix issues with Access Transformers and running in CI/Binary patch mode.

Author: marchermans

build.gradle

@@ -65,11 +65,6 @@ subprojects.forEach { Project subProject ->
     subProject.java.toolchain.languageVersion = JavaLanguageVersion.of(project.java_version)
     subProject.java.withSourcesJar()
 
-    //We exclude ASM from all subprojects, it is handled by Gradle itself.
-    subProject.configurations.configureEach { Configuration configuration ->
-        configuration.exclude group: 'org.ow2.asm'
-    }
-
     ['apiElements', 'runtimeElements'].each {
         subProject.configurations.named(it).configure {
             attributes {

common/build.gradle

@@ -35,6 +35,10 @@ dependencies {
     api "net.neoforged:JarJarMetadata:${project.jarjar_version}"
     api "net.neoforged:JarJarSelector:${project.jarjar_version}"
 
+    api "org.ow2.asm:asm:${project.asm_version}"
+    api "org.ow2.asm:asm-commons:${project.asm_version}"
+    api "org.ow2.asm:asm-tree:${project.asm_version}"
+
     // IDE support
     api "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:${project.gradle_idea_extension_version}"
 }

common/src/main/java/net/neoforged/gradle/common/tasks/PotentiallySignJar.java

@@ -0,0 +1,75 @@
+package net.neoforged.gradle.common.tasks;
+
+import net.neoforged.gradle.common.runtime.tasks.DefaultRuntime;
+import net.neoforged.gradle.common.services.caching.CachedExecutionService;
+import net.neoforged.gradle.common.services.caching.jobs.ICacheableJob;
+import net.neoforged.gradle.dsl.common.tasks.WithOperations;
+import net.neoforged.gradle.dsl.common.tasks.WithOutput;
+import net.neoforged.gradle.dsl.common.tasks.WithWorkspace;
+import net.neoforged.gradle.dsl.common.tasks.specifications.InputFileSpecification;
+import net.neoforged.gradle.util.ClassVisitingFileTreeVisitor;
+import org.gradle.api.provider.Property;
+import org.gradle.api.services.ServiceReference;
+import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.TaskAction;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipOutputStream;
+
+@CacheableTask
+public abstract class StripFinalFromParametersTask extends DefaultRuntime implements WithOutput, InputFileSpecification, WithOperations, WithWorkspace
+{
+    public StripFinalFromParametersTask() {
+        super();
+    }
+
+    @ServiceReference(CachedExecutionService.NAME)
+    public abstract Property<CachedExecutionService> getCacheService();
+
+    @TaskAction
+    public void stripFinal() throws IOException {
+        getCacheService().get()
+            .cached(this,
+                ICacheableJob.Default.file(this::doStripFinal, getOutput())
+                )
+            .execute();
+    }
+
+    private void doStripFinal() throws IOException {
+        var input = getArchiveOperations().zipTree(getInput());
+        try(final FileOutputStream fos = new FileOutputStream(ensureFileWorkspaceReady(getOutput()));
+            final ZipOutputStream zos = new ZipOutputStream(fos)) {
+            final ClassVisitingFileTreeVisitor visitor = new ClassVisitingFileTreeVisitor(zos, StripFinalClassVisitor::new);
+            input.visit(visitor);
+        }
+    }
+
+    private static class StripFinalClassVisitor extends ClassVisitor {
+        public StripFinalClassVisitor(int api, ClassVisitor classVisitor) {
+            super(api, classVisitor);
+        }
+
+        @Override
+        public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) {
+            MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions);
+            return new StripFinalParameterVisitor(api, mv);
+        }
+    }
+
+    private static class StripFinalParameterVisitor extends MethodVisitor {
+        public StripFinalParameterVisitor(int api, MethodVisitor methodVisitor) {
+            super(api, methodVisitor);
+        }
+
+        @Override
+        public void visitParameter(String name, int access) {
+            // Remove ACC_FINAL from parameter access flags
+            int newAccess = access & ~Opcodes.ACC_FINAL;
+            super.visitParameter(name, newAccess);
+        }
+    }
+}

common/src/main/java/net/neoforged/gradle/common/tasks/RawAndSourceCombiner.java

@@ -5,6 +5,8 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 
 /**
  * Represents an object with an input file.
@@ -20,5 +22,6 @@ trait InputFileSpecification implements ProjectSpecification {
     @DSLProperty
     @InputFile
     @Optional
+    @PathSensitive(PathSensitivity.NONE)
     abstract RegularFileProperty getInput();
 }

common/src/main/java/net/neoforged/gradle/common/tasks/StripFinalFromParametersTask.java

@@ -28,6 +28,7 @@ gradle_idea_extension_version=1.2
 groovy_dsl_improver_version=2.0.0
 eclipse_launch_configs_version=0.1.3
 vscode_launch_configs_version=1.0.8
+asm_version=9.9
 
 #Test dependencies
 junit_version=5.9.2

dsl/common/src/main/groovy/net/neoforged/gradle/dsl/common/tasks/specifications/InputFileSpecification.groovy

@@ -21,6 +21,10 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
                 }
             }
             
+            repositories {
+                mavenLocal()
+            }
+                        
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
             }
@@ -49,6 +53,10 @@ class AdvancedFmlTests extends BuilderBasedTestSpecification {
                 }
             }
             
+            repositories {
+                mavenLocal()
+            }
+                        
             dependencies {
                 implementation 'net.neoforged:neoforge:+'
             }