Force unique module name for libraries

Author: Su5eD

transformer/src/main/java/org/sinytra/connector/transformer/jar/JarTransformInstance.java

@@ -4,7 +4,6 @@
 import com.mojang.logging.LogUtils;
 import net.neoforged.art.api.Renamer;
 import net.neoforged.art.api.Transformer;
-import net.neoforged.art.api.Transformer.ResourceEntry;
 import org.jetbrains.annotations.Nullable;
 import org.sinytra.adapter.env.ctx.AuditTrail;
 import org.sinytra.adapter.env.ctx.PatchEnvironment;
@@ -21,20 +20,18 @@
 import org.sinytra.connector.transformer.plugin.PluginManager;
 import org.sinytra.connector.transformer.plugin.TransformerContextImpl;
 import org.sinytra.connector.transformer.transform.FabricMetadataTransformer;
+import org.sinytra.connector.transformer.transform.JarSignatureStripper;
 import org.sinytra.connector.transformer.transform.MixinPatchTransformer;
-import org.sinytra.connector.transformer.transform.TransformerUtil;
 import org.slf4j.Logger;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -116,19 +113,21 @@ public AuditTrail transformJar(File input, Path output, FabricModFileMetadata me
     }
 
     private void processGeneratedJar(File input, Path output, Stopwatch stopwatch) throws IOException {
-        Files.copy(input.toPath(), output);
-        FabricMetadataTransformer transformer = new FabricMetadataTransformer(this.environment);
-
-        try (FileSystem fs = FileSystems.newFileSystem(output)) {
-            Path path = fs.getPath(TransformerUtil.FABRIC_MOD_JSON);
-            byte[] data = Files.readAllBytes(path);
-            ResourceEntry entry = ResourceEntry.create(TransformerUtil.FABRIC_MOD_JSON, 0, data);
-            ResourceEntry processed = Objects.requireNonNull(transformer.process(entry), "Failed to process FMJ entry");
-            Files.write(path, processed.getData());
-        } catch (IOException e) {
-            throw new UncheckedIOException("Error patching generated jar file", e);
+        Renamer.Builder builder = Renamer.builder()
+            .logger(s -> LOGGER.trace(JarTransformer.TRANSFORM_MARKER, s))
+            .debug(s -> LOGGER.trace(JarTransformer.TRANSFORM_MARKER, s))
+            .ignoreJarPathPrefix("assets/", "data/");
+
+        builder.add(new FabricMetadataTransformer(this.environment));
+        builder.add(new JarSignatureStripper());
+
+        try (Renamer renamer = builder.build()) {
+            renamer.run(input, output.toFile());
+        } catch (Throwable t) {
+            LOGGER.error("Encountered error while transforming jar file {}", input.getAbsolutePath(), t);
+            throw t;
         }
-        
+
         stopwatch.stop();
         LOGGER.debug(JarTransformer.TRANSFORM_MARKER, "Skipping transformation of jar {} after {} ms as it contains generated metadata, assuming it's a java library", input.getName(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
     }

transformer/src/main/java/org/sinytra/connector/transformer/transform/FabricMetadataTransformer.java

@@ -32,9 +32,9 @@ public class FabricMetadataTransformer implements Transformer {
         "com.llamalad7.mixinextras.MixinExtrasBootstrap",
         "com.llamalad7.mixinextras.MixinExtrasBootstrap::init"
     );
-    
+
     private final TransformerEnvironment environment;
-    
+
     public FabricMetadataTransformer(TransformerEnvironment environment) {
         this.environment = environment;
     }

transformer/src/main/java/org/sinytra/connector/transformer/transform/JarSignatureStripper.java

@@ -3,10 +3,10 @@
 import net.neoforged.art.api.Transformer;
 
 import java.io.*;
+import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
 public class JarSignatureStripper implements Transformer {
-
     @Override
     public ResourceEntry process(ResourceEntry entry) {
         String name = entry.getName();
@@ -18,12 +18,17 @@ public ManifestEntry process(ManifestEntry entry) {
         Manifest manifest = new Manifest();
         try (InputStream is = new ByteArrayInputStream(entry.getData())) {
             manifest.read(is);
-            manifest.getEntries().clear();
+            processManifest(manifest);
             ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
             manifest.write(byteStream);
             return ManifestEntry.create(entry.getTime(), byteStream.toByteArray());
         } catch (IOException e) {
             throw new UncheckedIOException("Error writing manifest", e);
         }
     }
+
+    private static void processManifest(Manifest manifest) {
+        manifest.getEntries().clear();
+        manifest.getMainAttributes().remove(new Attributes.Name("Automatic-Module-Name"));
+    }
 }