Fix #303

HMCL/build.gradle

@@ -18,7 +18,7 @@ if (buildnumber == null)
 
 def versionroot = System.getenv("VERSION_ROOT")
 if (versionroot == null)
-    versionroot = "3.0"
+    versionroot = "3.1"
 
 String mavenVersion = versionroot + '.' + buildnumber
 version = mavenVersion

HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java

@@ -49,6 +49,14 @@ public final class Launcher extends Application {
             Controllers.initialize(primaryStage);
             primaryStage.setResizable(false);
             primaryStage.setScene(Controllers.getScene());
+
+            UPDATE_CHECKER.process(false)
+                    .then(Task.of(Schedulers.javafx(), () -> {
+                        if (UPDATE_CHECKER.isOutOfDate())
+                            Controllers.showUpdate();
+                    }))
+                    .start();
+
             primaryStage.show();
         } catch (Throwable e) {
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
@@ -59,19 +67,14 @@ public final class Launcher extends Application {
         Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
 
         try {
+            Logging.start();
+
             // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
             Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
             UPGRADER.parseArguments(VersionNumber.asVersion(VERSION), Arrays.asList(args));
 
             Logging.LOG.info("*** " + TITLE + " ***");
 
-            UPDATE_CHECKER.process(false)
-                    .then(Task.of(Schedulers.javafx(), () -> {
-                        if (UPDATE_CHECKER.isOutOfDate())
-                            Controllers.showUpdate();
-                    }))
-                    .start();
-
             launch(args);
         } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
             CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);

HMCL/src/main/java/org/jackhuang/hmcl/Main.java

@@ -26,9 +26,8 @@ public final class Main {
 
     public static void main(String[] args) {
         String currentDirectory = new File("").getAbsolutePath();
-        Logging.LOG.info("Current directory: " + currentDirectory);
         if (currentDirectory.contains("!")) {
-            Logging.LOG.severe("Exclamation mark(!) is not allowed in the path where HMCL is in. Forcibly exit.");
+            System.err.println("Exclamation mark(!) is not allowed in the path where HMCL is in. Forcibly exit.");
 
             // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
             String message = "Exclamation mark(!) is not allowed in the path where HMCL is in.\nThe path is " + currentDirectory;

HMCL/src/main/java/org/jackhuang/hmcl/event/AccountLoadingEvent.java

@@ -17,6 +17,13 @@
  */
 package org.jackhuang.hmcl.event;
 
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.util.ToStringBuilder;
+
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * This event gets fired when loading accounts.
  * <br>
@@ -26,14 +33,29 @@ package org.jackhuang.hmcl.event;
  */
 public class AccountLoadingEvent extends Event {
 
+    private final Collection<Account> accounts;
+
     /**
      * Constructor.
      *
      * @param source {@link org.jackhuang.hmcl.setting.Settings}
      */
-    public AccountLoadingEvent(Object source) {
+    public AccountLoadingEvent(Object source, Collection<Account> accounts) {
         super(source);
+        this.accounts = Collections.unmodifiableCollection(accounts);
     }
 
+
+    public Collection<Account> getAccounts() {
+        return accounts;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", source)
+                .append("accounts", accounts)
+                .toString();
+    }
 }
 

HMCL/src/main/java/org/jackhuang/hmcl/event/OutOfDateEvent.java

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.event;
 
+import org.jackhuang.hmcl.util.ToStringBuilder;
 import org.jackhuang.hmcl.util.VersionNumber;
 
 /**
@@ -42,4 +43,11 @@ public final class OutOfDateEvent extends Event {
         return true;
     }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", getSource())
+                .append("version", getVersion())
+                .toString();
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/event/ProfileChangedEvent.java

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.event;
 
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.util.ToStringBuilder;
 
 /**
  * This event gets fired when the selected profile changed.
@@ -44,4 +45,11 @@ public final class ProfileChangedEvent extends Event {
         return profile;
     }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", source)
+                .append("profile", profile)
+                .toString();
+    }
 }

HMCL/src/main/java/org/jackhuang/hmcl/event/ProfileLoadingEvent.java

@@ -17,6 +17,12 @@
  */
 package org.jackhuang.hmcl.event;
 
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.util.ToStringBuilder;
+
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * This event gets fired when loading profiles.
  * <br>
@@ -26,14 +32,29 @@ package org.jackhuang.hmcl.event;
  */
 public class ProfileLoadingEvent extends Event {
 
+    private final Collection<Profile> profiles;
+
     /**
      * Constructor.
      *
      * @param source {@link org.jackhuang.hmcl.setting.Settings}
      */
-    public ProfileLoadingEvent(Object source) {
+    public ProfileLoadingEvent(Object source, Collection<Profile> profiles) {
         super(source);
+
+        this.profiles = Collections.unmodifiableCollection(profiles);
     }
 
+    public Collection<Profile> getProfiles() {
+        return profiles;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", source)
+                .append("profiles", profiles)
+                .toString();
+    }
 }
 

HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java

@@ -173,10 +173,20 @@ public class HMCLGameRepository extends DefaultGameRepository {
         return new File(getVersionRoot(id), "icon.png");
     }
 
-    public void saveVersionSetting(String id) {
+    public boolean saveVersionSetting(String id) {
         if (!versionSettings.containsKey(id))
-            return;
-        Lang.invoke(() -> FileUtils.writeText(getVersionSettingFile(id), GSON.toJson(versionSettings.get(id))));
+            return false;
+        File file = getVersionSettingFile(id);
+        if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
+            return false;
+
+        try {
+            FileUtils.writeText(file, GSON.toJson(versionSettings.get(id)));
+            return true;
+        } catch (IOException e) {
+            Logging.LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
+            return false;
+        }
     }
 
     public boolean forbidsVersion(String id) {

HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java

@@ -50,7 +50,6 @@ public final class LauncherHelper {
     public static final LauncherHelper INSTANCE = new LauncherHelper();
     private LauncherHelper(){}
 
-    private TaskExecutor executor;
     public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
     private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(() -> {});
 
@@ -78,7 +77,7 @@ public final class LauncherHelper {
         VersionSetting setting = profile.getVersionSetting(selectedVersion);
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
-        TaskExecutor executor = this.executor = Task.of(Schedulers.javafx(), () -> Controllers.dialog(launchingStepsPane))
+        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> Controllers.dialog(launchingStepsPane))
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES)))
                 .then(variables -> {
                     if (setting.isNotCheckGame())
@@ -162,8 +161,7 @@ public final class LauncherHelper {
                             Controllers.closeDialog();
                     });
                 }
-
-                LauncherHelper.this.executor = null;
+                launchingStepsPane.setExecutor(null);
             }
         });
 

HMCL/src/main/java/org/jackhuang/hmcl/setting/Profile.java

@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.util.ImmediateObjectProperty;
 import org.jackhuang.hmcl.util.ImmediateStringProperty;
+import org.jackhuang.hmcl.util.ToStringBuilder;
 
 import java.io.File;
 import java.lang.reflect.Type;
@@ -146,6 +147,14 @@ public final class Profile {
             vs.setUsesGlobal(true);
     }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("gameDir", getGameDir())
+                .append("name", getName())
+                .toString();
+    }
+
     public void addPropertyChangedListener(InvalidationListener listener) {
         nameProperty.addListener(listener);
         globalProperty.addListener(listener);

HMCL/src/main/java/org/jackhuang/hmcl/setting/Settings.java

@@ -535,7 +535,7 @@ public class Settings {
     }
 
     private void onProfileChanged() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileChangedEvent(SETTINGS, getSelectedProfile()));
+        EventBus.EVENT_BUS.fireEvent(new ProfileChangedEvent(this, getSelectedProfile()));
         getSelectedProfile().getRepository().refreshVersionsAsync().start();
     }
 
@@ -548,11 +548,11 @@ public class Settings {
      * Invoked by loading GUI phase.
      */
     public void onProfileLoading() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(SETTINGS));
+        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(this, getProfiles()));
         onProfileChanged();
     }
 
     public void onAccountLoading() {
-        EventBus.EVENT_BUS.fireEvent(new AccountLoadingEvent(SETTINGS));
+        EventBus.EVENT_BUS.fireEvent(new AccountLoadingEvent(this, getAccounts()));
     }
 }

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

