feat(account): show little-skin login method by default. Closes #1622.

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccountFactory.java

@@ -33,8 +33,8 @@ import java.util.function.Function;
 import static org.jackhuang.hmcl.util.Lang.tryCast;
 
 public class AuthlibInjectorAccountFactory extends AccountFactory<AuthlibInjectorAccount> {
-    private AuthlibInjectorArtifactProvider downloader;
-    private Function<String, AuthlibInjectorServer> serverLookup;
+    private final AuthlibInjectorArtifactProvider downloader;
+    private final Function<String, AuthlibInjectorServer> serverLookup;
 
     /**
      * @param serverLookup a function that looks up {@link AuthlibInjectorServer} by url
@@ -64,14 +64,17 @@ public class AuthlibInjectorAccountFactory extends AccountFactory<AuthlibInjecto
     public AuthlibInjectorAccount fromStorage(Map<Object, Object> storage) {
         Objects.requireNonNull(storage);
 
+        String apiRoot = tryCast(storage.get("serverBaseURL"), String.class)
+                .orElseThrow(() -> new IllegalArgumentException("storage does not have API root."));
+        AuthlibInjectorServer server = serverLookup.apply(apiRoot);
+        return fromStorage(storage, downloader, server);
+    }
+
+    static AuthlibInjectorAccount fromStorage(Map<Object, Object> storage, AuthlibInjectorArtifactProvider downloader, AuthlibInjectorServer server) {
         YggdrasilSession session = YggdrasilSession.fromStorage(storage);
 
         String username = tryCast(storage.get("username"), String.class)
                 .orElseThrow(() -> new IllegalArgumentException("storage does not have username"));
-        String apiRoot = tryCast(storage.get("serverBaseURL"), String.class)
-                .orElseThrow(() -> new IllegalArgumentException("storage does not have API root."));
-
-        AuthlibInjectorServer server = serverLookup.apply(apiRoot);
 
         tryCast(storage.get("profileProperties"), Map.class).ifPresent(
                 it -> {

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/BoundAuthlibInjectorAccountFactory.java

@@ -0,0 +1,61 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2020  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.auth.authlibinjector;
+
+import org.jackhuang.hmcl.auth.AccountFactory;
+import org.jackhuang.hmcl.auth.AuthenticationException;
+import org.jackhuang.hmcl.auth.CharacterSelector;
+
+import java.util.Map;
+import java.util.Objects;
+
+public class BoundAuthlibInjectorAccountFactory extends AccountFactory<AuthlibInjectorAccount> {
+    private final AuthlibInjectorArtifactProvider downloader;
+    private final AuthlibInjectorServer server;
+
+    /**
+     * @param server Authlib-Injector Server
+     */
+    public BoundAuthlibInjectorAccountFactory(AuthlibInjectorArtifactProvider downloader, AuthlibInjectorServer server) {
+        this.downloader = downloader;
+        this.server = server;
+    }
+
+    @Override
+    public AccountLoginType getLoginType() {
+        return AccountLoginType.USERNAME_PASSWORD;
+    }
+
+    public AuthlibInjectorServer getServer() {
+        return server;
+    }
+
+    @Override
+    public AuthlibInjectorAccount create(CharacterSelector selector, String username, String password, ProgressCallback progressCallback, Object additionalData) throws AuthenticationException {
+        Objects.requireNonNull(selector);
+        Objects.requireNonNull(username);
+        Objects.requireNonNull(password);
+
+        return new AuthlibInjectorAccount(server, downloader, username, password, selector);
+    }
+
+    @Override
+    public AuthlibInjectorAccount fromStorage(Map<Object, Object> storage) {
+        return AuthlibInjectorAccountFactory.fromStorage(storage, downloader, server);
+    }
+}

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/yggdrasil/YggdrasilSession.java

@@ -78,6 +78,8 @@ public class YggdrasilSession {
     }
 
     public static YggdrasilSession fromStorage(Map<?, ?> storage) {
+        Objects.requireNonNull(storage);
+
         UUID uuid = tryCast(storage.get("uuid"), String.class).map(UUIDTypeAdapter::fromString).orElseThrow(() -> new IllegalArgumentException("uuid is missing"));
         String name = tryCast(storage.get("displayName"), String.class).orElseThrow(() -> new IllegalArgumentException("displayName is missing"));
         String clientToken = tryCast(storage.get("clientToken"), String.class).orElseThrow(() -> new IllegalArgumentException("clientToken is missing"));