Remove error

Fix optifine
Fix StackContainerPane
2018-03-06 11:25:15 +08:00 · 2018-03-06 11:19:21 +08:00 · 2018-03-06 10:19:37 +08:00 · 2018-03-06 10:13:48 +08:00 · 2018-03-05 20:57:30 +08:00 · 2018-03-05 20:56:26 +08:00
57 changed files with 667 additions and 235 deletions
@@ -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
@@ -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);
@@ -79,25 +82,28 @@ public final class Launcher extends Application {
    }

    public static void stopApplication() {
-        JFXUtilities.runInFX(() -> {
-            stopWithoutPlatform();
-            Platform.exit();
-        });
-    }
-
-    public static void stopWithoutPlatform() {
-        Logging.LOG.info("Stopping application without JavaFX Toolkit");
+        Logging.LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));

        JFXUtilities.runInFX(() -> {
            if (Controllers.getStage() == null)
                return;
            Controllers.getStage().close();
-
-            Logging.LOG.info("Shutting down executor services.");
            Schedulers.shutdown();
-
            Controllers.shutdown();
+            Platform.exit();
+            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
+        });
+    }

+    public static void stopWithoutPlatform() {
+        Logging.LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+
+        JFXUtilities.runInFX(() -> {
+            if (Controllers.getStage() == null)
+                return;
+            Controllers.getStage().close();
+            Schedulers.shutdown();
+            Controllers.shutdown();
            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
        });
    }
@@ -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;
@@ -37,4 +36,5 @@ public final class Main {
        } else
            Launcher.main(args);
    }
+
 }
@@ -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();
+    }
 }

@@ -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();
+    }
 }
@@ -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();
+    }
 }
@@ -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();
+    }
 }

@@ -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) {
@@ -25,6 +25,7 @@ import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.ServerDisconnectException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
+import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.launch.*;
 import org.jackhuang.hmcl.mod.CurseCompletionTask;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
@@ -50,7 +51,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(() -> {});

@@ -74,11 +74,11 @@ public final class LauncherHelper {
    private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
        GameRepository repository = profile.getRepository();
        DefaultDependencyManager dependencyManager = profile.getDependency();
-        Version version = repository.getResolvedVersion(selectedVersion);
+        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
        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())
@@ -101,7 +101,6 @@ public final class LauncherHelper {
                        }
                    } catch (AuthenticationException e) {
                        variables.set("account", DialogController.logIn(account));
-                        JFXUtilities.runInFX(() -> Controllers.dialog(launchingStepsPane));
                    }
                }))
                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
@@ -133,8 +132,10 @@ public final class LauncherHelper {
                                Controllers.closeDialog();
                            });
                    } else
-                        Platform.runLater(() ->
-                                Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath())));
+                        Platform.runLater(() -> {
+                            Controllers.closeDialog();
+                            Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                        });

                }))
                .executor();
@@ -154,16 +155,14 @@ public final class LauncherHelper {
            public void onStop(boolean success, TaskExecutor executor) {
                if (!success) {
                    Platform.runLater(() -> {
+                        Controllers.closeDialog();
                        if (executor.getLastException() != null)
                            Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
                                    scriptFile == null ? Launcher.i18n("launch.failed") : Launcher.i18n("version.launch_script.failed"),
                                    MessageBox.ERROR_MESSAGE, Controllers::closeDialog);
-                        else
-                            Controllers.closeDialog();
                    });
                }
-
-                LauncherHelper.this.executor = null;
+                launchingStepsPane.setExecutor(null);
            }
        });

@@ -182,28 +181,28 @@ public final class LauncherHelper {
            flag = true;
        }

