From 110149d0e65604b8fcfc361b6154e410a3cd4d53 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 16 Jun 2018 23:14:04 +0800
Subject: [PATCH] =?UTF-8?q?AuthlibInjectorAccountFactory=E7=9A=84addtional?=
 =?UTF-8?q?Data=E6=94=B9=E4=B8=BAAuthlibInjectorServer=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jackhuang/hmcl/ui/AddAccountPane.java   | 2 +-
 HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java     | 1 +
 .../authlibinjector/AuthlibInjectorAccountFactory.java    | 8 ++------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
index 13f49eb80..7fc653ed2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
@@ -144,7 +144,7 @@ public class AddAccountPane extends StackPane {
                 factory = Accounts.ACCOUNT_FACTORY.get(Accounts.AUTHLIB_INJECTOR_ACCOUNT_KEY);
                 Optional<AuthlibInjectorServer> server = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem());
                 if (server.isPresent()) {
-                    addtionalData = server.get().getUrl();
+                    addtionalData = server.get();
                 } else {
                     lblCreationWarning.setText(Launcher.i18n("account.failed.no_selected_server"));
                     return;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
index 7d80a6217..27a2e9aa0 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java
@@ -46,6 +46,7 @@ import javafx.util.Duration;
 import javafx.util.StringConverter;
 
 import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccountFactory.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccountFactory.java
index eb5189d4b..1cecb7fc6 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccountFactory.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/auth/authlibinjector/AuthlibInjectorAccountFactory.java
@@ -6,7 +6,6 @@ import org.jackhuang.hmcl.auth.CharacterSelector;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilSession;
 import org.jackhuang.hmcl.util.ExceptionalSupplier;
-import org.jackhuang.hmcl.util.NetworkUtils;
 
 import java.net.Proxy;
 import java.util.Map;
@@ -28,16 +27,13 @@ public class AuthlibInjectorAccountFactory extends AccountFactory<AuthlibInjecto
     }
 
     @Override
-    public AuthlibInjectorAccount create(CharacterSelector selector, String username, String password, Object apiRoot, Proxy proxy) throws AuthenticationException {
+    public AuthlibInjectorAccount create(CharacterSelector selector, String username, String password, Object additionalData, Proxy proxy) throws AuthenticationException {
         Objects.requireNonNull(selector);
         Objects.requireNonNull(username);
         Objects.requireNonNull(password);
         Objects.requireNonNull(proxy);
 
-        if (!(apiRoot instanceof String) || !NetworkUtils.isURL((String) apiRoot))
-            throw new IllegalArgumentException("Additional data should be API root string for authlib injector accounts.");
-
-        AuthlibInjectorServer server = serverLookup.apply((String) apiRoot);
+        AuthlibInjectorServer server = (AuthlibInjectorServer) additionalData;
 
         AuthlibInjectorAccount account = new AuthlibInjectorAccount(new YggdrasilService(new AuthlibInjectorProvider(server.getUrl()), proxy),
                 server, injectorJarPathSupplier, username, null, null);