Fix invisible

Author: illa4257

FlashLauncherRepo.iml

@@ -2,10 +2,12 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="FlashLauncher" />
-    <orderEntry type="module" module-name="AdvancedAPICore" />
+    <orderEntry type="module" module-name="FlashLauncher" scope="PROVIDED" />
+    <orderEntry type="module" module-name="AdvancedAPICore" scope="PROVIDED" />
   </component>
 </module>

generator/src/GHInfo.java

@@ -1,4 +1,5 @@
 import Utils.IniGroup;
+import Utils.ListMap;
 import Utils.Pair;
 import Utils.Version;
 import Utils.json.Json;
@@ -78,7 +79,7 @@ private void parse(final String url) throws Throwable {
                 dependencies.put(name, version);
             }
         final String launcherVersions = dependencies.getAsStringOrDefault("flash-launcher", "*");
-        final HashMap<Version, JsonList> repo = Main.official.contains(fullName) ? Main.mainRepo : Main.userRepo;
+        final ListMap<Version, JsonList> repo = Main.official.contains(fullName) ? Main.mainRepo : Main.userRepo;
         boolean added = false;
         for (final Version ver : Main.versions) {
             if (!ver.isCompatibility(launcherVersions)) continue;

generator/src/Main.java

@@ -1,5 +1,6 @@
 import Utils.Core;
 import Utils.IniGroup;
+import Utils.ListMap;
 import Utils.Version;
 import Utils.fixed.FixedSet;
 import Utils.json.Json;
@@ -26,8 +27,8 @@ public class Main {
     public static final IniGroup main = new IniGroup();
     public static final IniGroup user = new IniGroup();
 
-    public static final HashMap<Version, JsonList> mainRepo = new HashMap<>();
-    public static final HashMap<Version, JsonList> userRepo = new HashMap<>();
+    public static final ListMap<Version, JsonList> mainRepo = new ListMap<>();
+    public static final ListMap<Version, JsonList> userRepo = new ListMap<>();
 
     public static int mi = 0, ui = 0;
 
@@ -79,12 +80,12 @@ public static void main(final String[] args) {
             System.out.println("Exporting ...");
             for (final Map.Entry<Version, JsonList> e : mainRepo.entrySet()) {
                 final String hash = save("main/main-" + mi, e.getValue());
-                main.getAsGroup(e.getKey().toString()).put(hash, "main-" + mi + ".json");
+                main.getAsGroup(e.getKey().toString()).put(hash, "main/main-" + mi + ".json");
                 mi++;
             }
             for (final Map.Entry<Version, JsonList> e : userRepo.entrySet()) {
                 final String hash = save("user/user-" + ui, e.getValue());
-                user.getAsGroup(e.getKey().toString()).put(hash, "user-" + ui + ".json");
+                user.getAsGroup(e.getKey().toString()).put(hash, "user/user-" + ui + ".json");
                 ui++;
             }
             new FileOutputStream("main/main.ini") {{