@@ -17,6 +17,7 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXDialog;
 import javafx.scene.Node;
 import javafx.scene.Scene;

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

@@ -45,6 +45,7 @@ import javafx.scene.shape.Rectangle;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.Theme;
@@ -140,7 +141,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
 
         FXUtils.loadFXML(this, "/assets/fxml/decorator.fxml");
 
-        onCloseButtonAction = new SimpleObjectProperty<>(this, "onCloseButtonAction", primaryStage::close);
+        onCloseButtonAction = new SimpleObjectProperty<>(this, "onCloseButtonAction", Launcher::stopApplication);
 
         primaryStage.initStyle(StageStyle.UNDECORATED);
         btnClose.setGraphic(close);

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

@@ -23,6 +23,7 @@ import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
+import javafx.application.Platform;
 import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -48,7 +49,10 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 
 import static org.jackhuang.hmcl.util.ReflectionHelper.call;
@@ -368,6 +372,31 @@ public final class FXUtils {
         });
     }
 
+    public static <T> T runInUIThread(Supplier<T> supplier) {
+        if (javafx.application.Platform.isFxApplicationThread()) {
+            return supplier.get();
+        } else {
+            CountDownLatch doneLatch = new CountDownLatch(1);
+            AtomicReference<T> reference = new AtomicReference<>();
+            Platform.runLater(() -> {
+                try {
+                    reference.set(supplier.get());
+                } finally {
+                    doneLatch.countDown();
+                }
+
+            });
+
+            try {
+                doneLatch.await();
+            } catch (InterruptedException var3) {
+                Thread.currentThread().interrupt();
+            }
+
+            return reference.get();
+        }
+    }
+
     public static final Image DEFAULT_ICON = new Image("/assets/img/icon.png");
 
     public static final Interpolator SINE = new Interpolator() {

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

@@ -17,10 +17,12 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextInputDialog;
 import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.ui.FXUtils;
 
 import javax.swing.*;
 import java.util.Optional;
@@ -123,30 +125,32 @@ public final class MessageBox {
     }
 
     public static int confirm(String message, String title, int option) {
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle(title);
-        alert.setHeaderText(title);
-        alert.setContentText(message);
-        switch (option) {
-            case YES_NO_OPTION:
-                alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
-                break;
-            case YES_NO_CANCEL_OPTION:
-                alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
-                break;
-            case OK_CANCEL_OPTION:
-                alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
-                break;
-            default:
-                throw new IllegalArgumentException("Unrecognized message box option " + option);
-        }
-        Optional<ButtonType> buttonType = alert.showAndWait();
-        if (!buttonType.isPresent()) return CLOSED_OPTION;
-        else if (buttonType.get() == ButtonType.OK) return OK_OPTION;
-        else if (buttonType.get() == ButtonType.YES) return YES_OPTION;
-        else if (buttonType.get() == ButtonType.NO) return NO_OPTION;
-        else if (buttonType.get() == ButtonType.CANCEL) return CANCEL_OPTION;
-        else throw new IllegalStateException("Unrecognized button type:" + buttonType.get());
+        return FXUtils.runInUIThread(() -> {
+            Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+            alert.setTitle(title);
+            alert.setHeaderText(title);
+            alert.setContentText(message);
+            switch (option) {
+                case YES_NO_OPTION:
+                    alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
+                    break;
+                case YES_NO_CANCEL_OPTION:
+                    alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
+                    break;
+                case OK_CANCEL_OPTION:
+                    alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unrecognized message box option " + option);
+            }
+            Optional<ButtonType> buttonType = alert.showAndWait();
+            if (!buttonType.isPresent()) return CLOSED_OPTION;
+            else if (buttonType.get() == ButtonType.OK) return OK_OPTION;
+            else if (buttonType.get() == ButtonType.YES) return YES_OPTION;
+            else if (buttonType.get() == ButtonType.NO) return NO_OPTION;
+            else if (buttonType.get() == ButtonType.CANCEL) return CANCEL_OPTION;
+            else throw new IllegalStateException("Unexpected button type:" + buttonType.get());
+        });
     }
 
     public static Optional<String> input(String message) {

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

@@ -57,7 +57,9 @@ public class TaskExecutorDialogPane extends StackPane {
 
     public void setExecutor(TaskExecutor executor) {
         this.executor = executor;
-        taskListPane.setExecutor(executor);
+
+        if (executor != null)
+            taskListPane.setExecutor(executor);
     }
 
     public StringProperty titleProperty() {

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java

@@ -89,10 +89,10 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
         chkSnapshot.selectedProperty().addListener(listener);
         chkOld.selectedProperty().addListener(listener);
 
-        list.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-            if (newValue == null)
+        list.setOnMouseClicked(e -> {
+            if (list.getSelectionModel().getSelectedIndex() < 0)
                 return;
-            controller.getSettings().put(libraryId, newValue.getRemoteVersion());
+            controller.getSettings().put(libraryId, list.getSelectionModel().getSelectedItem().getRemoteVersion());
             callback.run();
         });
         refresh();

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

@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.upgrade;
 
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
+import com.jfoenix.concurrency.JFXUtilities;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -54,12 +55,19 @@ public class AppDataUpgrader extends IUpgrader {
             if (mainClass != null) {
                 ArrayList<String> al = new ArrayList<>(args);
                 al.add("--noupdate");
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    new URLClassLoader(new URL[]{jar.toURI().toURL()},
-                            ClassLoader.getSystemClassLoader().getParent()).loadClass(mainClass)
-                            .getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])});
-                    return null;
-                });
+                ClassLoader pre = Thread.currentThread().getContextClassLoader();
+                try {
+                    AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
+                        Logging.stop();
+                        ClassLoader now = new URLClassLoader(new URL[]{jar.toURI().toURL()}, ClassLoader.getSystemClassLoader().getParent());
+                        Thread.currentThread().setContextClassLoader(now);
+                        now.loadClass(mainClass).getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])});
+                        return null;
+                    });
+                } finally {
+                    Logging.start();
+                    Thread.currentThread().setContextClassLoader(pre);
+                }
                 return true;
             }
         }
