Fixed incorrect behavior, not all duplicated mods were removed from the standard mods dir (while still accounting for exception mods) + small optimization

Author: Skidamek

loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUpdater.java

@@ -455,44 +455,45 @@ private boolean applyModpack() throws Exception {
         // Copy files to running directory
         boolean needsRestart1 = ModpackUtils.correctFilesLocations(modpackDir, modpackContent, filesNotToCopy);
 
-        // Check if the conflicting mods still exits, they might have been deleted by methods above
-        conflictingNestedMods = conflictingNestedMods.stream()
-                .filter(conflictingMod -> {
-                    Path standardModsDir = MODS_DIR.resolve(conflictingMod.modPath().getFileName());
-                    return Files.exists(standardModsDir);
-                })
-                .toList();
-
-        if (!conflictingNestedMods.isEmpty()) {
-            LOGGER.warn("Found conflicting nested mods: {}", conflictingNestedMods);
-        }
-
-        final List<Path> modpackMods;
-        final Collection<FileInspection.Mod> modpackModList;
-        final List<Path> standardMods;
-        final Collection<FileInspection.Mod> standardModList;
-
+        Set<Path> modpackMods = new HashSet<>();
+        Collection<FileInspection.Mod> modpackModList = new ArrayList<>();
         Path modpackModsDir = modpackDir.resolve("mods");
         if (Files.exists(modpackModsDir)) {
-            try (Stream<Path> modpackModsStream = Files.list(modpackModsDir)) {
-                modpackMods = modpackModsStream.toList();
-                modpackModList = modpackMods.stream().map(FileInspection::getMod).filter(Objects::nonNull).toList();
+            try (Stream<Path> stream = Files.list(modpackModsDir)) {
+                stream.forEach(path -> {
+                    modpackMods.add(path);
+                    FileInspection.Mod mod = FileInspection.getMod(path);
+                    if (mod != null) {
+                        modpackModList.add(mod);
+                    }
+                });
             }
-        } else {
-            modpackModList = List.of();
         }
 
-        if (Files.exists(MODS_DIR)) {
-            try (Stream<Path> standardModsStream = Files.list(MODS_DIR)) {
-                standardMods = standardModsStream.toList();
-                standardModList = new ArrayList<>(standardMods.stream().map(FileInspection::getMod).filter(Objects::nonNull).toList());
+        Collection<FileInspection.Mod> standardModList = new ArrayList<>();
+        Path standardModsDir = MODS_DIR;
+        if (Files.exists(standardModsDir)) {
+            try (Stream<Path> stream = Files.list(standardModsDir)) {
+                stream.forEach(path -> {
+                    FileInspection.Mod mod = FileInspection.getMod(path);
+                    if (mod != null) {
+                        standardModList.add(mod);
+                    }
+                });
             }
-        } else {
-            standardModList = new ArrayList<>();
+        }
+
+        // Check if the conflicting mods still exits, they might have been deleted by methods above
+        conflictingNestedMods = conflictingNestedMods.stream()
+                .filter(conflictingMod -> modpackMods.contains(conflictingMod.modPath()))
+                .toList();
+
+        if (!conflictingNestedMods.isEmpty()) {
+            LOGGER.warn("Found conflicting nested mods: {}", conflictingNestedMods);
         }
 
         boolean needsRestart2 = ModpackUtils.fixNestedMods(conflictingNestedMods, standardModList);
-        Set<String> ignoredFiles = ModpackUtils.getIgnoredWithNested(conflictingNestedMods, filesNotToCopy);
+        Set<String> ignoredFiles = ModpackUtils.getWorkaroundsWithNested(conflictingNestedMods, workaroundMods);
 
         // Remove duplicate mods
         boolean needsRestart3 = ModpackUtils.removeDupeMods(modpackDir, standardModList, modpackModList, ignoredFiles, workaroundMods);

loader/core/src/main/java/pl/skidam/automodpack_loader_core/client/ModpackUtils.java

@@ -161,9 +161,9 @@ public static boolean fixNestedMods(List<FileInspection.Mod> conflictingNestedMo
         return needsRestart;
     }
 
-    // Returns new ignored files list, accounting for conflicting nested mods
-    public static Set<String> getIgnoredWithNested(List<FileInspection.Mod> conflictingNestedMods, Set<String> ignoredFiles) {
-        Set<String> newIgnoredFiles = new HashSet<>(ignoredFiles);
+    // Returns ignored files list, which is workarounds set + conflicting nested mods
+    public static Set<String> getWorkaroundsWithNested(List<FileInspection.Mod> conflictingNestedMods, Set<String> workarounds) {
+        Set<String> newIgnoredFiles = new HashSet<>(workarounds);
 
         for (FileInspection.Mod mod : conflictingNestedMods) {
             newIgnoredFiles.add(CustomFileUtils.formatPath(mod.modPath(), modpacksDir));
@@ -200,7 +200,9 @@ public static boolean removeDupeMods(Path modpackDir, Collection<FileInspection.
 
         var dupeMods = ModpackUtils.getDupeMods(modpackDir, ignoredMods, standardModList, modpackModList);
 
-        if (dupeMods.isEmpty()) return false;
+        if (dupeMods.isEmpty()) {
+            return false;
+        }
 
         Set<FileInspection.Mod> modsToKeep = new HashSet<>();