diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java index 74c3b79e8b..ff13f2f67a 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/UpgradeDialog.java @@ -50,10 +50,10 @@ public final class UpgradeDialog extends JFXDialogLayout { setHeading(new Label(i18n("update.changelog"))); setBody(new JFXSpinner()); - String url = CHANGELOG_URL + remoteVersion.getChannel().channelName + ".html"; + String url = CHANGELOG_URL + remoteVersion.channel().channelName + ".html"; Task.supplyAsync(Schedulers.io(), () -> { - VersionNumber targetVersion = VersionNumber.asVersion(remoteVersion.getVersion()); + VersionNumber targetVersion = VersionNumber.asVersion(remoteVersion.version()); VersionNumber currentVersion = VersionNumber.asVersion(Metadata.VERSION); if (targetVersion.compareTo(currentVersion) <= 0) // Downgrade update, no need to display changelog diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java index 894f3821ef..3ed51868b5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java @@ -185,7 +185,7 @@ public final class MainPage extends StackPane implements DecoratorPage { prompt.setSubtitle(i18n("update.bubble.subtitle")); prompt.setPickOnBounds(false); prompt.titleProperty().bind(BindingMapping.of(latestVersionProperty()).map(latestVersion -> - latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.getVersion()))); + latestVersion == null ? "" : i18n("update.bubble.title", latestVersion.version()))); hBox.getChildren().setAll(SVG.UPDATE.createIcon(20), prompt); } @@ -281,10 +281,10 @@ public final class MainPage extends StackPane implements DecoratorPage { if (show && !config().isDisableAutoShowUpdateDialog() && getLatestVersion() != null - && !Objects.equals(config().getPromptedVersion(), getLatestVersion().getVersion())) { - Controllers.dialog(new MessageDialogPane.Builder("", i18n("update.bubble.title", getLatestVersion().getVersion()), MessageDialogPane.MessageType.INFO) + && !Objects.equals(config().getPromptedVersion(), getLatestVersion().version())) { + Controllers.dialog(new MessageDialogPane.Builder("", i18n("update.bubble.title", getLatestVersion().version()), MessageDialogPane.MessageType.INFO) .addAction(i18n("button.view"), () -> { - config().setPromptedVersion(getLatestVersion().getVersion()); + config().setPromptedVersion(getLatestVersion().version()); onUpgrade(); }) .addCancel(null) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java index fab04efdc1..9d80ebcefd 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java @@ -157,7 +157,7 @@ public final class SettingsPage extends ScrollPane { updatePane.pseudoClassStateChanged(PseudoClass.getPseudoClass("active"), outdated); if (UpdateChecker.isOutdated()) { - lblUpdateSubProperty.set(i18n("update.newest_version", UpdateChecker.getLatestVersion().getVersion())); + lblUpdateSubProperty.set(i18n("update.newest_version", UpdateChecker.getLatestVersion().version())); } else if (UpdateChecker.isCheckingUpdate()) { lblUpdateSubProperty.set(i18n("update.checking")); } else { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java index a955ae83c1..868c500524 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java @@ -27,8 +27,8 @@ final class HMCLDownloadTask extends FileDownloadTask { private final RemoteVersion.Type archiveFormat; public HMCLDownloadTask(RemoteVersion version, Path target) { - super(version.getUrl(), target, version.getIntegrityCheck()); - archiveFormat = version.getType(); + super(version.url(), target, version.integrityCheck()); + archiveFormat = version.type(); } @Override diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java index 142dcd6b13..b24ce19491 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java @@ -23,11 +23,13 @@ import com.google.gson.JsonParseException; import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck; import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.io.NetworkUtils; +import org.jetbrains.annotations.NotNull; import java.io.IOException; import java.util.Optional; -public final class RemoteVersion { +public record RemoteVersion(UpdateChannel channel, String version, String url, Type type, IntegrityCheck integrityCheck, + boolean preview, boolean force) { public static RemoteVersion fetch(UpdateChannel channel, boolean preview, String url) throws IOException { try { @@ -46,54 +48,8 @@ public final class RemoteVersion { } } - private final UpdateChannel channel; - private final String version; - private final String url; - private final Type type; - private final IntegrityCheck integrityCheck; - private final boolean preview; - private final boolean force; - - public RemoteVersion(UpdateChannel channel, String version, String url, Type type, IntegrityCheck integrityCheck, boolean preview, boolean force) { - this.channel = channel; - this.version = version; - this.url = url; - this.type = type; - this.integrityCheck = integrityCheck; - this.preview = preview; - this.force = force; - } - - public UpdateChannel getChannel() { - return channel; - } - - public String getVersion() { - return version; - } - - public String getUrl() { - return url; - } - - public Type getType() { - return type; - } - - public IntegrityCheck getIntegrityCheck() { - return integrityCheck; - } - - public boolean isPreview() { - return preview; - } - - public boolean isForce() { - return force; - } - @Override - public String toString() { + public @NotNull String toString() { return "[" + version + " from " + url + "]"; } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java index 7d4fa507c6..df15a3fac1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/UpdateChecker.java @@ -43,13 +43,13 @@ public final class UpdateChecker { RemoteVersion latest = latestVersion.get(); if (latest == null || isDevelopmentVersion(Metadata.VERSION)) { return false; - } else if (latest.isForce() + } else if (latest.force() || Metadata.isNightly() - || latest.getChannel() == UpdateChannel.NIGHTLY - || latest.getChannel() != UpdateChannel.getChannel()) { - return !latest.getVersion().equals(Metadata.VERSION); + || latest.channel() == UpdateChannel.NIGHTLY + || latest.channel() != UpdateChannel.getChannel()) { + return !latest.version().equals(Metadata.VERSION); } else { - return VersionNumber.compare(Metadata.VERSION, latest.getVersion()) < 0; + return VersionNumber.compare(Metadata.VERSION, latest.version()) < 0; } }, latestVersion);