Ignore some exceptions

Disable accept button in AddAccountPage
Fix IllegalArgumentException: Invalid UUID String
2018-03-09 16:54:28 +08:00 · 2018-03-09 16:45:12 +08:00 · 2018-03-09 16:31:39 +08:00 · 2018-03-09 16:24:02 +08:00 · 2018-03-06 11:25:15 +08:00 · 2018-03-06 11:19:21 +08:00
50 changed files with 598 additions and 256 deletions
@@ -82,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);
        });
    }
@@ -36,4 +36,5 @@ public final class Main {
        } else
            Launcher.main(args);
    }
+
 }
@@ -19,12 +19,14 @@ package org.jackhuang.hmcl.game;

 import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
+import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 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;
@@ -45,13 +47,14 @@ import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;

 public final class LauncherHelper {
    public static final LauncherHelper INSTANCE = new LauncherHelper();
    private LauncherHelper(){}

    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
-    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(() -> {});
+    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});

    public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
        if (account == null)
@@ -64,7 +67,10 @@ public final class LauncherHelper {

        Platform.runLater(() -> {
            try {
-                checkGameState(profile, setting, version, () -> Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile)));
+                checkGameState(profile, setting, version, () -> {
+                    Controllers.dialog(launchingStepsPane);
+                    Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
+                });
            } catch (InterruptedException ignore) {
            }
        });
@@ -73,12 +79,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 = Task.of(Schedulers.javafx(), () -> Controllers.dialog(launchingStepsPane))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES)))
+        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
                .then(variables -> {
                    if (setting.isNotCheckGame())
                        return null;
@@ -100,7 +105,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)))
@@ -127,13 +131,15 @@ public final class LauncherHelper {
                        if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
                            Launcher.stopApplication();
                        else
-                            launchingStepsPane.setCancel(() -> {
+                            launchingStepsPane.setCancel(it -> {
                                process.stop();
-                                Controllers.closeDialog();
+                                Controllers.closeDialog(it);
                            });
                    } else
-                        Platform.runLater(() ->
-                                Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath())));
+                        Platform.runLater(() -> {
+                            Controllers.closeDialog(launchingStepsPane);
+                            Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                        });

                }))
                .executor();
@@ -153,12 +159,11 @@ public final class LauncherHelper {
            public void onStop(boolean success, TaskExecutor executor) {
                if (!success) {
                    Platform.runLater(() -> {
+                        Controllers.closeDialog(launchingStepsPane);
                        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();
+                                    MessageBox.ERROR_MESSAGE);
                    });
                }
                launchingStepsPane.setExecutor(null);
@@ -169,7 +174,7 @@ public final class LauncherHelper {
    }

    private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
-        boolean flag = false, suggest = true;
+        boolean flag = false;

        VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
        JavaVersion java = setting.getJavaVersion();
@@ -180,36 +185,32 @@ 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;
        }

-        if (flag) {
-            if (suggest && Controllers.getDialogContent() instanceof MessageDialogPane)
-                ((MessageDialogPane) Controllers.getDialogContent()).disableClosingDialog();
-        } else
+        if (!flag)
            onAccept.run();
    }

