lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

在添加authlib-injector服务器的过程中，传递AuthlibInjectorServerInfo而不是url

Browse Source
This commit is contained in:
yushijinhun
2018-06-16 19:01:23 +08:00
parent 92e5eecaf2
commit bfbc4613b9
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
View File

@@ -47,6 +47,8 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
private final TransitionHandler transitionHandler; private final TransitionHandler transitionHandler;
private AuthlibInjectorServerInfo serverBeingAdded;
{ {
FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml"); FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
FXUtils.smoothScrolling(scrollPane); FXUtils.smoothScrolling(scrollPane);
@@ -110,27 +112,29 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
@FXML @FXML
private void onAddNext() { private void onAddNext() {
String serverIp = txtServerIp.getText(); String url = fixInputUrl(txtServerIp.getText());
progressBar.setVisible(true); progressBar.setVisible(true);
addServerPane.setDisable(true); addServerPane.setDisable(true);
Task.ofResult("serverName", () -> Accounts.getAuthlibInjectorServerName(serverIp)) Task.of(() -> {
.finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> { serverBeingAdded = new AuthlibInjectorServerInfo(url, Accounts.getAuthlibInjectorServerName(url));
}).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
progressBar.setVisible(false); progressBar.setVisible(false);
addServerPane.setDisable(false); addServerPane.setDisable(false);
if (isDependentsSucceeded) { if (isDependentsSucceeded) {
lblServerName.setText(variables.get("serverName")); lblServerName.setText(serverBeingAdded.getServerName());
lblServerIp.setText(txtServerIp.getText()); lblServerIp.setText(serverBeingAdded.getServerIp());
lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverIp).getProtocol())); lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getServerIp()).getProtocol()));
transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer()); transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
} else } else {
lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage()); lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage());
}
}).start(); }).start();
} }
@FXML @FXML
@@ -140,10 +144,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
@FXML @FXML
private void onAddFinish() { private void onAddFinish() {
String ip = txtServerIp.getText(); Settings.INSTANCE.addAuthlibInjectorServerURL(serverBeingAdded.getServerIp());
if (!ip.endsWith("/"))
ip += "/";
Settings.INSTANCE.addAuthlibInjectorServerURL(ip);
loading(); loading();
dialog.close(); dialog.close();
} }
@@ -160,4 +161,11 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
public void setTitle(String title) { public void setTitle(String title) {
this.title.set(title); this.title.set(title);
} }
private String fixInputUrl(String url) {
if (!url.endsWith("/")) {
url += "/";
}
return url;
}
} }