Include most Flap patches to MRAPI

Author: thecatcore

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/context/MappingsRegistryInstance.java

@@ -135,7 +135,7 @@ public void addModMappings(Path path) {
             FileUtils.listPathContent(path)
                     .stream()
                     .filter(file -> file.endsWith(".class"))
-                    .map(file -> file.replace(".class", ""))
+                    .map(file -> file.replaceFirst(".class$", ""))
                     .forEach(cl -> mappingBuilder.addMapping(cl, (cl.contains("/") ? "" : this.defaultPackage) + cl));
         } catch (IOException e) {
             throw new RuntimeException(e);

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/remapper/minecraft/ClasspathUtils.java

@@ -1,7 +1,7 @@
 package io.github.fabriccompatibilitylayers.modremappingapi.impl.remapper.minecraft;
 
+import fr.catcore.modremapperapi.utils.Constants;
 import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ObjectShare;
 import net.fabricmc.loader.impl.launch.FabricLauncherBase;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -10,59 +10,50 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @ApiStatus.Internal
 public class ClasspathUtils {
-    public static List<Path> getRemapClasspath() throws IOException {
+    public static Set<Path> getRemapClasspath() throws IOException {
         var remapClasspathFile = System.getProperty("fabric.remapClasspathFile");
 
         if (remapClasspathFile == null) {
-            System.out.println("remapClasspathFile is null! Falling back to ObjectShare.");
+            Constants.MAIN_LOGGER.info("remapClasspathFile is null! Falling back to ObjectShare.");
             return getClassPathFromObjectShare();
         }
 
         var content = Files.readString(Path.of(remapClasspathFile));
 
         return Arrays.stream(content.split(File.pathSeparator))
                 .map(Path::of)
-                .toList();
+                .collect(Collectors.toSet());
     }
 
-    public static @NotNull List<Path> getClassPathFromObjectShare() {
+    public static @NotNull Set<Path> getClassPathFromObjectShare() {
         var share = FabricLoader.getInstance().getObjectShare();
         var inputs = share.get("fabric-loader:inputGameJars");
-        var list = new ArrayList<Path>();
+        var completeClasspath = new HashSet<Path>();
 
         var oldJar = FabricLoader.getInstance().getObjectShare().get("fabric-loader:inputGameJar");
         var classPaths = FabricLauncherBase.getLauncher().getClassPath();
 
-        if (inputs instanceof List<?> inputsList) {
-            var paths = (List<Path>) inputsList;
+        if (inputs instanceof Collection<?> inputsList) {
+            var paths = (Collection<Path>) inputsList;
+            completeClasspath.addAll(paths);
+        }
 
-            if (oldJar instanceof Path oldJarPath) {
-                if (paths.get(0).toString().equals(oldJarPath.toString())) {
-                    list.addAll(paths);
-                } else {
-                    list.add(oldJarPath);
-                }
-            } else {
-                list.addAll(paths);
-            }
-        } else if (oldJar instanceof Path oldJarPath) {
-            list.add(oldJarPath);
+        if (oldJar instanceof Path oldJarPath) {
+            completeClasspath.add(oldJarPath);
         }
 
-        list.addAll(classPaths);
+        completeClasspath.addAll(classPaths);
 
         Optional.ofNullable(share.get("fabric-loader:inputRealmsJar"))
                 .filter(Path.class::isInstance)
                 .map(Path.class::cast)
-                .ifPresent(list::add);
+                .ifPresent(completeClasspath::add);
 
-        return list;
+        return completeClasspath;
     }
 }

src/main/java/io/github/fabriccompatibilitylayers/modremappingapi/impl/utils/FileUtils.java

@@ -11,6 +11,7 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.SimpleFileVisitor;
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
@@ -97,32 +98,16 @@ public static List<String> listZipContent(Path path) throws IOException {
         return files;
     }
 
-    @ApiStatus.Internal
-    public static List<String> listDirectoryContent(File[] files) {
-        List<String> list = new ArrayList<>();
-
-        for (File file : files) {
-            if (file.isDirectory()) {
-                String name = file.getName();
-
-                for (String fileName : listDirectoryContent(file.listFiles())) {
-                    list.add(name + "/" + fileName);
-                }
-            } else if (file.isFile()) {
-                list.add(file.getName());
-            }
-        }
-
-        return list;
-    }
-
+    /**
+     * @author moehreag
+     */
     @ApiStatus.Internal
     public static List<String> listPathContent(Path path) throws IOException {
-        File file = path.toFile();
-
-        if (file.isDirectory()) {
-            return listDirectoryContent(file.listFiles());
-        } else if (file.isFile()) {
+        if (Files.isDirectory(path)) {
+            try (var s = Files.walk(path)) {
+                return s.map(Path::toString).collect(Collectors.toCollection(ArrayList::new));
+            }
+        } else if (Files.isRegularFile(path)) {
             return listZipContent(path);
         }
 
@@ -152,52 +137,22 @@ public static void emptyDir(Path dir) {
         }
     }
 
+    /**
+     * @author moehreag
+     */
     @ApiStatus.Internal
-    public static void zipFolder(Path input, Path output) throws IOException {
-        try (var zout = new ZipOutputStream(Files.newOutputStream(output))) {
-            var fileToZip = input.toFile();
-            zipFile(fileToZip, fileToZip.getName(), zout, true);
-        }
-    }
-    
-    private static void zipFile(File fileToZip, String fileName, ZipOutputStream zipOut, boolean root) throws IOException {
-        if (fileToZip.isHidden()) {
-            return;
-        }
-    
-        if (fileToZip.isDirectory()) {
-            if (!root) {
-                if (fileName.endsWith("/")) {
-                    zipOut.putNextEntry(new ZipEntry(fileName));
-                    zipOut.closeEntry();
-                } else {
-                    zipOut.putNextEntry(new ZipEntry(fileName + "/"));
-                    zipOut.closeEntry();
-                }
-            }
-    
-            var children = fileToZip.listFiles();
-            if (children != null) {
-                for (File childFile : children) {
-                    zipFile(childFile, (root ? "" : fileName + "/") + childFile.getName(), zipOut, false);
+    public static void zipFolder(Path in, Path out) throws IOException {
+        try (var outFs = FileSystems.newFileSystem(out)) {
+            Files.walkFileTree(in, new SimpleFileVisitor<>(){
+                @Override
+                public @NotNull FileVisitResult visitFile(@NotNull Path file, @NotNull BasicFileAttributes attrs) throws IOException {
+                    var outPath = outFs.getPath(in.relativize(file).toString());
+                    Files.createDirectories(outPath.getParent());
+                    Files.copy(file, outPath);
+                    return super.visitFile(file, attrs);
                 }
-            }
-            return;
-        }
-    
-        var zipEntry = new ZipEntry(fileName);
-        zipOut.putNextEntry(zipEntry);
-    
-        try (var fis = Files.newInputStream(fileToZip.toPath())) {
-            var bytes = new byte[1024];
-            int length;
-
-            while ((length = fis.read(bytes)) >= 0) {
-                zipOut.write(bytes, 0, length);
-            }
+            });
         }
-
-        zipOut.closeEntry();
     }
 
     /* Define ZIP File System Properties in Map */