Merge pull request #468 from yushijinhun/authlib-injector-ali

支持 authlib-injector API 地址指示

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java

@@ -31,6 +31,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
@@ -278,6 +279,8 @@ public class AddAccountPane extends StackPane {
                     return i18n("account.failed.invalid_password");
             }
             return exception.getMessage();
+        } else if (exception instanceof AuthlibInjectorDownloadException) {
+            return i18n("account.failed.injector_download_failure");
         } else {
             return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
         }

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java

@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
 
-import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
@@ -39,7 +38,6 @@ import java.io.IOException;
 
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
-import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
@@ -70,24 +68,13 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
         transitionHandler = new TransitionHandler(addServerContainer);
         transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
 
-        btnAddNext.disableProperty().bind(
-                Bindings.createBooleanBinding(txtServerUrl::validate, txtServerUrl.textProperty()).not());
+        btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
         nextPane.hideSpinner();
-
-        txtServerUrl.setText("https://");
     }
 
     @Override
     public void onDialogShown() {
         txtServerUrl.requestFocus();
-        txtServerUrl.selectEnd();
-    }
-
-    private String fixInputUrl(String url) {
-        if (!url.endsWith("/")) {
-            url += "/";
-        }
-        return url;
     }
 
     private String resolveFetchExceptionMessage(Throwable exception) {
@@ -110,13 +97,13 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa
 
         lblCreationWarning.setText("");
 
-        String url = fixInputUrl(txtServerUrl.getText());
+        String url = txtServerUrl.getText();
 
         nextPane.showSpinner();
         addServerPane.setDisable(true);
 
         Task.of(() -> {
-            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
+            serverBeingAdded = AuthlibInjectorServer.locateServer(url);
         }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
             addServerPane.setDisable(false);
             nextPane.hideSpinner();

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/URLValidator.java

@@ -1,37 +0,0 @@
-package org.jackhuang.hmcl.ui.construct;
-
-import com.jfoenix.validation.base.ValidatorBase;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.control.TextInputControl;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class URLValidator extends ValidatorBase {
-
-    private final ObservableList<String> protocols = FXCollections.observableArrayList();
-
-    public URLValidator() {
-        super();
-    }
-
-    public ObservableList<String> getProtocols() {
-        return protocols;
-    }
-
-    @Override
-    protected void eval() {
-        if (srcControl.get() instanceof TextInputControl) {
-            try {
-                URL url = new URL(((TextInputControl) srcControl.get()).getText());
-                if (protocols.isEmpty())
-                    hasErrors.set(false);
-                else
-                    hasErrors.set(!protocols.contains(url.getProtocol()));
-            } catch (MalformedURLException e) {
-                hasErrors.set(true);
-            }
-        }
-    }
-}

HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml

@@ -4,7 +4,6 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>
-<?import org.jackhuang.hmcl.ui.construct.URLValidator?>
 <?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>
 
 <fx:root xmlns="http://javafx.com/javafx"
@@ -16,16 +15,7 @@
                 <Label text="%account.injector.add" />
             </heading>
             <body>
-                <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url" onAction="#onAddNext">
-                    <validators>
-                        <URLValidator message="%input.url">
-                            <protocols>
-                                <String fx:value="http" />
-                                <String fx:value="https" />
-                            </protocols>
-                        </URLValidator>
-                    </validators>
-                </JFXTextField>
+                <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url" onAction="#onAddNext" />
             </body>
             <actions>
                 <Label fx:id="lblCreationWarning" />

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -36,6 +36,7 @@ account.create=Create a new account
 account.email=Email
 account.failed.connect_authentication_server=Cannot connect to the authentication server. Check your network.
 account.failed.connect_injector_server=Cannot connect to the authentication server. Check your network and ensure the URL is correct.
+account.failed.injector_download_failure=Failed to download authlib-injector. Check your network and try switching to another download source.
 account.failed.invalid_credentials=Incorrect password, or you are forbidden to login temporarily.
 account.failed.invalid_password=Invalid password
 account.failed.invalid_token=Please log out and re-input your password to login.

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -36,6 +36,7 @@ account.create=建立帳戶
 account.email=電子信箱
 account.failed.connect_authentication_server=無法連接認證伺服器，可能是網路問題
 account.failed.connect_injector_server=無法連接認證伺服器，可能是網路故障或 URL 輸入錯誤
+account.failed.injector_download_failure=無法下載 authlib-injector，請檢查網路或嘗試切換下載源
 account.failed.invalid_credentials=您的使用者名稱或密碼錯誤，或者登入次數過多被暫時禁止登入，請稍後再試
 account.failed.invalid_password=無效的密碼
 account.failed.invalid_token=請嘗試登出並重新輸入密碼登入

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -36,6 +36,7 @@ account.create=新建账户
 account.email=邮箱
 account.failed.connect_authentication_server=无法连接认证服务器，可能是网络问题
 account.failed.connect_injector_server=无法连接认证服务器，可能是网络故障或 URL 输入错误
+account.failed.injector_download_failure=无法下载 authlib-injector，请检查网络或尝试切换下载源
 account.failed.invalid_credentials=您的用户名或密码错误，或者登录次数过多被暂时禁止登录，请稍后再试
 account.failed.invalid_password=无效的密码
 account.failed.invalid_token=请尝试登出并重新输入密码登录