Fixed #296

Merge pull request #332 from xfl03/javafx
Fix #325 #296
2018-05-20 19:48:43 +08:00 · 2018-05-20 19:40:39 +08:00 · 2018-05-20 19:12:12 +08:00 · 2018-05-17 16:46:16 +08:00 · 2018-04-30 01:59:33 +08:00 · 2018-04-26 22:15:27 +08:00
37 changed files with 421 additions and 215 deletions
@@ -31,7 +31,13 @@ import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.*;

 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.ResourceBundle;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
@@ -123,6 +129,25 @@ public final class Launcher extends Application {
        }
    }

+    public static List<File> getCurrentJarFiles() {
+        List<File> result = new LinkedList<>();
+        if (Launcher.class.getClassLoader() instanceof URLClassLoader) {
+            URL[] urls = ((URLClassLoader) Launcher.class.getClassLoader()).getURLs();
+            for (URL u : urls)
+                try {
+                    File f = new File(u.toURI());
+                    if (f.isFile() && (f.getName().endsWith(".exe") || f.getName().endsWith(".jar")))
+                        result.add(f);
+                } catch (URISyntaxException e) {
+                    return null;
+                }
+        }
+        if (result.isEmpty())
+            return null;
+        else
+            return result;
+    }
+
    public static String i18n(String key) {
        try {
            return RESOURCE_BUNDLE.getString(key);
@@ -19,6 +19,7 @@ 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;
@@ -46,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)
@@ -65,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) {
            }
        });
@@ -78,8 +83,7 @@ public final class LauncherHelper {
        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;
@@ -127,13 +131,13 @@ 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.closeDialog();
+                            Controllers.closeDialog(launchingStepsPane);
                            Controllers.dialog(Launcher.i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                        });

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

        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;
        }

@@ -207,10 +210,7 @@ public final class LauncherHelper {
            flag = true;
        }

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

