qwq

Author: CiiLu

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/MainPage.java

@@ -494,10 +494,10 @@ public void onClink() {
                 onUpgrade();
             } else if (updateState.get() == State.DOWNLOADING) {
                 Controllers.dialog(new UpgradeDialog(latestVersion.get(), null));
-            } else if (updateState.get() == State.SUCCESS) {
+            } else if (updateState.get() == State.SUCCESS && !UPDATE_MODE.equals(EnumUpdateMode.SILENT)) {
                 Task.runAsync(() -> {
                     try {
-                        UpdateHandler.finishUpdate(downloadedHmcl, UPDATE_MODE == EnumUpdateMode.SILENT);
+                        UpdateHandler.finishUpdate(downloadedHmcl, false);
                     } catch (IOException e) {
                         LOG.warning("Failed to apply update", e);
                         javafx.application.Platform.runLater(() -> {

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/HMCLDownloadTask.java

@@ -19,38 +19,10 @@
 
 import org.jackhuang.hmcl.task.FileDownloadTask;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
 
 public final class HMCLDownloadTask extends FileDownloadTask {
-
-    private final RemoteVersion.Type archiveFormat;
-
     public HMCLDownloadTask(RemoteVersion version, Path target) {
         super(version.url(), target, version.integrityCheck());
-        archiveFormat = version.type();
-    }
-
-    @Override
-    public void execute() throws Exception {
-        super.execute();
-
-        try {
-            Path target = getPath();
-            switch (archiveFormat) {
-                case JAR:
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unknown format: " + archiveFormat);
-            }
-        } catch (Throwable e) {
-            try {
-                Files.deleteIfExists(getPath());
-            } catch (Throwable e2) {
-                e.addSuppressed(e2);
-            }
-            throw e;
-        }
     }
-
 }

HMCL/src/main/java/org/jackhuang/hmcl/upgrade/RemoteVersion.java

@@ -23,12 +23,11 @@
 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 record RemoteVersion(UpdateChannel channel, String version, String url, Type type, IntegrityCheck integrityCheck,
+public record RemoteVersion(UpdateChannel channel, String version, String url, IntegrityCheck integrityCheck,
                             boolean preview, boolean force) {
 
     public static RemoteVersion fetch(UpdateChannel channel, boolean preview, String url) throws IOException {
@@ -39,21 +38,12 @@ public static RemoteVersion fetch(UpdateChannel channel, boolean preview, String
             String jarHash = Optional.ofNullable(response.get("jarsha1")).map(JsonElement::getAsString).orElse(null);
             boolean force = Optional.ofNullable(response.get("force")).map(JsonElement::getAsBoolean).orElse(false);
             if (jarUrl != null && jarHash != null) {
-                return new RemoteVersion(channel, version, jarUrl, Type.JAR, new IntegrityCheck("SHA-1", jarHash), preview, force);
+                return new RemoteVersion(channel, version, jarUrl, new IntegrityCheck("SHA-1", jarHash), preview, force);
             } else {
                 throw new IOException("No download url is available");
             }
         } catch (JsonParseException e) {
             throw new IOException("Malformed response", e);
         }
     }
-
-    @Override
-    public @NotNull String toString() {
-        return "[" + version + " from " + url + "]";
-    }
-
-    public enum Type {
-        JAR
-    }
 }