@@ -219,10 +220,11 @@ public final class LauncherHelper {
    }

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

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

    private void checkExit(LauncherVisibility v) {
@@ -357,7 +359,9 @@ public final class LauncherHelper {
                        // Never come to here.
                        break;
                    case KEEP:
-                        // No operations here
+                        Platform.runLater(() -> {
+                            emitStatus(LoadingState.DONE);
+                        });
                        break;
                    case HIDE:
                        Platform.runLater(() -> {
@@ -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));
@@ -22,12 +22,15 @@ import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.AddAccountPane;
+import org.jackhuang.hmcl.ui.FXUtils;

 import java.util.function.Consumer;

@@ -35,18 +38,19 @@ public class AccountLoginPane extends StackPane {
    private final Account oldAccount;
    private final Consumer<AuthInfo> success;
    private final Runnable failed;
+    private final Consumer<Region> closeConsumer;

    @FXML
    private Label lblUsername;
    @FXML private JFXPasswordField txtPassword;
    @FXML private Label lblCreationWarning;
    @FXML private JFXProgressBar progressBar;
-    private JFXDialog dialog;

-    public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
+    public AccountLoginPane(Account oldAccount, Consumer<Region> closeConsumer, Consumer<AuthInfo> success, Runnable failed) {
        this.oldAccount = oldAccount;
        this.success = success;
        this.failed = failed;
+        this.closeConsumer = closeConsumer;

        FXUtils.loadFXML(this, "/assets/fxml/account-login.fxml");

@@ -69,9 +73,9 @@ public class AccountLoginPane extends StackPane {
            Object account = variable.get("login");
            if (account instanceof AuthInfo) {
                success.accept(((AuthInfo) account));
-                dialog.close();
+                closeConsumer.accept(this);
            } else if (account instanceof NoSelectedCharacterException) {
-                dialog.close();
+                closeConsumer.accept(this);
            } else if (account instanceof Exception) {
                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
            }
@@ -83,10 +87,6 @@ public class AccountLoginPane extends StackPane {
    @FXML
    private void onCancel() {
        failed.run();
-        dialog.close();
-    }
-
-    public void setDialog(JFXDialog dialog) {
-        this.dialog = dialog;
+        closeConsumer.accept(this);
    }
 }
@@ -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);
+    }
 }
@@ -28,6 +28,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.*;
@@ -49,6 +50,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -65,9 +67,10 @@ public class AddAccountPane extends StackPane {
    @FXML private Label lblAddInjectorServer;
    @FXML private Hyperlink linkAddInjectorServer;
    @FXML private JFXDialogLayout layout;
-    private final Runnable finalization;
+    @FXML private JFXButton btnAccept;
+    private final Consumer<Region> finalization;

-    public AddAccountPane(Runnable finalization) {
+    public AddAccountPane(Consumer<Region> finalization) {
        this.finalization = finalization;

        FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
@@ -81,6 +84,7 @@ public class AddAccountPane extends StackPane {
            cboServers.setVisible(newValue.intValue() == 2);
            linkAddInjectorServer.setVisible(newValue.intValue() == 2);
            lblAddInjectorServer.setVisible(newValue.intValue() == 2);
+            validateAcceptButton();
        });
        cboType.getSelectionModel().select(0);

@@ -92,6 +96,12 @@ public class AddAccountPane extends StackPane {
        txtUsername.setOnAction(e -> onCreationAccept());
        txtUsername.getValidators().add(new Validator(Launcher.i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));

+        txtUsername.textProperty().addListener(it -> validateAcceptButton());
+        txtPassword.textProperty().addListener(it -> validateAcceptButton());
+    }
+
+    private void validateAcceptButton() {
+        btnAccept.setDisable(!txtUsername.validate() || (cboType.getSelectionModel().getSelectedIndex() != 0 && !txtPassword.validate()));
    }

    private void loadServers() {
@@ -133,10 +143,10 @@ public class AddAccountPane extends StackPane {
        }).finalized(Schedulers.javafx(), variables -> {
            Settings.INSTANCE.addAccount(variables.get("create_account"));
            progressBar.setVisible(false);
-            finalization.run();
+            finalization.accept(this);
        }, exception -> {
            if (exception instanceof NoSelectedCharacterException) {
-                finalization.run();
+                finalization.accept(this);
            } else {
                lblCreationWarning.setText(accountException(exception));
            }
@@ -146,12 +156,12 @@ public class AddAccountPane extends StackPane {

    @FXML
    private void onCreationCancel() {
-        finalization.run();
+        finalization.accept(this);
    }

    @FXML
    private void onAddInjecterServer() {
-        finalization.run();
+        finalization.accept(this);
        Controllers.navigate(Controllers.getServersPage());
    }

@@ -33,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;

@@ -116,14 +117,8 @@ public final class Controllers {
        stage.setTitle(Launcher.TITLE);
    }

-    public static Region getDialogContent() {
-        return decorator.getDialog().getContent();
-    }
-
-    public static JFXDialog dialog(Region content) {
-        // TODO: temp fix
-        decorator.showDialog(new Region());
-        return decorator.showDialog(content);
+    public static void dialog(Region content) {
+        decorator.showDialog(content);
    }

    public static void dialog(String text) {
@@ -139,28 +134,33 @@ public final class Controllers {
    }

    public static void dialog(String text, String title, int type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, decorator.getDialog(), type, onAccept));
+        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, type, onAccept));
    }

    public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        dialog(new MessageDialogPane(text, title, decorator.getDialog(), onAccept, onCancel));
+        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, onAccept, onCancel));
    }

    public static void inputDialog(String text, Consumer<String> onResult) {
-        dialog(new InputDialogPane(text, decorator.getDialog(), onResult));
+        dialog(new InputDialogPane(text, Controllers::closeDialog, onResult));
    }

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

-    public static void closeDialog() {
-        decorator.getDialog().close();
+    public static void closeDialog(Region content) {
+
+        decorator.closeDialog(content);
    }

    public static void navigate(Node node) {
@@ -53,6 +53,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;
@@ -82,11 +83,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;
@@ -119,8 +122,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;
@@ -165,9 +166,11 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
                btnMax.fire();
        });

+        dialog = new JFXDialog();
+        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);
@@ -188,14 +191,17 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    }

    private void loadBackground() {
-        Image background;
+        try {
+            Image background;

-        if (Settings.INSTANCE.getBackgroundImageType() == EnumBackgroundImage.DEFAULT)
-            background = searchBackgroundImage(new Image("/assets/img/background.jpg"), "");
-        else
-            background = searchBackgroundImage(new Image("/assets/img/background.jpg"), Settings.INSTANCE.getBackgroundImage());
+            if (Settings.INSTANCE.getBackgroundImageType() == EnumBackgroundImage.DEFAULT)
+                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), "");
+            else
+                background = searchBackgroundImage(new Image("/assets/img/background.jpg"), Settings.INSTANCE.getBackgroundImage());

