diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java index 3673fb9ea..d295404d3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.TreeMap; import org.jackhuang.hmcl.Launcher; -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo; +import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; import com.google.gson.annotations.SerializedName; @@ -99,7 +99,7 @@ public final class Config implements Cloneable { @SerializedName("logLines") public final IntegerProperty logLines = new SimpleIntegerProperty(100); - public final ObservableList authlibInjectorServers = FXCollections.observableArrayList(); + public final ObservableList authlibInjectorServers = FXCollections.observableArrayList(); @Override public Config clone() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java index 51fa60681..b446ad3e2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java @@ -36,7 +36,7 @@ import org.jackhuang.hmcl.Launcher; import org.jackhuang.hmcl.auth.Account; import org.jackhuang.hmcl.auth.AccountFactory; import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount; -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo; +import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.event.*; import org.jackhuang.hmcl.task.Schedulers; @@ -314,13 +314,13 @@ public class Settings { private Set getAuthlibInjectorServerUrls() { return SETTINGS.authlibInjectorServers.stream() - .map(AuthlibInjectorServerInfo::getServerIp) + .map(AuthlibInjectorServer::getUrl) .collect(toSet()); } /** * The {@code serverBaseURL} specified in {@link AuthlibInjectorAccount} may not have an associated - * {@link AuthlibInjectorServerInfo} in {@link Config#authlibInjectorServers}, + * {@link AuthlibInjectorServer} in {@link Config#authlibInjectorServers}, * which usually happens when migrating data from an older version. * This method adds the missing servers to {@link Config#authlibInjectorServers}. */ @@ -340,12 +340,12 @@ public class Settings { serverName = url; Logging.LOG.log(Level.WARNING, "Failed to migrate authlib injector server [" + url + "]", e); } - SETTINGS.authlibInjectorServers.add(new AuthlibInjectorServerInfo(url, serverName)); + SETTINGS.authlibInjectorServers.add(new AuthlibInjectorServer(url, serverName)); }); } /** - * After an {@link AuthlibInjectorServerInfo} is removed, the associated accounts should also be removed. + * After an {@link AuthlibInjectorServer} is removed, the associated accounts should also be removed. * This method performs a check and removes the dangling accounts. * Don't call this before {@link #migrateAuthlibInjectorServers()} is called, otherwise old data would be lost. */ 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 df51d7378..98e9b6e9b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java @@ -110,7 +110,7 @@ public class AddAccountPane extends StackPane { private void loadServers() { cboServers.getItems().setAll( Settings.INSTANCE.SETTINGS.authlibInjectorServers.stream() - .map(server -> new TwoLineListItem(server.getServerName(), server.getServerIp())) + .map(server -> new TwoLineListItem(server.getName(), server.getUrl())) .collect(toList())); if (!cboServers.getItems().isEmpty()) cboServers.getSelectionModel().select(0); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java index 09df2e5fb..f5c874dfc 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServerItem.java @@ -23,19 +23,19 @@ import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.layout.BorderPane; import javafx.scene.layout.VBox; -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo; +import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; import org.jackhuang.hmcl.setting.Theme; import java.util.function.Consumer; public final class AuthlibInjectorServerItem extends BorderPane { - private final AuthlibInjectorServerInfo info; + private final AuthlibInjectorServer server; private final Label lblServerName = new Label(); private final Label lblServerIp = new Label(); - public AuthlibInjectorServerItem(AuthlibInjectorServerInfo info, Consumer deleteCallback) { - this.info = info; + public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer deleteCallback) { + this.server = server; lblServerName.setStyle("-fx-font-size: 15;"); lblServerIp.setStyle("-fx-font-size: 10;"); @@ -54,11 +54,11 @@ public final class AuthlibInjectorServerItem extends BorderPane { setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;"); JFXDepthManager.setDepth(this, 1); - lblServerName.setText(info.getServerName()); - lblServerIp.setText(info.getServerIp()); + lblServerName.setText(server.getName()); + lblServerIp.setText(server.getUrl()); } - public AuthlibInjectorServerInfo getInfo() { - return info; + public AuthlibInjectorServer getServer() { + return server; } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java index 959429291..23ee6dc05 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java @@ -9,7 +9,7 @@ import javafx.scene.control.ScrollPane; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import org.jackhuang.hmcl.Launcher; -import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo; +import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer; import org.jackhuang.hmcl.setting.Accounts; import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.task.Schedulers; @@ -26,12 +26,12 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa @FXML private ScrollPane scrollPane; @FXML private StackPane addServerContainer; - @FXML private Label lblServerIp; + @FXML private Label lblServerUrl; @FXML private Label lblServerName; @FXML private Label lblCreationWarning; @FXML private Label lblServerWarning; @FXML private VBox listPane; - @FXML private JFXTextField txtServerIp; + @FXML private JFXTextField txtServerUrl; @FXML private JFXDialogLayout addServerPane; @FXML private JFXDialogLayout confirmServerPane; @FXML private JFXDialog dialog; @@ -41,7 +41,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa private final TransitionHandler transitionHandler; - private AuthlibInjectorServerInfo serverBeingAdded; + private AuthlibInjectorServer serverBeingAdded; { FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml"); @@ -51,14 +51,14 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa getChildren().remove(dialog); dialog.setDialogContainer(this); - txtServerIp.textProperty().addListener((a, b, newValue) -> - btnAddNext.setDisable(!txtServerIp.validate())); + txtServerUrl.textProperty().addListener((a, b, newValue) -> + btnAddNext.setDisable(!txtServerUrl.validate())); reload(); } private void removeServer(AuthlibInjectorServerItem item) { - Settings.INSTANCE.SETTINGS.authlibInjectorServers.remove(item.getInfo()); + Settings.INSTANCE.SETTINGS.authlibInjectorServers.remove(item.getServer()); reload(); } @@ -75,7 +75,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa @FXML private void onAdd() { transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer()); - txtServerIp.setText(""); + txtServerUrl.setText(""); addServerPane.setDisable(false); progressBar.setVisible(false); dialog.show(); @@ -88,22 +88,22 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa @FXML private void onAddNext() { - String url = fixInputUrl(txtServerIp.getText()); + String url = fixInputUrl(txtServerUrl.getText()); progressBar.setVisible(true); addServerPane.setDisable(true); Task.of(() -> { - serverBeingAdded = new AuthlibInjectorServerInfo(url, Accounts.getAuthlibInjectorServerName(url)); + serverBeingAdded = new AuthlibInjectorServer(url, Accounts.getAuthlibInjectorServerName(url)); }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> { progressBar.setVisible(false); addServerPane.setDisable(false); if (isDependentsSucceeded) { - lblServerName.setText(serverBeingAdded.getServerName()); - lblServerIp.setText(serverBeingAdded.getServerIp()); + lblServerName.setText(serverBeingAdded.getName()); + lblServerUrl.setText(serverBeingAdded.getUrl()); - lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getServerIp()).getProtocol())); + lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol())); transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer()); } else { diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml index cac3bee5d..e5b4715bd 100644 --- a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml +++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml @@ -31,7 +31,7 @@