Fix various bugs do to refactoring

Author: thecatcore

src/main/java/fr/catcore/modremapperapi/ModRemappingAPI.java

@@ -2,6 +2,8 @@
 
 import io.github.fabriccompatibiltylayers.modremappingapi.impl.ModRemappingAPIImpl;
 
+@Deprecated
 public class ModRemappingAPI {
+    @Deprecated
     public static final boolean BABRIC = ModRemappingAPIImpl.BABRIC;
 }

src/main/java/fr/catcore/modremapperapi/remapping/RemapUtil.java

@@ -311,7 +311,6 @@ private static void preloadClasses() {
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.ModDiscoverer$1",
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.ModEntry",
                 "io.github.fabriccompatibiltylayers.modremappingapi.impl.remapper.resource.RefmapJson",
-                "fr.catcore.modremapperapi.remapping.MapEntryType",
                 "fr.catcore.modremapperapi.remapping.MappingBuilder",
                 "fr.catcore.modremapperapi.remapping.MappingBuilder$Entry",
                 "fr.catcore.modremapperapi.remapping.MappingBuilder$Type",
@@ -529,7 +528,7 @@ private static TinyRemapper makeRemapper(MappingTree... trees) {
             modRemapper.addRemapLibraries(libraries, FabricLoader.getInstance().getEnvironmentType());
 
             for (RemapLibrary library : libraries) {
-                Path libPath = CacheUtils.getLibraryPath(library.fileName);
+                Path libPath = CacheUtils.getLibraryPath(MappingsUtilsImpl.getSourceNamespace()).resolve(library.fileName);
 
                 if (Files.exists(libPath)) {
                     remapper.readClassPathAsync(libPath);

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/ModDiscoverer.java

@@ -53,17 +53,19 @@ protected static void init(List<ModRemapper> modRemappers, boolean remapClassEdi
 
         if (Files.exists(mainTempDir)) {
             FileUtils.emptyDir(mainTempDir);
-        } else {
-            try {
-                Files.createDirectory(mainTempDir);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
+        }
+
+        try {
+            Files.createDirectory(mainTempDir);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
 
         Map<Path, Path> modPaths = mods.stream()
                 .filter(entry -> Files.exists(entry.original))
-                .collect(Collectors.toMap(entry -> entry.original, entry -> entry.file));
+                .collect(Collectors.groupingBy(entry -> entry.modId))
+                .entrySet().stream()
+                .collect(Collectors.toMap(entry -> entry.getValue().get(0).original, entry -> entry.getValue().get(0).file));
 
         if (!remapClassEdits) {
             modPaths = excludeClassEdits(modPaths, mainTempDir);
@@ -145,8 +147,8 @@ private static Optional<ModEntry> discoverFolderMod(Path folder, Path destinatio
             return Optional.of(
                     new DefaultModEntry(
                             name,
-                            folder,
-                            destination
+                            destination,
+                            folder
                     )
             );
         }
@@ -160,20 +162,26 @@ private static Optional<ModEntry> discoverFileMod(Path file, Path destinationFol
 
         List<String> entries = FileUtils.listZipContent(file);
 
+        boolean found = false;
+
         for (String entry : entries) {
-            if (Objects.equals(entry, "/fabric.mod.json")) break;
+            if (entry.contains("fabric.mod.json")) return Optional.empty();
 
             if (entry.endsWith(".class")) {
-                return Optional.of(
-                        new DefaultModEntry(
-                                modName,
-                                file,
-                                destinationFolder.resolve(fileName)
-                        )
-                );
+                found = true;
             }
         }
 
+        if (found) {
+            return Optional.of(
+                    new DefaultModEntry(
+                            modName,
+                            destinationFolder.resolve(fileName),
+                            file
+                    )
+            );
+        }
+
         return Optional.empty();
     }
 

src/main/java/io/github/fabriccompatibiltylayers/modremappingapi/impl/utils/CacheUtils.java

@@ -17,7 +17,7 @@ public class CacheUtils {
     public static final Path MAIN_FOLDER = BASE_FOLDER
             .resolve(VersionHelper.MINECRAFT_VERSION)
             .resolve(VersionHelper.MOD_VERSION);
-    public static final Path LIBRARY_FOLDER = BASE_FOLDER.resolve("libs");
+    public static final Path LIBRARY_FOLDER = MAIN_FOLDER.resolve("libs");
 
     public static Path getCachePath(String pathName) {
         return MAIN_FOLDER.resolve(pathName);