-        if (java.getParsedVersion() < JavaVersion.JAVA_8) {
+        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8) {
            Controllers.dialog(Launcher.i18n("launch.advice.newer_java"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }

-        if (java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
+        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
            Controllers.dialog(Launcher.i18n("launch.advice.java9"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
            suggest = false;
            flag = true;
        }

-        if (java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
            Controllers.dialog(Launcher.i18n("launch.advice.different_platform"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }
-        if (java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
                setting.getMaxMemory() > 1.5 * 1024) {
            Controllers.dialog(Launcher.i18n("launch.advice.too_large_memory_for_32bit"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }
-        if (OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
+        if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
            Controllers.dialog(Launcher.i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
            flag = true;
        }
@@ -221,10 +220,11 @@ public final class LauncherHelper {
    }

    public void emitStatus(LoadingState state) {
+        if (state == LoadingState.DONE)
+            Controllers.closeDialog();

        launchingStepsPane.setTitle(state.getLocalizedMessage());
        launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
-        Controllers.dialog(launchingStepsPane);
    }

    private void checkExit(LauncherVisibility v) {
@@ -28,7 +28,7 @@ import java.util.List;
 public final class DownloadProviders {
    private DownloadProviders() {}

-    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(Settings.INSTANCE.getLocale() == Locales.ZH_CN), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);
+    public static final List<DownloadProvider> DOWNLOAD_PROVIDERS = Lang.immutableListOf(new MojangDownloadProvider(), BMCLAPIDownloadProvider.INSTANCE, CurseCDNDownloadProvider.INSTANCE);

    public static DownloadProvider getDownloadProvider(int index) {
        return Lang.get(DOWNLOAD_PROVIDERS, index).orElse(DOWNLOAD_PROVIDERS.get(0));
@@ -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);
@@ -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()));
    }
 }
@@ -18,10 +18,14 @@
 package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXProgressBar;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.Launcher;
@@ -37,9 +41,12 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;

+import java.util.Optional;
+
 public class AccountPage extends StackPane implements DecoratorPage {
    private final StringProperty title;
-
+    private final ObjectProperty<Runnable> onDelete = new SimpleObjectProperty<>(this, "onDelete");
+    private final VersionListItem item;
    private final Account account;

    @FXML
@@ -60,9 +67,13 @@ public class AccountPage extends StackPane implements DecoratorPage {
    private JFXButton btnDelete;
    @FXML
    private JFXButton btnRefresh;
+    @FXML
+    private JFXProgressBar progressBar;

-    public AccountPage(Account account) {
+    public AccountPage(Account account, VersionListItem item) {
        this.account = account;
+        this.item = item;
+
        title = new SimpleStringProperty(this, "title", Launcher.i18n("account") + " - " + account.getCharacter());

        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
@@ -95,13 +106,23 @@ public class AccountPage extends StackPane implements DecoratorPage {
    @FXML
    private void onDelete() {
        Settings.INSTANCE.deleteAccount(account);
-        Controllers.navigate(null);
+        Optional.ofNullable(onDelete.get()).ifPresent(Runnable::run);
    }

    @FXML
    private void onRefresh() {
-        if (account instanceof YggdrasilAccount)
-            AccountHelper.refreshSkinAsync((YggdrasilAccount) account).start();
+        if (account instanceof YggdrasilAccount) {
+            progressBar.setVisible(true);
+            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
+                    .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+                        progressBar.setVisible(false);
+
+                        if (isDependentsSucceeded) {
+                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                            item.setImage(image, AccountHelper.getViewport(4));
+                        }
+                    }).start();
+        }
    }

    public String getTitle() {
@@ -116,4 +137,16 @@ public class AccountPage extends StackPane implements DecoratorPage {
    public void setTitle(String title) {
        this.title.set(title);
    }
+
+    public Runnable getOnDelete() {
+        return onDelete.get();
+    }
+
+    public ObjectProperty<Runnable> onDeleteProperty() {
+        return onDelete;
+    }
+
+    public void setOnDelete(Runnable onDelete) {
+        this.onDelete.set(onDelete);
+    }
 }
@@ -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;
@@ -32,6 +33,7 @@ import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.JavaVersion;
+import org.jackhuang.hmcl.util.Lang;

 import java.util.function.Consumer;

@@ -121,7 +123,7 @@ public final class Controllers {

    public static JFXDialog dialog(Region content) {
        // TODO: temp fix
-        decorator.showDialog(new Region());
+        decorator.showDialog(Lang.apply(new Region(), region -> region.getProperties().put("controllers", true)));
        return decorator.showDialog(content);
    }

@@ -149,12 +151,15 @@ public final class Controllers {
        dialog(new InputDialogPane(text, decorator.getDialog(), onResult));
    }

+    public static void taskDialog(TaskExecutor executor, String title, String subtitle) {
+        taskDialog(executor, title, subtitle, null);
+    }
+
    public static void taskDialog(TaskExecutor executor, String title, String subtitle, Runnable onCancel) {
        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
        pane.setTitle(title);
        pane.setSubtitle(subtitle);
        pane.setExecutor(executor);
-        executor.start();
        dialog(pane);
    }

@@ -17,6 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDrawer;
@@ -45,6 +46,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;
@@ -52,6 +54,7 @@ import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogWizardDisplayer;
 import org.jackhuang.hmcl.ui.wizard.*;
 import org.jackhuang.hmcl.util.FileUtils;
@@ -81,11 +84,13 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    private final boolean max, min;
    private final WizardController wizardController = new WizardController(this);
    private final Queue<Object> cancelQueue = new ConcurrentLinkedQueue<>();
+    private final JFXDialog dialog;

    private double xOffset, yOffset, newX, newY, initX, initY;
-    private boolean allowMove, isDragging, dialogShown, maximized;
+    private boolean allowMove, isDragging, maximized;
    private BoundingBox originalBox, maximizedBox;
    private final TransitionHandler animationHandler;
+    private final StackContainerPane dialogPane = new StackContainerPane();

    @FXML
    private StackPane contentPlaceHolder;
@@ -118,8 +123,6 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    @FXML
    private JFXHamburger titleBurger;
    @FXML
-    private JFXDialog dialog;
-    @FXML
    private JFXButton btnMin;
    @FXML
    private JFXButton btnMax;
@@ -140,7 +143,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);
@@ -164,9 +167,21 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
                btnMax.fire();
        });

+        dialog = new JFXDialog() {
+            @Override
+            public void close() {
+                dialogPane.pop();
+                if (dialogPane.getChildren().isEmpty())
+                    Platform.runLater(() -> {
+                        if (dialogPane.getChildren().isEmpty())
+                            super.close();
+                    });
+            }
+        };
+        dialog.setOverlayClose(false);
+        drawerWrapper.getChildren().add(0, dialog);
        dialog.setDialogContainer(drawerWrapper);
-        dialog.setOnDialogClosed(e -> dialogShown = false);
-        dialog.setOnDialogOpened(e -> dialogShown = true);
+        dialog.setContent(dialogPane);

        if (!min) buttonsContainer.getChildren().remove(btnMin);
        if (!max) buttonsContainer.getChildren().remove(btnMax);
@@ -530,10 +545,10 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
        }
    }

-    public JFXDialog showDialog(Region content) {
-        dialog.setContent(content);
-        if (!dialogShown)
+    public JFXDialog showDialog(Node node) {
+        if (dialogPane.isEmpty())
            dialog.show();
+        dialogPane.push(node);
        return dialog;
    }

@@ -37,11 +37,7 @@ public final class DialogController {
                AccountLoginPane pane = new AccountLoginPane(account, it -> {
                        res.set(it);
                        latch.countDown();
-                        Controllers.closeDialog();
-                }, () -> {
-                        latch.countDown();
-                        Controllers.closeDialog();
-                });
+                }, latch::countDown);
                pane.setDialog(Controllers.dialog(pane));
            });
            latch.await();
@@ -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() {
@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui;
 import javafx.fxml.FXML;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
 import org.jackhuang.hmcl.game.GameVersion;
@@ -89,7 +90,7 @@ public class InstallerController {
        Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));

        if (!gameVersion.isPresent())
-            Controllers.dialog("version.cannot_read");
+            Controllers.dialog(Launcher.i18n("version.cannot_read"));
        else
            Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version, forge, liteLoader, optiFine));
    }
@@ -148,8 +148,9 @@ public final class LeftPaneController {
            VersionListItem item = new VersionListItem(account.getCharacter(), accountType(account));
            RipplerContainer ripplerContainer = new RipplerContainer(item);
            item.setOnSettingsButtonClicked(e -> {
-                AccountPage accountPage = new AccountPage(account);
+                AccountPage accountPage = new AccountPage(account, item);
                JFXPopup popup = new JFXPopup(accountPage);
+                accountPage.setOnDelete(popup::hide);
                popup.show((Node) e.getSource(), JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, e.getX(), e.getY());
            });
            ripplerContainer.setOnMouseClicked(e -> {
@@ -208,7 +209,7 @@ public final class LeftPaneController {
                                            .with(Task.of(Schedulers.javafx(), () -> {
                                                Controllers.closeDialog();
                                                checkAccount();
-                                            })).executor(),
+                                            })).executor(true),
                                    Launcher.i18n("modpack.installing"), "", null);
                            flag = false;
                        } catch (UnsupportedModpackException ignore) {
@@ -54,6 +54,9 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;

+import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
+import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
+
 public final class MainPage extends StackPane implements DecoratorPage {

    private final StringProperty title = new SimpleStringProperty(this, "title", Launcher.i18n("main_page"));
@@ -94,6 +97,10 @@ public final class MainPage extends StackPane implements DecoratorPage {
        FXUtils.installTooltip(btnRefresh, Launcher.i18n("button.refresh"));
    }

+    private String modifyVersion(String gameVersion, String version) {
+        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
+    }
+
    private Node buildNode(HMCLGameRepository repository, Version version, String game) {
        Profile profile = repository.getProfile();
        String id = version.getId();
@@ -105,13 +112,13 @@ public final class MainPage extends StackPane implements DecoratorPage {
        StringBuilder libraries = new StringBuilder();
        for (Library library : version.getLibraries()) {
            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                libraries.append(Launcher.i18n("install.installer.forge")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)forge", "").replace(game, "").trim(), "-"), "-")).append("\n");
+                libraries.append(Launcher.i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n");
            }
            if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                libraries.append(Launcher.i18n("install.installer.liteloader")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)liteloader", "").replace(game, "").trim(), "-"), "-")).append("\n");
+                libraries.append(Launcher.i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n");
            }
            if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                libraries.append(Launcher.i18n("install.installer.optifine")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)optifine", "").replace(game, "").trim(), "-"), "-")).append("\n");
+                libraries.append(Launcher.i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
            }
        }

@@ -127,7 +134,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
                Controllers.dialog(Launcher.i18n("login.empty_username"));
            else {
                FileChooser chooser = new FileChooser();
-                chooser.setInitialDirectory(repository.getRunDirectory(id));
+                if (repository.getRunDirectory(id).isDirectory())
+                    chooser.setInitialDirectory(repository.getRunDirectory(id));
                chooser.setTitle(Launcher.i18n("version.launch_script.save"));
                chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
                        ? new FileChooser.ExtensionFilter(Launcher.i18n("extension.bat"), "*.bat")
@@ -147,19 +155,18 @@ public final class MainPage extends StackPane implements DecoratorPage {
            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Launcher.i18n("modpack"), "*.zip"));
            File selectedFile = chooser.showOpenDialog(Controllers.getStage());
            if (selectedFile != null) {
-                TaskExecutorDialogPane pane = new TaskExecutorDialogPane(null);
                try {
                    TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, id, ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(id)))
-                            .then(Task.of(Schedulers.javafx(), Controllers::closeDialog)).executor();
-                    pane.setExecutor(executor);
-                    pane.setTitle(Launcher.i18n("modpack.update"));
-                    executor.start();
-                    Controllers.dialog(pane);
+                            .then(Task.of(Schedulers.javafx(), Controllers::closeDialog)).executor(true);
+                    Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), "", null);
                } catch (UnsupportedModpackException e) {
+                    Controllers.closeDialog();
                    Controllers.dialog(Launcher.i18n("modpack.unsupported"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (MismatchedModpackTypeException e) {
+                    Controllers.closeDialog();
                    Controllers.dialog(Launcher.i18n("modpack.mismatched_type"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (IOException e)  {
+                    Controllers.closeDialog();
                    Controllers.dialog(Launcher.i18n("modpack.invalid"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                }
            }
@@ -192,7 +199,7 @@ public final class MainPage extends StackPane implements DecoratorPage {
                            FXUtils.openFolder(repository.getRunDirectory(id));
                            break;
                        default:
-                            throw new Error();
+                            break;
                    }});
                versionPopup.show(item, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, event.getX(), event.getY());
            } else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
@@ -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) {
@@ -0,0 +1,45 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+
+import java.util.Stack;
+
+public class StackContainerPane extends StackPane {
+    private final Stack<Node> stack = new Stack<>();
+
+    public void push(Node node) {
+        if (!node.getProperties().containsKey("controllers"))
+            stack.push(node);
+        getChildren().setAll(node);
+    }
+
+    public void pop() {
+        stack.pop();
+        if (stack.isEmpty())
+            getChildren().setAll();
+        else
+            getChildren().setAll(stack.peek());
+    }
+
+    public boolean isEmpty() {
+        return stack.isEmpty();
+    }
+}
@@ -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() {
@@ -60,20 +60,24 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
            TaskExecutor executor = task.executor(new TaskListener() {
                @Override
                public void onStop(boolean success, TaskExecutor executor) {
-                    if (success) {
-                        if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
-                            JFXUtilities.runInFX(() -> Controllers.dialog((String) settings.get("success_message"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null)));
-                        else if (!settings.containsKey("forbid_success_message"))
-                            JFXUtilities.runInFX(() -> Controllers.dialog(Launcher.i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null)));
-                    } else {
-                        if (executor.getLastException() == null)
-                            return;
-                        String appendix = StringUtils.getStackTrace(executor.getLastException());
-                        if (settings.containsKey("failure_message") && settings.get("failure_message") instanceof String)
-                            JFXUtilities.runInFX(() -> Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null)));
-                        else if (!settings.containsKey("forbid_failure_message"))
-                            JFXUtilities.runInFX(() -> Controllers.dialog(appendix, Launcher.i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null)));
-                    }
+                    JFXUtilities.runInFX(() -> {
+                        Controllers.closeDialog();
+                        if (success) {
+                            if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
+                                Controllers.dialog((String) settings.get("success_message"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
+                            else if (!settings.containsKey("forbid_success_message"))
+                                Controllers.dialog(Launcher.i18n("message.success"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
+                        } else {
+                            if (executor.getLastException() == null)
+                                return;
+                            String appendix = StringUtils.getStackTrace(executor.getLastException());
+                            if (settings.containsKey("failure_message") && settings.get("failure_message") instanceof String)
+                                Controllers.dialog(appendix, (String) settings.get("failure_message"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
+                            else if (!settings.containsKey("forbid_failure_message"))
+                                Controllers.dialog(appendix, Launcher.i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
+                        }
+
+                    });
                }
            });
            pane.setExecutor(executor);
@@ -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();
@@ -66,6 +66,9 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
    }

    private CheckBoxTreeItem<String> getTreeItem(File file, String basePath) {
+        if (!file.exists())
+            return null;
+
        ModAdviser.ModSuggestion state = ModAdviser.ModSuggestion.SUGGESTED;
        if (basePath.length() > "minecraft/".length()) {
            state = adviser.advise(StringUtils.substringAfter(basePath, "minecraft/") + (file.isDirectory() ? "/" : ""), file.isDirectory());
@@ -19,10 +19,12 @@ 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;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.util.*;
@@ -54,12 +56,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 +105,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,13 +131,15 @@ public class AppDataUpgrader extends IUpgrader {
                        String hash = null;
                        if (map.containsKey("packsha1"))
                            hash = map.get("packsha1");
-                        Controllers.dialog(Launcher.i18n("message.downloading"));
-                        if (new AppDataUpgraderPackGzTask(NetworkUtils.toURL(map.get("pack")), version.toString(), hash).test()) {
+                        Task task = new AppDataUpgraderPackGzTask(NetworkUtils.toURL(map.get("pack")), version.toString(), hash);
+                        TaskExecutor executor = task.executor();
+                        JFXUtilities.runInFX(() -> Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null));
+                        if (executor.test()) {
                            new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderPackGzTask.getSelf(version.toString()).getAbsolutePath())
                                    .directory(new File("").getAbsoluteFile()).start();
                            System.exit(0);
                        }
-                        Controllers.closeDialog();
+                        JFXUtilities.runInFX(Controllers::closeDialog);
                    } catch (IOException ex) {
                        Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                    }
@@ -139,8 +150,6 @@ public class AppDataUpgrader extends IUpgrader {
                            url = map.get(OperatingSystem.CURRENT_OS.getCheckedName());
                        else if (map.containsKey(OperatingSystem.UNKNOWN.getCheckedName()))
                            url = map.get(OperatingSystem.UNKNOWN.getCheckedName());
-                    if (url == null)
-                        url = Launcher.PUBLISH;
                    try {
                        java.awt.Desktop.getDesktop().browse(new URI(url));
                    } catch (URISyntaxException | IOException e) {
@@ -71,7 +71,7 @@ public final class UpdateChecker {
                    return;

                if (value == null) {
-                    versionString = NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/update.php?version=" + Launcher.VERSION));
+                    versionString = NetworkUtils.doGet(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/update.php?version=" + Launcher.VERSION));
                    value = VersionNumber.asVersion(versionString);
                }

@@ -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("https://huangyuhui.duapp.com/hmcl/update_link.php")), Map.class);
                    } catch (JsonSyntaxException | IOException e) {
                        Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e);
                    }
@@ -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"));
@@ -112,7 +113,7 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
            map.put("version", Launcher.VERSION);
            map.put("log", Logging.getLogs());
            try {
-                String response = NetworkUtils.doPost(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/crash.php"), map);
+                String response = NetworkUtils.doPost(NetworkUtils.toURL("https://huangyuhui.duapp.com/hmcl/crash.php"), map);
                if (StringUtils.isNotBlank(response))
                    Logging.LOG.log(Level.SEVERE, "Crash server response: " + response);
            } catch (IOException ex) {
@@ -26,7 +26,7 @@
        <actions>
            <Label fx:id="lblCreationWarning" />
            <JFXButton onMouseClicked="#onAccept" text="%button.ok" styleClass="dialog-accept"/>
-            <JFXButton onMouseClicked="#finalization" text="%button.cancel" styleClass="dialog-cancel"/>
+            <JFXButton onMouseClicked="#onCancel" text="%button.cancel" styleClass="dialog-cancel"/>
        </actions>
    </JFXDialogLayout>
    <JFXProgressBar fx:id="progressBar" visible="false" StackPane.alignment="TOP_CENTER"/>
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import org.jackhuang.hmcl.ui.construct.ComponentList?>
+<?import com.jfoenix.controls.JFXProgressBar?>
 <fx:root xmlns:fx="http://javafx.com/fxml"
         xmlns="http://javafx.com/javafx"
         type="StackPane">
@@ -77,4 +78,5 @@
                       prefWidth="30" prefHeight="30"/>
        </right>
    </BorderPane>
+    <JFXProgressBar fx:id="progressBar" StackPane.alignment="TOP_CENTER" visible="false" />
 </fx:root>
@@ -20,7 +20,6 @@
            maxWidth="800">
        <center>
            <StackPane fx:id="drawerWrapper" styleClass="jfx-decorator-drawer" FXUtils.overflowHidden="true">
-                <JFXDialog fx:id="dialog" overlayClose="false" />
                <BorderPane>
                    <left>
                        <StackPane minWidth="200" maxWidth="200" styleClass="jfx-decorator-content-container">
@@ -20,7 +20,7 @@ about.copyright.statement=Copyright (c) 2018 huangyuhui.
 about.author=Author
 about.author.statement=huanghongxun (MCF: klkl6523)
 about.thanks_to=Thanks to
-about.thanks_to.statement=bangbang93 (BMCLAPI, http://bmclapi.bangbang93.com/)\ngamerteam (Default background image)\nAll contributors.
+about.thanks_to.statement=bangbang93 (BMCLAPI, http://bmclapi2.bangbang93.com/)\ngamerteam (Default background image)\nAll contributors.
 about.dependency=Dependency
 about.dependency.statement=Gson (Google, Apache License 2.0)\nCommons Compress (Apache, Apache License 2.0)
 about.claim=Statement
@@ -57,8 +57,8 @@ archive.author=Authors
 archive.game_version=Game
 archive.version=Version

-assets.download=Download Assets
-assets.download_all=Download Assets Files
+assets.download=Download assets
+assets.download_all=Check for the completion of assets
 assets.failed=Failed to get the list, try again.
 assets.failed_download=Failed to download assets, may cause no sounds and language files.

@@ -112,7 +112,7 @@ crash.minecraft=Minecraft has crashed!
 crash.user_fault=Your OS or Java environment may not be properly installed resulting in crashing of this software, please check your Java Environment or your computer!

 download=Download
-download.BMCL=BMCLAPI (bangbang93, http://bmclapi.bangbang93.com/)
+download.BMCL=BMCLAPI (bangbang93, http://bmclapi2.bangbang93.com/)
 download.failed=Failed to download
 download.failed.refresh=Unable to load version list. Click here to retry.
 download.mojang=Mojang
@@ -20,7 +20,7 @@ about.copyright.statement=Copyright (c) 2018 huangyuhui.
 about.author=作者
 about.author.statement=huanghongxun (百度贴吧：huanghongxun20)
 about.thanks_to=鸣谢
-about.thanks_to.statement=bangbang93 (BMCLAPI, http://bmclapi.bangbang93.com/)\ngamerteam (默认背景图)\n所有参与本项目,issue,pull requests的贡献者
+about.thanks_to.statement=bangbang93 (BMCLAPI, http://bmclapi2.bangbang93.com/)\ngamerteam (默认背景图)\n所有参与本项目,issue,pull requests的贡献者
 about.dependency=依赖
 about.dependency.statement=Gson (Google, Apache License 2.0)\nCommons Compress (Apache, Apache License 2.0)
 about.claim=免责声明
@@ -58,7 +58,7 @@ archive.game_version=游戏版本
 archive.version=版本

 assets.download=下载资源
-assets.download_all=下载资源文件
+assets.download_all=检查资源文件完整性
 assets.failed=获取列表失败，请刷新重试。
 assets.failed_download=下载资源文件失败，可能导致没有中文和声音。

@@ -112,7 +112,7 @@ crash.minecraft=Minecraft崩溃了！请认真阅读建议。
 crash.user_fault=您的系统或Java环境可能安装不当导致本软件崩溃，请检查您的Java环境或您的电脑！可以尝试重新安装Java。

 download=下载
-download.BMCL=BMCLAPI (bangbang93, http://bmclapi.bangbang93.com/)
+download.BMCL=BMCLAPI (bangbang93, http://bmclapi2.bangbang93.com/)
 download.failed=下载失败
 download.failed.refresh=加载版本列表失败，点击此处重试。
 download.mojang=官方
@@ -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();
+    }
 }
@@ -0,0 +1,61 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.auth;
+
+import java.net.Proxy;
+import java.util.Objects;
+
+public final class AccountBuilder<T extends Account> {
+    private CharacterSelector selector = CharacterSelector.DEFAULT;
+    private String username;
+    private String password = null;
+    private Object additionalData = null;
+    private Proxy proxy = Proxy.NO_PROXY;
+
+    public AccountBuilder() {
+    }
+
+    public AccountBuilder setSelector(CharacterSelector selector) {
+        this.selector = Objects.requireNonNull(selector);
+        return this;
+    }
+
+    public AccountBuilder setUsername(String username) {
+        this.username = Objects.requireNonNull(username);
+        return this;
+    }
+
+    public AccountBuilder setPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    public AccountBuilder setAdditionalData(Object additionalData) {
+        this.additionalData = additionalData;
+        return this;
+    }
+
+    public AccountBuilder setProxy(Proxy proxy) {
+        this.proxy = Objects.requireNonNull(proxy);
+        return this;
+    }
+
+    public T create(AccountFactory<T> factory) throws AuthenticationException {
+        return factory.create(selector, Objects.requireNonNull(username), password, additionalData, proxy);
+    }
+}
@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.download;

 import org.jackhuang.hmcl.download.forge.ForgeVersionList;
 import org.jackhuang.hmcl.download.game.GameVersionList;
+import org.jackhuang.hmcl.download.liteloader.LiteLoaderBMCLVersionList;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderVersionList;
 import org.jackhuang.hmcl.download.optifine.OptiFineBMCLVersionList;

@@ -66,7 +67,7 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
            case "forge":
                return ForgeVersionList.INSTANCE;
            case "liteloader":
-                return LiteLoaderVersionList.INSTANCE;
+                return LiteLoaderBMCLVersionList.INSTANCE;
            case "optifine":
                return OptiFineBMCLVersionList.INSTANCE;
            default:
@@ -77,12 +78,12 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
    @Override
    public String injectURL(String baseURL) {
        return baseURL
-                .replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com")
-                .replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com")
-                .replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries")
-                .replace("http://files.minecraftforge.net/maven", "https://bmclapi2.bangbang93.com/maven")
-                .replace("http://dl.liteloader.com/versions/versions.json", "https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json")
-                .replace("http://dl.liteloader.com/versions", "https://bmclapi2.bangbang93.com/maven");
+                .replace("https://launchermeta.mojang.com", "http://bmclapi2.bangbang93.com")
+                .replace("https://launcher.mojang.com", "http://bmclapi2.bangbang93.com")
+                .replace("https://libraries.minecraft.net", "http://bmclapi2.bangbang93.com/libraries")
+                .replaceFirst("https?://files\\.minecraftforge\\.net/maven", "http://bmclapi2.bangbang93.com/maven")
+                .replace("http://dl.liteloader.com/versions/versions.json", "http://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json")
+                .replace("http://dl.liteloader.com/versions", "http://bmclapi2.bangbang93.com/maven");
    }

 }
@@ -20,12 +20,8 @@ package org.jackhuang.hmcl.download;
 public class CurseCDNDownloadProvider extends MojangDownloadProvider {
    public static final CurseCDNDownloadProvider INSTANCE = new CurseCDNDownloadProvider();

-    protected CurseCDNDownloadProvider() {
-        super(false);
-    }
-
    @Override
    public String injectURL(String baseURL) {
-        return baseURL == null ? null : baseURL.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven");
+        return baseURL == null ? null : baseURL.replaceFirst("https?://files\\.minecraftforge\\.net/maven", "https://ftb.cursecdn.com/FTB2/maven");
    }
 }
@@ -41,9 +41,12 @@ public class MaintainTask extends TaskResult<Version> {

    @Override
    public void execute() {
-        Version newVersion = version;
+        setResult(maintain(version));
+    }
+
+    public static Version maintain(Version version) {
        Library forge = null, liteLoader = null, optiFine = null;
-        List<String> args = new ArrayList<>(StringUtils.tokenize(newVersion.getMinecraftArguments().orElse("")));
+        List<String> args = new ArrayList<>(StringUtils.tokenize(version.getMinecraftArguments().orElse("")));

        for (Library library : version.getLibraries()) {
            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge"))
@@ -84,11 +87,13 @@ public class MaintainTask extends TaskResult<Version> {
        }

        if ((liteLoader != null || forge != null) && optiFine != null) {
-            // If forge or LiteLoader installed, OptiFine Tweaker will cause crash.
+            // If forge or LiteLoader installed, OptiFine Forge Tweaker is needed.
            removeTweakClass(args, "optifine");
+            args.add("--tweakClass");
+            args.add("optifine.OptiFineForgeTweaker");
        }

-        setResult(newVersion.setMinecraftArguments(StringUtils.makeCommand(args)));
+        return version.setMinecraftArguments(StringUtils.makeCommand(args));
    }

    @Override
@@ -28,12 +28,6 @@ import org.jackhuang.hmcl.download.optifine.OptiFineVersionList;
 */
 public class MojangDownloadProvider implements DownloadProvider {

-    private final boolean isChina;
-
-    public MojangDownloadProvider(boolean isChina) {
-        this.isChina = isChina;
-    }
-
    @Override
    public String getLibraryBaseURL() {
        return "https://libraries.minecraft.net/";
@@ -46,17 +40,17 @@ public class MojangDownloadProvider implements DownloadProvider {

    @Override
    public String getVersionBaseURL() {
-        return "http://s3.amazonaws.com/Minecraft.Download/versions/";
+        return "https://s3.amazonaws.com/Minecraft.Download/versions/";
    }

    @Override
    public String getAssetIndexBaseURL() {
-        return "http://s3.amazonaws.com/Minecraft.Download/indexes/";
+        return "https://s3.amazonaws.com/Minecraft.Download/indexes/";
    }

    @Override
    public String getAssetBaseURL() {
-        return "http://resources.download.minecraft.net/";
+        return "https://resources.download.minecraft.net/";
    }

    @Override
@@ -77,16 +71,6 @@ public class MojangDownloadProvider implements DownloadProvider {

    @Override
    public String injectURL(String baseURL) {
-        if (baseURL == null)
-            return null;
-        //else if (baseURL.contains("scala-swing") || baseURL.contains("scala-xml") || baseURL.contains("scala-parser-combinators"))
-        //    return baseURL.replace("http://files.minecraftforge.net/maven", "http://ftb.cursecdn.com/FTB2/maven");
-        /*else if (baseURL.contains("typesafe") || baseURL.contains("scala"))
-            if (isChina)
-                return baseURL.replace("http://files.minecraftforge.net/maven", "http://maven.aliyun.com/nexus/content/groups/public");
-            else
-                return baseURL.replace("http://files.minecraftforge.net/maven", "http://repo1.maven.org/maven2");
-        */else
            return baseURL;
    }
 }
@@ -92,5 +92,5 @@ public final class ForgeVersionList extends VersionList<Void> {
        };
    }

-    public static final String FORGE_LIST = "http://files.minecraftforge.net/maven/net/minecraftforge/forge/json";
+    public static final String FORGE_LIST = "https://files.minecraftforge.net/maven/net/minecraftforge/forge/json";
 }
@@ -0,0 +1,121 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.download.liteloader;
+
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.download.VersionList;
+import org.jackhuang.hmcl.task.GetTask;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.VersionNumber;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ *
+ * @author huangyuhui
+ */
+public final class LiteLoaderBMCLVersionList extends VersionList<LiteLoaderRemoteVersionTag> {
+
+    public static final LiteLoaderBMCLVersionList INSTANCE = new LiteLoaderBMCLVersionList();
+
+    private LiteLoaderBMCLVersionList() {
+    }
+
+    @Override
+    public Task refreshAsync(DownloadProvider downloadProvider) {
+        GetTask task = new GetTask(NetworkUtils.toURL(downloadProvider.injectURL(LITELOADER_LIST)));
+        return new Task() {
+            @Override
+            public Collection<Task> getDependents() {
+                return Collections.singleton(task);
+            }
+
+            @Override
+            public void execute() {
+                lock.writeLock().lock();
+
+                try {
+                    LiteLoaderVersionsRoot root = Constants.GSON.fromJson(task.getResult(), LiteLoaderVersionsRoot.class);
+                    versions.clear();
+
+                    for (Map.Entry<String, LiteLoaderGameVersions> entry : root.getVersions().entrySet()) {
+                        String gameVersion = entry.getKey();
+                        LiteLoaderGameVersions liteLoader = entry.getValue();
+                        Optional<String> gg = VersionNumber.parseVersion(gameVersion);
+                        if (!gg.isPresent())
+                            continue;
+                        doBranch(gg.get(), gameVersion, liteLoader.getRepoitory(), liteLoader.getArtifacts(), false);
+                        doBranch(gg.get(), gameVersion, liteLoader.getRepoitory(), liteLoader.getSnapshots(), true);
+                    }
+                } finally {
+                    lock.writeLock().unlock();
+                }
+            }
+
+            private void doBranch(String key, String gameVersion, LiteLoaderRepository repository, LiteLoaderBranch branch, boolean snapshot) {
+                if (branch == null || repository == null)
+                    return;
+
+                for (Map.Entry<String, LiteLoaderVersion> entry : branch.getLiteLoader().entrySet()) {
+                    String branchName = entry.getKey();
+                    LiteLoaderVersion v = entry.getValue();
+                    if ("latest".equals(branchName))
+                        continue;
+
+                    String version = v.getVersion();
+                    String url = "http://bmclapi2.bangbang93.com/liteloader/download?version=" + version;
+                    if (snapshot) {
+                        try {
+                            version = version.replace("SNAPSHOT", getLatestSnapshotVersion(repository.getUrl() + "com/mumfrey/liteloader/" + v.getVersion() + "/"));
+                            url = repository.getUrl() + "com/mumfrey/liteloader/" + v.getVersion() + "/liteloader-" + version + "-release.jar";
+                        } catch (Exception ignore) {
+                        }
+                    }
+
+                    versions.put(key, new LiteLoaderRemoteVersion(gameVersion,
+                            version, downloadProvider.injectURL(url),
+                            v.getTweakClass(), v.getLibraries()
+                    ));
+                }
+            }
+        };
+    }
+
+    public static final String LITELOADER_LIST = "http://dl.liteloader.com/versions/versions.json";
+
+    private static String getLatestSnapshotVersion(String repo) throws Exception {
+        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        Document doc = builder.parse(repo + "maven-metadata.xml");
+        Element r = doc.getDocumentElement();
+        Element snapshot = (Element) r.getElementsByTagName("snapshot").item(0);
+        Node timestamp = snapshot.getElementsByTagName("timestamp").item(0);
+        Node buildNumber = snapshot.getElementsByTagName("buildNumber").item(0);
+        return timestamp.getTextContent() + "-" + buildNumber.getTextContent();
+    }
+}
@@ -42,7 +42,7 @@ public final class OptiFineBMCLVersionList extends VersionList<Void> {

    @Override
    public Task refreshAsync(DownloadProvider downloadProvider) {
-        GetTask task = new GetTask(NetworkUtils.toURL("http://bmclapi.bangbang93.com/optifine/versionlist"));
+        GetTask task = new GetTask(NetworkUtils.toURL("http://bmclapi2.bangbang93.com/optifine/versionlist"));
        return new Task() {
            @Override
            public Collection<Task> getDependents() {
@@ -70,13 +70,13 @@ public final class OptiFineInstallTask extends TaskResult<Version> {

    @Override
    public void execute() {
-        String remoteVersion = remote.getSelfVersion();
+        String remoteVersion = remote.getGameVersion() + "-" + remote.getSelfVersion();

        Library library = new Library(
                "net.optifine", "optifine", remoteVersion, null, null,
                new LibrariesDownloadInfo(new LibraryDownloadInfo(
                        "net/optifine/optifine/" + remoteVersion + "/optifine-" + remoteVersion + ".jar",
-                        remote.getUrl())), true
+                        remote.getUrl()))
        );

        List<Library> libraries = new LinkedList<>();
@@ -99,6 +99,8 @@ public final class OptiFineInstallTask extends TaskResult<Version> {
        String minecraftArguments = version.getMinecraftArguments().orElse("");
        if (!hasFMLTweaker)
            minecraftArguments = minecraftArguments + " --tweakClass optifine.OptiFineTweaker";
+        else
+            minecraftArguments = minecraftArguments + " --tweakClass optifine.OptiFineForgeTweaker";

        if (version.getMainClass() == null || !version.getMainClass().startsWith("net.minecraft.launchwrapper."))
            libraries.add(0, new Library("net.minecraft", "launchwrapper", "1.12"));
@@ -52,7 +52,7 @@ public final class OptiFineVersionList extends VersionList<Void> {

    @Override
    public Task refreshAsync(DownloadProvider downloadProvider) {
-        GetTask task = new GetTask(NetworkUtils.toURL("http://optifine.net/downloads"));
+        GetTask task = new GetTask(NetworkUtils.toURL("https://optifine.net/downloads"));
        return new Task() {
            @Override
            public Collection<Task> getDependents() {
@@ -116,6 +116,6 @@ public final class OptiFineVersionList extends VersionList<Void> {
            result = m.group(1);
        if (result == null)
            throw new IllegalStateException("Cannot find version in " + content);
-        return "http://optifine.net/downloadx?f=OptiFine" + result;
+        return "https://optifine.net/downloadx?f=OptiFine" + result;
    }
 }
@@ -40,7 +40,7 @@ public class ClassicVersion extends Version {
        public ClassicLibrary(String name) {
            super("", "", "", null, null,
                    new LibrariesDownloadInfo(new LibraryDownloadInfo("bin/" + name + ".jar"), null),
-                    false, null, null, null, null);
+                    null, null, null, null);
        }
    }

@@ -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);
@@ -45,7 +45,6 @@ public class Library implements Comparable<Library> {
    private final LibrariesDownloadInfo downloads;
    private final LibraryDownloadInfo download;
    private final ExtractRules extract;
-    private final boolean lateload;
    private final Map<OperatingSystem, String> natives;
    private final List<CompatibilityRule> rules;
    private final List<String> checksums;
@@ -55,16 +54,12 @@ public class Library implements Comparable<Library> {
    public Library(String groupId, String artifactId, String version) {
        this(groupId, artifactId, version, null, null, null);
    }
-    
+
    public Library(String groupId, String artifactId, String version, String classifier, String url, LibrariesDownloadInfo downloads) {
-        this(groupId, artifactId, version, classifier, url, downloads, false);
+        this(groupId, artifactId, version, classifier, url, downloads, null, null, null, null);
    }

-    public Library(String groupId, String artifactId, String version, String classifier, String url, LibrariesDownloadInfo downloads, boolean lateload) {
-        this(groupId, artifactId, version, classifier, url, downloads, lateload, null, null, null, null);
-    }
-
-    public Library(String groupId, String artifactId, String version, String classifier, String url, LibrariesDownloadInfo downloads, boolean lateload, List<String> checksums, ExtractRules extract, Map<OperatingSystem, String> natives, List<CompatibilityRule> rules) {
+    public Library(String groupId, String artifactId, String version, String classifier, String url, LibrariesDownloadInfo downloads, List<String> checksums, ExtractRules extract, Map<OperatingSystem, String> natives, List<CompatibilityRule> rules) {
        this.groupId = groupId;
        this.artifactId = artifactId;
        this.version = version;
@@ -78,7 +73,6 @@ public class Library implements Comparable<Library> {
        this.url = url;
        this.downloads = downloads;
        this.extract = extract;
-        this.lateload = lateload;
        this.natives = natives;
        this.rules = rules;
        this.checksums = checksums;
@@ -139,10 +133,6 @@ public class Library implements Comparable<Library> {
        return download;
    }

-    public boolean isLateload() {
-        return lateload;
-    }
-
    public List<String> getChecksums() {
        return checksums;
    }
@@ -179,7 +169,7 @@ public class Library implements Comparable<Library> {
    }

    public Library setClassifier(String classifier) {
-        return new Library(groupId, artifactId, version, classifier, url, downloads, lateload, checksums, extract, natives, rules);
+        return new Library(groupId, artifactId, version, classifier, url, downloads, checksums, extract, natives, rules);
    }

    public static Library fromName(String name) {
@@ -191,7 +181,7 @@ public class Library implements Comparable<Library> {
        if (arr.length != 3 && arr.length != 4)
            throw new IllegalArgumentException("Library name is malformed. Correct example: group:artifact:version(:classifier).");

-        return new Library(arr[0].replace("\\", "/"), arr[1], arr[2], arr.length >= 4 ? arr[3] : null, url, downloads, false, checksums, extract, natives, rules);
+        return new Library(arr[0].replace("\\", "/"), arr[1], arr[2], arr.length >= 4 ? arr[3] : null, url, downloads, checksums, extract, natives, rules);
    }

    public static class Serializer implements JsonDeserializer<Library>, JsonSerializer<Library> {
@@ -110,29 +110,23 @@ public class DefaultLauncher extends Launcher {
            res.add("-Dfml.ignorePatchDiscrepancies=true");
        }

-        LinkedList<File> lateload = new LinkedList<>();
-        StringBuilder classpath = new StringBuilder();
+        LinkedList<String> classpath = new LinkedList<>();
        for (Library library : version.getLibraries())
            if (library.appliesToCurrentEnvironment() && !library.isNative()) {
                File f = repository.getLibraryFile(version, library);
                if (f.exists() && f.isFile())
-                    if (library.isLateload())
-                        lateload.add(f);
-                    else
-                        classpath.append(f.getAbsolutePath()).append(OperatingSystem.PATH_SEPARATOR);
+                    classpath.add(f.getAbsolutePath());
            }
-        for (File library : lateload)
-            classpath.append(library.getAbsolutePath()).append(OperatingSystem.PATH_SEPARATOR);

        File jar = repository.getVersionJar(version);
        if (!jar.exists() || !jar.isFile())
            throw new IOException("Minecraft jar does not exist");
-        classpath.append(jar.getAbsolutePath());
+        classpath.add(jar.getAbsolutePath());

        // Provided Minecraft arguments
        File gameAssets = repository.getActualAssetDirectory(version.getId(), version.getAssetIndex().getId());
        Map<String, String> configuration = getConfigurations();
-        configuration.put("${classpath}", classpath.toString());
+        configuration.put("${classpath}", String.join(OperatingSystem.PATH_SEPARATOR, classpath));
        configuration.put("${natives_directory}", nativeFolder.getAbsolutePath());
        configuration.put("${game_assets}", gameAssets.getAbsolutePath());
        configuration.put("${assets_root}", gameAssets.getAbsolutePath());
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.task;

 import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.Logging;

 import java.util.concurrent.*;

@@ -115,6 +116,8 @@ public final class Schedulers {
    static final Scheduler NONE = new SchedulerImpl(Constants.emptyConsumer());

    public static synchronized void shutdown() {
+        Logging.LOG.info("Shutting down executor services.");
+
        if (CACHED_EXECUTOR != null)
            CACHED_EXECUTOR.shutdown();

@@ -205,6 +205,13 @@ public abstract class Task {
        return new TaskExecutor(this);
    }

+    public final TaskExecutor executor(boolean start) {
+        TaskExecutor executor = new TaskExecutor(this);
+        if (start)
+            executor.start();
+        return executor;
+    }
+
    public final TaskExecutor executor(TaskListener taskListener) {
        TaskExecutor executor = new TaskExecutor(this);
        executor.addTaskListener(taskListener);
@@ -48,8 +48,8 @@ public final class Constants {
    public static final Charset SYSTEM_CHARSET = Charset.forName(OperatingSystem.ENCODING);

    public static final String DEFAULT_LIBRARY_URL = "https://libraries.minecraft.net/";
-    public static final String DEFAULT_VERSION_DOWNLOAD_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/";
-    public static final String DEFAULT_INDEX_URL = "http://s3.amazonaws.com/Minecraft.Download/indexes/";
+    public static final String DEFAULT_VERSION_DOWNLOAD_URL = "https://s3.amazonaws.com/Minecraft.Download/versions/";
+    public static final String DEFAULT_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/";

    public static Consumer<Runnable> UI_THREAD_SCHEDULER = s -> Schedulers.computation().schedule(s::run);
    
@@ -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
@@ -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();
    }
@@ -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));
    }

@@ -70,10 +70,10 @@ public final class ZipEngine implements Closeable {
     * modified pathName, null if you dont want this file zipped
     */
    private void putDirectoryImpl(File source, String basePath, BiFunction<String, Boolean, String> pathNameCallback) throws IOException {
-        File[] files;
+        File[] files = null;
        if (source.isDirectory())
            files = source.listFiles();
-        else
+        else if (source.isFile())
            files = new File[] { source };

        if (files == null)
@@ -28,8 +28,16 @@ Now you can launch game by constructing a `DefaultLauncher`.
 DefaultLauncher launcher = new DefaultLauncher(
        repository, // GameRepository
        "test", // Your minecraft version name
-        OfflineAccountFactory.INSTANCE.fromUsername("player007").logIn(MultiCharacterSelector.DEFAULT), // account
-        // or YggdrasilAccountFactory.INSTANCE.fromUsername(username, password).logIn
+        new AccountBuilder.Builder()
+                .setUsername("playerId")
+                .setProxy(Proxy.NO_PROXY) // Optional
+                .create(OfflineAccountFactory.INSTANCE)
+                .logIn(), // account
+        // or new AccountBuilder.Builder()
+        //            .setUsername("[email protected]")
+        //            .setPassword("123")
+        //            .create(YggdrasilAccountFactory.INSTANCE)
+        //            .logIn()
        new LaunchOptions.Builder()
        		.setGameDir(repository.getBaseDirectory())
        		.setMaxMemory(...)
@@ -51,7 +59,7 @@ DefaultLauncher launcher = new DefaultLauncher(
                System.out.println("Process exited then exit code " + exitCode);
            }
        },
-        false // true if launcher process exits, listening thread exit too.
+        false // true if launcher process exits, listening threads exit too.
 );
 ```
 Now you can simply call `launcher.launch()` to launch the game.
Author	SHA1	Message	Date
huangyuhui	44aff94937	Remove error	2018-03-06 11:25:15 +08:00
huangyuhui	fb1fc92b7c	Fix optifine	2018-03-06 11:19:21 +08:00
huangyuhui	71cfa64b16	Fix StackContainerPane	2018-03-06 10:19:37 +08:00
huangyuhui	b200105a85	Fix Liteloader installing of BMCLAPI	2018-03-06 10:13:48 +08:00
huanghongxun	ce83f3c5e1	Merge pull request #297 from andylizi/switch-to-https Switch to Https for most links.	2018-03-05 20:57:30 +08:00
huanghongxun	57d3275856	Merge branch 'javafx' into switch-to-https	2018-03-05 20:56:26 +08:00
huangyuhui	eb1a109afc	Fix IllegalArgumentException: Folder parameter must be a valid folder	2018-03-05 20:36:38 +08:00
huangyuhui	a03e3fea12	Logs stopApplication stack trace	2018-03-05 20:23:23 +08:00
huangyuhui	c60ae111ef	Progress bar in account page	2018-03-05 20:07:30 +08:00
huangyuhui	5eb46395ae	Close popup when deleted an account	2018-03-05 19:13:58 +08:00
huangyuhui	db08b61cfa	Fix #301	2018-03-05 19:02:13 +08:00
huangyuhui	41d313baff	Fix #303	2018-03-04 23:35:42 +08:00
huangyuhui	58c3ed9254	Fixed #302	2018-03-04 23:33:08 +08:00
huangyuhui	affe36a568	Fix update again	2018-03-04 23:29:27 +08:00
huangyuhui	9ba6cddde7	Fix update	2018-03-04 19:09:11 +08:00
huangyuhui	5656c9f351	update update_link.php	2018-03-04 16:54:35 +08:00
huangyuhui	ecf24a746e	Fix crashing when unable to save version setting	2018-03-04 15:33:54 +08:00
huangyuhui	5b5a58a867	Fixed not terminating the process when closed window	2018-03-03 22:56:42 +08:00
andylizi	76c254ee98	Switch the download links to HTTPS	2018-02-28 17:23:49 +08:00