Fix remapping dependencies missing from remapping classpath

Author: thecatcore

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

@@ -13,11 +13,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class LibraryHandler {
-    private static Map<RemapLibrary, Path> remapLibraries;
+    private static final Map<RemapLibrary, Path> remapLibraries = new HashMap<>();
 
     public static void gatherRemapLibraries(List<ModRemapper> remappers) {
         try {
@@ -26,12 +27,14 @@ public static void gatherRemapLibraries(List<ModRemapper> remappers) {
 
                 remapper.addRemapLibraries(libraries, FabricLoader.getInstance().getEnvironmentType());
 
-                remapLibraries = CacheUtils.computeExtraLibraryPaths(libraries, MappingsUtilsImpl.getSourceNamespace());
+                Map<RemapLibrary, Path> temp = CacheUtils.computeExtraLibraryPaths(libraries, MappingsUtilsImpl.getSourceNamespace());
 
-                for (Map.Entry<RemapLibrary, Path> entry : remapLibraries.entrySet()) {
+                for (Map.Entry<RemapLibrary, Path> entry : temp.entrySet()) {
                     RemapLibrary library = entry.getKey();
                     Path path = entry.getValue();
 
+                    if (Files.exists(path)) continue;
+
                     if (!library.url.isEmpty()) {
                         Constants.MAIN_LOGGER.info("Downloading remapping library '" + library.fileName + "' from url '" + library.url + "'");
                         FileUtils.downloadFile(library.url, path);
@@ -43,6 +46,8 @@ public static void gatherRemapLibraries(List<ModRemapper> remappers) {
                         Constants.MAIN_LOGGER.info("Remapping library ready for use.");
                     }
                 }
+
+                remapLibraries.putAll(temp);
             }
         } catch (IOException | URISyntaxException e) {
             throw new RuntimeException(e);

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

@@ -36,11 +36,7 @@ public static Map<Path, Path> computeLibraryPaths(Collection<Path> sourcePaths,
     public static Map<RemapLibrary, Path> computeExtraLibraryPaths(Collection<RemapLibrary> sourcePaths, String target) {
         return sourcePaths.stream()
                 .collect(Collectors.toMap(p -> p,
-                p -> CacheUtils.getLibraryPath(target).resolve(p.fileName)))
-                .entrySet()
-                .stream()
-                .filter(entry -> !Files.exists(entry.getValue()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                p -> CacheUtils.getLibraryPath(target).resolve(p.fileName)));
     }
 
     static {