Fix not correct mod installation

Fix #532
Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx
2019-02-20 16:40:26 +08:00 · 2019-02-19 23:15:45 +08:00 · 2019-02-19 19:39:23 +08:00 · 2019-02-19 19:38:37 +08:00 · 2019-02-19 19:36:23 +08:00 · 2019-02-19 18:56:36 +08:00
439 changed files with 4719 additions and 2543 deletions
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.stage.Stage;
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,194 +0,0 @@
-/**
- * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
- *
- * 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 <https://www.gnu.org/licenses/>.
- */
-package org.jackhuang.hmcl.game;
-
-import javafx.embed.swing.SwingFXUtils;
-import javafx.scene.image.Image;
-import org.jackhuang.hmcl.Metadata;
-import org.jackhuang.hmcl.auth.Account;
-import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
-import org.jackhuang.hmcl.auth.yggdrasil.Texture;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.task.FileDownloadTask;
-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.io.NetworkUtils;
-
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.*;
-
-public final class AccountHelper {
-
-    private AccountHelper() {}
-
-    public static final File SKIN_DIR = Metadata.HMCL_DIRECTORY.resolve("skins").toFile();
-
-    public static void loadSkins() {
-        for (Account account : Accounts.getAccounts()) {
-            if (account instanceof YggdrasilAccount) {
-                new SkinLoadTask((YggdrasilAccount) account, false).start();
-            }
-        }
-    }
-
-    public static Task loadSkinAsync(YggdrasilAccount account) {
-        return new SkinLoadTask(account, false);
-    }
-
-    public static Task refreshSkinAsync(YggdrasilAccount account) {
-        return new SkinLoadTask(account, true);
-    }
-
-    private static File getSkinFile(UUID uuid) {
-        return new File(SKIN_DIR, uuid + ".png");
-    }
-
-    public static Image getSkin(YggdrasilAccount account) {
-        return getSkin(account, 1);
-    }
-
-    public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
-        UUID uuid = account.getUUID();
-        if (uuid == null)
-            return getSteveSkin(scaleRatio);
-
-        File file = getSkinFile(uuid);
-        if (file.exists()) {
-            Image original = new Image("file:" + file.getAbsolutePath());
-            if (original.isError())
-                return getDefaultSkin(uuid, scaleRatio);
-
-            return new Image("file:" + file.getAbsolutePath(),
-                    original.getWidth() * scaleRatio,
-                    original.getHeight() * scaleRatio,
-                    false, false);
-        }
-        return getDefaultSkin(uuid, scaleRatio);
-    }
-
-    public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio) throws Exception {
-        File file = getSkinFile(profile.getId());
-        downloadSkin(account, profile, true);
-        if (!file.exists())
-            return getDefaultSkin(profile.getId(), scaleRatio);
-
-        String url = "file:" + file.getAbsolutePath();
-        return scale(url, scaleRatio);
-    }
-
-    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 {
-        private final YggdrasilAccount account;
-        private final boolean refresh;
-        private final List<Task> dependencies = new LinkedList<>();
-
-        public SkinLoadTask(YggdrasilAccount account, boolean refresh) {
-            this.account = account;
-            this.refresh = refresh;
-        }
-
-        @Override
-        public Scheduler getScheduler() {
-            return Schedulers.io();
-        }
-
-        @Override
-        public Collection<Task> getDependencies() {
-            return dependencies;
-        }
-
-        @Override
-        public void execute() throws Exception {
-            if (!account.isLoggedIn() && (account.getCharacter() == null || refresh))
-                DialogController.logIn(account);
-
-            downloadSkin(account, refresh);
-        }
-    }
-
-    private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh) throws Exception {
-        account.clearCache();
-
-        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();
-    }
-
-    private static void downloadSkin(YggdrasilAccount account, boolean refresh) throws Exception {
-        account.clearCache();
-
-        if (account.getCharacter() == null) return;
-        File file = getSkinFile(account.getUUID());
-        if (!refresh && file.exists()) {
-            Image original = new Image("file:" + file.getAbsolutePath());
-            if (!original.isError())
-                return;
-        }
-        Optional<Texture> texture = account.getSkin();
-        if (!texture.isPresent()) return;
-        String url = texture.get().getUrl();
-        new FileDownloadTask(NetworkUtils.toURL(url), file).run();
-    }
-
-    public static Image scale(String url, double scaleRatio) {
-        Image origin = new Image(url);
-        return new Image(url,
-                origin.getWidth() * scaleRatio,
-                origin.getHeight() * scaleRatio,
-                false, false);
-    }
-
-    public static Image getSteveSkin(double scaleRatio) {
-        return scale("/assets/img/steve.png", scaleRatio);
-    }
-
-    public static Image getAlexSkin(double scaleRatio) {
-        return scale("/assets/img/alex.png", scaleRatio);
-    }
-
-    public static Image getDefaultSkin(UUID uuid, double scaleRatio) {
-        int type = uuid.hashCode() & 1;
-        if (type == 1)
-            return getAlexSkin(scaleRatio);
-        else
-            return getSteveSkin(scaleRatio);
-    }
-}
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -80,13 +80,6 @@ public class HMCLGameRepository extends DefaultGameRepository {
        }
    }

-    @Override
-    public void refreshVersions() {
-        EventBus.EVENT_BUS.fireEvent(new RefreshingVersionsEvent(this));
-        refreshVersionsImpl();
-        EventBus.EVENT_BUS.fireEvent(new RefreshedVersionsEvent(this));
-    }
-
    public void changeDirectory(File newDirectory) {
        setBaseDirectory(newDirectory);
        refreshVersionsAsync().start();
@@ -168,6 +161,8 @@ public class HMCLGameRepository extends DefaultGameRepository {
            return new Image("file:" + iconFile.getAbsolutePath());
        else if ("net.minecraft.launchwrapper.Launch".equals(version.getMainClass()))
            return new Image("/assets/img/furnace.png");
+        else if ("cpw.mods.modlauncher.Launcher".equals(version.getMainClass()))
+            return new Image("/assets/img/furnace.png");
        else
            return new Image("/assets/img/grass.png");
    }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -375,7 +375,7 @@ public final class LauncherHelper {
        if (!flag) {
            boolean hasForge2760 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
                    .anyMatch(it ->
-                            0 <= VersionNumber.VERSION_COMPARATOR.compare("1.12.2-14.23.5.2760", it.getVersion()) &&
+                            VersionNumber.VERSION_COMPARATOR.compare("1.12.2-14.23.5.2760", it.getVersion()) <= 0 &&
                                    VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2773") < 0);
            boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
            if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -0,0 +1,206 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.game;
+
+import static java.util.Collections.singletonMap;
+import static org.jackhuang.hmcl.util.Lang.threadPool;
+import static org.jackhuang.hmcl.util.Logging.LOG;
+
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+import javax.imageio.ImageIO;
+
+import org.jackhuang.hmcl.Metadata;
+import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
+import org.jackhuang.hmcl.auth.yggdrasil.Texture;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
+import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.task.FileDownloadTask;
+import org.jackhuang.hmcl.util.javafx.MultiStepBinding;
+
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.scene.image.Image;
+
+/**
+ * @author yushijinhun
+ */
+public final class TexturesLoader {
+
+    private TexturesLoader() {
+    }
+
+    // ==== Texture Loading ====
+    public static class LoadedTexture {
+        private final BufferedImage image;
+        private final Map<String, String> metadata;
+
+        public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
+            this.image = image;
+            this.metadata = metadata;
+        }
+
+        public BufferedImage getImage() {
+            return image;
+        }
+
+        public Map<String, String> getMetadata() {
+            return metadata;
+        }
+    }
+
+    private static final ThreadPoolExecutor POOL = threadPool("TexturesDownload", true, 2, 10, TimeUnit.SECONDS);
+    private static final Path TEXTURES_DIR = Metadata.MINECRAFT_DIRECTORY.resolve("assets").resolve("skins");
+
+    private static Path getTexturePath(Texture texture) {
+        String url = texture.getUrl();
+        int slash = url.lastIndexOf('/');
+        int dot = url.lastIndexOf('.');
+        if (dot < slash) {
+            dot = url.length();
+        }
+        String hash = url.substring(slash + 1, dot);
+        String prefix = hash.length() > 2 ? hash.substring(0, 2) : "xx";
+        return TEXTURES_DIR.resolve(prefix).resolve(hash);
+    }
+
+    public static LoadedTexture loadTexture(Texture texture) throws IOException {
+        Path file = getTexturePath(texture);
+        if (!Files.isRegularFile(file)) {
+            // download it
+            try {
+                new FileDownloadTask(new URL(texture.getUrl()), file.toFile()).run();
+                LOG.info("Texture downloaded: " + texture.getUrl());
+            } catch (Exception e) {
+                if (Files.isRegularFile(file)) {
+                    // concurrency conflict?
+                    LOG.log(Level.WARNING, "Failed to download texture " + texture.getUrl() + ", but the file is available", e);
+                } else {
+                    throw new IOException("Failed to download texture " + texture.getUrl());
+                }
+            }
+        }
+
+        BufferedImage img;
+        try (InputStream in = Files.newInputStream(file)) {
+            img = ImageIO.read(in);
+        }
+        return new LoadedTexture(img, texture.getMetadata());
+    }
+    // ====
+
+    // ==== Skins ====
+    private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
+    static {
+        loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
+        loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
+    }
+    private static void loadDefaultSkin(String path, TextureModel model) {
+        try (InputStream in = TexturesLoader.class.getResourceAsStream(path)) {
+            DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public static LoadedTexture getDefaultSkin(TextureModel model) {
+        return DEFAULT_SKINS.get(model);
+    }
+
+    public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
+        LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
+        return MultiStepBinding.of(service.getProfileRepository().binding(uuid))
+                .map(profile -> profile
+                        .flatMap(it -> {
+                            try {
+                                return YggdrasilService.getTextures(it);
+                            } catch (ServerResponseMalformedException e) {
+                                LOG.log(Level.WARNING, "Failed to parse texture payload", e);
+                                return Optional.empty();
+                            }
+                        })
+                        .flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN))))
+                .asyncMap(it -> {
+                    if (it.isPresent()) {
+                        Texture texture = it.get();
+                        try {
+                            return loadTexture(texture);
+                        } catch (IOException e) {
+                            LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
+                            return getDefaultSkin(TextureModel.detectModelName(texture.getMetadata()));
+                        }
+                    } else {
+                        return uuidFallback;
+                    }
+                }, uuidFallback, POOL);
+    }
+    // ====
+
+    // ==== Avatar ====
+    public static BufferedImage toAvatar(BufferedImage skin, int size) {
+        BufferedImage avatar = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = avatar.createGraphics();
+
+        int scale = skin.getWidth() / 64;
+        int faceOffset = (int) Math.round(size / 18.0);
+        g.drawImage(skin,
+                faceOffset, faceOffset, size - faceOffset, size - faceOffset,
+                8 * scale, 8 * scale, 16 * scale, 16 * scale,
+                null);
+        g.drawImage(skin,
+                0, 0, size, size,
+                40 * scale, 8 * scale, 48 * scale, 16 * scale, null);
+
+        g.dispose();
+        return avatar;
+    }
+
+    public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
+        return MultiStepBinding.of(skinBinding(service, uuid))
+                .map(it -> toAvatar(it.image, size))
+                .map(img -> SwingFXUtils.toFXImage(img, null));
+    }
+
+    public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
+        if (account instanceof YggdrasilAccount) {
+            return fxAvatarBinding(((YggdrasilAccount) account).getYggdrasilService(), account.getUUID(), size);
+        } else {
+            return Bindings.createObjectBinding(
+                    () -> SwingFXUtils.toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size), null));
+        }
+    }
+    // ====
+}
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -35,7 +35,6 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.authlibinjector.SimpleAuthlibInjectorArtifactProvider;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
 import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
