save selected groups properly

Author: Skidamek

core/src/main/java/pl/skidam/automodpack_core/config/Jsons.java

@@ -368,6 +368,11 @@ public Modpack(ModpackAddresses modpackAddresses) {
                 this.modpackAddresses = modpackAddresses;
                 this.selectedGroups = new ArrayList<>();
             }
+
+            public Modpack(ModpackAddresses modpackAddresses, List<Group> selectedGroups) {
+                this.modpackAddresses = modpackAddresses;
+                this.selectedGroups = selectedGroups;
+            }
         }
 
         public static class Group {

core/src/main/java/pl/skidam/automodpack_core/modpack/ClientSelectionManager.java

@@ -51,6 +51,7 @@ public List<ClientSelectionManagerFields.Group> getSelectedGroups() {
         return getSelectedGroups(getSelectedPackId());
     }
 
+    // TODO make packids somehow unique and independet from modpackNames or server addresses
     public boolean packExists(String packId) {
         return selections.modpacks.containsKey(packId);
     }
@@ -61,6 +62,9 @@ public void removePack(String packId) {
     }
 
     public void addPack(String packId, ClientSelectionManagerFields.Modpack pack) {
+        if (selections.modpacks.containsKey(packId)) {
+            LOGGER.debug("Overwritting pack {}", packId);
+        }
         selections.modpacks.put(packId, pack);
         save();
     }

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

@@ -625,7 +625,13 @@ public static void addModpackToList(String packId, Jsons.ModpackAddresses modpac
 
         ClientSelectionManager clientSelectionManager = ClientSelectionManager.getMgr();
 
-        clientSelectionManager.addPack(packId, new Jsons.ClientSelectionManagerFields.Modpack(modpackAddresses));
+        var pack = new Jsons.ClientSelectionManagerFields.Modpack(modpackAddresses);
+
+        if (clientSelectionManager.packExists(packId)) {
+            pack.selectedGroups = clientSelectionManager.getSelectedGroups(packId);
+        }
+
+        clientSelectionManager.addPack(packId, pack);
     }
 
     // Returns modpack name formatted for path or url if server doesn't provide modpack name

src/main/java/pl/skidam/automodpack/client/ui/ModpackSelectionScreen.java

@@ -5,7 +5,6 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Util;
-import pl.skidam.automodpack_core.Constants;
 import pl.skidam.automodpack_loader_core.client.ModpackUpdater;
 import pl.skidam.automodpack_core.config.Jsons;
 import pl.skidam.automodpack_core.modpack.ClientSelectionManager;
@@ -209,29 +208,29 @@ private void install() {
             mgr.addPack(content.modpackName, new Jsons.ClientSelectionManagerFields.Modpack(new Jsons.ModpackAddresses()));
         }
 
-        Constants.LOGGER.info("Selected {} pack", content.modpackName);
-        Constants.LOGGER.info("Selected {} groups", selectedGroups);
-
-        mgr.setSelectedPack(content.modpackName);
-
         // Assemble Groups map
         List<Jsons.ClientSelectionManagerFields.Group> finalGroupsToSave = new ArrayList<>();
         for (String id : selectedGroups) {
             List<String> filesForGroup = new ArrayList<>();
             Jsons.ModpackGroupFields group = content.groups.get(id);
-            // add all groups even if the group is not selective because it might become one someday, so yeah save all files which we download currently
-            if (group != null && selectedSelectiveFiles.containsKey(id)) {
-                filesForGroup.addAll(selectedSelectiveFiles.get(id));
+            // add all groups even if the group is not selective because it might become one someday, so save all files which we download currently
+            if (group != null) {
+                if (group.selective && selectedSelectiveFiles.containsKey(id)) {
+                    filesForGroup.addAll(selectedSelectiveFiles.get(id));
+                } else if (!group.selective) {
+                    filesForGroup.addAll(group.files.stream().map(modpackContentItem -> modpackContentItem.file).toList());
+                }
             }
             finalGroupsToSave.add(new Jsons.ClientSelectionManagerFields.Group(id, filesForGroup));
         }
 
         mgr.setSelectedGroups(content.modpackName, finalGroupsToSave);
+        mgr.setSelectedPack(content.modpackName);
 
         Set<Jsons.ModpackContentItem> finalFiles = new HashSet<>();
         for (String id : selectedGroups) {
             Jsons.ModpackGroupFields group = content.groups.get(id);
-            if (group == null || !isOsCompatible(group.compatibleOS) || group.files == null) continue;
+            if (group == null || group.files == null) continue;
 
             if (group.selective) {
                 Set<String> selectedFiles = selectedSelectiveFiles.get(id);