Fix #2470 Enhance the behavior of authlib-injector.json (#2471)

* Fix #2470

* Revert "Fix #2470"

This reverts commit b0f391021cb5b38d80556f854695d1600afb4a95.

* Refactor Behavior

* Simpify AuthlibInjectorServers.

* Fix merge

* Fix checkstyle.

* Recover the validation of AuthlibInjectorServers.

HMCL/src/main/java/org/jackhuang/hmcl/setting/AuthlibInjectorServers.java

@@ -22,70 +22,76 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.gson.TolerableValidationException;
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 
-public class AuthlibInjectorServers implements Validation {
+public final class AuthlibInjectorServers implements Validation {
 
     public static final String CONFIG_FILENAME = "authlib-injectors.json";
 
+    private static final Set<AuthlibInjectorServer> servers = new CopyOnWriteArraySet<>();
+
+    public static Set<AuthlibInjectorServer> getServers() {
+        return servers;
+    }
+
     private final List<String> urls;
 
-    public AuthlibInjectorServers(List<String> urls) {
+    private AuthlibInjectorServers(List<String> urls) {
         this.urls = urls;
     }
 
-    public List<String> getUrls() {
-        return urls;
-    }
-
     @Override
-    public void validate() throws JsonParseException {
+    public void validate() throws JsonParseException, TolerableValidationException {
-        if (urls == null)
+        if (this.urls == null) {
-            throw new JsonParseException("authlib-injectors.json -> urls cannot be null");
+            throw new JsonParseException("authlib-injectors.json -> urls cannot be null.");
+        }
     }
 
-    private static final Path configLocation = Paths.get(CONFIG_FILENAME);
+    public static void init() {
-    private static AuthlibInjectorServers configInstance;
+        Path configLocation;
-
+        Path jarPath = JarUtils.thisJarPath();
-    public synchronized static void init() {
+        if (jarPath != null && Files.isRegularFile(jarPath) && Files.isWritable(jarPath)) {
-        if (configInstance != null) {
+            configLocation = jarPath.getParent().resolve(CONFIG_FILENAME);
-            throw new IllegalStateException("AuthlibInjectorServers is already loaded");
+        } else {
+            configLocation = Paths.get(CONFIG_FILENAME);
         }
 
-        configInstance = new AuthlibInjectorServers(Collections.emptyList());
+        if (ConfigHolder.isNewlyCreated() && Files.exists(configLocation)) {
-
+            AuthlibInjectorServers configInstance;
-        if (Files.exists(configLocation)) {
             try {
                 String content = FileUtils.readText(configLocation);
                 configInstance = JsonUtils.GSON.fromJson(content, AuthlibInjectorServers.class);
             } catch (IOException | JsonParseException e) {
                 LOG.log(Level.WARNING, "Malformed authlib-injectors.json", e);
+                return;
+            }
+
+            if (!configInstance.urls.isEmpty()) {
+                config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
+                for (String url : configInstance.urls) {
+                    Task.supplyAsync(Schedulers.io(), () -> AuthlibInjectorServer.locateServer(url))
+                            .thenAcceptAsync(Schedulers.javafx(), server -> {
+                                config().getAuthlibInjectorServers().add(server);
+                                servers.add(server);
+                            })
+                            .start();
+                }
             }
         }
-
-        if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
-            config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
-            for (String url : AuthlibInjectorServers.getConfigInstance().getUrls()) {
-                Task.supplyAsync(Schedulers.io(), () -> AuthlibInjectorServer.locateServer(url))
-                        .thenAcceptAsync(Schedulers.javafx(), server -> config().getAuthlibInjectorServers().add(server))
-                        .start();
-            }
-        }
-    }
-
-    public static AuthlibInjectorServers getConfigInstance() {
-        return configInstance;
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java

@@ -21,14 +21,13 @@ import com.jfoenix.controls.JFXButton;
 import javafx.application.Platform;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.game.GameDirectoryType;
 import org.jackhuang.hmcl.game.GameRepository;
 import org.jackhuang.hmcl.game.LauncherHelper;
 import org.jackhuang.hmcl.mod.RemoteMod;
-import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
@@ -244,7 +243,19 @@ public final class Versions {
 
     private static void ensureSelectedAccount(Consumer<Account> action) {
         Account account = Accounts.getSelectedAccount();
-        if (account == null) {
+        if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getServers().isEmpty() &&
+                !(account instanceof AuthlibInjectorAccount && AuthlibInjectorServers.getServers().contains(((AuthlibInjectorAccount) account).getServer()))) {
+            CreateAccountPane dialog = new CreateAccountPane(AuthlibInjectorServers.getServers().iterator().next());
+            dialog.addEventHandler(DialogCloseEvent.CLOSE, e -> {
+                Account newAccount = Accounts.getSelectedAccount();
+                if (newAccount == null) {
+                    // user cancelled operation
+                } else {
+                    Platform.runLater(() -> action.accept(newAccount));
+                }
+            });
+            Controllers.dialog(dialog);
+        } else if (account == null) {
             CreateAccountPane dialog = new CreateAccountPane();
             dialog.addEventHandler(DialogCloseEvent.CLOSE, e -> {
                 Account newAccount = Accounts.getSelectedAccount();