-        drawerWrapper.setBackground(new Background(new BackgroundImage(background, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true))));
+            drawerWrapper.setBackground(new Background(new BackgroundImage(background, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true))));
+        } catch (IllegalArgumentException ignore) {
+        }
    }

    private static Image searchBackgroundImage(Image def, String customPath) {
@@ -511,6 +517,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    }

    public void showPage(Node content) {
+        FXUtils.checkFxUserThread();
+
        contentPlaceHolder.getStyleClass().removeAll("gray-background", "white-background");
        if (content != null)
            contentPlaceHolder.getStyleClass().add("gray-background");
@@ -531,11 +539,23 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
        }
    }

-    public JFXDialog showDialog(Region content) {
-        dialog.setContent(content);
-        if (!dialogShown)
+    public void showDialog(Node node) {
+        FXUtils.checkFxUserThread();
+
+        if (dialogPane.isEmpty())
            dialog.show();
-        return dialog;
+        dialogPane.push(node);
+    }
+
+    public void closeDialog(Node node) {
+        FXUtils.checkFxUserThread();
+
+        dialogPane.pop(node);
+        if (dialogPane.getChildren().isEmpty())
+            Platform.runLater(() -> {
+                if (dialogPane.getChildren().isEmpty())
+                    dialog.close();
+            });
    }

    public void startWizard(WizardProvider wizardProvider) {
@@ -543,6 +563,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
    }

    public void startWizard(WizardProvider wizardProvider, String category) {
+        FXUtils.checkFxUserThread();
+
        this.category = category;
        wizardController.setProvider(wizardProvider);
        wizardController.onStart();
@@ -624,10 +646,6 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
        return wizardController;
    }

-    public JFXDialog getDialog() {
-        return dialog;
-    }
-
    public AdvancedListBox getLeftPane() {
        return leftPane;
    }
@@ -34,15 +34,11 @@ public final class DialogController {
            CountDownLatch latch = new CountDownLatch(1);
            AtomicReference<AuthInfo> res = new AtomicReference<>(null);
            JFXUtilities.runInFX(() -> {
-                AccountLoginPane pane = new AccountLoginPane(account, it -> {
+                AccountLoginPane pane = new AccountLoginPane(account, Controllers::closeDialog, it -> {
                        res.set(it);
                        latch.countDown();
-                        Controllers.closeDialog();
-                }, () -> {
-                        latch.countDown();
-                        Controllers.closeDialog();
-                });
-                pane.setDialog(Controllers.dialog(pane));
+                }, latch::countDown);
+                Controllers.dialog(pane);
            });
            latch.await();
            return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);
@@ -62,6 +62,13 @@ public final class FXUtils {
    private FXUtils() {
    }

+    public static void checkFxUserThread() {
+        if (!Platform.isFxApplicationThread()) {
+            throw new IllegalStateException("Not on FX application thread; currentThread = "
+                    + Thread.currentThread().getName());
+        }
+    }
+
    public static <T> void onChange(ObservableValue<T> value, Consumer<T> consumer) {
        value.addListener((a, b, c) -> consumer.accept(c));
    }
@@ -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));
    }
