Added/fixed #124

LMH01 · Feb 28, 2023 · 6802264 · 6802264
1 parent 379ab81
commit 6802264
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -9,6 +9,7 @@
 - `PIC` entry is no longer added to export toml file as this was redundant and could caused confusion
 - Added new update channel: Beta
 - The dependencies section is no longer required when contents are imported, this cleans up .toml files immensely and makes it easier to modify and replace content
+- Dependency replacement now contains content that is currently being imported (fr #124)
 
 ### Bug fixes
 - Fixed NullPointException when no `requires_pictures` key was set in any mod map inside the `.toml` file when mods where imported

diff --git a/docs/changelog_dev.md b/docs/changelog_dev.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [v4.9.0-beta3]
+
+### Other
+- Dependency replacement now contains content that is currently being imported (fr #124)
+
 ## [v4.9.0-beta2]
 
 ### Other

diff --git a/src/main/java/com/github/lmh01/mgt2mt/MadGamesTycoon2ModTool.java b/src/main/java/com/github/lmh01/mgt2mt/MadGamesTycoon2ModTool.java
@@ -19,7 +19,7 @@
 public class MadGamesTycoon2ModTool {
     public static final OSType OS_TYPE;
     private static final Logger LOGGER = LoggerFactory.getLogger(MadGamesTycoon2ModTool.class);
-    public static final String VERSION = "4.9.0-beta2";//Version numbers that include "dev" are not checked for updates / tool will notify if update is available
+    public static final String VERSION = "4.9.0-dev";//Version numbers that include "dev" are not checked for updates / tool will notify if update is available
     public static final String CURRENT_RELEASE_VERSION = "4.8.0";//When this version number has been detected as the newest release version the update available message is held back
 
     static {

diff --git a/src/main/java/com/github/lmh01/mgt2mt/util/Utils.java b/src/main/java/com/github/lmh01/mgt2mt/util/Utils.java
@@ -526,7 +526,7 @@ public static void open(Path path) {
      * @param arrayList The array list that should be converted
      * @return Returns a string array
      */
-    public static String[] convertArrayListToArray(ArrayList<String> arrayList) {
+    public static String[] convertArrayListToArray(List<String> arrayList) {
         String[] strings = new String[arrayList.size()];
         strings = arrayList.toArray(strings);
         return strings;

diff --git a/src/main/java/com/github/lmh01/mgt2mt/util/manager/SharingManager.java b/src/main/java/com/github/lmh01/mgt2mt/util/manager/SharingManager.java
@@ -744,6 +744,7 @@ private static boolean checkAssetsFolders(Set<Map<String, Object>> mods) {
     @SuppressWarnings("unchecked")
     private static Set<Map<String, Object>> checkDependencies(Set<Map<String, Object>> mods) throws ModProcessingException {
         ContentAdministrator.analyzeContents();
+        Map<BaseContentManager, List<String>> contentNames = getContentNames(mods);
         TextAreaHelper.appendText(I18n.INSTANCE.get("textArea.importAll.checkingDependencies"));
         ProgressBarHelper.initializeProgressBar(0, mods.size(), I18n.INSTANCE.get("textArea.importAll.checkingDependencies"));
         Map<BaseContentManager, Map<String, String>> alreadyReplacedDependencies = new HashMap<>();
@@ -785,7 +786,7 @@ private static Set<Map<String, Object>> checkDependencies(Set<Map<String, Object
                             }
                             // Ask the user with which content the missing dependency should be replaced
                             JLabel label1 = new JLabel("<html>" + I18n.INSTANCE.get("textArea.importAll.dependencyCheck.optionPane.part1") + ":<br><br>" + child.getTypeUpperCase() + " - " + childName + "<br><br>" + I18n.INSTANCE.get("textArea.importAll.dependencyCheck.optionPane.part2"));
-                            JList<String> list = WindowHelper.getList(child.getContentByAlphabet(), false);
+                            JList<String> list = WindowHelper.getList(Utils.convertArrayListToArray(contentNames.get(child)), false);
                             JScrollPane scrollPane = WindowHelper.getScrollPane(list);
                             JLabel label2 = new JLabel("<html>" + I18n.INSTANCE.get("textArea.importAll.dependencyCheck.optionPane.part3"));
                             JCheckBox checkBox = new JCheckBox(I18n.INSTANCE.get("textArea.importAll.dependencyCheck.optionPane.checkBox"));
@@ -925,6 +926,26 @@ private static void replaceDependencyInDependencyMap(Map<String, Object> parentM
         }
     }
 
+    /**
+     * @param mods All maps for the new contents.
+     * @return Map that contains all content names for the specific content. Includes new content as well as already added content.
+     */
+    private static Map<BaseContentManager, List<String>> getContentNames(Set<Map<String, Object>> mods) throws ModProcessingException {
+        Map<BaseContentManager, List<String>> contentNames = new HashMap<>();
+        for (BaseContentManager contentManager : ContentAdministrator.contentManagers) {
+            List<String> names = new ArrayList<>();
+            for (Map<String, Object> map : mods) {
+                if (map.get("mod_type").equals(contentManager.getId())) {
+                    names.add((String)map.get("NAME EN"));
+                }
+            }
+            names.addAll(Arrays.asList(contentManager.getContentByAlphabet()));
+            names.sort(String::compareTo);
+            contentNames.put(contentManager, names);
+        }
+        return contentNames;
+    }
+
     /**
      * Checks if the import map contains the mod name under the mod_type
      *