Change separator fill in title bar and launch button to reduce color difference

Satisfy requirements metioned in #469
Fix request mojang server for skin info every time
2018-10-11 22:20:41 +08:00 · 2018-10-11 22:06:34 +08:00 · 2018-10-11 22:05:24 +08:00 · 2018-10-11 14:05:35 +08:00 · 2018-10-11 14:04:52 +08:00 · 2018-10-11 13:51:37 +08:00
252 changed files with 4311 additions and 2877 deletions
@@ -25,8 +25,12 @@ NVIDIA
 /HMCLCore/out/

 # eclipse
+/bin/
+/HMCL/bin/
+/HMCLCore/bin/
 .classpath
 .project
+.settings

 # netbeans
 .nb-gradle
@@ -1,5 +1,6 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '2.0.4'
+    id 'com.github.johnrengelman.shadow' version '4.0.0'
+    id 'application'
 }

 import java.nio.file.FileSystems
@@ -23,6 +24,8 @@ if (System.getenv("BUILD_NUMBER") != null && System.getenv("BUILD_NUMBER_OFFSET"
 def versionroot = System.getenv("VERSION_ROOT") ?: "3.2"
 version = versionroot + '.' + buildnumber

+mainClassName = 'org.jackhuang.hmcl.Main'
+
 dependencies {
    compile project(":HMCLCore")
    compile rootProject.files("lib/JFoenix.jar")
@@ -75,7 +78,7 @@ def repack(File file) {
 jar {
    manifest {
        attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
-                'Main-Class': 'org.jackhuang.hmcl.Main',
+                'Main-Class': mainClassName,
                'Multi-Release': 'true',
                'Implementation-Version': version
    }
@@ -26,6 +26,8 @@ import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
 import java.io.IOException;
@@ -78,9 +80,6 @@ public final class Launcher extends Application {
        try {
            Logging.start(LOG_DIRECTORY);

-            // NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
-            Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
-
            LOG.info("*** " + Metadata.TITLE + " ***");
            LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
            LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
@@ -17,16 +17,12 @@
 */
 package org.jackhuang.hmcl;

-import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
-
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 import javax.swing.*;
 import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -40,6 +36,7 @@ public final class Main {

    public static void main(String[] args) {
        System.setProperty("java.net.useSystemProxies", "true");
+        System.setProperty("http.agent", "HMCL/" + Metadata.VERSION);

        checkJavaFX();
        checkDirectoryPath();
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl;

-import org.jackhuang.hmcl.util.JarUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;

 /**
 * Stores metadata about this application.
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.game;

-import javafx.geometry.Rectangle2D;
+import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
@@ -30,8 +30,10 @@ import org.jackhuang.hmcl.task.Scheduler;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.DialogController;
-import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;

+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.*;

@@ -91,9 +93,19 @@ public final class AccountHelper {
        return scale(url, scaleRatio);
    }

-    public static Rectangle2D getViewport(double scaleRatio) {
-        double size = 8.0 * scaleRatio;
-        return new Rectangle2D(size, size, size, size);
+    public static Image getHead(Image skin, int scaleRatio) {
+        final int size = 8 * scaleRatio;
+        final int faceOffset = (int) Math.round(scaleRatio * 4d / 9d);
+        BufferedImage image = SwingFXUtils.fromFXImage(skin, null);
+        BufferedImage head = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g2d = head.createGraphics();
+        g2d.drawImage(image, faceOffset, faceOffset, size - faceOffset, size - faceOffset,
+                size, size, size + size, size + size, null);
+        if (image.getHeight() > 32) {
+            g2d.drawImage(image, 0, 0, size, size,
+                    40 * scaleRatio, 8 * scaleRatio, 48 * scaleRatio, 16 * scaleRatio, null);
+        }
+        return SwingFXUtils.toFXImage(head, null);
    }

    private static class SkinLoadTask extends Task {
@@ -128,12 +140,12 @@ public final class AccountHelper {
    private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh) throws Exception {
        account.clearCache();

-        Optional<Texture> texture = account.getSkin(profile);
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
        File file = getSkinFile(profile.getId());
        if (!refresh && file.exists())
            return;
+        Optional<Texture> texture = account.getSkin(profile);
+        if (!texture.isPresent()) return;
+        String url = texture.get().getUrl();
        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
    }

@@ -141,12 +153,12 @@ public final class AccountHelper {
        account.clearCache();

        if (account.getCharacter() == null) return;
-        Optional<Texture> texture = account.getSkin();
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
        File file = getSkinFile(account.getUUID());
        if (!refresh && file.exists())
            return;
+        Optional<Texture> texture = account.getSkin();
+        if (!texture.isPresent()) return;
+        String url = texture.get().getUrl();
        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
    }

@@ -159,11 +171,11 @@ public final class AccountHelper {
    }

    public static Image getSteveSkin(double scaleRatio) {
-         return scale("/assets/img/steve.png", 4);
+        return scale("/assets/img/steve.png", scaleRatio);
    }

    public static Image getAlexSkin(double scaleRatio) {
-        return scale("/assets/img/alex.png", 4);
+        return scale("/assets/img/alex.png", scaleRatio);
    }

    public static Image getDefaultSkin(UUID uuid, double scaleRatio) {
@@ -19,6 +19,7 @@ package org.jackhuang.hmcl.game;

 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import javafx.scene.image.Image;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
@@ -26,8 +27,8 @@ import org.jackhuang.hmcl.setting.EnumGameDirectory;
 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.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.io.IOException;
@@ -144,10 +145,24 @@ public class HMCLGameRepository extends DefaultGameRepository {
        return setting;
    }

-    public File getVersionIcon(String id) {
+    public File getVersionIconFile(String id) {
        return new File(getVersionRoot(id), "icon.png");
    }

+    public Image getVersionIconImage(String id) {
+        if (id == null || !isLoaded())
+            return new Image("/assets/img/grass.png");
+
+        Version version = getVersion(id);
+        File iconFile = getVersionIconFile(id);
+        if (iconFile.exists())
+            return new Image("file:" + iconFile.getAbsolutePath());
+        else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
+            return new Image("/assets/img/furnace.png");
+        else
+            return new Image("/assets/img/grass.png");
+    }
+
    public boolean saveVersionSetting(String id) {
        if (!versionSettings.containsKey(id))
            return false;
@@ -19,9 +19,9 @@ package org.jackhuang.hmcl.game;

 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.Zipper;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.Zipper;

 import java.io.File;
 import java.util.ArrayList;
@@ -61,6 +61,8 @@ public class HMCLModpackExportTask extends Task {
        Logging.LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
        try (Zipper zip = new Zipper(output.toPath())) {
            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
+                if (path.isEmpty())
+                    return true;
                for (String s : blackList)
                    if (path.equals(s))
                        return false;
@@ -73,8 +75,8 @@ public class HMCLModpackExportTask extends Task {
            Version mv = repository.getResolvedVersion(version);
            String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
                    .orElseThrow(() ->  new IllegalStateException("Cannot parse the version of " + version));
-            zip.putTextFile(Constants.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
-            zip.putTextFile(Constants.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
+            zip.putTextFile(JsonUtils.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
+            zip.putTextFile(JsonUtils.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
        }
    }
 }
@@ -27,9 +27,9 @@ import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.mod.ModpackInstallTask;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.CompressingUtils;
-import org.jackhuang.hmcl.util.Constants;
-import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.CompressingUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.io.IOException;
@@ -65,7 +65,7 @@ public final class HMCLModpackInstallTask extends Task {
        ModpackConfiguration<Modpack> config = null;
        try {
            if (json.exists()) {
-                config = Constants.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
+                config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
                }.getType());

                if (!MODPACK_TYPE.equals(config.getType()))
@@ -89,7 +89,7 @@ public final class HMCLModpackInstallTask extends Task {
    @Override
    public void execute() throws Exception {
        String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
-        Version version = Constants.GSON.fromJson(json, Version.class).setId(name).setJar(null);
+        Version version = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
        dependencies.add(new VersionJsonSaveTask(repository, version));
        dependencies.add(new MinecraftInstanceTask<>(zipFile, "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
    }
@@ -19,10 +19,10 @@ package org.jackhuang.hmcl.game;

 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.mod.Modpack;
-import org.jackhuang.hmcl.util.CompressingUtils;
-import org.jackhuang.hmcl.util.JsonUtils;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.CompressingUtils;

 import java.io.File;
 import java.io.IOException;
@@ -36,7 +36,7 @@ public final class HMCLModpackManager {
    public static final List<String> MODPACK_BLACK_LIST = Lang.immutableListOf(
            "usernamecache.json", "usercache.json", // Minecraft
            "launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
-            "pack.json", "launcher.jar", "hmclmc.log", // HMCL
+            "pack.json", "launcher.jar", "hmclmc.log", "cache", // HMCL
            "manifest.json", "minecraftinstance.json", ".curseclient", // Curse
            "minetweaker.log", // Mods
            "jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
@@ -30,6 +30,7 @@ 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.Accounts;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -40,9 +41,20 @@ import org.jackhuang.hmcl.ui.LogWindow;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
-import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.Log4jLevel;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.Pair;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
+import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
+import org.jackhuang.hmcl.util.platform.CommandBuilder;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.ManagedProcess;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;

 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -55,39 +67,58 @@ 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(){}

-    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
+    private final Profile profile;
+    private final Account account;
+    private final String selectedVersion;
+    private File scriptFile;
+    private final VersionSetting setting;
+    private LauncherVisibility launcherVisibility;
+    private boolean showLogs;
+
+    public LauncherHelper(Profile profile, Account account, String selectedVersion) {
+        this.profile = Objects.requireNonNull(profile);
+        this.account = Objects.requireNonNull(account);
+        this.selectedVersion = Objects.requireNonNull(selectedVersion);
+        this.setting = profile.getVersionSetting(selectedVersion);
+        this.launcherVisibility = setting.getLauncherVisibility();
+        this.showLogs = setting.isShowLogs();
+    }
+
    private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});

-    public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
-        if (account == null)
-            throw new IllegalArgumentException("No account");
+    public void setTestMode() {
+        launcherVisibility = LauncherVisibility.KEEP;
+        showLogs = true;
+    }

+    public void launch() {
        Logging.LOG.info("Launching game version: " + selectedVersion);

        GameRepository repository = profile.getRepository();
-
        Version version = repository.getResolvedVersion(selectedVersion);
-        VersionSetting setting = profile.getVersionSetting(selectedVersion);

        Platform.runLater(() -> {
            try {
                checkGameState(profile, setting, version, () -> {
                    Controllers.dialog(launchingStepsPane);
-                    Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
+                    Schedulers.newThread().schedule(this::launch0);
                });
            } catch (InterruptedException ignore) {
            }
        });
    }

-    private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
+    public void makeLaunchScript(File scriptFile) {
+        this.scriptFile = Objects.requireNonNull(scriptFile);
+
+        launch();
+    }
+
+    private void launch0() {
        HMCLGameRepository repository = profile.getRepository();
        DefaultDependencyManager dependencyManager = profile.getDependency();
        Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
-        VersionSetting setting = profile.getVersionSetting(selectedVersion);
        Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));

        TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
@@ -127,7 +158,7 @@ public final class LauncherHelper {
                            selectedVersion,
                            variables.get("account"),
                            setting.toLaunchOptions(profile.getGameDir()),
-                            setting.getLauncherVisibility() == LauncherVisibility.CLOSE
+                            launcherVisibility == 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())
                    ));
@@ -147,7 +178,7 @@ public final class LauncherHelper {
                    if (scriptFile == null) {
                        ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
                        PROCESSES.add(process);
-                        if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
+                        if (launcherVisibility == LauncherVisibility.CLOSE)
                            Launcher.stopApplication();
                        else
                            launchingStepsPane.setCancel(it -> {
@@ -186,7 +217,10 @@ public final class LauncherHelper {
                            if (ex != null) {
                                String message;
                                if (ex instanceof CurseCompletionException) {
-                                    message = i18n("modpack.type.curse.error");
+                                    if (ex.getCause() instanceof FileNotFoundException)
+                                        message = i18n("modpack.type.curse.not_found");
+                                    else
+                                        message = i18n("modpack.type.curse.error");
                                } else if (ex instanceof PermissionException) {
                                    message = i18n("launch.failed.executable_permission");
                                } else if (ex instanceof ProcessCreationException) {
@@ -231,7 +265,7 @@ public final class LauncherHelper {

        // Game later than 1.7.2 accepts Java 8.
        if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8 && gameVersion.compareTo(VersionNumber.asVersion("1.7.2")) > 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
+            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
                    .filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
            if (java8.isPresent()) {
@@ -256,7 +290,7 @@ public final class LauncherHelper {
                && version.getLibraries().stream()
                .filter(library -> "launchwrapper".equals(library.getArtifactId()))
                .anyMatch(library -> VersionNumber.asVersion(library.getVersion()).compareTo(VersionNumber.asVersion("1.13")) < 0)) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
+            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
            if (java8.isPresent()) {
                java8required = true;
                setting.setJavaVersion(java8.get());
@@ -267,9 +301,9 @@ public final class LauncherHelper {
        }

        // Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
-        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0.51");
+        VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0_51");
        if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
-            Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
+            Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
                    .filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
                    .max(Comparator.comparing(JavaVersion::getVersionNumber));
            if (java8.isPresent()) {
@@ -281,13 +315,13 @@ public final class LauncherHelper {
            }
        }

-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
-                org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
+                org.jackhuang.hmcl.util.platform.Platform.IS_64_BIT) {
            final JavaVersion java32 = java;

            // First find if same java version but whose platform is 64-bit installed.
-            Optional<JavaVersion> java64 = JavaVersion.getJREs().stream()
-                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
+            Optional<JavaVersion> java64 = JavaVersion.getJavas().stream()
+                    .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
                    .filter(javaVersion -> javaVersion.getParsedVersion() == java32.getParsedVersion())
                    .max(Comparator.comparing(JavaVersion::getVersionNumber));

@@ -295,8 +329,8 @@ public final class LauncherHelper {
                final boolean java8requiredFinal = java8required, newJavaRequiredFinal = newJavaRequired;

                // Then find if other java version which satisfies requirements installed.
-                java64 = JavaVersion.getJREs().stream()
-                        .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
+                java64 = JavaVersion.getJavas().stream()
+                        .filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
                        .filter(javaVersion -> {
                            if (java8requiredFinal) return javaVersion.getParsedVersion() == JavaVersion.JAVA_8;
                            if (newJavaRequiredFinal) return javaVersion.getParsedVersion() >= JavaVersion.JAVA_8;
@@ -313,28 +347,36 @@ public final class LauncherHelper {
            }
        }

-        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
+        // 32-bit JVM cannot make use of too much memory.
+        if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
                setting.getMaxMemory() > 1.5 * 1024) {
            // 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;
        }
-        
+
+        // Cannot allocate too much memory exceeding free space.
        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;
        }

+        // Forge 2760 and above will crash game with LiteLoader.
+        if (!flag) {
+            boolean hasForge2760 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
+                    .anyMatch(it -> VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2760") >= 0);
+            boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
+            if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
+                Controllers.dialog(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
+                flag = true;
+            }
+        }
+
        if (!flag)
            onAccept.run();
    }

-    public static void stopManagedProcesses() {
-        while (!PROCESSES.isEmpty())
-            Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
-    }
-
    public void emitStatus(LoadingState state) {
        if (state == LoadingState.DONE) {
            launchingStepsPane.fireEvent(new DialogCloseEvent());
@@ -344,8 +386,8 @@ public final class LauncherHelper {
        launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
    }

-    private void checkExit(LauncherVisibility v) {
-        switch (v) {
+    private void checkExit() {
+        switch (launcherVisibility) {
            case HIDE_AND_REOPEN:
                Platform.runLater(Controllers.getStage()::show);
                break;
@@ -394,7 +436,6 @@ public final class LauncherHelper {

        private final VersionSetting setting;
        private final Map<String, String> forbiddenTokens;
-        private final LauncherVisibility visibility;
        private ManagedProcess process;
        private boolean lwjgl;
        private LogWindow logWindow;
@@ -415,7 +456,6 @@ public final class LauncherHelper {
                        pair(authInfo.getUsername(), "<player>")
                );

-            visibility = setting.getLauncherVisibility();
            logs = new LinkedList<>();
        }

@@ -423,7 +463,7 @@ public final class LauncherHelper {
        public void setProcess(ManagedProcess process) {
            this.process = process;

-            if (setting.isShowLogs())
+            if (showLogs)
                Platform.runLater(() -> {
                    logWindow = new LogWindow();
                    logWindow.show();
@@ -431,6 +471,31 @@ public final class LauncherHelper {
                });
        }

+        private void finishLaunch() {
+            switch (launcherVisibility) {
+                case HIDE_AND_REOPEN:
+                    Platform.runLater(() -> {
+                        Controllers.getStage().hide();
+                        emitStatus(LoadingState.DONE);
+                    });
+                    break;
+                case CLOSE:
+                    // Never come to here.
+                    break;
+                case KEEP:
+                    Platform.runLater(() -> {
+                        emitStatus(LoadingState.DONE);
+                    });
+                    break;
+                case HIDE:
+                    Platform.runLater(() -> {
+                        Controllers.getStage().close();
+                        emitStatus(LoadingState.DONE);
+                    });
+                    break;
+            }
+        }
+
        @Override
        public synchronized void onLog(String log, Log4jLevel level) {
            String newLog = log;
@@ -446,7 +511,7 @@ public final class LauncherHelper {
            if (logs.size() > config().getLogLines())
                logs.removeFirst();

-            if (setting.isShowLogs()) {
+            if (showLogs) {
                try {
                    latch.await();
                    logWindow.waitForLoaded();
@@ -460,28 +525,7 @@ public final class LauncherHelper {

            if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
                lwjgl = true;
-                switch (visibility) {
-                    case HIDE_AND_REOPEN:
-                        Platform.runLater(() -> {
-                            Controllers.getStage().hide();
-                            emitStatus(LoadingState.DONE);
-                        });
-                        break;
-                    case CLOSE:
-                        // Never come to here.
-                        break;
-                    case KEEP:
-                        Platform.runLater(() -> {
-                            emitStatus(LoadingState.DONE);
-                        });
-                        break;
-                    case HIDE:
-                        Platform.runLater(() -> {
-                            Controllers.getStage().close();
-                            emitStatus(LoadingState.DONE);
-                        });
-                        break;
-                }
+                finishLaunch();
            }
        }

@@ -490,6 +534,9 @@ public final class LauncherHelper {
            if (exitType == ExitType.INTERRUPTED)
                return;

+            // Game crashed before opening the game window.
+            if (!lwjgl) finishLaunch();
+
            if (exitType != ExitType.NORMAL && logWindow == null)
                Platform.runLater(() -> {
                    logWindow = new LogWindow();
@@ -511,8 +558,14 @@ public final class LauncherHelper {
                    });
                });

-            checkExit(visibility);
+            checkExit();
        }

    }
+
+    public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
+    public static void stopManagedProcesses() {
+        while (!PROCESSES.isEmpty())
+            Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
+    }
 }
@@ -25,9 +25,9 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
 import org.jackhuang.hmcl.task.FinalizedCallback;
 import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.util.Constants;
-import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.io.FileNotFoundException;
@@ -64,7 +64,7 @@ public final class ModpackHelper {
            throw new FileNotFoundException(file.getPath());
        else
            try {
-                return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
+                return JsonUtils.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
                }.getType());
            } catch (JsonParseException e) {
                throw new IOException("Malformed modpack configuration");
@@ -26,6 +26,7 @@ import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AccountFactory;
+import org.jackhuang.hmcl.auth.AuthenticationException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
@@ -35,6 +36,7 @@ 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.Schedulers;

 import java.io.IOException;
 import java.util.Map;
@@ -91,9 +93,9 @@ public final class Accounts {
    }

    private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
-    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(accounts);
+    private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(Accounts.class, "accounts", accounts);

-    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
+    private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>(Accounts.class, "selectedAccount") {
        {
            accounts.addListener(onInvalidating(this::invalidated));
        }
@@ -181,11 +183,20 @@ public final class Accounts {
        config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));

        // load selected account
-        selectedAccount.set(
-                accounts.stream()
-                        .filter(it -> accountId(it).equals(config().getSelectedAccount()))
-                        .findFirst()
-                        .orElse(null));
+        Account selected = accounts.stream()
+                .filter(it -> accountId(it).equals(config().getSelectedAccount()))
+                .findFirst()
+                .orElse(null);
+        selectedAccount.set(selected);
+
+        Schedulers.io().schedule(() -> {
+            if (selected != null)
+                try {
+                    selected.logIn();
+                } catch (AuthenticationException e) {
+                    LOG.log(Level.WARNING, "Failed to log " + selected + " in", e);
+                }
+        });
    }

    public static ObservableList<Account> getAccounts() {
@@ -35,11 +35,11 @@ import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.upgrade.UpdateChannel;
-import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
-import org.jackhuang.hmcl.util.FileTypeAdapter;
-import org.jackhuang.hmcl.util.ObservableHelper;
+import org.jackhuang.hmcl.util.gson.EnumOrdinalDeserializer;
+import org.jackhuang.hmcl.util.gson.FileTypeAdapter;
 import org.jackhuang.hmcl.util.i18n.Locales;
 import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
+import org.jackhuang.hmcl.util.javafx.ObservableHelper;

 import java.io.File;
 import java.lang.reflect.Modifier;
@@ -95,7 +95,7 @@ public final class Config implements Cloneable, Observable {
    private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();

    @SerializedName("proxyType")
-    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.DIRECT);
+    private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.HTTP);

    @SerializedName("proxyHost")
    private StringProperty proxyHost = new SimpleStringProperty();
@@ -142,9 +142,6 @@ public final class Config implements Cloneable, Observable {
    @SerializedName("updateChannel")
    private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);

-    @SerializedName("enableMainPageGameList")
-    private BooleanProperty enableMainPageGameList = new SimpleBooleanProperty(false);
-
    @SerializedName("_version")
    private IntegerProperty configVersion = new SimpleIntegerProperty(0);

@@ -443,15 +440,4 @@ public final class Config implements Cloneable, Observable {
        this.updateChannel.set(updateChannel);
    }

-    public boolean isEnableMainPageGameList() {
-        return enableMainPageGameList.get();
-    }
-
-    public BooleanProperty enableMainPageGameListProperty() {
-        return enableMainPageGameList;
-    }
-
-    public void setEnableMainPageGameList(boolean enableMainPageGameList) {
-        this.enableMainPageGameList.set(enableMainPageGameList);
-    }
 }
@@ -19,7 +19,6 @@ package org.jackhuang.hmcl.setting;

 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
-import org.jackhuang.hmcl.util.OperatingSystem;

 import java.io.IOException;
 import java.nio.file.Files;
@@ -28,6 +27,10 @@ import java.nio.file.Paths;
 import java.util.Map;
 import java.util.logging.Level;

+import org.jackhuang.hmcl.util.InvocationDispatcher;
+import org.jackhuang.hmcl.util.Lang;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.jackhuang.hmcl.util.Logging.LOG;

@@ -68,7 +71,7 @@ public final class ConfigHolder {
        Settings.init();

        if (newlyCreated) {
-            saveConfig();
+            saveConfigSync();

            // hide the config file on windows
            if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
@@ -122,22 +125,26 @@ public final class ConfigHolder {
        return new Config();
    }

-    private static void saveConfig() throws IOException {
-        LOG.info("Saving config");
+    private static InvocationDispatcher<String> configWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
        try {
-            Files.write(configLocation, configInstance.toJson().getBytes(UTF_8));
+            writeToConfig(content);
        } catch (IOException e) {
            LOG.log(Level.SEVERE, "Failed to save config", e);
-            throw e;
+        }
+    });
+
+    private static void writeToConfig(String content) throws IOException {
+        LOG.info("Saving config");
+        synchronized (configLocation) {
+            Files.write(configLocation, content.getBytes(UTF_8));
        }
    }

    static void markConfigDirty() {
-        // TODO: change this to async
-        try {
-            saveConfig();
-        } catch (IOException ignored) {
-            // ignore it as it has been logged
-        }
+        configWriter.accept(configInstance.toJson());
+    }
+
+    private static void saveConfigSync() throws IOException {
+        writeToConfig(configInstance.toJson());
    }
 }
@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.setting;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
 import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.UUIDTypeAdapter;
+import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;

 import java.util.LinkedList;
 import java.util.List;
@@ -18,12 +18,14 @@
 package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
+import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
 import org.jackhuang.hmcl.download.DefaultDependencyManager;
 import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.EventPriority;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -31,6 +33,9 @@ import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.mod.ModManager;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.javafx.ImmediateObjectProperty;
+import org.jackhuang.hmcl.util.javafx.ImmediateStringProperty;
+import org.jackhuang.hmcl.util.javafx.ObservableHelper;

 import java.io.File;
 import java.lang.reflect.Type;
@@ -136,21 +141,23 @@ public final class Profile implements Observable {

        gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
        this.selectedVersion.addListener(o -> checkSelectedVersion());
-        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion()));
+        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));

        addPropertyChangedListener(onInvalidating(this::invalidate));
    }

    private void checkSelectedVersion() {
-        if (!repository.isLoaded()) return;
-        String newValue = selectedVersion.get();
-        if (!repository.hasVersion(newValue)) {
-            Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
-            if (version.isPresent())
-                selectedVersion.setValue(version.get());
-            else if (newValue != null)
-                selectedVersion.setValue(null);
-        }
+        JFXUtilities.runInFX(() -> {
+            if (!repository.isLoaded()) return;
+            String newValue = selectedVersion.get();
+            if (!repository.hasVersion(newValue)) {
+                Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
+                if (version.isPresent())
+                    selectedVersion.setValue(version.get());
+                else if (newValue != null)
+                    selectedVersion.setValue(null);
+            }
+        });
    }

    public HMCLGameRepository getRepository() {
@@ -17,20 +17,22 @@
 */
 package org.jackhuang.hmcl.setting;

+import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.Observable;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyListProperty;
-import javafx.beans.property.ReadOnlyListWrapper;
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.*;
 import javafx.collections.ObservableList;
 import org.jackhuang.hmcl.Launcher;
+import org.jackhuang.hmcl.event.EventBus;
+import org.jackhuang.hmcl.event.RefreshedVersionsEvent;

 import java.io.File;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;

-import static java.util.stream.Collectors.toList;
 import static javafx.collections.FXCollections.observableArrayList;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
@@ -65,7 +67,11 @@ public final class Profiles {

        @Override
        protected void invalidated() {
+            if (!initialized)
+                return;
+
            Profile profile = get();
+
            if (profiles.isEmpty()) {
                if (profile != null) {
                    set(null);
@@ -78,9 +84,20 @@ public final class Profiles {
                }
            }

-            if (!initialized)
-                return;
            config().setSelectedProfile(profile == null ? "" : profile.getName());
+            if (profile != null) {
+                if (profile.getRepository().isLoaded())
+                    selectedVersion.bind(profile.selectedVersionProperty());
+                else {
+                    selectedVersion.unbind();
+                    selectedVersion.set(null);
+                    // bind when repository was reloaded.
+                    profile.getRepository().refreshVersionsAsync().start();
+                }
+            } else {
+                selectedVersion.unbind();
+                selectedVersion.set(null);
+            }
        }
    };

@@ -127,18 +144,33 @@ public final class Profiles {
        HashSet<String> names = new HashSet<>();
        config().getConfigurations().forEach((name, profile) -> {
            if (!names.add(name)) return;
-            profile.setName(name);
            profiles.add(profile);
+            profile.setName(name);
        });
        checkProfiles();

-        initialized = true;
+        // Platform.runLater is necessary or profiles will be empty
+        // since checkProfiles adds 2 base profile later.
+        Platform.runLater(() -> {
+            initialized = true;

-        selectedProfile.set(
-                profiles.stream()
-                        .filter(it -> it.getName().equals(config().getSelectedProfile()))
-                        .findFirst()
-                        .orElse(profiles.get(0)));
+            selectedProfile.set(
+                    profiles.stream()
+                            .filter(it -> it.getName().equals(config().getSelectedProfile()))
+                            .findFirst()
+                            .orElse(profiles.get(0)));
+        });
+
+        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
+            JFXUtilities.runInFX(() -> {
+                Profile profile = selectedProfile.get();
+                if (profile != null && profile.getRepository() == event.getSource()) {
+                    selectedVersion.bind(profile.selectedVersionProperty());
+                    for (Consumer<Profile> listener : versionsListeners)
+                        listener.accept(profile);
+                }
+            });
+        });
    }

    public static ObservableList<Profile> getProfiles() {
@@ -160,4 +192,24 @@ public final class Profiles {
    public static ObjectProperty<Profile> selectedProfileProperty() {
        return selectedProfile;
    }
+
+    private static final ReadOnlyStringWrapper selectedVersion = new ReadOnlyStringWrapper();
+
+    public static ReadOnlyStringProperty selectedVersionProperty() {
+        return selectedVersion.getReadOnlyProperty();
+    }
+
+    // Guaranteed that the repository is loaded.
+    public static String getSelectedVersion() {
+        return selectedVersion.get();
+    }
+
+    private static final List<Consumer<Profile>> versionsListeners = new LinkedList<>();
+
+    public static void registerVersionsListener(Consumer<Profile> listener) {
+        Profile profile = getSelectedProfile();
+        if (profile != null && profile.getRepository().isLoaded())
+            listener.accept(profile);
+        versionsListeners.add(listener);
+    }
 }
@@ -17,11 +17,14 @@
 */
 package org.jackhuang.hmcl.setting;

-import javafx.scene.text.Font;
+import javafx.beans.binding.Bindings;
 import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.util.CacheRepository;

+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
+
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;

 public class Settings {
@@ -49,16 +52,15 @@ public class Settings {
        Profiles.init();

        CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
-        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(config().commonDirectoryProperty());
-    }
-
-    public Font getFont() {
-        return Font.font(config().getFontFamily(), config().getFontSize());
-    }
-
-    public void setFont(Font font) {
-        config().setFontFamily(font.getFamily());
-        config().setFontSize(font.getSize());
+        HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
+            String str = getCommonDirectory();
+            try {
+                Paths.get(str);
+                return str;
+            } catch (InvalidPathException e) {
+                return getDefaultCommonDirectory();
+            }
+        }, config().commonDirectoryProperty(), config().commonDirTypeProperty()));
    }

    public static String getDefaultCommonDirectory() {
@@ -22,9 +22,10 @@ import com.google.gson.stream.JsonWriter;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.scene.paint.Color;
-import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.IOUtils;
+
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;

 import java.io.File;
 import java.io.IOException;
@@ -22,10 +22,17 @@ import javafx.beans.InvalidationListener;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.game.LaunchOptions;
 import org.jackhuang.hmcl.util.*;
+import org.jackhuang.hmcl.util.javafx.ImmediateBooleanProperty;
+import org.jackhuang.hmcl.util.javafx.ImmediateIntegerProperty;
+import org.jackhuang.hmcl.util.javafx.ImmediateObjectProperty;
+import org.jackhuang.hmcl.util.javafx.ImmediateStringProperty;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -449,12 +456,12 @@ public final class VersionSetting {
        if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
        else if (isUsesCustomJavaDir()) {
            try {
-                return JavaVersion.fromExecutable(new File(getJavaDir()));
+                return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
            } catch (IOException e) {
                return null; // Custom Java Directory not found,
            }
        } else if (StringUtils.isNotBlank(getJava())) {
-            List<JavaVersion> matchedJava = JavaVersion.getJREs().stream()
+            List<JavaVersion> matchedJava = JavaVersion.getJavas().stream()
                    .filter(java -> java.getVersion().equals(getJava()))
                    .collect(Collectors.toList());
            if (matchedJava.isEmpty()) {
@@ -39,7 +39,7 @@ import org.jackhuang.hmcl.ui.profile.ProfileList;
 import org.jackhuang.hmcl.ui.versions.GameList;
 import org.jackhuang.hmcl.ui.versions.VersionPage;
 import org.jackhuang.hmcl.util.FutureCallback;
-import org.jackhuang.hmcl.util.JavaVersion;
+import org.jackhuang.hmcl.util.platform.JavaVersion;

 import java.util.function.Consumer;

@@ -31,26 +31,33 @@ import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
 import org.jackhuang.hmcl.util.*;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -83,13 +90,18 @@ public final class FXUtils {
    }

    public static <T> void onChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
-        onChange(value, consumer);
        consumer.accept(value.getValue());
+        onChange(value, consumer);
    }

    public static <T> void onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
-        onWeakChange(value, consumer);
        consumer.accept(value.getValue());
+        onWeakChange(value, consumer);
+    }
+
+    public static void runLaterIf(BooleanSupplier condition, Runnable runnable) {
+        if (condition.getAsBoolean()) Platform.runLater(() -> runLaterIf(condition, runnable));
+        else runnable.run();
    }

    public static void limitSize(ImageView imageView, double maxWidth, double maxHeight) {
@@ -195,6 +207,14 @@ public final class FXUtils {
        return region.getMaxHeight();
    }

+    public static Node limitingSize(Node node, double width, double height) {
+        StackPane pane = new StackPane(node);
+        pane.setAlignment(Pos.CENTER);
+        FXUtils.setLimitWidth(pane, width);
+        FXUtils.setLimitHeight(pane, height);
+        return pane;
+    }
+
    public static void smoothScrolling(ScrollPane scrollPane) {
        JFXScrollPane.smoothScrolling(scrollPane);
    }
@@ -203,7 +223,11 @@ public final class FXUtils {
        FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
        loader.setRoot(node);
        loader.setController(node);
-        Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
+        try {
+            loader.load();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
    }

    public static void installTooltip(Node node, String tooltip) {
@@ -328,7 +352,7 @@ public final class FXUtils {
     * @param comboBox the combo box being bound with {@code property}.
     * @param property the property being bound with {@code combo box}.
     * @see #unbindEnum(JFXComboBox)
-     * @deprecated Use {@link SelectionModelSelectedItemProperty#selectedItemPropertyFor(ComboBox)}
+     * @deprecated Use {@link ExtendedProperties#selectedItemPropertyFor(ComboBox)}
     */
    @SuppressWarnings("unchecked")
    @Deprecated
@@ -459,4 +483,11 @@ public final class FXUtils {
            return "Interpolator.SINE";
        }
    };
+
+    public static Runnable withJFXPopupClosing(Runnable runnable, JFXPopup popup) {
+        return () -> {
+            runnable.run();
+            popup.hide();
+        };
+    }
 }
@@ -1,241 +0,0 @@
-/*
- * 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;
-
-import com.jfoenix.concurrency.JFXUtilities;
-import com.jfoenix.controls.*;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-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.scene.layout.VBox;
-import javafx.stage.FileChooser;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
-import org.jackhuang.hmcl.game.GameVersion;
-import org.jackhuang.hmcl.game.HMCLGameRepository;
-import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.game.Version;
-import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
-import org.jackhuang.hmcl.mod.UnsupportedModpackException;
-import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.Theme;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.task.TaskExecutor;
-import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.ui.versions.Versions;
-import org.jackhuang.hmcl.util.Lang;
-import org.jackhuang.hmcl.util.VersionNumber;
-
-import java.io.File;
-import java.io.IOException;
-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 class GameVersionListPage extends StackPane {
-    private final JFXSpinner spinner;
-    private final StackPane contentPane;
-    private final JFXMasonryPane masonryPane;
-
-    private Profile profile;
-
-    public GameVersionListPage() {
-        spinner = new JFXSpinner();
-        spinner.getStyleClass().setAll("first-spinner");
-
-        contentPane = new StackPane();
-
-        ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-        scrollPane.setFitToWidth(true);
-
-        masonryPane = new JFXMasonryPane();
-        masonryPane.setHSpacing(3);
-        masonryPane.setVSpacing(3);
-        masonryPane.setCellWidth(182);
-        masonryPane.setCellHeight(153);
-
-        scrollPane.setContent(masonryPane);
-
-        VBox vBox = new VBox();
-        vBox.setPadding(new Insets(15));
-        vBox.setPickOnBounds(false);
-        vBox.setAlignment(Pos.BOTTOM_RIGHT);
-        vBox.setSpacing(15);
-
-        JFXButton btnRefresh = new JFXButton();
-        btnRefresh.setPrefWidth(40);
-        btnRefresh.setPrefHeight(40);
-        btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
-        btnRefresh.getStyleClass().setAll("jfx-button-raised-round");
-        btnRefresh.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1));
-        btnRefresh.setOnMouseClicked(e -> profile.getRepository().refreshVersionsAsync().start());
-        FXUtils.installTooltip(btnRefresh, i18n("button.refresh"));
-
-        vBox.getChildren().setAll(btnRefresh);
-
-        contentPane.getChildren().setAll(scrollPane, vBox);
-
-        getChildren().setAll(spinner);
-
-        Profiles.selectedProfileProperty().addListener((o, a, b) -> this.profile = b);
-        profile = Profiles.getSelectedProfile();
-
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> {
-            if (event.getSource() == profile.getRepository())
-                loadVersions((HMCLGameRepository) event.getSource());
-        });
-        EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
-            if (event.getSource() == profile.getRepository())
-                // This will occupy 0.5s. Too slow!
-                JFXUtilities.runInFX(this::loadingVersions);
-        });
-        if (profile.getRepository().isLoaded())
-            loadVersions(profile.getRepository());
-        else
-            profile.getRepository().refreshVersionsAsync().start();
-    }
-
-    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));
-        Task.ofResult("game", gameCallable).subscribe(Schedulers.javafx(), vars -> {
-            String game = vars.get("game");
-            item.setGameVersion(game);
-
-            StringBuilder libraries = new StringBuilder();
-            LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
-            analyzer.getForge().ifPresent(library -> libraries.append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n"));
-            analyzer.getLiteLoader().ifPresent(library -> libraries.append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n"));
-            analyzer.getOptiFine().ifPresent(library -> libraries.append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n"));
-
-            item.setLibraries(libraries.toString());
-        });
-        item.setVersionName(id);
-        item.setOnLaunchButtonClicked(e -> Versions.launch(profile, id));
-        item.setOnScriptButtonClicked(e -> Versions.generateLaunchScript(profile, id));
-        item.setOnSettingsButtonClicked(e -> {
-            Controllers.getVersionPage().load(id, profile);
-            Controllers.navigate(Controllers.getVersionPage());
-        });
-        item.setOnUpdateButtonClicked(event -> {
-            FileChooser chooser = new FileChooser();
-            chooser.setTitle(i18n("modpack.choose"));
-            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
-            File selectedFile = chooser.showOpenDialog(Controllers.getStage());
-            if (selectedFile != null) {
-                AtomicReference<Region> region = new AtomicReference<>();
-                try {
-                    TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, id, ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(id)))
-                            .then(Task.of(Schedulers.javafx(), () -> region.get().fireEvent(new DialogCloseEvent()))).executor();
-                    region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
-                    executor.start();
-                } catch (UnsupportedModpackException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (MismatchedModpackTypeException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                } catch (IOException e) {
-                    region.get().fireEvent(new DialogCloseEvent());
-                    Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
-                }
-            }
-        });
-        item.setOnMouseClicked(event -> {
-            if (event.getButton() == MouseButton.SECONDARY) {
-                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:
-                            Versions.renameVersion(profile, id);
-                            break;
-                        case 1:
-                            Versions.deleteVersion(profile, id);
-                            break;
-                        case 2:
-                            Versions.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) {
-                Versions.launch(profile, id);
-            }
-        });
-        File iconFile = repository.getVersionIcon(id);
-        if (iconFile.exists())
-            item.setImage(new Image("file:" + iconFile.getAbsolutePath()));
-        return item;
-    }
-
-    private void loadingVersions() {
-        getChildren().setAll(spinner);
-        masonryPane.getChildren().clear();
-    }
-
-    private void loadVersions(HMCLGameRepository repository) {
-        List<Node> children = repository.getVersions().parallelStream()
-                .filter(version -> !version.isHidden())
-                .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
-                .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);
-            }
-        });
-    }
-}
@@ -19,9 +19,8 @@ package org.jackhuang.hmcl.ui;

 import com.jfoenix.concurrency.JFXUtilities;
 import javafx.application.Platform;
-import javafx.beans.binding.When;
+import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
-import javafx.scene.paint.Color;
 import org.jackhuang.hmcl.event.EventBus;
 import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
@@ -29,19 +28,19 @@ import org.jackhuang.hmcl.game.ModpackHelper;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.UnsupportedModpackException;
 import org.jackhuang.hmcl.setting.Accounts;
+import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
 import org.jackhuang.hmcl.ui.account.AddAccountPane;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
 import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
 import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
-import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.ui.versions.Versions;

 import java.io.File;
 import java.util.concurrent.atomic.AtomicReference;
@@ -55,38 +54,48 @@ public final class LeftPaneController extends AdvancedListBox {
        AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
        accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
        accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
+
        GameAdvancedListItem gameListItem = new GameAdvancedListItem();
-        gameListItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
+        gameListItem.actionButtonVisibleProperty().bind(Profiles.selectedVersionProperty().isNotNull());
+        gameListItem.setOnAction(e -> {
+        	Profile profile = Profiles.getSelectedProfile();
+        	String version = Profiles.getSelectedVersion();
+        	if (version == null) {
+        		Controllers.navigate(Controllers.getGameListPage());
+        	} else {
+        		Versions.modifyGameSettings(profile, version);        	
+        	}
+        });
+
        ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
        profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
        profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());

-        IconedItem launcherSettingsItem = new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), "iconed-item");
+        AdvancedListItem gameItem = new AdvancedListItem();
+        gameItem.setImage(new Image("/assets/img/bookshelf.png"));
+        gameItem.setTitle(i18n("version.manage"));
+        gameItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));

-        launcherSettingsItem.getLabel().textProperty().bind(
-                new When(UpdateChecker.outdatedProperty())
-                        .then(i18n("update.found"))
-                        .otherwise(i18n("settings.launcher")));
-
-        launcherSettingsItem.getLabel().textFillProperty().bind(
-                new When(UpdateChecker.outdatedProperty())
-                        .then(Color.RED)
-                        .otherwise(Color.BLACK));
-
-        launcherSettingsItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
+        AdvancedListItem launcherSettingsItem = new AdvancedListItem();
+        launcherSettingsItem.setImage(new Image("/assets/img/command.png"));
+        launcherSettingsItem.setTitle(i18n("settings.launcher"));
+        launcherSettingsItem.setOnAction(e -> Controllers.navigate(Controllers.getSettingsPage()));

        this
                .startCategory(i18n("account").toUpperCase())
                .add(accountListItem)
                .startCategory(i18n("version").toUpperCase())
                .add(gameListItem)
+                .add(gameItem)
                .startCategory(i18n("profile.title").toUpperCase())
                .add(profileListItem)
                .startCategory(i18n("launcher").toUpperCase())
                .add(launcherSettingsItem);

        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
-        if (Profiles.selectedProfileProperty().get().getRepository().isLoaded())
+
+        Profile profile = Profiles.getSelectedProfile();
+        if (profile != null && profile.getRepository().isLoaded())
            onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
    }

@@ -22,26 +22,43 @@ import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;

 public abstract class ListPage<T extends Node> extends Control {
-    private final ListProperty<T> items = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final BooleanProperty loading = new SimpleBooleanProperty(false);
+    private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
+    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);

    public abstract void add();

-    public ListProperty<T> itemsProperty() {
-        return items;
-    }
-
-    public BooleanProperty loadingProperty() {
-        return loading;
-    }
-
    @Override
    protected Skin<?> createDefaultSkin() {
        return new ListPageSkin(this);
    }
+
+    public ObservableList<T> getItems() {
+        return items.get();
+    }
+
+    public void setItems(ObservableList<T> items) {
+        this.items.set(items);
+    }
+
+    public ListProperty<T> itemsProperty() {
+        return items;
+    }
+
+    public boolean isLoading() {
+        return loading.get();
+    }
+
+    public void setLoading(boolean loading) {
+        this.loading.set(loading);
+    }
+
+    public BooleanProperty loadingProperty() {
+        return loading;
+    }
 }
@@ -33,11 +33,10 @@ import javafx.stage.Stage;
 import org.jackhuang.hmcl.event.Event;
 import org.jackhuang.hmcl.event.EventManager;
 import org.jackhuang.hmcl.game.LauncherHelper;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.util.IOUtils;
 import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.Log4jLevel;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -176,7 +175,7 @@ public final class LogWindow extends Stage {

            engine = webView.getEngine();
            engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
-                    .replace("${FONT}", Settings.instance().getFont().getSize() + "px \"" + Settings.instance().getFont().getFamily() + "\""));
+                    .replace("${FONT}", config().getFontSize() + "px \"" + config().getFontFamily() + "\""));
            engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
                if (newValue == Worker.State.SUCCEEDED) {
                    document = engine.getDocument();
@@ -17,33 +17,172 @@
 */
 package org.jackhuang.hmcl.ui;

+import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXPopup;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.StackPane;
-import org.jackhuang.hmcl.setting.ConfigHolder;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+import org.jackhuang.hmcl.game.HMCLGameRepository;
+import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
+import org.jackhuang.hmcl.ui.construct.RipplerContainer;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
+import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
+import org.jackhuang.hmcl.ui.versions.GameItem;
 import org.jackhuang.hmcl.ui.versions.Versions;
+import org.jackhuang.hmcl.upgrade.RemoteVersion;
+import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.upgrade.UpdateHandler;
+import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class MainPage extends StackPane implements DecoratorPage {
-
    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("main_page"));

+    private final PopupMenu menu = new PopupMenu();
+    private final JFXPopup popup = new JFXPopup(menu);
+
    @FXML
    private StackPane main;
+    @FXML
+    private StackPane updatePane;
+    @FXML
+    private JFXButton btnLaunch;
+    @FXML
+    private JFXButton btnMenu;
+    @FXML
+    private JFXButton closeUpdateButton;
+    @FXML
+    private Label lblCurrentGame;
+    @FXML
+    private Label lblIcon;
+    @FXML
+    private TwoLineListItem lblLatestVersion;
+    @FXML
+    private Rectangle separator;

    {
        FXUtils.loadFXML(this, "/assets/fxml/main.fxml");

-        FXUtils.onChangeAndOperate(ConfigHolder.config().enableMainPageGameListProperty(), newValue -> {
-            if (newValue)
-                getChildren().setAll(new GameVersionListPage());
-            else
-                getChildren().setAll(main);
+        btnLaunch.setClip(new Rectangle(-100, -100, 310, 200));
+        btnMenu.setClip(new Rectangle(211, -100, 100, 200));
+        menu.setMaxHeight(365);
+        menu.setMaxWidth(545);
+        menu.setAlwaysShowingVBar(true);
+
+        updatePane.visibleProperty().bind(UpdateChecker.outdatedProperty());
+        closeUpdateButton.setGraphic(SVG.close(Theme.whiteFillBinding(), 10, 10));
+        closeUpdateButton.setOnMouseClicked(event -> {
+            Duration duration = Duration.millis(320);
+            Timeline nowAnimation = new Timeline();
+            nowAnimation.getKeyFrames().addAll(
+                    new KeyFrame(Duration.ZERO,
+                            new KeyValue(updatePane.translateXProperty(), 0, Interpolator.EASE_IN)),
+                    new KeyFrame(duration,
+                            new KeyValue(updatePane.translateXProperty(), 260, Interpolator.EASE_IN)),
+                    new KeyFrame(duration, e -> {
+                updatePane.visibleProperty().unbind();
+                updatePane.setVisible(false);
+            }));
+            nowAnimation.play();
+        });
+        lblIcon.setGraphic(SVG.update(Theme.whiteFillBinding(), 20, 20));
+        lblLatestVersion.titleProperty().bind(
+                MultiStepBinding.of(UpdateChecker.latestVersionProperty())
+                        .map(version -> version == null ? "" : i18n("update.bubble.title", version.getVersion())));
+
+        StackPane graphic = new StackPane();
+        Node svg = SVG.triangle(Theme.whiteFillBinding(), 10, 10);
+        StackPane.setAlignment(svg, Pos.CENTER_RIGHT);
+        graphic.getChildren().setAll(svg);
+        graphic.setTranslateX(12);
+        btnMenu.setGraphic(graphic);
+
+        FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), version -> {
+            if (version != null) {
+                lblCurrentGame.setText(version);
+            } else {
+                lblCurrentGame.setText(i18n("version.empty"));
+            }
+        });
+
+        Profiles.registerVersionsListener(this::loadVersions);
+
+        setOnDragOver(event -> {
+            if (event.getGestureSource() != this && event.getDragboard().hasFiles()) {
+                if (event.getDragboard().getFiles().stream().anyMatch(it -> "zip".equals(FileUtils.getExtension(it))))
+                event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
+            }
+            event.consume();
+        });
+
+        setOnDragDropped(event -> {
+            List<File> files = event.getDragboard().getFiles();
+            if (files != null) {
+                List<File> modpacks = files.stream()
+                        .filter(it -> "zip".equals(FileUtils.getExtension(it)))
+                        .collect(Collectors.toList());
+                if (!modpacks.isEmpty()) {
+                    File modpack = modpacks.get(0);
+                    Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(modpack), i18n("install.modpack"));
+                    event.setDropCompleted(true);
+                }
+            }
+            event.consume();
+        });
+    }
+
+    private void loadVersions(Profile profile) {
+        HMCLGameRepository repository = profile.getRepository();
+        List<Node> children = repository.getVersions().parallelStream()
+                .filter(version -> !version.isHidden())
+                .sorted(Comparator.comparing(Version::getReleaseTime).thenComparing(a -> VersionNumber.asVersion(a.getId())))
+                .map(version -> {
+                    StackPane pane = new StackPane();
+                    GameItem item = new GameItem(profile, version.getId());
+                    pane.getChildren().setAll(item);
+                    pane.getStyleClass().setAll("menu-container");
+                    item.setMouseTransparent(true);
+                    RipplerContainer container = new RipplerContainer(pane);
+                    container.setOnMouseClicked(e -> {
+                        profile.setSelectedVersion(version.getId());
+                        popup.hide();
+                    });
+                    return container;
+                })
+                .collect(Collectors.toList());
+        JFXUtilities.runInFX(() -> {
+            if (profile == Profiles.getSelectedProfile())
+                menu.getContent().setAll(children);
        });
    }

@@ -53,6 +192,20 @@ public final class MainPage extends StackPane implements DecoratorPage {
        Versions.launch(profile, profile.getSelectedVersion());
    }

+    @FXML
+    private void onMenu() {
+        popup.show(btnMenu, JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.RIGHT, 0, -btnMenu.getHeight());
+    }
+
+    @FXML
+    private void onUpgrade() {
+        RemoteVersion target = UpdateChecker.getLatestVersion();
+        if (target == null) {
+            return;
+        }
+        UpdateHandler.updateFrom(target);
+    }
+
    public String getTitle() {
        return title.get();
    }
@@ -150,4 +150,16 @@ public final class SVG {
    public static Node openInNew(ObjectBinding<? extends Paint> fill, double width, double height) {
        return createSVGPath("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z", fill, width, height);
    }
+
+    public static Node triangle(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M1,21H23L12,2", fill, width, height);
+    }
+
+    public static Node home(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z", fill, width, height);
+    }
+
+    public static Node viewList(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z", fill, width, height);
+    }
 }
@@ -36,24 +36,22 @@ import org.jackhuang.hmcl.upgrade.RemoteVersion;
 import org.jackhuang.hmcl.upgrade.UpdateChannel;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
 import org.jackhuang.hmcl.upgrade.UpdateHandler;
-import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.i18n.Locales;
+import org.jackhuang.hmcl.util.javafx.SafeStringConverter;

 import java.net.Proxy;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.Optional;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
-import static org.jackhuang.hmcl.util.SelectionModelSelectedItemProperty.selectedItemPropertyFor;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.reservedSelectedPropertyFor;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.selectedItemPropertyFor;

 public final class SettingsPage extends SettingsView implements DecoratorPage {
    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("settings.launcher"));

-    private ObjectProperty<Proxy.Type> selectedProxyType;
-
    private InvalidationListener updateListener;

    public SettingsPage() {
@@ -64,26 +62,19 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
        selectedItemPropertyFor(cboDownloadSource).bindBidirectional(config().downloadTypeProperty());
        // ====

-        chkEnableGameList.selectedProperty().bindBidirectional(config().enableMainPageGameListProperty());
+        // ==== Font ====
+        cboFont.valueProperty().bindBidirectional(config().fontFamilyProperty());

-        cboFont.initValue(Settings.instance().getFont());
-        cboFont.valueProperty().addListener((a, b, newValue) -> {
-            Font font = Font.font(newValue, Settings.instance().getFont().getSize());
-            Settings.instance().setFont(font);
-            lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
-        });
+        txtFontSize.textProperty().bindBidirectional(config().fontSizeProperty(),
+                SafeStringConverter.fromFiniteDouble()
+                        .restrict(it -> it > 0)
+                        .fallbackTo(12.0)
+                        .asPredicate(Validator.addTo(txtFontSize)));

-        txtFontSize.setText(Double.toString(Settings.instance().getFont().getSize()));
-        txtFontSize.getValidators().add(new Validator(it -> Lang.toDoubleOrNull(it) != null));
-        txtFontSize.textProperty().addListener((a, b, newValue) -> {
-            if (txtFontSize.validate()) {
-                Font font = Font.font(Settings.instance().getFont().getFamily(), Double.parseDouble(newValue));
-                Settings.instance().setFont(font);
-                lblDisplay.setStyle("-fx-font: " + font.getSize() + " \"" + font.getFamily() + "\";");
-            }
-        });
-
-        lblDisplay.setStyle("-fx-font: " + Settings.instance().getFont().getSize() + " \"" + Settings.instance().getFont().getFamily() + "\";");
+        lblDisplay.fontProperty().bind(Bindings.createObjectBinding(
+                () -> Font.font(config().getFontFamily(), config().getFontSize()),
+                config().fontFamilyProperty(), config().fontSizeProperty()));
+        // ====

        // ==== Languages ====
        cboLanguage.getItems().setAll(Locales.LOCALES);
@@ -99,40 +90,15 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
        proxyPane.disableProperty().bind(chkDisableProxy.selectedProperty());
        authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());

-        chkDisableProxy.setSelected(!config().hasProxy());
-        chkDisableProxy.selectedProperty().addListener(o -> config().setHasProxy(!chkDisableProxy.isSelected()));
-        config().hasProxyProperty().addListener(o -> chkDisableProxy.setSelected(!config().hasProxy()));
+        reservedSelectedPropertyFor(chkDisableProxy).bindBidirectional(config().hasProxyProperty());
        chkProxyAuthentication.selectedProperty().bindBidirectional(config().hasProxyAuthProperty());

-        selectedProxyType = new SimpleObjectProperty<Proxy.Type>(Proxy.Type.HTTP) {
-            {
-                invalidated();
-            }
-
-            @Override
-            protected void invalidated() {
-                Proxy.Type type = Objects.requireNonNull(get());
-                if (type == Proxy.Type.DIRECT) {
-                    set(Proxy.Type.HTTP); // HTTP by default
-                } else {
-                    chkProxyHttp.setSelected(type == Proxy.Type.HTTP);
-                    chkProxySocks.setSelected(type == Proxy.Type.SOCKS);
-                }
-            }
-        };
-        selectedProxyType.bindBidirectional(config().proxyTypeProperty());
-
        ToggleGroup proxyConfigurationGroup = new ToggleGroup();
        chkProxyHttp.setUserData(Proxy.Type.HTTP);
        chkProxyHttp.setToggleGroup(proxyConfigurationGroup);
        chkProxySocks.setUserData(Proxy.Type.SOCKS);
        chkProxySocks.setToggleGroup(proxyConfigurationGroup);
-        proxyConfigurationGroup.getToggles().forEach(
-                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        selectedProxyType.set((Proxy.Type) toggle.getUserData());
-                    }
-                }));
+        selectedItemPropertyFor(proxyConfigurationGroup, Proxy.Type.class).bindBidirectional(config().proxyTypeProperty());
        // ====

        fileCommonLocation.loadChildren(Arrays.asList(
@@ -177,27 +143,12 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {

        lblUpdateNote.setWrappingWidth(470);

-        ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<UpdateChannel>() {
-            @Override
-            protected void invalidated() {
-                UpdateChannel updateChannel = Objects.requireNonNull(get());
-                chkUpdateDev.setSelected(updateChannel == UpdateChannel.DEVELOPMENT);
-                chkUpdateStable.setSelected(updateChannel == UpdateChannel.STABLE);
-            }
-        };
-
        ToggleGroup updateChannelGroup = new ToggleGroup();
        chkUpdateDev.setToggleGroup(updateChannelGroup);
        chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT);
        chkUpdateStable.setToggleGroup(updateChannelGroup);
        chkUpdateStable.setUserData(UpdateChannel.STABLE);
-        updateChannelGroup.getToggles().forEach(
-                toggle -> toggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        updateChannel.set((UpdateChannel) toggle.getUserData());
-                    }
-                }));
-        updateChannel.bindBidirectional(ConfigHolder.config().updateChannelProperty());
+        selectedItemPropertyFor(updateChannelGroup, UpdateChannel.class).bindBidirectional(config().updateChannelProperty());
        // ====

        // ==== Background ====
@@ -64,7 +64,6 @@ public abstract class SettingsView extends StackPane {
    protected final JFXCheckBox chkProxyAuthentication;
    protected final GridPane authPane;
    protected final Pane proxyPane;
-    protected final JFXToggleButton chkEnableGameList;

    public SettingsView() {
        scroll = new ScrollPane();
@@ -165,23 +164,6 @@ public abstract class SettingsView extends StackPane {
                    settingsPane.getContent().add(backgroundItem);
                }

-                {
-                    BorderPane borderPane = new BorderPane();
-
-                    Label left = new Label(i18n("settings.launcher.enable_game_list"));
-                    BorderPane.setAlignment(left, Pos.CENTER_LEFT);
-                    borderPane.setLeft(left);
-
-                    chkEnableGameList = new JFXToggleButton();
-                    chkEnableGameList.setSize(8);
-                    FXUtils.setLimitHeight(chkEnableGameList, 20);
-                    borderPane.setRight(chkEnableGameList);
-
-                    // Do not uncomment this line,
-                    // since option for user to enable game list in main page is unnecessary
-                    // settingsPane.addChildren(borderPane);
-                }
-
                {
                    BorderPane downloadSourcePane = new BorderPane();
                    {
@@ -258,7 +240,6 @@ public abstract class SettingsView extends StackPane {

                            {
                                txtProxyHost = new JFXTextField();
-                                txtProxyHost.getStyleClass().setAll("fit-width");
                                GridPane.setRowIndex(txtProxyHost, 1);
                                GridPane.setColumnIndex(txtProxyHost, 1);
                                gridPane.getChildren().add(txtProxyHost);
@@ -274,7 +255,6 @@ public abstract class SettingsView extends StackPane {

                            {
                                txtProxyPort = new JFXTextField();
-                                txtProxyPort.getStyleClass().setAll("fit-width");
                                GridPane.setRowIndex(txtProxyPort, 2);
                                GridPane.setColumnIndex(txtProxyPort, 1);
                                FXUtils.setValidateWhileTextChanged(txtProxyPort, true);
@@ -311,7 +291,6 @@ public abstract class SettingsView extends StackPane {

                            {
                                txtProxyUsername = new JFXTextField();
-                                txtProxyUsername.getStyleClass().setAll("fit-width");
                                GridPane.setRowIndex(txtProxyUsername, 0);
                                GridPane.setColumnIndex(txtProxyUsername, 1);
                                authPane.getChildren().add(txtProxyUsername);
@@ -326,7 +305,6 @@ public abstract class SettingsView extends StackPane {

                            {
                                txtProxyPassword = new JFXPasswordField();
-                                txtProxyPassword.getStyleClass().setAll("fit-width");
                                GridPane.setRowIndex(txtProxyPassword, 1);
                                GridPane.setColumnIndex(txtProxyPassword, 1);
                                authPane.getChildren().add(txtProxyPassword);
@@ -1,231 +0,0 @@
-/*
- * 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.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;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
-import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.setting.Theme;
-
-import java.util.Optional;
-
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-public final class VersionItem extends StackPane {
-    @FXML
-    private Pane icon;
-    @FXML
-    private VBox content;
-    @FXML
-    private StackPane header;
-    @FXML
-    private StackPane body;
-    @FXML
-    private JFXButton btnSettings;
-    @FXML
-    private JFXButton btnUpdate;
-    @FXML
-    private JFXButton btnLaunch;
-    @FXML
-    private JFXButton btnScript;
-    @FXML
-    private Label lblVersionName;
-    @FXML
-    private Label lblGameVersion;
-    @FXML
-    private Label lblLibraries;
-    @FXML
-    private ImageView iconView;
-
-    private EventHandler<? super MouseEvent> launchClickedHandler = null;
-
-    private void initializeComponents() {
-        setPickOnBounds(false);
-        FXUtils.setLimitWidth(this, 160);
-        FXUtils.setLimitHeight(this, 149);
-
-        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() {
-        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));
-
-        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);
-
-        setOnMouseClicked(e -> {
-            if (e.getButton() == MouseButton.PRIMARY)
-                if (e.getClickCount() == 2)
-                    Optional.ofNullable(launchClickedHandler).ifPresent(h -> h.handle(e));
-        });
-    }
-
-    public void setUpdate(boolean update) {
-        btnUpdate.setVisible(update);
-    }
-
-    public void setVersionName(String versionName) {
-        lblVersionName.setText(versionName);
-    }
-
-    public void setGameVersion(String gameVersion) {
-        lblGameVersion.setText(gameVersion);
-    }
-
-    public void setLibraries(String libraries) {
-        lblLibraries.setText(libraries);
-    }
-
-    public void setImage(Image image) {
-        iconView.setImage(image);
-    }
-
-    public void setOnSettingsButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnSettings.setOnMouseClicked(handler);
-    }
-
-    public void setOnScriptButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnScript.setOnMouseClicked(handler);
-    }
-
-    public void setOnLaunchButtonClicked(EventHandler<? super MouseEvent> handler) {
-        launchClickedHandler = handler;
-        btnLaunch.setOnMouseClicked(handler);
-    }
-
-    public void setOnUpdateButtonClicked(EventHandler<? super MouseEvent> handler) {
-        btnUpdate.setOnMouseClicked(handler);
-    }
-}
@@ -24,7 +24,9 @@ import org.jackhuang.hmcl.auth.Account;
 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.Theme;
 import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -36,21 +38,21 @@ public class AccountAdvancedListItem extends AdvancedListItem {
        protected void invalidated() {
            Account account = get();
            if (account == null) {
-                titleProperty().set(i18n("account.missing"));
-                subtitleProperty().set(i18n("account.missing.add"));
-                imageProperty().set(new Image("/assets/img/craft_table.png"));
-                viewportProperty().set(null);
+                setTitle(i18n("account.missing"));
+                setSubtitle(i18n("account.missing.add"));
+                setImage(new Image("/assets/img/craft_table.png"));
            } else {
-                titleProperty().set(account.getCharacter());
-                subtitleProperty().set(accountSubtitle(account));
+                setTitle(account.getCharacter());
+                setSubtitle(accountSubtitle(account));

-                imageProperty().set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
-                viewportProperty().set(AccountHelper.getViewport(4));
+                final int scaleRatio = 4;
+                Image defaultSkin = AccountHelper.getDefaultSkin(account.getUUID(), scaleRatio);
+                setImage(AccountHelper.getHead(defaultSkin, scaleRatio));

                if (account instanceof YggdrasilAccount) {
                    AccountHelper.loadSkinAsync((YggdrasilAccount) account).subscribe(Schedulers.javafx(), () -> {
-                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                        imageProperty().set(image);
+                        Image image = AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio);
+                        setImage(AccountHelper.getHead(image, scaleRatio));
                    });
                }
            }
@@ -58,6 +60,7 @@ public class AccountAdvancedListItem extends AdvancedListItem {
    };

    public AccountAdvancedListItem() {
+        setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
    }

    public ObjectProperty<Account> accountProperty() {
@@ -19,48 +19,22 @@ package org.jackhuang.hmcl.ui.account;

 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.control.ToggleGroup;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.MappedObservableList;
-
-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;

 public class AccountList extends ListPage<AccountListItem> implements DecoratorPage {
-    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(i18n("account.manage"));
-    private ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
-        {
-            itemsProperty().addListener(onInvalidating(this::invalidated));
-        }
-
-        @Override
-        protected void invalidated() {
-            Account selected = get();
-            itemsProperty().forEach(item -> item.selectedProperty().set(item.getAccount() == selected));
-        }
-    };
-    private final ListProperty<Account> accounts = new SimpleListProperty<>(FXCollections.observableArrayList());
-
-    private ToggleGroup toggleGroup;
-    private final ObservableList<AccountListItem> accountItems;
+    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.manage"));
+    private final ListProperty<Account> accounts = new SimpleListProperty<>(this, "accounts", FXCollections.observableArrayList());
+    private final ObjectProperty<Account> selectedAccount;

    public AccountList() {
-        toggleGroup = new ToggleGroup();
-
-        accountItems = MappedObservableList.create(
-                accountsProperty(),
-                account -> new AccountListItem(toggleGroup, account));
-
-        itemsProperty().bindContent(accountItems);
-
-        toggleGroup.selectedToggleProperty().addListener((o, a, toggle) -> {
-            if (toggle == null || toggle.getUserData() == null) return;
-            selectedAccount.set(((AccountListItem) toggle.getUserData()).getAccount());
-        });
+        setItems(MappedObservableList.create(accounts, AccountListItem::new));
+        selectedAccount = createSelectedItemPropertyFor(getItems(), Account.class);
    }

    public ObjectProperty<Account> selectedAccountProperty() {
@@ -18,10 +18,8 @@
 package org.jackhuang.hmcl.ui.account;

 import javafx.beans.property.*;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.control.Control;
+import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
-import javafx.scene.control.ToggleGroup;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
@@ -34,18 +32,17 @@ import org.jackhuang.hmcl.task.Schedulers;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

-public class AccountListItem extends Control {
+public class AccountListItem extends RadioButton {
+
    private final Account account;
-    private final ToggleGroup toggleGroup;
    private final StringProperty title = new SimpleStringProperty();
    private final StringProperty subtitle = new SimpleStringProperty();
-    private final BooleanProperty selected = new SimpleBooleanProperty();
    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
-    private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();

-    public AccountListItem(ToggleGroup toggleGroup, Account account) {
+    public AccountListItem(Account account) {
        this.account = account;
-        this.toggleGroup = toggleGroup;
+        getStyleClass().clear();
+        setUserData(account);

        StringBuilder subtitleString = new StringBuilder(Accounts.getAccountTypeName(account));
        if (account instanceof AuthlibInjectorAccount) {
@@ -58,15 +55,12 @@ public class AccountListItem extends Control {
        else
            title.set(account.getUsername() + " - " + account.getCharacter());
        subtitle.set(subtitleString.toString());
-        selected.set(Accounts.selectedAccountProperty().get() == account);

-        viewport.set(AccountHelper.getViewport(4));
-        if (account instanceof YggdrasilAccount) {
-            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-            this.image.set(image);
-        } else {
-            this.image.set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
-        }
+        final int scaleRatio = 4;
+        Image image = account instanceof YggdrasilAccount ?
+                AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio) :
+                AccountHelper.getDefaultSkin(account.getUUID(), scaleRatio);
+        this.image.set(AccountHelper.getHead(image, scaleRatio));
    }

    @Override
@@ -74,34 +68,6 @@ public class AccountListItem extends Control {
        return new AccountListItemSkin(this);
    }

-    public ToggleGroup getToggleGroup() {
-        return toggleGroup;
-    }
-
-    public Account getAccount() {
-        return account;
-    }
-
-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public StringProperty subtitleProperty() {
-        return subtitle;
-    }
-
-    public BooleanProperty selectedProperty() {
-        return selected;
-    }
-
-    public ObjectProperty<Image> imageProperty() {
-        return image;
-    }
-
-    public ObjectProperty<Rectangle2D> viewportProperty() {
-        return viewport;
-    }
-
    public void refresh() {
        if (account instanceof YggdrasilAccount) {
            // progressBar.setVisible(true);
@@ -110,8 +76,9 @@ public class AccountListItem extends Control {
                        // progressBar.setVisible(false);

                        if (isDependentsSucceeded) {
-                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
-                            this.image.set(image);
+                            final int scaleRatio = 4;
+                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio);
+                            this.image.set(AccountHelper.getHead(image, scaleRatio));
                        }
                    }).start();
        }
@@ -120,4 +87,44 @@ public class AccountListItem extends Control {
    public void remove() {
        Accounts.getAccounts().remove(account);
    }
+
+    public Account getAccount() {
+        return account;
+    }
+
+    public String getTitle() {
+        return title.get();
+    }
+
+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public String getSubtitle() {
+        return subtitle.get();
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle.set(subtitle);
+    }
+
+    public StringProperty subtitleProperty() {
+        return subtitle;
+    }
+
+    public Image getImage() {
+        return image.get();
+    }
+
+    public void setImage(Image image) {
+        this.image.set(image);
+    }
+
+    public ObjectProperty<Image> imageProperty() {
+        return image;
+    }
 }
@@ -26,7 +26,6 @@ import javafx.scene.control.SkinBase;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -41,26 +40,23 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {

        BorderPane root = new BorderPane();

-        JFXRadioButton chkSelected = new JFXRadioButton();
+        JFXRadioButton chkSelected = new JFXRadioButton() {
+            @Override
+            public void fire() {
+                skinnable.fire();
+            }
+        };
        BorderPane.setAlignment(chkSelected, Pos.CENTER);
-        chkSelected.setUserData(skinnable);
-        chkSelected.selectedProperty().bindBidirectional(skinnable.selectedProperty());
-        chkSelected.setToggleGroup(skinnable.getToggleGroup());
+        chkSelected.selectedProperty().bind(skinnable.selectedProperty());
        root.setLeft(chkSelected);

        HBox center = new HBox();
        center.setSpacing(8);
        center.setAlignment(Pos.CENTER_LEFT);

-        StackPane imageViewContainer = new StackPane();
-        FXUtils.setLimitWidth(imageViewContainer, 32);
-        FXUtils.setLimitHeight(imageViewContainer, 32);
-
        ImageView imageView = new ImageView();
        FXUtils.limitSize(imageView, 32, 32);
        imageView.imageProperty().bind(skinnable.imageProperty());
-        imageView.viewportProperty().bind(skinnable.viewportProperty());
-        imageViewContainer.getChildren().setAll(imageView);

        TwoLineListItem item = new TwoLineListItem();
        BorderPane.setAlignment(item, Pos.CENTER);
@@ -31,6 +31,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.*;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
 import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
@@ -42,7 +43,6 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.*;
-import org.jackhuang.hmcl.util.Constants;
 import org.jackhuang.hmcl.util.Logging;

 import java.util.List;
@@ -66,6 +66,8 @@ public class AddAccountPane extends StackPane {
    @FXML private Hyperlink linkManageInjectorServers;
    @FXML private JFXDialogLayout layout;
    @FXML private JFXButton btnAccept;
+    @FXML private JFXButton btnAddServer;
+    @FXML private JFXButton btnManageServer;
    @FXML private SpinnerPane acceptPane;

    public AddAccountPane() {
@@ -81,6 +83,9 @@ public class AddAccountPane extends StackPane {
        cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
        cboType.getSelectionModel().select(0);

+        btnAddServer.visibleProperty().bind(cboServers.visibleProperty());
+        btnManageServer.visibleProperty().bind(cboServers.visibleProperty());
+
        cboServers.getItems().addListener(onInvalidating(this::checkIfNoServer));
        checkIfNoServer();

@@ -91,7 +96,6 @@ public class AddAccountPane extends StackPane {

        cboServers.visibleProperty().bind(loginType.isEqualTo(Accounts.FACTORY_AUTHLIB_INJECTOR));
        lblInjectorServer.visibleProperty().bind(cboServers.visibleProperty());
-        linkManageInjectorServers.visibleProperty().bind(cboServers.visibleProperty());

        txtUsername.getValidators().add(new Validator(i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));

@@ -189,7 +193,13 @@ public class AddAccountPane extends StackPane {
        Controllers.navigate(Controllers.getServersPage());
    }

+    @FXML
+    private void onAddInjecterServer() {
+        Controllers.dialog(new AddAuthlibInjectorServerPane());
+    }
+
    private class Selector extends BorderPane implements CharacterSelector {
+
        private final AdvancedListBox listBox = new AdvancedListBox();
        private final JFXButton cancel = new JFXButton();

@@ -221,20 +231,17 @@ public class AddAccountPane extends StackPane {

            for (GameProfile profile : names) {
                Image image;
+                final int scaleRatio = 4;
                try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4);
+                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, scaleRatio);
                } catch (Exception e) {
                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
-                    image = null;
+                    image = AccountHelper.getDefaultSkin(profile.getId(), scaleRatio);
                }
+
                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));
-                }
+                portraitView.setImage(AccountHelper.getHead(image, scaleRatio));
                FXUtils.limitSize(portraitView, 32, 32);

                IconedItem accountItem = new IconedItem(portraitView, profile.getName());
@@ -281,6 +288,8 @@ public class AddAccountPane extends StackPane {
                    return i18n("account.failed.invalid_password");
            }
            return exception.getMessage();
+        } else if (exception instanceof AuthlibInjectorDownloadException) {
+            return i18n("account.failed.injector_download_failure");
        } else {
            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
        }
@@ -20,7 +20,7 @@ package org.jackhuang.hmcl.ui.account;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
-import javafx.beans.binding.Bindings;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.StackPane;
@@ -29,9 +29,10 @@ 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.DialogAware;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;

@@ -39,7 +40,7 @@ import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

-public class AddAuthlibInjectorServerPane extends StackPane {
+public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {

    @FXML private StackPane addServerContainer;
    @FXML private Label lblServerUrl;
@@ -67,16 +68,13 @@ public class AddAuthlibInjectorServerPane extends StackPane {
        transitionHandler = new TransitionHandler(addServerContainer);
        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());

-        btnAddNext.disableProperty().bind(
-                Bindings.createBooleanBinding(txtServerUrl::validate, txtServerUrl.textProperty()).not());
+        btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
        nextPane.hideSpinner();
    }

-    private String fixInputUrl(String url) {
-        if (!url.endsWith("/")) {
-            url += "/";
-        }
-        return url;
+    @Override
+    public void onDialogShown() {
+        txtServerUrl.requestFocus();
    }

    private String resolveFetchExceptionMessage(Throwable exception) {
@@ -99,13 +97,13 @@ public class AddAuthlibInjectorServerPane extends StackPane {

        lblCreationWarning.setText("");

-        String url = fixInputUrl(txtServerUrl.getText());
+        String url = txtServerUrl.getText();

        nextPane.showSpinner();
        addServerPane.setDisable(true);

        Task.of(() -> {
-            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
+            serverBeingAdded = AuthlibInjectorServer.locateServer(url);
        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
            addServerPane.setDisable(false);
            nextPane.hideSpinner();
@@ -28,7 +28,7 @@ import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.MappedObservableList;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;

 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
@@ -17,39 +17,86 @@
 */
 package org.jackhuang.hmcl.ui.construct;

-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import javafx.geometry.Rectangle2D;
+import javafx.scene.Node;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
+import javafx.scene.input.MouseEvent;

 public class AdvancedListItem extends Control {
-    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
-    private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();
-    private final StringProperty title = new SimpleStringProperty();
-    private final StringProperty subtitle = new SimpleStringProperty();
+    private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
+    private final ObjectProperty<Node> rightGraphic = new SimpleObjectProperty<>(this, "rightGraphic");
+    private final StringProperty title = new SimpleStringProperty(this, "title");
+    private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
+    private final BooleanProperty actionButtonVisible = new SimpleBooleanProperty(this, "actionButtonVisible", true);
+
+    public AdvancedListItem() {
+        addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
+    }
+
+    public Image getImage() {
+        return image.get();
+    }

    public ObjectProperty<Image> imageProperty() {
        return image;
    }

-    public ObjectProperty<Rectangle2D> viewportProperty() {
-        return viewport;
+    public void setImage(Image image) {
+        this.image.set(image);
+    }
+
+    public Node getRightGraphic() {
+        return rightGraphic.get();
+    }
+
+    public ObjectProperty<Node> rightGraphicProperty() {
+        return rightGraphic;
+    }
+
+    public void setRightGraphic(Node rightGraphic) {
+        this.rightGraphic.set(rightGraphic);
+    }
+
+    public String getTitle() {
+        return title.get();
    }

    public StringProperty titleProperty() {
        return title;
    }

+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+
+    public String getSubtitle() {
+        return subtitle.get();
+    }
+
    public StringProperty subtitleProperty() {
        return subtitle;
    }

+    public void setSubtitle(String subtitle) {
+        this.subtitle.set(subtitle);
+    }
+
+    public boolean isActionButtonVisible() {
+        return actionButtonVisible.get();
+    }
+
+    public BooleanProperty actionButtonVisibleProperty() {
+        return actionButtonVisible;
+    }
+
+    public void setActionButtonVisible(boolean actionButtonVisible) {
+        this.actionButtonVisible.set(actionButtonVisible);
+    }
+
    public final ObjectProperty<EventHandler<ActionEvent>> onActionProperty() {
        return onAction;
    }
@@ -17,7 +17,6 @@
 */
 package org.jackhuang.hmcl.ui.construct;

-import com.jfoenix.controls.JFXButton;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
@@ -28,9 +27,7 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextAlignment;
-import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.SVG;

 public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {

@@ -38,6 +35,7 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
        super(skinnable);

        StackPane stackPane = new StackPane();
+        RipplerContainer container = new RipplerContainer(stackPane);

        BorderPane root = new BorderPane();
        root.setPickOnBounds(false);
@@ -54,7 +52,6 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
        FXUtils.limitSize(imageView, 32, 32);
        imageView.setPreserveRatio(true);
        imageView.imageProperty().bind(skinnable.imageProperty());
-        imageView.viewportProperty().bind(skinnable.viewportProperty());
        imageViewContainer.getChildren().setAll(imageView);

        VBox vbox = new VBox();
@@ -85,20 +82,27 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {

        HBox right = new HBox();
        right.setAlignment(Pos.CENTER);
-        right.setPickOnBounds(false);
-
-        JFXButton settings = new JFXButton();
-        FXUtils.setLimitWidth(settings, 40);
-        settings.getStyleClass().setAll("toggle-icon4");
-        settings.setGraphic(SVG.dotsVertical(Theme.blackFillBinding(), -1, -1));
-        right.getChildren().setAll(settings);
+        right.setMouseTransparent(true);
+        right.getStyleClass().setAll("toggle-icon4");
+        FXUtils.setLimitWidth(right, 40);
+        FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
+                newGraphic -> {
+                    if (newGraphic == null) {
+                        right.getChildren().clear();
+                    } else {
+                        right.getChildren().setAll(newGraphic);
+                    }
+                });
        root.setRight(right);

+        FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(),
+                visible -> root.setRight(visible ? right : null));
+
        stackPane.setStyle("-fx-padding: 10 16 10 16;");
        stackPane.getStyleClass().setAll("transparent");
        stackPane.setPickOnBounds(false);
        stackPane.getChildren().setAll(root);

-        getChildren().setAll(stackPane);
+        getChildren().setAll(container);
    }
 }
@@ -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
@@ -17,22 +17,22 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import org.jackhuang.hmcl.util.javafx.MappedObservableList;
+
 import javafx.beans.DefaultProperty;
 import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.css.PseudoClass;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
-import javafx.scene.control.Skin;
 import javafx.scene.control.SkinBase;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import org.jackhuang.hmcl.util.MappedObservableList;

@DefaultProperty("content")
 public class ComponentList extends Control {
@@ -100,23 +100,33 @@ public class ComponentList extends Control {
    }

    protected static class Skin extends SkinBase<ComponentList> {
+        private static final PseudoClass PSEUDO_CLASS_FIRST = PseudoClass.getPseudoClass("first");
+
        private final ObservableList<Node> list;
+        private final ObjectBinding<Node> firstItem;

        protected Skin(ComponentList control) {
            super(control);

-            list = MappedObservableList.create(control.getContent(), this::mapper);
+            list = MappedObservableList.create(control.getContent(), node -> {
+                ComponentListCell cell = new ComponentListCell(node);
+                cell.getStyleClass().add("options-list-item");
+                return cell;
+            });
+
+            firstItem = Bindings.valueAt(list, 0);
+            firstItem.addListener((observable, oldValue, newValue) -> {
+                if (newValue != null)
+                    newValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
+                if (oldValue != null)
+                    oldValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, false);
+            });
+            if (!list.isEmpty())
+                list.get(0).pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);

            VBox vbox = new VBox();
            Bindings.bindContent(vbox.getChildren(), list);
            getChildren().setAll(vbox);
        }
-
-        private Node mapper(Node node) {
-            StackPane child = new StackPane();
-            child.getChildren().add(new ComponentListCell(node));
-            child.getStyleClass().add("options-list-item");
-            return child;
-        }
    }
 }
@@ -24,6 +24,7 @@ import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
@@ -78,7 +79,6 @@ class ComponentListCell extends StackPane {
            content.getStyleClass().add("options-sublist");

            BorderPane groupNode = new BorderPane();
-            groupNode.getStyleClass().add("options-list-item-header");

            Node expandIcon = SVG.expand(Theme.blackFillBinding(), 10, 10);
            JFXButton expandButton = new JFXButton();
@@ -86,6 +86,7 @@ class ComponentListCell extends StackPane {
            expandButton.getStyleClass().add("options-list-item-expand-button");

            VBox labelVBox = new VBox();
+            labelVBox.setAlignment(Pos.CENTER_LEFT);

            if (list instanceof ComponentSublist) {
                Node leftNode = ((ComponentSublist) list).getHeaderLeft();
@@ -94,13 +95,11 @@ class ComponentListCell extends StackPane {
            } else {
                Label label = new Label();
                label.textProperty().bind(list.titleProperty());
-                label.setMouseTransparent(true);
                labelVBox.getChildren().add(label);

                if (list.isHasSubtitle()) {
                    Label subtitleLabel = new Label();
                    subtitleLabel.textProperty().bind(list.subtitleProperty());
-                    subtitleLabel.setMouseTransparent(true);
                    subtitleLabel.getStyleClass().add("subtitle-label");
                    labelVBox.getChildren().add(subtitleLabel);
                }
@@ -109,6 +108,7 @@ class ComponentListCell extends StackPane {
            groupNode.setLeft(labelVBox);

            HBox right = new HBox();
+            right.setAlignment(Pos.CENTER_RIGHT);
            if (list instanceof ComponentSublist) {
                Node rightNode = ((ComponentSublist) list).getHeaderRight();
                if (rightNode != null)
@@ -116,21 +116,13 @@ class ComponentListCell extends StackPane {
            }
            right.getChildren().add(expandButton);
            groupNode.setRight(right);
-            labelVBox.setAlignment(Pos.CENTER_LEFT);
-            right.setAlignment(Pos.CENTER_RIGHT);

            VBox container = new VBox();
-            container.setStyle("-fx-padding: 8 0 0 0;");
+            container.setPadding(new Insets(8, 0, 0, 0));
            FXUtils.setLimitHeight(container, 0);
-            Rectangle clipRect = new Rectangle();
-            clipRect.widthProperty().bind(container.widthProperty());
-            clipRect.heightProperty().bind(container.heightProperty());
-            container.setClip(clipRect);
+            FXUtils.setOverflowHidden(container, true);
            container.getChildren().setAll(content);
-
-            VBox holder = new VBox();
-            holder.getChildren().setAll(groupNode, container);
-            holder.getStyleClass().add("options-list-item-container");
+            groupNode.setBottom(container);

            expandButton.setOnMouseClicked(e -> {
                if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
@@ -162,7 +154,7 @@ class ComponentListCell extends StackPane {
            expandedProperty().addListener((a, b, newValue) ->
                    expandIcon.setRotate(newValue ? 180 : 0));

-            getChildren().setAll(holder);
+            getChildren().setAll(groupNode);
        } else
            getChildren().setAll(content);
    }
@@ -1,7 +1,7 @@
 /*
 * Hello Minecraft! Launcher.
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
- * 
+ * 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
@@ -15,37 +15,17 @@
 * 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;
+package org.jackhuang.hmcl.ui.construct;

-import java.util.Objects;
+import org.jackhuang.hmcl.ui.Controllers;

 /**
- * If a version string contains alphabets, a {@code StringVersionNumber}
- * will be constructed.
- *
- * @author huangyuhui
+ * @author yushijinhun
+ * @see Controllers#dialog(javafx.scene.layout.Region)
 */
-public final class StringVersionNumber extends VersionNumber {
+public interface DialogAware {

-    private final String version;
-
-    StringVersionNumber(String version) {
-        Objects.requireNonNull(version);
-        this.version = version;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    @Override
-    public int hashCode() {
-        return version.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return version;
+    default void onDialogShown() {
    }

 }
@@ -17,20 +17,26 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import static javafx.collections.FXCollections.emptyObservableList;
+import static javafx.collections.FXCollections.observableList;
+import static javafx.collections.FXCollections.singletonObservableList;
+
+import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+
 import com.jfoenix.controls.JFXComboBox;
+
 import javafx.beans.NamedArg;
+import javafx.beans.binding.Bindings;
 import javafx.scene.control.ListCell;
 import javafx.scene.text.Font;

 public class FontComboBox extends JFXComboBox<String> {
+
    private boolean loaded = false;

    public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize,
                        @NamedArg(value = "enableStyle", defaultValue = "false") boolean enableStyle) {
-        valueProperty().addListener((a, b, newValue) -> {
-            if (enableStyle)
-                setStyle("-fx-font-family: \"" + newValue + "\";");
-        });
+        styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));

        setCellFactory(listView -> new ListCell<String>() {
            @Override
@@ -43,15 +49,15 @@ public class FontComboBox extends JFXComboBox<String> {
            }
        });

+        itemsProperty().bind(MultiStepBinding.of(valueProperty())
+                        .map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));
+
        setOnMouseClicked(e -> {
-            if (loaded) return;
-            getItems().setAll(Font.getFamilies());
+            if (loaded)
+                return;
+            itemsProperty().unbind();
+            setItems(observableList(Font.getFamilies()));
            loaded = true;
        });
    }
-
-    public void initValue(Font font) {
-        getItems().setAll(font.getFamily());
-        getSelectionModel().select(font.getFamily());
-    }
 }
@@ -39,12 +39,17 @@ public class IconedItem extends RipplerContainer {

    private static HBox createHBox(Node icon) {
        HBox hBox = new HBox();
+
+        if (icon != null) {
+            icon.setMouseTransparent(true);
+            hBox.getChildren().add(icon);
+        }
+
        hBox.getStyleClass().setAll("iconed-item-container");
-        icon.setMouseTransparent(true);
        Label textLabel = new Label();
        textLabel.setId("label");
        textLabel.setMouseTransparent(true);
-        hBox.getChildren().addAll(icon, textLabel);
+        hBox.getChildren().addAll(textLabel);
        return hBox;
    }

@@ -0,0 +1,19 @@
+package org.jackhuang.hmcl.ui.construct;
+
+import javafx.geometry.Insets;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+
+public class MenuSeparator extends StackPane {
+
+    public MenuSeparator() {
+        Rectangle rect = new Rectangle();
+        rect.widthProperty().bind(widthProperty().add(-14));
+        rect.setHeight(1);
+        rect.setFill(Color.GRAY);
+        maxHeightProperty().set(10);
+        setPadding(new Insets(3));
+        getChildren().setAll(rect);
+    }
+}
@@ -24,6 +24,7 @@ import javafx.beans.NamedArg;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
@@ -138,7 +139,7 @@ public class MultiFileItem<T> extends ComponentList {

    public Node createChildren(String title, String subtitle, T userData) {
        BorderPane pane = new BorderPane();
-        pane.setStyle("-fx-padding: 3;");
+        pane.setPadding(new Insets(3));
        FXUtils.setLimitHeight(pane, 20);

        JFXRadioButton left = new JFXRadioButton(title);
@@ -17,6 +17,7 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.SimpleObjectProperty;
@@ -43,6 +44,9 @@ public class Navigator extends StackPane {
    public Navigator(Node init) {
        stack.push(init);
        getChildren().setAll(init);
+
+        Platform.runLater(() ->
+                fireEvent(new NavigationEvent(this, init, NavigationEvent.NAVIGATED)));
    }

    public void navigate(Node node) {
@@ -66,15 +70,26 @@ public class Navigator extends StackPane {
        close(stack.peek());
    }

+    public void clear() {
+        while (stack.size() > 1)
+            close(stack.peek());
+    }
+
    @SuppressWarnings("unchecked")
    public void close(Node from) {
        FXUtils.checkFxUserThread();

-        stack.remove(from);
+        if (stack.peek() != from)
+            throw new IllegalStateException();
+        stack.pop();
        Node node = stack.peek();
-        fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
+        NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
+        fireEvent(navigating);
+        node.fireEvent(navigating);
        setContent(node);
-        fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
+        NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
+        fireEvent(navigated);
+        node.fireEvent(navigated);

        Optional.ofNullable(from.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
                .ifPresent(handler -> from.removeEventHandler(PageCloseEvent.CLOSE, (EventHandler<PageCloseEvent>) handler));
@@ -0,0 +1,85 @@
+/*
+ * 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.beans.binding.Bindings;
+import javafx.beans.binding.When;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.VBox;
+import org.jackhuang.hmcl.ui.FXUtils;
+
+public class PopupMenu extends Control {
+
+    private final ObservableList<Node> content = FXCollections.observableArrayList();
+    private final BooleanProperty alwaysShowingVBar = new SimpleBooleanProperty();
+
+    public PopupMenu() {
+    }
+
+    public ObservableList<Node> getContent() {
+        return content;
+    }
+
+    public boolean isAlwaysShowingVBar() {
+        return alwaysShowingVBar.get();
+    }
+
+    public BooleanProperty alwaysShowingVBarProperty() {
+        return alwaysShowingVBar;
+    }
+
+    public void setAlwaysShowingVBar(boolean alwaysShowingVBar) {
+        this.alwaysShowingVBar.set(alwaysShowingVBar);
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new PopupMenuSkin();
+    }
+
+    private class PopupMenuSkin extends SkinBase<PopupMenu> {
+
+        protected PopupMenuSkin() {
+            super(PopupMenu.this);
+
+            ScrollPane scrollPane = new ScrollPane();
+            scrollPane.setFitToHeight(true);
+            scrollPane.setFitToWidth(true);
+            scrollPane.vbarPolicyProperty().bind(new When(alwaysShowingVBar)
+                    .then(ScrollPane.ScrollBarPolicy.ALWAYS)
+                    .otherwise(ScrollPane.ScrollBarPolicy.AS_NEEDED));
+
+            VBox content = new VBox();
+            content.getStyleClass().add("menu");
+            Bindings.bindContent(content.getChildren(), PopupMenu.this.getContent());
+            scrollPane.setContent(content);
+
+            FXUtils.smoothScrolling(scrollPane);
+
+            getChildren().setAll(scrollPane);
+        }
+    }
+}
@@ -33,6 +33,7 @@ import java.util.Collections;
 import java.util.List;

 public class TwoLineListItem extends StackPane {
+    private static final String DEFAULT_STYLE_CLASS = "two-line-list-item";

    private final StringProperty title = new SimpleStringProperty(this, "title");
    private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
@@ -64,6 +65,8 @@ public class TwoLineListItem extends StackPane {
        VBox vbox = new VBox();
        vbox.getChildren().setAll(lblTitle, lblSubtitle);
        getChildren().setAll(vbox);
+
+        getStyleClass().add(DEFAULT_STYLE_CLASS);
    }

    public String getTitle() {
@@ -1,37 +0,0 @@
-package org.jackhuang.hmcl.ui.construct;
-
-import com.jfoenix.validation.base.ValidatorBase;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.control.TextInputControl;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-public class URLValidator extends ValidatorBase {
-
-    private final ObservableList<String> protocols = FXCollections.observableArrayList();
-
-    public URLValidator() {
-        super();
-    }
-
-    public ObservableList<String> getProtocols() {
-        return protocols;
-    }
-
-    @Override
-    protected void eval() {
-        if (srcControl.get() instanceof TextInputControl) {
-            try {
-                URL url = new URL(((TextInputControl) srcControl.get()).getText());
-                if (protocols.isEmpty())
-                    hasErrors.set(false);
-                else
-                    hasErrors.set(!protocols.contains(url.getProtocol()));
-            } catch (MalformedURLException e) {
-                hasErrors.set(true);
-            }
-        }
-    }
-}
@@ -17,12 +17,37 @@
 */
 package org.jackhuang.hmcl.ui.construct;

+import com.jfoenix.controls.JFXTextField;
 import com.jfoenix.validation.base.ValidatorBase;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
 import javafx.scene.control.TextInputControl;

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

+import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
+
 public final class Validator extends ValidatorBase {
+
+    public static Consumer<Predicate<String>> addTo(JFXTextField control) {
+        return addTo(control, null);
+    }
+
+    /**
+     * @see SafeStringConverter#asPredicate(Consumer)
+     */
+    public static Consumer<Predicate<String>> addTo(JFXTextField control, String message) {
+        return predicate -> {
+            Validator validator = new Validator(message, predicate);
+            InvalidationListener listener = any -> control.validate();
+            validator.getProperties().put(validator, listener);
+            control.textProperty().addListener(new WeakInvalidationListener(listener));
+            control.getValidators().add(validator);
+        };
+    }
+
    private final Predicate<String> validator;

    /**
@@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;

-public class DecoratorControl extends Control {
+public class Decorator extends Control {
    private final ListProperty<Node> drawer = new SimpleListProperty<>(FXCollections.observableArrayList());
    private final ListProperty<Node> content = new SimpleListProperty<>(FXCollections.observableArrayList());
    private final ListProperty<Node> container = new SimpleListProperty<>(FXCollections.observableArrayList());
@@ -45,10 +45,11 @@ public class DecoratorControl extends Control {
    private final BooleanProperty canRefresh = new SimpleBooleanProperty(false);
    private final BooleanProperty canBack = new SimpleBooleanProperty(false);
    private final BooleanProperty canClose = new SimpleBooleanProperty(false);
+    private final BooleanProperty showCloseAsHome = new SimpleBooleanProperty(false);
    private final Stage primaryStage;
    private StackPane drawerWrapper;

-    public DecoratorControl(Stage primaryStage) {
+    public Decorator(Stage primaryStage) {
        this.primaryStage = primaryStage;

        primaryStage.initStyle(StageStyle.UNDECORATED);
@@ -174,6 +175,10 @@ public class DecoratorControl extends Control {
        return canClose;
    }

+    public BooleanProperty showCloseAsHomeProperty() {
+        return showCloseAsHome;
+    }
+
    public ObjectProperty<EventHandler<ActionEvent>> onBackNavButtonActionProperty() {
        return onBackNavButtonAction;
    }
@@ -22,7 +22,10 @@ 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.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.scene.Cursor;
@@ -66,7 +69,7 @@ import static org.jackhuang.hmcl.util.Logging.LOG;
 public class DecoratorController {
    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = DecoratorController.class.getName() + ".dialog.closeListener";

-    private final DecoratorControl decorator;
+    private final Decorator decorator;
    private final ImageView welcomeView;
    private final Navigator navigator;
    private final Node mainPage;
@@ -77,7 +80,7 @@ public class DecoratorController {
    public DecoratorController(Stage stage, Node mainPage) {
        this.mainPage = mainPage;

-        decorator = new DecoratorControl(stage);
+        decorator = new Decorator(stage);
        decorator.titleProperty().set(Metadata.TITLE);
        decorator.setOnCloseButtonAction(Launcher::stopApplication);

@@ -93,6 +96,7 @@ public class DecoratorController {
        welcomeView = new ImageView();
        welcomeView.setImage(new Image("/assets/img/welcome.png"));
        welcomeView.setCursor(Cursor.HAND);
+        FXUtils.limitSize(welcomeView, 796, 517);
        welcomeView.setOnMouseClicked(e -> {
            Timeline nowAnimation = new Timeline();
            nowAnimation.getKeyFrames().addAll(
@@ -110,7 +114,7 @@ public class DecoratorController {
        setupAuthlibInjectorDnD();
    }

-    public DecoratorControl getDecorator() {
+    public Decorator getDecorator() {
        return decorator;
    }

@@ -202,10 +206,12 @@ public class DecoratorController {
        if (navigator.getCurrentPage() instanceof DecoratorPage) {
            DecoratorPage page = (DecoratorPage) navigator.getCurrentPage();

-            page.onForceToClose();
-        } else {
-            navigator.close();
+            if (page.canForceToClose()) {
+                page.onForceToClose();
+                return;
+            }
        }
+        navigator.clear();
    }

    private void back() {
@@ -247,14 +253,15 @@ public class DecoratorController {

        if (to instanceof DecoratorPage) {
            decorator.drawerTitleProperty().bind(((DecoratorPage) to).titleProperty());
-            decorator.canCloseProperty().set(((DecoratorPage) to).canForceToClose());
+            decorator.showCloseAsHomeProperty().set(!((DecoratorPage) to).canForceToClose());
        } else {
            decorator.drawerTitleProperty().unbind();
            decorator.drawerTitleProperty().set("");
-            decorator.canCloseProperty().set(false);
+            decorator.showCloseAsHomeProperty().set(true);
        }

        decorator.canBackProperty().set(navigator.canGoBack());
+        decorator.canCloseProperty().set(navigator.canGoBack());

        if (navigator.canGoBack()) {
            decorator.setContentBackground(new Background(new BackgroundFill(Color.rgb(244, 244, 244, 0.5), CornerRadii.EMPTY, Insets.EMPTY)));
@@ -277,12 +284,17 @@ public class DecoratorController {
        FXUtils.checkFxUserThread();

        if (dialog == null) {
+            if (decorator.getDrawerWrapper() == null) {
+                // Sometimes showDialog will be invoked before decorator was initialized.
+                // Keep trying again.
+                Platform.runLater(() -> showDialog(node));
+                return;
+            }
+
            dialog = new JFXDialog();
            dialogPane = new StackContainerPane();

            dialog.setContent(dialogPane);
-            if (decorator.getDrawerWrapper() == null)
-                throw new IllegalStateException("Decorator has not been initialized");
            dialog.setDialogContainer(decorator.getDrawerWrapper());
            dialog.setOverlayClose(false);
            dialog.show();
@@ -293,6 +305,23 @@ public class DecoratorController {
        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
+
+        if (node instanceof DialogAware) {
+            DialogAware dialogAware = (DialogAware) node;
+            if (dialog.isVisible()) {
+                dialogAware.onDialogShown();
+            } else {
+                dialog.visibleProperty().addListener(new ChangeListener<Boolean>() {
+                    @Override
+                    public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                        if (newValue) {
+                            dialogAware.onDialogShown();
+                            observable.removeListener(this);
+                        }
+                    }
+                });
+            }
+        }
    }

    @SuppressWarnings("unchecked")
@@ -42,7 +42,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.util.Lang;

-public class DecoratorSkin extends SkinBase<DecoratorControl> {
+public class DecoratorSkin extends SkinBase<Decorator> {
    private static final SVGGlyph minus = Lang.apply(new SVGGlyph(0, "MINUS", "M804.571 420.571v109.714q0 22.857-16 38.857t-38.857 16h-694.857q-22.857 0-38.857-16t-16-38.857v-109.714q0-22.857 16-38.857t38.857-16h694.857q22.857 0 38.857 16t16 38.857z", Color.WHITE),
        glyph -> { glyph.setSize(12, 2); glyph.setTranslateY(4); });

@@ -62,14 +62,14 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
     *
     * @param control The control for which this Skin should attach to.
     */
-    public DecoratorSkin(DecoratorControl control) {
+    public DecoratorSkin(Decorator control) {
        super(control);

        primaryStage = control.getPrimaryStage();

        minus.fillProperty().bind(Theme.foregroundFillBinding());

-        DecoratorControl skinnable = getSkinnable();
+        Decorator skinnable = getSkinnable();

        BorderPane root = new BorderPane();
        root.getStyleClass().setAll("jfx-decorator", "resize-border");
@@ -146,7 +146,7 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
        titleContainer.setOnMouseMoved(this::onMouseMoved);
        titleContainer.setPickOnBounds(false);
        titleContainer.setMinHeight(40);
-        titleContainer.getStyleClass().setAll("jfx-tool-bar");
+        titleContainer.getStyleClass().addAll("jfx-tool-bar", "window-title-bar");
        titleContainer.addEventHandler(MouseEvent.MOUSE_ENTERED, e -> allowMove = true);
        titleContainer.addEventHandler(MouseEvent.MOUSE_EXITED, e -> {
            if (!isDragging) allowMove = false;
@@ -169,9 +169,9 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
                titleWrapper.setCenter(lblTitle);

                Rectangle separator = new Rectangle();
+                separator.getStyleClass().add("separator");
                separator.heightProperty().bind(titleWrapper.heightProperty());
                separator.setWidth(1);
-                separator.setFill(Color.GRAY);
                titleWrapper.setRight(separator);
            }
            titleContainer.setLeft(titleWrapper);
@@ -201,6 +201,13 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
                        if (newValue) navLeft.getChildren().setAll(backNavButton, closeNavButton);
                        else navLeft.getChildren().setAll(backNavButton);
                    });
+
+                    skinnable.showCloseAsHomeProperty().addListener((a, b, newValue) -> {
+                        if (newValue)
+                            closeNavButton.setGraphic(SVG.home(Theme.foregroundFillBinding(), -1, -1));
+                        else
+                            closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
+                    });
                }
                navBar.setLeft(navLeft);

@@ -233,6 +240,7 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
                Rectangle separator = new Rectangle();
                separator.visibleProperty().bind(refreshNavButton.visibleProperty());
                separator.heightProperty().bind(navBar.heightProperty());
+                separator.setFill(Color.GRAY);

                JFXButton btnMin = new JFXButton();
                StackPane pane = new StackPane(minus);
@@ -0,0 +1,78 @@
+package org.jackhuang.hmcl.ui.download;
+
+import javafx.scene.Node;
+import org.jackhuang.hmcl.download.DownloadProvider;
+import org.jackhuang.hmcl.game.ModpackHelper;
+import org.jackhuang.hmcl.mod.Modpack;
+import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.wizard.WizardController;
+import org.jackhuang.hmcl.ui.wizard.WizardProvider;
+
+import java.io.File;
+import java.util.Map;
+
+import static org.jackhuang.hmcl.util.Lang.tryCast;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+public class ModpackInstallWizardProvider implements WizardProvider {
+    private Profile profile;
+    private final File file;
+
+    public ModpackInstallWizardProvider() {
+        this(null);
+    }
+
+    public ModpackInstallWizardProvider(File modpackFile) {
+        this.file = modpackFile;
+    }
+
+    @Override
+    public void start(Map<String, Object> settings) {
+        profile = Profiles.getSelectedProfile();
+
+        if (file != null)
+            settings.put(ModpackPage.MODPACK_FILE, file);
+        settings.put(PROFILE, profile);
+    }
+
+    private Task finishModpackInstallingAsync(Map<String, Object> settings) {
+        if (!settings.containsKey(ModpackPage.MODPACK_FILE))
+            return 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)
+                .then(Task.of(Schedulers.javafx(), () -> profile.setSelectedVersion(name)));
+    }
+
+    @Override
+    public Object finish(Map<String, Object> settings) {
+        settings.put("success_message", i18n("install.success"));
+        settings.put("failure_message", i18n("install.failed"));
+
+        return finishModpackInstallingAsync(settings);
+    }
+
+    @Override
+    public Node createPage(WizardController controller, int step, Map<String, Object> settings) {
+        switch (step) {
+            case 0:
+                return new ModpackPage(controller);
+            default:
+                throw new IllegalStateException("error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
+        }
+    }
+
+    @Override
+    public boolean cancel() {
+        return true;
+    }
+
+    public static final String PROFILE = "PROFILE";
+}
@@ -32,6 +32,7 @@ import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.WebStage;
+import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.Validator;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardPage;
@@ -39,7 +40,9 @@ import org.jackhuang.hmcl.util.StringUtils;

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

+import static org.jackhuang.hmcl.util.Lang.tryCast;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public final class ModpackPage extends StackPane implements WizardPage {
@@ -75,31 +78,41 @@ public final class ModpackPage extends StackPane implements WizardPage {

        Profile profile = (Profile) controller.getSettings().get("PROFILE");

-        FileChooser chooser = new FileChooser();
-        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(controller::onEnd);
-        else {
+        File selectedFile;
+
+        Optional<File> filePath = tryCast(controller.getSettings().get(MODPACK_FILE), File.class);
+        if (filePath.isPresent()) {
+            selectedFile = filePath.get();
+        } else {
+            FileChooser chooser = new FileChooser();
+            chooser.setTitle(i18n("modpack.choose"));
+            chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
+            selectedFile = chooser.showOpenDialog(Controllers.getStage());
+            if (selectedFile == null) {
+                Platform.runLater(controller::onEnd);
+                return;
+            }
+
            controller.getSettings().put(MODPACK_FILE, selectedFile);
+        }
+
+        try {
+            manifest = ModpackHelper.readModpackManifest(selectedFile);
+            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()));
+
            lblModpackLocation.setText(selectedFile.getAbsolutePath());
            txtModpackName.getValidators().addAll(
                    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_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(i18n("modpack.task.install.error"));
-                btnInstall.setDisable(true);
-            }
+        } catch (UnsupportedModpackException e) {
+            Controllers.dialog(i18n("modpack.task.install.error"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
+            Platform.runLater(controller::onEnd);
        }
    }

@@ -21,8 +21,6 @@ import javafx.scene.Node;
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.GameBuilder;
 import org.jackhuang.hmcl.download.RemoteVersion;
-import org.jackhuang.hmcl.game.ModpackHelper;
-import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -30,18 +28,14 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardController;
 import org.jackhuang.hmcl.ui.wizard.WizardProvider;

-import java.io.File;
 import java.util.Map;

-import static org.jackhuang.hmcl.util.Lang.tryCast;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

-public final class DownloadWizardProvider implements WizardProvider {
+public final class VanillaInstallWizardProvider implements WizardProvider {
    private Profile profile;
-    private final int type;

-    public DownloadWizardProvider(int type) {
-        this.type = type;
+    public VanillaInstallWizardProvider() {
    }

    @Override
@@ -70,29 +64,12 @@ public final class DownloadWizardProvider implements WizardProvider {
                .then(Task.of(Schedulers.javafx(), () -> profile.setSelectedVersion(name)));
    }

-    private Task finishModpackInstallingAsync(Map<String, Object> settings) {
-        if (!settings.containsKey(ModpackPage.MODPACK_FILE))
-            return 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)
-                .then(Task.of(Schedulers.javafx(), () -> profile.setSelectedVersion(name)));
-    }
-
    @Override
    public Object finish(Map<String, Object> settings) {
        settings.put("success_message", i18n("install.success"));
        settings.put("failure_message", i18n("install.failed"));

-        switch (type) {
-            case 0: return finishVersionDownloadingAsync(settings);
-            case 1: return finishModpackInstallingAsync(settings);
-            default: return null;
-        }
+        return finishVersionDownloadingAsync(settings);
    }

    @Override
@@ -100,14 +77,7 @@ public final class DownloadWizardProvider implements WizardProvider {
        DownloadProvider provider = profile.getDependency().getDownloadProvider();
        switch (step) {
            case 0:
-                switch (type) {
-                    case 0:
-                        return new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.game")), "", provider, "game", () -> controller.onNext(new InstallersPage(controller, profile.getRepository(), provider)));
-                    case 1:
-                        return new ModpackPage(controller);
-                    default:
-                        throw new IllegalStateException("Error step " + step + ", subStep " + type + ", settings: " + settings + ", pages: " + controller.getPages());
-                }
+                return new VersionsPage(controller, i18n("install.installer.choose", i18n("install.installer.game")), "", provider, "game", () -> controller.onNext(new InstallersPage(controller, profile.getRepository(), provider)));
            default:
                throw new IllegalStateException("error step " + step + ", settings: " + settings + ", pages: " + controller.getPages());
        }
@@ -28,7 +28,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 org.jackhuang.hmcl.util.Zipper;
+import org.jackhuang.hmcl.util.io.Zipper;

 import java.io.File;
 import java.nio.file.Files;
@@ -31,8 +31,8 @@ import org.jackhuang.hmcl.ui.FXUtils;
 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.StringUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.util.LinkedList;
@@ -22,6 +22,8 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;

 public class ProfileAdvancedListItem extends AdvancedListItem {
@@ -32,14 +34,15 @@ public class ProfileAdvancedListItem extends AdvancedListItem {
            Profile profile = get();
            if (profile == null) {
            } else {
-                titleProperty().set(Profiles.getProfileDisplayName(profile));
-                subtitleProperty().set(profile.getGameDir().toString());
+                setTitle(Profiles.getProfileDisplayName(profile));
+                setSubtitle(profile.getGameDir().toString());
            }
        }
    };

    public ProfileAdvancedListItem() {
-        imageProperty().set(new Image("/assets/img/craft_table.png"));
+        setImage(new Image("/assets/img/craft_table.png"));
+        setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
    }

    public ObjectProperty<Profile> profileProperty() {
@@ -19,48 +19,23 @@ package org.jackhuang.hmcl.ui.profile;

 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.control.ToggleGroup;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.MappedObservableList;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;

-import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;

 public class ProfileList extends ListPage<ProfileListItem> implements DecoratorPage {
    private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(i18n("profile.manage"));
-    private ObjectProperty<Profile> selectedProfile = new SimpleObjectProperty<Profile>() {
-        {
-            itemsProperty().addListener(onInvalidating(this::invalidated));
-        }
-
-        @Override
-        protected void invalidated() {
-            Profile selected = get();
-            itemsProperty().forEach(item -> item.selectedProperty().set(item.getProfile() == selected));
-        }
-    };
    private final ListProperty<Profile> profiles = new SimpleListProperty<>(FXCollections.observableArrayList());
-
-    private ToggleGroup toggleGroup;
-    private final ObservableList<ProfileListItem> profileItems;
+    private ObjectProperty<Profile> selectedProfile;

    public ProfileList() {
-        toggleGroup = new ToggleGroup();
-
-        profileItems = MappedObservableList.create(
-                profilesProperty(),
-                profile -> new ProfileListItem(toggleGroup, profile));
-
-        itemsProperty().bindContent(profileItems);
-
-        toggleGroup.selectedToggleProperty().addListener((o, a, toggle) -> {
-            if (toggle == null || toggle.getUserData() == null) return;
-            selectedProfile.set(((ProfileListItem) toggle.getUserData()).getProfile());
-        });
+        setItems(MappedObservableList.create(profilesProperty(), ProfileListItem::new));
+        selectedProfile = createSelectedItemPropertyFor(getItems(), Profile.class);
    }

    public ObjectProperty<Profile> selectedProfileProperty() {
@@ -17,30 +17,26 @@
 */
 package org.jackhuang.hmcl.ui.profile;

-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.scene.control.Control;
+import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
-import javafx.scene.control.ToggleGroup;
+
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;

-public class ProfileListItem extends Control {
+public class ProfileListItem extends RadioButton {
    private final Profile profile;
-    private final ToggleGroup toggleGroup;
    private final StringProperty title = new SimpleStringProperty();
    private final StringProperty subtitle = new SimpleStringProperty();
-    private final BooleanProperty selected = new SimpleBooleanProperty();

-    public ProfileListItem(ToggleGroup toggleGroup, Profile profile) {
+    public ProfileListItem(Profile profile) {
        this.profile = profile;
-        this.toggleGroup = toggleGroup;
+        getStyleClass().clear();
+        setUserData(profile);

        title.set(Profiles.getProfileDisplayName(profile));
        subtitle.set(profile.getGameDir().toString());
-        selected.set(Profiles.selectedProfileProperty().get() == profile);
    }

    @Override
@@ -48,27 +44,35 @@ public class ProfileListItem extends Control {
        return new ProfileListItemSkin(this);
    }

-    public ToggleGroup getToggleGroup() {
-        return toggleGroup;
+    public void remove() {
+        Profiles.getProfiles().remove(profile);
    }

    public Profile getProfile() {
        return profile;
    }

+    public String getTitle() {
+        return title.get();
+    }
+
+    public void setTitle(String title) {
+        this.title.set(title);
+    }
+
    public StringProperty titleProperty() {
        return title;
    }

+    public String getSubtitle() {
+        return subtitle.get();
+    }
+
+    public void setSubtitle(String subtitle) {
+        this.subtitle.set(subtitle);
+    }
+
    public StringProperty subtitleProperty() {
        return subtitle;
    }
-
-    public BooleanProperty selectedProperty() {
-        return selected;
-    }
-
-    public void remove() {
-        Profiles.getProfiles().remove(profile);
-    }
 }
@@ -26,7 +26,6 @@ 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.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
@@ -39,25 +38,23 @@ public class ProfileListItemSkin extends SkinBase<ProfileListItem> {

        BorderPane root = new BorderPane();

-        JFXRadioButton chkSelected = new JFXRadioButton();
+        JFXRadioButton chkSelected = new JFXRadioButton() {
+            @Override
+            public void fire() {
+                skinnable.fire();
+            }
+        };
        BorderPane.setAlignment(chkSelected, Pos.CENTER);
-        chkSelected.setUserData(skinnable);
-        chkSelected.selectedProperty().bindBidirectional(skinnable.selectedProperty());
-        chkSelected.setToggleGroup(skinnable.getToggleGroup());
+        chkSelected.selectedProperty().bind(skinnable.selectedProperty());
        root.setLeft(chkSelected);

        HBox center = new HBox();
        center.setSpacing(8);
        center.setAlignment(Pos.CENTER_LEFT);

-        StackPane imageViewContainer = new StackPane();
-        FXUtils.setLimitWidth(imageViewContainer, 32);
-        FXUtils.setLimitHeight(imageViewContainer, 32);
-
        ImageView imageView = new ImageView();
        FXUtils.limitSize(imageView, 32, 32);
        imageView.imageProperty().set(new Image("/assets/img/craft_table.png"));
-        imageViewContainer.getChildren().setAll(imageView);

        TwoLineListItem item = new TwoLineListItem();
        BorderPane.setAlignment(item, Pos.CENTER);
@@ -20,11 +20,13 @@ package org.jackhuang.hmcl.ui.profile;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXCheckBox;
 import com.jfoenix.controls.JFXTextField;
+import com.jfoenix.validation.base.ValidatorBase;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
@@ -36,6 +38,7 @@ import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.StringUtils;

 import java.io.File;
+import java.nio.file.Paths;
 import java.util.Optional;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -60,11 +63,24 @@ public final class ProfilePage extends StackPane implements DecoratorPage {
        title = new ReadOnlyStringWrapper(this, "title",
                profile == null ? i18n("profile.new") : i18n("profile") + " - " + profileDisplayName);
        location = new SimpleStringProperty(this, "location",
-                Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(""));
+                Optional.ofNullable(profile).map(Profile::getGameDir).map(File::getAbsolutePath).orElse(".minecraft"));

        FXUtils.loadFXML(this, "/assets/fxml/profile.fxml");

        txtProfileName.setText(profileDisplayName);
+        txtProfileName.getValidators().add(new ValidatorBase() {
+            {
+                setMessage(i18n("profile.already_exists"));
+            }
+            @Override
+            protected void eval() {
+                JFXTextField control = (JFXTextField) this.getSrcControl();
+                if (Profiles.getProfiles().stream().anyMatch(profile -> profile.getName().equals(control.getText())))
+                    hasErrors.set(true);
+                else
+                    hasErrors.set(false);
+            }
+        });
        FXUtils.onChangeAndOperate(txtProfileName.textProperty(), it -> {
            btnSave.setDisable(!txtProfileName.validate() || StringUtils.isBlank(getLocation()));
        });
@@ -2,16 +2,15 @@ package org.jackhuang.hmcl.ui.versions;

 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.collections.ObservableList;
 import javafx.scene.input.TransferMode;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.mod.Datapack;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.MappedObservableList;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.javafx.MappedObservableList;

 import java.io.File;
 import java.io.IOException;
@@ -24,7 +23,6 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class DatapackListPage extends ListPage<DatapackListItem> implements DecoratorPage {
    private final StringProperty title = new SimpleStringProperty();
-    private final ObservableList<DatapackListItem> list; // Hold weak references
    private final Path worldDir;
    private final Datapack datapack;

@@ -36,14 +34,14 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
        datapack = new Datapack(worldDir.resolve("datapacks"));
        datapack.loadFromDir();

-        list = MappedObservableList.create(datapack.getInfo(), pack -> new DatapackListItem(pack, item -> {
-            try {
-                datapack.deletePack(pack.getId());
-            } catch (IOException e) {
-                Logging.LOG.warning("Failed to delete datapack");
-            }
-        }));
-        itemsProperty().bindContent(list);
+        setItems(MappedObservableList.create(datapack.getInfo(),
+                pack -> new DatapackListItem(pack, item -> {
+                    try {
+                        datapack.deletePack(pack);
+                    } catch (IOException e) {
+                        Logging.LOG.warning("Failed to delete datapack");
+                    }
+                })));

        setOnDragOver(event -> {
            if (event.getGestureSource() != this && event.getDragboard().hasFiles())
@@ -84,7 +82,7 @@ public class DatapackListPage extends ListPage<DatapackListItem> implements Deco
    public void add() {
        FileChooser chooser = new FileChooser();
        chooser.setTitle(i18n("datapack.choose_datapack"));
-        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("extension.datapack"), "*.zip"));
+        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("datapack.extension"), "*.zip"));
        List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());

        if (res != null)
@@ -17,67 +17,30 @@
 */
 package org.jackhuang.hmcl.ui.versions;

-import com.jfoenix.concurrency.JFXUtilities;
-import javafx.beans.InvalidationListener;
 import javafx.scene.image.Image;
-import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
-import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
-import org.jackhuang.hmcl.ui.WeakListenerHolder;
+import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.AdvancedListItem;

-import java.io.File;
-
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class GameAdvancedListItem extends AdvancedListItem {
-    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
-
-    private Profile profile;
-    private InvalidationListener listener = o -> loadVersion();

    public GameAdvancedListItem() {
-        Profiles.selectedProfileProperty().addListener(listenerHolder.weak((a, b, newValue) -> {
-            JFXUtilities.runInFX(() -> loadProfile(newValue));
-        }));
-        listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
-            JFXUtilities.runInFX(() -> {
-                if (profile != null && profile.getRepository() == event.getSource())
-                    loadVersion();
-            });
-        }));
-        loadProfile(Profiles.getSelectedProfile());
-    }
-
-    private void loadProfile(Profile newProfile) {
-        if (profile != null)
-            profile.selectedVersionProperty().removeListener(listener);
-        profile = newProfile;
-        if (profile != null)
-            profile.selectedVersionProperty().addListener(listener);
-        loadVersion();
-    }
-
-    private void loadVersion() {
-        Profile profile = this.profile;
-        if (profile == null || !profile.getRepository().isLoaded()) return;
-        String version = profile.getSelectedVersion();
-        File iconFile = profile.getRepository().getVersionIcon(version);
-
-        JFXUtilities.runInFX(() -> {
-            if (iconFile.exists())
-                imageProperty().set(new Image("file:" + iconFile.getAbsolutePath()));
-            else
-                imageProperty().set(new Image("/assets/img/grass.png"));
-
+        FXUtils.onChangeAndOperate(Profiles.selectedVersionProperty(), version -> {
            if (version != null) {
-                titleProperty().set(version);
-                subtitleProperty().set(null);
+                setTitle(version);
+                setSubtitle(null);
+                setImage(Profiles.getSelectedProfile().getRepository().getVersionIconImage(version));
            } else {
-                titleProperty().set(i18n("version.empty"));
-                subtitleProperty().set(i18n("version.empty.add"));
+                setTitle(i18n("version.empty"));
+                setSubtitle(i18n("version.empty.add"));
+                setImage(new Image("/assets/img/grass.png"));
            }
        });
+
+        setRightGraphic(SVG.gear(Theme.blackFillBinding(), -1, -1));
    }
 }
@@ -0,0 +1,84 @@
+/*
+ * 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.versions;
+
+import javafx.beans.property.*;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.image.Image;
+import org.jackhuang.hmcl.download.LibraryAnalyzer;
+import org.jackhuang.hmcl.game.GameVersion;
+import org.jackhuang.hmcl.setting.Profile;
+
+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 class GameItem extends Control {
+    private final Profile profile;
+    private final String version;
+    private final StringProperty title = new SimpleStringProperty();
+    private final StringProperty subtitle = new SimpleStringProperty();
+    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
+
+    public GameItem(Profile profile, String id) {
+        this.profile = profile;
+        this.version = id;
+
+        String game = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse("Unknown");
+
+        StringBuilder libraries = new StringBuilder(game);
+        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getVersion(id));
+        analyzer.getForge().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
+        analyzer.getLiteLoader().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
+        analyzer.getOptiFine().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))));
+
+        title.set(id);
+        subtitle.set(libraries.toString());
+        image.set(profile.getRepository().getVersionIconImage(version));
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new GameItemSkin(this);
+    }
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public StringProperty titleProperty() {
+        return title;
+    }
+
+    public StringProperty subtitleProperty() {
+        return subtitle;
+    }
+
+    public ObjectProperty<Image> imageProperty() {
+        return image;
+    }
+
+    private static String modifyVersion(String gameVersion, String version) {
+        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
+    }
+}
@@ -0,0 +1,36 @@
+package org.jackhuang.hmcl.ui.versions;
+
+import javafx.geometry.Pos;
+import javafx.scene.control.SkinBase;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
+
+public class GameItemSkin extends SkinBase<GameItem> {
+    public GameItemSkin(GameItem skinnable) {
+        super(skinnable);
+
+        HBox center = new HBox();
+        center.setSpacing(8);
+        center.setAlignment(Pos.CENTER_LEFT);
+
+        StackPane imageViewContainer = new StackPane();
+        FXUtils.setLimitWidth(imageViewContainer, 32);
+        FXUtils.setLimitHeight(imageViewContainer, 32);
+
+        ImageView imageView = new ImageView();
+        FXUtils.limitSize(imageView, 32, 32);
+        imageView.imageProperty().bind(skinnable.imageProperty());
+        imageViewContainer.getChildren().setAll(imageView);
+
+        TwoLineListItem item = new TwoLineListItem();
+        item.titleProperty().bind(skinnable.titleProperty());
+        item.subtitleProperty().bind(skinnable.subtitleProperty());
+        BorderPane.setAlignment(item, Pos.CENTER);
+        center.getChildren().setAll(imageView, item);
+        getChildren().setAll(center);
+    }
+}
@@ -25,18 +25,20 @@ import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.control.ToggleGroup;
 import org.jackhuang.hmcl.event.EventBus;
-import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
+import org.jackhuang.hmcl.game.Version;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.WeakListenerHolder;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
-import org.jackhuang.hmcl.util.VersionNumber;
+import org.jackhuang.hmcl.ui.download.ModpackInstallWizardProvider;
+import org.jackhuang.hmcl.ui.download.VanillaInstallWizardProvider;
 import org.jackhuang.hmcl.util.i18n.I18n;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;

+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;

@@ -47,38 +49,29 @@ public class GameList extends Control implements DecoratorPage {
    private final BooleanProperty loading = new SimpleBooleanProperty(true);
    private final ListProperty<GameListItem> items = new SimpleListProperty<>(FXCollections.observableArrayList());

-    private Profile profile;
    private ToggleGroup toggleGroup;

    public GameList() {
-        EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> {
-            if (event.getSource() == profile.getRepository())
-                loadVersions((HMCLGameRepository) event.getSource());
-        });
        EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
-            if (event.getSource() == profile.getRepository())
+            if (event.getSource() == Profiles.getSelectedProfile().getRepository())
                JFXUtilities.runInFX(() -> loading.set(true));
        });
-        Profiles.selectedProfileProperty().addListener((a, b, newValue) -> profile = newValue);

-        profile = Profiles.getSelectedProfile();
-        if (profile.getRepository().isLoaded())
-            loadVersions(profile.getRepository());
-        else
-            profile.getRepository().refreshVersionsAsync().start();
+        Profiles.registerVersionsListener(this::loadVersions);
    }

-    private void loadVersions(HMCLGameRepository repository) {
+    private void loadVersions(Profile profile) {
+        HMCLGameRepository repository = profile.getRepository();
        toggleGroup = new ToggleGroup();
        WeakListenerHolder listenerHolder = new WeakListenerHolder();
        toggleGroup.getProperties().put("ReferenceHolder", listenerHolder);
        List<GameListItem> children = repository.getVersions().parallelStream()
                .filter(version -> !version.isHidden())
-                .sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
+                .sorted(Comparator.comparing(Version::getReleaseTime).thenComparing(a -> VersionNumber.asVersion(a.getId())))
                .map(version -> new GameListItem(toggleGroup, profile, version.getId()))
                .collect(Collectors.toList());
        JFXUtilities.runInFX(() -> {
-            if (profile == repository.getProfile()) {
+            if (profile == Profiles.getSelectedProfile()) {
                loading.set(false);
                items.setAll(children);
                children.forEach(GameListItem::checkSelection);
@@ -107,19 +100,19 @@ public class GameList extends Control implements DecoratorPage {
    }

    public void addNewGame() {
-        Controllers.getDecorator().startWizard(new DownloadWizardProvider(0), i18n("install.new_game"));
+        Controllers.getDecorator().startWizard(new VanillaInstallWizardProvider(), i18n("install.new_game"));
    }

    public void importModpack() {
-        Controllers.getDecorator().startWizard(new DownloadWizardProvider(1), i18n("install.modpack"));
+        Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(), i18n("install.modpack"));
    }

    public void refresh() {
-        profile.getRepository().refreshVersionsAsync().start();
+        Profiles.getSelectedProfile().getRepository().refreshVersionsAsync().start();
    }

    public void modifyGlobalGameSettings() {
-        Versions.modifyGlobalSettings(profile);
+        Versions.modifyGlobalSettings(Profiles.getSelectedProfile());
    }

    @Override
@@ -17,31 +17,19 @@
 */
 package org.jackhuang.hmcl.ui.versions;

-import javafx.beans.property.*;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.image.Image;
-import org.jackhuang.hmcl.download.LibraryAnalyzer;
-import org.jackhuang.hmcl.game.GameVersion;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.ui.Controllers;
-
-import java.io.File;
-
-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 class GameListItem extends Control {
    private final Profile profile;
    private final String version;
    private final boolean isModpack;
    private final ToggleGroup toggleGroup;
-    private final StringProperty title = new SimpleStringProperty();
-    private final StringProperty subtitle = new SimpleStringProperty();
    private final BooleanProperty selected = new SimpleBooleanProperty();
-    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();

    public GameListItem(ToggleGroup toggleGroup, Profile profile, String id) {
        this.profile = profile;
@@ -49,23 +37,7 @@ public class GameListItem extends Control {
        this.toggleGroup = toggleGroup;
        this.isModpack = profile.getRepository().isModpack(id);

-        String game = GameVersion.minecraftVersion(profile.getRepository().getVersionJar(id)).orElse("Unknown");
-
-        StringBuilder libraries = new StringBuilder(game);
-        LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(profile.getRepository().getVersion(id));
-        analyzer.getForge().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))));
-        analyzer.getLiteLoader().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))));
-        analyzer.getOptiFine().ifPresent(library -> libraries.append(", ").append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))));
-
-        title.set(id);
-        subtitle.set(libraries.toString());
        selected.set(id.equals(profile.getSelectedVersion()));
-
-        File iconFile = profile.getRepository().getVersionIcon(version);
-        if (iconFile.exists())
-            image.set(new Image("file:" + iconFile.getAbsolutePath()));
-        else
-            image.set(new Image("/assets/img/grass.png"));
    }

    @Override
@@ -85,22 +57,10 @@ public class GameListItem extends Control {
        return version;
    }

-    public StringProperty titleProperty() {
-        return title;
-    }
-
-    public StringProperty subtitleProperty() {
-        return subtitle;
-    }
-
    public BooleanProperty selectedProperty() {
        return selected;
    }

-    public ObjectProperty<Image> imageProperty() {
-        return image;
-    }
-
    public void checkSelection() {
        selected.set(version.equals(profile.getSelectedVersion()));
    }
@@ -122,12 +82,11 @@ public class GameListItem extends Control {
    }

    public void launch() {
-        Versions.launch(profile, version);
+        Versions.testGame(profile, version);
    }

    public void modifyGameSettings() {
-        Controllers.getVersionPage().load(version, profile);
-        Controllers.navigate(Controllers.getVersionPage());
+        Versions.modifyGameSettings(profile, version);
    }

    public void generateLaunchScript() {
@@ -141,8 +100,4 @@ public class GameListItem extends Control {
    public void update() {
        Versions.updateVersion(profile, version);
    }
-
-    private static String modifyVersion(String gameVersion, String version) {
-        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
-    }
 }
@@ -19,27 +19,19 @@ package org.jackhuang.hmcl.ui.versions;

 import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
 import javafx.scene.control.SkinBase;
-import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
-import org.jackhuang.hmcl.ui.construct.IconedItem;
 import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
-import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
-
-import java.util.function.Consumer;
-import java.util.function.Function;
+import org.jackhuang.hmcl.ui.construct.MenuSeparator;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

@@ -57,48 +49,22 @@ public class GameListItemSkin extends SkinBase<GameListItem> {
        chkSelected.setToggleGroup(skinnable.getToggleGroup());
        root.setLeft(chkSelected);

-        HBox center = new HBox();
-        center.setSpacing(8);
-        center.setAlignment(Pos.CENTER_LEFT);
+        root.setCenter(new GameItem(skinnable.getProfile(), skinnable.getVersion()));

-        StackPane imageViewContainer = new StackPane();
-        FXUtils.setLimitWidth(imageViewContainer, 32);
-        FXUtils.setLimitHeight(imageViewContainer, 32);
-
-        ImageView imageView = new ImageView();
-        FXUtils.limitSize(imageView, 32, 32);
-        imageView.imageProperty().bind(skinnable.imageProperty());
-        imageViewContainer.getChildren().setAll(imageView);
-
-        TwoLineListItem item = new TwoLineListItem();
-        BorderPane.setAlignment(item, Pos.CENTER);
-        center.getChildren().setAll(imageView, item);
-        root.setCenter(center);
-
-        VBox menu = new VBox();
+        PopupMenu menu = new PopupMenu();
        JFXPopup popup = new JFXPopup(menu);

-        Function<Runnable, Runnable> wrap = r -> () -> {
-            r.run();
-            popup.hide();
-        };
-
-        Function<Node, Node> limitWidth = node -> {
-            StackPane pane = new StackPane(node);
-            pane.setAlignment(Pos.CENTER);
-            FXUtils.setLimitWidth(pane, 14);
-            FXUtils.setLimitHeight(pane, 14);
-            return pane;
-        };
-
-        menu.getChildren().setAll(
-                new IconedMenuItem(limitWidth.apply(SVG.gear(Theme.blackFillBinding(), 14, 14)), i18n("version.manage.manage"), wrap.apply(skinnable::modifyGameSettings)),
-                new IconedMenuItem(limitWidth.apply(SVG.pencil(Theme.blackFillBinding(), 14, 14)), i18n("version.manage.rename"), wrap.apply(skinnable::rename)),
-                new IconedMenuItem(limitWidth.apply(SVG.delete(Theme.blackFillBinding(), 14, 14)), i18n("version.manage.remove"), wrap.apply(skinnable::remove)),
-                new IconedMenuItem(limitWidth.apply(SVG.export(Theme.blackFillBinding(), 14, 14)), i18n("modpack.export"), wrap.apply(skinnable::export)),
-                new IconedMenuItem(limitWidth.apply(SVG.folderOpen(Theme.blackFillBinding(), 14, 14)), i18n("folder.game"), wrap.apply(skinnable::browse)),
-                new IconedMenuItem(limitWidth.apply(SVG.launch(Theme.blackFillBinding(), 14, 14)), i18n("version.launch"), wrap.apply(skinnable::launch)),
-                new IconedMenuItem(limitWidth.apply(SVG.script(Theme.blackFillBinding(), 14, 14)), i18n("version.launch_script"), wrap.apply(skinnable::generateLaunchScript)));
+        menu.getContent().setAll(
+                new IconedMenuItem(FXUtils.limitingSize(SVG.gear(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.manage.manage"), FXUtils.withJFXPopupClosing(skinnable::modifyGameSettings, popup)),
+                new MenuSeparator(),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.pencil(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.manage.rename"), FXUtils.withJFXPopupClosing(skinnable::rename, popup)),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.delete(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.manage.remove"), FXUtils.withJFXPopupClosing(skinnable::remove, popup)),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.export(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("modpack.export"), FXUtils.withJFXPopupClosing(skinnable::export, popup)),
+                new MenuSeparator(),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.folderOpen(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("folder.game"), FXUtils.withJFXPopupClosing(skinnable::browse, popup)),
+                new MenuSeparator(),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.launch(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.launch.test"), FXUtils.withJFXPopupClosing(skinnable::launch, popup)),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.script(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("version.launch_script"), FXUtils.withJFXPopupClosing(skinnable::generateLaunchScript, popup)));

        HBox right = new HBox();
        right.setAlignment(Pos.CENTER_RIGHT);
@@ -123,8 +89,6 @@ public class GameListItemSkin extends SkinBase<GameListItem> {

        root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
        JFXDepthManager.setDepth(root, 1);
-        item.titleProperty().bind(skinnable.titleProperty());
-        item.subtitleProperty().bind(skinnable.subtitleProperty());

        getChildren().setAll(root);
    }
@@ -23,13 +23,14 @@ import javafx.scene.input.TransferMode;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.mod.ModInfo;
 import org.jackhuang.hmcl.mod.ModManager;
+import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.ListPage;
-import org.jackhuang.hmcl.util.FileUtils;
 import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;
 import java.io.IOException;
@@ -77,6 +78,10 @@ public final class ModListPage extends ListPage<ModItem> {
        });
    }

+    public void loadVersion(Profile profile, String id) {
+        loadMods(profile.getModManager(), id);
+    }
+
    public void loadMods(ModManager modManager, String versionId) {
        this.modManager = modManager;
        this.versionId = versionId;
@@ -18,9 +18,9 @@
 package org.jackhuang.hmcl.ui.versions;

 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.controls.JFXTabPane;
+import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
@@ -28,9 +28,15 @@ import javafx.scene.control.Tab;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
+import org.jackhuang.hmcl.ui.SVG;
+import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
+import org.jackhuang.hmcl.ui.construct.Navigator;
+import org.jackhuang.hmcl.ui.construct.PageCloseEvent;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.FileUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;

 import java.io.File;

@@ -50,10 +56,6 @@ public final class VersionPage extends StackPane implements DecoratorPage {
    @FXML
    private WorldListPage world;
    @FXML
-    private JFXListView<?> browseList;
-    @FXML
-    private JFXListView<?> managementList;
-    @FXML
    private JFXButton btnBrowseMenu;
    @FXML
    private JFXButton btnDelete;
@@ -62,6 +64,8 @@ public final class VersionPage extends StackPane implements DecoratorPage {
    @FXML
    private JFXButton btnExport;
    @FXML
+    private JFXButton btnTestGame;
+    @FXML
    private StackPane rootPane;
    @FXML
    private StackPane contentPane;
@@ -77,15 +81,35 @@ public final class VersionPage extends StackPane implements DecoratorPage {
    {
        FXUtils.loadFXML(this, "/assets/fxml/version/version.fxml");

-        getChildren().removeAll(browseList, managementList);
-
+        PopupMenu browseList = new PopupMenu();
        browsePopup = new JFXPopup(browseList);
+        browseList.getContent().setAll(
+                new IconedMenuItem(null, i18n("folder.game"), FXUtils.withJFXPopupClosing(() -> onBrowse(""), browsePopup)),
+                new IconedMenuItem(null, i18n("folder.mod"), FXUtils.withJFXPopupClosing(() -> onBrowse("mods"), browsePopup)),
+                new IconedMenuItem(null, i18n("folder.config"), FXUtils.withJFXPopupClosing(() -> onBrowse("config"), browsePopup)),
+                new IconedMenuItem(null, i18n("folder.resourcepacks"), FXUtils.withJFXPopupClosing(() -> onBrowse("resourcepacks"), browsePopup)),
+                new IconedMenuItem(null, i18n("folder.screenshots"), FXUtils.withJFXPopupClosing(() -> onBrowse("screenshots"), browsePopup)),
+                new IconedMenuItem(null, i18n("folder.saves"), FXUtils.withJFXPopupClosing(() -> onBrowse("resourcepacks"), browsePopup))
+        );
+
+        PopupMenu managementList = new PopupMenu();
        managementPopup = new JFXPopup(managementList);
+        managementList.getContent().setAll(
+                new IconedMenuItem(null, i18n("version.manage.rename"), FXUtils.withJFXPopupClosing(() -> Versions.renameVersion(profile, version), managementPopup)),
+                new IconedMenuItem(null, i18n("version.manage.remove"), FXUtils.withJFXPopupClosing(() -> Versions.deleteVersion(profile, version), managementPopup)),
+                new IconedMenuItem(null, i18n("version.manage.redownload_assets_index"), FXUtils.withJFXPopupClosing(() -> new GameAssetIndexDownloadTask(profile.getDependency(), profile.getRepository().getResolvedVersion(version)).start(), managementPopup)),
+                new IconedMenuItem(null, i18n("version.manage.remove_libraries"), FXUtils.withJFXPopupClosing(() -> FileUtils.deleteDirectoryQuietly(new File(profile.getRepository().getBaseDirectory(), "libraries")), managementPopup))
+        );

        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"));
+
+        btnTestGame.setGraphic(SVG.launch(Theme.whiteFillBinding(), 20, 20));
+        FXUtils.installTooltip(btnTestGame, i18n("version.launch.test"));
+
+        setEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onNavigated);
    }

    public void load(String id, Profile profile) {
@@ -94,77 +118,48 @@ public final class VersionPage extends StackPane implements DecoratorPage {

        title.set(i18n("version.manage.manage") + " - " + id);

-        versionSettings.loadVersionSetting(profile, id);
+        versionSettings.loadVersion(profile, id);
        mod.setParentTab(tabPane);
        modTab.setUserData(mod);
-        mod.loadMods(profile.getModManager(), id);
+        mod.loadVersion(profile, id);
        installer.loadVersion(profile, id);
        world.loadVersion(profile, id);
    }

+    private void onNavigated(Navigator.NavigationEvent event) {
+        if (this.version == null || this.profile == null)
+            throw new IllegalStateException();
+
+        // If we jumped to game list page and deleted this version
+        // and back to this page, we should return to main page.
+        if (!this.profile.getRepository().isLoaded() ||
+                !this.profile.getRepository().hasVersion(version)) {
+            Platform.runLater(() -> fireEvent(new PageCloseEvent()));
+            return;
+        }
+
+        load(this.version, this.profile);
+    }
+
+    @FXML
+    private void onTestGame() {
+        Versions.testGame(profile, version);
+    }
+
    @FXML
    private void onBrowseMenu() {
-        browseList.getSelectionModel().select(-1);
-        browsePopup.show(btnBrowseMenu, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, -12, 15);
+        browsePopup.show(btnBrowseMenu, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, 0, btnBrowseMenu.getHeight());
    }

    @FXML
    private void onManagementMenu() {
-        managementList.getSelectionModel().select(-1);
-        managementPopup.show(btnManagementMenu, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, -12, 15);
+        managementPopup.show(btnManagementMenu, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.RIGHT, 0, btnManagementMenu.getHeight());
    }

-    @FXML
-    private void onBrowse() {
-        String sub;
-        switch (browseList.getSelectionModel().getSelectedIndex()) {
-            case 0:
-                sub = "";
-                break;
-            case 1:
-                sub = "mods";
-                break;
-            case 2:
-                sub = "coremods";
-                break;
-            case 3:
-                sub = "config";
-                break;
-            case 4:
-                sub = "resourcepacks";
-                break;
-            case 5:
-                sub = "screenshots";
-                break;
-            case 6:
-                sub = "saves";
-                break;
-            default:
-                return;
-        }
+    private void onBrowse(String sub) {
        FXUtils.openFolder(new File(profile.getRepository().getRunDirectory(version), sub));
    }

-    @FXML
-    private void onManagement() {
-        switch (managementList.getSelectionModel().getSelectedIndex()) {
-            case 0: // rename a version
-                Versions.renameVersion(profile, version);
-                break;
-            case 1: // remove a version
-                Versions.deleteVersion(profile, version);
-                break;
-            case 2: // redownload asset index
-                new GameAssetIndexDownloadTask(profile.getDependency(), profile.getRepository().getResolvedVersion(version)).start();
-                break;
-            case 3: // delete libraries
-                FileUtils.deleteDirectoryQuietly(new File(profile.getRepository().getBaseDirectory(), "libraries"));
-                break;
-            case 4:
-                throw new Error();
-        }
-    }
-
    public String getTitle() {
        return title.get();
    }
@@ -46,13 +46,14 @@ 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.ui.decorator.DecoratorPage;
-import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.JavaVersion;
 import org.jackhuang.hmcl.util.Logging;
-import org.jackhuang.hmcl.util.OperatingSystem;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.JavaVersion;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
@@ -106,11 +107,11 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag

        FXUtils.smoothScrolling(scroll);

-        Task.of(variables -> variables.set("list", JavaVersion.getJREs()))
+        Task.of(variables -> variables.set("list", JavaVersion.getJavas()))
                .subscribe(Schedulers.javafx(), variables -> {
                    javaItem.loadChildren(
                            (variables.<List<JavaVersion>>get("list")).stream()
-                                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion(), javaVersion.getBinary().getAbsolutePath(), javaVersion))
+                                    .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion() + i18n("settings.game.java_directory.bit", javaVersion.getPlatform().getBit()), javaVersion.getBinary().toString(), javaVersion))
                                    .collect(Collectors.toList()));
                    javaItemsLoaded = true;
                    initializeSelectedJava();
@@ -138,7 +139,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
            else
                profile.getRepository().globalizeVersionSetting(versionId);

-            Platform.runLater(() -> loadVersionSetting(profile, versionId));
+            Platform.runLater(() -> loadVersion(profile, versionId));
        });

        specificSettingsListener = o -> {
@@ -149,7 +150,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
        advancedSettingsPane.disableProperty().bind(chkEnableSpecificSettings.selectedProperty().not());
    }

-    public void loadVersionSetting(Profile profile, String versionId) {
+    public void loadVersion(Profile profile, String versionId) {
        this.profile = profile;
        this.versionId = versionId;

@@ -245,7 +246,10 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
        }

        if (lastVersionSetting.isUsesCustomJavaDir()) {
-            javaItem.setSelectedData(null);
+            javaItem.getGroup().getToggles().stream()
+                    .filter(javaItem::isCustomToggle)
+                    .findFirst().get()
+                    .setSelected(true);
        } else {
            try {
                javaItem.setSelectedData(lastVersionSetting.getJavaVersion());
@@ -259,7 +263,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
        Task.of(variables -> variables.set("java", versionSetting.getJavaVersion()))
                .subscribe(Task.of(Schedulers.javafx(),
                        variables -> javaItem.setSubtitle(variables.<JavaVersion>getOptional("java")
-                                .map(JavaVersion::getBinary).map(File::getAbsolutePath).orElse("Invalid Java Directory"))));
+                                .map(JavaVersion::getBinary).map(Path::toString).orElse("Invalid Java Directory"))));
    }

    @FXML
@@ -276,7 +280,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
        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);
+            File iconFile = profile.getRepository().getVersionIconFile(versionId);
            try {
                FileUtils.copyFile(selectedFile, iconFile);
                loadIcon();
@@ -291,7 +295,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
        if (versionId == null)
            return;

-        File iconFile = profile.getRepository().getVersionIcon(versionId);
+        File iconFile = profile.getRepository().getVersionIconFile(versionId);
        if (iconFile.exists())
            iconFile.delete();
        loadIcon();
@@ -303,7 +307,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag
            return;
        }

-        File iconFile = profile.getRepository().getVersionIcon(versionId);
+        File iconFile = profile.getRepository().getVersionIconFile(versionId);
        if (iconFile.exists())
            iconPickerItem.setImage(new Image("file:" + iconFile.getAbsolutePath()));
        else
@@ -27,7 +27,6 @@ import org.jackhuang.hmcl.mod.UnsupportedModpackException;
 import org.jackhuang.hmcl.setting.Accounts;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
-import org.jackhuang.hmcl.setting.Profiles;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
@@ -36,8 +35,8 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.export.ExportWizardProvider;
-import org.jackhuang.hmcl.util.FileUtils;
-import org.jackhuang.hmcl.util.OperatingSystem;
+import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.File;
 import java.io.IOException;
@@ -92,24 +91,18 @@ public class Versions {
                region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
                executor.start();
            } catch (UnsupportedModpackException e) {
-                region.get().fireEvent(new DialogCloseEvent());
                Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
            } catch (MismatchedModpackTypeException e) {
-                region.get().fireEvent(new DialogCloseEvent());
                Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
            } catch (IOException e) {
-                region.get().fireEvent(new DialogCloseEvent());
                Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
            }
        }
    }

    public static void generateLaunchScript(Profile profile, String id) {
-        GameRepository repository = profile.getRepository();
-
-        if (Accounts.getSelectedAccount() == null)
-            Controllers.dialog(i18n("login.empty_username"));
-        else {
+        if (checkForLaunching(profile, id)) {
+            GameRepository repository = profile.getRepository();
            FileChooser chooser = new FileChooser();
            if (repository.getRunDirectory(id).isDirectory())
                chooser.setInitialDirectory(repository.getRunDirectory(id));
@@ -119,22 +112,41 @@ public class Versions {
                    : new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
            File file = chooser.showSaveDialog(Controllers.getStage());
            if (file != null)
-                LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, file);
+                new LauncherHelper(profile, Accounts.getSelectedAccount(), id).makeLaunchScript(file);
        }
    }

    public static void launch(Profile profile, String id) {
+        if (checkForLaunching(profile, id))
+            new LauncherHelper(profile, Accounts.getSelectedAccount(), id).launch();
+    }
+
+    public static void testGame(Profile profile, String id) {
+        if (checkForLaunching(profile, id)) {
+            LauncherHelper helper = new LauncherHelper(profile, Accounts.getSelectedAccount(), id);
+            helper.setTestMode();
+            helper.launch();
+        }
+    }
+
+    private static boolean checkForLaunching(Profile profile, String id) {
        if (Accounts.getSelectedAccount() == null)
            Controllers.getLeftPaneController().checkAccount();
-        else if (id == null)
+        else if (id == null || !profile.getRepository().isLoaded() || !profile.getRepository().hasVersion(id))
            Controllers.dialog(i18n("version.empty.launch"));
        else
-            LauncherHelper.INSTANCE.launch(profile, Accounts.getSelectedAccount(), id, null);
+            return true;
+        return false;
    }

    public static void modifyGlobalSettings(Profile profile) {
        VersionSettingsPage page = new VersionSettingsPage();
-        page.loadVersionSetting(profile, null);
+        page.loadVersion(profile, null);
        Controllers.navigate(page);
    }
+
+    public static void modifyGameSettings(Profile profile, String version) {
+        Controllers.getVersionPage().load(version, profile);
+        Controllers.navigate(Controllers.getVersionPage());
+    }
 }
@@ -1,6 +1,9 @@
 package org.jackhuang.hmcl.ui.versions;

-import javafx.beans.property.*;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
@@ -8,8 +11,10 @@ import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.wizard.SinglePageWizardProvider;
+import org.jackhuang.hmcl.util.versioning.VersionNumber;

 import java.io.File;
+import java.text.SimpleDateFormat;
 import java.util.Date;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -19,12 +24,14 @@ public class WorldListItem extends Control {
    private final StringProperty subtitle = new SimpleStringProperty();
    private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
    private final World world;
+    private final SimpleDateFormat simpleDateFormat;

    public WorldListItem(World world) {
        this.world = world;
+        this.simpleDateFormat = new SimpleDateFormat(i18n("world.time"));

        title.set(world.getWorldName());
-        subtitle.set(i18n("world.description", world.getFileName(), new Date(world.getLastPlayed()).toString(), world.getGameVersion()));
+        subtitle.set(i18n("world.description", world.getFileName(), simpleDateFormat.format(new Date(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
    }

    @Override
@@ -58,6 +65,12 @@ public class WorldListItem extends Control {
    }

    public void manageDatapacks() {
+        if (world.getGameVersion() == null || // old game will not write game version to level.dat
+                (VersionNumber.isIntVersionNumber(world.getGameVersion()) // we don't parse snapshot version
+                        && VersionNumber.asVersion(world.getGameVersion()).compareTo(VersionNumber.asVersion("1.13")) < 0)) {
+            Controllers.dialog(i18n("world.datapack.1_13"));
+            return;
+        }
        Controllers.navigate(new DatapackListPage(world.getWorldName(), world.getFile()));
    }
 }
@@ -4,21 +4,18 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXPopup;
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
 import javafx.scene.control.SkinBase;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.setting.Theme;
 import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.IconedMenuItem;
+import org.jackhuang.hmcl.ui.construct.PopupMenu;
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;

-import java.util.function.Function;
-
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

 public class WorldListItemSkin extends SkinBase<WorldListItem> {
@@ -46,25 +43,12 @@ public class WorldListItemSkin extends SkinBase<WorldListItem> {
        center.getChildren().setAll(imageView, item);
        root.setCenter(center);

-        VBox menu = new VBox();
+        PopupMenu menu = new PopupMenu();
        JFXPopup popup = new JFXPopup(menu);

-        Function<Runnable, Runnable> wrap = r -> () -> {
-            r.run();
-            popup.hide();
-        };
-
-        Function<Node, Node> limitWidth = node -> {
-            StackPane pane = new StackPane(node);
-            pane.setAlignment(Pos.CENTER);
-            FXUtils.setLimitWidth(pane, 14);
-            FXUtils.setLimitHeight(pane, 14);
-            return pane;
-        };
-
-        menu.getChildren().setAll(
-                new IconedMenuItem(limitWidth.apply(SVG.gear(Theme.blackFillBinding(), 14, 14)), i18n("world.datapack"), wrap.apply(skinnable::manageDatapacks)),
-                new IconedMenuItem(limitWidth.apply(SVG.export(Theme.blackFillBinding(), 14, 14)), i18n("world.export"), wrap.apply(skinnable::export)));
+        menu.getContent().setAll(
+                new IconedMenuItem(FXUtils.limitingSize(SVG.gear(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("world.datapack"), FXUtils.withJFXPopupClosing(skinnable::manageDatapacks, popup)),
+                new IconedMenuItem(FXUtils.limitingSize(SVG.export(Theme.blackFillBinding(), 14, 14), 14, 14), i18n("world.export"), FXUtils.withJFXPopupClosing(skinnable::export, popup)));

        HBox right = new HBox();
        right.setAlignment(Pos.CENTER_RIGHT);
@@ -3,16 +3,20 @@ package org.jackhuang.hmcl.ui.versions;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.setting.Profile;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.util.Logging;

 import java.io.File;
 import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.logging.Level;
+import java.util.stream.Collectors;

 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

@@ -25,33 +29,38 @@ public class WorldListPage extends ListPage<WorldListItem> {
    public void loadVersion(Profile profile, String id) {
        this.savesDir = profile.getRepository().getRunDirectory(id).toPath().resolve("saves");

-        itemsProperty().clear();
-        try {
-            if (Files.exists(savesDir))
-                for (Path worldDir : Files.newDirectoryStream(savesDir)) {
-                    itemsProperty().add(new WorldListItem(new World(worldDir)));
-                }
-        } catch (IOException e) {
-            Logging.LOG.log(Level.WARNING, "Failed to read saves", e);
-        }
+        itemsProperty().setAll(World.getWorlds(savesDir).stream()
+                .map(WorldListItem::new).collect(Collectors.toList()));
    }

    @Override
    public void add() {
        FileChooser chooser = new FileChooser();
-        chooser.setTitle(i18n("world.choose_world"));
+        chooser.setTitle(i18n("world.import.choose"));
        chooser.getExtensionFilters().setAll(new FileChooser.ExtensionFilter(i18n("world.extension"), "*.zip"));
        List<File> res = chooser.showOpenMultipleDialog(Controllers.getStage());

-        if (res == null) return;
-        res.forEach(it -> {
-            try {
-                World world = new World(it.toPath());
-                world.install(savesDir, world.getWorldName());
-                itemsProperty().add(new WorldListItem(new World(savesDir.resolve(world.getWorldName()))));
-            } catch (IOException | IllegalArgumentException e) {
-                Logging.LOG.log(Level.WARNING, "Unable to parse datapack file " + it, e);
-            }
-        });
+        if (res == null || res.isEmpty()) return;
+        try {
+            // Only accept one world file because user is required to confirm the new world name
+            // Or too many input dialogs are popped.
+            World world = new World(res.get(0).toPath());
+
+            Controllers.inputDialog(i18n("world.name.enter"), (name, resolve, reject) -> {
+                Task.of(() -> world.install(savesDir, name))
+                        .finalized(Schedulers.javafx(), var -> {
+                            itemsProperty().add(new WorldListItem(new World(savesDir.resolve(name))));
+                            resolve.run();
+                        }, e -> {
+                            if (e instanceof FileAlreadyExistsException)
+                                reject.accept(i18n("world.import.failed", i18n("world.import.already_exists")));
+                            else
+                                reject.accept(i18n("world.import.failed", e.getClass().getName() + ": " + e.getLocalizedMessage()));
+                        }).start();
+            }).setInitialText(world.getWorldName());
+
+        } catch (IOException | IllegalArgumentException e) {
+            Logging.LOG.log(Level.WARNING, "Unable to parse datapack file " + res.get(0), e);
+        }
    }
 }
@@ -17,8 +17,6 @@
 */
 package org.jackhuang.hmcl.upgrade;

-import org.jackhuang.hmcl.util.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -30,6 +28,8 @@ import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;

+import org.jackhuang.hmcl.util.io.IOUtils;
+
 import static java.nio.file.StandardOpenOption.*;
 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Pair.pair;
@@ -18,7 +18,7 @@
 package org.jackhuang.hmcl.upgrade;

 import org.jackhuang.hmcl.task.FileDownloadTask;
-import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.tukaani.xz.XZInputStream;

 import java.io.ByteArrayInputStream;
@@ -18,8 +18,8 @@
 package org.jackhuang.hmcl.upgrade;

 import org.jackhuang.hmcl.util.DigestUtils;
-import org.jackhuang.hmcl.util.IOUtils;
-import org.jackhuang.hmcl.util.JarUtils;
+import org.jackhuang.hmcl.util.io.IOUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;

 import java.io.IOException;
 import java.io.InputStream;
@@ -21,8 +21,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
-import org.jackhuang.hmcl.util.JsonUtils;
-import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.gson.JsonUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;
 import java.util.Optional;
@@ -24,7 +24,7 @@ import javafx.beans.property.*;
 import javafx.beans.value.ObservableBooleanValue;
 import org.jackhuang.hmcl.Metadata;
 import org.jackhuang.hmcl.setting.ConfigHolder;
-import org.jackhuang.hmcl.util.NetworkUtils;
+import org.jackhuang.hmcl.util.io.NetworkUtils;

 import java.io.IOException;
 import java.util.logging.Level;
@@ -35,7 +35,7 @@ import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Lang.thread;
 import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.VersionNumber.asVersion;
+import static org.jackhuang.hmcl.util.versioning.VersionNumber.asVersion;

 public final class UpdateChecker {
    private UpdateChecker() {}
@@ -83,7 +83,7 @@ public final class UpdateChecker {
    }

    private static RemoteVersion checkUpdate(UpdateChannel channel) throws IOException {
-        if (!IntegrityChecker.isSelfVerified()) {
+        if (!IntegrityChecker.isSelfVerified() && !"true".equals(System.getProperty("hmcl.self_integrity_check.disable"))) {
            throw new IOException("Self verification failed");
        }

@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.upgrade;

 import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
 import javafx.application.Platform;
 import javafx.scene.layout.Region;
 import org.jackhuang.hmcl.Launcher;
@@ -28,9 +29,9 @@ import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
-import org.jackhuang.hmcl.util.JarUtils;
-import org.jackhuang.hmcl.util.JavaVersion;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.JarUtils;
+import org.jackhuang.hmcl.util.platform.JavaVersion;

 import javax.swing.*;
 import java.io.IOException;
@@ -158,7 +159,7 @@ public final class UpdateHandler {

    private static void startJava(Path jar, String... appArgs) throws IOException {
        List<String> commandline = new ArrayList<>();
-        commandline.add(JavaVersion.fromCurrentEnvironment().getBinary().getAbsolutePath());
+        commandline.add(JavaVersion.fromCurrentEnvironment().getBinary().toString());
        commandline.add("-jar");
        commandline.add(jar.toAbsolutePath().toString());
        for (String arg : appArgs) {
@@ -239,18 +240,20 @@ public final class UpdateHandler {
    }

    private static void breakForceUpdateFeature() {
-        try {
-            Path hmclVersionJson = Launcher.HMCL_DIRECTORY.toPath().resolve("hmclver.json");
-            if (Files.isRegularFile(hmclVersionJson)) {
+        Path hmclVersionJson = Launcher.HMCL_DIRECTORY.toPath().resolve("hmclver.json");
+        if (Files.isRegularFile(hmclVersionJson)) {
+            try {
                Map<?, ?> content = new Gson().fromJson(new String(Files.readAllBytes(hmclVersionJson), UTF_8), Map.class);
                Object ver = content.get("ver");
                if (ver instanceof String && ((String) ver).startsWith("3.")) {
                    Files.delete(hmclVersionJson);
                    LOG.info("Successfully broke the force update feature");
                }
+            } catch (IOException e) {
+                LOG.log(Level.WARNING, "Failed to break the force update feature", e);
+            } catch (JsonParseException e) {
+                hmclVersionJson.toFile().delete();
            }
-        } catch (IOException e) {
-            LOG.log(Level.WARNING, "Failed to break the force update feature", e);
        }
    }
    // ====
@@ -23,6 +23,8 @@ import org.jackhuang.hmcl.ui.CrashWindow;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.upgrade.IntegrityChecker;
 import org.jackhuang.hmcl.upgrade.UpdateChecker;
+import org.jackhuang.hmcl.util.io.NetworkUtils;
+import org.jackhuang.hmcl.util.platform.OperatingSystem;

 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -1,5 +1,6 @@
 .root {
    -fx-base-color: #5c6bc0;
+    -fx-base-darker-color: derive(-fx-base-color, -10%);
    -fx-base-check-color: derive(-fx-base-color, 30%);
    -fx-base-text-fill: white;
 }
@@ -1,5 +1,6 @@
 .root {
    -fx-base-color: %base-color%;
+    -fx-base-darker-color: derive(-fx-base-color, -10%);
    -fx-base-check-color: derive(-fx-base-color, 30%);
    -fx-base-text-fill: %font-color%;
 }
@@ -59,6 +59,10 @@
    -fx-padding: 20 0 20 0;
 }

+.iconed-item {
+    -jfx-rippler-fill: -fx-base-color;
+}
+
 .iconed-item .iconed-item-container {
    -fx-padding: 10 16 10 16;
    -fx-spacing: 10;
@@ -66,13 +70,48 @@
    -fx-alignment: CENTER_LEFT;
 }

+.iconed-menu-item {
+    -jfx-rippler-fill: -fx-base-color;
+}
+
 .iconed-menu-item .iconed-item-container {
-    -fx-padding: 10 16 10 16;
+    -fx-padding: 8 16 8 16;
    -fx-spacing: 10;
    -fx-font-size: 12;
    -fx-alignment: CENTER_LEFT;
 }

+.menu-container {
+    -fx-padding: 8 16 8 16;
+}
+
+.menu {
+    -fx-padding: 4 0 4 0;
+}
+
+.bubble {
+    -fx-background-color: gray;
+    -fx-background-radius: 2px;
+}
+
+.bubble .label {
+    -fx-text-fill: white;
+}
+
+.two-line-list-item {
+    -jfx-title-font-size: 15px;
+    -jfx-title-fill: black;
+    -jfx-subtitle-fill: gray;
+}
+
+.window-title-bar .separator {
+    -fx-fill: -fx-base-darker-color;
+}
+
+.darker-fill {
+    -fx-fill: -fx-base-darker-color;
+}
+
 /*******************************************************************************
 *                                                                             *
 * JFX Tab Pane                                                                *
@@ -181,7 +220,6 @@

 .jfx-popup-container {
    -fx-background-color: WHITE;
-    -fx-pref-width: 151.0px;
 }

 .popup-list-view {
@@ -309,6 +347,7 @@
 }

 .jfx-tool-bar-second {
+    -fx-pref-height: 42;
    -fx-padding: 2 2 2 2;
    -fx-background-color: -fx-base-check-color;
 }
@@ -318,7 +357,7 @@
 }

 .jfx-tool-bar-button {
-    -fx-toggle-icon4-size: 35px;
+    -fx-toggle-icon4-size: 37px;
    -fx-pref-height: -fx-toggle-icon4-size;
    -fx-max-height: -fx-toggle-icon4-size;
    -fx-min-height: -fx-toggle-icon4-size;
@@ -510,6 +549,15 @@
    -fx-font-size:14px;
 }

+.jfx-button-raised .jfx-rippler {
+    -jfx-rippler-fill: white;
+}
+
+.jfx-button-raised .label {
+    -fx-text-fill: white;
+    -fx-font-size: 14px;
+}
+
 .jfx-button-raised-round {
    -fx-background-color: -fx-base-color;
    -fx-background-radius: 50px;
@@ -692,11 +740,8 @@
    -fx-font-size: 12;
 }

-.options-list-item-ahead {
-    -fx-background-radius: 2 2 0 0;
-    -fx-background-color: white;
-    -fx-padding: 10 16 10 16;
-    -fx-font-size: 12;
+.options-list-item:first {
+    -fx-border-width: 0;
 }

 .options-list-item-expand-button {
@@ -31,8 +31,18 @@

                <JFXComboBox fx:id="cboServers" promptText="%general.prompt.empty" maxHeight="25" GridPane.columnIndex="1" GridPane.rowIndex="1"/>

-                <Hyperlink fx:id="linkManageInjectorServers" text="%account.injector.manage"
-                           onMouseClicked="#onManageInjecterServers" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
+                <HBox GridPane.columnIndex="2" GridPane.rowIndex="1" spacing="8">
+                    <JFXButton fx:id="btnAddServer" styleClass="toggle-icon4" onMouseClicked="#onAddInjecterServer">
+                        <graphic>
+                            <javafx.scene.shape.SVGPath content="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z" />
+                        </graphic>
+                    </JFXButton>
+                    <JFXButton fx:id="btnManageServer" styleClass="toggle-icon4" onMouseClicked="#onManageInjecterServers">
+                        <graphic>
+                            <fx:include source="/assets/svg/gear.fxml" />
+                        </graphic>
+                    </JFXButton>
+                </HBox>

                <Label text="%account.username" GridPane.rowIndex="2" GridPane.columnIndex="0"/>

@@ -4,7 +4,6 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>
-<?import org.jackhuang.hmcl.ui.construct.URLValidator?>
 <?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>

 <fx:root xmlns="http://javafx.com/javafx"
@@ -16,16 +15,7 @@
                <Label text="%account.injector.add" />
            </heading>
            <body>
-                <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url" onAction="#onAddNext">
-                    <validators>
-                        <URLValidator message="%input.url">
-                            <protocols>
-                                <String fx:value="http" />
-                                <String fx:value="https" />
-                            </protocols>
-                        </URLValidator>
-                    </validators>
-                </JFXTextField>
+                <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url" onAction="#onAddNext" />
            </body>
            <actions>
                <Label fx:id="lblCreationWarning" />
@@ -2,11 +2,48 @@

 <?import com.jfoenix.controls.JFXButton?>
 <?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Rectangle?>
+<?import org.jackhuang.hmcl.ui.FXUtils?>
+<?import javafx.geometry.Insets?>
+<?import org.jackhuang.hmcl.ui.construct.TwoLineListItem?>
+<?import javafx.scene.layout.HBox?>
 <fx:root type="StackPane" pickOnBounds="false"
         xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <StackPane fx:id="main" style="-fx-padding: 25;">
-        <JFXButton prefWidth="150" prefHeight="50" buttonType="RAISED" styleClass="jfx-button-raised"
-                   style="-fx-font-size: 15;" onMouseClicked="#launch"
-                   text="%version.launch" StackPane.alignment="BOTTOM_RIGHT"/>
+        <StackPane fx:id="updatePane" styleClass="bubble" FXUtils.limitWidth="230" FXUtils.limitHeight="55"
+                   onMouseClicked="#onUpgrade" StackPane.alignment="TOP_RIGHT">
+            <HBox StackPane.alignment="CENTER_LEFT" alignment="CENTER_LEFT" spacing="12">
+                <Label fx:id="lblIcon" />
+                <TwoLineListItem titleFill="white" subtitleFill="white" subtitle="%update.bubble.subtitle" fx:id="lblLatestVersion" pickOnBounds="false"
+                    style="-jfx-title-font-weight: BOLD;" />
+
+                <StackPane.margin>
+                    <Insets left="16" top="9" right="12" bottom="9" />
+                </StackPane.margin>
+            </HBox>
+
+            <JFXButton fx:id="closeUpdateButton" StackPane.alignment="TOP_RIGHT" styleClass="toggle-icon-tiny">
+                <StackPane.margin>
+                    <Insets topRightBottomLeft="5" />
+                </StackPane.margin>
+            </JFXButton>
+        </StackPane>
+
+        <StackPane maxWidth="230" maxHeight="55" StackPane.alignment="BOTTOM_RIGHT">
+            <JFXButton prefWidth="230" prefHeight="55" buttonType="RAISED" styleClass="jfx-button-raised"
+                       onMouseClicked="#launch" fx:id="btnLaunch">
+                <graphic>
+                    <VBox alignment="CENTER" translateX="-7" maxWidth="200">
+                        <Label style="-fx-font-size: 16;" text="%version.launch"/>
+                        <Label style="-fx-font-size: 12px;" fx:id="lblCurrentGame"/>
+                    </VBox>
+                </graphic>
+            </JFXButton>
+            <Rectangle fx:id="separator" translateX="95" height="57" styleClass="darker-fill" width="1" mouseTransparent="true"/>
+            <JFXButton prefWidth="230" prefHeight="55" buttonType="RAISED" styleClass="jfx-button-raised"
+                       style="-fx-font-size: 15;" onMouseClicked="#onMenu" fx:id="btnMenu" />
+        </StackPane>
    </StackPane>
 </fx:root>
@@ -20,14 +20,17 @@

                <BorderPane> <!-- Name -->
                    <left>
-                        <VBox>
-                            <Label text="%profile" BorderPane.alignment="CENTER_LEFT"/>
+                        <VBox alignment="CENTER_LEFT">
+                            <Label text="%profile.name" BorderPane.alignment="CENTER_LEFT"/>
                        </VBox>
                    </left>
                    <right>
                        <JFXTextField fx:id="txtProfileName" BorderPane.alignment="CENTER_RIGHT">
+                            <BorderPane.margin>
+                                <Insets top="8" bottom="8" />
+                            </BorderPane.margin>
                            <validators>
-                                <RequiredFieldValidator/>
+                                <RequiredFieldValidator message="%input.not_empty" />
                            </validators>
                        </JFXTextField>
                    </right>
@@ -29,7 +29,9 @@
            </Tab>
        </JFXTabPane>

-        <HBox alignment="TOP_RIGHT" style="-fx-padding: 2 2 2 2;" spacing="3" pickOnBounds="false">
+        <HBox alignment="TOP_RIGHT" style="-fx-padding: 4;" spacing="3" pickOnBounds="false">
+            <JFXButton fx:id="btnTestGame" maxHeight="40.0" minHeight="40.0" onMouseClicked="#onTestGame"
+                       styleClass="toggle-icon3" />
            <JFXButton fx:id="btnBrowseMenu" maxHeight="40.0" minHeight="40.0" onMouseClicked="#onBrowseMenu"
                       styleClass="toggle-icon3">
                <graphic>
@@ -44,23 +46,4 @@
            </JFXButton>
        </HBox>
    </StackPane>
-
-    <JFXListView fx:id="browseList" styleClass="option-list-view" onMouseClicked="#onBrowse" maxWidth="150.0"
-                 minWidth="150.0">
-        <Label text="%folder.game"/>
-        <Label text="%folder.mod"/>
-        <Label text="%folder.coremod"/>
-        <Label text="%folder.config"/>
-        <Label text="%folder.resourcepacks"/>
-        <Label text="%folder.screenshots"/>
-        <Label text="%folder.saves"/>
-    </JFXListView>
-
-    <JFXListView fx:id="managementList" styleClass="option-list-view" onMouseClicked="#onManagement"
-                 maxWidth="300.0" minWidth="300.0">
-        <Label text="%version.manage.rename"/>
-        <Label text="%version.manage.remove"/>
-        <Label text="%version.manage.redownload_assets_index"/>
-        <Label text="%version.manage.remove_libraries"/>
-    </JFXListView>
 </fx:root>
@@ -23,7 +23,7 @@ about.thanks_to=Thanks to
 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)\nConstant Pool Scanner(jenkins-ci, CDDL, GPL 2)
+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)\nConstant Pool Scanner (jenkins-ci, CDDL, GPL 2)\nOpenNBT (Steveice10, BSD 3-Clause)
 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
@@ -36,11 +36,12 @@ account.create=Create a new account
 account.email=Email
 account.failed.connect_authentication_server=Cannot connect to the authentication server. Check your network.
 account.failed.connect_injector_server=Cannot connect to the authentication server. Check your network and ensure the URL is correct.
+account.failed.injector_download_failure=Failed to download authlib-injector. Check your network and try switching to another download source.
 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 login.
 account.failed.no_character=No character in this account.
-account.failed.server_response_malformed=Invalid server response. Is this a valid authentication server?
+account.failed.server_response_malformed=Invalid server response. The authentication server may have a failure.
 account.injector.add=Add an authentication server
 account.injector.manage=Manage authentication servers
 account.injector.manage.title=Authentication servers
@@ -102,10 +103,9 @@ fatal.migration_requires_manual_reboot=The upgrade is about to be completed. Ple
 fatal.apply_update_failure=We're sorry that HMCL couldn't finish the upgrade because something went wrong.\nBut you can still manually finish the upgrade by downloading HMCL from %s.\nPlease consider reporting this issue to us.

 folder.config=Configs
-folder.coremod=Core Mod
-folder.game=Game Dir
+folder.game=Game Directory
 folder.mod=Mod
-folder.resourcepacks=Resourcepacks
+folder.resourcepacks=Resource packs
 folder.saves=Saves
 folder.screenshots=Screenshots

@@ -140,6 +140,7 @@ lang=English
 lang.default=Use system language

 launch.advice.different_platform=Your OS is 64-Bit but your Java is 32-Bit. The 64-Bit Java is recommended.
+launch.advice.forge2760_liteloader=Forge 2760 and above is not compatible with LiteLoader, please consider downgrade Forge to 2759 or earlier.
 launch.advice.java8_1_13=Minecraft 1.13 and later versions can only run on Java 8 or later.
 launch.advice.java8_51_1_13=Minecraft 1.13 may crash on Java 8 earlier than 1.8.0_51. You are supposed to install the latest version of Java 8.
 launch.advice.java9=You cannot launch Minecraft until game version is higher than 1.13 with Java 9 or later Java versions.
@@ -164,8 +165,8 @@ launcher=Launcher
 launcher.background=Background Image
 launcher.background.choose=Choose background path.
 launcher.background.default=Default
-launcher.common_directory=Common Directory
-launcher.common_directory.choose=Choose common directory.
+launcher.common_directory=Cache Directory (Store downloaded files)
+launcher.common_directory.choose=Choose cache directory.
 launcher.common_directory.default=Default
 launcher.common_directory.disabled=Disabled
 launcher.contact=Contact Us
@@ -217,11 +218,12 @@ modpack.name=Modpack Name
 modpack.not_a_valid_name=Not a valid modpack name
 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.error=This modpack file cannot be recognized. Only Curse, MultiMC modpacks are supported.
 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.curse.not_found=Some of required resources are deleted and cannot be downloaded. Please consider the latest version or other modpacks.
 modpack.type.hmcl=HMCL
 modpack.type.multimc=MultiMC
 modpack.unsupported=Unsupported modpack, only HMCL, MultiMC, Curse modpacks are supported.
@@ -247,12 +249,13 @@ mods.remove=Remove
 datapack=Data packs
 datapack.add=Add data pack
 datapack.choose_datapack=Choose the datapack zip to be imported
+datapack.extension=Datapack
 datapack.title=World %s - Datapacks
 datapack.remove=Remove

 world=Worlds/Datapacks
-world.choose_world=Choose the save zip to be imported
 world.datapack=Manage data packs
+world.datapack.1_13=Only Minecraft 1.13 and later versions support data packs.
 world.description=%s. Last played time: %s. Game version: %s.
 world.export=Export this world
 world.export.title=Choose a file location to hold your world
@@ -260,14 +263,21 @@ world.export.location=Export to
 world.export.wizard=Export world %s
 world.extension=World zip
 world.game_version=Game Version
+world.import.already_exists=This world already exists.
+world.import.choose=Choose the save zip to be imported
+world.import.failed=Unable to import this world: %s
 world.name=World Name
+world.name.enter=Enter the world name
+world.time=EEE, MMM d, yyyy HH:mm:ss

 profile=Game Directories
+profile.already_exists=This name already exists, please consider another name.
 profile.default=Current directory
 profile.home=User home
 profile.instance_directory=Game Directory
 profile.instance_directory.choose=Choose Game Directory
 profile.manage=Game Directory List
+profile.name=Name
 profile.new=New Config
 profile.title=Game Directories
 profile.selected=Selected
@@ -304,6 +314,7 @@ settings.game.dimension=Game Window Dimension
 settings.game.exploration=Explore
 settings.game.fullscreen=Fullscreen
 settings.game.java_directory=Java Directory
+settings.game.java_directory.bit=, %s-Bit
 settings.game.java_directory.choose=Choose Java Directory.
 settings.game.management=Manage
 settings.game.working_directory=Working Directory
@@ -345,6 +356,8 @@ update.checking=Checking for updates
 update.failed=Failed to perform upgrade
 update.found=Update Available!
 update.newest_version=Latest version: %s
+update.bubble.title=Update Available: %s
+update.bubble.subtitle=Click here to upgrade
 update.note=Development version contains more functionality and bug fixes as well as more possible bugs.
 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.
@@ -353,19 +366,20 @@ update.tooltip=Update
 version=Games
 version.cannot_read=Unable to gather the game version. Cannot continue auto-installing.
 version.empty=No game
-version.empty.add=Click btn right to install game
+version.empty.add=Install game in game list
 version.empty.launch=No game to launch, please install new game via game list page.
 version.forbidden_name=Forbidden name, do not use this.
 version.game.old=Old
 version.game.release=Release
 version.game.snapshot=Snapshot
 version.launch=Play
+version.launch.test=Test Game
 version.launch_script=Make Launching Script
 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=Game List
-version.manage.manage=Game Management
+version.manage.manage=Manage Game
 version.manage.redownload_assets_index=Redownload Assets Index
 version.manage.remove=Delete this game
 version.manage.remove.confirm=Sure to remove game %s? You cannot restore this game again!
@@ -23,7 +23,7 @@ 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)\nConstant Pool Scanner(jenkins-ci, CDDL, GPL 2)
+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)\nConstant Pool Scanner (jenkins-ci, CDDL, GPL 2)\nOpenNBT (Steveice10, BSD 3-Clause)
 about.claim=免責聲明
 about.claim.statement=Minecraft 版權歸 Mojang AB 所有，使用本軟體產生的版權問題，軟體製作方概不負責。請支援正版。
 about.open_source=開源
@@ -36,11 +36,12 @@ account.create=建立帳戶
 account.email=電子信箱
 account.failed.connect_authentication_server=無法連接認證伺服器，可能是網路問題
 account.failed.connect_injector_server=無法連接認證伺服器，可能是網路故障或 URL 輸入錯誤
+account.failed.injector_download_failure=無法下載 authlib-injector，請檢查網路或嘗試切換下載源
 account.failed.invalid_credentials=您的使用者名稱或密碼錯誤，或者登入次數過多被暫時禁止登入，請稍後再試
 account.failed.invalid_password=無效的密碼
 account.failed.invalid_token=請嘗試登出並重新輸入密碼登入
 account.failed.no_character=該帳號沒有角色
-account.failed.server_response_malformed=這個伺服器不是合法的登入驗證伺服器
+account.failed.server_response_malformed=無法解析認證伺服器響應，可能是伺服器故障
 account.injector.add=新增認證伺服器
 account.injector.manage=管理認證伺服器
 account.injector.manage.title=認證伺服器
@@ -102,7 +103,6 @@ fatal.migration_requires_manual_reboot=HMCL 即將升級完成，請重新打開
 fatal.apply_update_failure=我們很抱歉 HMCL 無法自動完成升級程序，因為出現了一些問題。\n但你依然可以從 %s 處手動下載 HMCL 來完成升級。\n請考慮向我們回報該問題。

 folder.config=設定資料夾
-folder.coremod=核心 MOD 模組資料夾
 folder.game=遊戲資料夾
 folder.mod=MOD 模組資料夾
 folder.resourcepacks=資源包資料夾
@@ -140,6 +140,7 @@ lang=正體中文
 lang.default=跟隨系統語言

 launch.advice.different_platform=您的系統為 64 位元，但是 Java 是 32 位元，建議您安裝 64 位 Java。
+launch.advice.forge2760_liteloader=Forge 2760 與 LiteLoader 不相容。請刪除 LiteLoader 或者更換 Forge 至 2759 或更舊的版本。
 launch.advice.java8_1_13=Minecraft 1.13 只支援 Java 8 或更高版本，請使用 Java 8 或最新版本。
 launch.advice.java8_51_1_13=低於 1.8.0_51 的 Java 版本可能會導致 Minecraft 1.13 崩潰。建議您到 https://java.com 安裝最新版的 Java 8。
 launch.advice.java9=低於 (包含) 1.13 的有安裝 Mod Minecraft 版本 不支援 Java 9 或更高版本，請使用 Java 8。
@@ -164,8 +165,8 @@ launcher=啟動器
 launcher.background=背景位址
 launcher.background.choose=選擇背景路徑
 launcher.background.default=預設（自動尋找啟動器同目錄下的 background.png/jpg 及 bg 資料夾內的圖片）
-launcher.common_directory=公共資料夾
-launcher.common_directory.choose=選擇公共資料夾
+launcher.common_directory=緩存目錄（檔案下載緩存）
+launcher.common_directory.choose=選擇緩存目錄
 launcher.common_directory.default=預設
 launcher.common_directory.disabled=停用
 launcher.contact=聯絡我們
@@ -217,11 +218,12 @@ modpack.name=整合包名稱
 modpack.not_a_valid_name=整合包名稱無效
 modpack.scan=解析整合包
 modpack.task.install=匯入整合包
-modpack.task.install.error=安裝失敗，可能是整合包格式錯誤或操作檔案失敗。
+modpack.task.install.error=無法識別該整合包，目前僅支持導入 Curse、MultiMC、HMCL 整合包。
 modpack.task.install.will=將會安裝整合包：
 modpack.type.curse=Curse
 modpack.type.curse.completion=下載 Curse 整合包相關檔案
 modpack.type.curse.error=無法完成 Curse 整合包的下載，請多次重試或設定代理
+modpack.type.curse.not_found=部分必需檔案已經從網路中被刪除並且再也無法下載，請嘗試該整合包的最新版本或者安裝其他整合包。
 modpack.type.hmcl=HMCL
 modpack.type.multimc=MultiMC
 modpack.unsupported=不支援該整合包。僅 HMCL、MultiMC、Curse 整合包受支援。
@@ -244,30 +246,38 @@ mods.add.success=成功新增模組 %s。
 mods.choose_mod=選擇模組
 mods.remove=刪除

-datapack=數據檔
-datapack.add=添加數據檔
-datapack.choose_datapack=選擇要導入的數據包壓縮檔
-datapack.title=世界 %s - 數據檔
+datapack=資料包
+datapack.add=添加資料包
+datapack.choose_datapack=選擇要導入的資料包壓縮檔
+datapack.extension=資料包
+datapack.title=世界 %s - 資料包
 datapack.remove=刪除

-world=世界/數據檔
-world.choose_world=選擇要導入的存檔壓縮檔
-world.datapack=管理數據檔
+world=世界/資料包
+world.datapack=管理資料包
+world.datapack.1_13=僅 Minecraft 1.13 及之後的版本支持資料包
 world.description=%s. 上一次遊戲時間: %s. 遊戲版本: %s
 world.export=導出此世界
 world.export.title=選擇該世界的存儲位置
 world.export.location=保存到
 world.export.wizard=導出世界 %s
 world.extension=存檔壓縮檔
+world.import.already_exists=此世界已經存在
+world.import.choose=選擇要導入的存檔壓縮檔
+world.import.failed=無法導入此世界: %s
 world.game_version=遊戲版本
 world.name=世界名稱
+world.name.enter=輸入世界名稱
+world.time=yyyy 年 MM 月 dd 日 HH:mm:ss

 profile=遊戲目錄
+profile.already_exists=該名稱已存在
 profile.default=目前目錄
-profile.home=主資料夾
+profile.home=官方啟動器
 profile.instance_directory=遊戲路徑
 profile.instance_directory.choose=選擇遊戲路徑
 profile.manage=遊戲目錄列表
+profile.name=名稱
 profile.new=建立設定
 profile.title=遊戲目錄
 profile.selected=已選取
@@ -304,6 +314,7 @@ settings.game.dimension=遊戲介面解析度大小
 settings.game.exploration=瀏覽
 settings.game.fullscreen=全螢幕
 settings.game.java_directory=Java 路徑
+settings.game.java_directory.bit=，%s 位
 settings.game.java_directory.choose=選擇 Java 路徑
 settings.game.management=管理
 settings.game.working_directory=運行路徑（版本隔離）
@@ -345,6 +356,8 @@ update.checking=正在檢查更新
 update.failed=更新失敗
 update.found=發現到更新
 update.newest_version=最新版本為：%s
+update.bubble.title=發現更新：%s
+update.bubble.subtitle=點擊此處進行升級
 update.note=開發版包含更多的功能以及錯誤修復，但也可能會包含其他的問題。
 update.latest=目前版本為最新版本
 update.no_browser=無法打開瀏覽器，網址已經複製到剪貼簿了，您可以手動複製網址打開頁面
@@ -353,20 +366,21 @@ update.tooltip=更新
 version=遊戲
 version.cannot_read=讀取遊戲版本失敗，無法進行自動安裝
 version.empty=無遊戲版本
-version.empty.add=點擊右側按鈕安裝
+version.empty.add=進入遊戲列表安裝
 version.empty.launch=沒有可啟動的遊戲，你可以點擊左側遊戲欄內的設置按鈕進入遊戲列表安裝遊戲
 version.forbidden_name=此版本名稱不受支援，請換一個名字
 version.game.old=老舊版本
 version.game.release=穩定版本
 version.game.snapshot=測試版本
 version.launch=啟動遊戲
+version.launch.test=測試遊戲
 version.launch_script=生成啟動腳本
 version.launch_script.failed=生成啟動腳本失敗
 version.launch_script.save=儲存啟動腳本
 version.launch_script.success=啟動腳本已生成完畢：%s
 version.manage=遊戲列表
 version.manage.manage=游戏管理
-version.manage.redownload_assets_index=重新下載資源設定（assets_index.json）
+version.manage.redownload_assets_index=更新資源列表
 version.manage.remove=刪除該版本
 version.manage.remove.confirm=真的要刪除版本 %s 嗎？你將無法找回被刪除的檔案！
 version.manage.remove.confirm.trash=真的要刪除版本 %s 嗎？你可以在系統的資源回收桶 (或垃圾桶) 中還原資料夾 %s 來找回該版本。
@@ -23,7 +23,7 @@ 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)\nConstant Pool Scanner(jenkins-ci, CDDL, GPL 2)
+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)\nConstant Pool Scanner (jenkins-ci, CDDL, GPL 2)\nOpenNBT (Steveice10, BSD 3-Clause)
 about.claim=免责声明
 about.claim.statement=Minecraft 版权归 Mojang AB 所有，使用本软件产生的版权问题，软件制作方概不负责。请支持正版。
 about.open_source=开源
@@ -34,13 +34,14 @@ account.character=角色
 account.choose=选择一个角色
 account.create=新建账户
 account.email=邮箱
-account.failed.connect_authentication_server=无法连接认证服务器,可能是网络问题
+account.failed.connect_authentication_server=无法连接认证服务器，可能是网络问题
 account.failed.connect_injector_server=无法连接认证服务器，可能是网络故障或 URL 输入错误
+account.failed.injector_download_failure=无法下载 authlib-injector，请检查网络或尝试切换下载源
 account.failed.invalid_credentials=您的用户名或密码错误，或者登录次数过多被暂时禁止登录，请稍后再试
 account.failed.invalid_password=无效的密码
 account.failed.invalid_token=请尝试登出并重新输入密码登录
 account.failed.no_character=该帐号没有角色
-account.failed.server_response_malformed=这个服务器不是合法的登录验证服务器
+account.failed.server_response_malformed=无法解析认证服务器响应，可能是服务器故障
 account.injector.add=添加认证服务器
 account.injector.manage=管理认证服务器
 account.injector.manage.title=认证服务器
@@ -50,7 +51,7 @@ account.injector.server_url=服务器地址
 account.injector.server_name=服务器名称
 account.manage=账户列表
 account.methods=登录方式
-account.methods.authlib_injector=authlib-injector 登录
+account.methods.authlib_injector=外置登录 (authlib-injector)
 account.methods.offline=离线模式
 account.methods.yggdrasil=正版登录
 account.missing=没有游戏账户
@@ -102,7 +103,6 @@ fatal.migration_requires_manual_reboot=HMCL 即将完成升级，请重新打开
 fatal.apply_update_failure=我们很抱歉 HMCL 无法自动完成升级，因为出现了一些问题。\n但你依然可以从 %s 处手动下载 HMCL 来完成升级。\n请考虑向我们反馈该问题。

 folder.config=配置文件夹
-folder.coremod=核心 MOD 文件夹
 folder.game=游戏文件夹
 folder.mod=MOD文件夹
 folder.resourcepacks=资源包文件夹
@@ -140,6 +140,7 @@ lang=简体中文
 lang.default=跟随系统语言

 launch.advice.different_platform=您的系统是 64 位，但是 Java 是 32 位的，建议您安装 64 位 Java。
+launch.advice.forge2760_liteloader=Forge 2760 与 LiteLoader 不兼容。请删除 LiteLoader 或者更换 Forge 至 2759 或更旧的版本。
 launch.advice.java8_1_13=Minecraft 1.13 只支持 Java 8 或更高版本，请使用 Java 8 或最新版本。
 launch.advice.java8_51_1_13=低于 1.8.0_51 的 Java 版本可能会导致 Minecraft 1.13 崩溃。建议您到 https://java.com 安装最新版的 Java 8。
 launch.advice.java9=低于 1.13 的有安装 Mod 的 Minecraft 版本不支持 Java 9 或更高版本，请使用 Java 8。
@@ -164,8 +165,8 @@ launcher=启动器
 launcher.background=背景地址
 launcher.background.choose=选择背景路径
 launcher.background.default=默认（自动检索启动器同目录下的 background.png/jpg 及 bg 文件夹内的图片）
-launcher.common_directory=公共文件夹（统一存放游戏资源文件，减少游戏体积）
-launcher.common_directory.choose=选择公共文件夹
+launcher.common_directory=缓存目录（文件下载缓存）
+launcher.common_directory.choose=选择缓存目录
 launcher.common_directory.default=默认（%AppData%/.minecraft 或者 ~/.minecraft）
 launcher.common_directory.disabled=禁用（总是使用游戏路径）
 launcher.contact=联系我们
@@ -217,11 +218,12 @@ modpack.name=整合包名称
 modpack.not_a_valid_name=不是一个有效的整合包名称
 modpack.scan=解析整合包
 modpack.task.install=导入整合包
-modpack.task.install.error=安装失败，可能是整合包格式不正确或操作文件失败。
+modpack.task.install.error=无法识别该整合包，目前仅支持导入 Curse、MultiMC、HMCL 整合包。
 modpack.task.install.will=将会安装整合包：
 modpack.type.curse=Curse
 modpack.type.curse.completion=下载 Curse 整合包相关文件
 modpack.type.curse.error=未能完成 Curse 整合包的下载，请多次重试或设置代理
+modpack.type.curse.not_found=部分必需文件已经在网络中被删除并且再也无法下载，请尝试该整合包的最新版本或者安装其他整合包。
 modpack.type.hmcl=HMCL
 modpack.type.multimc=MultiMC
 modpack.unsupported=该整合包不被支持。仅 HMCL、MultiMC、Curse 整合包受支持。
@@ -247,12 +249,13 @@ mods.remove=删除
 datapack=数据包
 datapack.add=添加数据包
 datapack.choose_datapack=选择要导入的数据包压缩包
+datapack.extension=数据包
 datapack.title=世界 %s - 数据包
 datapack.remove=删除

 world=世界/数据包
-world.choose_world=选择要导入的存档压缩包
 world.datapack=管理数据包
+world.datapack.1_13=仅 Minecraft 1.13 及之后的版本支持数据包
 world.description=%s. 上一次游戏时间: %s. 游戏版本: %s
 world.export=导出此世界
 world.export.title=选择该世界的存储位置
@@ -260,14 +263,21 @@ world.export.location=保存到
 world.export.wizard=导出世界 %s
 world.extension=世界压缩包
 world.game_version=游戏版本
+world.import.already_exists=此世界已经存在
+world.import.choose=选择要导入的存档压缩包
+world.import.failed=无法导入此世界：%s
 world.name=世界名称
+world.name.enter=输入世界名称
+world.time=yyyy 年 MM 月 dd 日 HH:mm:ss

 profile=游戏目录
+profile.already_exists=该名称已存在
 profile.default=当前目录
-profile.home=主文件夹
+profile.home=官方启动器
 profile.instance_directory=游戏路径
 profile.instance_directory.choose=选择游戏路径
 profile.manage=游戏目录列表
+profile.name=名称
 profile.new=新建配置
 profile.title=游戏目录
 profile.selected=已选中
@@ -304,6 +314,7 @@ settings.game.dimension=游戏窗口分辨率
 settings.game.exploration=浏览
 settings.game.fullscreen=全屏
 settings.game.java_directory=Java 路径
+settings.game.java_directory.bit=，%s 位
 settings.game.java_directory.choose=选择 Java 路径
 settings.game.management=管理
 settings.game.working_directory=运行路径（版本隔离）
@@ -345,6 +356,8 @@ update.checking=正在检查更新
 update.failed=更新失败
 update.found=发现更新
 update.newest_version=最新版本为：%s
+update.bubble.title=发现更新：%s
+update.bubble.subtitle=点击此处进行升级
 update.note=开发版包含更多的功能以及错误修复，但也可能会包含其他的问题。
 update.latest=当前版本为最新版本
 update.no_browser=无法打开浏览器，网址已经复制到剪贴板了，您可以手动粘贴网址打开页面
@@ -353,20 +366,21 @@ update.tooltip=更新
 version=游戏
 version.cannot_read=读取游戏版本失败，无法进行自动安装
 version.empty=没有游戏版本
-version.empty.add=点击右侧按钮安装
+version.empty.add=进入游戏列表安装
 version.empty.launch=没有可启动的游戏，你可以点击左侧游戏栏内的设置按钮进入游戏列表安装游戏
 version.forbidden_name=此版本名称不受支持，请换一个名字
 version.game.old=远古版
 version.game.release=稳定版
 version.game.snapshot=测试版
 version.launch=启动游戏
+version.launch.test=测试游戏
 version.launch_script=生成启动脚本
 version.launch_script.failed=生成启动脚本失败
 version.launch_script.save=保存启动脚本
 version.launch_script.success=启动脚本已生成完毕：%s
 version.manage=游戏列表
 version.manage.manage=游戏管理
-version.manage.redownload_assets_index=重新下载资源配置（assets_index.json）
+version.manage.redownload_assets_index=更新资源列表
 version.manage.remove=删除该版本
 version.manage.remove.confirm=真的要删除版本 %s 吗？你将无法找回被删除的文件！
 version.manage.remove.confirm.trash=真的要删除版本 %s 吗？你可以在系统的回收站中恢复文件夹 %s 来找回该版本。
Author	SHA1	Message	Date
huanghongxun	9981423927	Change separator fill in title bar and launch button to reduce color difference	2018-10-11 22:20:41 +08:00
huanghongxun	0e5250dfb3	Satisfy requirements metioned in #469	2018-10-11 22:06:34 +08:00
huanghongxun	2dc956b357	Fix request mojang server for skin info every time	2018-10-11 22:05:24 +08:00
huanghongxun	b8bd0a08e0	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2018-10-11 14:05:35 +08:00
huanghongxun	fb31eebcf2	Add a warning that forge 2760 is not compatible with liteloader	2018-10-11 14:04:52 +08:00
huanghongxun	3c8689a3f1	Close launching progress dialog when game crashed before opening window	2018-10-11 13:51:37 +08:00
huanghongxun	2957d66dd6	Add test game button in versions page	2018-10-11 13:41:11 +08:00
huanghongxun	6f6efe0874	Rename DecoratorControl to Decorator	2018-10-11 13:32:39 +08:00
huanghongxun	355fc04069	Drop modpack file to install	2018-10-11 13:32:11 +08:00
huanghongxun	b4738f383b	Fix not on FX thread	2018-10-11 12:59:06 +08:00
huanghongxun	b12711969c	Rewrite encode location	2018-10-10 16:37:04 +08:00
huanghongxun	94727353c4	Fix response code 400 when downloading mods from curse	2018-10-10 15:27:27 +08:00
huanghongxun	5eb7449b74	Delete old files if etag was updated	2018-10-10 01:36:31 +08:00
huanghongxun	dae41dfb30	Add an entrance directly to add authlib-injector server	2018-10-09 22:15:46 +08:00
huanghongxun	07a701e572	Cache asset indexes by ETag cache	2018-10-09 20:22:54 +08:00
huanghongxun	5323aaed6d	ETag caching	2018-10-09 20:16:16 +08:00
huanghongxun	daf659373f	Removed static login method	2018-10-08 21:23:01 +08:00
huanghongxun	0eb81c29df	Update I18N	2018-10-08 01:31:02 +08:00
huanghongxun	8aea89c103	Login when launcher opened to reduce launching time	2018-10-08 01:27:48 +08:00
huanghongxun	f1d97454c2	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2018-10-06 12:42:50 +08:00
huanghongxun	ffb6a45e28	Remove toLowerCase	2018-10-06 12:42:30 +08:00
huanghongxun	f0d1c9b361	Merge pull request #468 from yushijinhun/authlib-injector-ali 支持 authlib-injector API 地址指示	2018-10-06 12:38:04 +08:00
huanghongxun	aedd4c290e	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2018-10-06 12:20:48 +08:00
huanghongxun	749ecfe37f	Fix #467	2018-10-06 12:20:42 +08:00
yushijinhun	c51da28e31	Add error message for authlib-injector download failure	2018-10-06 12:06:31 +08:00
yushijinhun	f3dca75a10	Do not check for update of authlib-injector each time	2018-10-06 11:56:02 +08:00
yushijinhun	c3dcb0292c	Support -Dauthlibinjector.side=client argument See yushijinhun/authlib-injector#16	2018-10-06 11:38:55 +08:00
yushijinhun	2a42ecda78	Support authlib-injector ALI See yushijinhun/authlib-injector#18	2018-10-06 00:47:36 +08:00
huanghongxun	08be1896ee	Forbid adding profiles with already existent name	2018-10-05 23:04:56 +08:00
huanghongxun	6b3152c4b5	Try to fix #462 .	2018-10-05 22:27:19 +08:00
yushijinhun	19ea27dece	emmm... Forgot to add DialogAware.java Related: `b9e26a4112`	2018-10-04 12:48:29 +08:00
yushijinhun	b9e26a4112	Add DialogAware & Improve add auth server dialog	2018-10-04 12:45:04 +08:00
yushijinhun	a71aea8e43	Update translation: account.failed.server_response_malformed	2018-10-04 11:56:12 +08:00
yushijinhun	1b1f22b9fa	Fix Java list display error on JDK10 如何重现： 1. 关闭当前选中版本的版本特定设置 2. 重启HMCL 3. 从主界面进入版本设置 4. 打开版本特定设置 5. 展开Java列表问题：Java列表中的项目除了自定义项外，在外观上仍保持被禁用的状态（但是可以点击）。原因未知。此问题只在Java10上出现。若在进入版本设置界面前，版本特定设置已经被打开，则不会出现此问题。已知Java项目的styleClass、pseudoClass、disable、disabled属性均正常。试过但没用的解决方法： 1. 删除HMCL全部CSS 2. 将Java列表默认展开 3. 使用JavaFX原生组件替代JFoenix组件本提交中的代码由于玄学原因，可以解决此问题。	2018-10-03 22:40:17 +08:00
yushijinhun	705a5659b6	Fix cursor doesn't change when hanging on proxy settings	2018-10-03 21:41:22 +08:00
yushijinhun	4121921aca	Fix compile errors	2018-10-03 19:20:47 +08:00
yushijinhun	8cb4ca0e8b	Remove Settings.font	2018-10-03 17:17:16 +08:00
yushijinhun	6205937a10	Refactor update channel selecting	2018-10-03 17:15:42 +08:00
yushijinhun	2f522b744f	Add MappedProperty & reservedSelectedPropertyFor(CheckBox)	2018-10-03 17:09:12 +08:00
yushijinhun	b8a84f831a	Refactor proxy settings	2018-10-03 16:43:48 +08:00
yushijinhun	5f9490d780	Add SafeStringConverter & Refactor font settings	2018-10-03 16:38:21 +08:00
huanghongxun	a1c5b87b55	Fix crash when no game installed	2018-10-03 15:55:38 +08:00
yushijinhun	641e308c53	Remove right graphic of Game List&Launcher Settings	2018-10-03 13:40:09 +08:00
yushijinhun	64bc70a15d	Fix Account/VersionListItem can be unselected	2018-10-03 13:01:30 +08:00
yushijinhun	acadbdb5c9	Fix potential NPE Related: `3323ea2be0`	2018-10-03 12:10:19 +08:00
yushijinhun	3323ea2be0	Remove JFXButton in AdvancedListItem	2018-10-03 12:02:17 +08:00
huanghongxun	45f55b2075	Adjust looking of LeftPaneController	2018-10-03 01:32:55 +08:00
yushijinhun	372005dae1	Partially revert `223c2bc7c7`	2018-10-02 22:07:57 +08:00
yushijinhun	2c7ca6d354	Remove some methods in Lang	2018-10-02 22:01:42 +08:00
yushijinhun	e21f315239	Fix VersionNumber.equals() and hashCode() may not be consistent	2018-10-02 21:25:29 +08:00
yushijinhun	223c2bc7c7	Change update.bubble.subtitle to 'Click here to upgrade'	2018-10-02 21:15:14 +08:00
yushijinhun	3facbba4ee	Use databind for update bubble	2018-10-02 21:15:14 +08:00
yushijinhun	b8bf56c8c3	Add pseudo class 'first' for 'options-list-item' Related: `caf85d2a92`	2018-10-02 20:38:41 +08:00
huanghongxun	2fa08e0a70	Change default profile directory to ".minecraft"	2018-10-02 18:34:09 +08:00
huanghongxun	8e1e13058b	Fix #463	2018-10-02 18:33:48 +08:00
huanghongxun	92520e46a3	Remove settings entrance in main page	2018-10-02 18:11:52 +08:00
huanghongxun	6ae6c9c971	Name changes	2018-10-02 18:11:13 +08:00
huanghongxun	caf85d2a92	Fix showing a gray horizontal line in component list cell	2018-10-02 18:06:24 +08:00
huanghongxun	030b577dee	Add an explicit entry to game list page	2018-10-02 12:44:36 +08:00
huanghongxun	83516ba679	Fix #461	2018-10-02 12:15:52 +08:00
huanghongxun	c8f74ee8e3	Add test game in game list page	2018-10-02 11:47:53 +08:00
yushijinhun	c50e41ab91	Use setItems in DatapackListPage	2018-10-01 21:01:43 +08:00
yushijinhun	c03a0feb75	Refactor ProfileList	2018-10-01 20:59:11 +08:00
yushijinhun	7da5b8fbc8	Add AutomatedToggleGroup & Refactor AccountList	2018-10-01 20:39:00 +08:00
yushijinhun	83f7e61d37	Add selectedItemPropertyFor(ToggleGroup)	2018-10-01 20:03:57 +08:00
yushijinhun	86765275c8	Make SelectionModelSelectedItemProperty a util class	2018-10-01 15:38:12 +08:00
yushijinhun	a01e15d841	Add MultiStepBinding&ReadWriteComposedProperty	2018-10-01 15:35:39 +08:00
yushijinhun	5e5db332d0	Remove 'Downloads' paragraph in readme, as GitHub Releases is available	2018-10-01 11:29:12 +08:00
huanghongxun	2de2f45124	Fix always showing horizontal scrollbar of game list popup in main page	2018-09-30 20:07:57 +08:00
huanghongxun	b1b3eb9369	Fix always using custom common directory	2018-09-30 20:07:57 +08:00
yushijinhun	507665cd91	Fix #460	2018-09-30 19:45:39 +08:00
yushijinhun	c779172cc2	Fix custom toggle is not selected when using customized java	2018-09-30 19:30:22 +08:00
yushijinhun	684813e131	Refactor Java lookup	2018-09-30 19:18:29 +08:00
huanghongxun	76ef47efc4	Suppress exceptions thrown when checking Java installation	2018-09-30 13:22:42 +08:00
huanghongxun	71a8fa0e66	Display platform of java installations	2018-09-28 19:30:41 +08:00
huanghongxun	48d98b2424	Conceal NPE	2018-09-26 19:07:09 +08:00
huanghongxun	5a0e17b121	Fix crash when user set common directory to an invalid path	2018-09-26 19:00:31 +08:00
huanghongxun	5f686f7205	Fix crash when modpack to be installed is malformed.	2018-09-26 13:13:44 +08:00
huanghongxun	518969d2f2	Fix JsonParseException	2018-09-26 13:13:21 +08:00
huanghongxun	01ff1327f7	Make head displayed more precisely	2018-09-25 12:30:21 +08:00
huanghongxun	4d366397a8	Merge pull request #457 from andylizi/add-helmet-support 支持在头像中显示头盔层	2018-09-24 17:28:17 +08:00
huanghongxun	80f79d20a5	Update message UI	2018-09-24 17:26:02 +08:00
huanghongxun	1611d11544	Fix crash when yggdrasil server gives response with malformed UUID	2018-09-24 17:24:13 +08:00
andylizi	c8e8b25c85	Adjust `faceOffset` in skin preview	2018-09-24 15:34:48 +08:00
andylizi	92cfc3c1d3	Make skin preview more accurate	2018-09-24 13:47:59 +08:00
huanghongxun	c4cebe72b4	Show bubble when updates available	2018-09-24 01:51:14 +08:00
andylizi	6d346a3ad6	Render helmet layer in skin preview. Fixed #456	2018-09-23 22:53:23 +08:00
huanghongxun	6e2696dea3	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2018-09-22 22:26:14 +08:00
huanghongxun	ba67c968cf	Change version selection list look	2018-09-22 22:25:53 +08:00
huanghongxun	332719f49a	Fix closing page	2018-09-22 21:40:16 +08:00
yushijinhun	fb18975c5c	Fix param table in readme	2018-09-22 21:08:03 +08:00
yushijinhun	08a7c27353	Fix config file is checked before created	2018-09-22 21:05:50 +08:00
yushijinhun	4c9cb99a94	Add hmcl.self_integrity_check.disable option	2018-09-22 21:05:50 +08:00
huanghongxun	cbecca5f55	Merge pull request #455 from yushijinhun/javafx 重构	2018-09-22 18:12:18 +08:00
yushijinhun	4a0831a155	Replace Properties with InvocationDispatcher & Make config saving async	2018-09-22 14:21:17 +08:00
yushijinhun	fa38c53915	Remove Constants.SYSTEM_CHARSET	2018-09-22 12:54:15 +08:00
yushijinhun	e7c2170ce3	Fix getSteve/AlexSkin ignores scaleRatio param	2018-09-22 12:53:02 +08:00
yushijinhun	9b69fe8c56	Remove Constants.DEFAULT_ICON	2018-09-22 12:52:30 +08:00
yushijinhun	ed91771594	Remove truePredicate/falsePredicate/emptyConsumer	2018-09-22 12:39:57 +08:00
yushijinhun	b33e014f71	Move GSON const to JsonUtils	2018-09-22 12:37:03 +08:00
yushijinhun	19632ac162	Move JsonUtils->gson, JarUtils->io, Properties->javafx	2018-09-22 12:33:18 +08:00
yushijinhun	74e3a9e2d1	Use http.agent to set useragent	2018-09-22 12:30:33 +08:00
yushijinhun	b15291dc57	Refactor util package structure	2018-09-22 12:12:06 +08:00
huanghongxun	1b5d4c1b42	Improve UI details	2018-09-22 00:18:55 +08:00
huanghongxun	923924638e	Add a close button to close all pages	2018-09-20 22:54:41 +08:00
huanghongxun	8b52c46664	Merge resources.zip to allow multiple datapack zip containing resources.zip	2018-09-20 00:12:41 +08:00
huanghongxun	aa8c386cdd	Support zip file in datapacks folder	2018-09-19 23:02:27 +08:00
huanghongxun	bafe17107c	Fix loading empty repository	2018-09-19 16:31:17 +08:00
huanghongxun	9c169fb560	Add a separator to separate launch button and popup button	2018-09-19 10:46:14 +08:00
huanghongxun	61ab8a6769	Fix NPE when first start	2018-09-19 00:20:32 +08:00
huanghongxun	b1cd7057db	Add a convenient entrance to launch other version	2018-09-19 00:16:21 +08:00
huanghongxun	d426952d47	Fix Minecraft jar does not exist when renaming a version	2018-09-19 00:12:44 +08:00
huanghongxun	67b6a60382	Fix bugs with world.	2018-09-17 16:30:27 +08:00
huanghongxun	9d5da5a39d	Try again when decorator is not initialized.	2018-09-17 16:28:52 +08:00
huanghongxun	efb14572d6	Fix selected profile automatically changes to Home	2018-09-17 16:28:01 +08:00