@@ -221,7 +221,7 @@ public final class LauncherHelper {

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

        launchingStepsPane.setTitle(state.getLocalizedMessage());
        launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
@@ -359,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(() -> {
@@ -23,7 +23,7 @@ import org.jackhuang.hmcl.util.JavaVersion;

 import java.util.*;

-final class Config {
+public final class Config implements Cloneable {

    @SerializedName("last")
    private String selectedProfile = "";
@@ -97,7 +97,6 @@ final class Config {

    public void setSelectedProfile(String selectedProfile) {
        this.selectedProfile = selectedProfile;
-        Settings.INSTANCE.save();
    }

    public String getBackgroundImage() {
@@ -106,7 +105,6 @@ final class Config {

    public void setBackgroundImage(String backgroundImage) {
        this.backgroundImage = backgroundImage;
-        Settings.INSTANCE.save();
    }

    public int getBackgroundImageType() {
@@ -115,7 +113,6 @@ final class Config {

    public void setBackgroundImageType(int backgroundImageType) {
        this.backgroundImageType = backgroundImageType;
-        Settings.INSTANCE.save();
    }

    public String getCommonDirectory() {
@@ -124,7 +121,6 @@ final class Config {

    public void setCommonDirectory(String commonDirectory) {
        this.commonDirectory = commonDirectory;
-        Settings.INSTANCE.save();
    }

    public boolean isHasProxy() {
@@ -133,7 +129,6 @@ final class Config {

    public void setHasProxy(boolean hasProxy) {
        this.hasProxy = hasProxy;
-        Settings.INSTANCE.save();
    }

    public boolean isHasProxyAuth() {
@@ -142,7 +137,6 @@ final class Config {

    public void setHasProxyAuth(boolean hasProxyAuth) {
        this.hasProxyAuth = hasProxyAuth;
-        Settings.INSTANCE.save();
    }

    public int getProxyType() {
@@ -151,7 +145,6 @@ final class Config {

    public void setProxyType(int proxyType) {
        this.proxyType = proxyType;
-        Settings.INSTANCE.save();
    }

    public String getProxyHost() {
@@ -160,7 +153,6 @@ final class Config {

    public void setProxyHost(String proxyHost) {
        this.proxyHost = proxyHost;
-        Settings.INSTANCE.save();
    }

    public String getProxyPort() {
@@ -169,7 +161,6 @@ final class Config {

    public void setProxyPort(String proxyPort) {
        this.proxyPort = proxyPort;
-        Settings.INSTANCE.save();
    }

    public String getProxyUser() {
@@ -178,7 +169,6 @@ final class Config {

    public void setProxyUser(String proxyUser) {
        this.proxyUser = proxyUser;
-        Settings.INSTANCE.save();
    }

    public String getProxyPass() {
@@ -187,7 +177,6 @@ final class Config {

    public void setProxyPass(String proxyPass) {
        this.proxyPass = proxyPass;
-        Settings.INSTANCE.save();
    }

    public String getTheme() {
@@ -196,7 +185,6 @@ final class Config {

    public void setTheme(String theme) {
        this.theme = theme;
-        Settings.INSTANCE.save();
    }

    public List<JavaVersion> getJava() {
@@ -205,7 +193,6 @@ final class Config {

    public void setJava(List<JavaVersion> java) {
        this.java = java;
-        Settings.INSTANCE.save();
    }

    public String getLocalization() {
@@ -214,7 +201,6 @@ final class Config {

    public void setLocalization(String localization) {
        this.localization = localization;
-        Settings.INSTANCE.save();
    }

    public int getDownloadType() {
@@ -223,7 +209,6 @@ final class Config {

    public void setDownloadType(int downloadType) {
        this.downloadType = downloadType;
-        Settings.INSTANCE.save();
    }

    public Map<String, Profile> getConfigurations() {
@@ -232,7 +217,6 @@ final class Config {

    public void setConfigurations(Map<String, Profile> configurations) {
        this.configurations = configurations;
-        Settings.INSTANCE.save();
    }

    public List<Map<Object, Object>> getAccounts() {
@@ -241,7 +225,6 @@ final class Config {

    public void setAccounts(List<Map<Object, Object>> accounts) {
        this.accounts = accounts;
-        Settings.INSTANCE.save();
    }

    public String getSelectedAccount() {
@@ -250,7 +233,6 @@ final class Config {

    public void setSelectedAccount(String selectedAccount) {
        this.selectedAccount = selectedAccount;
-        Settings.INSTANCE.save();
    }

    public String getFontFamily() {
@@ -259,7 +241,6 @@ final class Config {

    public void setFontFamily(String fontFamily) {
        this.fontFamily = fontFamily;
-        Settings.INSTANCE.save();
    }

    public double getFontSize() {
@@ -268,7 +249,6 @@ final class Config {

    public void setFontSize(double fontSize) {
        this.fontSize = fontSize;
-        Settings.INSTANCE.save();
    }

    public int getLogLines() {
@@ -285,6 +265,9 @@ final class Config {

    public void setAuthlibInjectorServerURLs(Set<String> authlibInjectorServerURLs) {
        this.authlibInjectorServerURLs = authlibInjectorServerURLs;
-        Settings.INSTANCE.save();
+    }
+
+    public Config clone() {
+        return Settings.GSON.fromJson(Settings.GSON.toJson(this), Config.class);
    }
 }
@@ -55,7 +55,8 @@ public class Settings {
    public static final String DEFAULT_PROFILE = "Default";
    public static final String HOME_PROFILE = "Home";

-    public static final File SETTINGS_FILE = new File("hmcl.json").getAbsoluteFile();
+    public static final String SETTINGS_FILE_NAME = "hmcl.json";
+    public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile();

    public static final Settings INSTANCE = new Settings();

@@ -144,6 +145,7 @@ public class Settings {
            super.invalidated();

            SETTINGS.setCommonDirectory(get());
+            save();
        }
    };

@@ -168,6 +170,7 @@ public class Settings {
    public void setLocale(Locales.SupportedLocale locale) {
        this.locale = locale;
        SETTINGS.setLocalization(Locales.getNameByLocale(locale));
+        save();
    }

    private Proxy proxy = Proxy.NO_PROXY;
@@ -185,6 +188,7 @@ public class Settings {
    public void setProxyType(Proxy.Type proxyType) {
        this.proxyType = proxyType;
        SETTINGS.setProxyType(Proxies.PROXIES.indexOf(proxyType));
+        save();
        loadProxy();
    }

@@ -194,6 +198,7 @@ public class Settings {

    public void setProxyHost(String proxyHost) {
        SETTINGS.setProxyHost(proxyHost);
+        save();
    }

    public String getProxyPort() {
@@ -202,6 +207,7 @@ public class Settings {

    public void setProxyPort(String proxyPort) {
        SETTINGS.setProxyPort(proxyPort);
+        save();
    }

    public String getProxyUser() {
@@ -210,6 +216,7 @@ public class Settings {

    public void setProxyUser(String proxyUser) {
        SETTINGS.setProxyUser(proxyUser);
+        save();
    }

    public String getProxyPass() {
@@ -218,15 +225,22 @@ public class Settings {

    public void setProxyPass(String proxyPass) {
        SETTINGS.setProxyPass(proxyPass);
+        save();
    }

    public boolean hasProxy() { return SETTINGS.isHasProxy(); }

-    public void setHasProxy(boolean hasProxy) { SETTINGS.setHasProxy(hasProxy); }
+    public void setHasProxy(boolean hasProxy) {
+        SETTINGS.setHasProxy(hasProxy);
+        save();
+    }

    public boolean hasProxyAuth() { return SETTINGS.isHasProxyAuth(); }

-    public void setHasProxyAuth(boolean hasProxyAuth) { SETTINGS.setHasProxyAuth(hasProxyAuth); }
+    public void setHasProxyAuth(boolean hasProxyAuth) {
+        SETTINGS.setHasProxyAuth(hasProxyAuth);
+        save();
+    }

    private void loadProxy() {
        String host = getProxyHost();
@@ -261,6 +275,7 @@ public class Settings {
    public void setFont(Font font) {
        SETTINGS.setFontFamily(font.getFamily());
        SETTINGS.setFontSize(font.getSize());
+        save();
    }

    public int getLogLines() {
@@ -269,6 +284,7 @@ public class Settings {

    public void setLogLines(int logLines) {
        SETTINGS.setLogLines(logLines);
+        save();
    }

    /****************************************
@@ -296,8 +312,10 @@ public class Settings {
    }

    private void checkAuthlibInjectorServerURLs() {
-        if (SETTINGS.getAuthlibInjectorServerURLs() == null)
+        if (SETTINGS.getAuthlibInjectorServerURLs() == null) {
            SETTINGS.setAuthlibInjectorServerURLs(new HashSet<>());
+            save();
+        }
    }

    private void checkAuthlibInjectorAccounts() {
@@ -323,6 +341,7 @@ public class Settings {
        if (index == -1)
            throw new IllegalArgumentException("Unknown download provider: " + downloadProvider);
        SETTINGS.setDownloadType(index);
+        save();
    }

    /****************************************
@@ -352,6 +371,7 @@ public class Settings {
            super.invalidated();

            SETTINGS.setSelectedAccount(getValue() == null ? "" : Accounts.getAccountId(getValue()));
+            save();
        }
    };

@@ -404,6 +424,7 @@ public class Settings {
            super.invalidated();

            SETTINGS.setBackgroundImage(get());
+            save();
        }
    };

@@ -425,6 +446,7 @@ public class Settings {
            super.invalidated();

            SETTINGS.setBackgroundImageType(get().ordinal());
+            save();
        }
    };

@@ -450,6 +472,7 @@ public class Settings {
            super.invalidated();

            SETTINGS.setTheme(get().getName().toLowerCase());
+            save();
        }
    };

@@ -473,7 +496,10 @@ public class Settings {
        checkProfileMap();

        if (!hasProfile(SETTINGS.getSelectedProfile())) {
-            getProfileMap().keySet().stream().findFirst().ifPresent(SETTINGS::setSelectedProfile);
+            getProfileMap().keySet().stream().findFirst().ifPresent(selectedProfile -> {
+                SETTINGS.setSelectedProfile(selectedProfile);
+                save();
+            });
            Schedulers.computation().schedule(this::onProfileChanged);
        }
        return getProfile(SETTINGS.getSelectedProfile());
@@ -482,6 +508,7 @@ public class Settings {
    public void setSelectedProfile(Profile selectedProfile) {
        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), SETTINGS.getSelectedProfile())) {
            SETTINGS.setSelectedProfile(selectedProfile.getName());
+            save();
            Schedulers.computation().schedule(this::onProfileChanged);
        }
    }
@@ -555,4 +582,8 @@ public class Settings {
    public void onAccountLoading() {
        EventBus.EVENT_BUS.fireEvent(new AccountLoadingEvent(this, getAccounts()));
    }
+
+    public Config getRawConfig() {
+        return SETTINGS.clone();
+    }
 }
@@ -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);
    }
 }
@@ -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());
    }

@@ -17,6 +17,7 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.construct.URLValidator;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.NetworkUtils;
@@ -45,6 +46,9 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
    @FXML private JFXProgressBar progressBar;
    @FXML private JFXButton btnAddNext;

+    @FXML private URLValidator validatorURL;
+    @FXML private URLValidator validatorHttp;
+
    private final TransitionHandler transitionHandler;

    {
@@ -55,6 +59,9 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
        getChildren().remove(dialog);
        dialog.setDialogContainer(this);

+        validatorURL.setMessage(Launcher.i18n("input.url"));
+        validatorHttp.setMessage(Launcher.i18n("input.url.http"));
+
        txtServerIp.textProperty().addListener((a, b, newValue) ->
                btnAddNext.setDisable(!txtServerIp.validate()));

@@ -117,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(Lang.apply(new Region(), region -> region.getProperties().put("controllers", true)));
-        return decorator.showDialog(content);
+    public static void dialog(Region content) {
+        decorator.showDialog(content);
    }

    public static void dialog(String text) {
@@ -140,31 +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) {
-        taskDialog(executor, title, subtitle, null);
+    public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
+        return taskDialog(executor, title, subtitle, null);
    }

-    public static void taskDialog(TaskExecutor executor, String title, String subtitle, Runnable onCancel) {
+    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);
        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) {
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDrawer;
@@ -167,17 +166,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
                btnMax.fire();
        });

-        dialog = new JFXDialog() {
-            @Override
-            public void close() {
-                dialogPane.pop();
-                if (dialogPane.getChildren().isEmpty())
-                    Platform.runLater(() -> {
-                        if (dialogPane.getChildren().isEmpty())
-                            super.close();
-                    });
-            }
-        };
+        dialog = new JFXDialog();
        dialog.setOverlayClose(false);
        drawerWrapper.getChildren().add(0, dialog);
        dialog.setDialogContainer(drawerWrapper);
@@ -202,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) {
@@ -525,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");
@@ -545,11 +539,23 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
        }
    }

-    public JFXDialog showDialog(Node node) {
+    public void showDialog(Node node) {
+        FXUtils.checkFxUserThread();
+
        if (dialogPane.isEmpty())
            dialog.show();
        dialogPane.push(node);
-        return dialog;
+    }
+
+    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) {
@@ -557,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();
@@ -638,10 +646,6 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
        return wizardController;
    }

-    public JFXDialog getDialog() {
-        return dialog;
-    }
-
    public AdvancedListBox getLeftPane() {
        return leftPane;
    }
@@ -34,11 +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();
                }, latch::countDown);
-                pane.setDialog(Controllers.dialog(pane));
+                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));
    }
@@ -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;
@@ -192,10 +195,10 @@ public final class LeftPaneController {
    }

    private boolean checkedModpack = false;
+    private static boolean showNewAccount = true;

    private void onRefreshedVersions(RefreshedVersionsEvent event) {
        JFXUtilities.runInFX(() -> {
-            boolean flag = true;
            HMCLGameRepository repository = (HMCLGameRepository) event.getSource();
            if (!checkedModpack) {
                checkedModpack = true;
@@ -204,22 +207,26 @@ 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(true),
-                                    Launcher.i18n("modpack.installing"), "", null);
-                            flag = false;
+                            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();
+                            showNewAccount = false;
                        } catch (UnsupportedModpackException ignore) {
                        }
                    }
                }
            }

-            if (flag)
+            if (showNewAccount) {
+                showNewAccount = false;
                checkAccount();
+            }
        });
    }

@@ -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,7 @@ 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;
@@ -155,18 +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) {
+                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(true);
-                    Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), "", null);
+                            .then(Task.of(Schedulers.javafx(), () -> Controllers.closeDialog(region.get()))).executor();
+                    region.set(Controllers.taskDialog(executor, Launcher.i18n("modpack.update"), ""));
+                    executor.start();
                } catch (UnsupportedModpackException e) {
-                    Controllers.closeDialog();
+                    Controllers.closeDialog(region.get());
                    Controllers.dialog(Launcher.i18n("modpack.unsupported"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (MismatchedModpackTypeException e) {
-                    Controllers.closeDialog();
+                    Controllers.closeDialog(region.get());
                    Controllers.dialog(Launcher.i18n("modpack.mismatched_type"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                } catch (IOException e)  {
-                    Controllers.closeDialog();
+                    Controllers.closeDialog(region.get());
                    Controllers.dialog(Launcher.i18n("modpack.invalid"), Launcher.i18n("message.error"), MessageBox.ERROR_MESSAGE);
                }
            }
@@ -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);
        });

@@ -19,6 +19,7 @@ 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;

@@ -26,17 +27,20 @@ public class StackContainerPane extends StackPane {
    private final Stack<Node> stack = new Stack<>();

    public void push(Node node) {
-        if (!node.getProperties().containsKey("controllers"))
-            stack.push(node);
+        stack.push(node);
        getChildren().setAll(node);
+
+        Logging.LOG.info(this + " " + stack);
    }

-    public void pop() {
-        stack.pop();
+    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() {
@@ -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);
        });

@@ -61,7 +61,7 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                @Override
                public void onStop(boolean success, TaskExecutor executor) {
                    JFXUtilities.runInFX(() -> {
-                        Controllers.closeDialog();
+                        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));
@@ -17,10 +17,6 @@ public class URLValidator extends ValidatorBase {
        super();
    }

-    public URLValidator(@NamedArg("message") String message) {
-        super(message);
-    }
-
    public ObservableList<String> getProtocols() {
        return protocols;
    }
@@ -18,14 +18,23 @@
 package org.jackhuang.hmcl.ui.export;

 import javafx.scene.Node;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.game.HMCLModpackExportTask;
 import org.jackhuang.hmcl.game.HMCLModpackManager;
 import org.jackhuang.hmcl.mod.Modpack;
+import org.jackhuang.hmcl.setting.Config;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.ZipEngine;

 import java.io.File;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;

@@ -46,16 +55,73 @@ public final class ExportWizardProvider implements WizardProvider {
    public Object finish(Map<String, Object> settings) {
        @SuppressWarnings("unchecked")
        List<String> whitelist = (List<String>) settings.get(ModpackFileSelectionPage.MODPACK_FILE_SELECTION);
+        List<File> launcherJar = Launcher.getCurrentJarFiles();
+        boolean includeLauncher = (Boolean) settings.get(ModpackInfoPage.MODPACK_INCLUDE_LAUNCHER) && launcherJar != null;

-        return new HMCLModpackExportTask(profile.getRepository(), version, whitelist,
-                new Modpack(
-                        (String) settings.get(ModpackInfoPage.MODPACK_NAME),
-                        (String) settings.get(ModpackInfoPage.MODPACK_AUTHOR),
-                        (String) settings.get(ModpackInfoPage.MODPACK_VERSION),
-                        null,
-                        (String) settings.get(ModpackInfoPage.MODPACK_DESCRIPTION),
-                        null
-                ), (File) settings.get(ModpackInfoPage.MODPACK_FILE));
+        return new Task() {
+            Task dependency = null;
+
+            @Override
+            public void execute() throws Exception {
+                File modpackFile = (File) settings.get(ModpackInfoPage.MODPACK_FILE);
+                File tempModpack = includeLauncher ? Files.createTempFile("hmcl", ".zip").toFile() : modpackFile;
+
+                dependency = new HMCLModpackExportTask(profile.getRepository(), version, whitelist,
+                        new Modpack(
+                                (String) settings.get(ModpackInfoPage.MODPACK_NAME),
+                                (String) settings.get(ModpackInfoPage.MODPACK_AUTHOR),
+                                (String) settings.get(ModpackInfoPage.MODPACK_VERSION),
+                                null,
+                                (String) settings.get(ModpackInfoPage.MODPACK_DESCRIPTION),
+                                null
+                        ), tempModpack);
+
+                if (includeLauncher) {
+                    dependency = dependency.then(Task.of(() -> {
+                        boolean flag = true;
+
+                        try (ZipEngine zip = new ZipEngine(modpackFile)) {
+                            Config config = Settings.INSTANCE.getRawConfig();
+
+                            config.setHasProxy(false);
+                            config.setSelectedProfile("");
+                            config.setCommonDirectory(null);
+                            config.setFontFamily("Consolas");
+                            config.setFontSize(12);
+                            config.setJava(null);
+                            config.setLocalization(null);
+                            config.setAccounts(null);
+                            config.setSelectedAccount("");
+                            config.setLogLines(100);
+                            config.setConfigurations(null);
+
+                            zip.putTextFile(Settings.GSON.toJson(config), Settings.SETTINGS_FILE_NAME);
+                            zip.putFile(tempModpack, "modpack.zip");
+
+                            File bg = new File("bg").getAbsoluteFile();
+                            if (bg.isDirectory())
+                                zip.putDirectory(bg);
+
+                            File background_png = new File("background.png").getAbsoluteFile();
+                            if (background_png.isFile())
+                                zip.putFile(background_png, "background.png");
+
+                            File background_jpg = new File("background.jpg").getAbsoluteFile();
+                            if (background_jpg.isFile())
+                                zip.putFile(background_jpg, "background.jpg");
+
+                            for (File jar : launcherJar)
+                                zip.putFile(jar, jar.getName());
+                        }
+                    }));
+                }
+            }
+
+            @Override
+            public Collection<? extends Task> getDependencies() {
+                return Collections.singleton(dependency);
+            }
+        };
    }

    @Override
@@ -33,8 +33,10 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
+import org.jackhuang.hmcl.util.FileUtils;

 import java.io.File;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;

@@ -45,12 +47,16 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
    @FXML
    private JFXTextField txtModpackName;
    @FXML
-    private JFXTextField txtModpackAuthor;@FXML
-    private JFXTextField txtModpackVersion;@FXML
+    private JFXTextField txtModpackAuthor;
+    @FXML
+    private JFXTextField txtModpackVersion;
+    @FXML
    private JFXTextArea txtModpackDescription;
    @FXML
-    private JFXToggleButton chkIncludeLauncher;@FXML
-    private JFXButton btnNext;@FXML
+    private JFXToggleButton chkIncludeLauncher;
+    @FXML
+    private JFXButton btnNext;
+    @FXML
    private ScrollPane scroll;

    public ModpackInfoPage(WizardController controller, String version) {
@@ -63,6 +69,10 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
        txtModpackVersion.textProperty().addListener(e -> checkValidation());
        txtModpackAuthor.setText(Optional.ofNullable(Settings.INSTANCE.getSelectedAccount()).map(Account::getUsername).orElse(""));
        lblVersionName.setText(version);
+
+        List<File> launcherJar = Launcher.getCurrentJarFiles();
+        if (launcherJar == null)
+            chkIncludeLauncher.setDisable(true);
    }

    private void checkValidation() {
@@ -20,6 +20,7 @@ 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;
@@ -38,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;
@@ -116,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);
                    }
@@ -133,13 +138,14 @@ public class AppDataUpgrader extends IUpgrader {
                            hash = map.get("packsha1");
                        Task task = new AppDataUpgraderPackGzTask(NetworkUtils.toURL(map.get("pack")), version.toString(), hash);
                        TaskExecutor executor = task.executor();
-                        JFXUtilities.runInFX(() -> Controllers.taskDialog(executor, Launcher.i18n("message.downloading"), "", null));
+                        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);
                        }
-                        JFXUtilities.runInFX(Controllers::closeDialog);
+                        JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
                    } catch (IOException ex) {
                        Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                    }
@@ -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() {
@@ -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!");
@@ -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>
@@ -34,9 +34,9 @@
                    <body>
                        <JFXTextField fx:id="txtServerIp" promptText="%account.injector.server_ip">
                            <validators>
-                                <URLValidator message="%input.url">
+                                <URLValidator fx:id="validatorURL">
                                </URLValidator>
-                                <URLValidator message="%input.url.http">
+                                <URLValidator fx:id="validatorHttp">
                                    <protocols>
                                        <String fx:value="http" />
                                        <String fx:value="https" />
@@ -31,7 +31,7 @@
                    </right>
                </BorderPane>

-                <FileItem fx:id="gameDir" name="%profile.instance_directory" title="%settings.choose_gamedir"/>
+                <FileItem fx:id="gameDir" name="%profile.instance_directory" title="%profile.instance_directory.choose"/>
            </ComponentList>

        </VBox>
@@ -25,7 +25,7 @@
                <MultiFileItem fx:id="javaItem" title="%settings.game.java_directory" chooserTitle="%settings.game.java_directory.choose"
                               hasSubtitle="true" customText="%settings.custom" directory="false" />

-                <MultiFileItem fx:id="gameDirItem" title="%profile.instance_directory" chooserTitle="%settings.choose_gamedir"
+                <MultiFileItem fx:id="gameDirItem" title="%settings.game.game_directory" chooserTitle="%settings.game.game_directory.choose"
                               hasSubtitle="true" customText="%settings.custom" directory="true" />

                <BorderPane> <!-- Max Memory -->
@@ -311,6 +311,7 @@ profile=Profile
 profile.default=Current directory
 profile.home=User home
 profile.instance_directory=Game Directory
+profile.instance_directory.choose=Choose Game Directory
 profile.new=New Config
 profile.new_name=New Profile Name:
 profile.remove=Sure to remove profile %s?
@@ -343,7 +344,6 @@ settings.advanced.server_ip=Server Host
 settings.advanced.wrapper_launcher=Wrapper Launcher(i.e. optirun...)

 settings.cannot_remove_default_config=Cannot remove the default configution.
-settings.choose_gamedir=Choose Game Directory
 settings.custom=Custom
 settings.default=Default
 settings.failed_load=Failed to load settings file. Remove it?
@@ -352,6 +352,8 @@ settings.game=Games
 settings.game.dimension=Game Window Dimension
 settings.game.exploration=Explore
 settings.game.fullscreen=Fullscreen
+settings.game.game_directory=Game Directory
+settings.game.game_directory.choose=Choose Game Directory
 settings.game.java_directory=Java Dir
 settings.game.java_directory.choose=Choose Java Directory.
 settings.game.management=Manage
@@ -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=您的电脑不正常，可能需要使用驱动精灵或其他安装器更新显卡驱动。
@@ -147,7 +147,7 @@ install.installer.forge=Forge
 install.installer.game=游戏
 install.installer.install=安装%s
 install.installer.liteloader=LiteLoader
-install.installer.not_installed=不安装%s
+install.installer.not_installed=暂不安装%s，可以点击此处安装
 install.installer.optifine=OptiFine
 install.installer.version=%s版本
 install.modpack=安装整合包
@@ -311,6 +311,7 @@ profile=配置
 profile.default=当前目录
 profile.home=主文件夹
 profile.instance_directory=游戏路径
+profile.instance_directory.choose=选择游戏路径
 profile.new=新建配置
 profile.new_name=新配置名:
 profile.remove=真的要删除配置%s吗？
@@ -343,7 +344,6 @@ settings.advanced.server_ip=直入服务器ip地址(不必填写，启动游戏
 settings.advanced.wrapper_launcher=前置指令(不必填写,如optirun)

 settings.cannot_remove_default_config=不能删除默认配置
-settings.choose_gamedir=选择游戏路径
 settings.custom=自定义
 settings.default=默认
 settings.failed_load=设置文件加载失败，可能是升级了启动器或被人工修改造成错误，是否清除？
@@ -352,6 +352,8 @@ settings.game=游戏设置
 settings.game.dimension=游戏窗口分辨率
 settings.game.exploration=浏览
 settings.game.fullscreen=全屏
+settings.game.game_directory=游戏路径（版本隔离）
+settings.game.game_directory.choose=选择游戏路径
 settings.game.java_directory=Java路径
 settings.game.java_directory.choose=选择Java路径
 settings.game.management=管理
@@ -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);
    }

@@ -36,27 +36,27 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {

    @Override
    public String getLibraryBaseURL() {
-        return "http://bmclapi2.bangbang93.com/libraries/";
+        return "https://bmclapi2.bangbang93.com/libraries/";
    }

    @Override
    public String getVersionListURL() {
-        return "http://bmclapi2.bangbang93.com/mc/game/version_manifest.json";
+        return "https://bmclapi2.bangbang93.com/mc/game/version_manifest.json";
    }

    @Override
    public String getVersionBaseURL() {
-        return "http://bmclapi2.bangbang93.com/versions/";
+        return "https://bmclapi2.bangbang93.com/versions/";
    }

    @Override
    public String getAssetIndexBaseURL() {
-        return "http://bmclapi2.bangbang93.com/indexes/";
+        return "https://bmclapi2.bangbang93.com/indexes/";
    }

    @Override
    public String getAssetBaseURL() {
-        return "http://bmclapi2.bangbang93.com/assets/";
+        return "https://bmclapi2.bangbang93.com/assets/";
    }

    @Override
@@ -78,12 +78,12 @@ public class BMCLAPIDownloadProvider implements DownloadProvider {
    @Override
    public String injectURL(String baseURL) {
        return baseURL
-                .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");
+                .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")
+                .replaceFirst("https?://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");
    }

 }
@@ -17,10 +17,12 @@
 */
 package org.jackhuang.hmcl.download.game;

+import org.jackhuang.hmcl.game.CompatibilityRule;
 import org.jackhuang.hmcl.game.Library;
 import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.Platform;
 import org.jackhuang.hmcl.util.SimpleMultimap;
 import org.jackhuang.hmcl.util.VersionNumber;

@@ -44,7 +46,6 @@ public class LibrariesUniqueTask extends TaskResult<Version> {
    public void execute() {
        List<Library> libraries = new ArrayList<>(version.getLibraries());

-        Map<String, VersionNumber> versionMap = new HashMap<>();
        SimpleMultimap<String, Library> multimap = new SimpleMultimap<String, Library>(HashMap::new, LinkedList::new);

        for (Library library : libraries) {
@@ -52,32 +53,36 @@ public class LibrariesUniqueTask extends TaskResult<Version> {
            VersionNumber number = VersionNumber.asVersion(library.getVersion());
            String serialized = Constants.GSON.toJson(library);

-            if (versionMap.containsKey(id)) {
-                VersionNumber otherNumber = versionMap.get(id);
-                if (number.compareTo(otherNumber) > 0) {
-                    multimap.removeKey(id);
-                    versionMap.put(id, number);
-                    multimap.put(id, library);
-                } else if (number.compareTo(otherNumber) == 0) { // same library id.
-                    boolean flag = false;
-                    // prevent from duplicated libraries
-                    for (Library otherLibrary : multimap.get(id))
-                        if (library.equals(otherLibrary)) {
-                            String otherSerialized = Constants.GSON.toJson(otherLibrary);
-                            // A trick, the library that has more information is better, which can be
-                            // considered whose serialized JSON text will be longer.
-                            if (serialized.length() <= otherSerialized.length()) {
-                                flag = true;
-                                break;
-                            } else {
-                                multimap.removeValue(id, otherLibrary);
+            if (multimap.containsKey(id)) {
+                boolean hasEqualRule = false;
+                for (Library otherLibrary : multimap.get(id)) {
+                    VersionNumber otherNumber = VersionNumber.asVersion(otherLibrary.getVersion());
+                    if (CompatibilityRule.equals(library.getRules(), otherLibrary.getRules())) { // rules equal, ignore older version.
+                        hasEqualRule = true;
+                        if (number.compareTo(otherNumber) > 0) { // if this library is newer
+                            multimap.removeValue(otherLibrary);
+                            multimap.put(id, library);
+                            break;
+                        } else if (number.compareTo(otherNumber) == 0) { // same library id.
+                            // prevent from duplicated libraries
+                            if (library.equals(otherLibrary)) {
+                                String otherSerialized = Constants.GSON.toJson(otherLibrary);
+                                // A trick, the library that has more information is better, which can be
+                                // considered whose serialized JSON text will be longer.
+                                if (serialized.length() > otherSerialized.length()) {
+                                    multimap.removeValue(id, otherLibrary);
+                                    multimap.put(id, library);
+                                    break;
+                                }
                            }
                        }
-                    if (!flag)
-                        multimap.put(id, library);
+                    }
+                }
+
+                if (!hasEqualRule) {
+                    multimap.put(id, library);
                }
            } else {
-                versionMap.put(id, number);
                multimap.put(id, library);
            }
        }
@@ -76,6 +76,25 @@ public final class CompatibilityRule {
        return action == Action.ALLOW;
    }

+    public static boolean equals(Collection<CompatibilityRule> rules1, Collection<CompatibilityRule> rules2) {
+        return Objects.hashCode(rules1) == Objects.hashCode(rules2);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CompatibilityRule that = (CompatibilityRule) o;
+        return action == that.action &&
+                Objects.equals(os, that.os) &&
+                Objects.equals(features, that.features);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(action, os, features);
+    }
+
    public enum Action {
        ALLOW,
        DISALLOW
@@ -137,6 +137,10 @@ public class Library implements Comparable<Library> {
        return checksums;
    }

+    public List<CompatibilityRule> getRules() {
+        return rules;
+    }
+
    public boolean is(String groupId, String artifactId) {
        return this.groupId.equals(groupId) && this.artifactId.equals(artifactId);
    }
@@ -295,7 +295,7 @@ public class DefaultLauncher extends Launcher {
            if (isWindows) {
                writer.write("@echo off");
                writer.newLine();
-                writer.write("set APPDATA=" + options.getGameDir().getParent());
+                writer.write("set APPDATA=" + options.getGameDir().getAbsoluteFile().getParent());
                writer.newLine();
                writer.write("cd /D %APPDATA%");
                writer.newLine();
Author	SHA1	Message	Date
huangyuhui	63ca5dd409	Fixed #296	2018-05-20 19:48:43 +08:00
huanghongxun	663e1ef7ab	Merge pull request #332 from xfl03/javafx Fix #325 #296	2018-05-20 19:40:39 +08:00
Alexander Xia	1a47d355f0	Fix #325 #296	2018-05-20 19:12:12 +08:00
huangyuhui	e407994103	Fixed #331	2018-05-17 16:46:16 +08:00
huangyuhui	bda2149c02	Fix #326	2018-04-30 01:59:33 +08:00
huangyuhui	b925423d61	Fixded #324	2018-04-26 22:15:27 +08:00
huangyuhui	f3906a37bf	Fixed #321	2018-04-26 13:14:14 +08:00
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