-import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
 import org.jackhuang.hmcl.task.Schedulers;
@@ -63,7 +62,7 @@ public final class Accounts {
    private Accounts() {}

    public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
-    public static final YggdrasilAccountFactory FACTORY_YGGDRASIL = new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE);
+    public static final YggdrasilAccountFactory FACTORY_MOJANG = YggdrasilAccountFactory.MOJANG;
    public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(createAuthlibInjectorArtifactProvider(), Accounts::getOrCreateAuthlibInjectorServer);

    // ==== login type / account factory mapping ====
@@ -71,7 +70,7 @@ public final class Accounts {
    private static final Map<AccountFactory<?>, String> factory2type = new HashMap<>();
    static {
        type2factory.put("offline", FACTORY_OFFLINE);
-        type2factory.put("yggdrasil", FACTORY_YGGDRASIL);
+        type2factory.put("yggdrasil", FACTORY_MOJANG);
        type2factory.put("authlibInjector", FACTORY_AUTHLIB_INJECTOR);

        type2factory.forEach((type, factory) -> factory2type.put(factory, type));
@@ -94,7 +93,7 @@ public final class Accounts {
        else if (account instanceof AuthlibInjectorAccount)
            return FACTORY_AUTHLIB_INJECTOR;
        else if (account instanceof YggdrasilAccount)
-            return FACTORY_YGGDRASIL;
+            return FACTORY_MOJANG;
        else
            throw new IllegalArgumentException("Failed to determine account type: " + account);
    }
@@ -279,7 +278,7 @@ public final class Accounts {
    // ==== Login type name i18n ===
    private static Map<AccountFactory<?>, String> unlocalizedLoginTypeNames = mapOf(
            pair(Accounts.FACTORY_OFFLINE, "account.methods.offline"),
-            pair(Accounts.FACTORY_YGGDRASIL, "account.methods.yggdrasil"),
+            pair(Accounts.FACTORY_MOJANG, "account.methods.yggdrasil"),
            pair(Accounts.FACTORY_AUTHLIB_INJECTOR, "account.methods.authlib_injector"));

    public static String getLocalizedLoginTypeName(AccountFactory<?> factory) {
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -19,7 +19,7 @@ package org.jackhuang.hmcl.setting;

 import com.google.gson.*;
 import com.google.gson.annotations.JsonAdapter;
-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -31,7 +31,6 @@ import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
 import org.jackhuang.hmcl.game.HMCLCacheRepository;
 import org.jackhuang.hmcl.game.HMCLGameRepository;
 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;
@@ -52,7 +51,6 @@ import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
 public final class Profile implements Observable {
    private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
    private final HMCLGameRepository repository;
-    private final ModManager modManager;

    private final StringProperty selectedVersion = new SimpleStringProperty();

@@ -136,7 +134,6 @@ public final class Profile implements Observable {
        this.name = new ImmediateStringProperty(this, "name", name);
        gameDir = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
        repository = new HMCLGameRepository(this, initialGameDir);
-        modManager = new ModManager(repository);
        this.global.set(global == null ? new VersionSetting() : global);
        this.selectedVersion.set(selectedVersion);
        this.useRelativePath.set(useRelativePath);
@@ -166,10 +163,6 @@ public final class Profile implements Observable {
        return repository;
    }

-    public ModManager getModManager() {
-        return modManager;
-    }
-
    public DefaultDependencyManager getDependency() {
        return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
    }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.setting;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.*;
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -90,8 +90,13 @@ public final class Controllers {

    // FXThread
    public static GameList getGameListPage() {
-        if (gameListPage == null)
+        if (gameListPage == null) {
            gameListPage = new GameList();
+            FXUtils.applyDragListener(gameListPage, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
+                File modpack = modpacks.get(0);
+                Controllers.getDecorator().startWizard(new ModpackInstallWizardProvider(Profiles.getSelectedProfile(), modpack), i18n("install.modpack"));
+            });
+        }
        return gameListPage;
    }

@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
@@ -234,8 +234,20 @@ public final class FXUtils {
        }
    }

-    public static void installTooltip(Node node, String tooltip) {
-        installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
+    public static void installFastTooltip(Node node, Tooltip tooltip) {
+        installTooltip(node, 50, 5000, 0, tooltip);
+    }
+
+    public static void installFastTooltip(Node node, String tooltip) {
+        installFastTooltip(node, new Tooltip(tooltip));
+    }
+
+    public static void installSlowTooltip(Node node, Tooltip tooltip) {
+        installTooltip(node, 500, 5000, 0, tooltip);
+    }
+
+    public static void installSlowTooltip(Node node, String tooltip) {
+        installSlowTooltip(node, new Tooltip(tooltip));
    }

    public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.ui;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import javafx.application.Platform;
 import javafx.scene.image.Image;
 import javafx.scene.layout.Region;
@@ -119,16 +119,16 @@ public final class LeftPaneController extends AdvancedListBox {
                if (repository.getVersionCount() == 0) {
                    File modpackFile = new File("modpack.zip").getAbsoluteFile();
                    if (modpackFile.exists()) {
-                        Task.ofResult("encoding", () -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
-                                .then(Task.ofResult("modpack", var -> ModpackHelper.readModpackManifest(modpackFile.toPath(), var.get("encoding"))))
-                                .then(Task.of(var -> {
+                        Task.ofResult(() -> CompressingUtils.findSuitableEncoding(modpackFile.toPath()))
+                                .thenResult(encoding -> ModpackHelper.readModpackManifest(modpackFile.toPath(), encoding))
+                                .thenResult(modpack -> {
                                    AtomicReference<Region> region = new AtomicReference<>();
-                                    Modpack modpack = var.get("modpack");
                                    TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
                                            .with(Task.of(Schedulers.javafx(), this::checkAccount)).executor();
                                    region.set(Controllers.taskDialog(executor, i18n("modpack.installing")));
                                    executor.start();
-                                })).start();
+                                    return null;
+                                }).start();
                    }
                }
            }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -19,26 +19,26 @@ package org.jackhuang.hmcl.ui;

 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXScrollPane;
-import com.jfoenix.controls.JFXSpinner;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.SkinBase;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.Pane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.setting.Theme;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;

-public class ListPageSkin extends SkinBase<ListPage> {
+public class ListPageSkin extends SkinBase<ListPage<?>> {

    public ListPageSkin(ListPage<?> skinnable) {
        super(skinnable);

-        StackPane rootPane = new StackPane();
-
-        JFXSpinner spinner = new JFXSpinner();
-        spinner.setRadius(16);
-        spinner.getStyleClass().setAll("materialDesign-purple", "first-spinner");
+        SpinnerPane spinnerPane = new SpinnerPane();
+        spinnerPane.getStyleClass().add("large-spinner-pane");
+        Pane placeholder = new Pane();

        StackPane contentPane = new StackPane();
        {
@@ -51,12 +51,15 @@ public class ListPageSkin extends SkinBase<ListPage> {
                list.setSpacing(10);
                list.setPadding(new Insets(10));

+                VBox content = new VBox();
+                content.getChildren().setAll(list, placeholder);
+
                Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());

-                scrollPane.setContent(list);
+                scrollPane.setContent(content);
                JFXScrollPane.smoothScrolling(scrollPane);
            }
-
+            
            VBox vBox = new VBox();
            {
                vBox.setAlignment(Pos.BOTTOM_RIGHT);
@@ -67,7 +70,7 @@ public class ListPageSkin extends SkinBase<ListPage> {
                JFXButton btnAdd = new JFXButton();
                FXUtils.setLimitWidth(btnAdd, 40);
                FXUtils.setLimitHeight(btnAdd, 40);
-                btnAdd.getStyleClass().setAll("jfx-button-raised-round");
+                btnAdd.getStyleClass().add("jfx-button-raised-round");
                btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
                btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
                btnAdd.setOnMouseClicked(e -> skinnable.add());
@@ -75,7 +78,7 @@ public class ListPageSkin extends SkinBase<ListPage> {
                JFXButton btnRefresh = new JFXButton();
                FXUtils.setLimitWidth(btnRefresh, 40);
                FXUtils.setLimitHeight(btnRefresh, 40);
-                btnRefresh.getStyleClass().setAll("jfx-button-raised-round");
+                btnRefresh.getStyleClass().add("jfx-button-raised-round");
                btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
                btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1));
                btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
@@ -89,16 +92,18 @@ public class ListPageSkin extends SkinBase<ListPage> {
                        });
            }

-            contentPane.getChildren().setAll(scrollPane, vBox);
+            // Keep a blank space to prevent buttons from blocking up mod items.
+            BorderPane group = new BorderPane();
+            group.setPickOnBounds(false);
+            group.setBottom(vBox);
+            placeholder.minHeightProperty().bind(vBox.heightProperty());
+
+            contentPane.getChildren().setAll(scrollPane, group);
        }

-        rootPane.getChildren().setAll(contentPane);
+        spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
+        spinnerPane.setContent(contentPane);

-        skinnable.loadingProperty().addListener((a, b, newValue) -> {
-            if (newValue) rootPane.getChildren().setAll(spinner);
-            else rootPane.getChildren().setAll(contentPane);
-        });
-
-        getChildren().setAll(rootPane);
+        getChildren().setAll(spinnerPane);
    }
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -87,11 +87,8 @@ public final class MainPage extends StackPane implements DecoratorPage {
                lblIcon.setGraphic(SVG.update(Theme.whiteFillBinding(), 20, 20));

                TwoLineListItem prompt = new TwoLineListItem();
-                prompt.setTitleFill(Color.WHITE);
-                prompt.setSubtitleFill(Color.WHITE);
                prompt.setSubtitle(i18n("update.bubble.subtitle"));
                prompt.setPickOnBounds(false);
-                prompt.setStyle("-jfx-title-font-weight: BOLD;");
                prompt.titleProperty().bind(latestVersionProperty());

                hBox.getChildren().setAll(lblIcon, prompt);
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -162,4 +162,8 @@ public final class SVG {
    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);
    }
+
+    public static Node check(ObjectBinding<? extends Paint> fill, double width, double height) {
+        return createSVGPath("M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z", fill, width, height);
+    }
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -129,7 +129,7 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
                        config().commonDirectoryProperty(), config().commonDirTypeProperty()));

        // ==== Update ====
-        FXUtils.installTooltip(btnUpdate, i18n("update.tooltip"));
+        FXUtils.installFastTooltip(btnUpdate, i18n("update.tooltip"));
        updateListener = any -> {
            btnUpdate.setVisible(UpdateChecker.isOutdated());

@@ -247,4 +247,9 @@ public final class SettingsPage extends SettingsView implements DecoratorPage {
    protected void onHelp() {
        FXUtils.openLink(Metadata.HELP_URL);
    }
+
+    @Override
+    protected void onSponsor() {
+        FXUtils.openLink("https://hmcl.huangyuhui.net/api/redirect/sponsor");
+    }
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -21,6 +21,7 @@ import com.jfoenix.controls.*;
 import javafx.geometry.HPos;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
+import javafx.scene.Cursor;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.*;
@@ -75,6 +76,19 @@ public abstract class SettingsView extends StackPane {
            {
                ComponentList settingsPane = new ComponentList();
                {
+                    {
+                        StackPane sponsorPane = new StackPane();
+                        sponsorPane.setCursor(Cursor.HAND);
+                        sponsorPane.setOnMouseClicked(e -> onSponsor());
+                        {
+                            Label label = new Label(i18n("sponsor.hmcl"));
+                            label.setWrapText(true);
+                            label.prefWidthProperty().bind(sponsorPane.widthProperty());
+                            sponsorPane.getChildren().add(label);
+                        }
+                        settingsPane.getContent().add(sponsorPane);
+                    }
+
                    ComponentSublist updatePane = new ComponentSublist();
                    updatePane.setTitle(i18n("update"));
                    updatePane.setHasSubtitle(true);
@@ -83,7 +97,7 @@ public abstract class SettingsView extends StackPane {

                        lblUpdate = new Label(i18n("update"));
                        lblUpdateSub = new Label();
-                        lblUpdateSub.getStyleClass().setAll("subtitle-label");
+                        lblUpdateSub.getStyleClass().add("subtitle-label");

                        headerLeft.getChildren().setAll(lblUpdate, lblUpdateSub);
                        updatePane.setHeaderLeft(headerLeft);
@@ -92,7 +106,7 @@ public abstract class SettingsView extends StackPane {
                    {
                        btnUpdate = new JFXButton();
                        btnUpdate.setOnMouseClicked(e -> onUpdate());
-                        btnUpdate.getStyleClass().setAll("toggle-icon4");
+                        btnUpdate.getStyleClass().add("toggle-icon4");
                        btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 20, 20));

                        updatePane.setHeaderRight(btnUpdate);
@@ -124,7 +138,7 @@ public abstract class SettingsView extends StackPane {

                        Label help = new Label(i18n("help"));
                        Label helpSubtitle = new Label(i18n("help.detail"));
-                        helpSubtitle.getStyleClass().setAll("subtitle-label");
+                        helpSubtitle.getStyleClass().add("subtitle-label");

                        headerLeft.getChildren().setAll(help, helpSubtitle);
                        updatePane.setLeft(headerLeft);
@@ -133,7 +147,7 @@ public abstract class SettingsView extends StackPane {
                    {
                        JFXButton btnExternal = new JFXButton();
                        btnExternal.setOnMouseClicked(e -> onHelp());
-                        btnExternal.getStyleClass().setAll("toggle-icon4");
+                        btnExternal.getStyleClass().add("toggle-icon4");
                        btnExternal.setGraphic(SVG.openInNew(Theme.blackFillBinding(), -1, -1));

                        updatePane.setRight(btnExternal);
@@ -337,7 +351,7 @@ public abstract class SettingsView extends StackPane {
                    {
                        JFXButton logButton = new JFXButton(i18n("settings.launcher.launcher_log.export"));
                        logButton.setOnMouseClicked(e -> onExportLogs());
-                        logButton.getStyleClass().setAll("jfx-button-border");
+                        logButton.getStyleClass().add("jfx-button-border");

                        logPane.setHeaderRight(logButton);
                    }
@@ -359,7 +373,7 @@ public abstract class SettingsView extends StackPane {
                                HBox hBox = new HBox();
                                hBox.setSpacing(3);

-                                cboFont = new FontComboBox(12, false);
+                                cboFont = new FontComboBox(12);
                                txtFontSize = new JFXTextField();
                                FXUtils.setLimitWidth(txtFontSize, 50);
                                hBox.getChildren().setAll(cboFont, txtFontSize);
@@ -491,4 +505,5 @@ public abstract class SettingsView extends StackPane {
    protected abstract void onUpdate();
    protected abstract void onHelp();
    protected abstract void onExportLogs();
+    protected abstract void onSponsor();
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,15 +17,15 @@
 */
 package org.jackhuang.hmcl.ui.account;

+import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.image.Image;
 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.game.TexturesLoader;
 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;

@@ -38,23 +38,15 @@ public class AccountAdvancedListItem extends AdvancedListItem {
        protected void invalidated() {
            Account account = get();
            if (account == null) {
+                titleProperty().unbind();
                setTitle(i18n("account.missing"));
                setSubtitle(i18n("account.missing.add"));
+                imageProperty().unbind();
                setImage(new Image("/assets/img/craft_table.png"));
            } else {
-                setTitle(account.getCharacter());
+                titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
                setSubtitle(accountSubtitle(account));
-
-                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, scaleRatio);
-                        setImage(AccountHelper.getHead(image, scaleRatio));
-                    });
-                }
+                imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
            }
        }
    };
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,21 +17,28 @@
 */
 package org.jackhuang.hmcl.ui.account;

+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.*;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.auth.Account;
+import org.jackhuang.hmcl.auth.AuthenticationException;
+import org.jackhuang.hmcl.auth.CredentialExpiredException;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.auth.offline.OfflineAccount;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
-import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.ui.DialogController;

+import static org.jackhuang.hmcl.util.Lang.thread;
+import static org.jackhuang.hmcl.util.Logging.LOG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;

+import java.util.logging.Level;
+
 public class AccountListItem extends RadioButton {

    private final Account account;
@@ -44,23 +51,24 @@ public class AccountListItem extends RadioButton {
        getStyleClass().clear();
        setUserData(account);

-        StringBuilder subtitleString = new StringBuilder(Accounts.getLocalizedLoginTypeName(Accounts.getAccountFactory(account)));
+        String loginTypeName = Accounts.getLocalizedLoginTypeName(Accounts.getAccountFactory(account));
        if (account instanceof AuthlibInjectorAccount) {
            AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
-            subtitleString.append(", ").append(i18n("account.injector.server")).append(": ").append(server.getName());
+            subtitle.bind(Bindings.concat(
+                    loginTypeName, ", ", i18n("account.injector.server"), ": ",
+                    Bindings.createStringBinding(server::getName, server)));
+        } else {
+            subtitle.set(loginTypeName);
        }

-        if (account instanceof OfflineAccount)
-            title.set(account.getCharacter());
-        else
-            title.set(account.getUsername() + " - " + account.getCharacter());
-        subtitle.set(subtitleString.toString());
+        StringBinding characterName = Bindings.createStringBinding(account::getCharacter, account);
+        if (account instanceof OfflineAccount) {
+            title.bind(characterName);
+        } else {
+            title.bind(Bindings.concat(account.getUsername(), " - ", characterName));
+        }

-        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));
+        image.bind(TexturesLoader.fxAvatarBinding(account, 32));
    }

    @Override
@@ -69,19 +77,20 @@ public class AccountListItem extends RadioButton {
    }

    public void refresh() {
-        if (account instanceof YggdrasilAccount) {
-            // progressBar.setVisible(true);
-            AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
-                    .finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-                        // progressBar.setVisible(false);
-
-                        if (isDependentsSucceeded) {
-                            final int scaleRatio = 4;
-                            Image image = AccountHelper.getSkin((YggdrasilAccount) account, scaleRatio);
-                            this.image.set(AccountHelper.getHead(image, scaleRatio));
-                        }
-                    }).start();
-        }
+        account.clearCache();
+        thread(() -> {
+            try {
+                account.logIn();
+            } catch (CredentialExpiredException e) {
+                try {
+                    DialogController.logIn(account);
+                } catch (Exception e1) {
+                    LOG.log(Level.WARNING, "Failed to refresh " + account + " with password", e1);
+                }
+            } catch (AuthenticationException e) {
+                LOG.log(Level.WARNING, "Failed to refresh " + account + " with token", e);
+            }
+        });
    }

    public void remove() {
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,22 +17,30 @@
 */
 package org.jackhuang.hmcl.ui.account;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXRadioButton;
 import com.jfoenix.effects.JFXDepthManager;
+
+import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
+import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
+import javafx.scene.control.Tooltip;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
+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.TwoLineListItem;

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

+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+
 public class AccountListItemSkin extends SkinBase<AccountListItem> {

    public AccountListItemSkin(AccountListItem skinnable) {
@@ -58,8 +66,22 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        FXUtils.limitSize(imageView, 32, 32);
        imageView.imageProperty().bind(skinnable.imageProperty());

-        TwoLineListItem item = new TwoLineListItem();
+        Label title = new Label();
+        title.getStyleClass().add("title");
+        title.textProperty().bind(skinnable.titleProperty());
+        Label subtitle = new Label();
+        subtitle.getStyleClass().add("subtitle");
+        subtitle.textProperty().bind(skinnable.subtitleProperty());
+        if (skinnable.getAccount() instanceof AuthlibInjectorAccount) {
+            Tooltip tooltip = new Tooltip();
+            AuthlibInjectorServer server = ((AuthlibInjectorAccount) skinnable.getAccount()).getServer();
+            tooltip.textProperty().bind(Bindings.createStringBinding(server::toString, server));
+            FXUtils.installSlowTooltip(subtitle, tooltip);
+        }
+        VBox item = new VBox(title, subtitle);
+        item.getStyleClass().add("two-line-list-item");
        BorderPane.setAlignment(item, Pos.CENTER);
+
        center.getChildren().setAll(imageView, item);
        root.setCenter(center);

@@ -69,7 +91,7 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
        btnRefresh.getStyleClass().add("toggle-icon4");
        btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRefresh, i18n("button.refresh")));
+        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
        right.getChildren().add(btnRefresh);

        JFXButton btnRemove = new JFXButton();
@@ -77,14 +99,12 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
        btnRemove.getStyleClass().add("toggle-icon4");
        BorderPane.setAlignment(btnRemove, Pos.CENTER);
        btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
-        JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRemove, i18n("button.delete")));
+        JFXUtilities.runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
        right.getChildren().add(btnRemove);
        root.setRight(right);

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

        getChildren().setAll(root);
    }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -31,14 +31,16 @@ import org.jackhuang.hmcl.ui.FXUtils;
 import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;

 import java.util.function.Consumer;
+import java.util.logging.Level;
+
+import static org.jackhuang.hmcl.util.Logging.LOG;

 public class AccountLoginPane extends StackPane {
    private final Account oldAccount;
    private final Consumer<AuthInfo> success;
    private final Runnable failed;

-    @FXML
-    private Label lblUsername;
+    @FXML private Label lblUsername;
    @FXML private JFXPasswordField txtPassword;
    @FXML private Label lblCreationWarning;
    @FXML private JFXProgressBar progressBar;
@@ -59,25 +61,20 @@ public class AccountLoginPane extends StackPane {
        String password = txtPassword.getText();
        progressBar.setVisible(true);
        lblCreationWarning.setText("");
-        Task.ofResult("login", () -> {
-            try {
-                return oldAccount.logInWithPassword(password);
-            } catch (Exception e) {
-                return e;
-            }
-        }).subscribe(Schedulers.javafx(), variable -> {
-            Object account = variable.get("login");
-            if (account instanceof AuthInfo) {
-                success.accept(((AuthInfo) account));
-                fireEvent(new DialogCloseEvent());
-            } else if (account instanceof NoSelectedCharacterException) {
-                fireEvent(new DialogCloseEvent());
-            } else if (account instanceof Exception) {
-                lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
-            }
-
-            progressBar.setVisible(false);
-        });
+        Task.ofResult(() -> oldAccount.logInWithPassword(password))
+                .finalizedResult(Schedulers.javafx(), authInfo -> {
+                    success.accept(authInfo);
+                    fireEvent(new DialogCloseEvent());
+                    progressBar.setVisible(false);
+                }, e -> {
+                    LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
+                    if (e instanceof NoSelectedCharacterException) {
+                        fireEvent(new DialogCloseEvent());
+                    } else {
+                        lblCreationWarning.setText(AddAccountPane.accountException(e));
+                    }
+                    progressBar.setVisible(false);
+                }).start();
    }

    @FXML
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,15 +17,19 @@
 */
 package org.jackhuang.hmcl.ui.account;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.*;
+
+import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
+import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
-import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
@@ -35,20 +39,22 @@ 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;
-import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
-import org.jackhuang.hmcl.game.AccountHelper;
+import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
+import org.jackhuang.hmcl.game.TexturesLoader;
 import org.jackhuang.hmcl.setting.Accounts;
 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.construct.*;
-import org.jackhuang.hmcl.util.Logging;
+import org.jackhuang.hmcl.util.javafx.MultiStepBinding;

+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
-import java.util.logging.Level;
-
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 import static org.jackhuang.hmcl.setting.ConfigHolder.config;
 import static org.jackhuang.hmcl.ui.FXUtils.*;
@@ -63,12 +69,13 @@ public class AddAccountPane extends StackPane {
    @FXML private JFXComboBox<AccountFactory<?>> cboType;
    @FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
    @FXML private Label lblInjectorServer;
-    @FXML private Hyperlink linkManageInjectorServers;
-    @FXML private JFXDialogLayout layout;
    @FXML private JFXButton btnAccept;
    @FXML private JFXButton btnAddServer;
    @FXML private JFXButton btnManageServer;
    @FXML private SpinnerPane acceptPane;
+    @FXML private HBox linksContainer;
+
+    private ListProperty<Hyperlink> links = new SimpleListProperty<>();;

    public AddAccountPane() {
        FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
@@ -79,7 +86,7 @@ public class AddAccountPane extends StackPane {
        cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
        selectDefaultServer();

-        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
+        cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_MOJANG, Accounts.FACTORY_AUTHLIB_INJECTOR);
        cboType.setConverter(stringConverter(Accounts::getLocalizedLoginTypeName));
        // try selecting the preferred login type
        cboType.getSelectionModel().select(
@@ -117,6 +124,34 @@ public class AddAccountPane extends StackPane {
                txtUsername.textProperty(),
                txtPassword.textProperty(), txtPassword.visibleProperty(),
                cboServers.getSelectionModel().selectedItemProperty(), cboServers.visibleProperty()));
+
+        // authlib-injector links
+        links.bind(MultiStepBinding.of(cboServers.getSelectionModel().selectedItemProperty())
+                .map(AddAccountPane::createHyperlinks)
+                .map(FXCollections::observableList));
+        Bindings.bindContent(linksContainer.getChildren(), links);
+        linksContainer.visibleProperty().bind(cboServers.visibleProperty());
+    }
+
+    private static final String[] ALLOWED_LINKS = { "register" };
+
+    public static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
+        if (server == null) {
+            return emptyList();
+        }
+
+        Map<String, String> links = server.getLinks();
+        List<Hyperlink> result = new ArrayList<>();
+        for (String key : ALLOWED_LINKS) {
+            String value = links.get(key);
+            if (value != null) {
+                Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
+                FXUtils.installSlowTooltip(link, value);
+                link.setOnAction(e -> FXUtils.openLink(value));
+                result.add(link);
+            }
+        }
+        return unmodifiableList(result);
    }

    /**
@@ -160,10 +195,8 @@ public class AddAccountPane extends StackPane {
        AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
        Object additionalData = getAuthAdditionalData();

-        Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, additionalData))
-                .finalized(Schedulers.javafx(), variables -> {
-
-                    Account account = variables.get("create_account");
+        Task.ofResult(() -> factory.create(new Selector(), username, password, additionalData))
+                .finalizedResult(Schedulers.javafx(), account -> {
                    int oldIndex = Accounts.getAccounts().indexOf(account);
                    if (oldIndex == -1) {
                        Accounts.getAccounts().add(account);
@@ -214,7 +247,7 @@ public class AddAccountPane extends StackPane {
        private final CountDownLatch latch = new CountDownLatch(1);
        private GameProfile selectedProfile = null;

-        {
+        public Selector() {
            setStyle("-fx-padding: 8px;");

            cancel.setText(i18n("button.cancel"));
@@ -232,45 +265,33 @@ public class AddAccountPane extends StackPane {
        }

        @Override
-        public GameProfile select(Account account, List<GameProfile> names) throws NoSelectedCharacterException {
-            if (!(account instanceof YggdrasilAccount))
-                return CharacterSelector.DEFAULT.select(account, names);
-            YggdrasilAccount yggdrasilAccount = (YggdrasilAccount) account;
+        public GameProfile select(YggdrasilService service, List<GameProfile> profiles) throws NoSelectedCharacterException {
+            Platform.runLater(() -> {
+                for (GameProfile profile : profiles) {
+                    ImageView portraitView = new ImageView();
+                    portraitView.setSmooth(false);
+                    portraitView.imageProperty().bind(TexturesLoader.fxAvatarBinding(service, profile.getId(), 32));
+                    FXUtils.limitSize(portraitView, 32, 32);

-            for (GameProfile profile : names) {
-                Image image;
-                final int scaleRatio = 4;
-                try {
-                    image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, scaleRatio);
-                } catch (Exception e) {
-                    Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
-                    image = AccountHelper.getDefaultSkin(profile.getId(), scaleRatio);
+                    IconedItem accountItem = new IconedItem(portraitView, profile.getName());
+                    accountItem.setOnMouseClicked(e -> {
+                        selectedProfile = profile;
+                        latch.countDown();
+                    });
+                    listBox.add(accountItem);
                }
-
-                ImageView portraitView = new ImageView();
-                portraitView.setSmooth(false);
-                portraitView.setImage(AccountHelper.getHead(image, scaleRatio));
-                FXUtils.limitSize(portraitView, 32, 32);
-
-                IconedItem accountItem = new IconedItem(portraitView, profile.getName());
-                accountItem.setOnMouseClicked(e -> {
-                    selectedProfile = profile;
-                    latch.countDown();
-                });
-                listBox.add(accountItem);
-            }
-
-            JFXUtilities.runInFX(() -> Controllers.dialog(this));
+                Controllers.dialog(this);
+            });

            try {
                latch.await();

                if (selectedProfile == null)
-                    throw new NoSelectedCharacterException(account);
+                    throw new NoSelectedCharacterException();

                return selectedProfile;
            } catch (InterruptedException ignore) {
-                throw new NoSelectedCharacterException(account);
+                throw new NoSelectedCharacterException();
            } finally {
                JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
            }
@@ -298,6 +319,8 @@ public class AddAccountPane extends StackPane {
            return exception.getMessage();
        } else if (exception instanceof AuthlibInjectorDownloadException) {
            return i18n("account.failed.injector_download_failure");
+        } else if (exception instanceof CharacterDeletedException) {
+            return i18n("account.failed.character_deleted");
        } else if (exception.getClass() == AuthenticationException.class) {
            return exception.getLocalizedMessage();
        } else {
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -19,6 +19,8 @@ package org.jackhuang.hmcl.ui.account;

 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.effects.JFXDepthManager;
+
+import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
@@ -33,17 +35,17 @@ public final class AuthlibInjectorServerItem extends BorderPane {
    private final AuthlibInjectorServer server;

    private final Label lblServerName = new Label();
-    private final Label lblServerIp = new Label();
+    private final Label lblServerUrl = new Label();

    public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
        this.server = server;

        lblServerName.setStyle("-fx-font-size: 15;");
-        lblServerIp.setStyle("-fx-font-size: 10;");
+        lblServerUrl.setStyle("-fx-font-size: 10;");

        VBox center = new VBox();
        BorderPane.setAlignment(center, Pos.CENTER);
-        center.getChildren().addAll(lblServerName, lblServerIp);
+        center.getChildren().addAll(lblServerName, lblServerUrl);
        setCenter(center);

        JFXButton right = new JFXButton();
@@ -55,8 +57,8 @@ public final class AuthlibInjectorServerItem extends BorderPane {

        setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
        JFXDepthManager.setDepth(this, 1);
-        lblServerName.setText(server.getName());
-        lblServerIp.setText(server.getUrl());
+        lblServerName.textProperty().bind(Bindings.createStringBinding(server::getName, server));
+        lblServerUrl.setText(server.getUrl());
    }

    public AuthlibInjectorServer getServer() {
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -83,7 +83,7 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
        HBox right = new HBox();
        right.setAlignment(Pos.CENTER);
        right.setMouseTransparent(true);
-        right.getStyleClass().setAll("toggle-icon4");
+        right.getStyleClass().add("toggle-icon4");
        FXUtils.setLimitWidth(right, 40);
        FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
                newGraphic -> {
@@ -99,7 +99,7 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
                visible -> root.setRight(visible ? right : null));

        stackPane.setStyle("-fx-padding: 10 16 10 16;");
-        stackPane.getStyleClass().setAll("transparent");
+        stackPane.getStyleClass().add("transparent");
        stackPane.setPickOnBounds(false);
        stackPane.getChildren().setAll(root);

@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -61,7 +61,7 @@ public class FileItem extends BorderPane {
        right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
        right.getStyleClass().add("toggle-icon4");
        right.setOnMouseClicked(e -> onExplore());
-        FXUtils.installTooltip(right, i18n("button.edit"));
+        FXUtils.installFastTooltip(right, i18n("button.edit"));
        setRight(right);

        Tooltip tip = new Tooltip();
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -24,27 +24,27 @@ import static javafx.collections.FXCollections.singletonObservableList;
 import org.jackhuang.hmcl.util.javafx.MultiStepBinding;

 import com.jfoenix.controls.JFXComboBox;
+import com.jfoenix.controls.JFXListCell;

 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) {
+    public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize) {
        styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));

-        setCellFactory(listView -> new ListCell<String>() {
+        setCellFactory(listView -> new JFXListCell<String>() {
            @Override
-            protected void updateItem(String item, boolean empty) {
+            public void updateItem(String item, boolean empty) {
                super.updateItem(item, empty);
-                if (item != null) {
+                if (!empty) {
                    setText(item);
-                    setFont(new Font(item, fontSize));
+                    setGraphic(null);
+                    setStyle("-fx-font-family: \"" + item + "\"");
                }
            }
        });
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -45,7 +45,7 @@ public class IconedItem extends RipplerContainer {
            hBox.getChildren().add(icon);
        }

-        hBox.getStyleClass().setAll("iconed-item-container");
+        hBox.getStyleClass().add("iconed-item-container");
        Label textLabel = new Label();
        textLabel.setId("label");
        textLabel.setMouseTransparent(true);
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -18,6 +18,7 @@
 package org.jackhuang.hmcl.ui.construct;

 import javafx.scene.Node;
+import org.jackhuang.hmcl.ui.FXUtils;

 public class IconedMenuItem extends IconedItem {

@@ -27,4 +28,9 @@ public class IconedMenuItem extends IconedItem {
        getStyleClass().setAll("iconed-menu-item");
        setOnMouseClicked(e -> action.run());
    }
+
+    public IconedMenuItem addTooltip(String tooltip) {
+        FXUtils.installFastTooltip(this, tooltip);
+        return this;
+    }
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -63,7 +63,7 @@ public final class ImagePickerItem extends BorderPane {
        deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
        deleteButton.getStyleClass().add("toggle-icon4");

-        FXUtils.installTooltip(selectButton, i18n("button.edit"));
+        FXUtils.installFastTooltip(selectButton, i18n("button.edit"));

        HBox hBox = new HBox();
        hBox.getChildren().setAll(imageView, selectButton, deleteButton);
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -0,0 +1,133 @@
+/*
+ * Hello Minecraft! Launcher
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import com.jfoenix.controls.JFXCheckBox;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Pos;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.TreeTableCell;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
+
+public class JFXCheckBoxTreeTableCell<S,T> extends TreeTableCell<S,T> {
+
+    private final CheckBox checkBox;
+    private boolean showLabel;
+    private ObservableValue<Boolean> booleanProperty;
+
+    public JFXCheckBoxTreeTableCell() {
+        this(null, null);
+    }
+
+    public JFXCheckBoxTreeTableCell(
+            final Callback<Integer, ObservableValue<Boolean>> getSelectedProperty) {
+        this(getSelectedProperty, null);
+    }
+
+    public JFXCheckBoxTreeTableCell(
+            final Callback<Integer, ObservableValue<Boolean>> getSelectedProperty,
+            final StringConverter<T> converter) {
+        this.getStyleClass().add("check-box-tree-table-cell");
+        this.checkBox = new JFXCheckBox();
+        setGraphic(null);
+        setSelectedStateCallback(getSelectedProperty);
+        setConverter(converter);
+    }
+
+    private ObjectProperty<StringConverter<T>> converter =
+            new SimpleObjectProperty<StringConverter<T>>(this, "converter") {
+                protected void invalidated() {
+                    updateShowLabel();
+                }
+            };
+
+    public final ObjectProperty<StringConverter<T>> converterProperty() {
+        return converter;
+    }
+    public final void setConverter(StringConverter<T> value) {
+        converterProperty().set(value);
+    }
+    public final StringConverter<T> getConverter() {
+        return converterProperty().get();
+    }
+
+    private ObjectProperty<Callback<Integer, ObservableValue<Boolean>>>
+            selectedStateCallback =
+            new SimpleObjectProperty<Callback<Integer, ObservableValue<Boolean>>>(
+                    this, "selectedStateCallback");
+
+    public final ObjectProperty<Callback<Integer, ObservableValue<Boolean>>> selectedStateCallbackProperty() {
+        return selectedStateCallback;
+    }
+
+    public final void setSelectedStateCallback(Callback<Integer, ObservableValue<Boolean>> value) {
+        selectedStateCallbackProperty().set(value);
+    }
+
+    public final Callback<Integer, ObservableValue<Boolean>> getSelectedStateCallback() {
+        return selectedStateCallbackProperty().get();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override public void updateItem(T item, boolean empty) {
+        super.updateItem(item, empty);
+
+        if (empty) {
+            setText(null);
+            setGraphic(null);
+        } else {
+            StringConverter<T> c = getConverter();
+
+            if (showLabel) {
+                setText(c.toString(item));
+            }
+            setGraphic(checkBox);
+
+            if (booleanProperty instanceof BooleanProperty) {
+                checkBox.selectedProperty().unbindBidirectional((BooleanProperty)booleanProperty);
+            }
+            ObservableValue<?> obsValue = getSelectedProperty();
+            if (obsValue instanceof BooleanProperty) {
+                booleanProperty = (ObservableValue<Boolean>) obsValue;
+                checkBox.selectedProperty().bindBidirectional((BooleanProperty)booleanProperty);
+            }
+
+            checkBox.disableProperty().bind(Bindings.not(
+                    getTreeTableView().editableProperty().and(
+                            getTableColumn().editableProperty()).and(
+                            editableProperty())
+            ));
+        }
+    }
+
+    private void updateShowLabel() {
+        this.showLabel = converter != null;
+        this.checkBox.setAlignment(showLabel ? Pos.CENTER_LEFT : Pos.CENTER);
+    }
+
+    private ObservableValue<?> getSelectedProperty() {
+        return getSelectedStateCallback() != null ?
+                getSelectedStateCallback().call(getIndex()) :
+                getTableColumn().getCellObservableValue(getIndex());
+    }
+}
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -64,7 +64,7 @@ public class PopupMenu extends Control {
    public static Node wrapPopupMenuItem(Node node) {
        StackPane pane = new StackPane();
        pane.getChildren().setAll(node);
-        pane.getStyleClass().setAll("menu-container");
+        pane.getStyleClass().add("menu-container");
        node.setMouseTransparent(true);
        return new RipplerContainer(pane);
    }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -18,7 +18,6 @@
 package org.jackhuang.hmcl.ui.construct;

 import com.jfoenix.controls.JFXRippler;
-import javafx.animation.Transition;
 import javafx.beans.DefaultProperty;
 import javafx.beans.InvalidationListener;
 import javafx.beans.NamedArg;
@@ -64,68 +63,28 @@ public class RipplerContainer extends StackPane {
            mask.resize(buttonContainer.getWidth() - buttonContainer.snappedRightInset() - buttonContainer.snappedLeftInset(), buttonContainer.getHeight() - buttonContainer.snappedBottomInset() - buttonContainer.snappedTopInset());
            return mask;
        }
-
-        @Override
-        protected void initListeners() {
-            this.ripplerPane.setOnMousePressed(event -> {
-                if (releaseManualRippler != null)
-                    releaseManualRippler.run();
-                releaseManualRippler = null;
-                createRipple(event.getX(), event.getY());
-            });
-        }
    };

-    private Transition clickedAnimation;
    private final CornerRadii defaultRadii = new CornerRadii(3);
-    private Runnable releaseManualRippler;

    public RipplerContainer(@NamedArg("container") Node container) {
        setContainer(container);

        getStyleClass().add(DEFAULT_STYLE_CLASS);
        buttonContainer.getChildren().add(buttonRippler);
-        setOnMousePressed(event -> {
-            if (clickedAnimation != null) {
-                clickedAnimation.setRate(1);
-                clickedAnimation.play();
-            }
-        });
-        setOnMouseReleased(event -> {
-            if (clickedAnimation != null) {
-                clickedAnimation.setRate(-1);
-                clickedAnimation.play();
-            }
-        });
        focusedProperty().addListener((a, b, newValue) -> {
            if (newValue) {
                if (!isPressed())
-                    buttonRippler.showOverlay();
+                    buttonRippler.setOverlayVisible(true);
            } else {
-                buttonRippler.hideOverlay();
+                buttonRippler.setOverlayVisible(false);
            }
        });
-        pressedProperty().addListener(o -> buttonRippler.hideOverlay());
+        pressedProperty().addListener(o -> buttonRippler.setOverlayVisible(false));
        setPickOnBounds(false);

        buttonContainer.setPickOnBounds(false);
-        buttonContainer.shapeProperty().bind(shapeProperty());
-        buttonContainer.borderProperty().bind(borderProperty());
-        buttonContainer.backgroundProperty().bind(Bindings.createObjectBinding(() -> {
-            if (getBackground() == null || isJavaDefaultBackground(getBackground()) || isJavaDefaultClickedBackground(getBackground()))
-                setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
-
-            try {
-                return new Background(new BackgroundFill(getBackground() != null ? getBackground().getFills().get(0).getFill() : Color.TRANSPARENT,
-                        getBackground() != null ? getBackground().getFills().get(0).getRadii() : defaultRadii, Insets.EMPTY));
-            } catch (Exception e) {
-                return getBackground();
-            }
-        }, backgroundProperty()));
-
-        ripplerFillProperty().addListener((a, b, newValue) -> buttonRippler.setRipplerFill(newValue));
-        if (getBackground() == null || isJavaDefaultBackground(getBackground()))
-            setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
+        buttonRippler.ripplerFillProperty().bind(ripplerFillProperty());

        containerProperty().addListener(o -> updateChildren());
        updateChildren();
@@ -153,24 +112,6 @@ public class RipplerContainer extends StackPane {
            getChildren().get(i).setPickOnBounds(false);
    }

-    private boolean isJavaDefaultBackground(Background background) {
-        try {
-            String firstFill = background.getFills().get(0).getFill().toString();
-            return "0xffffffba".equals(firstFill) || "0xffffffbf".equals(firstFill) || "0xffffffbd".equals(firstFill);
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    private boolean isJavaDefaultClickedBackground(Background background) {
-        try {
-            String firstFill = background.getFills().get(0).getFill().toString();
-            return "0x039ed3ff".equals(firstFill);
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
    public Node getContainer() {
        return container.get();
    }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -19,7 +19,9 @@ package org.jackhuang.hmcl.ui.construct;

 import com.jfoenix.controls.JFXSpinner;
 import javafx.beans.DefaultProperty;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
 import javafx.scene.layout.StackPane;
@@ -32,19 +34,29 @@ public class SpinnerPane extends StackPane {
    private final JFXSpinner spinner = new JFXSpinner();
    private final StackPane contentPane = new StackPane();
    private final ObjectProperty<Node> content = new SimpleObjectProperty<>(this, "content");
+    private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading") {
+    	protected void invalidated() {
+    		if (get())
+    	        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+    		else
+    	        transitionHandler.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+    	}
+    };

    public SpinnerPane() {
+    	getStyleClass().add("spinner-pane");
+    	
        getChildren().setAll(contentPane);

        content.addListener((a, b, newValue) -> contentPane.getChildren().setAll(newValue));
    }

    public void showSpinner() {
-        transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer());
+    	setLoading(true);
    }

    public void hideSpinner() {
-        transitionHandler.setContent(contentPane, ContainerAnimations.FADE.getAnimationProducer());
+    	setLoading(false);
    }

    public Node getContent() {
@@ -58,4 +70,16 @@ public class SpinnerPane extends StackPane {
    public void setContent(Node content) {
        this.content.set(content);
    }
+
+    public boolean isLoading() {
+    	return loading.get();
+    }
+    
+    public BooleanProperty loadingProperty() {
+    	return loading;
+    }
+    
+    public void setLoading(boolean loading) {
+    	this.loading.set(loading);
+    }
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -17,7 +17,7 @@
 */
 package org.jackhuang.hmcl.ui.construct;

-import com.jfoenix.concurrency.JFXUtilities;
+import com.jfoenix.utils.JFXUtilities;
 import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -24,7 +24,6 @@ import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.scene.control.Label;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.download.forge.ForgeInstallTask;
 import org.jackhuang.hmcl.download.game.GameAssetDownloadTask;
 import org.jackhuang.hmcl.download.liteloader.LiteLoaderInstallTask;
@@ -111,7 +110,6 @@ public final class TaskListPane extends StackPane {
                ProgressListNode node = new ProgressListNode(task);
                nodes.put(task, node);
                Platform.runLater(() -> listBox.add(node));
-
            }

            @Override
@@ -139,7 +137,7 @@ public final class TaskListPane extends StackPane {
        });
    }

-    private static class ProgressListNode extends VBox {
+    private static class ProgressListNode extends BorderPane {
        private final JFXProgressBar bar = new JFXProgressBar();
        private final Label title = new Label();
        private final Label state = new Label();
@@ -149,10 +147,9 @@ public final class TaskListPane extends StackPane {
            title.setText(task.getName());
            state.textProperty().bind(task.messageProperty());

-            BorderPane borderPane = new BorderPane();
-            borderPane.setLeft(title);
-            borderPane.setRight(state);
-            getChildren().addAll(borderPane, bar);
+            setLeft(title);
+            setRight(state);
+            setBottom(bar);

            bar.minWidthProperty().bind(widthProperty());
            bar.prefWidthProperty().bind(widthProperty());
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -19,32 +19,15 @@ package org.jackhuang.hmcl.ui.construct;

 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.css.CssMetaData;
-import javafx.css.SimpleStyleableObjectProperty;
-import javafx.css.Styleable;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleablePropertyFactory;
 import javafx.scene.control.Label;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.text.Font;

-import java.util.List;
-
-public class TwoLineListItem extends StackPane {
+public class TwoLineListItem extends VBox {
    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");

-    private final StyleableObjectProperty<Font> titleFont = new SimpleStyleableObjectProperty<>(StyleableProperties.TITLE_FONT, this, "title-font", Font.font(15));
-    private final StyleableObjectProperty<Font> subtitleFont = new SimpleStyleableObjectProperty<>(StyleableProperties.SUBTITLE_FONT, this, "subtitle-font", Font.getDefault());
-
-    private final StyleableObjectProperty<Paint> titleFill = new SimpleStyleableObjectProperty<>(StyleableProperties.TITLE_FILL, this, "title-fill", Color.BLACK);
-    private final StyleableObjectProperty<Paint> subtitleFill = new SimpleStyleableObjectProperty<>(StyleableProperties.SUBTITLE_FILL, this, "subtitle-fill", Color.GRAY);
-
    public TwoLineListItem(String titleString, String subtitleString) {
        this();

@@ -53,20 +36,16 @@ public class TwoLineListItem extends StackPane {
    }

    public TwoLineListItem() {
+        setMouseTransparent(true);
        Label lblTitle = new Label();
-        lblTitle.textFillProperty().bind(titleFill);
-        lblTitle.fontProperty().bind(titleFont);
+        lblTitle.getStyleClass().add("title");
        lblTitle.textProperty().bind(title);

        Label lblSubtitle = new Label();
-        lblSubtitle.textFillProperty().bind(subtitleFill);
-        lblSubtitle.fontProperty().bind(subtitleFont);
+        lblSubtitle.getStyleClass().add("subtitle");
        lblSubtitle.textProperty().bind(subtitle);

-        VBox vbox = new VBox();
-        vbox.getChildren().setAll(lblTitle, lblSubtitle);
-        getChildren().setAll(vbox);
-
+        getChildren().setAll(lblTitle, lblSubtitle);
        getStyleClass().add(DEFAULT_STYLE_CLASS);
    }

@@ -94,74 +73,8 @@ public class TwoLineListItem extends StackPane {
        this.subtitle.set(subtitle);
    }

-    public Font getTitleFont() {
-        return titleFont.get();
-    }
-
-    public StyleableObjectProperty<Font> titleFontProperty() {
-        return titleFont;
-    }
-
-    public void setTitleFont(Font titleFont) {
-        this.titleFont.set(titleFont);
-    }
-
-    public Font getSubtitleFont() {
-        return subtitleFont.get();
-    }
-
-    public StyleableObjectProperty<Font> subtitleFontProperty() {
-        return subtitleFont;
-    }
-
-    public void setSubtitleFont(Font subtitleFont) {
-        this.subtitleFont.set(subtitleFont);
-    }
-
-    public Paint getTitleFill() {
-        return titleFill.get();
-    }
-
-    public StyleableObjectProperty<Paint> titleFillProperty() {
-        return titleFill;
-    }
-
-    public void setTitleFill(Paint titleFill) {
-        this.titleFill.set(titleFill);
-    }
-
-    public Paint getSubtitleFill() {
-        return subtitleFill.get();
-    }
-
-    public StyleableObjectProperty<Paint> subtitleFillProperty() {
-        return subtitleFill;
-    }
-
-    public void setSubtitleFill(Paint subtitleFill) {
-        this.subtitleFill.set(subtitleFill);
-    }
-
    @Override
    public String toString() {
        return getTitle();
    }
-
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.FACTORY.getCssMetaData();
-    }
-
-    private static class StyleableProperties {
-        private static final StyleablePropertyFactory<TwoLineListItem> FACTORY = new StyleablePropertyFactory<>(StackPane.getClassCssMetaData());
-
-        private static final CssMetaData<TwoLineListItem, Font> TITLE_FONT = FACTORY.createFontCssMetaData("-jfx-title-font", s -> s.titleFont, Font.font(15));
-        private static final CssMetaData<TwoLineListItem, Font> SUBTITLE_FONT = FACTORY.createFontCssMetaData("-jfx-subtitle-font", s -> s.subtitleFont);
-        private static final CssMetaData<TwoLineListItem, Paint> TITLE_FILL = FACTORY.createPaintCssMetaData("-jfx-title-fill", s -> s.titleFill);
-        private static final CssMetaData<TwoLineListItem, Paint> SUBTITLE_FILL = FACTORY.createPaintCssMetaData("-jfx-subtitle-fill", s -> s.subtitleFill, Color.GREY);
-    }
 }
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -32,6 +32,7 @@ import javafx.scene.control.SkinBase;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
@@ -72,13 +73,17 @@ public class DecoratorSkin extends SkinBase<Decorator> {
        Decorator skinnable = getSkinnable();

        BorderPane root = new BorderPane();
-        root.getStyleClass().setAll("jfx-decorator", "resize-border");
-        root.setMaxHeight(519);
-        root.setMaxWidth(800);
+        root.getStyleClass().addAll("jfx-decorator", "resize-border");
+        root.setPrefHeight(519);
+        root.setPrefWidth(800);
+        root.setMaxHeight(Region.USE_PREF_SIZE);
+        root.setMinHeight(Region.USE_PREF_SIZE);
+        root.setMaxWidth(Region.USE_PREF_SIZE);
+        root.setMinWidth(Region.USE_PREF_SIZE);

        StackPane drawerWrapper = new StackPane();
        skinnable.setDrawerWrapper(drawerWrapper);
-        drawerWrapper.getStyleClass().setAll("jfx-decorator-drawer");
+        drawerWrapper.getStyleClass().add("jfx-decorator-drawer");
        drawerWrapper.backgroundProperty().bind(skinnable.backgroundProperty());
        FXUtils.setOverflowHidden(drawerWrapper, true);
        {
@@ -87,10 +92,10 @@ public class DecoratorSkin extends SkinBase<Decorator> {
            {
                BorderPane leftRootPane = new BorderPane();
                FXUtils.setLimitWidth(leftRootPane, 200);
-                leftRootPane.getStyleClass().setAll("jfx-decorator-content-container");
+                leftRootPane.getStyleClass().add("jfx-decorator-content-container");

                StackPane drawerContainer = new StackPane();
-                drawerContainer.getStyleClass().setAll("gray-background");
+                drawerContainer.getStyleClass().add("gray-background");
                Bindings.bindContent(drawerContainer.getChildren(), skinnable.drawerProperty());
                leftRootPane.setCenter(drawerContainer);

@@ -106,7 +111,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {

            {
                contentPlaceHolder = new StackPane();
-                contentPlaceHolder.getStyleClass().setAll("jfx-decorator-content-container");
+                contentPlaceHolder.getStyleClass().add("jfx-decorator-content-container");
                contentPlaceHolder.backgroundProperty().bind(skinnable.contentBackgroundProperty());
                FXUtils.setOverflowHidden(contentPlaceHolder, true);
                Bindings.bindContent(contentPlaceHolder.getChildren(), skinnable.contentProperty());
@@ -184,14 +189,14 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                {
                    JFXButton backNavButton = new JFXButton();
                    backNavButton.setGraphic(SVG.back(Theme.foregroundFillBinding(), -1, -1));
-                    backNavButton.getStyleClass().setAll("jfx-decorator-button");
+                    backNavButton.getStyleClass().add("jfx-decorator-button");
                    backNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
                    backNavButton.onActionProperty().bind(skinnable.onBackNavButtonActionProperty());
                    backNavButton.visibleProperty().bind(skinnable.canBackProperty());

                    closeNavButton = new JFXButton();
                    closeNavButton.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
-                    closeNavButton.getStyleClass().setAll("jfx-decorator-button");
+                    closeNavButton.getStyleClass().add("jfx-decorator-button");
                    closeNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
                    closeNavButton.onActionProperty().bind(skinnable.onCloseNavButtonActionProperty());

@@ -202,7 +207,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                        else navLeft.getChildren().setAll(backNavButton);
                    });

-                    skinnable.showCloseAsHomeProperty().addListener((a, b, newValue) -> {
+                    FXUtils.onChangeAndOperate(skinnable.showCloseAsHomeProperty(), (newValue) -> {
                        if (newValue)
                            closeNavButton.setGraphic(SVG.home(Theme.foregroundFillBinding(), -1, -1));
                        else
@@ -214,7 +219,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                VBox navCenter = new VBox();
                navCenter.setAlignment(Pos.CENTER_LEFT);
                Label titleLabel = new Label();
-                titleLabel.getStyleClass().setAll("jfx-decorator-title");
+                titleLabel.getStyleClass().add("jfx-decorator-title");
                titleLabel.textProperty().bind(skinnable.drawerTitleProperty());
                navCenter.getChildren().setAll(titleLabel);
                navBar.setCenter(navCenter);
@@ -223,7 +228,7 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                navRight.setAlignment(Pos.CENTER_RIGHT);
                refreshNavButton = new JFXButton();
                refreshNavButton.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1));
-                refreshNavButton.getStyleClass().setAll("jfx-decorator-button");
+                refreshNavButton.getStyleClass().add("jfx-decorator-button");
                refreshNavButton.ripplerFillProperty().bind(Theme.whiteFillBinding());
                refreshNavButton.onActionProperty().bind(skinnable.onRefreshNavButtonActionProperty());
                refreshNavButton.visibleProperty().bind(skinnable.canRefreshProperty());
@@ -246,12 +251,12 @@ public class DecoratorSkin extends SkinBase<Decorator> {
                StackPane pane = new StackPane(minus);
                pane.setAlignment(Pos.CENTER);
                btnMin.setGraphic(pane);
-                btnMin.getStyleClass().setAll("jfx-decorator-button");
+                btnMin.getStyleClass().add("jfx-decorator-button");
                btnMin.setOnAction(e -> skinnable.minimize());

                JFXButton btnClose = new JFXButton();
                btnClose.setGraphic(SVG.close(Theme.foregroundFillBinding(), -1, -1));
-                btnClose.getStyleClass().setAll("jfx-decorator-button");
+                btnClose.getStyleClass().add("jfx-decorator-button");
                btnClose.setOnAction(e -> skinnable.close());

                buttonsContainer.getChildren().setAll(separator, btnMin, btnClose);
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
@@ -52,7 +52,7 @@ public class DecoratorWizardDisplayer extends StackPane implements TaskExecutorD
        wizardController.setProvider(provider);
        wizardController.onStart();

-        getStyleClass().setAll("white-background");
+        getStyleClass().add("white-background");
    }

    @Override
@@ -1,6 +1,6 @@
-/**
+/*
 * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com> and contributors
+ * Copyright (C) 2019  huangyuhui <huanghongxun2008@126.com> and contributors
 *
 * 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
Author	SHA1	Message	Date
huanghongxun	e940845c60	Fix not correct mod installation	2019-02-20 16:40:26 +08:00
huanghongxun	d8aa989cc4	Fix #532	2019-02-19 23:15:45 +08:00
huanghongxun	31ed4268b6	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2019-02-19 19:39:23 +08:00
huanghongxun	c698eaac6f	Add sponsor information	2019-02-19 19:38:37 +08:00
huanghongxun	d0dd23fa14	Fix compilation error along with openjfx	2019-02-19 19:36:23 +08:00
yushijinhun	c6f1aa21c5	Log exception in login pane	2019-02-19 18:56:36 +08:00
huanghongxun	a3dc7798e7	fetch Forge remote version list only from BMCLAPI	2019-02-17 14:01:05 +08:00
huanghongxun	88f6fd1965	Set cursor in button to hand by default	2019-02-17 13:57:49 +08:00
huanghongxun	9062c2e447	Display more friendly error message when fail to install library	2019-02-17 13:45:10 +08:00
huanghongxun	e3d2a4bf9d	Update JFoenix to fix #523	2019-02-16 01:52:37 +08:00
huanghongxun	c2d609cdb4	Use TableView in ModListPage to allow multiple selection	2019-02-15 19:39:43 +08:00
huanghongxun	b3721e29c6	Update copyright statement	2019-02-14 16:20:14 +08:00
huanghongxun	eab4463c2d	HMCLauncher: verify if JVM version is between 8 and 10	2019-02-14 15:34:52 +08:00
yushijinhun	394873864f	Fix #526	2019-02-13 20:09:51 +08:00
yushijinhun	758216245f	Add missing license headers	2019-02-13 20:05:01 +08:00
huanghongxun	6edfd112a2	Replace "close" icon to "delete" icon on ModItem	2019-02-13 17:51:01 +08:00
huanghongxun	625215b068	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2019-02-13 17:46:18 +08:00
huanghongxun	4759e4957c	refactor	2019-02-13 17:46:11 +08:00
huanghongxun	b62f9494ae	Have a placeholder in the bottom of LIstPage	2019-02-12 21:39:01 +08:00
huanghongxun	12b47e7d51	Better prompt of LibraryDownloadException	2019-02-12 21:30:45 +08:00
huanghongxun	9ced29aa93	Display furnace image as default for modded 1.13 game	2019-02-11 19:53:55 +08:00
huanghongxun	5095640ba2	Report memory usage when OutOfMemoryError occurred.	2019-02-11 19:47:17 +08:00
huanghongxun	c889d7cb3f	Download missing game jar when launching	2019-02-11 19:36:19 +08:00
huanghongxun	84636f3f50	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2019-02-10 10:51:39 +08:00
huanghongxun	9a6f07d7c9	make DefaultGameRepositoy.readVersionJson nonnull.	2019-02-10 10:51:04 +08:00
huanghongxun	e8f5088049	Support automatic installation of Forge 1.13.	2019-02-10 10:49:48 +08:00
yushijinhun	0bee306d67	css clean up	2019-02-09 21:44:14 +08:00
yushijinhun	8d75b2d413	Fix #519	2019-02-09 21:37:26 +08:00
huanghongxun	426ea607e8	HMCLauncher: try bundled JRE	2019-02-08 22:05:16 +08:00
yushijinhun	507cade50d	polish authlib-injector	2019-02-08 17:08:23 +08:00
huanghongxun	f0c7f54cc6	Redownload asset index when install new game	2019-02-08 15:54:28 +08:00
yushijinhun	62c38482f6	polish `639bc58e84` see https://github.com/huanghongxun/HMCL/commit/639bc58e84b68a7b508ed9ba0a701a13b2fac1b4#r32215378	2019-02-08 14:55:58 +08:00
yushijinhun	0ff6ca18ed	Use https for bmclapi	2019-02-08 14:35:16 +08:00
huanghongxun	bbe6c388a3	Merge branch 'skin-refactor' into javafx	2019-02-06 22:53:38 +08:00
huanghongxun	639bc58e84	Support version identification of Minecraft 1.14	2019-02-06 21:54:51 +08:00
huanghongxun	c0bcafd747	Revert "Use JFXListView in place of custom components to accelerate rendering" This reverts commit `0813211`	2019-02-06 17:14:49 +08:00
huanghongxun	bcaa019551	Only maintain game version json with launchwrapper installed. Forge modlauncher is not supported right now.	2019-02-06 15:14:08 +08:00
huanghongxun	38725abc48	DownloadInfo.url can be null in forge 1.13.2 version json	2019-02-06 13:35:16 +08:00
yushijinhun	00f1173bac	Add translation for CharacterDeletedException	2019-02-05 14:56:11 +08:00
yushijinhun	68a02966d0	Skip parsing json file if it does not exist	2019-02-05 14:31:33 +08:00
yushijinhun	4721fcea66	allow characterName/authserverName to be changed at runtime	2019-02-05 02:09:39 +08:00
yushijinhun	5ea63273be	check validity of YggdrasilSession response	2019-02-05 01:46:48 +08:00
yushijinhun	7cee25aab2	Fix concurrent problems in TexturesLoader.Selector	2019-02-05 00:15:17 +08:00
yushijinhun	9298f5e030	Account Refactor	2019-02-04 23:12:40 +08:00
yushijinhun	93f943d40c	Fix crash in version settings introduced in `d75c3bbf96`	2019-02-04 17:06:20 +08:00
Feng Chang	f20c11a4e2	Ensure sequential execution of configuration writer threads (#516 ) * Ensure sequential execution of configuration writer threads Signed-off-by: Chang Feng <chang_196700@hotmail.com> * Change method to add synchronized to action Signed-off-by: Chang Feng <chang_196700@hotmail.com>	2019-02-04 02:18:24 +08:00
yushijinhun	0c25f31493	fix npe	2019-01-26 22:50:51 +08:00
yushijinhun	8d774e267f	Show register link in login dialog https://github.com/yushijinhun/authlib-injector/issues/25	2019-01-26 15:19:17 +08:00
yushijinhun	6c1de5d485	Improve tooltip UX	2019-01-26 13:33:59 +08:00
yushijinhun	77c86ed3bc	Add tooltip for authlib-injector accounts	2019-01-26 13:17:45 +08:00
yushijinhun	d75c3bbf96	Refactor TwoLineListItem	2019-01-26 13:06:56 +08:00
huanghongxun	8bb6cb714c	use result of prev task instead of AutoTypingMap	2019-01-22 17:15:03 +08:00
huanghongxun	28d002f6d3	Do not schedule task if preExecute and postExecute are not overrided.	2019-01-22 16:46:11 +08:00
huanghongxun	78fcc69d29	Fixed not displaying "Home" icon. Mentioned in #513	2019-01-22 16:28:41 +08:00
huanghongxun	cdfae54ab9	Fixed costly time consumption reading level.dat. Mentioned in #512	2019-01-22 16:11:31 +08:00
huanghongxun	0813211c20	Use JFXListView in place of custom components to accelerate rendering	2019-01-22 16:01:00 +08:00
huanghongxun	056a4eead2	Add comments to LiteLoaderInstallTask and OptiFineInstallTask	2019-01-22 15:54:59 +08:00
huanghongxun	2635d31425	Fix not correctly adding "--tweakClass" for MultiMC modpack	2019-01-22 15:52:57 +08:00
huanghongxun	76d35af5b9	MultiMC modpack patch json file may have "+libraries" or "libraries"	2019-01-22 15:51:52 +08:00
huanghongxun	bcff1695d3	Refactor MaintainTask	2019-01-22 15:50:49 +08:00
huanghongxun	3d04447c2f	Load world asynchronously	2019-01-22 14:59:01 +08:00
huanghongxun	2736b88a10	Add some promise-like method to TaskResult	2019-01-22 14:58:00 +08:00
huanghongxun	0804a2fbf8	Merge TaskCallable and TaskCallable2	2019-01-22 14:56:48 +08:00
huanghongxun	7224ed6a7d	Fix missorting optifine versions	2019-01-16 12:34:13 +08:00
huanghongxun	c41737364c	Prevent from potential conflict that a MultiMC modpack has ".minecraft" and "minecraft" at the same time	2019-01-13 17:10:23 +08:00
huanghongxun	320e579844	Remove game deletion and renaming action in game settings page	2019-01-13 16:55:07 +08:00
huanghongxun	fc3f2e045b	Retry fetching remote text file when downloading had been terminated	2019-01-13 16:50:54 +08:00
huanghongxun	481b47bf10	Fix #508 . MultiMC stores files in ".minecraft" instead	2019-01-13 16:50:21 +08:00
huanghongxun	0fb87f0b1d	Accept modpack drag	2019-01-13 11:55:55 +08:00
huanghongxun	1252d7700f	Update alert prompt of Forge 2760	2019-01-11 21:23:26 +08:00
huanghongxun	30c2d88f62	Use spinnerPane in ModListPage	2019-01-11 21:18:26 +08:00
huanghongxun	718a98d7ec	Fix alerting Forge conflicts with LiteLoader but actually not	2019-01-11 21:17:02 +08:00
huanghongxun	fb3ba220b6	Fix redownloading disabled mods for curse modpack	2019-01-09 13:18:04 +08:00
yushijinhun	d655c9ec6b	Use /* instead of /** for license header see: https://github.com/mycila/license-maven-plugin/issues/118	2019-01-05 19:04:24 +08:00
yushijinhun	8a67f33cf6	Update license year to 2019	2019-01-05 18:50:16 +08:00
yushijinhun	2e53688c52	Add gradle default tasks: clean, build	2019-01-05 18:49:28 +08:00
yushijinhun	11ce04fba4	Add dependency org.jetbrains.annotations	2019-01-05 18:49:02 +08:00
yushijinhun	8b191e4a3b	Fix grey auth server list cell	2018-12-31 19:43:36 +08:00
huanghongxun	6405263616	Merge branch 'javafx' of https://github.com/huanghongxun/HMCL into javafx	2018-12-30 19:29:27 +08:00
huanghongxun	a2119ab008	Remove "MCBBS" in introduction to the functinoality of modpack install	2018-12-30 19:28:53 +08:00
Haowei Wen	b21d8f094a	Merge pull request #504 from xfl03/xfl03-jfxpatch-1 Fixed #503	2018-12-23 02:53:10 +08:00
Alexander Xia	90c41a83b1	Fixed #503	2018-12-23 02:49:18 +08:00
huanghongxun	a1ec774089	Remind user to move files when switch game working directory	2018-12-22 00:56:05 +08:00
huanghongxun	631056064a	Add tooltip about what would be cleaned in game directory	2018-12-22 00:25:19 +08:00