@@ -96,10 +104,10 @@ public class AppDataUpgrader extends IUpgrader {
         if (!(ver instanceof IntVersionNumber))
             return;
         IntVersionNumber version = (IntVersionNumber) ver;
-        checker.requestDownloadLink().then(Task.of(Schedulers.javafx(), variables -> {
+        checker.requestDownloadLink().then(Task.of(variables -> {
             Map<String, String> map = variables.get(UpdateChecker.REQUEST_DOWNLOAD_LINK_ID);
 
-            if (MessageBox.confirm(Launcher.i18n("update.newest_version") + version.toString() + "\n"
+            if (MessageBox.confirm(Launcher.i18n("update.newest_version", version.toString()) + "\n"
                             + Launcher.i18n("update.should_open_link"),
                     MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION)
                 if (map != null && map.containsKey("jar") && !StringUtils.isBlank(map.get("jar")))
@@ -122,7 +130,7 @@ public class AppDataUpgrader extends IUpgrader {
                         String hash = null;
                         if (map.containsKey("packsha1"))
                             hash = map.get("packsha1");
-                        Controllers.dialog(Launcher.i18n("message.downloading"));
+                        JFXUtilities.runInFX(() -> Controllers.dialog(Launcher.i18n("message.downloading")));
                         if (new AppDataUpgraderPackGzTask(NetworkUtils.toURL(map.get("pack")), version.toString(), hash).test()) {
                             new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderPackGzTask.getSelf(version.toString()).getAbsolutePath())
                                     .directory(new File("").getAbsoluteFile()).start();

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

@@ -115,7 +115,7 @@ public final class UpdateChecker {
             public void execute() {
                 if (download_link == null)
                     try {
-                        download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/update_link.php?type=hmcl")), Map.class);
+                        download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/update_link.php")), Map.class);
                     } catch (JsonSyntaxException | IOException e) {
                         Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e);
                     }

HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java

@@ -37,6 +37,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
     private static final HashMap<String, String> SOURCE = new HashMap<String, String>() {
         {
             put("javafx.fxml.LoadException", Launcher.i18n("crash.NoClassDefFound"));
+            put("Location is not set", Launcher.i18n("crash.NoClassDefFound"));
             put("UnsatisfiedLinkError", Launcher.i18n("crash.user_fault"));
             put("java.lang.NoClassDefFoundError", Launcher.i18n("crash.NoClassDefFound"));
             put("java.lang.VerifyError", Launcher.i18n("crash.NoClassDefFound"));

HMCLCore/src/main/java/org/jackhuang/hmcl/auth/Account.java

@@ -17,6 +17,8 @@
  */
 package org.jackhuang.hmcl.auth;
 
+import org.jackhuang.hmcl.util.ToStringBuilder;
+
 import java.util.Map;
 import java.util.UUID;
 
@@ -64,4 +66,13 @@ public abstract class Account {
     public abstract Map<Object, Object> toStorage();
 
     public abstract void clearCache();
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("username", getUsername())
+                .append("character", getCharacter())
+                .append("uuid", getUUID())
+                .toString();
+    }
 }

HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java

@@ -116,7 +116,7 @@ public final class GameVersion {
                     .getEntry("net/minecraft/client/Minecraft.class");
             if (minecraft != null)
                 return getVersionOfOldMinecraft(f, minecraft);
-            ZipArchiveEntry main = f.getEntry("net/minecraft/client/main/Launcher.class");
+            ZipArchiveEntry main = f.getEntry("net/minecraft/client/main/Main.class");
             ZipArchiveEntry minecraftServer = f.getEntry("net/minecraft/server/MinecraftServer.class");
             if ((main != null) && (minecraftServer != null))
                 return getVersionOfNewMinecraft(f, minecraftServer);

HMCLCore/src/main/java/org/jackhuang/hmcl/util/IntVersionNumber.java

@@ -43,11 +43,14 @@ public final class IntVersionNumber extends VersionNumber {
         if (!(o instanceof IntVersionNumber))
             return 0;
         IntVersionNumber other = (IntVersionNumber) o;
-        int len = Math.min(this.version.size(), other.version.size());
-        for (int i = 0; i < len; ++i)
-            if (!version.get(i).equals(other.version.get(i)))
-                return version.get(i).compareTo(other.version.get(i));
-        return Integer.compare(this.version.size(), other.version.size());
+        int len = Math.max(this.version.size(), other.version.size());
+        for (int i = 0; i < len; ++i) {
+            int thisInt = Lang.get(this.version, i).orElse(0);
+            int otherInt = Lang.get(other.version, i).orElse(0);
+            if (thisInt != otherInt)
+                return Integer.compare(thisInt, otherInt);
+        }
+        return 0;
     }
 
     @Override

HMCLCore/src/main/java/org/jackhuang/hmcl/util/Logging.java

@@ -35,6 +35,9 @@ public final class Logging {
 
     static {
         LOG = Logger.getLogger("HMCL");
+    }
+
+    public static void start() {
         LOG.setLevel(Level.FINER);
         LOG.setUseParentHandlers(false);
 
@@ -63,6 +66,11 @@ public final class Logging {
         LOG.addHandler(streamHandler);
     }
 
+    public static void stop() {
+        for (Handler handler : LOG.getHandlers())
+            LOG.removeHandler(handler);
+    }
+
     public static String getLogs() {
         return OUTPUT_STREAM.toString();
     }

HMCLCore/src/main/java/org/jackhuang/hmcl/util/VersionNumber.java

@@ -40,13 +40,11 @@ public abstract class VersionNumber implements Comparable<VersionNumber> {
             throw new IllegalArgumentException("The version " + version + " is malformed, only dots and digits are allowed.");
 
         String[] s = version.split("\\.");
-        int last = s.length - 1;
-        for (int i = s.length - 1; i >= 0; --i)
-            if (Integer.parseInt(s[i]) == 0)
-                last = i;
-        ArrayList<Integer> versions = new ArrayList<>(last + 1);
-        for (int i = 0; i <= last; ++i)
-            versions.add(Integer.parseInt(s[i]));
+        ArrayList<Integer> versions = new ArrayList<>(s.length);
+        for (String value : s) versions.add(Integer.parseInt(value));
+        while (!versions.isEmpty() && versions.get(versions.size() - 1) == 0)
+            versions.remove(versions.size() - 1);
+
         return new IntVersionNumber(Collections.unmodifiableList(versions));
     }