Implement additional install selector null checks

TerraFirmaCraft-The-Final-Frontier · Aug 17, 2023 · 84899c6 · 84899c6
1 parent 264c51f
commit 84899c6
Showing 1 changed file with 34 additions and 30 deletions.
diff --git a/mod-director-core/src/main/java/net/jan/moddirector/core/manage/select/InstallSelector.java b/mod-director-core/src/main/java/net/jan/moddirector/core/manage/select/InstallSelector.java
@@ -31,47 +31,51 @@ public void accept(
         List<String> ignoredGroups = new ArrayList<>();
 
         for(ModDirectorRemoteMod mod : excludedMods) {
-            String group = mod.getInstallationPolicy().getOptionalKey();
-
-            if(group != null && !group.equals("$")) {
-                ignoredGroups.add(group);
+            InstallationPolicy policy = mod.getInstallationPolicy();
+            if(policy != null) {
+                String group = policy.getOptionalKey();
+                if(group != null && !group.equals("$")) {
+                    ignoredGroups.add(group);
+                }
             }
         }
 
         for(InstallableMod mod : reInstall) {
-            String group = mod.getRemoteMod().getInstallationPolicy().getOptionalKey();
-
-            if(group != null && !group.equals("$")) {
-                ignoredGroups.add(group);
+            ModDirectorRemoteMod remoteMod = mod.getRemoteMod();
+            if(remoteMod != null) {
+                InstallationPolicy policy = remoteMod.getInstallationPolicy();
+                if(policy != null) {
+                    String group = policy.getOptionalKey();
+                    if(group != null && !group.equals("$")) {
+                        ignoredGroups.add(group);
+                    }
+                }
+                alwaysInstall.add(mod);
             }
-
-            alwaysInstall.add(mod);
         }
 
         for(InstallableMod mod : freshInstalls) {
             ModDirectorRemoteMod remoteMod = mod.getRemoteMod();
-
-            if(remoteMod.getInstallationPolicy().getOptionalKey() == null) {
-                alwaysInstall.add(mod);
-            } else {
+            if(remoteMod != null) {
                 InstallationPolicy policy = remoteMod.getInstallationPolicy();
-                if(ignoredGroups.contains(policy.getOptionalKey())) {
-                    continue;
+                if(policy != null) {
+                    String optionalKey = policy.getOptionalKey();
+                    if(optionalKey == null) {
+                        alwaysInstall.add(mod);
+                    } else if(!ignoredGroups.contains(optionalKey)) {
+                        SelectableInstallOption installOption = new SelectableInstallOption(
+                                policy.isSelectedByDefault(),
+                                policy.getName() == null ? remoteMod.offlineName() : policy.getName(),
+                                policy.getDescription()
+                        );
+                        if(optionalKey.equals("$")) {
+                            singleOptions.add(installOption);
+                        } else {
+                            groupOptions.computeIfAbsent(optionalKey, k -> new ArrayList<>()).add(installOption);
+                        }
+                        optionsToMod.put(installOption, mod);
+                    }
                 }
-
-                SelectableInstallOption installOption = new SelectableInstallOption(
-                        policy.isSelectedByDefault(),
-                        policy.getName() == null ? remoteMod.offlineName() : policy.getName(),
-                        policy.getDescription()
-                );
-
-                if (policy.getOptionalKey().equals("$")) {
-                    singleOptions.add(installOption);
-                } else {
-                    groupOptions.computeIfAbsent(policy.getOptionalKey(), (k) -> new ArrayList<>()).add(installOption);
-                }
-
-                optionsToMod.put(installOption, mod);
             }
         }
     }