Fine-tune MavenTask access transformers

- Allow multiple AccessTransformer configs to be used in MavenTask
- Fix AccessTransformer config not being properly cached
  - Refreshing the project (and/or re-running `syncMavenizer`) after changing or disabling ATs now work consistently

Author: Jonathing

settings.gradle

@@ -40,7 +40,7 @@ dependencyResolutionManagement.versionCatalogs.register('libs') {
     // Utilities
     library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.4.0'
     library 'utils-files',    'net.minecraftforge', 'file-utils'      version '0.3.3'
-    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.12'
+    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.13'
     library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.1'
     library 'utils-logging',  'net.minecraftforge', 'log-utils'       version '0.5.0'
     library 'utils-os',       'net.minecraftforge', 'os-utils'        version '0.1.0'

src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java

@@ -172,7 +172,7 @@ static void run(String[] args) throws Exception {
 
         var mcmaven = new MinecraftMaven(output, options.has(dependenciesOnlyO), cache, jdkCache, mappings,
             foreignRepositories, options.has(globalAuxiliaryVariantsO), options.has(disableGradleO), options.has(stubO),
-            options.valueOf(accessTransformerO));
+            options.valuesOf(accessTransformerO));
         mcmaven.run(artifact);
     }
 }

src/main/java/net/minecraftforge/mcmaven/impl/MinecraftMaven.java

@@ -50,7 +50,6 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.jetbrains.annotations.Nullable;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
@@ -67,15 +66,15 @@ public record MinecraftMaven(
     boolean disableGradle,
     boolean stubJars,
     Set<String> mcpConfigVersions,
-    @Nullable File accessTransformer
+    List<File> accessTransformer
 ) {
     // Only 1.14.4+ has official mappings, we can support more when we add more mappings
     private static final MinecraftVersion MIN_OFFICIAL_MAPPINGS = MinecraftVersion.from("1.14.4");
     private static final ComparableVersion MIN_SUPPORTED_FORGE = new ComparableVersion("1.14.4");
 
     public MinecraftMaven(File output, boolean dependenciesOnly, File cacheRoot, File jdkCacheRoot, Mappings mappings,
         Map<String, String> foreignRepositories, boolean globalAuxiliaryVariants, boolean disableGradle, boolean stubJars,
-        @Nullable File accessTransformer) {
+        List<File> accessTransformer) {
         this(output, dependenciesOnly, new Cache(cacheRoot, jdkCacheRoot, foreignRepositories), mappings, foreignRepositories, globalAuxiliaryVariants, disableGradle, stubJars, new HashSet<>(), accessTransformer);
     }
 
@@ -92,8 +91,17 @@ public MinecraftMaven(File output, boolean dependenciesOnly, File cacheRoot, Fil
         LOGGER.info("  GradleVariantHack:  " + globalAuxiliaryVariants);
         LOGGER.info("  Disable Gradle:     " + disableGradle);
         LOGGER.info("  Stub Jars:          " + stubJars);
-        if (accessTransformer != null)
-            LOGGER.info("  Access Transformer: " + accessTransformer.getAbsolutePath());
+        if (!accessTransformer.isEmpty()) {
+            LOGGER.getInfo().print("  Access Transformer: ");
+            var itor = accessTransformer.iterator();
+            while (itor.hasNext()) {
+                var file = itor.next();
+                LOGGER.getInfo().print(file.getAbsolutePath());
+                if (itor.hasNext())
+                    LOGGER.getInfo().print(", ");
+            }
+            LOGGER.getInfo().println();
+        }
         LOGGER.info();
     }
 
@@ -314,13 +322,14 @@ private void updateFile(File target, File source, Artifact artifact) {
             }
 
             // Only transform main artifacts
-            if (accessTransformer != null && artifact.getClassifier() == null) {
+            if (!accessTransformer.isEmpty() && artifact.getClassifier() == null) {
                 writeAccessTransformed(target, source, artifact);
                 return;
             }
         }
 
         var cache = HashStore.fromFile(target)
+            .add(accessTransformer)
             .add("source", source);
 
         var isPom = "pom".equals(artifact.getExtension());
@@ -383,7 +392,7 @@ private void writeAccessTransformed(File target, File source, Artifact artifact)
         var tool = this.cache.maven().download(Constants.ACCESS_TRANSFORMER);
         var cache = HashStore.fromFile(target)
             .add("tool", tool)
-            .add("at", accessTransformer)
+            .add(accessTransformer)
             .add("source", source);
 
         if (target.exists() && cache.isSame())
@@ -397,13 +406,15 @@ private void writeAccessTransformed(File target, File source, Artifact artifact)
         }
 
         var log = new File(source.getAbsolutePath() + ".accesstransformer.log");
-        var ret = ProcessUtils.runJar(jdk, source.getParentFile(), log, tool, Collections.emptyList(),
-            List.of(
-                "--inJar", source.getAbsolutePath(),
-                "--outJar", target.getAbsolutePath(),
-                "--atfile", accessTransformer.getAbsolutePath()
-            )
-        );
+        var args = new ArrayList<>(List.of(
+            "--inJar", source.getAbsolutePath(),
+            "--outJar", target.getAbsolutePath()
+        ));
+        for (var file : accessTransformer) {
+            args.add("--atfile");
+            args.add(file.getAbsolutePath());
+        }
+        var ret = ProcessUtils.runJar(jdk, source.getParentFile(), log, tool, Collections.emptyList(), args);
         if (ret.exitCode != 0)
             throw new IllegalStateException("Failed to Access Transform jar file (exit code " + ret.exitCode + "), See log: " + log.getAbsolutePath());