@@ -25,6 +25,7 @@ import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseButton;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import org.jackhuang.hmcl.Launcher;
@@ -41,6 +42,7 @@ import org.jackhuang.hmcl.mod.UnsupportedModpackException;
 import org.jackhuang.hmcl.setting.*;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.ClassTitle;
 import org.jackhuang.hmcl.ui.construct.IconedItem;
@@ -50,6 +52,7 @@ import org.jackhuang.hmcl.util.Lang;
 import java.io.File;
 import java.util.LinkedList;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;

 public final class LeftPaneController {
    private final AdvancedListBox leftPane;
@@ -148,8 +151,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 -> {
@@ -203,13 +207,15 @@ public final class LeftPaneController {
                    File modpackFile = new File("modpack.zip").getAbsoluteFile();
                    if (modpackFile.exists()) {
                        try {
+                            AtomicReference<Region> region = new AtomicReference<>();
                            Modpack modpack = ModpackHelper.readModpackManifest(modpackFile);
-                            Controllers.taskDialog(ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
-                                            .with(Task.of(Schedulers.javafx(), () -> {
-                                                Controllers.closeDialog();
-                                                checkAccount();
-                                            })).executor(),
-                                    Launcher.i18n("modpack.installing"), "", null);
+                            TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
+                                    .with(Task.of(Schedulers.javafx(), () -> {
+                                        Controllers.closeDialog(region.get());
+                                        checkAccount();
+                                    })).executor();
+                            region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.installing"), ""));
+                            executor.start();
                            flag = false;
                        } catch (UnsupportedModpackException ignore) {
                        }
@@ -25,6 +25,7 @@ import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.image.Image;
 import javafx.scene.input.MouseButton;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.Launcher;
@@ -53,6 +54,10 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
+import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;

 public final class MainPage extends StackPane implements DecoratorPage {

@@ -94,6 +99,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 +114,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 +136,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 +157,20 @@ 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);
+                AtomicReference<Region> region = new AtomicReference<>();
                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"));
+                            .then(Task.of(Schedulers.javafx(), () -> Controllers.closeDialog(region.get()))).executor();
+                    region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), ""));
                    executor.start();
-                    Controllers.dialog(pane);
                } catch (UnsupportedModpackException e) {
+                    Controllers.closeDialog(region.get());
                    Controllers.dialog(Launcher.i18n("modpack.unsupported"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (MismatchedModpackTypeException e) {
+                    Controllers.closeDialog(region.get());
                    Controllers.dialog(Launcher.i18n("modpack.mismatched_type"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (IOException e)  {
+                    Controllers.closeDialog(region.get());
                    Controllers.dialog(Launcher.i18n("modpack.invalid"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                }
            }
@@ -192,7 +203,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) {
@@ -22,14 +22,13 @@ import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXTextField;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;

 import java.util.function.Consumer;

 public class InputDialogPane extends StackPane {
-    private final String text;
-    private final JFXDialog dialog;

    @FXML
    private JFXButton acceptButton;
@@ -40,16 +39,13 @@ public class InputDialogPane extends StackPane {
    @FXML
    private Label content;

-    public InputDialogPane(String text, JFXDialog dialog, Consumer<String> onResult) {
-        this.text = text;
-        this.dialog = dialog;
-
+    public InputDialogPane(String text, Consumer<Region> closeConsumer, Consumer<String> onResult) {
        FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
        content.setText(text);
-        cancelButton.setOnMouseClicked(e -> dialog.close());
+        cancelButton.setOnMouseClicked(e -> closeConsumer.accept(this));
        acceptButton.setOnMouseClicked(e -> {
            onResult.accept(textField.getText());
-            dialog.close();
+            closeConsumer.accept(this);
        });
    }
 }
@@ -22,6 +22,7 @@ import com.jfoenix.controls.JFXDialog;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.Theme;
@@ -29,6 +30,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;

 import java.util.Optional;
+import java.util.function.Consumer;

 public final class MessageDialogPane extends StackPane {
    private boolean closingDialog = true;
@@ -46,7 +48,7 @@ public final class MessageDialogPane extends StackPane {
    @FXML
    private HBox actions;

-    public MessageDialogPane(String text, String title, JFXDialog dialog, int type, Runnable onAccept) {
+    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, int type, Runnable onAccept) {
        FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");

        if (title != null)
@@ -54,8 +56,7 @@ public final class MessageDialogPane extends StackPane {

        content.setText(text);
        acceptButton.setOnMouseClicked(e -> {
-            if (closingDialog)
-                dialog.close();
+            closeConsumer.accept(MessageDialogPane.this);
            Optional.ofNullable(onAccept).ifPresent(Runnable::run);
        });

@@ -82,13 +83,12 @@ public final class MessageDialogPane extends StackPane {
        }
    }

-    public MessageDialogPane(String text, String title, JFXDialog dialog, Runnable onAccept, Runnable onCancel) {
-        this(text, title, dialog, MessageBox.QUESTION_MESSAGE, onAccept);
+    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, Runnable onAccept, Runnable onCancel) {
+        this(text, title, closeConsumer, MessageBox.QUESTION_MESSAGE, onAccept);

        cancelButton.setVisible(true);
        cancelButton.setOnMouseClicked(e -> {
-            if (closingDialog)
-                dialog.close();
+            closeConsumer.accept(MessageDialogPane.this);
            Optional.ofNullable(onCancel).ifPresent(Runnable::run);
        });

@@ -0,0 +1,49 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * 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 org.jackhuang.hmcl.util.Logging;
+
+import java.util.Stack;
+
+public class StackContainerPane extends StackPane {
+    private final Stack<Node> stack = new Stack<>();
+
+    public void push(Node node) {
+        stack.push(node);
+        getChildren().setAll(node);
+
+        Logging.LOG.info(this + " " + stack);
+    }
+
+    public void pop(Node node) {
+        boolean flag = stack.remove(node);
+        if (stack.isEmpty())
+            getChildren().setAll();
+        else
+            getChildren().setAll(stack.peek());
+
+        Logging.LOG.info(this + " " + stack + ", removed: " + flag + ", object: " + node);
+    }
+
+    public boolean isEmpty() {
+        return stack.isEmpty();
+    }
+}
@@ -23,15 +23,17 @@ import com.jfoenix.controls.JFXProgressBar;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.FXUtils;

 import java.util.Optional;
+import java.util.function.Consumer;

 public class TaskExecutorDialogPane extends StackPane {
    private TaskExecutor executor;
-    private Runnable onCancel;
+    private Consumer<Region> onCancel;

    @FXML
    private JFXProgressBar progressBar;
@@ -44,14 +46,14 @@ public class TaskExecutorDialogPane extends StackPane {
    @FXML
    private TaskListPane taskListPane;

-    public TaskExecutorDialogPane(Runnable cancel) {
+    public TaskExecutorDialogPane(Consumer<Region> cancel) {
        FXUtils.loadFXML(this, "/assets/fxml/task-dialog.fxml");

        setCancel(cancel);

        btnCancel.setOnMouseClicked(e -> {
            Optional.ofNullable(executor).ifPresent(TaskExecutor::cancel);
-            onCancel.run();
+            onCancel.accept(this);
        });
    }

@@ -93,7 +95,7 @@ public class TaskExecutorDialogPane extends StackPane {
            progressBar.setProgress(progress);
    }

-    public void setCancel(Runnable onCancel) {
+    public void setCancel(Consumer<Region> onCancel) {
        this.onCancel = onCancel;

        JFXUtilities.runInFX(() -> btnCancel.setDisable(onCancel == null));
@@ -33,8 +33,8 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay

    @Override
    default void handleTask(Map<String, Object> settings, Task task) {
-        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(() -> {
-            Controllers.closeDialog();
+        TaskExecutorDialogPane pane = new TaskExecutorDialogPane(it -> {
+            Controllers.closeDialog(it);
            Controllers.navigate(null);
        });

@@ -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(pane);
+                        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);
@@ -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());
@@ -20,10 +20,12 @@ package org.jackhuang.hmcl.upgrade;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.jfoenix.concurrency.JFXUtilities;
+import javafx.scene.layout.Region;
 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.*;
@@ -37,6 +39,7 @@ import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Pack200;
@@ -115,13 +118,16 @@ public class AppDataUpgrader extends IUpgrader {
                        String hash = null;
                        if (map.containsKey("jarsha1"))
                            hash = map.get("jarsha1");
-                        Controllers.dialog(Launcher.i18n("message.downloading"));
-                        if (new AppDataUpgraderJarTask(NetworkUtils.toURL(map.get("jar")), version.toString(), hash).test()) {
+                        Task task = new AppDataUpgraderJarTask(NetworkUtils.toURL(map.get("jar")), version.toString(), hash);
+                        TaskExecutor executor = task.executor();
+                        AtomicReference<Region> region = new AtomicReference<>();
+                        JFXUtilities.runInFX(() -> region.set(Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null)));
+                        if (executor.test()) {
                            new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderJarTask.getSelf(version.toString()).getAbsolutePath())
                                    .directory(new File("").getAbsoluteFile()).start();
                            System.exit(0);
                        }
-                        Controllers.closeDialog();
+                        JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
                    } catch (IOException ex) {
                        Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                    }
@@ -130,13 +136,16 @@ public class AppDataUpgrader extends IUpgrader {
                        String hash = null;
                        if (map.containsKey("packsha1"))
                            hash = map.get("packsha1");
-                        JFXUtilities.runInFX(() -> 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();
+                        AtomicReference<Region> region = new AtomicReference<>();
+                        JFXUtilities.runInFX(() -> region.set(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(region.get()));
                    } catch (IOException ex) {
                        Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                    }
@@ -147,8 +156,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) {
@@ -17,8 +17,12 @@
 */
 package org.jackhuang.hmcl.upgrade;

+import com.jfoenix.concurrency.JFXUtilities;
+import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.util.Charsets;
 import org.jackhuang.hmcl.util.Logging;
@@ -28,6 +32,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;

 /**
@@ -52,7 +57,11 @@ public class NewFileUpgrader extends IUpgrader {
        if (url == null) return;
        File newf = new File(url.getFile());
        Controllers.dialog(Launcher.i18n("message.downloading"));
-        if (new FileDownloadTask(url, newf).test()) {
+        Task task = new FileDownloadTask(url, newf);
+        TaskExecutor executor = task.executor();
+        AtomicReference<Region> region = new AtomicReference<>();
+        JFXUtilities.runInFX(() -> region.set(Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null)));
+        if (executor.test()) {
            try {
                new ProcessBuilder(newf.getCanonicalPath(), "--removeOldLauncher", getRealPath())
                        .directory(new File("").getAbsoluteFile())
@@ -62,7 +71,7 @@ public class NewFileUpgrader extends IUpgrader {
            }
            System.exit(0);
        }
-        Controllers.closeDialog();
+        JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
    }

    private static String getRealPath() {
@@ -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/hmcl/update_link.php")), 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);
                    }
@@ -42,6 +42,8 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
            put("java.lang.NoClassDefFoundError", Launcher.i18n("crash.NoClassDefFound"));
            put("java.lang.VerifyError", Launcher.i18n("crash.NoClassDefFound"));
            put("java.lang.NoSuchMethodError", Launcher.i18n("crash.NoClassDefFound"));
+            put("java.lang.NoSuchFieldError", Launcher.i18n("crash.NoClassDefFound"));
+            put("netscape.javascript.JSException", Launcher.i18n("crash.NoClassDefFound"));
            put("java.lang.IncompatibleClassChangeError", Launcher.i18n("crash.NoClassDefFound"));
            put("java.lang.ClassFormatError", Launcher.i18n("crash.NoClassDefFound"));
            put("java.lang.OutOfMemoryError", "FUCKING MEMORY LIMIT!");
@@ -113,7 +115,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) {
@@ -56,7 +56,7 @@
        </body>
        <actions>
            <Label fx:id="lblCreationWarning"/>
-            <JFXButton onMouseClicked="#onCreationAccept" text="%button.ok" styleClass="dialog-accept"/>
+            <JFXButton fx:id="btnAccept" onMouseClicked="#onCreationAccept" text="%button.ok" styleClass="dialog-accept"/>
            <JFXButton onMouseClicked="#onCreationCancel" text="%button.cancel" styleClass="dialog-cancel"/>
        </actions>
    </JFXDialogLayout>
@@ -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=下载资源文件失败，可能导致没有中文和声音。

@@ -93,7 +93,7 @@ color.red=红色
 color.recent=推荐
 color.custom=自定义颜色

-crash.NoClassDefFound=请确认HMCL本体是否完整
+crash.NoClassDefFound=请确认HMCL本体是否完整，或更新您的Java。
 crash.advice.ClassNotFoundException=Minecraft不完整或Mod冲突，如果有未能下载的文件请下载成功后重试或是客户端损坏请重试请重新制作客户端或下载整合包解决问题，另可尝试游戏设置->（版本）管理->删除库文件解决问题
 crash.advice.ConcurrentModificationException=这可能是因为您的Java版本高于Java 1.8.0_11导致的,可以尝试卸载Java8安装Java7。
 crash.advice.LWJGLException=您的电脑不正常，可能需要使用驱动精灵或其他安装器更新显卡驱动。
@@ -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=官方
@@ -0,0 +1,61 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <huanghongxun2008@126.com>
+ *
+ * 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);
+    }
+}
@@ -20,10 +20,7 @@ package org.jackhuang.hmcl.auth.offline;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.AuthenticationException;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Pair;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.UUIDTypeAdapter;
+import org.jackhuang.hmcl.util.*;

 import java.util.Map;
 import java.util.Objects;
@@ -66,7 +63,7 @@ public class OfflineAccount extends Account {

    @Override
    public AuthInfo logIn() throws AuthenticationException {
-        if (StringUtils.isBlank(username) || StringUtils.isBlank(uuid))
+        if (StringUtils.isBlank(username))
            throw new AuthenticationException("Username cannot be empty");

        return new AuthInfo(username, uuid, uuid);
@@ -107,6 +104,9 @@ public class OfflineAccount extends Account {

    @Override
    public String toString() {
-        return "OfflineAccount[username=" + username + ", uuid=" + uuid + "]";
+        return new ToStringBuilder(this)
+                .append("username", username)
+                .append("uuid", uuid)
+                .toString();
    }
 }
@@ -21,9 +21,13 @@ import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.CharacterSelector;
 import org.jackhuang.hmcl.util.DigestUtils;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.UUIDTypeAdapter;

 import java.net.Proxy;
 import java.util.Map;
+import java.util.UUID;
+import java.util.logging.Level;

 /**
 *
@@ -47,6 +51,9 @@ public class OfflineAccountFactory extends AccountFactory<OfflineAccount> {
        String uuid = Lang.get(storage, "uuid", String.class)
                .orElse(getUUIDFromUserName(username));

+        // Check if the uuid is vaild
+        UUIDTypeAdapter.fromString(uuid);
+
        return new OfflineAccount(username, uuid);
    }

@@ -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 <huanghongxun2008@126.com>
+ *
+ * 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);
        }
    }

@@ -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);
    
@@ -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("someone@xxx.com")
+        //            .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	a1e115ea6b	Ignore some exceptions	2018-03-09 16:54:28 +08:00
huangyuhui	03383510ef	Disable accept button in AddAccountPage	2018-03-09 16:45:12 +08:00
huangyuhui	e8cf9644eb	Fix IllegalArgumentException: Invalid UUID String	2018-03-09 16:31:39 +08:00
huangyuhui	dbfcf1facc	Try to fix empty stack of StackContainerPane	2018-03-09 16:24:02 +08:00
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
andylizi	76c254ee98	Switch the download links to HTTPS	2018-02-28 17:23:49 +08:00