Don't use double brace initialization and other improvements

Author: Ran-Mewo

src/main/java/io/github/pacifistmc/forgix/Forgix.java

@@ -37,10 +37,10 @@ public static void mergeLoaders(Map<File, String> jarsAndLoadersMap, File output
                 ));
 
         try (var baos = JAR.combineJars(jarsAndLoadersMap.keySet(),
-                extraManifestAttributes:new HashMap<>() {{
-                    put(MANIFEST_VERSION_KEY, VERSION);
-                    put(MANIFEST_MAPPINGS_KEY, String.join(";", tinyFiles.values()));
-                }});
+                extraManifestAttributes:Map.of(
+                    MANIFEST_VERSION_KEY, VERSION,
+                    MANIFEST_MAPPINGS_KEY, String.join(";", tinyFiles.values())
+                ));
              var fos = new FileOutputStream(outputFile)
         ) {
             baos.writeTo(fos);
@@ -55,49 +55,49 @@ public static void mergeVersions(Collection<File> jarFiles, File outputFile) {
         }
         JAR.setPerms(outputFile);
     }
-    
+
     public static void main(String[] args) {
         if (args.length < 2) {
             """
             Usage:
             java -jar forgix.jar mergeJars --output <outputJar> --<loader1> <jar1> --<loader2> <jar2> [--<loader3> <jar3> ...]
             java -jar forgix.jar mergeVersions --output <outputJar> <jar1> <jar2> [<jar3> ...]
-            
+
             Example:
             java -jar forgix.jar mergeJars --output path/to/merged.jar --forge myforgemod.jar --fabric myfabricmod.jar
             java -jar forgix.jar mergeVersions --output path/to/merged.jar my1.16mod.jar my1.17mod.jar my1.18mod.jar""".errExit();
         }
-        
+
         String command = args[0];
-        
+
         // Handle mergeJars command
         if ("mergeJars".equals(command)) {
             if (args.length < 5 || args.length % 2 != 1) {
                 "Usage: java -jar forgix.jar mergeJars --output <outputJar> --<loader1> <jar1> --<loader2> <jar2> [--<loader3> <jar3> ...]".errExit();
             }
-            
+
             Map<File, String> jarsAndLoadersMap = new HashMap<>();
             File outputFile = null;
-            
+
             for (int i = 1; i < args.length; i += 2) {
                 if (!args[i].startsWith("--")) "Parameter must start with --".errExit();
-                
+
                 var param = args[i].substring(2);
                 var value = args[i + 1];
-                
+
                 if ("output".equals(param)) {
                     outputFile = new File(value);
                     continue;
                 }
-                
+
                 var jarFile = new File(value);
                 if (!jarFile.exists() || !jarFile.isFile()) "Jar file not found: ${value}".errExit();
                 jarsAndLoadersMap.put(jarFile, param);
             }
-            
+
             if (outputFile == null) "Output jar file must be specified with --output".errExit();
             if (jarsAndLoadersMap.size() < 2) "At least two jars must be provided".errExit();
-            
+
             try {
                 mergeLoaders(jarsAndLoadersMap, outputFile);
                 "Successfully merged jars into ${outputFile.getAbsolutePath()}".println();
@@ -106,26 +106,26 @@ public static void main(String[] args) {
             }
             return;
         }
-        
+
         // Handle mergeVersions command
         if ("mergeVersions".equals(command)) {
             if (args.length < 4) {
                 "Usage: java -jar forgix.jar mergeVersions --output <outputJar> <jar1> <jar2> [<jar3> ...]".errExit();
             }
-            
+
             if (!"--output".equals(args[1])) "Output jar file must be specified with --output".errExit();
-            
+
             File outputFile = new File(args[2]);
             List<File> jarFiles = new ArrayList<>();
-            
+
             for (int i = 3; i < args.length; i++) {
                 var jarFile = new File(args[i]);
                 if (!jarFile.exists() || !jarFile.isFile()) "Jar file not found: ${args[i]}".errExit();
                 jarFiles.add(jarFile);
             }
-            
+
             if (jarFiles.size() < 2) "At least two jars must be provided".errExit();
-            
+
             try {
                 mergeVersions(jarFiles, outputFile);
                 "Successfully merged version jars into ${outputFile.getAbsolutePath()}".println();
@@ -134,7 +134,7 @@ public static void main(String[] args) {
             }
             return;
         }
-        
+
         // Unknown command
         "Unknown command: ${command}".errExit();
     }

src/main/java/io/github/pacifistmc/forgix/utils/JAR.java

@@ -25,19 +25,17 @@
 public class JAR {
     // Constants
     private static final int BUFFER_SIZE = 64 * 1024; // 64KB buffer
-    public static final Set<PosixFilePermission> perms = new HashSet<>() {
-        {
-            add(PosixFilePermission.OTHERS_EXECUTE);
-            add(PosixFilePermission.OTHERS_WRITE);
-            add(PosixFilePermission.OTHERS_READ);
-            add(PosixFilePermission.OWNER_EXECUTE);
-            add(PosixFilePermission.OWNER_WRITE);
-            add(PosixFilePermission.OWNER_READ);
-            add(PosixFilePermission.GROUP_EXECUTE);
-            add(PosixFilePermission.GROUP_WRITE);
-            add(PosixFilePermission.GROUP_READ);
-        }
-    };
+    public static final Set<PosixFilePermission> perms = Set.of(
+        PosixFilePermission.OTHERS_EXECUTE,
+        PosixFilePermission.OTHERS_WRITE,
+        PosixFilePermission.OTHERS_READ,
+        PosixFilePermission.OWNER_EXECUTE,
+        PosixFilePermission.OWNER_WRITE,
+        PosixFilePermission.OWNER_READ,
+        PosixFilePermission.GROUP_EXECUTE,
+        PosixFilePermission.GROUP_WRITE,
+        PosixFilePermission.GROUP_READ
+    );
 
     /**
      * Merges the manifests of multiple JAR files.
@@ -89,15 +87,10 @@ public static Map<String, String> mergeServices(Collection<File> jars) {
                 }).collect(Collectors.toMap(
                         Map.Entry::getKey,
                         Map.Entry::getValue,
-                        (a, b) -> {
-                            // Only add unique lines
-                            return String.join("\n", new LinkedHashSet<>() {
-                                {
-                                    addAll(Arrays.asList(a.split("\n")));
-                                    addAll(Arrays.asList(b.split("\n")));
-                                }
-                            });
-                        }
+                        (a, b) -> Stream.concat(
+                            Arrays.stream(a.split("\n")),
+                            Arrays.stream(b.split("\n"))
+                        ).distinct().collect(Collectors.joining("\n"))
                 ));
     }
 
@@ -230,13 +223,12 @@ public static boolean writeResources(JarFile jarFile, Map<JarEntry, String> cont
         jarFile.close(); // Close the JAR file so we can write to it
         try (ZipFile zipFile = new ZipFile(jarFile.getName())) {
             // Add all writers to the ZIP
-            writers.forEach((is, entry) ->
-                zipFile.addStream(is,
-                        new ZipParameters() {{
-                            setFileNameInZip(entry.getName());
-                            setOverrideExistingFilesInZip(true);
-                        }}
-                ));
+            writers.forEach((is, entry) -> {
+                var params = new ZipParameters();
+                params.setFileNameInZip(entry.getName());
+                params.setOverrideExistingFilesInZip(true);
+                zipFile.addStream(is, params);
+            });
         }
         return !writers.isEmpty();
     }
@@ -248,10 +240,12 @@ public static boolean writeResources(JarFile jarFile, Map<JarEntry, String> cont
      */
     public static void addFiles(File jarFile, Map<File, String> filesAndNamesMap) {
         try (ZipFile zipFile = new ZipFile(jarFile)) {
-            filesAndNamesMap.forEach((file, path) -> zipFile.addFile(file, new ZipParameters() {{
-                setFileNameInZip(path);
-                setOverrideExistingFilesInZip(true);
-            }}));
+            filesAndNamesMap.forEach((file, path) -> {
+                var params = new ZipParameters();
+                params.setFileNameInZip(path);
+                params.setOverrideExistingFilesInZip(true);
+                zipFile.addFile(file, params);
+            });
         }
     }