Support new MultiMC modpack

Add the prompt indicating the miss of DST Root CA X3.

HMCL/build.gradle

@@ -1,3 +1,6 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+import proguard.gradle.ProGuardTask
+
 import java.security.MessageDigest
 import java.util.jar.JarFile
 import java.util.jar.Pack200
@@ -15,11 +18,9 @@ if (buildnumber == null)
 
 def versionroot = System.getenv("VERSION_ROOT")
 if (versionroot == null)
-    versionroot = "3.0"
+    versionroot = "3.1"
 
-String mavenGroupId = 'HMCL'
 String mavenVersion = versionroot + '.' + buildnumber
-String bundleName = "Hello Minecraft! Launcher"
 version = mavenVersion
 
 dependencies {
@@ -30,7 +31,7 @@ dependencies {
 task generateSources(type: Sync) {
     from 'src/main/java'
     into "$buildDir/generated-src"
-    filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [
+    filter(ReplaceTokens, tokens: [
             'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion
     ])
 }
@@ -47,16 +48,16 @@ jar {
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
 
     manifest {
-        attributes 'Created-By'        : 'Copyright(c) 2013-2017 huangyuhui.',
+        attributes 'Created-By'        : 'Copyright(c) 2013-2018 huangyuhui.',
                 'Main-Class'        : mainClass,
                 'Multi-Release': "true"
     }
 
     doLast {
-        new File("build/signed").mkdirs()
-        ant.signjar(signedjar: archivePath, jar: archivePath,
-                keystore: "HMCL.keystore", storepass: "123456",
-                alias: "HMCL")
+        //new File("build/signed").mkdirs()
+        //ant.signjar(signedjar: archivePath, jar: archivePath,
+        //        keystore: "HMCL.keystore", storepass: "123456",
+        //        alias: "HMCL")
 
         def messageDigest = MessageDigest.getInstance("SHA1")
         archivePath.eachByte 1024 * 1024, { byte[] buf, int bytesRead ->
@@ -122,7 +123,7 @@ task makePackGZ(dependsOn: jar) doLast {
     fileEx.append sha1Hex
 }
 
-task proguard(type: proguard.gradle.ProGuardTask, dependsOn: jar) {
+task proguard(type: ProGuardTask, dependsOn: jar) {
     ext {
         def re = jar.classifier
         injar = jar.archivePath

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

@@ -0,0 +1,154 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl;
+
+import com.jfoenix.concurrency.JFXUtilities;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.stage.Stage;
+
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.upgrade.AppDataUpgrader;
+import org.jackhuang.hmcl.upgrade.IUpgrader;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.util.*;
+
+import java.io.File;
+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.concurrent.TimeUnit;
+
+public final class Launcher extends Application {
+
+    @Override
+    public void start(Stage primaryStage) {
+        Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
+
+        try {
+            // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
+            // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
+            Platform.setImplicitExit(false);
+            Controllers.initialize(primaryStage);
+            primaryStage.setResizable(false);
+            primaryStage.setScene(Controllers.getScene());
+
+            UPDATE_CHECKER.process(false)
+                    .then(Task.of(Schedulers.javafx(), () -> {
+                        if (UPDATE_CHECKER.isOutOfDate())
+                            Controllers.showUpdate();
+                    }))
+                    .start();
+
+            primaryStage.show();
+        } catch (Throwable e) {
+            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
+        }
+    }
+
+    public static void main(String[] args) {
+        Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
+
+        if (!FileUtils.makeDirectory(LOG_DIRECTORY))
+            System.out.println("Unable to create log directory " + LOG_DIRECTORY + ", log files cannot be generated.");
+
+        try {
+            Logging.start(LOG_DIRECTORY);
+
+            // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
+            Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
+            UPGRADER.parseArguments(VersionNumber.asVersion(VERSION), Arrays.asList(args));
+
+            Logging.LOG.info("*** " + TITLE + " ***");
+            Logging.LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
+            Logging.LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
+            Logging.LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
+            Logging.LOG.info("Java Home: " + System.getProperty("java.home"));
+
+            launch(args);
+        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
+            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
+        }
+    }
+
+    public static void stopApplication() {
+        Logging.LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
+
+        JFXUtilities.runInFX(() -> {
+            if (Controllers.getStage() == null)
+                return;
+            Controllers.getStage().close();
+            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);
+        });
+    }
+
+    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 final File MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
+    public static final File HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
+    public static final File LOG_DIRECTORY = new File(Launcher.HMCL_DIRECTORY, "logs");
+
+    public static final String VERSION = System.getProperty("hmcl.version.override", "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@");
+    public static final String NAME = "HMCL";
+    public static final String TITLE = NAME + " " + VERSION;
+    public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(VersionNumber.asVersion(VERSION));
+    public static final IUpgrader UPGRADER = new AppDataUpgrader();
+    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+
+    public static final String UPDATE_SERVER = "https://www.huangyuhui.net";
+    public static final String CONTACT = UPDATE_SERVER + "/hmcl.php";
+    public static final String PUBLISH = "http://www.mcbbs.net/thread-142335-1-1.html";
+}

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

@@ -17,128 +17,86 @@
  */
 package org.jackhuang.hmcl;
 
-import com.jfoenix.concurrency.JFXUtilities;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.stage.Stage;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.Controllers;
-import org.jackhuang.hmcl.upgrade.AppDataUpgrader;
-import org.jackhuang.hmcl.upgrade.IUpgrader;
-import org.jackhuang.hmcl.upgrade.UpdateChecker;
-import org.jackhuang.hmcl.util.*;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.ResourceBundle;
-import java.util.concurrent.TimeUnit;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
 import java.util.logging.Level;
 
-public final class Main extends Application {
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+import javax.swing.JOptionPane;
 
-    @Override
-    public void start(Stage primaryStage) {
-        Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
-
-        try {
-            // When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
-            // Stage.show() cannot work again because JavaFX Toolkit have already shut down.
-            Platform.setImplicitExit(false);
-            Controllers.initialize(primaryStage);
-            primaryStage.setResizable(false);
-            primaryStage.setScene(Controllers.getScene());
-            primaryStage.show();
-        } catch (Throwable e) {
-            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
-        }
-    }
+public final class Main {
 
     public static void main(String[] args) {
-        Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
+        checkJavaFX();
+        checkDirectoryPath();
+        checkDSTRootCAX3();
+        Launcher.main(args);
+    }
 
+    private static void checkDirectoryPath() {
+        String currentDirectory = new File("").getAbsolutePath();
+        if (currentDirectory.contains("!")) {
+            // No Chinese translation because both Swing and JavaFX cannot render Chinese character properly when exclamation mark exists in the path.
+            showErrorAndExit("Exclamation mark(!) is not allowed in the path where HMCL is in.\n"
+                    + "The path is " + currentDirectory);
+        }
+    }
+
+    private static void checkJavaFX() {
         try {
-            // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
-            Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
-            UPGRADER.parseArguments(VersionNumber.asVersion(VERSION), Arrays.asList(args));
-
-            Logging.LOG.info("*** " + TITLE + " ***");
-
-            UPDATE_CHECKER.process(false)
-                    .then(Task.of(Schedulers.javafx(), () -> {
-                        if (UPDATE_CHECKER.isOutOfDate())
-                            Controllers.showUpdate();
-                    }))
-                    .start();
-
-            launch(args);
-        } catch (Throwable e) { // Fucking JavaFX will suppress the exception and will break our crash reporter.
-            CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
+            Class.forName("javafx.application.Application");
+        } catch (ClassNotFoundException e) {
+            showErrorAndExit(i18n("fatal.missing_javafx"));
         }
     }
 
-    public static void stopApplication() {
-        JFXUtilities.runInFX(() -> {
-            stopWithoutPlatform();
-            Platform.exit();
-        });
-    }
-
-    public static void stopWithoutPlatform() {
-        JFXUtilities.runInFX(() -> {
-            if (Controllers.getStage() == null)
-                return;
-            Controllers.getStage().close();
-
-            Logging.LOG.info("Shutting down executor services.");
-            Schedulers.shutdown();
-
-            Controllers.shutdown();
-
-            Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
-        });
-    }
-
-    public static String i18n(String key) {
+    private static void checkDSTRootCAX3() {
+        TrustManagerFactory tmf;
         try {
-            return RESOURCE_BUNDLE.getString(key);
-        } catch (Exception e) {
-            Logging.LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
-            return key;
+            tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init((KeyStore) null);
+        } catch (NoSuchAlgorithmException | KeyStoreException e) {
+            LOG.log(Level.WARNING, "Failed to init TrustManagerFactory", e);
+            // don't know what to do here
+            return;
         }
-    }
-
-    public static String i18n(String key, Object... formatArgs) {
-        return String.format(i18n(key), formatArgs);
-    }
-
-    public static File getWorkingDirectory(String folder) {
-        String home = System.getProperty("user.home", ".");
-        switch (OperatingSystem.CURRENT_OS) {
-            case LINUX:
-                return new File(home, "." + folder + "/");
-            case WINDOWS:
-                String appdata = System.getenv("APPDATA");
-                return new File(Lang.nonNull(appdata, home), "." + folder + "/");
-            case OSX:
-                return new File(home, "Library/Application Support/" + folder);
-            default:
-                return new File(home, folder + "/");
+        for (TrustManager tm : tmf.getTrustManagers()) {
+            if (tm instanceof X509TrustManager) {
+                for (X509Certificate cert : ((X509TrustManager) tm).getAcceptedIssuers()) {
+                    if ("CN=DST Root CA X3, O=Digital Signature Trust Co.".equals((cert.getSubjectDN().getName()))) {
+                        return;
+                    }
+                }
+            }
         }
+        showWarningAndContinue(i18n("fatal.missing_dst_root_ca_x3"));
     }
 
-    public static final File MINECRAFT_DIRECTORY = getWorkingDirectory("minecraft");
-    public static final File HMCL_DIRECTORY = getWorkingDirectory("hmcl");
+    /**
+     * Indicates that a fatal error has occurred, and that the application cannot start.
+     */
+    private static void showErrorAndExit(String message) {
+        System.err.println(message);
+        System.err.println("A fatal error has occurred, forcibly exiting.");
+        JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE);
+        System.exit(1);
+    }
 
-    public static final String VERSION = "@HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@";
-    public static final String NAME = "HMCL";
-    public static final String TITLE = NAME + " " + VERSION;
-    public static final ResourceBundle RESOURCE_BUNDLE = Settings.INSTANCE.getLocale().getResourceBundle();
-    public static final UpdateChecker UPDATE_CHECKER = new UpdateChecker(VersionNumber.asVersion(VERSION));
-    public static final IUpgrader UPGRADER = new AppDataUpgrader();
-    public static final CrashReporter CRASH_REPORTER = new CrashReporter();
+    /**
+     * Indicates that potential issues have been detected, and that the application may not function properly (but it can still run).
+     */
+    private static void showWarningAndContinue(String message) {
+        System.err.println(message);
+        System.err.println("Potential issues have been detected.");
+        JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
+    }
 
-    public static final String CONTACT = "http://huangyuhui.duapp.com/hmcl.php";
-    public static final String PUBLISH = "http://www.mcbbs.net/thread-142335-1-1.html";
 }

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

@@ -0,0 +1,57 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.event;
+
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.util.ToStringBuilder;
+
+/**
+ * This event gets fired when added accounts.
+ * <br>
+ * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
+ *
+ * @author huangyuhui
+ */
+public class AccountAddedEvent extends Event {
+
+    private final Account account;
+
+    /**
+     * Constructor.
+     *
+     * @param source {@link org.jackhuang.hmcl.setting.Settings}
+     */
+    public AccountAddedEvent(Object source, Account account) {
+        super(source);
+        this.account = account;
+    }
+
+
+    public Account getAccount() {
+        return account;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", source)
+                .append("account", account)
+                .toString();
+    }
+}
+

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

@@ -0,0 +1,60 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.event;
+
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.util.ToStringBuilder;
+
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * This event gets fired when loading accounts.
+ * <br>
+ * This event is fired on the {@link org.jackhuang.hmcl.event.EventBus#EVENT_BUS}
+ *
+ * @author huangyuhui
+ */
+public class AccountLoadingEvent extends Event {
+
+    private final Collection<Account> accounts;
+
+    /**
+     * Constructor.
+     *
+     * @param source {@link org.jackhuang.hmcl.setting.Settings}
+     */
+    public AccountLoadingEvent(Object source, Collection<Account> accounts) {
+        super(source);
+        this.accounts = Collections.unmodifiableCollection(accounts);
+    }
+
+
+    public Collection<Account> getAccounts() {
+        return accounts;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("source", source)
+                .append("accounts", accounts)
+                .toString();
+    }
+}
+

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

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

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

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

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

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

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

@@ -19,7 +19,7 @@ package org.jackhuang.hmcl.game;
 
 import javafx.geometry.Rectangle2D;
 import javafx.scene.image.Image;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.Texture;
@@ -34,16 +34,13 @@ import org.jackhuang.hmcl.util.NetworkUtils;
 
 import java.io.File;
 import java.net.Proxy;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 public final class AccountHelper {
-    public static final AccountHelper INSTANCE = new AccountHelper();
+
     private AccountHelper() {}
 
-    public static final File SKIN_DIR = new File(Main.HMCL_DIRECTORY, "skins");
+    public static final File SKIN_DIR = new File(Launcher.HMCL_DIRECTORY, "skins");
 
     public static void loadSkins() {
         loadSkins(Proxy.NO_PROXY);
@@ -73,8 +70,8 @@ public final class AccountHelper {
         return new SkinLoadTask(account, proxy, true);
     }
 
-    private static File getSkinFile(String name) {
-        return new File(SKIN_DIR, name + ".png");
+    private static File getSkinFile(UUID uuid) {
+        return new File(SKIN_DIR, uuid + ".png");
     }
 
     public static Image getSkin(YggdrasilAccount account) {
@@ -82,9 +79,11 @@ public final class AccountHelper {
     }
 
     public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
-        if (account.getCharacter() == null)
-            return getDefaultSkin(account, scaleRatio);
-        File file = getSkinFile(account.getCharacter());
+        UUID uuid = account.getUUID();
+        if (uuid == null)
+            return getSteveSkin(scaleRatio);
+
+        File file = getSkinFile(uuid);
         if (file.exists()) {
             Image original = new Image("file:" + file.getAbsolutePath());
             return new Image("file:" + file.getAbsolutePath(),
@@ -92,15 +91,14 @@ public final class AccountHelper {
                     original.getHeight() * scaleRatio,
                     false, false);
         }
-        return getDefaultSkin(account, scaleRatio);
+        return getDefaultSkin(uuid, scaleRatio);
     }
 
     public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio, Proxy proxy) throws Exception {
-        String name = profile.getName();
-        File file = getSkinFile(name);
+        File file = getSkinFile(profile.getId());
         downloadSkin(account, profile, true, proxy);
         if (!file.exists())
-            return getDefaultSkin(account, scaleRatio);
+            return getDefaultSkin(profile.getId(), scaleRatio);
 
         String url = "file:" + file.getAbsolutePath();
         return scale(url, scaleRatio);
@@ -152,7 +150,7 @@ public final class AccountHelper {
         Optional<Texture> texture = account.getSkin(profile);
         if (!texture.isPresent()) return;
         String url = texture.get().getUrl();
-        File file = getSkinFile(profile.getName());
+        File file = getSkinFile(profile.getId());
         if (!refresh && file.exists())
             return;
         new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();
@@ -165,7 +163,7 @@ public final class AccountHelper {
         Optional<Texture> texture = account.getSkin();
         if (!texture.isPresent()) return;
         String url = texture.get().getUrl();
-        File file = getSkinFile(account.getCharacter());
+        File file = getSkinFile(account.getUUID());
         if (!refresh && file.exists())
             return;
         new FileDownloadTask(NetworkUtils.toURL(url), file, proxy).run();
@@ -187,11 +185,8 @@ public final class AccountHelper {
         return scale("/assets/img/alex.png", 4);
     }
 
-    public static Image getDefaultSkin(Account account, double scaleRatio) {
-        if (account == null)
-            return getSteveSkin(scaleRatio);
-
-        int type = account.getUUID().hashCode() & 1;
+    public static Image getDefaultSkin(UUID uuid, double scaleRatio) {
+        int type = uuid.hashCode() & 1;
         if (type == 1)
             return getAlexSkin(scaleRatio);
         else

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

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.game;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
@@ -70,7 +71,7 @@ public class HMCLGameDownloadTask extends Task {
                 NetworkUtils.toURL(profile.getDependency().getDownloadProvider().injectURL(version.getDownloadInfo().getUrl())),
                 cache,
                 profile.getDependency().getProxy(),
-                version.getDownloadInfo().getSha1()
+                new IntegrityCheck("SHA-1", version.getDownloadInfo().getSha1())
         ).then(Task.of(v -> FileUtils.copyFile(cache, jar))));
     }
 

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.launch.DefaultLauncher;
 import org.jackhuang.hmcl.launch.ProcessListener;
@@ -45,7 +45,7 @@ public final class HMCLGameLauncher extends DefaultLauncher {
     protected void appendJvmArgs(List<String> result) {
         super.appendJvmArgs(result);
 
-        result.add("-Dminecraft.launcher.version=" + Main.VERSION);
-        result.add("-Dminecraft.launcher.brand=" + Main.NAME);
+        result.add("-Dminecraft.launcher.version=" + Launcher.VERSION);
+        result.add("-Dminecraft.launcher.brand=" + Launcher.NAME);
     }
 }

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

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

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

@@ -42,7 +42,6 @@ public final class HMCLModpackInstallTask extends Task {
     private final String name;
     private final HMCLGameRepository repository;
     private final Modpack modpack;
-    private final File run;
     private final List<Task> dependencies = new LinkedList<>();
     private final List<Task> dependents = new LinkedList<>();
 
@@ -52,8 +51,8 @@ public final class HMCLModpackInstallTask extends Task {
         this.zipFile = zipFile;
         this.name = name;
         this.modpack = modpack;
-        this.run = repository.getRunDirectory(name);
 
+        File run = repository.getRunDirectory(name);
         File json = repository.getModpackConfiguration(name);
         if (repository.hasVersion(name) && !json.exists())
             throw new IllegalArgumentException("Version " + name + " already exists");

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

@@ -26,7 +26,6 @@ import org.jackhuang.hmcl.util.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 
 /**

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

@@ -17,17 +17,18 @@
  */
 package org.jackhuang.hmcl.game;
 
-import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
-import org.jackhuang.hmcl.Main;
+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.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.download.MaintainTask;
 import org.jackhuang.hmcl.launch.*;
+import org.jackhuang.hmcl.mod.CurseCompletionException;
 import org.jackhuang.hmcl.mod.CurseCompletionTask;
+import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Settings;
@@ -37,53 +38,55 @@ import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
 import org.jackhuang.hmcl.ui.LogWindow;
 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.*;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 public final class LauncherHelper {
     public static final LauncherHelper INSTANCE = new LauncherHelper();
     private LauncherHelper(){}
 
-    private TaskExecutor executor;
     public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
-    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(() -> {});
+    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
 
-    public void launch(String selectedVersion, File scriptFile) {
-        Profile profile = Settings.INSTANCE.getSelectedProfile();
-        GameRepository repository = profile.getRepository();
-        Account account = Settings.INSTANCE.getSelectedAccount();
+    public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
         if (account == null)
-            throw new IllegalStateException("No account");
+            throw new IllegalArgumentException("No account");
+
+        GameRepository repository = profile.getRepository();
 
         Version version = repository.getResolvedVersion(selectedVersion);
         VersionSetting setting = profile.getVersionSetting(selectedVersion);
 
         Platform.runLater(() -> {
             try {
-                checkGameState(profile, setting, version, () -> Schedulers.newThread().schedule(() -> launch0(selectedVersion, scriptFile)));
+                checkGameState(profile, setting, version, () -> {
+                    Controllers.dialog(launchingStepsPane);
+                    Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
+                });
             } catch (InterruptedException ignore) {
             }
         });
     }
 
-    private void launch0(String selectedVersion, File scriptFile) {
-        Profile profile = Settings.INSTANCE.getSelectedProfile();
-        GameRepository repository = profile.getRepository();
+    private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
+        HMCLGameRepository repository = profile.getRepository();
         DefaultDependencyManager dependencyManager = profile.getDependency();
-        Version version = repository.getResolvedVersion(selectedVersion);
-        Account account = Settings.INSTANCE.getSelectedAccount();
+        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
         VersionSetting setting = profile.getVersionSetting(selectedVersion);
         Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
 
-        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;
@@ -91,38 +94,49 @@ public final class LauncherHelper {
                         return dependencyManager.checkGameCompletionAsync(version);
                 })
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
-                .then(new CurseCompletionTask(dependencyManager, selectedVersion))
-                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
-                .then(Task.of(Main.i18n("account.methods"), variables -> {
+                .then(var -> {
                     try {
-                        try {
-                            variables.set("account", account.logIn());
-                        } catch (ServerDisconnectException e) {
-                            if (account.canPlayOffline())
-                                variables.set("account", account.playOffline());
-                            else
-                                throw e;
-                        }
-                    } catch (AuthenticationException e) {
+                        ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
+                        if ("Curse".equals(configuration.getType()))
+                            return new CurseCompletionTask(dependencyManager, selectedVersion);
+                        else
+                            return null;
+                    } catch (IOException e) {
+                        return null;
+                    }
+                })
+                .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
+                .then(Task.of(i18n("account.methods"), variables -> {
+                    try {
+                        variables.set("account", account.logIn());
+                    } catch (CredentialExpiredException e) {
                         variables.set("account", DialogController.logIn(account));
-                        JFXUtilities.runInFX(() -> Controllers.dialog(launchingStepsPane));
+                    } catch (AuthenticationException e) {
+                        variables.set("account",
+                                account.playOffline().orElseThrow(() -> e));
                     }
                 }))
                 .then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
                 .then(Task.of(variables -> {
                     variables.set("launcher", new HMCLGameLauncher(
-                            repository, selectedVersion, variables.get("account"), setting.toLaunchOptions(profile.getGameDir()), new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
+                            repository,
+                            selectedVersion,
+                            variables.get("account"),
+                            setting.toLaunchOptions(profile.getGameDir()),
+                            setting.getLauncherVisibility() == LauncherVisibility.CLOSE
+                                    ? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
+                                    : new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
                     ));
                 }))
                 .then(variables -> {
                     DefaultLauncher launcher = variables.get("launcher");
                     if (scriptFile == null) {
-                        return new LaunchTask<>(launcher::launch).setName(Main.i18n("version.launch"));
+                        return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
                     } else {
                         return new LaunchTask<>(() -> {
                             launcher.makeLaunchScript(scriptFile);
                             return null;
-                        }).setName(Main.i18n("version.launch_script"));
+                        }).setName(i18n("version.launch_script"));
                     }
                 })
                 .then(Task.of(variables -> {
@@ -130,15 +144,17 @@ public final class LauncherHelper {
                         ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                         PROCESSES.add(process);
                         if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
-                            Main.stopApplication();
+                            Launcher.stopApplication();
                         else
-                            launchingStepsPane.setCancel(() -> {
+                            launchingStepsPane.setCancel(it -> {
                                 process.stop();
-                                Controllers.closeDialog();
+                                Controllers.closeDialog(it);
                             });
                     } else
-                        Platform.runLater(() ->
-                                Controllers.dialog(Main.i18n("version.launch_script.success", scriptFile.getAbsolutePath())));
+                        Platform.runLater(() -> {
+                            Controllers.closeDialog(launchingStepsPane);
+                            Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
+                        });
 
                 }))
                 .executor();
@@ -156,18 +172,34 @@ public final class LauncherHelper {
 
             @Override
             public void onStop(boolean success, TaskExecutor executor) {
-                if (!success) {
+                if (!success && !Controllers.isStopped()) {
                     Platform.runLater(() -> {
-                        if (executor.getLastException() != null)
-                            Controllers.dialog(I18nException.getStackTrace(executor.getLastException()),
-                                    scriptFile == null ? Main.i18n("launch.failed") : Main.i18n("version.launch_script.failed"),
-                                    MessageBox.ERROR_MESSAGE, Controllers::closeDialog);
-                        else
-                            Controllers.closeDialog();
+                        // Check if the application has stopped
+                        // because onStop will be invoked if tasks fail when the executor service shut down.
+                        if (!Controllers.isStopped()) {
+                            Controllers.closeDialog(launchingStepsPane);
+                            Exception ex = executor.getLastException();
+                            if (ex != null) {
+                                String message;
+                                if (ex instanceof CurseCompletionException) {
+                                    message = i18n("modpack.type.curse.error");
+                                } else if (ex instanceof PermissionException) {
+                                    message = i18n("launch.failed.executable_permission");
+                                } else if (ex instanceof ProcessCreationException) {
+                                    message = i18n("launch.failed.creating_process") + ex.getLocalizedMessage();
+                                } else if (ex instanceof NotDecompressingNativesException) {
+                                    message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
+                                } else {
+                                    message = StringUtils.getStackTrace(ex);
+                                }
+                                Controllers.dialog(message,
+                                        scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
+                                        MessageBox.ERROR_MESSAGE);
+                            }
+                        }
                     });
                 }
-
-                LauncherHelper.this.executor = null;
+                launchingStepsPane.setExecutor(null);
             }
         });
 
@@ -175,47 +207,57 @@ 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;
+
+        // Without onAccept called, the launching operation will be terminated.
 
         VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
         JavaVersion java = setting.getJavaVersion();
         if (java == null) {
-            Controllers.dialog(Main.i18n("launch.wrong_javadir"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept);
             setting.setJava(null);
+            setting.setDefaultJavaPath(null);
             java = JavaVersion.fromCurrentEnvironment();
             flag = true;
         }
 
-        if (java.getParsedVersion() < JavaVersion.JAVA_8) {
-            Controllers.dialog(Main.i18n("launch.advice.newer_java"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8) {
+            if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
+                // Minecraft 1.13 and later versions only support Java 8 or later.
+                // Terminate launching operation.
+                Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
+            } else {
+                // Most mods require Java 8 or later version.
+                Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.error"), MessageBox.WARNING_MESSAGE, onAccept);
+            }
             flag = true;
         }
 
-        if (java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
-            Controllers.dialog(Main.i18n("launch.advice.java9"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
-            suggest = false;
+        // LaunchWrapper will crash because of assuming the system class loader is an instance of URLClassLoader.
+        // cpw has claimed that he will make MinecraftForge of 1.13 and later versions able to run on Java 9.
+        if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9 && gameVersion.compareTo(VersionNumber.asVersion("1.12.5")) < 0 && version.getMainClass().contains("launchwrapper")) {
+            Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
             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(Main.i18n("launch.advice.different_platform"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            Controllers.dialog(i18n("launch.advice.different_platform"), 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(Main.i18n("launch.advice.too_large_memory_for_32bit"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+            // 1.5 * 1024 is an inaccurate number.
+            // Actual memory limit depends on operating system and memory.
+            Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
             flag = true;
         }
-        if (OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
-            Controllers.dialog(Main.i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+        if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
+            Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), 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();
     }
 
@@ -225,10 +267,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) {
@@ -245,8 +288,8 @@ public final class LauncherHelper {
                 Platform.runLater(() -> {
                     // Shut down the platform when user closed log window.
                     Platform.setImplicitExit(true);
-                    // If we use Main.stop(), log window will be halt immediately.
-                    Main.stopWithoutPlatform();
+                    // If we use Launcher.stop(), log window will be halt immediately.
+                    Launcher.stopWithoutPlatform();
                 });
                 break;
         }
@@ -261,15 +304,7 @@ public final class LauncherHelper {
 
         @Override
         public void execute() throws Exception {
-            try {
-                setResult(supplier.get());
-            } catch (PermissionException e) {
-                throw new I18nException(Main.i18n("launch.failed.executable_permission"), e);
-            } catch (ProcessCreationException e) {
-                throw new I18nException(Main.i18n("launch.failed.creating_process") + e.getLocalizedMessage(), e);
-            } catch (NotDecompressingNativesException e) {
-                throw new I18nException(Main.i18n("launch.failed.decompressing_natives") + e.getLocalizedMessage(), e);
-            }
+            setResult(supplier.get());
         }
 
         @Override
@@ -304,10 +339,10 @@ public final class LauncherHelper {
             if (authInfo == null)
                 forbiddenTokens = Collections.emptyMap();
             else
-                forbiddenTokens = Lang.mapOf(
-                        new Pair<>(authInfo.getAccessToken(), "<access token>"),
-                        new Pair<>(authInfo.getUserId(), "<uuid>"),
-                        new Pair<>(authInfo.getUsername(), "<player>")
+                forbiddenTokens = mapOf(
+                        pair(authInfo.getAccessToken(), "<access token>"),
+                        pair(UUIDTypeAdapter.fromUUID(authInfo.getUUID()), "<uuid>"),
+                        pair(authInfo.getUsername(), "<player>")
                 );
 
             visibility = setting.getLauncherVisibility();
@@ -337,7 +372,7 @@ public final class LauncherHelper {
             else
                 System.out.print(log);
 
-            logs.add(new Pair<>(log, level));
+            logs.add(pair(log, level));
             if (logs.size() > Settings.INSTANCE.getLogLines())
                 logs.removeFirst();
 
@@ -360,9 +395,12 @@ public final class LauncherHelper {
                         });
                         break;
                     case CLOSE:
-                        throw new Error("Never come to here");
+                        // Never come to here.
+                        break;
                     case KEEP:
-                        // No operations here
+                        Platform.runLater(() -> {
+                            emitStatus(LoadingState.DONE);
+                        });
                         break;
                     case HIDE:
                         Platform.runLater(() -> {
@@ -385,10 +423,10 @@ public final class LauncherHelper {
 
                     switch (exitType) {
                         case JVM_ERROR:
-                            logWindow.setTitle(Main.i18n("launch.failed.cannot_create_jvm"));
+                            logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
                             break;
                         case APPLICATION_ERROR:
-                            logWindow.setTitle(Main.i18n("launch.failed.exited_abnormally"));
+                            logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
                             break;
                     }
 

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

@@ -17,7 +17,7 @@
  */
 package org.jackhuang.hmcl.game;
 
-import org.jackhuang.hmcl.Main;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public enum LoadingState {
     DEPENDENCIES("launch.state.dependencies"),
@@ -33,6 +33,6 @@ public enum LoadingState {
     }
 
     public String getLocalizedMessage() {
-        return Main.i18n(key);
+        return i18n(key);
     }
 }

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

@@ -59,12 +59,12 @@ public final class ModpackHelper {
         throw new UnsupportedModpackException(file.toString());
     }
 
-    public static <T> ModpackConfiguration<T> readModpackConfiguration(File file) throws IOException {
+    public static ModpackConfiguration<?> readModpackConfiguration(File file) throws IOException {
         if (!file.exists())
             throw new FileNotFoundException(file.getPath());
         else
             try {
-                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<T>>() {
+                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
                 }.getType());
             } catch (JsonParseException e) {
                 throw new IOException("Malformed modpack configuration");

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

@@ -17,27 +17,25 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import com.google.gson.JsonParseException;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorBuildInfo;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerResponse;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.*;
-
-import java.io.File;
 import java.io.IOException;
-import java.net.URL;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.Pair.pair;
 
 /**
  * @author huangyuhui
@@ -49,14 +47,14 @@ public final class Accounts {
     public static final String YGGDRASIL_ACCOUNT_KEY = "yggdrasil";
     public static final String AUTHLIB_INJECTOR_ACCOUNT_KEY = "authlibInjector";
 
-    public static final Map<String, AccountFactory<?>> ACCOUNT_FACTORY = Lang.mapOf(
-            new Pair<>(OFFLINE_ACCOUNT_KEY, OfflineAccountFactory.INSTANCE),
-            new Pair<>(YGGDRASIL_ACCOUNT_KEY, new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE)),
-            new Pair<>(AUTHLIB_INJECTOR_ACCOUNT_KEY, new AuthlibInjectorAccountFactory(Accounts::downloadAuthlibInjector))
+    public static final Map<String, AccountFactory<?>> ACCOUNT_FACTORY = mapOf(
+            pair(OFFLINE_ACCOUNT_KEY, OfflineAccountFactory.INSTANCE),
+            pair(YGGDRASIL_ACCOUNT_KEY, new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE)),
+            pair(AUTHLIB_INJECTOR_ACCOUNT_KEY, new AuthlibInjectorAccountFactory(
+                    new AuthlibInjectorDownloader(Launcher.HMCL_DIRECTORY.toPath(), () -> Settings.INSTANCE.getDownloadProvider())::getArtifactInfo,
+                    Accounts::getOrCreateAuthlibInjectorServer))
     );
 
-    private static final Map<String, String> AUTHLIB_INJECTOR_SERVER_NAMES = new HashMap<>();
-
     public static String getAccountType(Account account) {
         if (account instanceof OfflineAccount) return OFFLINE_ACCOUNT_KEY;
         else if (account instanceof AuthlibInjectorAccount) return AUTHLIB_INJECTOR_ACCOUNT_KEY;
@@ -72,33 +70,23 @@ public final class Accounts {
         return username + ":" + character;
     }
 
-    private static String downloadAuthlibInjector() throws Exception {
-        AuthlibInjectorBuildInfo buildInfo = AuthlibInjectorBuildInfo.requestBuildInfo();
-        File jar = new File(Main.HMCL_DIRECTORY, "authlib-injector.jar");
-        File local = new File(Main.HMCL_DIRECTORY, "authlib-injector.txt");
-        int buildNumber = 0;
-        try {
-            buildNumber = Integer.parseInt(FileUtils.readText(local));
-        } catch (IOException | NumberFormatException ignore) {
-        }
-        if (buildNumber < buildInfo.getBuildNumber()) {
-            new FileDownloadTask(new URL(buildInfo.getUrl()), jar).run();
-            FileUtils.writeText(local, String.valueOf(buildInfo.getBuildNumber()));
-        }
-        return jar.getAbsolutePath();
-    }
+    private static AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {
+        return Settings.SETTINGS.authlibInjectorServers.stream()
+                .filter(server -> url.equals(server.getUrl()))
+                .findFirst()
+                .orElseGet(() -> {
+                    // this usually happens when migrating data from an older version
+                    AuthlibInjectorServer server;
+                    try {
+                        server = AuthlibInjectorServer.fetchServerInfo(url);
+                        LOG.info("Migrated authlib injector server " + server);
+                    } catch (IOException e) {
+                        server = new AuthlibInjectorServer(url, url);
+                        LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
+                    }
 
-    public static String getAuthlibInjectorServerName(String serverIp) {
-        if (AUTHLIB_INJECTOR_SERVER_NAMES.containsKey(serverIp))
-            return AUTHLIB_INJECTOR_SERVER_NAMES.get(serverIp);
-        else {
-            try {
-                AuthlibInjectorServerResponse response = Constants.GSON.fromJson(NetworkUtils.doGet(NetworkUtils.toURL(serverIp)), AuthlibInjectorServerResponse.class);
-                AUTHLIB_INJECTOR_SERVER_NAMES.put(serverIp, response.getMeta().getServerName());
-                return response.getMeta().getServerName();
-            } catch (JsonParseException | IOException | NullPointerException e) {
-                return null;
-            }
-        }
+                    Settings.SETTINGS.authlibInjectorServers.add(server);
+                    return server;
+                });
     }
 }

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

@@ -17,274 +17,95 @@
  */
 package org.jackhuang.hmcl.setting;
 
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+
 import com.google.gson.annotations.SerializedName;
-import org.jackhuang.hmcl.Main;
-import org.jackhuang.hmcl.util.JavaVersion;
 
-import java.util.*;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
 
-final class Config {
+public final class Config implements Cloneable {
 
     @SerializedName("last")
-    private String selectedProfile = "";
+    public final StringProperty selectedProfile = new SimpleStringProperty("");
 
     @SerializedName("backgroundType")
-    private int backgroundImageType = 0;
+    public final IntegerProperty backgroundImageType = new SimpleIntegerProperty(0);
 
     @SerializedName("bgpath")
-    private String backgroundImage = null;
+    public final StringProperty backgroundImage = new SimpleStringProperty();
 
     @SerializedName("commonpath")
-    private String commonDirectory = Main.MINECRAFT_DIRECTORY.getAbsolutePath();
+    public final StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());
 
     @SerializedName("hasProxy")
-    private boolean hasProxy = false;
+    public final BooleanProperty hasProxy = new SimpleBooleanProperty();
 
     @SerializedName("hasProxyAuth")
-    private boolean hasProxyAuth = false;
+    public final BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
 
     @SerializedName("proxyType")
-    private int proxyType = 0;
+    public final IntegerProperty proxyType = new SimpleIntegerProperty();
 
     @SerializedName("proxyHost")
-    private String proxyHost = null;
+    public final StringProperty proxyHost = new SimpleStringProperty();
 
     @SerializedName("proxyPort")
-    private String proxyPort = null;
+    public final StringProperty proxyPort = new SimpleStringProperty();
 
     @SerializedName("proxyUserName")
-    private String proxyUser = null;
+    public final StringProperty proxyUser = new SimpleStringProperty();
 
     @SerializedName("proxyPassword")
-    private String proxyPass = null;
+    public final StringProperty proxyPass = new SimpleStringProperty();
 
     @SerializedName("theme")
-    private String theme = null;
-
-    @SerializedName("java")
-    private List<JavaVersion> java = null;
+    public final StringProperty theme = new SimpleStringProperty();
 
     @SerializedName("localization")
-    private String localization;
+    public final StringProperty localization = new SimpleStringProperty();
 
     @SerializedName("downloadtype")
-    private int downloadType = 0;
+    public final IntegerProperty downloadType = new SimpleIntegerProperty(1);
 
     @SerializedName("configurations")
-    private Map<String, Profile> configurations = new TreeMap<>();
+    public final ObservableMap<String, Profile> configurations = FXCollections.observableMap(new TreeMap<>());
 
     @SerializedName("accounts")
-    private List<Map<Object, Object>> accounts = new LinkedList<>();
+    public final ObservableList<Map<Object, Object>> accounts = FXCollections.observableArrayList();
 
     @SerializedName("selectedAccount")
-    private String selectedAccount = "";
+    public final StringProperty selectedAccount = new SimpleStringProperty("");
 
     @SerializedName("fontFamily")
-    private String fontFamily = "Consolas";
+    public final StringProperty fontFamily = new SimpleStringProperty("Consolas");
 
     @SerializedName("fontSize")
-    private double fontSize = 12;
+    public final DoubleProperty fontSize = new SimpleDoubleProperty(12);
 
     @SerializedName("logLines")
-    private int logLines = 100;
+    public final IntegerProperty logLines = new SimpleIntegerProperty(100);
 
-    @SerializedName("authlibInjectorServerURLs")
-    private Set<String> authlibInjectorServerURLs = new HashSet<>();
+    @SerializedName("firstLaunch")
+    public final BooleanProperty firstLaunch = new SimpleBooleanProperty(true);
 
-    public String getSelectedProfile() {
-        return selectedProfile;
-    }
+    public final ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
 
-    public void setSelectedProfile(String selectedProfile) {
-        this.selectedProfile = selectedProfile;
-        Settings.INSTANCE.save();
-    }
-
-    public String getBackgroundImage() {
-        return backgroundImage;
-    }
-
-    public void setBackgroundImage(String backgroundImage) {
-        this.backgroundImage = backgroundImage;
-        Settings.INSTANCE.save();
-    }
-
-    public int getBackgroundImageType() {
-        return backgroundImageType;
-    }
-
-    public void setBackgroundImageType(int backgroundImageType) {
-        this.backgroundImageType = backgroundImageType;
-        Settings.INSTANCE.save();
-    }
-
-    public String getCommonDirectory() {
-        return commonDirectory;
-    }
-
-    public void setCommonDirectory(String commonDirectory) {
-        this.commonDirectory = commonDirectory;
-        Settings.INSTANCE.save();
-    }
-
-    public boolean isHasProxy() {
-        return hasProxy;
-    }
-
-    public void setHasProxy(boolean hasProxy) {
-        this.hasProxy = hasProxy;
-        Settings.INSTANCE.save();
-    }
-
-    public boolean isHasProxyAuth() {
-        return hasProxyAuth;
-    }
-
-    public void setHasProxyAuth(boolean hasProxyAuth) {
-        this.hasProxyAuth = hasProxyAuth;
-        Settings.INSTANCE.save();
-    }
-
-    public int getProxyType() {
-        return proxyType;
-    }
-
-    public void setProxyType(int proxyType) {
-        this.proxyType = proxyType;
-        Settings.INSTANCE.save();
-    }
-
-    public String getProxyHost() {
-        return proxyHost;
-    }
-
-    public void setProxyHost(String proxyHost) {
-        this.proxyHost = proxyHost;
-        Settings.INSTANCE.save();
-    }
-
-    public String getProxyPort() {
-        return proxyPort;
-    }
-
-    public void setProxyPort(String proxyPort) {
-        this.proxyPort = proxyPort;
-        Settings.INSTANCE.save();
-    }
-
-    public String getProxyUser() {
-        return proxyUser;
-    }
-
-    public void setProxyUser(String proxyUser) {
-        this.proxyUser = proxyUser;
-        Settings.INSTANCE.save();
-    }
-
-    public String getProxyPass() {
-        return proxyPass;
-    }
-
-    public void setProxyPass(String proxyPass) {
-        this.proxyPass = proxyPass;
-        Settings.INSTANCE.save();
-    }
-
-    public String getTheme() {
-        return theme;
-    }
-
-    public void setTheme(String theme) {
-        this.theme = theme;
-        Settings.INSTANCE.save();
-    }
-
-    public List<JavaVersion> getJava() {
-        return java;
-    }
-
-    public void setJava(List<JavaVersion> java) {
-        this.java = java;
-        Settings.INSTANCE.save();
-    }
-
-    public String getLocalization() {
-        return localization;
-    }
-
-    public void setLocalization(String localization) {
-        this.localization = localization;
-        Settings.INSTANCE.save();
-    }
-
-    public int getDownloadType() {
-        return downloadType;
-    }
-
-    public void setDownloadType(int downloadType) {
-        this.downloadType = downloadType;
-        Settings.INSTANCE.save();
-    }
-
-    public Map<String, Profile> getConfigurations() {
-        return configurations;
-    }
-
-    public void setConfigurations(Map<String, Profile> configurations) {
-        this.configurations = configurations;
-        Settings.INSTANCE.save();
-    }
-
-    public List<Map<Object, Object>> getAccounts() {
-        return accounts;
-    }
-
-    public void setAccounts(List<Map<Object, Object>> accounts) {
-        this.accounts = accounts;
-        Settings.INSTANCE.save();
-    }
-
-    public String getSelectedAccount() {
-        return selectedAccount;
-    }
-
-    public void setSelectedAccount(String selectedAccount) {
-        this.selectedAccount = selectedAccount;
-        Settings.INSTANCE.save();
-    }
-
-    public String getFontFamily() {
-        return fontFamily;
-    }
-
-    public void setFontFamily(String fontFamily) {
-        this.fontFamily = fontFamily;
-        Settings.INSTANCE.save();
-    }
-
-    public double getFontSize() {
-        return fontSize;
-    }
-
-    public void setFontSize(double fontSize) {
-        this.fontSize = fontSize;
-        Settings.INSTANCE.save();
-    }
-
-    public int getLogLines() {
-        return logLines;
-    }
-
-    public void setLogLines(int logLines) {
-        this.logLines = logLines;
-    }
-
-    public Set<String> getAuthlibInjectorServerURLs() {
-        return authlibInjectorServerURLs;
-    }
-
-    public void setAuthlibInjectorServerURLs(Set<String> authlibInjectorServerURLs) {
-        this.authlibInjectorServerURLs = authlibInjectorServerURLs;
-        Settings.INSTANCE.save();
+    @Override
+    public Config clone() {
+        return Settings.GSON.fromJson(Settings.GSON.toJson(this), Config.class);
     }
 }

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

@@ -23,13 +23,12 @@ import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.MojangDownloadProvider;
 import org.jackhuang.hmcl.util.Lang;
 
-import java.util.Arrays;
 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));

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

@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.util.ImmediateObjectProperty;
 import org.jackhuang.hmcl.util.ImmediateStringProperty;
+import org.jackhuang.hmcl.util.ToStringBuilder;
 
 import java.io.File;
 import java.lang.reflect.Type;
@@ -115,6 +116,7 @@ public final class Profile {
         VersionSetting vs = repository.getVersionSetting(id);
         if (vs == null || vs.isUsesGlobal()) {
             getGlobal().setGlobal(true); // always keep global.isGlobal = true
+            getGlobal().setUsesGlobal(true);
             return getGlobal();
         } else
             return vs;
@@ -146,6 +148,14 @@ public final class Profile {
             vs.setUsesGlobal(true);
     }
 
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("gameDir", getGameDir())
+                .append("name", getName())
+                .toString();
+    }
+
     public void addPropertyChangedListener(InvalidationListener listener) {
         nameProperty.addListener(listener);
         globalProperty.addListener(listener);

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

@@ -17,18 +17,22 @@
  */
 package org.jackhuang.hmcl.setting;
 
-import org.jackhuang.hmcl.Main;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class Profiles {
+
+    public static final String DEFAULT_PROFILE = "Default";
+    public static final String HOME_PROFILE = "Home";
+
     private Profiles() {
     }
 
     public static String getProfileDisplayName(Profile profile) {
         switch (profile.getName()) {
-            case Settings.DEFAULT_PROFILE:
-                return Main.i18n("profile.default");
-            case Settings.HOME_PROFILE:
-                return Main.i18n("profile.home");
+            case Profiles.DEFAULT_PROFILE:
+                return i18n("profile.default");
+            case Profiles.HOME_PROFILE:
+                return i18n("profile.home");
             default:
                 return profile.getName();
         }

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

@@ -20,7 +20,6 @@ package org.jackhuang.hmcl.setting;
 import org.jackhuang.hmcl.util.Lang;
 
 import java.net.Proxy;
-import java.util.Arrays;
 import java.util.List;
 
 /**

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

@@ -19,20 +19,29 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
+import javafx.collections.ObservableSet;
 import javafx.scene.text.Font;
-import org.jackhuang.hmcl.Main;
+
+import org.hildan.fxgson.creators.ObservableListCreator;
+import org.hildan.fxgson.creators.ObservableMapCreator;
+import org.hildan.fxgson.creators.ObservableSetCreator;
+import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AccountFactory;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.download.DownloadProvider;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.ProfileChangedEvent;
-import org.jackhuang.hmcl.event.ProfileLoadingEvent;
+import org.jackhuang.hmcl.event.*;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.i18n.Locales;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,37 +50,48 @@ import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.toList;
+import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import static org.jackhuang.hmcl.util.Lang.tryCast;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
 public class Settings {
     public static final Gson GSON = new GsonBuilder()
             .registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
             .registerTypeAdapter(Profile.class, Profile.Serializer.INSTANCE)
             .registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
-            .setPrettyPrinting().create();
+            .registerTypeAdapter(ObservableList.class, new ObservableListCreator())
+            .registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
+            .registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
+            .registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
+            .setPrettyPrinting()
+            .create();
 
-    public static final String DEFAULT_PROFILE = "Default";
-    public static final String HOME_PROFILE = "Home";
+    public static final String SETTINGS_FILE_NAME = "hmcl.json";
+    public static final File SETTINGS_FILE = new File(SETTINGS_FILE_NAME).getAbsoluteFile();
 
-    public static final File SETTINGS_FILE = new File("hmcl.json").getAbsoluteFile();
+    public static final Config SETTINGS = initSettings();
 
     public static final Settings INSTANCE = new Settings();
 
-    private Settings() {}
+    private final Map<String, Account> accounts = new ConcurrentHashMap<>();
 
-    private final Config SETTINGS = initSettings();
+    private final boolean firstLaunch;
 
-    private Map<String, Account> accounts = new HashMap<>();
+    private Settings() {
+        firstLaunch = SETTINGS.firstLaunch.get();
 
-    {
         loadProxy();
 
-        for (Iterator<Map<Object, Object>> iterator = SETTINGS.getAccounts().iterator(); iterator.hasNext(); ) {
+        for (Iterator<Map<Object, Object>> iterator = SETTINGS.accounts.iterator(); iterator.hasNext();) {
             Map<Object, Object> settings = iterator.next();
-            AccountFactory<?> factory = Accounts.ACCOUNT_FACTORY.get(Lang.get(settings, "type", String.class).orElse(""));
+            AccountFactory<?> factory = Accounts.ACCOUNT_FACTORY.get(tryCast(settings.get("type"), String.class).orElse(""));
             if (factory == null) {
-                // unrecognized account type, so remove it.
+                LOG.warning("Unrecognized account type, removing: " + settings);
                 iterator.remove();
                 continue;
             }
@@ -80,7 +100,7 @@ public class Settings {
             try {
                 account = factory.fromStorage(settings, getProxy());
             } catch (Exception e) {
-                // storage is malformed, delete.
+                LOG.log(Level.WARNING, "Malformed account storage, removing: " + settings, e);
                 iterator.remove();
                 continue;
             }
@@ -88,8 +108,8 @@ public class Settings {
             accounts.put(Accounts.getAccountId(account), account);
         }
 
-        checkAuthlibInjectorServerURLs();
-        checkAuthlibInjectorAccounts();
+        SETTINGS.authlibInjectorServers.addListener(onInvalidating(this::removeDanglingAuthlibInjectorAccounts));
+
         checkProfileMap();
 
         save();
@@ -103,7 +123,7 @@ public class Settings {
         Lang.ignoringException(() -> Runtime.getRuntime().addShutdownHook(new Thread(this::save)));
     }
 
-    private Config initSettings() {
+    private static Config initSettings() {
         Config c = new Config();
         if (SETTINGS_FILE.exists())
             try {
@@ -124,11 +144,12 @@ public class Settings {
 
     public void save() {
         try {
-            SETTINGS.getAccounts().clear();
+            SETTINGS.accounts.clear();
+            SETTINGS.firstLaunch.set(false);
             for (Account account : accounts.values()) {
                 Map<Object, Object> storage = account.toStorage();
                 storage.put("type", Accounts.getAccountType(account));
-                SETTINGS.getAccounts().add(storage);
+                SETTINGS.accounts.add(storage);
             }
 
             FileUtils.writeText(SETTINGS_FILE, GSON.toJson(SETTINGS));
@@ -137,12 +158,17 @@ public class Settings {
         }
     }
 
-    private final StringProperty commonPath = new ImmediateStringProperty(this, "commonPath", SETTINGS.getCommonDirectory()) {
+    public boolean isFirstLaunch() {
+        return firstLaunch;
+    }
+
+    private final StringProperty commonPath = new ImmediateStringProperty(this, "commonPath", SETTINGS.commonDirectory.get()) {
         @Override
         public void invalidated() {
             super.invalidated();
 
-            SETTINGS.setCommonDirectory(get());
+            SETTINGS.commonDirectory.set(get());
+            save();
         }
     };
 
@@ -158,7 +184,7 @@ public class Settings {
         this.commonPath.set(commonPath);
     }
 
-    private Locales.SupportedLocale locale = Locales.getLocaleByName(SETTINGS.getLocalization());
+    private Locales.SupportedLocale locale = Locales.getLocaleByName(SETTINGS.localization.get());
 
     public Locales.SupportedLocale getLocale() {
         return locale;
@@ -166,7 +192,8 @@ public class Settings {
 
     public void setLocale(Locales.SupportedLocale locale) {
         this.locale = locale;
-        SETTINGS.setLocalization(Locales.getNameByLocale(locale));
+        SETTINGS.localization.set(Locales.getNameByLocale(locale));
+        save();
     }
 
     private Proxy proxy = Proxy.NO_PROXY;
@@ -175,7 +202,7 @@ public class Settings {
         return proxy;
     }
 
-    private Proxy.Type proxyType = Proxies.getProxyType(SETTINGS.getProxyType());
+    private Proxy.Type proxyType = Proxies.getProxyType(SETTINGS.proxyType.get());
 
     public Proxy.Type getProxyType() {
         return proxyType;
@@ -183,49 +210,64 @@ public class Settings {
 
     public void setProxyType(Proxy.Type proxyType) {
         this.proxyType = proxyType;
-        SETTINGS.setProxyType(Proxies.PROXIES.indexOf(proxyType));
+        SETTINGS.proxyType.set(Proxies.PROXIES.indexOf(proxyType));
+        save();
         loadProxy();
     }
 
     public String getProxyHost() {
-        return SETTINGS.getProxyHost();
+        return SETTINGS.proxyHost.get();
     }
 
     public void setProxyHost(String proxyHost) {
-        SETTINGS.setProxyHost(proxyHost);
+        SETTINGS.proxyHost.set(proxyHost);
+        save();
     }
 
     public String getProxyPort() {
-        return SETTINGS.getProxyPort();
+        return SETTINGS.proxyPort.get();
     }
 
     public void setProxyPort(String proxyPort) {
-        SETTINGS.setProxyPort(proxyPort);
+        SETTINGS.proxyPort.set(proxyPort);
+        save();
     }
 
     public String getProxyUser() {
-        return SETTINGS.getProxyUser();
+        return SETTINGS.proxyUser.get();
     }
 
     public void setProxyUser(String proxyUser) {
-        SETTINGS.setProxyUser(proxyUser);
+        SETTINGS.proxyUser.set(proxyUser);
+        save();
     }
 
     public String getProxyPass() {
-        return SETTINGS.getProxyPass();
+        return SETTINGS.proxyPass.get();
     }
 
     public void setProxyPass(String proxyPass) {
-        SETTINGS.setProxyPass(proxyPass);
+        SETTINGS.proxyPass.set(proxyPass);
+        save();
     }
 
-    public boolean hasProxy() { return SETTINGS.isHasProxy(); }
+    public boolean hasProxy() {
+        return SETTINGS.hasProxy.get();
+    }
 
-    public void setHasProxy(boolean hasProxy) { SETTINGS.setHasProxy(hasProxy); }
+    public void setHasProxy(boolean hasProxy) {
+        SETTINGS.hasProxy.set(hasProxy);
+        save();
+    }
 
-    public boolean hasProxyAuth() { return SETTINGS.isHasProxyAuth(); }
+    public boolean hasProxyAuth() {
+        return SETTINGS.hasProxyAuth.get();
+    }
 
-    public void setHasProxyAuth(boolean hasProxyAuth) { SETTINGS.setHasProxyAuth(hasProxyAuth); }
+    public void setHasProxyAuth(boolean hasProxyAuth) {
+        SETTINGS.hasProxyAuth.set(hasProxyAuth);
+        save();
+    }
 
     private void loadProxy() {
         String host = getProxyHost();
@@ -254,59 +296,39 @@ public class Settings {
     }
 
     public Font getFont() {
-        return Font.font(SETTINGS.getFontFamily(), SETTINGS.getFontSize());
+        return Font.font(SETTINGS.fontFamily.get(), SETTINGS.fontSize.get());
     }
 
     public void setFont(Font font) {
-        SETTINGS.setFontFamily(font.getFamily());
-        SETTINGS.setFontSize(font.getSize());
+        SETTINGS.fontFamily.set(font.getFamily());
+        SETTINGS.fontSize.set(font.getSize());
+        save();
     }
 
     public int getLogLines() {
-        return Math.max(SETTINGS.getLogLines(), 100);
+        return Math.max(SETTINGS.logLines.get(), 100);
     }
 
     public void setLogLines(int logLines) {
-        SETTINGS.setLogLines(logLines);
+        SETTINGS.logLines.set(logLines);
+        save();
     }
 
     /****************************************
      *           AUTHLIB INJECTORS          *
      ****************************************/
 
-    public Set<String> getAuthlibInjectorServerURLs() {
-        return SETTINGS.getAuthlibInjectorServerURLs();
-    }
-
-    public void removeAuthlibInjectorServerURL(String serverURL) {
-        checkAuthlibInjectorServerURLs();
-
-        SETTINGS.getAuthlibInjectorServerURLs().remove(serverURL);
-
-        checkAuthlibInjectorAccounts();
-        save();
-    }
-
-    public void addAuthlibInjectorServerURL(String serverURL) {
-        checkAuthlibInjectorServerURLs();
-
-        SETTINGS.getAuthlibInjectorServerURLs().add(serverURL);
-        save();
-    }
-
-    private void checkAuthlibInjectorServerURLs() {
-        if (SETTINGS.getAuthlibInjectorServerURLs() == null)
-            SETTINGS.setAuthlibInjectorServerURLs(new HashSet<>());
-    }
-
-    private void checkAuthlibInjectorAccounts() {
-        for (Account account : getAccounts()) {
-            if (account instanceof AuthlibInjectorAccount) {
-                AuthlibInjectorAccount injectorAccount = (AuthlibInjectorAccount) account;
-                if (!SETTINGS.getAuthlibInjectorServerURLs().contains(injectorAccount.getServerBaseURL()))
-                    deleteAccount(account);
-            }
-        }
+    /**
+     * After an {@link AuthlibInjectorServer} is removed, the associated accounts should also be removed.
+     * This method performs a check and removes the dangling accounts.
+     * Don't call this before {@link #migrateAuthlibInjectorServers()} is called, otherwise old data would be lost.
+     */
+    private void removeDanglingAuthlibInjectorAccounts() {
+        accounts.values().stream()
+                .filter(AuthlibInjectorAccount.class::isInstance)
+                .filter(it -> !SETTINGS.authlibInjectorServers.contains(((AuthlibInjectorAccount) it).getServer()))
+                .collect(toList())
+                .forEach(this::deleteAccount);
     }
 
     /****************************************
@@ -314,21 +336,22 @@ public class Settings {
      ****************************************/
 
     public DownloadProvider getDownloadProvider() {
-        return DownloadProviders.getDownloadProvider(SETTINGS.getDownloadType());
+        return DownloadProviders.getDownloadProvider(SETTINGS.downloadType.get());
     }
 
     public void setDownloadProvider(DownloadProvider downloadProvider) {
         int index = DownloadProviders.DOWNLOAD_PROVIDERS.indexOf(downloadProvider);
         if (index == -1)
             throw new IllegalArgumentException("Unknown download provider: " + downloadProvider);
-        SETTINGS.setDownloadType(index);
+        SETTINGS.downloadType.set(index);
+        save();
     }
 
     /****************************************
      *               ACCOUNTS               *
      ****************************************/
 
-    private final ImmediateObjectProperty<Account> selectedAccount = new ImmediateObjectProperty<Account>(this, "selectedAccount", accounts.get(SETTINGS.getSelectedAccount())) {
+    private final ImmediateObjectProperty<Account> selectedAccount = new ImmediateObjectProperty<Account>(this, "selectedAccount", accounts.get(SETTINGS.selectedAccount.get())) {
         @Override
         public Account get() {
             Account a = super.get();
@@ -350,7 +373,8 @@ public class Settings {
         public void invalidated() {
             super.invalidated();
 
-            SETTINGS.setSelectedAccount(getValue() == null ? "" : Accounts.getAccountId(getValue()));
+            SETTINGS.selectedAccount.set(getValue() == null ? "" : Accounts.getAccountId(getValue()));
+            save();
         }
     };
 
@@ -368,6 +392,9 @@ public class Settings {
 
     public void addAccount(Account account) {
         accounts.put(Accounts.getAccountId(account), account);
+        onAccountLoading();
+
+        EventBus.EVENT_BUS.fireEvent(new AccountAddedEvent(this, account));
     }
 
     public Account getAccount(String name, String character) {
@@ -381,12 +408,14 @@ public class Settings {
     public void deleteAccount(String name, String character) {
         accounts.remove(Accounts.getAccountId(name, character));
 
+        onAccountLoading();
         selectedAccount.get();
     }
 
     public void deleteAccount(Account account) {
         accounts.remove(Accounts.getAccountId(account));
 
+        onAccountLoading();
         selectedAccount.get();
     }
 
@@ -394,12 +423,13 @@ public class Settings {
      *              BACKGROUND              *
      ****************************************/
 
-    private final ImmediateStringProperty backgroundImage = new ImmediateStringProperty(this, "backgroundImage", SETTINGS.getBackgroundImage()) {
+    private final ImmediateStringProperty backgroundImage = new ImmediateStringProperty(this, "backgroundImage", SETTINGS.backgroundImage.get()) {
         @Override
         public void invalidated() {
             super.invalidated();
 
-            SETTINGS.setBackgroundImage(get());
+            SETTINGS.backgroundImage.set(get());
+            save();
         }
     };
 
@@ -415,12 +445,13 @@ public class Settings {
         this.backgroundImage.set(backgroundImage);
     }
 
-    private final ImmediateObjectProperty<EnumBackgroundImage> backgroundImageType = new ImmediateObjectProperty<EnumBackgroundImage>(this, "backgroundImageType", EnumBackgroundImage.indexOf(SETTINGS.getBackgroundImageType())) {
+    private final ImmediateObjectProperty<EnumBackgroundImage> backgroundImageType = new ImmediateObjectProperty<EnumBackgroundImage>(this, "backgroundImageType", EnumBackgroundImage.indexOf(SETTINGS.backgroundImageType.get())) {
         @Override
         public void invalidated() {
             super.invalidated();
 
-            SETTINGS.setBackgroundImageType(get().ordinal());
+            SETTINGS.backgroundImageType.set(get().ordinal());
+            save();
         }
     };
 
@@ -440,12 +471,13 @@ public class Settings {
      *                THEME                 *
      ****************************************/
 
-    private final ImmediateObjectProperty<Theme> theme = new ImmediateObjectProperty<Theme>(this, "theme", Theme.getTheme(SETTINGS.getTheme()).orElse(Theme.BLUE)) {
+    private final ImmediateObjectProperty<Theme> theme = new ImmediateObjectProperty<Theme>(this, "theme", Theme.getTheme(SETTINGS.theme.get()).orElse(Theme.BLUE)) {
         @Override
         public void invalidated() {
             super.invalidated();
 
-            SETTINGS.setTheme(get().getName().toLowerCase());
+            SETTINGS.theme.set(get().getName().toLowerCase());
+            save();
         }
     };
 
@@ -468,16 +500,20 @@ public class Settings {
     public Profile getSelectedProfile() {
         checkProfileMap();
 
-        if (!hasProfile(SETTINGS.getSelectedProfile())) {
-            SETTINGS.setSelectedProfile(getProfileMap().keySet().stream().findFirst().get());
+        if (!hasProfile(SETTINGS.selectedProfile.get())) {
+            getProfileMap().keySet().stream().findFirst().ifPresent(selectedProfile -> {
+                SETTINGS.selectedProfile.set(selectedProfile);
+                save();
+            });
             Schedulers.computation().schedule(this::onProfileChanged);
         }
-        return getProfile(SETTINGS.getSelectedProfile());
+        return getProfile(SETTINGS.selectedProfile.get());
     }
 
     public void setSelectedProfile(Profile selectedProfile) {
-        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), SETTINGS.getSelectedProfile())) {
-            SETTINGS.setSelectedProfile(selectedProfile.getName());
+        if (hasProfile(selectedProfile.getName()) && !Objects.equals(selectedProfile.getName(), SETTINGS.selectedProfile.get())) {
+            SETTINGS.selectedProfile.set(selectedProfile.getName());
+            save();
             Schedulers.computation().schedule(this::onProfileChanged);
         }
     }
@@ -494,7 +530,7 @@ public class Settings {
     }
 
     public Map<String, Profile> getProfileMap() {
-        return SETTINGS.getConfigurations();
+        return SETTINGS.configurations;
     }
 
     public Collection<Profile> getProfiles() {
@@ -506,6 +542,7 @@ public class Settings {
             throw new IllegalArgumentException("Profile's name is empty");
 
         getProfileMap().put(ver.getName(), ver);
+        Schedulers.computation().schedule(this::onProfileLoading);
 
         ver.nameProperty().setChangedListener(this::profileNameChanged);
 
@@ -524,13 +561,13 @@ public class Settings {
 
     private void checkProfileMap() {
         if (getProfileMap().isEmpty()) {
-            getProfileMap().put(DEFAULT_PROFILE, new Profile(DEFAULT_PROFILE));
-            getProfileMap().put(HOME_PROFILE, new Profile(HOME_PROFILE, Main.MINECRAFT_DIRECTORY));
+            getProfileMap().put(Profiles.DEFAULT_PROFILE, new Profile(Profiles.DEFAULT_PROFILE));
+            getProfileMap().put(Profiles.HOME_PROFILE, new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY));
         }
     }
 
     private void onProfileChanged() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileChangedEvent(SETTINGS, getSelectedProfile()));
+        EventBus.EVENT_BUS.fireEvent(new ProfileChangedEvent(this, getSelectedProfile()));
         getSelectedProfile().getRepository().refreshVersionsAsync().start();
     }
 
@@ -543,7 +580,15 @@ public class Settings {
      * Invoked by loading GUI phase.
      */
     public void onProfileLoading() {
-        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(SETTINGS));
+        EventBus.EVENT_BUS.fireEvent(new ProfileLoadingEvent(this, getProfiles()));
         onProfileChanged();
     }
+
+    public void onAccountLoading() {
+        EventBus.EVENT_BUS.fireEvent(new AccountLoadingEvent(this, getAccounts()));
+    }
+
+    public Config getRawConfig() {
+        return SETTINGS.clone();
+    }
 }

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

@@ -19,14 +19,16 @@ package org.jackhuang.hmcl.setting;
 
 import com.google.gson.*;
 import javafx.beans.InvalidationListener;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -87,6 +89,20 @@ public final class VersionSetting {
         javaProperty.set(java);
     }
 
+    private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(this, "defaultJavaPath", "");
+
+    /**
+     * Path to Java executable, or null if user customizes java directory.
+     * It's used to determine which JRE to use when multiple JREs match the selected Java version.
+     */
+    public String getDefaultJavaPath() {
+        return defaultJavaPathProperty.get();
+    }
+
+    public void setDefaultJavaPath(String defaultJavaPath) {
+        defaultJavaPathProperty.set(defaultJavaPath);
+    }
+
     private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
 
     public ImmediateStringProperty javaDirProperty() {
@@ -444,12 +460,18 @@ public final class VersionSetting {
                 return null; // Custom Java Directory not found,
             }
         } else if (StringUtils.isNotBlank(getJava())) {
-            JavaVersion c = JavaVersion.getJREs().get(getJava());
-            if (c == null) {
+            List<JavaVersion> matchedJava = JavaVersion.getJREs().stream()
+                    .filter(java -> java.getVersion().equals(getJava()))
+                    .collect(Collectors.toList());
+            if (matchedJava.isEmpty()) {
                 setJava("Default");
                 return JavaVersion.fromCurrentEnvironment();
-            } else
-                return c;
+            } else {
+                return matchedJava.stream()
+                        .filter(java -> java.getBinary().toString().equals(getDefaultJavaPath()))
+                        .findFirst()
+                        .orElse(matchedJava.get(0));
+            }
         } else throw new Error();
     }
 
@@ -475,6 +497,7 @@ public final class VersionSetting {
         gameDirTypeProperty.addListener(listener);
         gameDirProperty.addListener(listener);
         launcherVisibilityProperty.addListener(listener);
+        defaultJavaPathProperty.addListener(listener);
     }
 
     public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
@@ -482,8 +505,8 @@ public final class VersionSetting {
         return new LaunchOptions.Builder()
                 .setGameDir(gameDir)
                 .setJava(javaVersion)
-                .setVersionName(Main.TITLE)
-                .setProfileName(Main.TITLE)
+                .setVersionName(Launcher.TITLE)
+                .setProfileName(Launcher.TITLE)
                 .setMinecraftArgs(getMinecraftArgs())
                 .setJavaArgs(getJavaArgs())
                 .setMaxMemory(getMaxMemory())
@@ -535,6 +558,7 @@ public final class VersionSetting {
             obj.addProperty("gameDir", src.getGameDir());
             obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
             obj.addProperty("gameDirType", src.getGameDirType().ordinal());
+            obj.addProperty("defaultJavaPath", src.getDefaultJavaPath());
 
             return obj;
         }
@@ -571,6 +595,7 @@ public final class VersionSetting {
             vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
             vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
             vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
+            vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
 
             return vs;
         }

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

@@ -1,133 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXProgressBar;
-import com.jfoenix.controls.JFXRadioButton;
-import javafx.beans.binding.Bindings;
-import javafx.event.EventHandler;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-
-public final class AccountItem extends StackPane {
-
-    private final Account account;
-
-    @FXML
-    private Pane icon;
-    @FXML private VBox content;
-    @FXML private StackPane header;
-    @FXML private StackPane body;
-    @FXML private JFXButton btnDelete;
-    @FXML private JFXButton btnRefresh;
-    @FXML private Label lblUser;
-    @FXML private Label lblType;
-    @FXML private Label lblEmail;
-    @FXML private Label lblServer;
-    @FXML private Label lblCurrentAccount;
-    @FXML private JFXRadioButton chkSelected;
-    @FXML private JFXProgressBar pgsSkin;
-    @FXML private ImageView portraitView;
-    @FXML private HBox buttonPane;
-
-    public AccountItem(int i, Account account, ToggleGroup toggleGroup) {
-        this.account = account;
-
-        FXUtils.loadFXML(this, "/assets/fxml/account-item.fxml");
-
-        setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5.0, 0.12, -0.5, 1.0));
-
-        chkSelected.setToggleGroup(toggleGroup);
-        btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
-        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));
-
-        // create image view
-        icon.translateYProperty().bind(Bindings.createDoubleBinding(() -> header.getBoundsInParent().getHeight() - icon.getHeight() / 2 - 16, header.boundsInParentProperty(), icon.heightProperty()));
-
-        chkSelected.getProperties().put("account", account);
-        setSelected(Settings.INSTANCE.getSelectedAccount() == account);
-
-        lblUser.setText(account.getCharacter());
-        lblType.setText(AccountsPage.accountType(account));
-        lblEmail.setText(account.getUsername());
-
-        if (account instanceof AuthlibInjectorAccount) {
-            Task.ofResult("serverName", () -> Accounts.getAuthlibInjectorServerName(((AuthlibInjectorAccount) account).getServerBaseURL()))
-                    .subscribe(Schedulers.javafx(), variables -> lblServer.setText(variables.get("serverName")));
-        }
-
-        if (account instanceof YggdrasilAccount) {
-            btnRefresh.setOnMouseClicked(e -> {
-                pgsSkin.setVisible(true);
-                AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                        .subscribe(Schedulers.javafx(), this::loadSkin);
-            });
-            AccountHelper.loadSkinAsync((YggdrasilAccount) account)
-                    .subscribe(Schedulers.javafx(), this::loadSkin);
-        } else
-            loadSkin();
-
-        if (account instanceof OfflineAccount) { // Offline Account cannot be refreshed,
-            buttonPane.getChildren().remove(btnRefresh);
-        }
-    }
-
-    private void loadSkin() {
-        pgsSkin.setVisible(false);
-        portraitView.setViewport(AccountHelper.getViewport(4));
-        if (account instanceof YggdrasilAccount)
-            portraitView.setImage(AccountHelper.getSkin((YggdrasilAccount) account, 4));
-        else
-            portraitView.setImage(AccountHelper.getDefaultSkin(account, 4));
-        FXUtils.limitSize(portraitView, 32, 32);
-    }
-
-    public Account getAccount() {
-        return account;
-    }
-
-    public void setSelected(boolean selected) {
-        lblCurrentAccount.setVisible(selected);
-        chkSelected.setSelected(selected);
-    }
-
-    public void setOnDeleteButtonMouseClicked(EventHandler<? super MouseEvent> eventHandler) {
-        btnDelete.setOnMouseClicked(eventHandler);
-    }
-}

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

@@ -17,11 +17,11 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.controls.JFXDialog;
 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;
@@ -35,18 +35,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,11 +70,11 @@ 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(AccountsPage.accountException((Exception) account));
+                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
             }
 
             progressBar.setVisible(false);
@@ -83,10 +84,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);
     }
 }

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

@@ -0,0 +1,151 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui;
+
+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.auth.Account;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.construct.ComponentList;
+import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+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
+    private Label lblType;
+    @FXML
+    private Label lblServer;
+    @FXML
+    private Label lblCharacter;
+    @FXML
+    private Label lblEmail;
+    @FXML
+    private BorderPane paneServer;
+    @FXML
+    private BorderPane paneEmail;
+    @FXML
+    private ComponentList componentList;
+    @FXML
+    private JFXButton btnDelete;
+    @FXML
+    private JFXButton btnRefresh;
+    @FXML
+    private JFXProgressBar progressBar;
+
+    public AccountPage(Account account, VersionListItem item) {
+        this.account = account;
+        this.item = item;
+
+        title = new SimpleStringProperty(this, "title", i18n("account") + " - " + account.getCharacter());
+
+        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
+
+        FXUtils.setLimitWidth(this, 300);
+        if (account instanceof AuthlibInjectorAccount) {
+            lblServer.setText(((AuthlibInjectorAccount) account).getServer().getName());
+            FXUtils.setLimitHeight(this, 182);
+        } else {
+            componentList.removeChildren(paneServer);
+
+            if (account instanceof OfflineAccount) {
+                componentList.removeChildren(paneEmail);
+                FXUtils.setLimitHeight(this, 110);
+            } else
+                FXUtils.setLimitHeight(this, 145);
+        }
+
+        btnDelete.setGraphic(SVG.delete(Theme.blackFillBinding(), 15, 15));
+        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), 15, 15));
+
+        lblCharacter.setText(account.getCharacter());
+        lblType.setText(AddAccountPane.accountType(account));
+        lblEmail.setText(account.getUsername());
+
+        btnRefresh.setVisible(account instanceof YggdrasilAccount);
+    }
+
+    @FXML
+    private void onDelete() {
+        Settings.INSTANCE.deleteAccount(account);
+        Optional.ofNullable(onDelete.get()).ifPresent(Runnable::run);
+    }
+
+    @FXML
+    private void onRefresh() {
+        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() {
+        return title.get();
+    }
+
+    @Override
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    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);
+    }
+}

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

@@ -1,312 +0,0 @@
-/*
- * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see {http://www.gnu.org/licenses/}.
- */
-package org.jackhuang.hmcl.ui;
-
-import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.*;
-import javafx.application.Platform;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
-import org.jackhuang.hmcl.auth.*;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
-import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
-import org.jackhuang.hmcl.ui.construct.Validator;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CountDownLatch;
-import java.util.stream.Collectors;
-
-public final class AccountsPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("account"));
-
-    @FXML
-    private ScrollPane scrollPane;
-    @FXML private JFXMasonryPane masonryPane;
-    @FXML private JFXDialog dialog;
-    @FXML private JFXTextField txtUsername;
-    @FXML private JFXPasswordField txtPassword;
-    @FXML private Label lblCreationWarning;
-    @FXML private Label lblPassword;
-    @FXML private JFXComboBox<String> cboType;
-    @FXML private JFXComboBox<TwoLineListItem> cboServers;
-    @FXML private JFXProgressBar progressBar;
-    @FXML private Label lblAddInjectorServer;
-    @FXML private Hyperlink linkAddInjectorServer;
-
-    {
-        FXUtils.loadFXML(this, "/assets/fxml/account.fxml");
-
-        getChildren().remove(dialog);
-        dialog.setDialogContainer(this);
-
-        FXUtils.smoothScrolling(scrollPane);
-
-        cboType.getItems().setAll(Main.i18n("account.methods.offline"), Main.i18n("account.methods.yggdrasil"), Main.i18n("account.methods.authlib_injector"));
-        cboType.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> {
-            txtPassword.setVisible(newValue.intValue() != 0);
-            lblPassword.setVisible(newValue.intValue() != 0);
-            cboServers.setVisible(newValue.intValue() == 2);
-            linkAddInjectorServer.setVisible(newValue.intValue() == 2);
-            lblAddInjectorServer.setVisible(newValue.intValue() == 2);
-        });
-        cboType.getSelectionModel().select(0);
-
-        // These two lines can eliminate black, don't know why.
-        cboServers.getItems().setAll(new TwoLineListItem("", ""));
-        cboServers.getSelectionModel().select(0);
-
-        txtPassword.setOnAction(e -> onCreationAccept());
-        txtUsername.setOnAction(e -> onCreationAccept());
-        txtUsername.getValidators().add(new Validator(Main.i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
-
-        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), account -> {
-            for (Node node : masonryPane.getChildren())
-                if (node instanceof AccountItem)
-                    ((AccountItem) node).setSelected(account == ((AccountItem) node).getAccount());
-        });
-
-        loadAccounts();
-        loadServers();
-
-        if (Settings.INSTANCE.getAccounts().isEmpty())
-            addNewAccount();
-    }
-
-    public void loadAccounts() {
-        List<Node> children = new LinkedList<>();
-        int i = 0;
-        ToggleGroup group = new ToggleGroup();
-        for (Account account : Settings.INSTANCE.getAccounts()) {
-            children.add(buildNode(++i, account, group));
-        }
-        group.selectedToggleProperty().addListener((a, b, newValue) -> {
-            if (newValue != null)
-                Settings.INSTANCE.setSelectedAccount((Account) newValue.getProperties().get("account"));
-        });
-        FXUtils.resetChildren(masonryPane, children);
-        Platform.runLater(() -> {
-            masonryPane.requestLayout();
-            scrollPane.requestLayout();
-        });
-    }
-
-    public void loadServers() {
-        Task.ofResult("list", () -> Settings.INSTANCE.getAuthlibInjectorServerURLs().parallelStream()
-                .map(serverURL -> new TwoLineListItem(Accounts.getAuthlibInjectorServerName(serverURL), serverURL))
-                .collect(Collectors.toList()))
-                .subscribe(Task.of(Schedulers.javafx(), variables -> {
-                    cboServers.getItems().setAll(variables.<Collection<TwoLineListItem>>get("list"));
-                    if (!cboServers.getItems().isEmpty())
-                        cboServers.getSelectionModel().select(0);
-                }));
-    }
-
-    private Node buildNode(int i, Account account, ToggleGroup group) {
-        AccountItem item = new AccountItem(i, account, group);
-        item.setOnDeleteButtonMouseClicked(e -> {
-            Settings.INSTANCE.deleteAccount(account);
-            Platform.runLater(this::loadAccounts);
-        });
-        return item;
-    }
-
-    @FXML
-    private void addNewAccount() {
-        txtUsername.setText("");
-        txtPassword.setText("");
-        lblCreationWarning.setText("");
-        dialog.show();
-    }
-
-    @FXML
-    private void onAddInjecterServer() {
-        Controllers.navigate(Controllers.getServersPage());
-    }
-
-    @FXML
-    private void onCreationAccept() {
-        int type = cboType.getSelectionModel().getSelectedIndex();
-        String username = txtUsername.getText();
-        String password = txtPassword.getText();
-        String apiRoot = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem()).map(TwoLineListItem::getSubtitle).orElse(null);
-        progressBar.setVisible(true);
-        lblCreationWarning.setText("");
-        Task.ofResult("create_account", () -> {
-                AccountFactory<?> factory;
-                switch (type) {
-                    case 0: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.OFFLINE_ACCOUNT_KEY); break;
-                    case 1: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.YGGDRASIL_ACCOUNT_KEY); break;
-                    case 2: factory = Accounts.ACCOUNT_FACTORY.get(Accounts.AUTHLIB_INJECTOR_ACCOUNT_KEY); break;
-                    default: throw new Error();
-                }
-
-                return factory.create(new Selector(), username, password, apiRoot, Settings.INSTANCE.getProxy());
-        }).finalized(Schedulers.javafx(), variables -> {
-            Settings.INSTANCE.addAccount(variables.get("create_account"));
-            dialog.close();
-            loadAccounts();
-            progressBar.setVisible(false);
-        }, exception -> {
-            if (exception instanceof NoSelectedCharacterException) {
-                dialog.close();
-            } else {
-                lblCreationWarning.setText(accountException(exception));
-            }
-            progressBar.setVisible(false);
-        }).start();
-    }
-
-    @FXML
-    private void onCreationCancel() {
-        dialog.close();
-    }
-
-    public String getTitle() {
-        return title.get();
-    }
-
-    @Override
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title.set(title);
-    }
-
-    public static String accountException(Exception exception) {
-        if (exception instanceof InvalidCredentialsException) {
-            return Main.i18n("account.failed.invalid_credentials");
-        } else if (exception instanceof NoCharacterException) {
-            return Main.i18n("account.failed.no_charactor");
-        } else if (exception instanceof ServerDisconnectException) {
-            return Main.i18n("account.failed.connect_authentication_server");
-        } else if (exception instanceof InvalidTokenException) {
-            return Main.i18n("account.failed.invalid_token");
-        } else if (exception instanceof InvalidPasswordException) {
-            return Main.i18n("account.failed.invalid_password");
-        } else {
-            return exception.getClass() + ": " + exception.getLocalizedMessage();
-        }
-    }
-
-    public static String accountType(Account account) {
-        if (account instanceof OfflineAccount) return Main.i18n("account.methods.offline");
-        else if (account instanceof AuthlibInjectorAccount) return Main.i18n("account.methods.authlib_injector");
-        else if (account instanceof YggdrasilAccount) return Main.i18n("account.methods.yggdrasil");
-        else throw new Error(Main.i18n("account.methods.no_method") + ": " + account);
-    }
-
-    private static class Selector extends BorderPane implements CharacterSelector {
-        private final AdvancedListBox listBox = new AdvancedListBox();
-        private final JFXButton cancel = new JFXButton();
-
-        private final CountDownLatch latch = new CountDownLatch(1);
-        private GameProfile selectedProfile = null;
-
-        {
-            setStyle("-fx-padding: 8px;");
-
-            cancel.setText(Main.i18n("button.cancel"));
-            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
-            cancel.setOnMouseClicked(e -> latch.countDown());
-
-            listBox.startCategory(Main.i18n("account.choose"));
-
-            setCenter(listBox);
-
-            HBox hbox = new HBox();
-            hbox.setAlignment(Pos.CENTER_RIGHT);
-            hbox.getChildren().add(cancel);
-            setBottom(hbox);
-        }
-
-        @Override
-        public GameProfile select(Account account, List<GameProfile> names) throws NoSelectedCharacterException {
-            if (!(account instanceof YggdrasilAccount))
-                return CharacterSelector.DEFAULT.select(account, names);
-            YggdrasilAccount yggdrasilAccount = (YggdrasilAccount) account;
-
-            for (GameProfile profile : names) {
-                Image image;
-                try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4, Settings.INSTANCE.getProxy());
-                } catch (Exception e) {
-                    image = FXUtils.DEFAULT_ICON;
-                }
-                ImageView portraitView = new ImageView();
-                portraitView.setSmooth(false);
-                if (image == FXUtils.DEFAULT_ICON)
-                    portraitView.setImage(FXUtils.DEFAULT_ICON);
-                else {
-                    portraitView.setImage(image);
-                    portraitView.setViewport(AccountHelper.getViewport(4));
-                }
-                FXUtils.limitSize(portraitView, 32, 32);
-
-                IconedItem accountItem = new IconedItem(portraitView, profile.getName());
-                accountItem.setOnMouseClicked(e -> {
-                    selectedProfile = profile;
-                    latch.countDown();
-                });
-                listBox.add(accountItem);
-            }
-
-            JFXUtilities.runInFX(() -> Controllers.dialog(this));
-
-            try {
-                latch.await();
-
-                JFXUtilities.runInFX(Controllers::closeDialog);
-
-                if (selectedProfile == null)
-                    throw new NoSelectedCharacterException(account);
-
-                return selectedProfile;
-            } catch (InterruptedException ignore) {
-                throw new NoSelectedCharacterException(account);
-            }
-        }
-    }
-}

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

@@ -0,0 +1,283 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2017  huangyuhui <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui;
+
+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.*;
+import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+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.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
+import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.IconedItem;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.ui.construct.Validator;
+import org.jackhuang.hmcl.util.Constants;
+import org.jackhuang.hmcl.util.Logging;
+import static org.jackhuang.hmcl.ui.FXUtils.jfxListCellFactory;
+import static org.jackhuang.hmcl.ui.FXUtils.stringConverter;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Consumer;
+import java.util.logging.Level;
+
+public class AddAccountPane extends StackPane {
+
+    @FXML private JFXTextField txtUsername;
+    @FXML private JFXPasswordField txtPassword;
+    @FXML private Label lblCreationWarning;
+    @FXML private Label lblPassword;
+    @FXML private JFXComboBox<String> cboType;
+    @FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
+    @FXML private Label lblInjectorServer;
+    @FXML private Hyperlink linkManageInjectorServers;
+    @FXML private JFXDialogLayout layout;
+    @FXML private JFXButton btnAccept;
+    @FXML private SpinnerPane acceptPane;
+    private final Consumer<Region> finalization;
+
+    public AddAccountPane(Consumer<Region> finalization) {
+        this.finalization = finalization;
+
+        FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
+
+        cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl())));
+        cboServers.setConverter(stringConverter(AuthlibInjectorServer::getName));
+        cboServers.setItems(Settings.SETTINGS.authlibInjectorServers);
+        cboServers.setPromptText(i18n("general.prompt.empty"));
+
+        // workaround: otherwise the combox will be black
+        if (!cboServers.getItems().isEmpty())
+            cboServers.getSelectionModel().select(0);
+
+        cboType.getItems().setAll(i18n("account.methods.offline"), i18n("account.methods.yggdrasil"), i18n("account.methods.authlib_injector"));
+        cboType.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) -> {
+            txtPassword.setVisible(newValue.intValue() != 0);
+            lblPassword.setVisible(newValue.intValue() != 0);
+            cboServers.setVisible(newValue.intValue() == 2);
+            linkManageInjectorServers.setVisible(newValue.intValue() == 2);
+            lblInjectorServer.setVisible(newValue.intValue() == 2);
+            validateAcceptButton();
+        });
+        cboType.getSelectionModel().select(0);
+
+        txtPassword.setOnAction(e -> onCreationAccept());
+        txtUsername.setOnAction(e -> onCreationAccept());
+        txtUsername.getValidators().add(new Validator(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()));
+    }
+
+    @FXML
+    private void onCreationAccept() {
+        String username = txtUsername.getText();
+        String password = txtPassword.getText();
+        Object addtionalData;
+
+        int type = cboType.getSelectionModel().getSelectedIndex();
+        AccountFactory<?> factory;
+        switch (type) {
+            case 0:
+                factory = Accounts.ACCOUNT_FACTORY.get(Accounts.OFFLINE_ACCOUNT_KEY);
+                addtionalData = null;
+                break;
+            case 1:
+                factory = Accounts.ACCOUNT_FACTORY.get(Accounts.YGGDRASIL_ACCOUNT_KEY);
+                addtionalData = null;
+                break;
+            case 2:
+                factory = Accounts.ACCOUNT_FACTORY.get(Accounts.AUTHLIB_INJECTOR_ACCOUNT_KEY);
+                Optional<AuthlibInjectorServer> server = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem());
+                if (server.isPresent()) {
+                    addtionalData = server.get();
+                } else {
+                    lblCreationWarning.setText(i18n("account.failed.no_selected_server"));
+                    return;
+                }
+                break;
+            default:
+                throw new Error();
+        }
+
+        acceptPane.showSpinner();
+        lblCreationWarning.setText("");
+
+        Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, addtionalData, Settings.INSTANCE.getProxy()))
+                .finalized(Schedulers.javafx(), variables -> {
+                    Settings.INSTANCE.addAccount(variables.get("create_account"));
+                    acceptPane.hideSpinner();
+                    finalization.accept(this);
+                }, exception -> {
+                    if (exception instanceof NoSelectedCharacterException) {
+                        finalization.accept(this);
+                    } else {
+                        lblCreationWarning.setText(accountException(exception));
+                    }
+                    acceptPane.hideSpinner();
+                }).start();
+    }
+
+    @FXML
+    private void onCreationCancel() {
+        finalization.accept(this);
+    }
+
+    @FXML
+    private void onManageInjecterServers() {
+        finalization.accept(this);
+        Controllers.navigate(Controllers.getServersPage());
+    }
+
+    private void showSelector(Node node) {
+        getChildren().setAll(node);
+    }
+
+    private void closeSelector() {
+        getChildren().setAll(layout);
+    }
+
+    private class Selector extends BorderPane implements CharacterSelector {
+        private final AdvancedListBox listBox = new AdvancedListBox();
+        private final JFXButton cancel = new JFXButton();
+
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private GameProfile selectedProfile = null;
+
+        {
+            setStyle("-fx-padding: 8px;");
+
+            cancel.setText(i18n("button.cancel"));
+            StackPane.setAlignment(cancel, Pos.BOTTOM_RIGHT);
+            cancel.setOnMouseClicked(e -> latch.countDown());
+
+            listBox.startCategory(i18n("account.choose"));
+
+            setCenter(listBox);
+
+            HBox hbox = new HBox();
+            hbox.setAlignment(Pos.CENTER_RIGHT);
+            hbox.getChildren().add(cancel);
+            setBottom(hbox);
+        }
+
+        @Override
+        public GameProfile select(Account account, List<GameProfile> names) throws NoSelectedCharacterException {
+            if (!(account instanceof YggdrasilAccount))
+                return CharacterSelector.DEFAULT.select(account, names);
+            YggdrasilAccount yggdrasilAccount = (YggdrasilAccount) account;
+
+            for (GameProfile profile : names) {
+                Image image;
+                try {
+                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4, Settings.INSTANCE.getProxy());
+                } catch (Exception e) {
+                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
+                    image = null;
+                }
+                ImageView portraitView = new ImageView();
+                portraitView.setSmooth(false);
+                if (image == null) {
+                    portraitView.setImage(Constants.DEFAULT_ICON.get());
+                } else {
+                    portraitView.setImage(image);
+                    portraitView.setViewport(AccountHelper.getViewport(4));
+                }
+                FXUtils.limitSize(portraitView, 32, 32);
+
+                IconedItem accountItem = new IconedItem(portraitView, profile.getName());
+                accountItem.setOnMouseClicked(e -> {
+                    selectedProfile = profile;
+                    latch.countDown();
+                });
+                listBox.add(accountItem);
+            }
+
+            JFXUtilities.runInFX(() -> showSelector(this));
+
+            try {
+                latch.await();
+
+                if (selectedProfile == null)
+                    throw new NoSelectedCharacterException(account);
+
+                JFXUtilities.runInFX(AddAccountPane.this::closeSelector);
+
+                return selectedProfile;
+            } catch (InterruptedException ignore) {
+                throw new NoSelectedCharacterException(account);
+            }
+        }
+    }
+
+    public static String accountException(Exception exception) {
+        if (exception instanceof NoCharacterException) {
+            return i18n("account.failed.no_character");
+        } else if (exception instanceof ServerDisconnectException) {
+            return i18n("account.failed.connect_authentication_server");
+        } else if (exception instanceof RemoteAuthenticationException) {
+            RemoteAuthenticationException remoteException = (RemoteAuthenticationException) exception;
+            String remoteMessage = remoteException.getRemoteMessage();
+            if ("ForbiddenOperationException".equals(remoteException.getRemoteName()) && remoteMessage != null) {
+                if (remoteMessage.contains("Invalid credentials"))
+                    return i18n("account.failed.invalid_credentials");
+                else if (remoteMessage.contains("Invalid token"))
+                    return i18n("account.failed.invalid_token");
+                else if (remoteMessage.contains("Invalid username or password"))
+                    return i18n("account.failed.invalid_password");
+            }
+            return exception.getMessage();
+        } else {
+            return exception.getClass() + ": " + exception.getLocalizedMessage();
+        }
+    }
+
+    public static String accountType(Account account) {
+        if (account instanceof OfflineAccount) return i18n("account.methods.offline");
+        else if (account instanceof AuthlibInjectorAccount) return i18n("account.methods.authlib_injector");
+        else if (account instanceof YggdrasilAccount) return i18n("account.methods.yggdrasil");
+        else throw new Error(i18n("account.methods.no_method") + ": " + account);
+    }
+}

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

@@ -23,19 +23,19 @@ import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Theme;
 
 import java.util.function.Consumer;
 
 public final class AuthlibInjectorServerItem extends BorderPane {
-    private final AuthlibInjectorServerInfo info;
+    private final AuthlibInjectorServer server;
 
     private final Label lblServerName = new Label();
     private final Label lblServerIp = new Label();
 
-    public AuthlibInjectorServerItem(AuthlibInjectorServerInfo info, Consumer<AuthlibInjectorServerItem> deleteCallback) {
-        this.info = info;
+    public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
+        this.server = server;
 
         lblServerName.setStyle("-fx-font-size: 15;");
         lblServerIp.setStyle("-fx-font-size: 10;");
@@ -54,11 +54,11 @@ public final class AuthlibInjectorServerItem extends BorderPane {
 
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
-        lblServerName.setText(info.getServerName());
-        lblServerIp.setText(info.getServerIp());
+        lblServerName.setText(server.getName());
+        lblServerIp.setText(server.getUrl());
     }
 
-    public AuthlibInjectorServerInfo getInfo() {
-        return info;
+    public AuthlibInjectorServer getServer() {
+        return server;
     }
 }

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

@@ -4,47 +4,47 @@ import com.jfoenix.controls.*;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServerInfo;
-import org.jackhuang.hmcl.setting.Accounts;
+
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Settings;
 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.SpinnerPane;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.NetworkUtils;
+import static java.util.stream.Collectors.toList;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
-import java.util.Collection;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import java.io.IOException;
 
 public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("account.injector.server"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("account.injector.server"));
 
     @FXML private ScrollPane scrollPane;
     @FXML private StackPane addServerContainer;
-    @FXML private Label lblServerIp;
+    @FXML private Label lblServerUrl;
     @FXML private Label lblServerName;
     @FXML private Label lblCreationWarning;
     @FXML private Label lblServerWarning;
     @FXML private VBox listPane;
-    @FXML private JFXTextField txtServerIp;
+    @FXML private JFXTextField txtServerUrl;
     @FXML private JFXDialogLayout addServerPane;
     @FXML private JFXDialogLayout confirmServerPane;
     @FXML private JFXDialog dialog;
     @FXML private StackPane contentPane;
-    @FXML private JFXSpinner spinner;
-    @FXML private JFXProgressBar progressBar;
+    @FXML private SpinnerPane nextPane;
     @FXML private JFXButton btnAddNext;
 
     private final TransitionHandler transitionHandler;
 
+    private AuthlibInjectorServer serverBeingAdded;
+
     {
         FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
         FXUtils.smoothScrolling(scrollPane);
@@ -53,44 +53,35 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
         getChildren().remove(dialog);
         dialog.setDialogContainer(this);
 
-        txtServerIp.textProperty().addListener((a, b, newValue) ->
-                btnAddNext.setDisable(!txtServerIp.validate()));
+        txtServerUrl.textProperty().addListener((a, b, newValue) ->
+                btnAddNext.setDisable(!txtServerUrl.validate()));
 
-        loading();
+        reload();
     }
 
     private void removeServer(AuthlibInjectorServerItem item) {
-        Settings.INSTANCE.removeAuthlibInjectorServerURL(item.getInfo().getServerIp());
-        loading();
+        Settings.SETTINGS.authlibInjectorServers.remove(item.getServer());
+        reload();
     }
 
-    private void loading() {
-        getChildren().remove(contentPane);
-        spinner.setVisible(true);
-
-        Task.ofResult("list", () -> Settings.INSTANCE.getAuthlibInjectorServerURLs().parallelStream()
-                .map(serverURL -> new AuthlibInjectorServerItem(new AuthlibInjectorServerInfo(serverURL, Accounts.getAuthlibInjectorServerName(serverURL)), this::removeServer))
-                .collect(Collectors.toList()))
-                .subscribe(Task.of(Schedulers.javafx(), variables -> {
-                    listPane.getChildren().setAll(variables.<Collection<? extends Node>>get("list"));
-                    loadingCompleted();
-                }));
-    }
-
-    private void loadingCompleted() {
-        getChildren().add(contentPane);
-        spinner.setVisible(false);
-
-        if (Settings.INSTANCE.getAuthlibInjectorServerURLs().isEmpty())
+    private void reload() {
+        listPane.getChildren().setAll(
+                Settings.SETTINGS.authlibInjectorServers.stream()
+                        .map(server -> new AuthlibInjectorServerItem(server, this::removeServer))
+                        .collect(toList()));
+        if (Settings.SETTINGS.authlibInjectorServers.isEmpty()) {
             onAdd();
+        }
     }
 
     @FXML
     private void onAdd() {
         transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
-        txtServerIp.setText("");
+        txtServerUrl.setText("");
+        txtServerUrl.resetValidation();
+        lblCreationWarning.setText("");
         addServerPane.setDisable(false);
-        progressBar.setVisible(false);
+        nextPane.hideSpinner();
         dialog.show();
     }
 
@@ -101,26 +92,28 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
 
     @FXML
     private void onAddNext() {
-        String serverIp = txtServerIp.getText();
-        progressBar.setVisible(true);
+        String url = fixInputUrl(txtServerUrl.getText());
+
+        nextPane.showSpinner();
         addServerPane.setDisable(true);
 
-        Task.ofResult("serverName", () -> Objects.requireNonNull(Accounts.getAuthlibInjectorServerName(serverIp)))
-                .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-                    progressBar.setVisible(false);
-                    addServerPane.setDisable(false);
+        Task.of(() -> {
+            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
+        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+            nextPane.hideSpinner();
+            addServerPane.setDisable(false);
 
-                    if (isDependentsSucceeded) {
-                        lblServerName.setText(variables.get("serverName"));
-                        lblServerIp.setText(txtServerIp.getText());
+            if (isDependentsSucceeded) {
+                lblServerName.setText(serverBeingAdded.getName());
+                lblServerUrl.setText(serverBeingAdded.getUrl());
 
-                        lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverIp).getProtocol()));
-
-                        transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
-                    } else
-                        lblCreationWarning.setText(variables.<Exception>get("lastException").getLocalizedMessage());
-                }).start();
+                lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
 
+                transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+            } else {
+                lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
+            }
+        }).start();
 
     }
 
@@ -131,11 +124,10 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
 
     @FXML
     private void onAddFinish() {
-        String ip = txtServerIp.getText();
-        if (!ip.endsWith("/"))
-            ip += "/";
-        Settings.INSTANCE.addAuthlibInjectorServerURL(ip);
-        loading();
+        if (!Settings.INSTANCE.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
+            Settings.INSTANCE.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
+        }
+        reload();
         dialog.close();
     }
 
@@ -151,4 +143,19 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
     public void setTitle(String title) {
         this.title.set(title);
     }
+
+    private String fixInputUrl(String url) {
+        if (!url.endsWith("/")) {
+            url += "/";
+        }
+        return url;
+    }
+
+    private String resolveFetchExceptionMessage(Throwable exception) {
+        if (exception instanceof IOException) {
+            return i18n("account.failed.connect_injector_server");
+        } else {
+            return exception.getClass() + ": " + exception.getLocalizedMessage();
+        }
+    }
 }

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

@@ -17,13 +17,12 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.controls.JFXDialog;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -93,7 +92,9 @@ public final class Controllers {
     public static void initialize(Stage stage) {
         Controllers.stage = stage;
 
-        decorator = new Decorator(stage, getMainPage(), Main.TITLE, false, true);
+        stage.setOnCloseRequest(e -> Launcher.stopApplication());
+
+        decorator = new Decorator(stage, getMainPage(), Launcher.TITLE, false, true);
         decorator.showPage(null);
         leftPaneController = new LeftPaneController(decorator.getLeftPane());
 
@@ -110,17 +111,12 @@ public final class Controllers {
         stage.setMaxHeight(521);
 
         stage.getIcons().add(new Image("/assets/img/icon.png"));
-        stage.setTitle(Main.TITLE);
+        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) {
+        if (decorator != null)
+            decorator.showDialog(content);
     }
 
     public static void dialog(String text) {
@@ -136,28 +132,34 @@ 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) {
+        if (stage == null) // shut down
+            return;
+        decorator.closeDialog(content);
     }
 
     public static void navigate(Node node) {
@@ -168,7 +170,13 @@ public final class Controllers {
     }
 
     public static void showUpdate() {
-        getDecorator().showUpdate();
+        if (stage == null) // shut down
+            return;
+        getLeftPaneController().showUpdate();
+    }
+
+    public static boolean isStopped() {
+        return decorator == null;
     }
 
     public static void shutdown() {

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

@@ -27,7 +27,10 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Main;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import org.jackhuang.hmcl.Launcher;
 
 /**
  * @author huangyuhui
@@ -36,10 +39,10 @@ public class CrashWindow extends Stage {
 
     public CrashWindow(String text) {
         Label lblCrash = new Label();
-        if (Main.UPDATE_CHECKER.isOutOfDate())
-            lblCrash.setText(Main.i18n("launcher.crash_out_dated"));
+        if (Launcher.UPDATE_CHECKER.isOutOfDate())
+            lblCrash.setText(i18n("launcher.crash_out_dated"));
         else
-            lblCrash.setText(Main.i18n("launcher.crash"));
+            lblCrash.setText(i18n("launcher.crash"));
         lblCrash.setWrapText(true);
 
         TextArea textArea = new TextArea();
@@ -47,8 +50,8 @@ public class CrashWindow extends Stage {
         textArea.setEditable(false);
 
         Button btnContact = new Button();
-        btnContact.setText(Main.i18n("launcher.contact"));
-        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Main.CONTACT));
+        btnContact.setText(i18n("launcher.contact"));
+        btnContact.setOnMouseClicked(event -> FXUtils.openLink(Launcher.CONTACT));
         HBox box = new HBox();
         box.setStyle("-fx-padding: 8px;");
         box.getChildren().add(btnContact);
@@ -65,7 +68,7 @@ public class CrashWindow extends Stage {
         Scene scene = new Scene(pane, 800, 480);
         setScene(scene);
         getIcons().add(new Image("/assets/img/icon.png"));
-        setTitle(Main.i18n("message.error"));
+        setTitle(i18n("message.error"));
 
         setOnCloseRequest(e -> System.exit(1));
     }

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

@@ -22,6 +22,10 @@ import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDrawer;
 import com.jfoenix.controls.JFXHamburger;
 import com.jfoenix.svg.SVGGlyph;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -38,6 +42,7 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
@@ -45,7 +50,8 @@ import javafx.scene.shape.Rectangle;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import org.jackhuang.hmcl.Main;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.EnumBackgroundImage;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.setting.Theme;
@@ -53,13 +59,14 @@ 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;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
-
 import java.io.File;
+import java.util.Locale;
 import java.util.Queue;
 import java.util.Random;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -74,7 +81,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     private static final SVGGlyph close = Lang.apply(new SVGGlyph(0, "CLOSE", "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z", Color.WHITE),
             glyph -> { glyph.setPrefSize(12, 12); glyph.setSize(12, 12); });
 
-    private final ObjectProperty<Runnable> onCloseButtonAction = new SimpleObjectProperty<>(Main::stopApplication);
+    private final ObjectProperty<Runnable> onCloseButtonAction;
     private final BooleanProperty customMaximize = new SimpleBooleanProperty(false);
 
     private final Stage primaryStage;
@@ -82,11 +89,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,17 +128,15 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     @FXML
     private JFXHamburger titleBurger;
     @FXML
-    private JFXDialog dialog;
-    @FXML
     private JFXButton btnMin;
     @FXML
     private JFXButton btnMax;
     @FXML
     private JFXButton btnClose;
     @FXML
-    private HBox updatePane;
-    @FXML
     private HBox navLeft;
+    @FXML
+    private ImageView welcomeView;
 
     public Decorator(Stage primaryStage, Node mainPage, String title) {
         this(primaryStage, mainPage, title, true, true);
@@ -143,8 +150,7 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
 
         FXUtils.loadFXML(this, "/assets/fxml/decorator.fxml");
 
-        updatePane.setCursor(Cursor.HAND);
-        updatePane.setOnMouseClicked(event -> Main.UPDATE_CHECKER.checkOutdate());
+        onCloseButtonAction = new SimpleObjectProperty<>(this, "onCloseButtonAction", Launcher::stopApplication);
 
         primaryStage.initStyle(StageStyle.UNDECORATED);
         btnClose.setGraphic(close);
@@ -168,9 +174,24 @@ 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);
+
+        welcomeView.setCursor(Cursor.HAND);
+        welcomeView.setOnMouseClicked(e -> {
+            Timeline nowAnimation = new Timeline();
+            nowAnimation.getKeyFrames().addAll(
+                    new KeyFrame(Duration.ZERO, new KeyValue(welcomeView.opacityProperty(), 1.0D, Interpolator.EASE_BOTH)),
+                    new KeyFrame(new Duration(300), new KeyValue(welcomeView.opacityProperty(), 0.0D, Interpolator.EASE_BOTH)),
+                    new KeyFrame(new Duration(300), e2 -> drawerWrapper.getChildren().remove(welcomeView))
+            );
+            nowAnimation.play();
+        });
+        if (!Settings.INSTANCE.isFirstLaunch() || Settings.INSTANCE.getLocale().getLocale() != Locale.CHINA)
+            drawerWrapper.getChildren().remove(welcomeView);
 
         if (!min) buttonsContainer.getChildren().remove(btnMin);
         if (!max) buttonsContainer.getChildren().remove(btnMax);
@@ -191,14 +212,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) {
@@ -474,10 +498,6 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
         }
     }
 
-    public void showUpdate() {
-        updatePane.setVisible(true);
-    }
-
     private void showCloseNavButton() {
         navLeft.getChildren().add(closeNavButton);
     }
@@ -518,6 +538,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");
@@ -538,11 +560,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) {
@@ -550,6 +584,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();
@@ -631,10 +667,6 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
         return wizardController;
     }
 
-    public JFXDialog getDialog() {
-        return dialog;
-    }
-
     public AdvancedListBox getLeftPane() {
         return leftPane;
     }

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

@@ -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);

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

@@ -17,12 +17,13 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.adapters.ReflectionHelper;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
 import javafx.beans.property.Property;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -30,34 +31,52 @@ import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
 import javafx.util.Duration;
-import org.jackhuang.hmcl.Main;
+import javafx.util.StringConverter;
+
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.net.URI;
-import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import static org.jackhuang.hmcl.util.ReflectionHelper.call;
-import static org.jackhuang.hmcl.util.ReflectionHelper.construct;
+import static org.jackhuang.hmcl.util.Lang.tryCast;
 
 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 InvalidationListener onInvalidating(Runnable action) {
+        return arg -> action.run();
+    }
+
     public static <T> void onChange(ObservableValue<T> value, Consumer<T> consumer) {
         value.addListener((a, b, c) -> consumer.accept(c));
     }
@@ -114,7 +133,7 @@ public final class FXUtils {
     }
 
     public static void removeListener(Node node, String key) {
-        Lang.cast(node.getProperties().get(key), ListenerPair.class)
+        tryCast(node.getProperties().get(key), ListenerPair.class)
                 .ifPresent(info -> {
                     info.unbind();
                     node.getProperties().remove(key);
@@ -184,18 +203,12 @@ public final class FXUtils {
     }
 
     public static void loadFXML(Node node, String absolutePath) {
-        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), Main.RESOURCE_BUNDLE);
+        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
         loader.setRoot(node);
         loader.setController(node);
         Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
     }
 
-    public static void resetChildren(JFXMasonryPane pane, List<Node> children) {
-        // Fixes mis-repositioning.
-        ReflectionHelper.setFieldContent(JFXMasonryPane.class, pane, "oldBoxes", null);
-        pane.getChildren().setAll(children);
-    }
-
     public static void installTooltip(Node node, String tooltip) {
         installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
     }
@@ -203,17 +216,22 @@ public final class FXUtils {
     public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
         try {
             // Java 8
-            call(construct(Class.forName("javafx.scene.control.Tooltip$TooltipBehavior"), new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false),
-                    "install", node, tooltip);
-        } catch (Throwable e) {
+            Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
+            Constructor<?> behaviorConstructor = behaviorClass.getDeclaredConstructor(Duration.class, Duration.class, Duration.class, boolean.class);
+            behaviorConstructor.setAccessible(true);
+            Object behavior = behaviorConstructor.newInstance(new Duration(openDelay), new Duration(visibleDelay), new Duration(closeDelay), false);
+            Method installMethod = behaviorClass.getDeclaredMethod("install", Node.class, Tooltip.class);
+            installMethod.setAccessible(true);
+            installMethod.invoke(behavior, node, tooltip);
+        } catch (ReflectiveOperationException e) {
             try {
                 // Java 9
-                call(tooltip, "setShowDelay", new Duration(openDelay));
-                call(tooltip, "setShowDuration", new Duration(visibleDelay));
-                call(tooltip, "setHideDelay", new Duration(closeDelay));
-            } catch (Throwable e2) {
+                Tooltip.class.getMethod("setShowDelay", Duration.class).invoke(tooltip, new Duration(openDelay));
+                Tooltip.class.getMethod("setShowDuration", Duration.class).invoke(tooltip, new Duration(visibleDelay));
+                Tooltip.class.getMethod("setHideDelay", Duration.class).invoke(tooltip, new Duration(closeDelay));
+            } catch (ReflectiveOperationException e2) {
                 e.addSuppressed(e2);
-                Logging.LOG.log(Level.SEVERE, "Cannot install tooltip by reflection", e);
+                Logging.LOG.log(Level.SEVERE, "Cannot install tooltip", e);
             }
             Tooltip.install(node, tooltip);
         }
@@ -322,7 +340,7 @@ public final class FXUtils {
      */
     @SuppressWarnings("unchecked")
     public static void unbindEnum(JFXComboBox<?> comboBox) {
-        ChangeListener listener = Lang.get(comboBox.getProperties(), "FXUtils.bindEnum.listener", ChangeListener.class).orElse(null);
+        ChangeListener listener = tryCast(comboBox.getProperties().get("FXUtils.bindEnum.listener"), ChangeListener.class).orElse(null);
         if (listener == null) return;
         comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
     }
@@ -368,7 +386,57 @@ public final class FXUtils {
         });
     }
 
-    public static final Image DEFAULT_ICON = new Image("/assets/img/icon.png");
+    public static <T> T runInUIThread(Supplier<T> supplier) {
+        if (javafx.application.Platform.isFxApplicationThread()) {
+            return supplier.get();
+        } else {
+            CountDownLatch doneLatch = new CountDownLatch(1);
+            AtomicReference<T> reference = new AtomicReference<>();
+            Platform.runLater(() -> {
+                try {
+                    reference.set(supplier.get());
+                } finally {
+                    doneLatch.countDown();
+                }
+
+            });
+
+            try {
+                doneLatch.await();
+            } catch (InterruptedException var3) {
+                Thread.currentThread().interrupt();
+            }
+
+            return reference.get();
+        }
+    }
+
+    public static <T> StringConverter<T> stringConverter(Function<T, String> func) {
+        return new StringConverter<T>() {
+
+            @Override
+            public String toString(T object) {
+                return object == null ? "" : func.apply(object);
+            }
+
+            @Override
+            public T fromString(String string) {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    public static <T> Callback<ListView<T>, ListCell<T>> jfxListCellFactory(Function<T, Node> graphicBuilder) {
+        return view -> new JFXListCell<T>() {
+            @Override
+            public void updateItem(T item, boolean empty) {
+                super.updateItem(item, empty);
+                if (!empty) {
+                    setGraphic(graphicBuilder.apply(item));
+                }
+            }
+        };
+    }
 
     public static final Interpolator SINE = new Interpolator() {
         @Override

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

@@ -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.download.MaintainTask;
 import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
 import org.jackhuang.hmcl.game.GameVersion;
@@ -29,6 +30,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.download.InstallerWizardProvider;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.LinkedList;
 import java.util.Optional;
@@ -89,7 +91,7 @@ public class InstallerController {
         Optional<String> gameVersion = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version));
 
         if (!gameVersion.isPresent())
-            Controllers.dialog("version.cannot_read");
+            Controllers.dialog(i18n("version.cannot_read"));
         else
             Controllers.getDecorator().startWizard(new InstallerWizardProvider(profile, gameVersion.get(), version, forge, liteLoader, optiFine));
     }

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

@@ -21,7 +21,8 @@ import com.jfoenix.effects.JFXDepthManager;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.Main;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.function.Consumer;
 
@@ -44,7 +45,7 @@ public class InstallerItem extends BorderPane {
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
         lblInstallerArtifact.setText(artifact);
-        lblInstallerVersion.setText(Main.i18n("archive.version") + ": " + version);
+        lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
     }
 
     @FXML

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

@@ -19,86 +19,98 @@ package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXPopup;
 import javafx.application.Platform;
 import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
 import javafx.scene.image.Image;
-import javafx.scene.layout.BorderPane;
+import javafx.scene.input.MouseButton;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import org.jackhuang.hmcl.Main;
+import javafx.scene.paint.Color;
+
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.ProfileChangedEvent;
-import org.jackhuang.hmcl.event.ProfileLoadingEvent;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+import org.jackhuang.hmcl.event.*;
 import org.jackhuang.hmcl.game.AccountHelper;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.setting.Theme;
+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;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.Lang;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
 
 public final class LeftPaneController {
     private final AdvancedListBox leftPane;
     private final VBox profilePane = new VBox();
-    private final VersionListItem accountItem = new VersionListItem("", "");
+    private final VBox accountPane = new VBox();
+    private final IconedItem launcherSettingsItem;
+    private final VersionListItem missingAccountItem = new VersionListItem(i18n("account.missing"), i18n("message.unknown"));
+    private final HashMap<Account, VersionListItem> items = new HashMap<>();
 
     public LeftPaneController(AdvancedListBox leftPane) {
         this.leftPane = leftPane;
 
-        leftPane.startCategory(Main.i18n("account").toUpperCase())
-                .add(Lang.apply(new RipplerContainer(accountItem), rippler -> {
-                    rippler.setOnMouseClicked(e -> Controllers.navigate(new AccountsPage()));
-                    accountItem.setOnSettingsButtonClicked(() -> Controllers.navigate(new AccountsPage()));
-                }))
-                .startCategory(Main.i18n("launcher").toUpperCase())
-                .add(Lang.apply(new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), Main.i18n("settings.launcher")), iconedItem -> {
-                    iconedItem.prefWidthProperty().bind(leftPane.widthProperty());
-                    iconedItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
-                }))
-                .add(new ClassTitle(Lang.apply(new BorderPane(), borderPane -> {
-                    borderPane.setLeft(Lang.apply(new VBox(), vBox -> vBox.getChildren().setAll(new Text(Main.i18n("profile.title").toUpperCase()))));
-                    JFXButton addProfileButton = new JFXButton();
-                    addProfileButton.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
-                    addProfileButton.getStyleClass().add("toggle-icon-tiny");
-                    addProfileButton.setOnMouseClicked(e ->
+        this.launcherSettingsItem = Lang.apply(new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), i18n("settings.launcher")), iconedItem -> {
+            iconedItem.prefWidthProperty().bind(leftPane.widthProperty());
+            iconedItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
+        });
+
+        leftPane
+                .add(new ClassTitle(i18n("account").toUpperCase(), Lang.apply(new JFXButton(), button -> {
+                    button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
+                    button.getStyleClass().add("toggle-icon-tiny");
+                    button.setOnMouseClicked(e -> addNewAccount());
+                })))
+                .add(accountPane)
+                .startCategory(i18n("launcher").toUpperCase())
+                .add(launcherSettingsItem)
+                .add(new ClassTitle(i18n("profile.title").toUpperCase(), Lang.apply(new JFXButton(), button -> {
+                    button.setGraphic(SVG.plus(Theme.blackFillBinding(), 10, 10));
+                    button.getStyleClass().add("toggle-icon-tiny");
+                    button.setOnMouseClicked(e ->
                             Controllers.getDecorator().showPage(new ProfilePage(null)));
-                    borderPane.setRight(addProfileButton);
                 })))
                 .add(profilePane);
 
+        EventBus.EVENT_BUS.channel(AccountAddedEvent.class).register(this::onAccountAdd);
+        EventBus.EVENT_BUS.channel(AccountLoadingEvent.class).register(this::onAccountsLoading);
         EventBus.EVENT_BUS.channel(ProfileLoadingEvent.class).register(this::onProfilesLoading);
         EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(this::onProfileChanged);
         EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(this::onRefreshedVersions);
 
-        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), it -> {
-            if (it == null) {
-                accountItem.setVersionName(Main.i18n("account.missing"));
-                accountItem.setGameVersion(Main.i18n("message.unknown"));
-            } else {
-                accountItem.setVersionName(it.getCharacter());
-                accountItem.setGameVersion(AccountsPage.accountType(it));
-            }
+        FXUtils.onChangeAndOperate(Settings.INSTANCE.selectedAccountProperty(), this::onSelectedAccountChanged);
+        onAccountsLoading();
+    }
 
-            if (it instanceof YggdrasilAccount) {
-                Image image = AccountHelper.getSkin((YggdrasilAccount) it, 4);
-                accountItem.setImage(image, AccountHelper.getViewport(4));
-            } else
-                accountItem.setImage(AccountHelper.getDefaultSkin(it, 4), AccountHelper.getViewport(4));
+    private void addNewAccount() {
+        Controllers.dialog(new AddAccountPane(Controllers::closeDialog));
+    }
+
+    private void onSelectedAccountChanged(Account newAccount) {
+        Platform.runLater(() -> {
+            for (Node node : accountPane.getChildren()) {
+                if (node instanceof RipplerContainer && node.getProperties().get("account") instanceof Account) {
+                    boolean current = Objects.equals(node.getProperties().get("account"), newAccount);
+                    ((RipplerContainer) node).setSelected(current);
+                }
+            }
         });
     }
 
@@ -110,7 +122,7 @@ public final class LeftPaneController {
                 if (node instanceof RipplerContainer && node.getProperties().get("profile") instanceof String) {
                     boolean current = Objects.equals(node.getProperties().get("profile"), profile.getName());
                     ((RipplerContainer) node).setSelected(current);
-                    ((VersionListItem) ((RipplerContainer) node).getContainer()).setGameVersion(current ? Main.i18n("profile.selected") : "");
+                    ((VersionListItem) ((RipplerContainer) node).getContainer()).setGameVersion(current ? i18n("profile.selected") : "");
                 }
             }
         });
@@ -121,7 +133,7 @@ public final class LeftPaneController {
         for (Profile profile : Settings.INSTANCE.getProfiles()) {
             VersionListItem item = new VersionListItem(Profiles.getProfileDisplayName(profile));
             RipplerContainer ripplerContainer = new RipplerContainer(item);
-            item.setOnSettingsButtonClicked(() -> Controllers.getDecorator().showPage(new ProfilePage(profile)));
+            item.setOnSettingsButtonClicked(e -> Controllers.getDecorator().showPage(new ProfilePage(profile)));
             ripplerContainer.setOnMouseClicked(e -> Settings.INSTANCE.setSelectedProfile(profile));
             ripplerContainer.getProperties().put("profile", profile.getName());
             ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
@@ -130,11 +142,80 @@ public final class LeftPaneController {
         Platform.runLater(() -> profilePane.getChildren().setAll(list));
     }
 
+    private static String accountType(Account account) {
+        if (account instanceof OfflineAccount) return i18n("account.methods.offline");
+        else if (account instanceof YggdrasilAccount) return account.getUsername();
+        else throw new Error(i18n("account.methods.no_method") + ": " + account);
+    }
+
+    private void onAccountAdd(AccountAddedEvent event) {
+        Account account = event.getAccount();
+        VersionListItem item = items.get(account);
+        if (account instanceof YggdrasilAccount)
+            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
+                    .subscribe(Schedulers.javafx(), () -> {
+                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                        item.setImage(image, AccountHelper.getViewport(4));
+                    });
+    }
+
+    private void onAccountsLoading() {
+        LinkedList<RipplerContainer> list = new LinkedList<>();
+        items.clear();
+        Account selectedAccount = Settings.INSTANCE.getSelectedAccount();
+        for (Account account : Settings.INSTANCE.getAccounts()) {
+            VersionListItem item = new VersionListItem(account.getCharacter(), accountType(account));
+            items.put(account, item);
+            RipplerContainer ripplerContainer = new RipplerContainer(item);
+            item.setOnSettingsButtonClicked(e -> {
+                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 -> {
+                if (e.getButton() == MouseButton.PRIMARY)
+                    Settings.INSTANCE.setSelectedAccount(account);
+            });
+            ripplerContainer.getProperties().put("account", account);
+            ripplerContainer.maxWidthProperty().bind(leftPane.widthProperty());
+
+            if (account instanceof YggdrasilAccount) {
+                Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
+                item.setImage(image, AccountHelper.getViewport(4));
+            } else
+                item.setImage(AccountHelper.getDefaultSkin(account.getUUID(), 4), AccountHelper.getViewport(4));
+
+            if (account instanceof AuthlibInjectorAccount) {
+                FXUtils.installTooltip(ripplerContainer, 500, 5000, 0, new Tooltip(((AuthlibInjectorAccount) account).getServer().getName()));
+            }
+
+            if (selectedAccount == account)
+                ripplerContainer.setSelected(true);
+
+            list.add(ripplerContainer);
+        }
+
+        if (Settings.INSTANCE.getAccounts().isEmpty()) {
+            RipplerContainer container = new RipplerContainer(missingAccountItem);
+            missingAccountItem.setOnSettingsButtonClicked(e -> addNewAccount());
+            container.setOnMouseClicked(e -> addNewAccount());
+            list.add(container);
+        }
+
+        Platform.runLater(() -> accountPane.getChildren().setAll(list));
+    }
+
+    public void showUpdate() {
+        launcherSettingsItem.setText(i18n("update.found"));
+        launcherSettingsItem.setTextFill(Color.RED);
+    }
+
     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;
@@ -143,27 +224,31 @@ 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(),
-                                    Main.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, i18n("modpack.installing"), ""));
+                            executor.start();
+                            showNewAccount = false;
                         } catch (UnsupportedModpackException ignore) {
                         }
                     }
                 }
             }
 
-            if (flag)
+            if (showNewAccount) {
+                showNewAccount = false;
                 checkAccount();
+            }
         });
     }
 
-    private void checkAccount() {
+    public void checkAccount() {
         if (Settings.INSTANCE.getAccounts().isEmpty())
-            Controllers.navigate(new AccountsPage());
+            addNewAccount();
     }
 }

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

@@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import javafx.stage.Stage;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
@@ -43,6 +43,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import java.util.concurrent.CountDownLatch;
 
 /**
@@ -63,7 +65,7 @@ public final class LogWindow extends Stage {
     public LogWindow() {
         setScene(new Scene(impl, 800, 480));
         getScene().getStylesheets().addAll(Settings.INSTANCE.getTheme().getStylesheets());
-        setTitle(Main.i18n("logwindow.title"));
+        setTitle(i18n("logwindow.title"));
         getIcons().add(new Image("/assets/img/icon.png"));
     }
 

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

@@ -18,22 +18,22 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXListView;
-import com.jfoenix.controls.JFXMasonryPane;
-import com.jfoenix.controls.JFXPopup;
+import com.jfoenix.controls.*;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
+import javafx.scene.control.ScrollPane;
 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.Main;
+
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.ProfileChangedEvent;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
+import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
 import org.jackhuang.hmcl.game.*;
 import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
@@ -43,96 +43,113 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.OperatingSystem;
-import org.jackhuang.hmcl.util.StringUtils;
-
 import java.io.File;
 import java.io.IOException;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
+import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class MainPage extends StackPane implements DecoratorPage {
 
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("main_page"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("main_page"));
 
     private Profile profile;
-    private String rightClickedVersion;
 
     @FXML
     private JFXButton btnRefresh;
-
+    @FXML
+    private StackPane contentPane;
     @FXML
     private JFXButton btnAdd;
-
+    @FXML
+    private JFXSpinner spinner;
     @FXML
     private JFXMasonryPane masonryPane;
-
     @FXML
-    private JFXListView versionList;
-
-    private final JFXPopup versionPopup;
+    private ScrollPane scrollPane;
 
     {
         FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
 
+        loadingVersions();
+
         EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> {
             if (event.getSource() == profile.getRepository())
                 loadVersions((HMCLGameRepository) event.getSource());
         });
-        EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(event -> this.profile = event.getProfile());
+        EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
+            if (event.getSource() == profile.getRepository())
+                // This will occupy 0.5s. Too slow!
+                JFXUtilities.runInFX(this::loadingVersions);
+        });
+        EventBus.EVENT_BUS.channel(ProfileChangedEvent.class).register(event -> {
+            this.profile = event.getProfile();
+        });
 
-        versionPopup = new JFXPopup(versionList);
-        getChildren().remove(versionList);
-
-        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), Main.i18n("install")));
-        FXUtils.installTooltip(btnAdd, Main.i18n("install"));
+        btnAdd.setOnMouseClicked(e -> Controllers.getDecorator().startWizard(new DownloadWizardProvider(), i18n("install")));
+        FXUtils.installTooltip(btnAdd, i18n("install"));
         btnRefresh.setOnMouseClicked(e -> Settings.INSTANCE.getSelectedProfile().getRepository().refreshVersionsAsync().start());
-        FXUtils.installTooltip(btnRefresh, Main.i18n("button.refresh"));
+        FXUtils.installTooltip(btnRefresh, i18n("button.refresh"));
     }
 
-    private Node buildNode(HMCLGameRepository repository, Version version, String game) {
+    private String modifyVersion(String gameVersion, String version) {
+        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
+    }
+
+    private Node buildNode(HMCLGameRepository repository, Version version, Callable<String> gameCallable) {
+        Profile profile = repository.getProfile();
         String id = version.getId();
         VersionItem item = new VersionItem();
         item.setUpdate(repository.isModpack(id));
-        item.setGameVersion(game);
+        Task.ofResult("game", gameCallable).subscribe(Schedulers.javafx(), vars -> {
+            String game = vars.get("game");
+            item.setGameVersion(game);
+
+            StringBuilder libraries = new StringBuilder();
+            for (Library library : version.getLibraries()) {
+                if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
+                    libraries.append(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(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(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n");
+                }
+            }
+
+            item.setLibraries(libraries.toString());
+        });
         item.setVersionName(id);
-
-        StringBuilder libraries = new StringBuilder();
-        for (Library library : version.getLibraries()) {
-            if (library.getGroupId().equalsIgnoreCase("net.minecraftforge") && library.getArtifactId().equalsIgnoreCase("forge")) {
-                libraries.append(Main.i18n("install.installer.forge")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)forge", "").replace(game, "").trim(), "-"), "-")).append("\n");
-            }
-            if (library.getGroupId().equalsIgnoreCase("com.mumfrey") && library.getArtifactId().equalsIgnoreCase("liteloader")) {
-                libraries.append(Main.i18n("install.installer.liteloader")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)liteloader", "").replace(game, "").trim(), "-"), "-")).append("\n");
-            }
-            if (library.getGroupId().equalsIgnoreCase("net.optifine") && library.getArtifactId().equalsIgnoreCase("optifine")) {
-                libraries.append(Main.i18n("install.installer.optifine")).append(": ").append(StringUtils.removeSuffix(StringUtils.removePrefix(library.getVersion().replaceAll("(?i)optifine", "").replace(game, "").trim(), "-"), "-")).append("\n");
-            }
-        }
-
-        item.setLibraries(libraries.toString());
         item.setOnLaunchButtonClicked(e -> {
             if (Settings.INSTANCE.getSelectedAccount() == null)
-                Controllers.dialog(Main.i18n("login.empty_username"));
+                Controllers.getLeftPaneController().checkAccount();
             else
-                LauncherHelper.INSTANCE.launch(id, null);
+                LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
         });
         item.setOnScriptButtonClicked(e -> {
             if (Settings.INSTANCE.getSelectedAccount() == null)
-                Controllers.dialog(Main.i18n("login.empty_username"));
+                Controllers.dialog(i18n("login.empty_username"));
             else {
                 FileChooser chooser = new FileChooser();
-                chooser.setInitialDirectory(repository.getRunDirectory(id));
-                chooser.setTitle(Main.i18n("version.launch_script.save"));
+                if (repository.getRunDirectory(id).isDirectory())
+                    chooser.setInitialDirectory(repository.getRunDirectory(id));
+                chooser.setTitle(i18n("version.launch_script.save"));
                 chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
-                        ? new FileChooser.ExtensionFilter(Main.i18n("extension.bat"), "*.bat")
-                        : new FileChooser.ExtensionFilter(Main.i18n("extension.sh"), "*.sh"));
+                        ? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
+                        : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
                 File file = chooser.showSaveDialog(Controllers.getStage());
                 if (file != null)
-                    LauncherHelper.INSTANCE.launch(id, file);
+                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, file);
             }
         });
         item.setOnSettingsButtonClicked(e -> {
@@ -141,37 +158,65 @@ public final class MainPage extends StackPane implements DecoratorPage {
         });
         item.setOnUpdateButtonClicked(event -> {
             FileChooser chooser = new FileChooser();
-            chooser.setTitle(Main.i18n("modpack.choose"));
-            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Main.i18n("modpack"), "*.zip"));
+            chooser.setTitle(i18n("modpack.choose"));
+            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(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(Main.i18n("modpack.update"));
+                            .then(Task.of(Schedulers.javafx(), () -> Controllers.closeDialog(region.get()))).executor();
+                    region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
                     executor.start();
-                    Controllers.dialog(pane);
                 } catch (UnsupportedModpackException e) {
-                    Controllers.dialog(Main.i18n("modpack.unsupported"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 } catch (MismatchedModpackTypeException e) {
-                    Controllers.dialog(Main.i18n("modpack.mismatched_type"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (IOException e)  {
-                    Controllers.dialog(Main.i18n("modpack.invalid"), Main.i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+                } catch (IOException e) {
+                    Controllers.closeDialog(region.get());
+                    Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 }
             }
         });
         item.setOnMouseClicked(event -> {
             if (event.getButton() == MouseButton.SECONDARY) {
-                rightClickedVersion = id;
-                versionList.getSelectionModel().select(-1);
+                JFXListView<String> versionList = new JFXListView<>();
+                JFXPopup versionPopup = new JFXPopup(versionList);
+                versionList.getStyleClass().add("option-list-view");
+                FXUtils.setLimitWidth(versionList, 150);
+                versionList.getItems().setAll(Lang.immutableListOf(
+                        i18n("version.manage.rename"),
+                        i18n("version.manage.remove"),
+                        i18n("modpack.export"),
+                        i18n("folder.game")
+                ));
+                versionList.setOnMouseClicked(e -> {
+                    versionPopup.hide();
+                    switch (versionList.getSelectionModel().getSelectedIndex()) {
+                        case 0:
+                            VersionPage.renameVersion(profile, id);
+                            break;
+                        case 1:
+                            VersionPage.deleteVersion(profile, id);
+                            break;
+                        case 2:
+                            VersionPage.exportVersion(profile, id);
+                            break;
+                        case 3:
+                            FXUtils.openFolder(repository.getRunDirectory(id));
+                            break;
+                        default:
+                            break;
+                    }
+                });
                 versionPopup.show(item, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, event.getX(), event.getY());
             } else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
                 if (Settings.INSTANCE.getSelectedAccount() == null)
-                    Controllers.dialog(Main.i18n("login.empty_username"));
+                    Controllers.dialog(i18n("login.empty_username"));
                 else
-                    LauncherHelper.INSTANCE.launch(id, null);
+                    LauncherHelper.INSTANCE.launch(profile, Settings.INSTANCE.getSelectedAccount(), id, null);
             }
         });
         File iconFile = repository.getVersionIcon(id);
@@ -180,33 +225,21 @@ public final class MainPage extends StackPane implements DecoratorPage {
         return item;
     }
 
-    private void loadVersions(HMCLGameRepository repository) {
-        List<Node> children = new LinkedList<>();
-        for (Version version : repository.getVersions()) {
-            children.add(buildNode(repository, version, GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")));
-        }
-        JFXUtilities.runInFX(() -> FXUtils.resetChildren(masonryPane, children));
+    private void loadingVersions() {
+        getChildren().setAll(spinner);
+        masonryPane.getChildren().clear();
     }
 
-    @FXML
-    private void onVersionManagement() {
-        versionPopup.hide();
-        switch (versionList.getSelectionModel().getSelectedIndex()) {
-            case 0:
-                VersionPage.renameVersion(profile, rightClickedVersion);
-                break;
-            case 1:
-                VersionPage.deleteVersion(profile, rightClickedVersion);
-                break;
-            case 2:
-                VersionPage.exportVersion(profile, rightClickedVersion);
-                break;
-            case 3:
-                FXUtils.openFolder(profile.getRepository().getRunDirectory(rightClickedVersion));
-                break;
-            default:
-                throw new Error();
-        }
+    private void loadVersions(HMCLGameRepository repository) {
+        List<Node> children = repository.getVersions().parallelStream()
+                .map(version -> buildNode(repository, version, () -> GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")))
+                .collect(Collectors.toList());
+        JFXUtilities.runInFX(() -> {
+            if (profile == repository.getProfile()) {
+                masonryPane.getChildren().setAll(children);
+                getChildren().setAll(contentPane);
+            }
+        });
     }
 
     public String getTitle() {

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

@@ -17,30 +17,32 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXSpinner;
 import com.jfoenix.controls.JFXTabPane;
-import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Level;
-import java.util.stream.Stream;
+import java.util.stream.Collectors;
 
 public final class ModController {
     @FXML
@@ -68,21 +70,22 @@ public final class ModController {
         });
 
         rootPane.setOnDragDropped(event -> {
-            List<File> mods = event.getDragboard().getFiles();
-            Stream<File> stream = null;
-            if (mods != null)
-                stream = mods.stream()
-                        .filter(it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)));
-            if (stream != null && stream.findAny().isPresent()) {
-                stream.forEach(it -> {
-                    try {
-                        modManager.addMod(versionId, it);
-                    } catch (IOException | IllegalArgumentException e) {
-                        Logging.LOG.log(Level.WARNING, "Unable to parse mod file " + it, e);
-                    }
-                });
-                loadMods(modManager, versionId);
-                event.setDropCompleted(true);
+            List<File> files = event.getDragboard().getFiles();
+            if (files != null) {
+                Collection<File> mods = files.stream()
+                        .filter(it -> Arrays.asList("jar", "zip", "litemod").contains(FileUtils.getExtension(it)))
+                        .collect(Collectors.toList());
+                if (!mods.isEmpty()) {
+                    mods.forEach(it -> {
+                        try {
+                            modManager.addMod(versionId, it);
+                        } catch (IOException | IllegalArgumentException e) {
+                            Logging.LOG.log(Level.WARNING, "Unable to parse mod file " + it, e);
+                        }
+                    });
+                    loadMods(modManager, versionId);
+                    event.setDropCompleted(true);
+                }
             }
             event.consume();
         });
@@ -93,7 +96,7 @@ public final class ModController {
         this.versionId = versionId;
         Task.of(variables -> {
             synchronized (ModController.this) {
-                Platform.runLater(() -> {
+                JFXUtilities.runInFX(() -> {
                     rootPane.getChildren().remove(contentPane);
                     spinner.setVisible(true);
                 });
@@ -121,25 +124,24 @@ public final class ModController {
                     list.add(item);
                 }
 
-                Platform.runLater(() -> {
-                    rootPane.getChildren().add(contentPane);
-                    spinner.setVisible(false);
-                });
                 variables.set("list", list);
             }
-        }).finalized(Schedulers.javafx(), variables -> {
-            FXUtils.onWeakChangeAndOperate(parentTab.getSelectionModel().selectedItemProperty(), newValue -> {
-                if (newValue != null && newValue.getUserData() == ModController.this)
-                    modPane.getChildren().setAll(variables.<List<ModItem>>get("list"));
-            });
-        }, null).start();
+        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+            rootPane.getChildren().add(contentPane);
+            spinner.setVisible(false);
+            if (isDependentsSucceeded)
+                FXUtils.onWeakChangeAndOperate(parentTab.getSelectionModel().selectedItemProperty(), newValue -> {
+                    if (newValue != null && newValue.getUserData() == ModController.this)
+                        modPane.getChildren().setAll(variables.<List<ModItem>>get("list"));
+                });
+        }).start();
     }
 
     @FXML
     private void onAdd() {
         FileChooser chooser = new FileChooser();
-        chooser.setTitle(Main.i18n("mods.choose_mod"));
-        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(Main.i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
+        chooser.setTitle(i18n("mods.choose_mod"));
+        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("extension.mod"), "*.jar", "*.zip", "*.litemod"));
         List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());
 
         // It's guaranteed that succeeded and failed are thread safe here.
@@ -161,10 +163,10 @@ public final class ModController {
         }).with(Task.of(Schedulers.javafx(), variables -> {
             List<String> prompt = new LinkedList<>();
             if (!succeeded.isEmpty())
-                prompt.add(Main.i18n("mods.add.success", String.join(", ", succeeded)));
+                prompt.add(i18n("mods.add.success", String.join(", ", succeeded)));
             if (!failed.isEmpty())
-                prompt.add(Main.i18n("mods.add.failed", String.join(", ", failed)));
-            Controllers.dialog(String.join("\n", prompt), Main.i18n("mods.add"));
+                prompt.add(i18n("mods.add.failed", String.join(", ", failed)));
+            Controllers.dialog(String.join("\n", prompt), i18n("mods.add"));
             loadMods(modManager, versionId);
         })).start();
     }

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

@@ -17,14 +17,16 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.geometry.Pos;
 import javafx.scene.layout.BorderPane;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.setting.Theme;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.function.Consumer;
 
@@ -40,7 +42,9 @@ public final class ModItem extends BorderPane {
         setCenter(modItem);
 
         JFXButton btnRemove = new JFXButton();
-        FXUtils.installTooltip(btnRemove, Main.i18n("mods.remove"));
+        JFXUtilities.runInFX(() -> {
+            FXUtils.installTooltip(btnRemove, i18n("mods.remove"));
+        });
         btnRemove.setOnMouseClicked(e -> deleteCallback.accept(this));
         btnRemove.getStyleClass().add("toggle-icon4");
         BorderPane.setAlignment(btnRemove, Pos.CENTER);
@@ -50,7 +54,7 @@ public final class ModItem extends BorderPane {
         setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
         JFXDepthManager.setDepth(this, 1);
         modItem.setTitle(info.getFileName());
-        modItem.setSubtitle(info.getName() + ", " + Main.i18n("archive.version") + ": " + info.getVersion() + ", " + Main.i18n("archive.game_version") + ": " + info.getGameVersion() + ", " + Main.i18n("archive.author") + ": " + info.getAuthors());
+        modItem.setSubtitle(info.getName() + ", " + i18n("archive.version") + ": " + info.getVersion() + ", " + i18n("archive.game_version") + ": " + info.getGameVersion() + ", " + i18n("archive.author") + ": " + info.getAuthors());
         chkEnabled.setSelected(info.isActive());
         chkEnabled.selectedProperty().addListener((a, b, newValue) ->
                 info.activeProperty().set(newValue));

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

@@ -23,13 +23,14 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.ui.construct.FileItem;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 import java.util.Optional;
@@ -54,7 +55,7 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
         String profileDisplayName = Optional.ofNullable(profile).map(Profiles::getProfileDisplayName).orElse("");
 
         title = new SimpleStringProperty(this, "title",
-                profile == null ? Main.i18n("profile.new") : Main.i18n("profile") + " - " + profileDisplayName);
+                profile == null ? i18n("profile.new") : i18n("profile") + " - " + profileDisplayName);
         location = new SimpleStringProperty(this, "location",
                 Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(""));
 

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

@@ -34,11 +34,17 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.*;
-import org.jackhuang.hmcl.ui.construct.*;
+import org.jackhuang.hmcl.ui.construct.FileItem;
+import org.jackhuang.hmcl.ui.construct.FontComboBox;
+import org.jackhuang.hmcl.ui.construct.MultiFileItem;
+import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.i18n.Locales;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.net.Proxy;
 import java.util.Arrays;
@@ -46,7 +52,7 @@ import java.util.Collections;
 import java.util.stream.Collectors;
 
 public final class SettingsPage extends StackPane implements DecoratorPage {
-    private final StringProperty title = new SimpleStringProperty(this, "title", Main.i18n("settings.launcher"));
+    private final StringProperty title = new SimpleStringProperty(this, "title", i18n("settings.launcher"));
 
     @FXML
     private JFXTextField txtProxyHost;
@@ -174,12 +180,12 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
 
         fileCommonLocation.setProperty(Settings.INSTANCE.commonPathProperty());
 
-        FXUtils.installTooltip(btnUpdate, Main.i18n("update.tooltip"));
+        FXUtils.installTooltip(btnUpdate, i18n("update.tooltip"));
         checkUpdate();
 
         // background
         backgroundItem.loadChildren(Collections.singletonList(
-                backgroundItem.createChildren(Main.i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
+                backgroundItem.createChildren(i18n("launcher.background.default"), EnumBackgroundImage.DEFAULT)
         ));
 
         FXUtils.bindString(backgroundItem.getTxtCustom(), Settings.INSTANCE.backgroundImageProperty());
@@ -196,8 +202,8 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
 
         // theme
         JFXColorPicker picker = new JFXColorPicker(Color.web(Settings.INSTANCE.getTheme().getColor()), null);
-        picker.setCustomColorText(Main.i18n("color.custom"));
-        picker.setRecentColorsText(Main.i18n("color.recent"));
+        picker.setCustomColorText(i18n("color.custom"));
+        picker.setRecentColorsText(i18n("color.recent"));
         picker.getCustomColors().setAll(Arrays.stream(Theme.VALUES).map(Theme::getColor).map(Color::web).collect(Collectors.toList()));
         picker.setOnAction(e -> {
             Theme theme = Theme.custom(Theme.getColorDisplayName(picker.getValue()));
@@ -211,7 +217,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
     private void initBackgroundItemSubtitle() {
         switch (Settings.INSTANCE.getBackgroundImageType()) {
             case DEFAULT:
-                backgroundItem.setSubtitle(Main.i18n("launcher.background.default"));
+                backgroundItem.setSubtitle(i18n("launcher.background.default"));
                 break;
             case CUSTOM:
                 backgroundItem.setSubtitle(Settings.INSTANCE.getBackgroundImage());
@@ -233,25 +239,25 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
     }
 
     public void checkUpdate() {
-        btnUpdate.setVisible(Main.UPDATE_CHECKER.isOutOfDate());
+        btnUpdate.setVisible(Launcher.UPDATE_CHECKER.isOutOfDate());
 
-        if (Main.UPDATE_CHECKER.isOutOfDate()) {
-            lblUpdateSub.setText(Main.i18n("update.newest_version", Main.UPDATE_CHECKER.getNewVersion().toString()));
+        if (Launcher.UPDATE_CHECKER.isOutOfDate()) {
+            lblUpdateSub.setText(i18n("update.newest_version", Launcher.UPDATE_CHECKER.getNewVersion().toString()));
             lblUpdateSub.getStyleClass().setAll("update-label");
 
-            lblUpdate.setText(Main.i18n("update.found"));
+            lblUpdate.setText(i18n("update.found"));
             lblUpdate.getStyleClass().setAll("update-label");
         } else {
-            lblUpdateSub.setText(Main.i18n("update.latest"));
+            lblUpdateSub.setText(i18n("update.latest"));
             lblUpdateSub.getStyleClass().setAll("subtitle-label");
 
-            lblUpdate.setText(Main.i18n("update"));
+            lblUpdate.setText(i18n("update"));
             lblUpdate.getStyleClass().setAll();
         }
     }
 
     @FXML
     private void onUpdate() {
-        Main.UPDATE_CHECKER.checkOutdate();
+        Launcher.UPDATE_CHECKER.checkOutdate();
     }
 }

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

@@ -17,10 +17,13 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import javafx.beans.binding.Bindings;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.effect.BlurType;
 import javafx.scene.effect.DropShadow;
@@ -28,12 +31,12 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.Main;
+import javafx.scene.text.TextAlignment;
+
 import org.jackhuang.hmcl.setting.Theme;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Optional;
 
@@ -65,18 +68,119 @@ public final class VersionItem extends StackPane {
 
     private EventHandler<? super MouseEvent> launchClickedHandler = null;
 
+    private void initializeComponents() {
+        setPickOnBounds(false);
+        FXUtils.setLimitWidth(this, 160);
+        FXUtils.setLimitHeight(this, 156);
+
+        content = new VBox();
+        {
+            header = new StackPane();
+            VBox.setVgrow(header, Priority.ALWAYS);
+            header.setPickOnBounds(false);
+            header.setPadding(new Insets(8));
+            header.setStyle("-fx-background-radius: 2 2 0 0; -fx-background-color: rgb(255,255,255,0.87);");
+            {
+                VBox headerContent = new VBox();
+                headerContent.setPadding(new Insets(8, 8, 0, 8));
+                {
+                    lblVersionName = new Label();
+                    lblVersionName.setStyle("-fx-font-size: 15;");
+                    lblVersionName.setTextAlignment(TextAlignment.JUSTIFY);
+                    lblVersionName.setWrapText(true);
+                    headerContent.getChildren().add(lblVersionName);
+
+                    lblGameVersion = new Label();
+                    lblGameVersion.setStyle("-fx-font-size: 11;");
+                    lblGameVersion.setTextAlignment(TextAlignment.JUSTIFY);
+                    lblGameVersion.setWrapText(true);
+                    headerContent.getChildren().add(lblGameVersion);
+
+                    lblLibraries = new Label();
+                    lblLibraries.setStyle("-fx-font-size: 10; -fx-text-fill: gray;");
+                    lblLibraries.setTextAlignment(TextAlignment.JUSTIFY);
+                    lblLibraries.setWrapText(true);
+                    headerContent.getChildren().add(lblLibraries);
+                }
+                header.getChildren().add(headerContent);
+            }
+            content.getChildren().add(header);
+
+            body = new StackPane();
+            body.setStyle("-fx-background-radius: 0 0 2 2; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;");
+            body.setMinHeight(40);
+            body.setPickOnBounds(false);
+            {
+                BorderPane bodyContent = new BorderPane();
+                {
+                    HBox hbox = new HBox();
+                    hbox.setSpacing(8);
+                    {
+                        btnSettings = new JFXButton();
+                        btnSettings.getStyleClass().add("toggle-icon4");
+                        FXUtils.setLimitWidth(btnSettings, 30);
+                        FXUtils.setLimitHeight(btnSettings, 30);
+                        hbox.getChildren().add(btnSettings);
+
+                        btnUpdate = new JFXButton();
+                        btnUpdate.getStyleClass().add("toggle-icon4");
+                        FXUtils.setLimitWidth(btnUpdate, 30);
+                        FXUtils.setLimitHeight(btnUpdate, 30);
+                        hbox.getChildren().add(btnUpdate);
+                    }
+                    bodyContent.setLeft(hbox);
+                }
+                {
+                    HBox hbox = new HBox();
+                    hbox.setSpacing(8);
+                    {
+                        btnScript = new JFXButton();
+                        btnScript.getStyleClass().add("toggle-icon4");
+                        FXUtils.setLimitWidth(btnScript, 30);
+                        FXUtils.setLimitHeight(btnScript, 30);
+                        hbox.getChildren().add(btnScript);
+
+                        btnLaunch = new JFXButton();
+                        btnLaunch.getStyleClass().add("toggle-icon4");
+                        FXUtils.setLimitWidth(btnLaunch, 30);
+                        FXUtils.setLimitHeight(btnLaunch, 30);
+                        hbox.getChildren().add(btnLaunch);
+                    }
+                    bodyContent.setRight(hbox);
+                }
+                body.getChildren().setAll(bodyContent);
+            }
+            content.getChildren().add(body);
+        }
+        getChildren().add(content);
+
+        icon = new StackPane();
+        StackPane.setAlignment(icon, Pos.TOP_RIGHT);
+        icon.setPickOnBounds(false);
+        {
+            iconView = new ImageView();
+            StackPane.setAlignment(iconView, Pos.CENTER_RIGHT);
+            StackPane.setMargin(iconView, new Insets(0, 12, 0, 0));
+            iconView.setImage(new Image("/assets/img/icon.png"));
+            icon.getChildren().add(iconView);
+        }
+        getChildren().add(icon);
+    }
+
     public VersionItem() {
-        FXUtils.loadFXML(this, "/assets/fxml/version-item.fxml");
+        initializeComponents();
         setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5.0, 0.12, -1.0, 1.0));
         btnSettings.setGraphic(SVG.gear(Theme.blackFillBinding(), 15, 15));
         btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 15, 15));
         btnLaunch.setGraphic(SVG.launch(Theme.blackFillBinding(), 15, 15));
         btnScript.setGraphic(SVG.script(Theme.blackFillBinding(), 15, 15));
 
-        FXUtils.installTooltip(btnSettings, Main.i18n("version.settings"));
-        FXUtils.installTooltip(btnUpdate, Main.i18n("version.update"));
-        FXUtils.installTooltip(btnLaunch, Main.i18n("version.launch"));
-        FXUtils.installTooltip(btnScript, Main.i18n("version.launch_script"));
+        JFXUtilities.runInFX(() -> {
+            FXUtils.installTooltip(btnSettings, i18n("version.settings"));
+            FXUtils.installTooltip(btnUpdate, i18n("version.update"));
+            FXUtils.installTooltip(btnLaunch, i18n("version.launch"));
+            FXUtils.installTooltip(btnScript, i18n("version.launch_script"));
+        });
 
         icon.translateYProperty().bind(Bindings.createDoubleBinding(() -> header.getBoundsInParent().getHeight() - icon.getHeight() / 2 - 16, header.boundsInParentProperty(), icon.heightProperty()));
         FXUtils.limitSize(iconView, 32, 32);

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

@@ -17,11 +17,14 @@
  */
 package org.jackhuang.hmcl.ui;
 
+import com.jfoenix.controls.JFXButton;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
 
 public final class VersionListItem extends StackPane {
@@ -33,7 +36,7 @@ public final class VersionListItem extends StackPane {
     private Label lblGameVersion;
     @FXML
     private ImageView imageView;
-    private Runnable handler;
+    @FXML private JFXButton btnSettings;
 
     public VersionListItem(String versionName) {
         this(versionName, "");
@@ -48,13 +51,8 @@ public final class VersionListItem extends StackPane {
         FXUtils.limitSize(imageView, 32, 32);
     }
 
-    @FXML
-    private void onSettings() {
-        handler.run();
-    }
-
-    public void setOnSettingsButtonClicked(Runnable handler) {
-        this.handler = handler;
+    public void setOnSettingsButtonClicked(EventHandler<? super MouseEvent> handler) {
+        btnSettings.setOnMouseClicked(handler);
     }
 
     public void setVersionName(String versionName) {

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

@@ -26,12 +26,13 @@ import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Tab;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
 import org.jackhuang.hmcl.util.FileUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 
@@ -79,17 +80,17 @@ public final class VersionPage extends StackPane implements DecoratorPage {
         browsePopup = new JFXPopup(browseList);
         managementPopup = new JFXPopup(managementList);
 
-        FXUtils.installTooltip(btnDelete, Main.i18n("version.manage.remove"));
-        FXUtils.installTooltip(btnBrowseMenu, Main.i18n("settings.game.exploration"));
-        FXUtils.installTooltip(btnManagementMenu, Main.i18n("settings.game.management"));
-        FXUtils.installTooltip(btnExport, Main.i18n("modpack.export"));
+        FXUtils.installTooltip(btnDelete, i18n("version.manage.remove"));
+        FXUtils.installTooltip(btnBrowseMenu, i18n("settings.game.exploration"));
+        FXUtils.installTooltip(btnManagementMenu, i18n("settings.game.management"));
+        FXUtils.installTooltip(btnExport, i18n("modpack.export"));
     }
 
     public void load(String id, Profile profile) {
         this.version = id;
         this.profile = profile;
 
-        title.set(Main.i18n("settings.game") + " - " + id);
+        title.set(i18n("settings.game") + " - " + id);
 
         versionSettingsController.loadVersionSetting(profile, id);
         modController.setParentTab(tabPane);
@@ -185,7 +186,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
     }
 
     public static void deleteVersion(Profile profile, String version) {
-        Controllers.confirmDialog(Main.i18n("version.manage.remove.confirm", version), Main.i18n("message.confirm"), () -> {
+        Controllers.confirmDialog(i18n("version.manage.remove.confirm", version), i18n("message.confirm"), () -> {
             if (profile.getRepository().removeVersionFromDisk(version)) {
                 profile.getRepository().refreshVersionsAsync().start();
                 Controllers.navigate(null);
@@ -194,7 +195,7 @@ public final class VersionPage extends StackPane implements DecoratorPage {
     }
 
     public static void renameVersion(Profile profile, String version) {
-        Controllers.inputDialog(Main.i18n("version.manage.rename.message"), res -> {
+        Controllers.inputDialog(i18n("version.manage.rename.message"), res -> {
             if (profile.getRepository().renameVersion(version, res)) {
                 profile.getRepository().refreshVersionsAsync().start();
                 Controllers.navigate(null);
@@ -203,6 +204,6 @@ public final class VersionPage extends StackPane implements DecoratorPage {
     }
 
     public static void exportVersion(Profile profile, String version) {
-        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), Main.i18n("modpack.wizard"));
+        Controllers.getDecorator().startWizard(new ExportWizardProvider(profile, version), i18n("modpack.wizard"));
     }
 }

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

@@ -17,17 +17,19 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.controls.*;
+import com.jfoenix.controls.JFXCheckBox;
+import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.controls.JFXToggleButton;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
-import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Toggle;
 import javafx.scene.image.Image;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -37,11 +39,12 @@ import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.ImagePickerItem;
 import org.jackhuang.hmcl.ui.construct.MultiFileItem;
 import org.jackhuang.hmcl.util.*;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
@@ -77,33 +80,34 @@ public final class VersionSettingsController {
 
     @FXML
     private void initialize() {
-        lblPhysicalMemory.setText(Main.i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");
+        lblPhysicalMemory.setText(i18n("settings.physical_memory") + ": " + OperatingSystem.TOTAL_MEMORY + "MB");
 
         FXUtils.smoothScrolling(scroll);
 
-        Task.of(variables -> variables.set("list", JavaVersion.getJREs().values().stream().map(javaVersion ->
-                javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion)
-        ).collect(Collectors.toList()))).subscribe(Schedulers.javafx(), variables ->
-                javaItem.loadChildren(variables.<Collection<Node>>get("list"))
-        );
+        Task.of(variables -> variables.set("list", JavaVersion.getJREs()))
+                .subscribe(Schedulers.javafx(), variables -> {
+                    javaItem.loadChildren(
+                            (variables.<List<JavaVersion>>get("list")).stream()
+                                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion))
+                                    .collect(Collectors.toList()));
+                    initializeSelectedJava();
+                });
 
         if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS)
             javaItem.getExtensionFilters().add(new FileChooser.ExtensionFilter("Java", "java.exe", "javaw.exe"));
 
         gameDirItem.loadChildren(Arrays.asList(
-                gameDirItem.createChildren(Main.i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
-                gameDirItem.createChildren(Main.i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
+                gameDirItem.createChildren(i18n("settings.advanced.game_dir.default"), EnumGameDirectory.ROOT_FOLDER),
+                gameDirItem.createChildren(i18n("settings.advanced.game_dir.independent"), EnumGameDirectory.VERSION_FOLDER)
         ));
 
         globalItem.loadChildren(Arrays.asList(
-                globalItem.createChildren(Main.i18n("settings.type.global"), true),
-                globalItem.createChildren(Main.i18n("settings.type.special"), false)
+                globalItem.createChildren(i18n("settings.type.global"), true),
+                globalItem.createChildren(i18n("settings.type.special"), false)
         ));
     }
 
     public void loadVersionSetting(Profile profile, String versionId) {
-        rootPane.getChildren().remove(advancedSettingsPane);
-
         this.profile = profile;
         this.versionId = versionId;
 
@@ -148,29 +152,17 @@ public final class VersionSettingsController {
         FXUtils.bindBoolean(chkShowLogs, versionSetting.showLogsProperty());
         FXUtils.bindEnum(cboLauncherVisibility, versionSetting.launcherVisibilityProperty());
 
-        boolean flag = false;
-        Toggle defaultToggle = null;
-        for (Toggle toggle : javaItem.getGroup().getToggles()) {
-            if (toggle.getUserData() == Lang.invoke(versionSetting::getJavaVersion)) {
-                toggle.setSelected(true);
-                flag = true;
-            } else if (toggle.getUserData() == JavaVersion.fromCurrentEnvironment()) {
-                defaultToggle = toggle;
-            }
-        }
-
         javaItem.setToggleSelectedListener(newValue -> {
             if (javaItem.isCustomToggle(newValue)) {
                 versionSetting.setJava("Custom");
+                versionSetting.setDefaultJavaPath(null);
             } else {
-                versionSetting.setJava(((JavaVersion) newValue.getUserData()).getVersion());
+                JavaVersion java = (JavaVersion) newValue.getUserData();
+                versionSetting.setJava(java.getVersion());
+                versionSetting.setDefaultJavaPath(java.getBinary().toString());
             }
         });
 
-        if (!flag) {
-            Optional.ofNullable(defaultToggle).ifPresent(t -> t.setSelected(true));
-        }
-
         versionSetting.javaDirProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
         versionSetting.javaProperty().setChangedListener(it -> initJavaSubtitle(versionSetting));
         initJavaSubtitle(versionSetting);
@@ -180,6 +172,8 @@ public final class VersionSettingsController {
         else
             globalItem.getGroup().getToggles().stream().filter(it -> it.getUserData() == Boolean.FALSE).findFirst().ifPresent(it -> it.setSelected(true));
         globalItem.setToggleSelectedListener(newValue -> {
+            // do not call versionSettings.setUsesGlobal(true/false)
+            // because versionSettings can be the global one.
             if ((Boolean) newValue.getUserData())
                 profile.globalizeVersionSetting(versionId);
             else
@@ -189,7 +183,7 @@ public final class VersionSettingsController {
         });
 
         versionSetting.usesGlobalProperty().setChangedListenerAndOperate(it ->
-                globalItem.setSubtitle(Main.i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special")));
+                globalItem.setSubtitle(i18n(versionSetting.isUsesGlobal() ? "settings.type.global" : "settings.type.special")));
 
         gameDirItem.getGroup().getToggles().stream()
                 .filter(it -> it.getUserData() == versionSetting.getGameDirType())
@@ -204,9 +198,33 @@ public final class VersionSettingsController {
 
         lastVersionSetting = versionSetting;
 
+        initializeSelectedJava();
+
         loadIcon();
     }
 
+    private void initializeSelectedJava() {
+        if (lastVersionSetting == null
+                || !JavaVersion.getJREsImmediately().isPresent() /* JREs are still being loaded */) {
+            return;
+        }
+
+        boolean flag = false;
+        Toggle defaultToggle = null;
+        for (Toggle toggle : javaItem.getGroup().getToggles()) {
+            if (toggle.getUserData() == Lang.invoke(lastVersionSetting::getJavaVersion)) {
+                toggle.setSelected(true);
+                flag = true;
+            } else if (toggle.getUserData() == JavaVersion.fromCurrentEnvironment()) {
+                defaultToggle = toggle;
+            }
+        }
+
+        if (!flag) {
+            Optional.ofNullable(defaultToggle).ifPresent(t -> t.setSelected(true));
+        }
+    }
+
     private void initJavaSubtitle(VersionSetting versionSetting) {
         Task.of(variables -> variables.set("java", versionSetting.getJavaVersion()))
                 .subscribe(Task.of(Schedulers.javafx(),
@@ -218,18 +236,10 @@ public final class VersionSettingsController {
         gameDirItem.setSubtitle(profile.getRepository().getRunDirectory(versionId).getAbsolutePath());
     }
 
-    @FXML
-    private void onShowAdvanced() {
-        if (!rootPane.getChildren().contains(advancedSettingsPane))
-            rootPane.getChildren().add(advancedSettingsPane);
-        else
-            rootPane.getChildren().remove(advancedSettingsPane);
-    }
-
     @FXML
     private void onExploreIcon() {
         FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Main.i18n("extension.png"), "*.png"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.png"), "*.png"));
         File selectedFile = chooser.showOpenDialog(Controllers.getStage());
         if (selectedFile != null) {
             File iconFile = profile.getRepository().getVersionIcon(versionId);
@@ -247,7 +257,7 @@ public final class VersionSettingsController {
         if (iconFile.exists())
             iconPickerItem.setImage(new Image("file:" + iconFile.getAbsolutePath()));
         else
-            iconPickerItem.setImage(FXUtils.DEFAULT_ICON);
+            iconPickerItem.setImage(Constants.DEFAULT_ICON.get());
         FXUtils.limitSize(iconPickerItem.getImageView(), 32, 32);
     }
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java

@@ -22,6 +22,7 @@ import javafx.animation.Timeline;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
 public final class TransitionHandler implements AnimationHandler {
@@ -36,6 +37,12 @@ public final class TransitionHandler implements AnimationHandler {
     public TransitionHandler(StackPane view) {
         this.view = view;
         currentNode = view.getChildren().stream().findFirst().orElse(null);
+
+        // prevent content overflow
+        Rectangle clip = new Rectangle();
+        clip.widthProperty().bind(view.widthProperty());
+        clip.heightProperty().bind(view.heightProperty());
+        view.setClip(clip);
     }
 
     @Override
@@ -73,7 +80,10 @@ public final class TransitionHandler implements AnimationHandler {
 
         Timeline nowAnimation = new Timeline();
         nowAnimation.getKeyFrames().addAll(transition.animate(this));
-        nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> view.getChildren().remove(previousNode)));
+        nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
+            previousNode.setMouseTransparent((Boolean) previousNode.getProperties().get(MOUSE_TRANSPARENT));
+            view.getChildren().remove(previousNode);
+        }));
         nowAnimation.play();
         animation = nowAnimation;
     }
@@ -86,13 +96,17 @@ public final class TransitionHandler implements AnimationHandler {
         } else
             previousNode = NULL;
 
-        if (previousNode == currentNode)
+        if (previousNode == newView)
             previousNode = NULL;
 
+        previousNode.getProperties().put(MOUSE_TRANSPARENT, previousNode.isMouseTransparent());
+        previousNode.setMouseTransparent(true);
+
         currentNode = newView;
 
         view.getChildren().setAll(previousNode, currentNode);
     }
 
+    private static final String MOUSE_TRANSPARENT = "TransitionHandler.MOUSE_TRANSPARENT";
     private static final StackPane NULL = new StackPane();
 }

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

@@ -18,11 +18,13 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import javafx.scene.Node;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
+import org.jackhuang.hmcl.util.Lang;
 
 /**
  * @author huangyuhui
@@ -48,6 +50,13 @@ public class ClassTitle extends StackPane {
         getStyleClass().add("class-title");
     }
 
+    public ClassTitle(String text, Node rightNode) {
+        this(Lang.apply(new BorderPane(), borderPane -> {
+            borderPane.setLeft(Lang.apply(new VBox(), vBox -> vBox.getChildren().setAll(new Text(text))));
+            borderPane.setRight(rightNode);
+        }));
+    }
+
     public Node getContent() {
         return content;
     }

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

@@ -60,9 +60,14 @@ public class ComponentList extends StackPane {
             child.getStyleClass().add("options-list-item-ahead");
         else
             child.getStyleClass().add("options-list-item");
+        child.getProperties().put("node", node);
         vbox.getChildren().add(child);
     }
 
+    public void removeChildren(Node node) {
+        vbox.getChildren().removeIf(node1 -> node1.getProperties().get("node") == node);
+    }
+
     public String getTitle() {
         return title.get();
     }

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

@@ -26,11 +26,12 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 
@@ -54,7 +55,7 @@ public class FileItem extends BorderPane {
         right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
         right.getStyleClass().add("toggle-icon4");
         right.setOnMouseClicked(e -> onExplore());
-        FXUtils.installTooltip(right, Main.i18n("button.edit"));
+        FXUtils.installTooltip(right, i18n("button.edit"));
         setRight(right);
 
         Tooltip tip = new Tooltip();

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

@@ -21,21 +21,19 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
+import javafx.scene.paint.Paint;
 
 public class IconedItem extends RipplerContainer {
-    private final Node icon;
-    private final String text;
 
     public IconedItem(Node icon, String text) {
         super(createHBox(icon, text));
-        this.icon = icon;
-        this.text = text;
     }
 
     private static HBox createHBox(Node icon, String text) {
         HBox hBox = new HBox();
         icon.setMouseTransparent(true);
         Label textLabel = new Label(text);
+        textLabel.setId("label");
         textLabel.setAlignment(Pos.CENTER);
         textLabel.setMouseTransparent(true);
         hBox.getChildren().addAll(icon, textLabel);
@@ -43,4 +41,12 @@ public class IconedItem extends RipplerContainer {
         hBox.setAlignment(Pos.CENTER_LEFT);
         return hBox;
     }
+
+    public void setText(String text) {
+        ((Label) lookup("#label")).setText(text);
+    }
+
+    public void setTextFill(Paint paint) {
+        ((Label) lookup("#label")).setTextFill(paint);
+    }
 }

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

@@ -15,7 +15,9 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -41,7 +43,7 @@ public final class ImagePickerItem extends BorderPane {
         selectButton.onMouseClickedProperty().bind(onSelectButtonClicked);
         selectButton.getStyleClass().add("toggle-icon4");
 
-        FXUtils.installTooltip(selectButton, Main.i18n("button.edit"));
+        FXUtils.installTooltip(selectButton, i18n("button.edit"));
 
         HBox hBox = new HBox();
         hBox.getChildren().setAll(imageView, selectButton);

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

@@ -18,18 +18,16 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
-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 +38,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);
         });
     }
 }

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

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

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

@@ -18,17 +18,19 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXButton;
-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.Main;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 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,18 +83,17 @@ 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);
         });
 
-        acceptButton.setText(Main.i18n("button.yes"));
-        cancelButton.setText(Main.i18n("button.no"));
+        acceptButton.setText(i18n("button.yes"));
+        cancelButton.setText(i18n("button.no"));
 
         actions.getChildren().add(cancelButton);
     }

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

@@ -5,26 +5,25 @@ import com.jfoenix.controls.JFXRadioButton;
 import javafx.beans.NamedArg;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.ui.FXUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Consumer;
 
 public class MultiColorItem extends ComponentList {
-    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", Main.i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", Main.i18n("selector.choose_file"));
+    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
+    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
 
     private final ToggleGroup group = new ToggleGroup();
     private final JFXColorPicker colorPicker = new JFXColorPicker();

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

@@ -32,27 +32,26 @@ import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 import java.util.Collection;
 import java.util.function.Consumer;
 
 public class MultiFileItem extends ComponentList {
-    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", Main.i18n("selector.custom"));
-    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", Main.i18n("selector.choose_file"));
+    private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
+    private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
     private final BooleanProperty directory = new SimpleBooleanProperty(this, "directory", false);
-    private final SimpleStringProperty tooltip = new SimpleStringProperty(this, "tooltip");
     private final ObservableList<FileChooser.ExtensionFilter> extensionFilters = FXCollections.observableArrayList();
 
     private final ToggleGroup group = new ToggleGroup();
@@ -112,10 +111,6 @@ public class MultiFileItem extends ComponentList {
             if (toggleSelectedListener != null)
                 toggleSelectedListener.accept(newValue);
         });
-
-        Tooltip tip = new Tooltip();
-        tip.textProperty().bind(tooltipProperty());
-        Tooltip.install(this, tip);
     }
 
     public Node createChildren(String title) {
@@ -153,7 +148,7 @@ public class MultiFileItem extends ComponentList {
 
     public void onExploreJavaDir() {
         DirectoryChooser chooser = new DirectoryChooser();
-        chooser.setTitle(Main.i18n(getChooserTitle()));
+        chooser.setTitle(i18n(getChooserTitle()));
         File selectedDir = chooser.showDialog(Controllers.getStage());
         if (selectedDir != null)
             txtCustom.setText(selectedDir.getAbsolutePath());
@@ -230,16 +225,4 @@ public class MultiFileItem extends ComponentList {
     public ObservableList<FileChooser.ExtensionFilter> getExtensionFilters() {
         return extensionFilters;
     }
-
-    public String getTooltip() {
-        return tooltip.get();
-    }
-
-    public StringProperty tooltipProperty() {
-        return tooltip;
-    }
-
-    public void setTooltip(String tooltip) {
-        this.tooltip.set(tooltip);
-    }
 }

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

@@ -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.ui.construct;
+
+import com.jfoenix.controls.JFXSpinner;
+import javafx.beans.DefaultProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+
+@DefaultProperty("content")
+public class SpinnerPane extends StackPane {
+    private final TransitionHandler transitionHandler = new TransitionHandler(this);
+    private final JFXSpinner spinner = new JFXSpinner();
+    private final StackPane contentPane = new StackPane();
+    private final ObjectProperty<Node> content = new SimpleObjectProperty<>(this, "content");
+
+    public SpinnerPane() {
+        getChildren().setAll(contentPane);
+
+        content.addListener((a, b, newValue) -> contentPane.getChildren().setAll(newValue));
+    }
+
+    public void showSpinner() {
+        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+    }
+
+    public void hideSpinner() {
+        transitionHandler.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+    }
+
+    public Node getContent() {
+        return content.get();
+    }
+
+    public ObjectProperty<Node> contentProperty() {
+        return content;
+    }
+
+    public void setContent(Node content) {
+        this.content.set(content);
+    }
+}

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

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

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

@@ -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,20 +46,22 @@ 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);
         });
     }
 
     public void setExecutor(TaskExecutor executor) {
         this.executor = executor;
-        taskListPane.setExecutor(executor);
+
+        if (executor != null)
+            taskListPane.setExecutor(executor);
     }
 
     public StringProperty titleProperty() {
@@ -91,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));

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

@@ -19,13 +19,14 @@ package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.concurrency.JFXUtilities;
 import javafx.beans.property.StringProperty;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.wizard.AbstractWizardDisplayer;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Map;
 
@@ -33,12 +34,12 @@ 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);
         });
 
-        pane.setTitle(Main.i18n("message.doing"));
+        pane.setTitle(i18n("message.doing"));
         pane.setProgress(Double.MAX_VALUE);
         if (settings.containsKey("title")) {
             Object title = settings.get("title");
@@ -60,20 +61,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(Main.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, Main.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(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, i18n("wizard.failed"), MessageBox.ERROR_MESSAGE, () -> Controllers.navigate(null));
+                        }
+
+                    });
                 }
             });
             pane.setExecutor(executor);

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

@@ -23,7 +23,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.game.GameAssetRefreshTask;
@@ -35,6 +35,7 @@ import org.jackhuang.hmcl.mod.*;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.task.TaskListener;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -62,29 +63,29 @@ public final class TaskListPane extends StackPane {
                     return;
 
                 if (task instanceof GameAssetRefreshTask) {
-                    task.setName(Main.i18n("assets.download"));
+                    task.setName(i18n("assets.download"));
                 } else if (task instanceof GameAssetDownloadTask) {
-                    task.setName(Main.i18n("assets.download_all"));
+                    task.setName(i18n("assets.download_all"));
                 } else if (task instanceof ForgeInstallTask) {
-                    task.setName(Main.i18n("install.installer.install", Main.i18n("install.installer.forge")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.forge")));
                 } else if (task instanceof LiteLoaderInstallTask) {
-                    task.setName(Main.i18n("install.installer.install", Main.i18n("install.installer.liteloader")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.liteloader")));
                 } else if (task instanceof OptiFineInstallTask) {
-                    task.setName(Main.i18n("install.installer.install", Main.i18n("install.installer.optifine")));
+                    task.setName(i18n("install.installer.install", i18n("install.installer.optifine")));
                 } else if (task instanceof CurseCompletionTask) {
-                    task.setName(Main.i18n("modpack.type.curse.completion"));
+                    task.setName(i18n("modpack.type.curse.completion"));
                 } else if (task instanceof ModpackInstallTask) {
-                    task.setName(Main.i18n("modpack.installing"));
+                    task.setName(i18n("modpack.installing"));
                 } else if (task instanceof CurseInstallTask) {
-                    task.setName(Main.i18n("modpack.install", Main.i18n("modpack.type.curse")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.curse")));
                 } else if (task instanceof MultiMCModpackInstallTask) {
-                    task.setName(Main.i18n("modpack.install", Main.i18n("modpack.type.multimc")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.multimc")));
                 } else if (task instanceof HMCLModpackInstallTask) {
-                    task.setName(Main.i18n("modpack.install", Main.i18n("modpack.type.hmcl")));
+                    task.setName(i18n("modpack.install", i18n("modpack.type.hmcl")));
                 } else if (task instanceof HMCLModpackExportTask) {
-                    task.setName(Main.i18n("modpack.export"));
+                    task.setName(i18n("modpack.export"));
                 } else if (task instanceof MinecraftInstanceTask) {
-                    task.setName(Main.i18n("modpack.scan"));
+                    task.setName(i18n("modpack.scan"));
                 }
 
                 ProgressListNode node = new ProgressListNode(task);

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

@@ -1,7 +1,6 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.validation.base.ValidatorBase;
-import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TextInputControl;
@@ -17,10 +16,6 @@ public class URLValidator extends ValidatorBase {
         super();
     }
 
-    public URLValidator(@NamedArg("message") String message) {
-        super(message);
-    }
-
     public ObservableList<String> getProtocols() {
         return protocols;
     }

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

@@ -22,7 +22,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.GameRepository;
@@ -30,12 +30,11 @@ 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.Lang;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Map;
 import java.util.Optional;
 
-import static org.jackhuang.hmcl.Main.i18n;
-
 class AdditionalInstallersPage extends StackPane implements WizardPage {
     private final InstallerWizardProvider provider;
     private final WizardController controller;
@@ -100,7 +99,7 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
 
     @Override
     public String getTitle() {
-        return Main.i18n("settings.tabs.installers");
+        return i18n("settings.tabs.installers");
     }
 
     private String getVersion(String id) {
@@ -109,24 +108,24 @@ class AdditionalInstallersPage extends StackPane implements WizardPage {
 
     @Override
     public void onNavigate(Map<String, Object> settings) {
-        lblGameVersion.setText(Main.i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
+        lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + provider.getGameVersion());
         btnForge.setDisable(provider.getForge() != null);
         if (provider.getForge() != null || controller.getSettings().containsKey("forge"))
-            lblForge.setText(Main.i18n("install.installer.version", Main.i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
+            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + Lang.nonNull(provider.getForge(), getVersion("forge")));
         else
-            lblForge.setText(Main.i18n("install.installer.not_installed", Main.i18n("install.installer.forge")));
+            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));
 
         btnLiteLoader.setDisable(provider.getLiteLoader() != null);
         if (provider.getLiteLoader() != null || controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(Main.i18n("install.installer.version", Main.i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
+            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + Lang.nonNull(provider.getLiteLoader(), getVersion("liteloader")));
         else
-            lblLiteLoader.setText(Main.i18n("install.installer.not_installed", Main.i18n("install.installer.liteloader")));
+            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));
 
         btnOptiFine.setDisable(provider.getOptiFine() != null);
         if (provider.getOptiFine() != null || controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(Main.i18n("install.installer.version", Main.i18n("install.installer.optifine")) + ": " + Lang.nonNull(provider.getOptiFine(), getVersion("optifine")));
+            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + Lang.nonNull(provider.getOptiFine(), getVersion("optifine")));
         else
-            lblOptiFine.setText(Main.i18n("install.installer.not_installed", Main.i18n("install.installer.optifine")));
+            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
 
     }
 

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

@@ -18,7 +18,7 @@
 package org.jackhuang.hmcl.ui.download;
 
 import javafx.scene.Node;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.download.RemoteVersion;
@@ -30,11 +30,11 @@ 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.Lang;
-
 import java.io.File;
 import java.util.Map;
 
-import static org.jackhuang.hmcl.Main.i18n;
+import static org.jackhuang.hmcl.util.Lang.tryCast;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class DownloadWizardProvider implements WizardProvider {
     private Profile profile;
@@ -67,9 +67,9 @@ public final class DownloadWizardProvider implements WizardProvider {
         if (!settings.containsKey(ModpackPage.MODPACK_FILE))
             return null;
 
-        File selected = Lang.get(settings, ModpackPage.MODPACK_FILE, File.class).orElse(null);
-        Modpack modpack = Lang.get(settings, ModpackPage.MODPACK_CURSEFORGE_MANIFEST, Modpack.class).orElse(null);
-        String name = Lang.get(settings, ModpackPage.MODPACK_NAME, String.class).orElse(null);
+        File selected = tryCast(settings.get(ModpackPage.MODPACK_FILE), File.class).orElse(null);
+        Modpack modpack = tryCast(settings.get(ModpackPage.MODPACK_MANIFEST), Modpack.class).orElse(null);
+        String name = tryCast(settings.get(ModpackPage.MODPACK_NAME), String.class).orElse(null);
         if (selected == null || modpack == null || name == null) return null;
 
         return ModpackHelper.getInstallTask(profile, selected, name, modpack);
@@ -77,8 +77,8 @@ public final class DownloadWizardProvider implements WizardProvider {
 
     @Override
     public Object finish(Map<String, Object> settings) {
-        settings.put("success_message", Main.i18n("install.success"));
-        settings.put("failure_message", Main.i18n("install.failed"));
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_message", i18n("install.failed"));
 
         switch (Lang.parseInt(settings.get(InstallTypePage.INSTALL_TYPE), -1)) {
             case 0: return finishVersionDownloadingAsync(settings);
@@ -101,10 +101,10 @@ public final class DownloadWizardProvider implements WizardProvider {
                     case 1:
                         return new ModpackPage(controller);
                     default:
-                        throw new IllegalStateException("Error step " + step + ", subStep " + subStep + ", settings: " + settings);
+                        throw new IllegalStateException("Error step " + step + ", subStep " + subStep + ", settings: " + settings + ", pages: " + controller.getPages());
                 }
             default:
-                throw new IllegalStateException("error step " + step + ", settings: " + settings);
+                throw new IllegalStateException("error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
         }
     }
 

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

@@ -20,20 +20,19 @@ package org.jackhuang.hmcl.ui.download;
 import com.jfoenix.controls.JFXListView;
 import javafx.fxml.FXML;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Map;
 
 public final class InstallTypePage extends StackPane implements WizardPage {
-    private final WizardController controller;
 
     @FXML private JFXListView<Object> list;
 
     public InstallTypePage(WizardController controller) {
-        this.controller = controller;
 
         FXUtils.loadFXML(this, "/assets/fxml/download/dltype.fxml");
         list.setOnMouseClicked(e -> {
@@ -51,7 +50,7 @@ public final class InstallTypePage extends StackPane implements WizardPage {
 
     @Override
     public String getTitle() {
-        return Main.i18n("install.select");
+        return i18n("install.select");
     }
 
     public static final String INSTALL_TYPE = "INSTALL_TYPE";

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

@@ -18,7 +18,7 @@
 package org.jackhuang.hmcl.ui.download;
 
 import javafx.scene.Node;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.Version;
@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Map;
 
@@ -80,8 +81,8 @@ public final class InstallerWizardProvider implements WizardProvider {
 
     @Override
     public Object finish(Map<String, Object> settings) {
-        settings.put("success_message", Main.i18n("install.success"));
-        settings.put("failure_message", Main.i18n("install.failed"));
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_message", i18n("install.failed"));
 
         Task ret = Task.empty();
 

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

@@ -23,7 +23,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.game.GameRepository;
@@ -32,14 +32,12 @@ import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Map;
-import java.util.Optional;
 
 public class InstallersPage extends StackPane implements WizardPage {
     private final WizardController controller;
-    private final GameRepository repository;
-    private final DownloadProvider downloadProvider;
 
     @FXML
     private VBox list;
@@ -73,37 +71,35 @@ public class InstallersPage extends StackPane implements WizardPage {
 
     public InstallersPage(WizardController controller, GameRepository repository, DownloadProvider downloadProvider) {
         this.controller = controller;
-        this.repository = repository;
-        this.downloadProvider = downloadProvider;
 
         FXUtils.loadFXML(this, "/assets/fxml/download/installers.fxml");
 
         String gameVersion = ((RemoteVersion<?>) controller.getSettings().get("game")).getGameVersion();
         Validator hasVersion = new Validator(s -> !repository.hasVersion(s) && StringUtils.isNotBlank(s));
-        hasVersion.setMessage(Main.i18n("install.new_game.already_exists"));
+        hasVersion.setMessage(i18n("install.new_game.already_exists"));
         txtName.getValidators().add(hasVersion);
         txtName.textProperty().addListener(e -> btnInstall.setDisable(!txtName.validate()));
         txtName.setText(gameVersion);
 
         btnForge.setOnMouseClicked(e -> {
             controller.getSettings().put(INSTALLER_TYPE, 0);
-            controller.onNext(new VersionsPage(controller, Main.i18n("install.installer.choose", Main.i18n("install.installer.forge")), gameVersion, downloadProvider, "forge", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.forge")), gameVersion, downloadProvider, "forge", () -> controller.onPrev(false)));
         });
 
         btnLiteLoader.setOnMouseClicked(e -> {
             controller.getSettings().put(INSTALLER_TYPE, 1);
-            controller.onNext(new VersionsPage(controller, Main.i18n("install.installer.choose", Main.i18n("install.installer.liteloader")), gameVersion, downloadProvider, "liteloader", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.liteloader")), gameVersion, downloadProvider, "liteloader", () -> controller.onPrev(false)));
         });
 
         btnOptiFine.setOnMouseClicked(e -> {
             controller.getSettings().put(INSTALLER_TYPE, 2);
-            controller.onNext(new VersionsPage(controller, Main.i18n("install.installer.choose", Main.i18n("install.installer.optifine")), gameVersion, downloadProvider, "optifine", () -> controller.onPrev(false)));
+            controller.onNext(new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.optifine")), gameVersion, downloadProvider, "optifine", () -> controller.onPrev(false)));
         });
     }
 
     @Override
     public String getTitle() {
-        return Main.i18n("install.new_game");
+        return i18n("install.new_game");
     }
 
     private String getVersion(String id) {
@@ -112,21 +108,21 @@ public class InstallersPage extends StackPane implements WizardPage {
 
     @Override
     public void onNavigate(Map<String, Object> settings) {
-        lblGameVersion.setText(Main.i18n("install.new_game.current_game_version") + ": " + getVersion("game"));
+        lblGameVersion.setText(i18n("install.new_game.current_game_version") + ": " + getVersion("game"));
         if (controller.getSettings().containsKey("forge"))
-            lblForge.setText(Main.i18n("install.installer.version", Main.i18n("install.installer.forge")) + ": " + getVersion("forge"));
+            lblForge.setText(i18n("install.installer.version", i18n("install.installer.forge")) + ": " + getVersion("forge"));
         else
-            lblForge.setText(Main.i18n("install.installer.not_installed", Main.i18n("install.installer.forge")));
+            lblForge.setText(i18n("install.installer.not_installed", i18n("install.installer.forge")));
 
         if (controller.getSettings().containsKey("liteloader"))
-            lblLiteLoader.setText(Main.i18n("install.installer.version", Main.i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
+            lblLiteLoader.setText(i18n("install.installer.version", i18n("install.installer.liteloader")) + ": " + getVersion("liteloader"));
         else
-            lblLiteLoader.setText(Main.i18n("install.installer.not_installed", Main.i18n("install.installer.liteloader")));
+            lblLiteLoader.setText(i18n("install.installer.not_installed", i18n("install.installer.liteloader")));
 
         if (controller.getSettings().containsKey("optifine"))
-            lblOptiFine.setText(Main.i18n("install.installer.version", Main.i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
+            lblOptiFine.setText(i18n("install.installer.version", i18n("install.installer.optifine")) + ": " + getVersion("optifine"));
         else
-            lblOptiFine.setText(Main.i18n("install.installer.not_installed", Main.i18n("install.installer.optifine")));
+            lblOptiFine.setText(i18n("install.installer.not_installed", i18n("install.installer.optifine")));
     }
 
     @Override

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

@@ -25,7 +25,7 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
@@ -37,6 +37,7 @@ import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.StringUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 import java.util.Map;
@@ -75,28 +76,28 @@ public final class ModpackPage extends StackPane implements WizardPage {
         Profile profile = (Profile) controller.getSettings().get("PROFILE");
 
         FileChooser chooser = new FileChooser();
-        chooser.setTitle(Main.i18n("modpack.choose"));
-        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Main.i18n("modpack"), "*.zip"));
+        chooser.setTitle(i18n("modpack.choose"));
+        chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
         File selectedFile = chooser.showOpenDialog(Controllers.getStage());
         if (selectedFile == null) Platform.runLater(() -> Controllers.navigate(null));
         else {
             controller.getSettings().put(MODPACK_FILE, selectedFile);
             lblModpackLocation.setText(selectedFile.getAbsolutePath());
             txtModpackName.getValidators().addAll(
-                    new Validator(Main.i18n("install.new_game.already_exists"), str -> !profile.getRepository().hasVersion(str) && StringUtils.isNotBlank(str)),
-                    new Validator(Main.i18n("version.forbidden_name"), str -> !profile.getRepository().forbidsVersion(str))
+                    new Validator(i18n("install.new_game.already_exists"), str -> !profile.getRepository().hasVersion(str) && StringUtils.isNotBlank(str)),
+                    new Validator(i18n("version.forbidden_name"), str -> !profile.getRepository().forbidsVersion(str))
             );
             txtModpackName.textProperty().addListener(e -> btnInstall.setDisable(!txtModpackName.validate()));
 
             try {
                 manifest = ModpackHelper.readModpackManifest(selectedFile);
-                controller.getSettings().put(MODPACK_CURSEFORGE_MANIFEST, manifest);
+                controller.getSettings().put(MODPACK_MANIFEST, manifest);
                 lblName.setText(manifest.getName());
                 lblVersion.setText(manifest.getVersion());
                 lblAuthor.setText(manifest.getAuthor());
                 txtModpackName.setText(manifest.getName() + (StringUtils.isBlank(manifest.getVersion()) ? "" : "-" + manifest.getVersion()));
             } catch (UnsupportedModpackException e) {
-                txtModpackName.setText(Main.i18n("modpack.task.install.error"));
+                txtModpackName.setText(i18n("modpack.task.install.error"));
             }
         }
     }
@@ -118,17 +119,17 @@ public final class ModpackPage extends StackPane implements WizardPage {
         if (manifest != null) {
             WebStage stage = new WebStage();
             stage.getWebView().getEngine().loadContent(manifest.getDescription());
-            stage.setTitle(Main.i18n("modpack.wizard.step.3"));
+            stage.setTitle(i18n("modpack.wizard.step.3"));
             stage.showAndWait();
         }
     }
 
     @Override
     public String getTitle() {
-        return Main.i18n("modpack.task.install");
+        return i18n("modpack.task.install");
     }
 
     public static final String MODPACK_FILE = "MODPACK_FILE";
     public static final String MODPACK_NAME = "MODPACK_NAME";
-    public static final String MODPACK_CURSEFORGE_MANIFEST = "CURSEFORGE_MANIFEST";
+    public static final String MODPACK_MANIFEST = "MODPACK_MANIFEST";
 }

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

@@ -44,11 +44,9 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 public final class VersionsPage extends StackPane implements WizardPage, Refreshable {
-    private final WizardController controller;
     private final String gameVersion;
     private final DownloadProvider downloadProvider;
     private final String libraryId;
-    private final Runnable callback;
     private final String title;
 
     @FXML
@@ -73,12 +71,10 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
     private TaskExecutor executor;
 
     public VersionsPage(WizardController controller, String title, String gameVersion, DownloadProvider downloadProvider, String libraryId, Runnable callback) {
-        this.controller = controller;
         this.title = title;
         this.gameVersion = gameVersion;
         this.downloadProvider = downloadProvider;
         this.libraryId = libraryId;
-        this.callback = callback;
         this.versionList = downloadProvider.getVersionListById(libraryId);
 
         FXUtils.loadFXML(this, "/assets/fxml/download/versions.fxml");
@@ -93,10 +89,10 @@ public final class VersionsPage extends StackPane implements WizardPage, Refresh
         chkSnapshot.selectedProperty().addListener(listener);
         chkOld.selectedProperty().addListener(listener);
 
-        list.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
-            if (newValue == null)
+        list.setOnMouseClicked(e -> {
+            if (list.getSelectionModel().getSelectedIndex() < 0)
                 return;
-            controller.getSettings().put(libraryId, newValue.getRemoteVersion());
+            controller.getSettings().put(libraryId, list.getSelectionModel().getSelectedItem().getRemoteVersion());
             callback.run();
         });
         refresh();

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

@@ -23,12 +23,13 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersionTag;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderRemoteVersionTag;
 import org.jackhuang.hmcl.download.optifine.OptiFineRemoteVersion;
 import org.jackhuang.hmcl.ui.FXUtils;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Objects;
 
@@ -57,15 +58,15 @@ public final class VersionsPageItem extends StackPane {
         if (remoteVersion.getTag() instanceof GameRemoteVersionTag) {
             switch (((GameRemoteVersionTag) remoteVersion.getTag()).getType()) {
                 case RELEASE:
-                    lblGameVersion.setText(Main.i18n("version.game.release"));
+                    lblGameVersion.setText(i18n("version.game.release"));
                     imageView.setImage(new Image("/assets/img/icon.png", 32, 32, false, true));
                     break;
                 case SNAPSHOT:
-                    lblGameVersion.setText(Main.i18n("version.game.snapshot"));
+                    lblGameVersion.setText(i18n("version.game.snapshot"));
                     imageView.setImage(new Image("/assets/img/command.png", 32, 32, false, true));
                     break;
                 default:
-                    lblGameVersion.setText(Main.i18n("version.game.old"));
+                    lblGameVersion.setText(i18n("version.game.old"));
                     imageView.setImage(new Image("/assets/img/grass.png", 32, 32, false, true));
                     break;
             }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java

@@ -18,14 +18,22 @@
 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.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 +54,72 @@ 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.hasProxy.set(false);
+                            config.selectedProfile.set("");
+                            config.commonDirectory.set(null);
+                            config.fontFamily.set("Consolas");
+                            config.fontSize.set(12);
+                            config.localization.set(null);
+                            config.accounts.clear();
+                            config.selectedAccount.set("");
+                            config.logLines.set(100);
+                            config.configurations.clear();
+
+                            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

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java

@@ -25,7 +25,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.TreeItem;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.Main;
+
 import org.jackhuang.hmcl.game.ModAdviser;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.FXUtils;
@@ -33,16 +33,17 @@ import org.jackhuang.hmcl.ui.construct.NoneMultipleSelectionModel;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
 import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
-
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static org.jackhuang.hmcl.util.Lang.mapOf;
+import static org.jackhuang.hmcl.util.Pair.pair;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 /**
  * @author huangyuhui
  */
@@ -66,6 +67,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());
@@ -147,23 +151,23 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP
 
     @Override
     public String getTitle() {
-        return Main.i18n("modpack.wizard.step.2.title");
+        return i18n("modpack.wizard.step.2.title");
     }
 
     public static final String MODPACK_FILE_SELECTION = "modpack.accepted";
-    private static final Map<String, String> TRANSLATION = Lang.mapOf(
-            new Pair<>("minecraft/servers.dat", Main.i18n("modpack.files.servers_dat")),
-            new Pair<>("minecraft/saves", Main.i18n("modpack.files.saves")),
-            new Pair<>("minecraft/mods", Main.i18n("modpack.files.mods")),
-            new Pair<>("minecraft/config", Main.i18n("modpack.files.config")),
-            new Pair<>("minecraft/liteconfig", Main.i18n("modpack.files.liteconfig")),
-            new Pair<>("minecraft/resourcepacks", Main.i18n("modpack.files.resourcepacks")),
-            new Pair<>("minecraft/resources", Main.i18n("modpack.files.resourcepacks")),
-            new Pair<>("minecraft/options.txt", Main.i18n("modpack.files.options_txt")),
-            new Pair<>("minecraft/optionsshaders.txt", Main.i18n("modpack.files.optionsshaders_txt")),
-            new Pair<>("minecraft/mods/VoxelMods", Main.i18n("modpack.files.mods.voxelmods")),
-            new Pair<>("minecraft/dumps", Main.i18n("modpack.files.dumps")),
-            new Pair<>("minecraft/blueprints", Main.i18n("modpack.files.blueprints")),
-            new Pair<>("minecraft/scripts", Main.i18n("modpack.files.scripts"))
+    private static final Map<String, String> TRANSLATION = mapOf(
+            pair("minecraft/servers.dat", i18n("modpack.files.servers_dat")),
+            pair("minecraft/saves", i18n("modpack.files.saves")),
+            pair("minecraft/mods", i18n("modpack.files.mods")),
+            pair("minecraft/config", i18n("modpack.files.config")),
+            pair("minecraft/liteconfig", i18n("modpack.files.liteconfig")),
+            pair("minecraft/resourcepacks", i18n("modpack.files.resourcepacks")),
+            pair("minecraft/resources", i18n("modpack.files.resourcepacks")),
+            pair("minecraft/options.txt", i18n("modpack.files.options_txt")),
+            pair("minecraft/optionsshaders.txt", i18n("modpack.files.optionsshaders_txt")),
+            pair("minecraft/mods/VoxelMods", i18n("modpack.files.mods.voxelmods")),
+            pair("minecraft/dumps", i18n("modpack.files.dumps")),
+            pair("minecraft/blueprints", i18n("modpack.files.blueprints")),
+            pair("minecraft/scripts", i18n("modpack.files.scripts"))
     );
 }

HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java

@@ -26,15 +26,17 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.StackPane;
 import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.setting.Settings;
 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 static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 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() {
@@ -72,8 +82,8 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
     @FXML
     private void onNext() {
         FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle(Main.i18n("modpack.wizard.step.initialization.save"));
-        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(Main.i18n("modpack"), "*.zip"));
+        fileChooser.setTitle(i18n("modpack.wizard.step.initialization.save"));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
         File file = fileChooser.showSaveDialog(Controllers.getStage());
         if (file == null) {
             Controllers.navigate(null);
@@ -100,7 +110,7 @@ public final class ModpackInfoPage extends StackPane implements WizardPage {
 
     @Override
     public String getTitle() {
-        return Main.i18n("modpack.wizard.step.1.title");
+        return i18n("modpack.wizard.step.1.title");
     }
 
     public static final String MODPACK_NAME = "modpack.name";

HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/WizardController.java

@@ -20,10 +20,7 @@ package org.jackhuang.hmcl.ui.wizard;
 import javafx.scene.Node;
 import org.jackhuang.hmcl.task.Task;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Stack;
+import java.util.*;
 
 public class WizardController implements Navigation {
     private final WizardDisplayer displayer;
@@ -47,6 +44,10 @@ public class WizardController implements Navigation {
         this.provider = provider;
     }
 
+    public List<Node> getPages() {
+        return Collections.unmodifiableList(pages);
+    }
+
     @Override
     public void onStart() {
         Objects.requireNonNull(provider);
@@ -81,6 +82,10 @@ public class WizardController implements Navigation {
 
     @Override
     public void onPrev(boolean cleanUp) {
+        if (!canPrev()) {
+            throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages);
+        }
+
         Node page = pages.pop();
         if (cleanUp && page instanceof WizardPage)
             ((WizardPage) page).cleanup(settings);

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

@@ -18,25 +18,26 @@
 package org.jackhuang.hmcl.upgrade;
 
 import com.google.gson.JsonParseException;
-import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
-import org.jackhuang.hmcl.Main;
+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.FileDownloadTask.IntegrityCheck;
 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.*;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.*;
-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;
@@ -49,22 +50,24 @@ import java.util.zip.GZIPInputStream;
  */
 public class AppDataUpgrader extends IUpgrader {
 
-    private boolean launchNewerVersion(List<String> args, File jar) throws IOException, PrivilegedActionException {
+    private void launchNewerVersion(List<String> args, File jar) throws IOException, ReflectiveOperationException {
         try (JarFile jarFile = new JarFile(jar)) {
             String mainClass = jarFile.getManifest().getMainAttributes().getValue("Main-Class");
-            if (mainClass != null) {
-                ArrayList<String> al = new ArrayList<>(args);
-                al.add("--noupdate");
-                AccessController.doPrivileged((PrivilegedExceptionAction<Void>) () -> {
-                    new URLClassLoader(new URL[]{jar.toURI().toURL()},
-                            ClassLoader.getSystemClassLoader().getParent()).loadClass(mainClass)
-                            .getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])});
-                    return null;
-                });
-                return true;
+            if (mainClass == null)
+                throw new ClassNotFoundException("Main-Class not found in manifest");
+            ArrayList<String> al = new ArrayList<>(args);
+            al.add("--noupdate");
+            ClassLoader pre = Thread.currentThread().getContextClassLoader();
+            try {
+                Logging.stop();
+                ClassLoader now = new URLClassLoader(new URL[]{jar.toURI().toURL()}, ClassLoader.getSystemClassLoader().getParent());
+                Thread.currentThread().setContextClassLoader(now);
+                now.loadClass(mainClass).getMethod("main", String[].class).invoke(null, new Object[]{al.toArray(new String[0])});
+            } finally {
+                Logging.start(Launcher.LOG_DIRECTORY);
+                Thread.currentThread().setContextClassLoader(pre);
             }
         }
-        return false;
     }
 
     @Override
@@ -80,15 +83,18 @@ public class AppDataUpgrader extends IUpgrader {
                         String j = m.get("loc");
                         if (j != null) {
                             File jar = new File(j);
-                            if (jar.exists() && launchNewerVersion(args, jar))
+                            if (jar.exists()) {
+                                launchNewerVersion(args, jar);
                                 System.exit(0);
+                            }
                         }
                     }
                 }
             } catch (JsonParseException ex) {
                 f.delete();
-            } catch (IOException | PrivilegedActionException t) {
+            } catch (IOException | ReflectiveOperationException t) {
                 Logging.LOG.log(Level.SEVERE, "Unable to execute newer version application", t);
+                AppDataUpgraderPackGzTask.HMCL_VER_FILE.delete(); // delete version json, let HMCL re-download the newer version.
             }
     }
 
@@ -97,65 +103,66 @@ public class AppDataUpgrader extends IUpgrader {
         if (!(ver instanceof IntVersionNumber))
             return;
         IntVersionNumber version = (IntVersionNumber) ver;
-        checker.requestDownloadLink().then(Task.of(Schedulers.javafx(), variables -> {
+        checker.requestDownloadLink().then(Task.of(variables -> {
             Map<String, String> map = variables.get(UpdateChecker.REQUEST_DOWNLOAD_LINK_ID);
 
-            if (MessageBox.confirm(Main.i18n("update.newest_version") + version.toString() + "\n"
-                            + Main.i18n("update.should_open_link"),
-                    MessageBox.YES_NO_OPTION) == MessageBox.YES_OPTION)
-                if (map != null && map.containsKey("jar") && !StringUtils.isBlank(map.get("jar")))
-                    try {
-                        String hash = null;
-                        if (map.containsKey("jarsha1"))
-                            hash = map.get("jarsha1");
-                        Controllers.dialog(Main.i18n("message.downloading"));
-                        if (new AppDataUpgraderJarTask(NetworkUtils.toURL(map.get("jar")), version.toString(), hash).test()) {
-                            new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderJarTask.getSelf(version.toString()).getAbsolutePath())
-                                    .directory(new File("").getAbsoluteFile()).start();
-                            System.exit(0);
-                        }
-                        Controllers.closeDialog();
-                    } catch (IOException ex) {
-                        Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
-                    }
-                else if (map != null && map.containsKey("pack") && !StringUtils.isBlank(map.get("pack")))
-                    try {
-                        String hash = null;
-                        if (map.containsKey("packsha1"))
-                            hash = map.get("packsha1");
-                        Controllers.dialog(Main.i18n("message.downloading"));
-                        if (new AppDataUpgraderPackGzTask(NetworkUtils.toURL(map.get("pack")), version.toString(), hash).test()) {
-                            new ProcessBuilder(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath(), "-jar", AppDataUpgraderPackGzTask.getSelf(version.toString()).getAbsolutePath())
-                                    .directory(new File("").getAbsoluteFile()).start();
-                            System.exit(0);
-                        }
-                        Controllers.closeDialog();
-                    } catch (IOException ex) {
-                        Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
-                    }
-                else {
-                    String url = Main.PUBLISH;
-                    if (map != null)
-                        if (map.containsKey(OperatingSystem.CURRENT_OS.getCheckedName()))
-                            url = map.get(OperatingSystem.CURRENT_OS.getCheckedName());
-                        else if (map.containsKey(OperatingSystem.UNKNOWN.getCheckedName()))
-                            url = map.get(OperatingSystem.UNKNOWN.getCheckedName());
-                    if (url == null)
-                        url = Main.PUBLISH;
-                    try {
-                        java.awt.Desktop.getDesktop().browse(new URI(url));
-                    } catch (URISyntaxException | IOException e) {
-                        Logging.LOG.log(Level.SEVERE, "Failed to browse uri: " + url, e);
-                        OperatingSystem.setClipboard(url);
-                        MessageBox.show(Main.i18n("update.no_browser"));
+            if (map != null && map.containsKey("jar") && !StringUtils.isBlank(map.get("jar")))
+                try {
+                    String hash = null;
+                    if (map.containsKey("jarsha1"))
+                        hash = map.get("jarsha1");
+                    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, 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);
                     }
+                    JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
+                } catch (IOException ex) {
+                    Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                 }
+            else if (map != null && map.containsKey("pack") && !StringUtils.isBlank(map.get("pack")))
+                try {
+                    String hash = null;
+                    if (map.containsKey("packsha1"))
+                        hash = map.get("packsha1");
+                    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, 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(region.get()));
+                } catch (IOException ex) {
+                    Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
+                }
+            else {
+                String url = Launcher.PUBLISH;
+                if (map != null)
+                    if (map.containsKey(OperatingSystem.CURRENT_OS.getCheckedName()))
+                        url = map.get(OperatingSystem.CURRENT_OS.getCheckedName());
+                    else if (map.containsKey(OperatingSystem.UNKNOWN.getCheckedName()))
+                        url = map.get(OperatingSystem.UNKNOWN.getCheckedName());
+                try {
+                    java.awt.Desktop.getDesktop().browse(new URI(url));
+                } catch (URISyntaxException | IOException e) {
+                    Logging.LOG.log(Level.SEVERE, "Failed to browse uri: " + url, e);
+                    OperatingSystem.setClipboard(url);
+                    MessageBox.show(i18n("update.no_browser"));
+                }
+            }
         })).start();
     }
 
     public static class AppDataUpgraderPackGzTask extends Task {
 
-        public static final File BASE_FOLDER = Main.HMCL_DIRECTORY;
+        public static final File BASE_FOLDER = Launcher.HMCL_DIRECTORY;
         public static final File HMCL_VER_FILE = new File(BASE_FOLDER, "hmclver.json");
 
         public static File getSelf(String ver) {
@@ -177,7 +184,7 @@ public class AppDataUpgrader extends IUpgrader {
 
         @Override
         public Collection<Task> getDependents() {
-            return Arrays.asList(new FileDownloadTask(downloadLink, tempFile, Proxy.NO_PROXY, hash));
+            return Collections.singleton(new FileDownloadTask(downloadLink, tempFile, Proxy.NO_PROXY, new IntegrityCheck("SHA-1", hash)));
         }
 
         @Override
@@ -187,7 +194,7 @@ public class AppDataUpgrader extends IUpgrader {
             if (!FileUtils.makeDirectory(f.getParentFile()))
                 throw new IOException("Failed to make directories: " + f.getParent());
 
-            for (int i = 0; f.exists(); i++)
+            for (int i = 0; f.exists() && !f.delete(); i++)
                 f = new File(BASE_FOLDER, "HMCL-" + newestVersion + (i > 0 ? "-" + i : "") + ".jar");
             if (!f.createNewFile())
                 throw new IOException("Failed to create new file: " + f);
@@ -205,7 +212,7 @@ public class AppDataUpgrader extends IUpgrader {
 
     public static class AppDataUpgraderJarTask extends Task {
 
-        public static final File BASE_FOLDER = Main.getWorkingDirectory("hmcl");
+        public static final File BASE_FOLDER = OperatingSystem.getWorkingDirectory("hmcl");
         public static final File HMCL_VER_FILE = new File(BASE_FOLDER, "hmclver.json");
 
         public static File getSelf(String ver) {
@@ -227,7 +234,7 @@ public class AppDataUpgrader extends IUpgrader {
 
         @Override
         public Collection<Task> getDependents() {
-            return Collections.singleton(new FileDownloadTask(downloadLink, tempFile, Proxy.NO_PROXY, hash));
+            return Collections.singleton(new FileDownloadTask(downloadLink, tempFile, Proxy.NO_PROXY, new IntegrityCheck("SHA-1", hash)));
         }
 
         @Override

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

@@ -17,19 +17,25 @@
  */
 package org.jackhuang.hmcl.upgrade;
 
-import org.jackhuang.hmcl.Main;
+import com.jfoenix.concurrency.JFXUtilities;
+import javafx.scene.layout.Region;
+
 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;
 import org.jackhuang.hmcl.util.VersionNumber;
-
 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;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
 /**
  *
  * @author huangyuhui
@@ -51,8 +57,12 @@ public class NewFileUpgrader extends IUpgrader {
         URL url = requestDownloadLink();
         if (url == null) return;
         File newf = new File(url.getFile());
-        Controllers.dialog(Main.i18n("message.downloading"));
-        if (new FileDownloadTask(url, newf).test()) {
+        Controllers.dialog(i18n("message.downloading"));
+        Task task = new FileDownloadTask(url, newf);
+        TaskExecutor executor = task.executor();
+        AtomicReference<Region> region = new AtomicReference<>();
+        JFXUtilities.runInFX(() -> region.set(Controllers.taskDialog(executor, i18n("message.downloading"), "", null)));
+        if (executor.test()) {
             try {
                 new ProcessBuilder(newf.getCanonicalPath(), "--removeOldLauncher", getRealPath())
                         .directory(new File("").getAbsoluteFile())
@@ -62,7 +72,7 @@ public class NewFileUpgrader extends IUpgrader {
             }
             System.exit(0);
         }
-        Controllers.closeDialog();
+        JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
     }
 
     private static String getRealPath() {
@@ -70,7 +80,7 @@ public class NewFileUpgrader extends IUpgrader {
         File file = new File(realPath);
         realPath = file.getAbsolutePath();
         try {
-            realPath = java.net.URLDecoder.decode(realPath, Charsets.DEFAULT_CHARSET.name());
+            realPath = java.net.URLDecoder.decode(realPath, UTF_8.name());
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -18,18 +18,23 @@
 package org.jackhuang.hmcl.upgrade;
 
 import com.google.gson.JsonSyntaxException;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.OutOfDateEvent;
+import org.jackhuang.hmcl.task.GetTask;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskResult;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.util.Constants;
-import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.NetworkUtils;
 import org.jackhuang.hmcl.util.VersionNumber;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.logging.Level;
 
@@ -65,20 +70,29 @@ public final class UpdateChecker {
      */
     public TaskResult<VersionNumber> process(final boolean showMessage) {
         return new TaskResult<VersionNumber>() {
+            GetTask http = new GetTask(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update.php?version=" + Launcher.VERSION));
+
+            @Override
+            public Collection<? extends Task> getDependents() {
+                return value == null ? Collections.singleton(http) : Collections.emptyList();
+            }
+
             @Override
             public void execute() throws Exception {
-                if (Main.VERSION.contains("@"))
+                if (isDevelopmentVersion(Launcher.VERSION)) {
+                    LOG.info("Current version is a development version, skip updating");
                     return;
+                }
 
                 if (value == null) {
-                    versionString = NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/hmcl/update.php?version=" + Main.VERSION));
+                    versionString = http.getResult();
                     value = VersionNumber.asVersion(versionString);
                 }
 
                 if (value == null) {
-                    Logging.LOG.warning("Unable to check update...");
+                    LOG.warning("Unable to check update...");
                     if (showMessage)
-                        MessageBox.show(Main.i18n("update.failed"));
+                        MessageBox.show(i18n("update.failed"));
                 } else if (base.compareTo(value) < 0)
                     outOfDate = true;
                 if (outOfDate)
@@ -92,6 +106,11 @@ public final class UpdateChecker {
         };
     }
 
+    private boolean isDevelopmentVersion(String version) {
+        return version.contains("@") || // eg. @HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING@
+                version.contains("SNAPSHOT"); // eg. 3.1.SNAPSHOT
+    }
+
     /**
      * Get the <b>cached</b> newest version number, use "process" method to
      * download!
@@ -113,12 +132,13 @@ public final class UpdateChecker {
         return new TaskResult<Map<String, String>>() {
             @Override
             public void execute() {
-                if (download_link == null)
+                if (download_link == null) {
                     try {
-                        download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL("http://huangyuhui.duapp.com/update_link.php?type=hmcl")), Map.class);
+                        download_link = Constants.GSON.<Map<String, String>>fromJson(NetworkUtils.doGet(NetworkUtils.toURL(Launcher.UPDATE_SERVER + "/hmcl/update_link.php")), Map.class);
                     } catch (JsonSyntaxException | IOException e) {
-                        Logging.LOG.log(Level.SEVERE, "Failed to get update link.", e);
+                        LOG.log(Level.SEVERE, "Failed to get update link.", e);
                     }
+                }
                 setResult(download_link);
             }
 
@@ -134,7 +154,7 @@ public final class UpdateChecker {
     public void checkOutdate() {
         if (outOfDate)
             if (EventBus.EVENT_BUS.fireEvent(new OutOfDateEvent(this, getNewVersion())) != Event.Result.DENY) {
-                Main.UPGRADER.download(this, getNewVersion());
+                Launcher.UPGRADER.download(this, getNewVersion());
             }
     }
 }

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

@@ -18,15 +18,20 @@
 package org.jackhuang.hmcl.util;
 
 import javafx.application.Platform;
-import org.jackhuang.hmcl.Main;
+import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.ui.CrashWindow;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
+import static java.util.Collections.newSetFromMap;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 
 /**
@@ -34,17 +39,21 @@ import java.util.logging.Level;
  */
 public class CrashReporter implements Thread.UncaughtExceptionHandler {
 
-    private static final HashMap<String, String> SOURCE = new HashMap<String, String>() {
+    private static final Map<String, String> SOURCE = new HashMap<String, String>() {
         {
-            put("javafx.fxml.LoadException", Main.i18n("crash.NoClassDefFound"));
-            put("UnsatisfiedLinkError", Main.i18n("crash.user_fault"));
-            put("java.lang.NoClassDefFoundError", Main.i18n("crash.NoClassDefFound"));
-            put("java.lang.VerifyError", Main.i18n("crash.NoClassDefFound"));
-            put("java.lang.NoSuchMethodError", Main.i18n("crash.NoClassDefFound"));
-            put("java.lang.IncompatibleClassChangeError", Main.i18n("crash.NoClassDefFound"));
-            put("java.lang.ClassFormatError", Main.i18n("crash.NoClassDefFound"));
+            put("javafx.fxml.LoadException", i18n("crash.NoClassDefFound"));
+            put("Location is not set", i18n("crash.NoClassDefFound"));
+            put("UnsatisfiedLinkError", i18n("crash.user_fault"));
+            put("java.lang.NoClassDefFoundError", i18n("crash.NoClassDefFound"));
+            put("java.lang.VerifyError", i18n("crash.NoClassDefFound"));
+            put("java.lang.NoSuchMethodError", i18n("crash.NoClassDefFound"));
+            put("java.lang.NoSuchFieldError", i18n("crash.NoClassDefFound"));
+            put("netscape.javascript.JSException", i18n("crash.NoClassDefFound"));
+            put("java.lang.IncompatibleClassChangeError", i18n("crash.NoClassDefFound"));
+            put("java.lang.ClassFormatError", i18n("crash.NoClassDefFound"));
             put("java.lang.OutOfMemoryError", "FUCKING MEMORY LIMIT!");
-            put("Trampoline", Main.i18n("launcher.update_java"));
+            put("Trampoline", i18n("launcher.update_java"));
+            put("com.sun.javafx.css.StyleManager.findMatchingStyles", i18n("launcher.update_java"));
             put("NoSuchAlgorithmException", "Has your operating system been installed completely or is a ghost system?");
         }
     };
@@ -55,11 +64,11 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             if (s.contains(entry.getKey())) {
                 if (StringUtils.isNotBlank(entry.getValue())) {
                     String info = entry.getValue();
-                    Logging.LOG.severe(info);
+                    LOG.severe(info);
                     try {
                         MessageBox.show(info);
                     } catch (Throwable t) {
-                        Logging.LOG.log(Level.SEVERE, "Unable to show message", t);
+                        LOG.log(Level.SEVERE, "Unable to show message", t);
                     }
                 }
                 return false;
@@ -67,56 +76,56 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
         return true;
     }
 
+    private static Set<String> CAUGHT_EXCEPTIONS = newSetFromMap(new ConcurrentHashMap<>());
+
     @Override
     public void uncaughtException(Thread t, Throwable e) {
-        String stackTrace = StringUtils.getStackTrace(e);
-        if (!stackTrace.contains("org.jackhuang"))
-            return;
-
-        if (THROWABLE_SET.contains(stackTrace))
-            return;
-        THROWABLE_SET.add(stackTrace);
+        LOG.log(Level.SEVERE, "Uncaught exception in thread " + t.getName(), e);
 
         try {
-            StringBuilder builder = new StringBuilder();
-            builder.append("---- Hello Minecraft! Crash Report ----\n");
-            builder.append("  Version: " + Main.VERSION + "\n");
-            builder.append("  Time: ").append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())).append("\n");
-            builder.append("  Thread: ").append(t.toString()).append("\n");
-            builder.append("\n  Content: \n    ");
-            builder.append(stackTrace).append("\n\n");
-            builder.append("-- System Details --\n");
-            builder.append("  Operating System: ").append(System.getProperty("os.name")).append(' ').append(OperatingSystem.SYSTEM_VERSION).append("\n");
-            builder.append("  Java Version: ").append(System.getProperty("java.version")).append(", ").append(System.getProperty("java.vendor")).append("\n");
-            builder.append("  Java VM Version: ").append(System.getProperty("java.vm.name")).append(" (").append(System.getProperty("java.vm.info")).append("), ").append(System.getProperty("java.vm.vendor")).append("\n");
-            String text = builder.toString();
+            String stackTrace = StringUtils.getStackTrace(e);
+            if (!stackTrace.contains("org.jackhuang"))
+                return;
 
-            Logging.LOG.log(Level.SEVERE, text);
+            if (CAUGHT_EXCEPTIONS.contains(stackTrace))
+                return;
+            CAUGHT_EXCEPTIONS.add(stackTrace);
 
-            if (checkThrowable(e) && !text.contains("OpenJDK")) {
+            String text = "---- Hello Minecraft! Crash Report ----\n" +
+                    "  Version: " + Launcher.VERSION + "\n" +
+                    "  Time: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n" +
+                    "  Thread: " + t.toString() + "\n" +
+                    "\n  Content: \n    " +
+                    stackTrace + "\n\n" +
+                    "-- System Details --\n" +
+                    "  Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION + "\n" +
+                    "  Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor") + "\n" +
+                    "  Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor") + "\n";
+
+            LOG.log(Level.SEVERE, text);
+
+            if (checkThrowable(e)) {
                 Platform.runLater(() -> new CrashWindow(text).show());
-                if (!Main.UPDATE_CHECKER.isOutOfDate())
+                if (!Launcher.UPDATE_CHECKER.isOutOfDate())
                     reportToServer(text);
             }
-        } catch (Throwable ex) {
-            Logging.LOG.log(Level.SEVERE, "Unable to caught exception", ex);
-            Logging.LOG.log(Level.SEVERE, "There is the original exception", e);
+        } catch (Throwable handlingException) {
+            LOG.log(Level.SEVERE, "Unable to handle uncaught exception", handlingException);
         }
     }
 
-    private static final HashSet<String> THROWABLE_SET = new HashSet<>();
-
     private void reportToServer(final String text) {
         Thread t = new Thread(() -> {
             HashMap<String, String> map = new HashMap<>();
             map.put("crash_report", text);
-            map.put("version", Main.VERSION);
+            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://hmcl.huangyuhui.net/hmcl/crash.php"), map);
                 if (StringUtils.isNotBlank(response))
-                    Logging.LOG.log(Level.SEVERE, "Crash server response: " + response);
+                    LOG.log(Level.SEVERE, "Crash server response: " + response);
             } catch (IOException ex) {
-                Logging.LOG.log(Level.SEVERE, "Unable to post HMCL server.", ex);
+                LOG.log(Level.SEVERE, "Unable to post HMCL server.", ex);
             }
         });
         t.setDaemon(true);

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java

@@ -0,0 +1,59 @@
+/*
+ * 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.util.i18n;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+
+import org.jackhuang.hmcl.setting.Settings;
+
+public final class I18n {
+
+    private I18n() {}
+
+    private static ResourceBundle RESOURCE_BUNDLE = null;
+
+    static {
+        try {
+            RESOURCE_BUNDLE = Settings.INSTANCE.getLocale().getResourceBundle();
+        } catch (Throwable e) {
+            LOG.log(Level.SEVERE, "Settings cannot be initialized", e);
+        }
+    }
+
+    public static ResourceBundle getResourceBundle() {
+        return RESOURCE_BUNDLE == null ? Locales.DEFAULT.getResourceBundle() : RESOURCE_BUNDLE;
+    }
+
+    public static String i18n(String key, Object... formatArgs) {
+        return String.format(i18n(key), formatArgs);
+    }
+
+    public static String i18n(String key) {
+        try {
+            return getResourceBundle().getString(key);
+        } catch (MissingResourceException e) {
+            LOG.log(Level.SEVERE, "Cannot find key " + key + " in resource bundle", e);
+            return key;
+        }
+    }
+
+}

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/Locales.java

@@ -1,7 +1,7 @@
 /*
  * 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
@@ -15,12 +15,10 @@
  * 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.setting;
+package org.jackhuang.hmcl.util.i18n;
 
-import org.jackhuang.hmcl.ui.construct.UTF8Control;
 import org.jackhuang.hmcl.util.Lang;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
@@ -54,7 +52,7 @@ public final class Locales {
      */
     public static final SupportedLocale RU = new SupportedLocale(new Locale("ru"));
 
-    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN);
+    public static final List<SupportedLocale> LOCALES = Lang.immutableListOf(DEFAULT, EN, ZH_CN, ZH);
 
     public static SupportedLocale getLocale(int index) {
         return Lang.get(LOCALES, index).orElse(DEFAULT);

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/UTF8Control.java

@@ -1,7 +1,7 @@
 /*
  * 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
@@ -15,7 +15,9 @@
  * 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;
+package org.jackhuang.hmcl.util.i18n;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,14 +28,14 @@ import java.util.Locale;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 
-public final class UTF8Control extends ResourceBundle.Control {
+final class UTF8Control extends ResourceBundle.Control {
+
     public static final UTF8Control INSTANCE = new UTF8Control();
 
     private UTF8Control() {}
 
     @Override
-    public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload)
-    throws IOException {
+    public ResourceBundle newBundle(String baseName, Locale locale, String format, ClassLoader loader, boolean reload) throws IOException {
         // The below is a copy of the default implementation.
         String bundleName = toBundleName(baseName, locale);
         String resourceName = toResourceName(bundleName, "properties");
@@ -54,7 +56,7 @@ public final class UTF8Control extends ResourceBundle.Control {
         if (stream != null) {
             try {
                 // Only this line is changed to make it to read properties files as UTF-8.
-                bundle = new PropertyResourceBundle(new InputStreamReader(stream, "UTF-8"));
+                bundle = new PropertyResourceBundle(new InputStreamReader(stream, UTF_8));
             } finally {
                 stream.close();
             }

HMCL/src/main/resources/assets/css/root.css

@@ -911,6 +911,22 @@
     -fx-stroke-width: 5.0;
 }
 
+.small-spinner {
+    -jfx-radius: 10;
+}
+
+.small-spinner > .arc {
+    -fx-stroke-width: 3.0;
+}
+
+.small-spinner-pane .jfx-spinner {
+    -jfx-radius: 10;
+}
+
+.small-spinner-pane .jfx-spinner > .arc {
+    -fx-stroke-width: 3.0;
+}
+
 .second-spinner {
     -jfx-radius: 30;
 }

HMCL/src/main/resources/assets/fxml/account-add.fxml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import com.jfoenix.controls.*?>
+<?import com.jfoenix.validation.RequiredFieldValidator?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import org.jackhuang.hmcl.ui.FXUtils?>
+<?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>
+<fx:root xmlns:fx="http://javafx.com/fxml"
+         xmlns="http://javafx.com/javafx"
+         type="StackPane">
+    <JFXDialogLayout fx:id="layout">
+        <heading>
+            <Label text="%account.create"/>
+        </heading>
+        <body>
+            <GridPane vgap="15" hgap="15" style="-fx-padding: 15 0 0 0;">
+                <columnConstraints>
+                    <ColumnConstraints maxWidth="70" minWidth="70"/>
+                    <ColumnConstraints/>
+                    <ColumnConstraints minWidth="140"/>
+                </columnConstraints>
+
+                <Label text="%account.methods" GridPane.halignment="RIGHT" GridPane.columnIndex="0"
+                       GridPane.rowIndex="0"/>
+
+                <JFXComboBox fx:id="cboType" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.columnSpan="2"/>
+
+                <Label fx:id="lblInjectorServer" text="%account.injector.server" GridPane.halignment="RIGHT"
+                       GridPane.columnIndex="0" GridPane.rowIndex="1"/>
+
+                <JFXComboBox fx:id="cboServers" maxHeight="25" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+
+                <Hyperlink fx:id="linkManageInjectorServers" text="%account.injector.manage"
+                           onMouseClicked="#onManageInjecterServers" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
+
+                <Label text="%account.username" GridPane.rowIndex="2" GridPane.columnIndex="0"/>
+
+                <JFXTextField fx:id="txtUsername" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.columnSpan="2"
+                              FXUtils.validateWhileTextChanged="true">
+                    <validators>
+                        <RequiredFieldValidator message="%input.not_empty">
+                        </RequiredFieldValidator>
+                    </validators>
+                </JFXTextField>
+
+                <Label fx:id="lblPassword" text="%account.password" GridPane.rowIndex="3" GridPane.columnIndex="0"/>
+
+                <JFXPasswordField fx:id="txtPassword" GridPane.columnIndex="1" GridPane.rowIndex="3"
+                                  GridPane.columnSpan="2" FXUtils.validateWhileTextChanged="true">
+                    <validators>
+                        <RequiredFieldValidator message="%input.not_empty">
+                        </RequiredFieldValidator>
+                    </validators>
+                </JFXPasswordField>
+            </GridPane>
+        </body>
+        <actions>
+            <Label fx:id="lblCreationWarning"/>
+            <SpinnerPane fx:id="acceptPane" styleClass="small-spinner-pane">
+                <JFXButton fx:id="btnAccept" onMouseClicked="#onCreationAccept" text="%button.ok" styleClass="dialog-accept"/>
+            </SpinnerPane>
+            <JFXButton onMouseClicked="#onCreationCancel" text="%button.cancel" styleClass="dialog-cancel"/>
+        </actions>
+    </JFXDialogLayout>
+</fx:root>

HMCL/src/main/resources/assets/fxml/account-item.fxml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXProgressBar?>
-<?import com.jfoenix.controls.JFXRadioButton?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.*?>
-<?import org.jackhuang.hmcl.ui.FXUtils?>
-<fx:root xmlns="http://javafx.com/javafx"
-         xmlns:fx="http://javafx.com/fxml"
-         type="StackPane" FXUtils.limitWidth="160" FXUtils.limitHeight="156">
-    <VBox fx:id="content">
-        <StackPane fx:id="header" VBox.vgrow="ALWAYS" style="-fx-background-radius: 2 2 0 0; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;">
-            <HBox StackPane.alignment="TOP_CENTER" alignment="CENTER_RIGHT">
-                <JFXProgressBar fx:id="pgsSkin" visible="false" />
-            </HBox>
-            <VBox style="-fx-padding: 8 8 0 8;">
-                <Label fx:id="lblUser" style="-fx-font-size: 15;" wrapText="true" textAlignment="JUSTIFY" />
-                <Label fx:id="lblEmail" style="-fx-font-size: 11; -fx-text-fill: gray;" />
-                <Label fx:id="lblServer" style="-fx-font-size: 11; -fx-text-fill: gray;" />
-                <Label fx:id="lblType" style="-fx-font-size: 11; -fx-text-fill: gray;" />
-            </VBox>
-        </StackPane>
-        <StackPane fx:id="body" style="-fx-background-radius: 0 0 2 2; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;" minHeight="40">
-            <BorderPane>
-                <left>
-                    <HBox fx:id="buttonPane" spacing="8">
-                        <JFXButton fx:id="btnRefresh" styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30" prefWidth="30" prefHeight="30" />
-                        <JFXButton fx:id="btnDelete" styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30" prefWidth="30" prefHeight="30" />
-                    </HBox>
-                </left>
-                <right>
-                    <HBox alignment="CENTER_RIGHT">
-                        <Label fx:id="lblCurrentAccount" text="%account.current" />
-                        <JFXRadioButton fx:id="chkSelected" BorderPane.alignment="CENTER_RIGHT" />
-                    </HBox>
-                </right>
-            </BorderPane>
-
-        </StackPane>
-    </VBox>
-    <StackPane fx:id="icon" StackPane.alignment="TOP_RIGHT" pickOnBounds="false">
-        <ImageView fx:id="portraitView" StackPane.alignment="CENTER_RIGHT" smooth="false">
-            <StackPane.margin>
-                <Insets right="12" />
-            </StackPane.margin>
-        </ImageView>
-    </StackPane>
-</fx:root>

HMCL/src/main/resources/assets/fxml/account.fxml

@@ -1,75 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.*?>
-<?import com.jfoenix.validation.RequiredFieldValidator?>
+<?import com.jfoenix.controls.JFXButton?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import org.jackhuang.hmcl.ui.FXUtils?>
-<fx:root xmlns="http://javafx.com/javafx"
-         xmlns:fx="http://javafx.com/fxml"
+<?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">
-    <ScrollPane fitToHeight="true" fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER">
-        <JFXMasonryPane fx:id="masonryPane" HSpacing="3" VSpacing="3" cellWidth="182" cellHeight="160">
-        </JFXMasonryPane>
-    </ScrollPane>
-    <AnchorPane pickOnBounds="false">
-        <JFXButton onMouseClicked="#addNewAccount" AnchorPane.bottomAnchor="16" AnchorPane.rightAnchor="16" buttonType="RAISED" prefWidth="40" prefHeight="40" styleClass="jfx-button-raised-round">
-            <graphic>
-                <fx:include source="/assets/svg/plus.fxml" />
-            </graphic>
-        </JFXButton>
-    </AnchorPane>
+    <VBox fx:id="rootPane">
 
-    <JFXDialog fx:id="dialog">
-        <StackPane>
-            <JFXDialogLayout>
-                <heading>
-                    <Label text="%account.create" />
-                </heading>
-                <body>
-                    <GridPane vgap="15" hgap="15" style="-fx-padding: 15 0 0 0;">
-                        <columnConstraints>
-                            <ColumnConstraints maxWidth="70" minWidth="70"/>
-                            <ColumnConstraints />
-                            <ColumnConstraints minWidth="140" />
-                        </columnConstraints>
+        <ComponentList fx:id="componentList" depth="1">
 
-                        <Label text="%account.methods" GridPane.halignment="RIGHT" GridPane.columnIndex="0" GridPane.rowIndex="0" />
+            <BorderPane> <!-- Name -->
+                <left>
+                    <VBox>
+                        <Label text="%account.methods" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </left>
+                <right>
+                    <VBox>
+                        <Label fx:id="lblType" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </right>
+            </BorderPane>
 
-                        <JFXComboBox fx:id="cboType" GridPane.columnIndex="1" GridPane.rowIndex="0" GridPane.columnSpan="2" />
+            <BorderPane> <!-- Name -->
+                <left>
+                    <VBox>
+                        <Label text="%account.character" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </left>
+                <right>
+                    <VBox>
+                        <Label fx:id="lblCharacter" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </right>
+            </BorderPane>
 
-                        <Label fx:id="lblAddInjectorServer" text="%account.injector.server" GridPane.halignment="RIGHT" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+            <BorderPane fx:id="paneEmail"> <!-- Name -->
+                <left>
+                    <VBox>
+                        <Label text="%account.email" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </left>
+                <right>
+                    <VBox>
+                        <Label fx:id="lblEmail" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </right>
+            </BorderPane>
 
-                        <JFXComboBox fx:id="cboServers" maxHeight="25" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+            <BorderPane fx:id="paneServer"> <!-- Name -->
+                <left>
+                    <VBox>
+                        <Label text="%account.injector.server" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </left>
+                <right>
+                    <VBox>
+                        <Label fx:id="lblServer" BorderPane.alignment="CENTER_LEFT"/>
+                    </VBox>
+                </right>
+            </BorderPane>
+        </ComponentList>
 
-                        <Hyperlink fx:id="linkAddInjectorServer" text="%account.injector.add" onMouseClicked="#onAddInjecterServer" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-
-                        <Label text="%account.username" GridPane.rowIndex="2" GridPane.columnIndex="0" />
-
-                        <JFXTextField fx:id="txtUsername" GridPane.columnIndex="1" GridPane.rowIndex="2" GridPane.columnSpan="2" FXUtils.validateWhileTextChanged="true">
-                            <validators>
-                                <RequiredFieldValidator message="%input.not_empty">
-                                </RequiredFieldValidator>
-                            </validators>
-                        </JFXTextField>
-
-                        <Label fx:id="lblPassword" text="%account.password" GridPane.rowIndex="3" GridPane.columnIndex="0" />
-
-                        <JFXPasswordField fx:id="txtPassword" GridPane.columnIndex="1" GridPane.rowIndex="3" GridPane.columnSpan="2" FXUtils.validateWhileTextChanged="true">
-                            <validators>
-                                <RequiredFieldValidator message="%input.not_empty">
-                                </RequiredFieldValidator>
-                            </validators>
-                        </JFXPasswordField>
-                    </GridPane>
-                </body>
-                <actions>
-                    <Label fx:id="lblCreationWarning" />
-                    <JFXButton onMouseClicked="#onCreationAccept" text="%button.ok" styleClass="dialog-accept" />
-                    <JFXButton onMouseClicked="#onCreationCancel" text="%button.cancel" styleClass="dialog-cancel" />
-                </actions>
-            </JFXDialogLayout>
-            <JFXProgressBar fx:id="progressBar" visible="false" StackPane.alignment="TOP_CENTER" />
-        </StackPane>
-    </JFXDialog>
+    </VBox>
+    <BorderPane pickOnBounds="false" style="-fx-padding: 4;">
+        <left>
+            <JFXButton BorderPane.alignment="BOTTOM_LEFT" fx:id="btnDelete" onMouseClicked="#onDelete"
+                       styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30"
+                       prefWidth="30" prefHeight="30"/>
+        </left>
+        <right>
+            <JFXButton BorderPane.alignment="BOTTOM_RIGHT" fx:id="btnRefresh" onMouseClicked="#onRefresh"
+                       styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30"
+                       prefWidth="30" prefHeight="30"/>
+        </right>
+    </BorderPane>
+    <JFXProgressBar fx:id="progressBar" StackPane.alignment="TOP_CENTER" visible="false" />
 </fx:root>

HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml

@@ -5,10 +5,10 @@
 <?import javafx.scene.layout.*?>
 <?import org.jackhuang.hmcl.ui.construct.URLValidator?>
 <?import java.lang.String?>
+<?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>
 <fx:root xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          type="StackPane">
-    <JFXSpinner fx:id="spinner" style="-fx-radius:16" styleClass="materialDesign-purple, first-spinner" />
     <StackPane fx:id="contentPane">
         <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true">
             <VBox fx:id="listPane" spacing="10" style="-fx-padding: 20 20 70 20;">
@@ -32,7 +32,7 @@
                         <Label text="%account.injector.add" />
                     </heading>
                     <body>
-                        <JFXTextField fx:id="txtServerIp" promptText="%account.injector.server_ip" labelFloat="true">
+                        <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url">
                             <validators>
                                 <URLValidator message="%input.url">
                                     <protocols>
@@ -46,7 +46,9 @@
                     <actions>
                         <Label fx:id="lblCreationWarning" />
                         <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
-                        <JFXButton fx:id="btnAddNext" onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
+                        <SpinnerPane fx:id="nextPane" styleClass="small-spinner-pane">
+                            <JFXButton fx:id="btnAddNext" onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
+                        </SpinnerPane>
                     </actions>
                 </JFXDialogLayout>
 
@@ -60,10 +62,10 @@
                                 <ColumnConstraints maxWidth="100" />
                                 <ColumnConstraints />
                             </columnConstraints>
-                            <Label text="%account.injector.server_ip" GridPane.columnIndex="0" GridPane.rowIndex="0" />
+                            <Label text="%account.injector.server_url" GridPane.columnIndex="0" GridPane.rowIndex="0" />
                             <Label text="%account.injector.server_name" GridPane.columnIndex="0" GridPane.rowIndex="1" />
 
-                            <Label fx:id="lblServerIp" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                            <Label fx:id="lblServerUrl" GridPane.columnIndex="1" GridPane.rowIndex="0" />
                             <Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
 
                             <Label fx:id="lblServerWarning" text="%account.injector.http" style="-fx-text-fill: red;" GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
@@ -76,7 +78,6 @@
                     </actions>
                 </JFXDialogLayout>
             </StackPane>
-            <JFXProgressBar fx:id="progressBar" visible="false" StackPane.alignment="TOP_CENTER" />
         </StackPane>
     </JFXDialog>
 </fx:root>

HMCL/src/main/resources/assets/fxml/decorator.fxml

@@ -8,6 +8,8 @@
 <?import org.jackhuang.hmcl.ui.construct.AdvancedListBox?>
 <?import org.jackhuang.hmcl.ui.FXUtils?>
 <?import java.lang.String?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
 <fx:root xmlns="http://javafx.com/javafx"
          type="StackPane"
          xmlns:fx="http://javafx.com/fxml">
@@ -20,26 +22,14 @@
             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">
                             <BorderPane fx:id="leftRootPane">
                                 <center>
-                                    <BorderPane styleClass="gray-background">
-                                        <center>
-                                            <AdvancedListBox fx:id="leftPane"/>
-                                        </center>
-                                        <bottom>
-                                            <BorderPane fx:id="menuBottomBar">
-                                                <left>
-                                                    <HBox fx:id="updatePane" visible="false" style="-fx-background-color: red;" alignment="CENTER_LEFT">
-                                                        <Label text="%update.found" style="-fx-text-fill: white; -fx-font-size: 16px;" />
-                                                    </HBox>
-                                                </left>
-                                            </BorderPane>
-                                        </bottom>
-                                    </BorderPane>
+                                    <StackPane styleClass="gray-background">
+                                        <AdvancedListBox fx:id="leftPane"/>
+                                    </StackPane>
                                 </center>
                                 <right>
                                     <Rectangle height="${leftRootPane.height}" width="1" fill="gray"/>
@@ -56,6 +46,9 @@
                         </StackPane>
                     </center>
                 </BorderPane>
+                <ImageView fx:id="welcomeView">
+                    <Image url="/assets/img/welcome.png" />
+                </ImageView>
             </StackPane>
         </center>
         <top>

HMCL/src/main/resources/assets/fxml/main.fxml

@@ -1,38 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXListView?>
 <?import com.jfoenix.controls.JFXMasonryPane?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
+<?import com.jfoenix.controls.JFXSpinner?>
 <fx:root
         maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
         type="StackPane" pickOnBounds="false"
         xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
-    <ScrollPane fitToHeight="true" fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER">
-        <JFXMasonryPane fx:id="masonryPane" HSpacing="3" VSpacing="3" cellWidth="182" cellHeight="160">
-        </JFXMasonryPane>
-    </ScrollPane>
-    <VBox style="-fx-padding: 15;" spacing="15" pickOnBounds="false" alignment="BOTTOM_RIGHT">
-        <JFXButton prefWidth="40" prefHeight="40" buttonType="RAISED" fx:id="btnRefresh" styleClass="jfx-button-raised-round">
-            <graphic>
-                <fx:include source="/assets/svg/refresh.fxml" />
-            </graphic>
-        </JFXButton>
-        <JFXButton prefWidth="40" prefHeight="40" buttonType="RAISED" fx:id="btnAdd" styleClass="jfx-button-raised-round">
-            <graphic>
-                <fx:include source="/assets/svg/plus.fxml" />
-            </graphic>
-        </JFXButton>
-    </VBox>
-
-
-    <JFXListView fx:id="versionList" styleClass="option-list-view" onMouseClicked="#onVersionManagement"
-                 maxWidth="150.0" minWidth="150.0">
-        <Label text="%version.manage.rename"/>
-        <Label text="%version.manage.remove"/>
-        <Label text="%modpack.export"/>
-        <Label text="%folder.game"/>
-    </JFXListView>
+    <JFXSpinner fx:id="spinner" styleClass="first-spinner" />
+    <StackPane fx:id="contentPane">
+        <ScrollPane fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER">
+            <JFXMasonryPane fx:id="masonryPane" HSpacing="3" VSpacing="3" cellWidth="182" cellHeight="160">
+            </JFXMasonryPane>
+        </ScrollPane>
+        <VBox style="-fx-padding: 15;" spacing="15" pickOnBounds="false" alignment="BOTTOM_RIGHT">
+            <JFXButton prefWidth="40" prefHeight="40" buttonType="RAISED" fx:id="btnRefresh" styleClass="jfx-button-raised-round">
+                <graphic>
+                    <fx:include source="/assets/svg/refresh.fxml" />
+                </graphic>
+            </JFXButton>
+            <JFXButton prefWidth="40" prefHeight="40" buttonType="RAISED" fx:id="btnAdd" styleClass="jfx-button-raised-round">
+                <graphic>
+                    <fx:include source="/assets/svg/plus.fxml" />
+                </graphic>
+            </JFXButton>
+        </VBox>
+    </StackPane>
 </fx:root>

HMCL/src/main/resources/assets/fxml/profile.fxml

@@ -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>

HMCL/src/main/resources/assets/fxml/version-item.fxml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import com.jfoenix.controls.JFXButton?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.*?>
-<?import org.jackhuang.hmcl.ui.FXUtils?>
-<fx:root xmlns="http://javafx.com/javafx"
-         xmlns:fx="http://javafx.com/fxml"
-         type="StackPane" pickOnBounds="false" FXUtils.limitWidth="160" FXUtils.limitHeight="156">
-    <VBox fx:id="content" pickOnBounds="false">
-        <StackPane fx:id="header" VBox.vgrow="ALWAYS" pickOnBounds="false" style="-fx-background-radius: 2 2 0 0; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;">
-            <VBox style="-fx-padding: 8 8 0 8;">
-                <Label fx:id="lblVersionName" style="-fx-font-size: 15;" textAlignment="JUSTIFY" wrapText="true" />
-                <Label fx:id="lblGameVersion" style="-fx-font-size: 11;" textAlignment="JUSTIFY" wrapText="true" />
-                <Label fx:id="lblLibraries" style="-fx-font-size: 10; -fx-text-fill: gray;" textAlignment="JUSTIFY" wrapText="true" />
-            </VBox>
-        </StackPane>
-        <StackPane fx:id="body" style="-fx-background-radius: 0 0 2 2; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;" minHeight="40" pickOnBounds="false">
-            <BorderPane>
-                <left>
-                    <HBox spacing="8">
-                        <JFXButton fx:id="btnSettings" styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30" prefWidth="30" prefHeight="30" />
-                        <JFXButton fx:id="btnUpdate" styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30" prefWidth="30" prefHeight="30" />
-                    </HBox>
-                </left>
-                <right>
-                    <HBox spacing="8">
-                        <JFXButton fx:id="btnScript" styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minWidth="30" minHeight="30" prefWidth="30" prefHeight="30" />
-                        <JFXButton fx:id="btnLaunch" styleClass="toggle-icon4" maxWidth="30" maxHeight="30" minHeight="30" minWidth="30" prefWidth="30" prefHeight="30" />
-                    </HBox>
-                </right>
-            </BorderPane>
-
-        </StackPane>
-    </VBox>
-    <StackPane fx:id="icon" StackPane.alignment="TOP_RIGHT" pickOnBounds="false">
-        <ImageView fx:id="iconView" StackPane.alignment="CENTER_RIGHT">
-            <StackPane.margin>
-                <Insets right="12" />
-            </StackPane.margin>
-            <Image url="/assets/img/icon.png" />
-        </ImageView>
-    </StackPane>
-</fx:root>

HMCL/src/main/resources/assets/fxml/version-list-item.fxml

@@ -31,7 +31,7 @@
         </left>
         <right>
             <HBox alignment="CENTER" pickOnBounds="false">
-                <JFXButton fx:id="btnSettings" maxWidth="40" minWidth="40" prefWidth="40" styleClass="toggle-icon4" onMouseClicked="#onSettings">
+                <JFXButton fx:id="btnSettings" maxWidth="40" minWidth="40" prefWidth="40" styleClass="toggle-icon4">
                     <graphic>
                         <fx:include source="/assets/svg/gear.fxml" />
                     </graphic>

HMCL/src/main/resources/assets/fxml/version/version-settings.fxml

@@ -5,7 +5,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.*?>
 <?import org.jackhuang.hmcl.ui.construct.*?>
 <?import org.jackhuang.hmcl.ui.*?>
@@ -26,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 -->
@@ -105,8 +104,8 @@
                     </right>
                 </BorderPane>
             </ComponentList>
-            <HBox alignment="CENTER" style="-fx-padding: 10 0 10 0;">
-                <JFXButton text="%settings.advanced" onMouseClicked="#onShowAdvanced" buttonType="RAISED" styleClass="jfx-button-raised"/>
+            <HBox alignment="CENTER_LEFT" style="-fx-padding: 20 0 12 0;">
+                <Label text="%settings.advanced" style="-fx-text-fill: #616161;" />
             </HBox>
             <ComponentList fx:id="advancedSettingsPane" depth="1">
                 <JFXTextField labelFloat="true" promptText="%settings.advanced.jvm_args" styleClass="fit-width"

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -18,30 +18,34 @@
 about.copyright=Copyright
 about.copyright.statement=Copyright (c) 2018 huangyuhui.
 about.author=Author
-about.author.statement=huanghongxun (MCF: klkl6523)
+about.author.statement=huanghongxun ([email protected])
 about.thanks_to=Thanks to
-about.thanks_to.statement=bangbang93 (BMCLAPI, http://bmclapi.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.thanks_to.statement=bangbang93 (BMCLAPI, https://bmclapi2.bangbang93.com/)\ngamerteam (Default background image)\nAll contributors who participated in this project via issues, pull requests, etc.
+about.dependency=Dependencies
+# Due to space limitations, only first authors are listed
+about.dependency.statement=JFoenix (Shadi Shaheen, Apache 2.0)\nGson (Google, Apache 2.0)\nApache Commons Compress (ASF, Apache 2.0)\nXZ for Java (Lasse Collin, Public Domain)\nfx-gson (Joffrey Bion, MIT)
 about.claim=Statement
 about.claim.statement=Minecraft is copyrighted by Mojang AB. We are not responsible for any copyright infringement arising from the use of this software.
 about.open_source=Open Source
 about.open_source.statement=GPL v3 (https://github.com/huanghongxun/HMCL/)
 
 account=Accounts
+account.character=character
 account.choose=Choose a character
-account.current=Current
 account.create=Create a new account
 account.email=Email
-account.failed.connect_authentication_server=Cannot connect the authentication server. Check your network.
-account.failed.invalid_credentials=Incorrect password. Or forbidden to log in temporarily.
+account.failed.connect_authentication_server=Cannot connect to the authentication server. Check your network.
+account.failed.invalid_credentials=Incorrect password, or you are forbidden to login temporarily.
 account.failed.invalid_password=Invalid password
-account.failed.invalid_token=Please log out and re-input your password to log in.
-account.failed.no_charactor=No character in this account.
-account.injector.add=Add new authentication server
+account.failed.invalid_token=Please log out and re-input your password to login.
+account.failed.no_character=No character in this account.
+account.failed.no_selected_server=No authentication server is selected.
+account.failed.connect_injector_server=Cannot connect to the authentication server. Check your network and ensure the URL is correct.
+account.injector.add=Add authentication server
+account.injector.manage=Manage authentication servers
 account.injector.http=Warning: This server is using HTTP, which will cause your password be transmitted in clear text.
 account.injector.server=Auth Server
-account.injector.server_ip=Server URL
+account.injector.server_url=Server URL
 account.injector.server_name=Server Name
 account.methods=Login Type
 account.methods.authlib_injector=authlib-injector
@@ -56,74 +60,40 @@ archive.author=Authors
 archive.game_version=Game
 archive.version=Version
 
-assets.download=Download Assets
-assets.download_all=Download Assets Files
-assets.failed=Failed to get the list, try again.
-assets.failed_download=Failed to download assets, may cause no sounds and language files.
+assets.download=Download assets
+assets.download_all=Check the integrity of assets
 
-button.about=About
 button.cancel=Cancel
 button.clear=Clear
-button.close=Close
-button.copy=Copy
 button.delete=Delete
-button.download=Download
 button.edit=Edit
-button.explore=Explore
-button.info=Info
 button.install=Install
-button.more=More
 button.no=No
 button.ok=OK
-button.others=Others
-button.preview=Preview
 button.refresh=Refresh
-button.retry=Retry
 button.save=Save
-button.test=Test
 button.yes=Yes
 
-color.blue=Blue
-color.dark_blue=Dark Blue
-color.green=Green
-color.orange=Orange
-color.purple=Purple
-color.red=Red
 color.recent=Recommended
 color.custom=Custom Color
 
 crash.NoClassDefFound=Please check "HMCL" software is complete.
-crash.advice.ClassNotFoundException=Minecraft or mods are incomplete. Retry if there are some libraries that have not downloaded or update your game and mods! Or you can try Game Settings -> Manage (Version) -> Delete library files to solve the problem.
-crash.advice.ConcurrentModificationException=Maybe your Java is newer than 1.8.0_11, you could downgrade to Java 7.
-crash.advice.LWJGLException=Maybe your video driver does not work well, please update your video driver.
-crash.advice.NoSuchFieldError=Minecraft or mods are incomplete. Retry if there are some libraries that have not downloaded or update your game and mods!
-crash.advice.OpenGL=Maybe drivers caused problems.
-crash.advice.OutOfMemoryError=The maximum memory of JVM is too small, please modify it.
-crash.advice.SecurityException=Maybe you have modified minecraft.jar but have not removed the META-INF.
-crash.advice.UnsupportedClassVersionError=Maybe your java is too old, try to update the java.
-crash.advice.no=No advice.
-crash.advice.no_lwjgl=Maybe drivers caused problems.
-crash.advice.otherwise=Maybe mods caused problems.
-crash.error=Minecraft has crashed.
-crash.headless=If your OS is Linux, please use Oracle JDK instead of OpenJDK, or add "-Djava.awt.headless=false" JVM argument, or check if your Xserver works normally.
-crash.launcher=Launcher has crashed!
-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, https://bmclapi2.bangbang93.com/)
 download.failed=Failed to download
 download.failed.refresh=Unable to load version list. Click here to retry.
 download.mojang=Mojang
-download.not_200=Failed to download, the response code is %s.
-download.source=Download Source
-download.successfully=Downloaded successfully
 
 extension.bat=Windows Bat file
 extension.mod=Mod file
 extension.png=Image file
 extension.sh=Bash shell
 
+fatal.missing_javafx=JavaFX is missing.\nIf you are using Java 11 or later, please downgrade to Java 8 or 10.\nIf you are using OpenJDK, please ensure OpenJFX is included.
+fatal.missing_dst_root_ca_x3=The DST Root CA X3 certificate is missing on the current Java platform.\nYou can still use HMCL, but HMCL will be unable to connect to some sites (such as sites that use certificates issued by Let's Encrypt), which may cause HMCL not to function properly.\nPlease upgrade your Java to 8u101 or later to resolve the problem.
+
 folder.config=Configs
 folder.coremod=Core Mod
 folder.game=Game Dir
@@ -132,15 +102,16 @@ folder.resourcepacks=Resourcepacks
 folder.saves=Saves
 folder.screenshots=Screenshots
 
+general.prompt.empty=(None)
+
 input.email=The username must be an e-mail.
 input.number=Must be a number.
-input.not_empty=Input Requrired!
+input.not_empty=Required field
 input.url=Must be a valid URL.
 
 install=Install New Game
 install.failed=Failed to install
 install.installer.choose=Choose a %s version
-install.installer.failed=Unable to install %s.
 install.installer.forge=Forge
 install.installer.game=Game
 install.installer.install=
@@ -152,37 +123,29 @@ install.modpack=Install a modpack (CurseForge supported)
 install.new_game=Install a New Game
 install.new_game.already_exists=This version has already been existing.
 install.new_game.current_game_version=Current Game Version
-install.no_version=The version is not found.
-install.no_version_if_intall=The required version is not found, do you wish to install the version automatically?
-install.release_time=Release Time
 install.select=Select an operation
 install.success=Installed successfully
-install.time=Time
-install.type=Type
 
 lang=English
 lang.default=Belong to OS language.
 
 launch.advice.different_platform=Your OS is 64-Bit but your Java is 32-Bit. The 64-Bit Java is recommended.
-launch.advice.java9=You cannot launch Minecraft until game version is higher than 1.13 with Java 9 or newer Java version.
+launch.advice.java8_1_13=Minecraft 1.13 and later versions can only run on Java 8 or later.
+launch.advice.java9=You cannot launch Minecraft until game version is higher than 1.13 with Java 9 or later Java versions.
 launch.advice.newer_java=Java 8 is suggested, which can make game run more fluently. And many mods and Minecraft 1.12 and newer versions requires Java 8.
 launch.advice.not_enough_space=You have allocated too much memory, because the physical memory size is %dMB, your game probably crash. The launcher will try to launch it.
 launch.advice.too_large_memory_for_32bit=You have allocated too much memory, because of your 32-Bit Java Runtime Environment, your game probably crash. The maximum memory is 1024MB. The launcher will try to launch it.
-launch.circular_dependency_versions=Found circular dependency versions, please check if your client has been modified.
 launch.failed=Unable to launch
 launch.failed.cannot_create_jvm=Java virtual machine cannot be created. Java arguments may have problems. You can enable the no args mode in the settings.
 launch.failed.creating_process=Failed to create process, maybe your java path is wrong, please modify your java path.
 launch.failed.decompressing_natives=Unable to decompress native libraries.
-launch.failed.downloading_libraries=Did not finish downloading libraries, continue launching game?
 launch.failed.executable_permission=Unable to add permission to the launch script
 launch.failed.exited_abnormally=Game exited abnormally, please visit the log, or ask someone for help.
-launch.failed.prelaunch_command=Prelaunch command fail.
 launch.state.dependencies=Dependencies
 launch.state.done=Done
 launch.state.logging_in=Logging In
 launch.state.modpack=Preparing for modpack
 launch.state.waiting_launching=Waiting for game launching
-launch.unsupported_launcher_version=Sorry, the launcher cannot launch minecraft, but will retry launching it.
 launch.wrong_javadir=Incorrect Java directory, will reset to default Java directory.
 
 launcher=Launcher
@@ -194,62 +157,31 @@ launcher.common_directory.choose=Choose common directory.
 launcher.contact=Contact Us
 launcher.crash=Hello Minecraft! Launcher has crashed!
 launcher.crash_out_dated=Hello Minecraft! Launcher has crashed! Your launcher is outdated. Update it!
-launcher.exit_failed=Failed to shutdown.
-launcher.modpack=Documentations for modpacks.
-launcher.open_jdk=We have found that you started this application using OpenJDK, which will cause so many troubles drawing the UI. We suggest you using Oracle JDK instead.
-launcher.restart=Options will be in operations only if restart this app.
-launcher.tab.about=About
-launcher.tab.general=General
-launcher.tab.ui=UI
 launcher.update_java=Please upgrade your Java.
-launcher.update_launcher=Check for update
-launcher.versions_json_not_formatted=The version information of %s is malformed! Redownload it?
-launcher.versions_json_not_matched=The version %s is malformed! There are a json:%s in this version. Do you want to fix this problem?
-launcher.versions_json_not_matched_cannot_auto_completion=The version %s lost version information file, delete it?
 
-login.changed_client_token=The server response has changed the client token.
-login.choose_charactor=Please choose the character you want
 login.empty_username=You have not set a username!
 login.enter_password=Please enter your password.
-login.enter_username=Please enter your name.
-login.failed=Failed to login
-login.invalid_username=Invalid username
-login.invalid_uuid_and_username=Invalid UUID and username
-login.no_valid_character=No valid character, please visit skinme.cc and create your own character.
 
-logwindow.search=Search
 logwindow.show_lines=Show Lines
 logwindow.terminate_game=Terminate Game
 logwindow.title=Log
 
 main_page=Home
 
-message.cancelled=Cancelled
-message.cannot_open_explorer=Cannot open explorer:
 message.confirm=Confirm
 message.doing=Please wait
 message.downloading=Downloading...
 message.error=Error
 message.info=Info
-message.loading=Loading...
 message.success=Tasks succeeded
 message.unknown=Unknown
 
-minecraft.invalid=Invalid
-minecraft.invalid_jar=Invalid Jar
-minecraft.modified=(Modified!)
-minecraft.not_a_file=Not a file
-minecraft.not_found=Not found
-minecraft.not_readable=Not readable
-minecraft.wrong_path=Wrong Minecraft path, the launcher could not find the path.
 
 modpack=Mod pack
-modpack.choose=Choose a modpack zip file which you want to import. If you want to update the modpack, please enter the version you want to update.
+modpack.choose=Choose a modpack zip file which you want to install.
 modpack.desc=Describe your modpack, including precautions, changlog, supporting Markdown(also supporting online pictures).
 modpack.enter_name=Enter your desired name for this game.
 modpack.export=Export Modpack
-modpack.export_error=Failed to export the modpack, maybe the format of your game directory is incorrect or failed to manage files.
-modpack.export_finished=Exporting the modpack finished. See
 modpack.files.blueprints=BuildCraft blueprints
 modpack.files.config=Mod configs
 modpack.files.dumps=NEI debug output
@@ -262,22 +194,20 @@ modpack.files.resourcepacks=Resource(Texture) packs
 modpack.files.saves=Saved games
 modpack.files.scripts=MineTweaker configuration
 modpack.files.servers_dat=Multiplayer servers list
-modpack.included_launcher=The modpack is included the launcher, you can publish it directly.
 modpack.install=Install %s modpack
 modpack.installing=Installing modpack
 modpack.introduction=Curse, MultiMC, HMCL, MCBBS modpacks supprted.
 modpack.invalid=Invalid modpack file.
 modpack.mismatched_type=Mismatched modpack type, your current game is %s modpack, but your update file is %s modpack.
 modpack.name=Modpack Name
-modpack.not_a_valid_location=Not a valid modpack path
 modpack.not_a_valid_name=Not a valid modpack name
-modpack.not_included_launcher=You can use the modpack by clicking the "Import Modpack" button.
 modpack.scan=Scanning this modpack
 modpack.task.install=Import Modpack
 modpack.task.install.error=Failed to install the modpack. Maybe the files is incorrect, or a management issue occurred.
 modpack.task.install.will=Install the modpack:
 modpack.type.curse=Curse
 modpack.type.curse.completion=Install relative files to Curse modpack
+modpack.type.curse.error=Unable to complete this Curse modpack. Please retry.
 modpack.type.hmcl=HMCL
 modpack.type.multimc=MultiMC
 modpack.unsupported=Unsupported modpack, only HMCL, MultiMC, Curse modpacks are supported.
@@ -288,7 +218,6 @@ modpack.wizard.step.1.title=Set the basic options to the modpack.
 modpack.wizard.step.2=Files selection
 modpack.wizard.step.2.title=Choose the files you want to put into the modpack.
 modpack.wizard.step.3=Description
-modpack.wizard.step.3.title=Describe your modpack.
 modpack.wizard.step.initialization.exported_version=The exported game version
 modpack.wizard.step.initialization.include_launcher=Include the launcher
 modpack.wizard.step.initialization.save=Choose a path to export the game files to
@@ -299,19 +228,15 @@ mods.add=Add mods
 mods.add.failed=Failed to add mods %s.
 mods.add.success=Successfully added mods %s.
 mods.choose_mod=Choose your mods
-mods.default_information=Please ensure that you have installed Forge or LiteLoader before installing mods!\nYou can drop your mod files from explorer/finder, and delete mods by the delete button.\nDisable a mod by leaving the check box unchecked; Choose an item to get the information.
 mods.remove=Remove
 
-operation.confirm_stop=Terminate the operations?
-operation.stopped=The operation was aborted.
 
 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?
 profile.title=Game Directories
 profile.selected=Selected
 
@@ -321,7 +246,7 @@ selector.custom=Custom
 
 settings=Settings
 
-settings.advanced=Advanced
+settings.advanced=Advanced Settings
 settings.advanced.dont_check_game_completeness=Don't check game completeness
 settings.advanced.game_dir.default=Default (.minecraft/)
 settings.advanced.game_dir.independent=Independent (.minecraft/versions/<version name>/, except assets,libraries)
@@ -340,16 +265,14 @@ settings.advanced.precall_command=Pre-Launch command(will be executed before gam
 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?
 
 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
@@ -375,16 +298,11 @@ settings.launcher.theme=Theme
 
 settings.max_memory=Max Memory/MB
 settings.physical_memory=Physical Memory Size
-settings.run_directory=Run Directory(Version Isolation)
 settings.show_log=Show Logs
-settings.tabs.assets_downloads=Assets
-settings.tabs.game_download=Games
 settings.tabs.installers=Installers
-settings.test_game=Test game
 settings.type.global=Global version settings(all shared)
 settings.type=Version setting type
 settings.type.special=Specialized version settings(will not affect other versions)
-settings.update_version=Update version json.
 
 update=Update
 update.failed=Failed to check for updates.
@@ -392,7 +310,6 @@ update.found=Found Update!
 update.newest_version=Newest version: %s
 update.latest=This is latest Version.
 update.no_browser=Cannot open any browser. The link has been copied to the clipboard. Paste it to a browser address bar to update.
-update.should_open_link=Are you willing to update the launcher?
 update.tooltip=Update
 
 version.cannot_read=Unable to gather the game version. Cannot continue auto-installing.
@@ -406,7 +323,6 @@ version.launch_script.failed=Unable to make launch script.
 version.launch_script.save=Save the launch script
 version.launch_script.success=Finished script creation, %s.
 version.manage.redownload_assets_index=Redownload Assets Index
-version.manage.redownload_json=Redownload Minecraft Configuration(minecraft.json)
 version.manage.remove=Delete this version
 version.manage.remove.confirm=Sure to remove version %s?
 version.manage.remove_libraries=Delete library files
@@ -416,10 +332,6 @@ version.settings=Settings
 version.update=Update
 
 wizard.prev=< Prev
-wizard.close=Close
 wizard.failed=Failed
 wizard.finish=Finish
-wizard.help=Help
 wizard.next=Next >
-wizard.steps=Steps
-wizard.summary=Summary

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -0,0 +1,337 @@
+# Hello Minecraft! Launcher.
+# Copyright (C) 2013  huangyuhui <[email protected]>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see {http://www.gnu.org/licenses/}.
+#
+#author: huangyuhui
+about.copyright=版權
+about.copyright.statement=Copyright (c) 2018 huangyuhui.
+about.author=作者
+about.author.statement=huanghongxun ([email protected])
+about.thanks_to=鳴謝
+about.thanks_to.statement=bangbang93 (BMCLAPI, https://bmclapi2.bangbang93.com/)\ngamerteam (默認背景圖)\n所有通過 Issues、Pull Requests 等方式參與本項目的貢獻者
+about.dependency=依賴
+# 由於篇幅限制，僅列出第一作者
+about.dependency.statement=JFoenix (Shadi Shaheen, Apache 2.0)\nGson (Google, Apache 2.0)\nApache Commons Compress (ASF, Apache 2.0)\nXZ for Java (Lasse Collin, Public Domain)\nfx-gson (Joffrey Bion, MIT)
+about.claim=免責聲明
+about.claim.statement=Minecraft 版權歸 Mojang AB 所有，使用本軟件產生的版權問題，軟件製作方概不負責。請支持正版。
+about.open_source=開源
+about.open_source.statement=GPL v3 (https://github.com/huanghongxun/HMCL/)
+
+account=賬戶
+account.character=角色
+account.choose=選擇一個角色
+account.create=新建賬戶
+account.email=郵箱
+account.failed.connect_authentication_server=無法連接認證服務器,可能是網絡問題
+account.failed.invalid_credentials=您的用戶名或密碼錯誤，或者登錄次數過多被暫時禁止登錄，請稍後再試
+account.failed.invalid_password=無效的密碼
+account.failed.invalid_token=請嘗試登出並重新輸入密碼登錄
+account.failed.no_character=該帳號沒有角色
+account.failed.no_selected_server=未選擇認證服務器
+account.failed.connect_injector_server=無法連接認證服務器，可能是網絡故障或 URL 輸入錯誤
+account.injector.add=添加認證服務器
+account.injector.manage=管理認證服務器
+account.injector.http=警告：此服務器使用不安全的 HTTP 協議，您的密碼在登錄時會被明文傳輸。
+account.injector.server=認證服務器
+account.injector.server_url=服務器地址
+account.injector.server_name=服務器名稱
+account.methods=登錄方式
+account.methods.authlib_injector=authlib-injector 登錄
+account.methods.no_method=沒有登入方式
+account.methods.offline=離線模式
+account.methods.yggdrasil=正版登錄
+account.missing=沒有賬戶
+account.password=密碼
+account.username=用戶名
+
+archive.author=作者
+archive.game_version=遊戲版本
+archive.version=版本
+
+assets.download=下載資源
+assets.download_all=檢查資源文件完整性
+
+button.cancel=取消
+button.clear=清除
+button.delete=刪除
+button.edit=修改
+button.install=安裝
+button.no=否
+button.ok=確定
+button.refresh=刷新
+button.save=保存
+button.yes=是
+
+color.recent=推薦
+color.custom=自定義顏色
+
+crash.NoClassDefFound=請確認 HMCL 本體是否完整，或更新您的 Java。
+crash.user_fault=您的系統或 Java 環境可能安裝不當導致本軟件崩潰，請檢查您的 Java 環境或您的電腦！可以嘗試重新安裝 Java。
+
+download=下載
+download.BMCL=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com/）
+download.failed=下載失敗
+download.failed.refresh=加載版本列表失敗，點擊此處重試。
+download.mojang=官方
+
+extension.bat=Windows 腳本
+extension.mod=模組文件
+extension.png=圖片文件
+extension.sh=Bash 腳本
+
+fatal.missing_javafx=JavaFX 缺失。\n如果您使用的是 Java 11 或更高版本，請降級到 Java 8 或 10。\n如果您使用的是 OpenJDK，請確保其包含 OpenJFX。
+fatal.missing_dst_root_ca_x3=當前 Java 平台缺少 DST Root CA X3 證書。\n您依然可以使用 HMCL，但將無法連接到部分站點（如使用 Let's Encrypt 證書的站點），這可能會使 HMCL 無法正常工作。\n請將您的 Java 升級到 8u101 以上以解決此問題。
+
+folder.config=配置文件夾
+folder.coremod=核心MOD文件夾
+folder.game=遊戲文件夾
+folder.mod=MOD文件夾
+folder.resourcepacks=資源包文件夾
+folder.saves=存檔文件夾
+folder.screenshots=截圖文件夾
+
+general.prompt.empty=（無）
+
+input.email=用戶名必須是郵箱
+input.number=必須是數字
+input.not_empty=必填項
+input.url=必須是合法的鏈接
+
+install=添加遊戲
+install.failed=安裝失敗
+install.installer.choose=選擇 %s 版本
+install.installer.forge=Forge
+install.installer.game=遊戲
+install.installer.install=安裝 %s
+install.installer.liteloader=LiteLoader
+install.installer.not_installed=暫不安裝 %s，可以點擊此處安裝
+install.installer.optifine=OptiFine
+install.installer.version=%s 版本
+install.modpack=安裝整合包
+install.new_game=安裝新遊戲版本
+install.new_game.already_exists=此版本已經存在，請換一個名字
+install.new_game.current_game_version=當前遊戲版本
+install.select=請選擇安裝方式
+install.success=安裝成功
+
+lang=繁體中文
+lang.default=跟隨系統語言
+
+launch.advice.different_platform=您的系統是 64 位的但是 Java 是 32 位的，推薦您安裝 64 位 Java。
+launch.advice.java8_1_13=Minecraft 1.13 只支持 Java 8 或更高版本，請使用 Java 8 或最新版本。
+launch.advice.java9=不高於 1.13 的安裝了 Mod 的 Minecraft 不支持 Java 9 或更高版本，請使用 Java 8。
+launch.advice.newer_java=檢測到您未使用 Java 8 及更新版本，Java 8 能使遊戲更流暢而且 Minecraft 1.12 及更新版本和很多 Mod 強制需要需要 Java 8。
+launch.advice.not_enough_space=您設置的內存大小過大，由於超過了系統內存大小 %dMB，所以可能影響遊戲體驗或無法啓動遊戲，啓動器仍會嘗試啓動。
+launch.advice.too_large_memory_for_32bit=您設置的內存大小過大，由於可能超過了 32 位 Java 的內存分配限制，所以可能無法啓動遊戲，請將內存調至 1024MB 或更小，啓動器仍會嘗試啓動。
+launch.failed=啓動失敗
+launch.failed.cannot_create_jvm=截獲到無法創建 Java 虛擬機，可能是 Java 參數有問題，可以在設置中開啓無參數模式啓動。
+launch.failed.creating_process=啓動失敗，在創建新進程時發生錯誤，可能是 Java 路徑錯誤。
+launch.failed.decompressing_natives=未能解壓遊戲本地庫。
+launch.failed.executable_permission=未能爲啓動文件添加執行權限。
+launch.failed.exited_abnormally=遊戲非正常退出，請查看日志文件，或聯繫他人尋求幫助。
+launch.state.dependencies=正在處理遊戲依賴
+launch.state.done=啓動完成
+launch.state.logging_in=登錄中
+launch.state.modpack=正在下載必要文件
+launch.state.waiting_launching=等待遊戲啓動
+launch.wrong_javadir=錯誤的 Java 路徑，將自動重置爲默認 Java 路徑。
+
+launcher=啓動器
+launcher.background=背景地址
+launcher.background.choose=選擇背景路徑
+launcher.background.default=默認（自動檢索啓動器同目錄下的 background.png/jpg 及 bg 文件夾內的圖片）
+launcher.common_directory=公共文件夾
+launcher.common_directory.choose=選擇公共文件夾
+launcher.contact=聯繫我們
+launcher.crash=Hello Minecraft! Launcher 遇到了無法處理的錯誤，請複製下列內容並通過 MCBBS、貼吧、GitHub 或 Minecraft Forum 反饋 bug。
+launcher.crash_out_dated=Hello Minecraft! Launcher 遇到了無法處理的錯誤，已檢測到您的啓動器不是最新版本，請更新後再試！
+launcher.update_java=請更新您的 Java
+
+login.empty_username=你還未設置用戶名！
+login.enter_password=請輸入您的密碼
+
+logwindow.show_lines=顯示行數
+logwindow.terminate_game=結束遊戲進程
+logwindow.title=日誌
+
+main_page=主頁
+
+message.confirm=提示
+message.doing=請耐心等待
+message.downloading=正在下載...
+message.error=錯誤
+message.info=提示
+message.success=已完成
+message.unknown=未知
+
+
+modpack=整合包
+modpack.choose=選擇要安裝的遊戲整合包文件
+modpack.desc=描述你要製作的整合包，比如整合包注意事項和更新記錄，支持 Markdown（圖片請用網絡圖）。
+modpack.enter_name=給遊戲起個你喜歡的名字
+modpack.export=導出整合包
+modpack.files.blueprints=BuildCraft 藍圖
+modpack.files.config=Mod 配置文件
+modpack.files.dumps=NEI 調試輸出
+modpack.files.liteconfig=Mod 配置文件
+modpack.files.mods=Mod
+modpack.files.mods.voxelmods=VoxelMods 配置，如小地圖
+modpack.files.options_txt=遊戲設定
+modpack.files.optionsshaders_txt=光影設定
+modpack.files.resourcepacks=資源包(材質包)
+modpack.files.saves=遊戲存檔
+modpack.files.scripts=MineTweaker 配置
+modpack.files.servers_dat=多人遊戲服務器列表
+modpack.install=安裝%s整合包
+modpack.installing=正在安裝整合包
+modpack.introduction=支持 Curse、MultiMC、HMCL、MCBBS 整合包。
+modpack.invalid=無效的整合包升級文件，可能是下載時出現問題。
+modpack.mismatched_type=整合包類型不匹配，當前遊戲是 %s 整合包，但是提供的整合包更新文件是 %s 整合包。
+modpack.name=整合包名稱
+modpack.not_a_valid_name=不是一個有效的整合包名稱
+modpack.scan=解析整合包
+modpack.task.install=導入整合包
+modpack.task.install.error=安裝失敗，可能是整合包格式不正確或操作文件失敗。
+modpack.task.install.will=將會安裝整合包：
+modpack.type.curse=Curse
+modpack.type.curse.completion=下載 Curse 整合包相關文件
+modpack.type.curse.error=未能完成 Curse 整合包的下载，请多次重试或设置代理
+modpack.type.hmcl=HMCL
+modpack.type.multimc=MultiMC
+modpack.unsupported=該整合包不被支持。僅 HMCL、MultiMC、Curse 整合包受支持。
+modpack.update=正在升級整合包
+modpack.wizard=導出整合包嚮導
+modpack.wizard.step.1=基本設置
+modpack.wizard.step.1.title=設置整合包的主要信息
+modpack.wizard.step.2=文件選擇
+modpack.wizard.step.2.title=選中你想加到整合包中的文件或文件夾
+modpack.wizard.step.3=整合包描述
+modpack.wizard.step.initialization.exported_version=要導出的遊戲版本
+modpack.wizard.step.initialization.include_launcher=包含啓動器
+modpack.wizard.step.initialization.save=選擇要導出到的遊戲整合包位置
+modpack.wizard.step.initialization.warning=在製作整合包前，請您確認您選擇的版本可以正常啓動，\n並保證您的 Minecraft 是正式版而非快照版，\n而且不應當將不允許非官方途徑傳播的 Mod、材質包等納入整合包。\n整合包會保存您目前的下載源設置
+
+mods=模組管理
+mods.add=添加模組
+mods.add.failed=添加模組 %s 失敗。
+mods.add.success=成功添加模組 %s。
+mods.choose_mod=選擇模組
+mods.remove=刪除
+
+
+profile=配置
+profile.default=當前目錄
+profile.home=主文件夾
+profile.instance_directory=遊戲路徑
+profile.instance_directory.choose=選擇遊戲路徑
+profile.new=新建配置
+profile.title=遊戲目錄
+profile.selected=已選中
+
+selector.choose=選擇
+selector.choose_file=選擇文件
+selector.custom=自定義
+
+settings=普通設置
+
+settings.advanced=高級設置
+settings.advanced.dont_check_game_completeness=不檢查遊戲完整性
+settings.advanced.game_dir.default=默認（.minecraft/）
+settings.advanced.game_dir.independent=各版本獨立（.minecraft/versions/<版本名>/，除 assets、libraries）
+settings.advanced.java_args_default=啓動器默認添加的參數（請不要重複添加）：-XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -XX:MaxPermSize=???m -Xmx???m -Dfml.ignoreInvalidMinecraftCertificates=true -Dfml.ignorePatchDiscrepancies=true
+settings.advanced.java_permanent_generation_space=內存永久保存區域（不必填寫，MB）
+settings.advanced.jvm_args=Java 虛擬機參數（不必填寫）
+settings.advanced.launcher_visibility.close=遊戲啓動後結束啓動器
+settings.advanced.launcher_visibility.hide=遊戲啓動後隱藏啓動器
+settings.advanced.launcher_visibility.hide_reopen=隱藏啓動器並在遊戲結束後重新打開
+settings.advanced.launcher_visibility.keep=保持啓動器可見
+settings.advanced.launcher_visible=啓動器可見性
+settings.advanced.minecraft_arguments=Minecraft 額外參數（不必填寫）
+settings.advanced.no_common=不使用公共路徑
+settings.advanced.no_jvm_args=不添加默認的 JVM 參數（使用 Java 9 時必勾）
+settings.advanced.precall_command=啓動前執行命令（不必填寫，將在遊戲啓動前調用）
+settings.advanced.server_ip=直入服務器 IP 地址（不必填寫，啓動遊戲後直接進入對應服務器）
+settings.advanced.wrapper_launcher=前置指令（不必填寫，如 optirun）
+
+settings.custom=自定義
+
+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=管理
+
+settings.icon=遊戲圖標
+
+settings.launcher=啓動器設置
+settings.launcher.common_path.tooltip=啓動器將所有遊戲資源及依賴庫文件放於此集中管理，如果遊戲文件夾內有現成的將不會使用公共庫文件
+settings.launcher.download_source=下載源
+settings.launcher.language=語言
+settings.launcher.log_font=日誌字體
+settings.launcher.proxy=代理
+settings.launcher.proxy.authentication=代理賬戶
+settings.launcher.proxy.no_proxy=直連
+settings.launcher.proxy.has_proxy=啓用驗證
+settings.launcher.proxy.host=主機
+settings.launcher.proxy.http=HTTP
+settings.launcher.proxy.password=密碼
+settings.launcher.proxy.port=端口
+settings.launcher.proxy.socks=Socks
+settings.launcher.proxy.username=賬戶
+settings.launcher.theme=主題
+
+settings.max_memory=最大內存（MB）
+settings.physical_memory=物理內存大小
+settings.show_log=查看日誌
+settings.tabs.installers=自動安裝
+settings.type.global=全局版本設置（使用該設置的版本共用一套設定）
+settings.type=版本設置類型
+settings.type.special=單獨版本設置（不會影響到其他版本的設定）
+
+update=啓動器更新
+update.failed=檢查更新失敗
+update.found=發現更新
+update.newest_version=最新版本爲：%s
+update.latest=當前版本爲最新版本
+update.no_browser=無法打開瀏覽器，網址已經複製到剪貼板了，您可以手動粘貼網址打開頁面
+update.tooltip=更新
+
+version.cannot_read=讀取遊戲版本失敗，無法進行自動安裝
+version.forbidden_name=此版本名稱不受支持，請換一個名字
+version.game.old=遠古版
+version.game.release=穩定版
+version.game.snapshot=測試版
+version.launch=啓動遊戲
+version.launch_script=生成啓動腳本
+version.launch_script.failed=生成啓動腳本失敗
+version.launch_script.save=保存啓動腳本
+version.launch_script.success=啓動腳本已生成完畢：%s
+version.manage.redownload_assets_index=重新下載資源配置（assets_index.json）
+version.manage.remove=刪除該版本
+version.manage.remove.confirm=真的要刪除版本 %s 嗎？
+version.manage.remove_libraries=刪除所有庫文件
+version.manage.rename=重命名該版本
+version.manage.rename.message=請輸入要改成的名字
+version.settings=遊戲設置
+version.update=更新
+
+wizard.prev=< 上一步
+wizard.failed=失敗
+wizard.finish=完成
+wizard.next=下一步 >