Ensure sequential execution of configuration writer threads (#516)

* Ensure sequential execution of configuration writer threads

Signed-off-by: Chang Feng <[email protected]>

* Change method to add synchronized to action

Signed-off-by: Chang Feng <[email protected]>

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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) {

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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,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);
     }

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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
@@ -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;
     }
 

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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
@@ -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) {

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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
@@ -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();
                     }
                 }
             }

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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.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;
@@ -28,17 +28,14 @@ import javafx.scene.control.SkinBase;
 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();
 
         StackPane contentPane = new StackPane();
         {
@@ -56,7 +53,7 @@ public class ListPageSkin extends SkinBase<ListPage> {
                 scrollPane.setContent(list);
                 JFXScrollPane.smoothScrolling(scrollPane);
             }
-
+            
             VBox vBox = new VBox();
             {
                 vBox.setAlignment(Pos.BOTTOM_RIGHT);
@@ -92,13 +89,9 @@ public class ListPageSkin extends SkinBase<ListPage> {
             contentPane.getChildren().setAll(scrollPane, vBox);
         }
 
-        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);
     }
 }

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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);

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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());
 

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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
@@ -359,7 +359,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);

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountAdvancedListItem.java

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountList.java

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItem.java

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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,18 +21,26 @@ import com.jfoenix.concurrency.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;");
         JFXDepthManager.setDepth(root, 1);
-        item.titleProperty().bind(skinnable.titleProperty());
-        item.subtitleProperty().bind(skinnable.subtitleProperty());
 
         getChildren().setAll(root);
     }

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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
@@ -59,25 +59,19 @@ 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 -> {
+                    if (e instanceof NoSelectedCharacterException) {
+                        fireEvent(new DialogCloseEvent());
+                    } else {
+                        lblCreationWarning.setText(AddAccountPane.accountException(e));
+                    }
+                    progressBar.setVisible(false);
+                }).start();
     }
 
     @FXML

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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,8 +19,12 @@ package org.jackhuang.hmcl.ui.account;
 
 import com.jfoenix.concurrency.JFXUtilities;
 import com.jfoenix.controls.*;
+
 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;
@@ -44,11 +48,16 @@ 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 +72,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");
@@ -117,6 +127,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 +198,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);

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

@@ -1,6 +1,6 @@
-/**
+/*
  * Hello Minecraft! Launcher
- * Copyright (C) 2018  huangyuhui <[email protected]> and contributors
+ * Copyright (C) 2019  huangyuhui <[email protected]> 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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,14 +17,17 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
+import com.jfoenix.controls.JFXListView;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyIntegerProperty;
 import javafx.beans.property.ReadOnlyIntegerWrapper;
+import javafx.geometry.Insets;
 import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
 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;
@@ -42,15 +45,16 @@ import java.util.Map;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 public final class TaskListPane extends StackPane {
-    private final AdvancedListBox listBox = new AdvancedListBox();
+    private final JFXListView<Task> listBox = new JFXListView<>();
     private final Map<Task, ProgressListNode> nodes = new HashMap<>();
     private final ReadOnlyIntegerWrapper finishedTasks = new ReadOnlyIntegerWrapper();
     private final ReadOnlyIntegerWrapper totTasks = new ReadOnlyIntegerWrapper();
 
     public TaskListPane() {
-        listBox.setSpacing(0);
-
         getChildren().setAll(listBox);
+
+        listBox.setPadding(Insets.EMPTY);
+        listBox.setCellFactory(listView -> new ProgressListNode());
     }
 
     public ReadOnlyIntegerProperty finishedTasksProperty() {
@@ -66,7 +70,7 @@ public final class TaskListPane extends StackPane {
             @Override
             public void onStart() {
                 Platform.runLater(() -> {
-                    listBox.clear();
+                    listBox.getItems().clear();
                     finishedTasks.set(0);
                     totTasks.set(0);
                 });
@@ -108,66 +112,66 @@ public final class TaskListPane extends StackPane {
                     task.setName(i18n("modpack.scan"));
                 }
 
-                ProgressListNode node = new ProgressListNode(task);
-                nodes.put(task, node);
-                Platform.runLater(() -> listBox.add(node));
-
+                Platform.runLater(() -> listBox.getItems().add(task));
             }
 
             @Override
             public void onFinished(Task task) {
-                ProgressListNode node = nodes.remove(task);
-                if (node == null)
-                    return;
-                node.unbind();
                 Platform.runLater(() -> {
-                    listBox.remove(node);
-                    finishedTasks.set(finishedTasks.getValue() + 1);
-                });
-            }
-
-            @Override
-            public void onFailed(Task task, Throwable throwable) {
-                ProgressListNode node = nodes.remove(task);
-                if (node == null)
-                    return;
-                Platform.runLater(() -> {
-                    node.setThrowable(throwable);
-                    finishedTasks.set(finishedTasks.getValue() + 1);
+                    if (listBox.getItems().remove(task))
+                        finishedTasks.set(finishedTasks.getValue() + 1);
                 });
             }
         });
     }
 
-    private static class ProgressListNode extends VBox {
+    private static class ProgressListNode extends ListCell<Task> {
+        private final BorderPane borderPane = new BorderPane();
         private final JFXProgressBar bar = new JFXProgressBar();
         private final Label title = new Label();
         private final Label state = new Label();
 
-        public ProgressListNode(Task task) {
-            bar.progressProperty().bind(task.progressProperty());
-            title.setText(task.getName());
-            state.textProperty().bind(task.messageProperty());
-
-            BorderPane borderPane = new BorderPane();
+        {
             borderPane.setLeft(title);
             borderPane.setRight(state);
-            getChildren().addAll(borderPane, bar);
+            borderPane.setBottom(bar);
+            borderPane.setMinWidth(0);
+            borderPane.setPrefWidth(1);
+
+            setPadding(Insets.EMPTY);
 
             bar.minWidthProperty().bind(widthProperty());
             bar.prefWidthProperty().bind(widthProperty());
             bar.maxWidthProperty().bind(widthProperty());
         }
 
-        public void unbind() {
-            bar.progressProperty().unbind();
-            state.textProperty().unbind();
-        }
+        @Override
+        protected void updateItem(Task item, boolean empty) {
+            boolean wasEmpty = isEmpty();
+            Task oldTask = getItem();
 
-        public void setThrowable(Throwable throwable) {
-            unbind();
-            state.setText(throwable.getLocalizedMessage());
-            bar.setProgress(0);
+            if (!wasEmpty && oldTask != null) {
+                bar.progressProperty().unbind();
+                state.textProperty().unbind();
+            }
+
+            super.updateItem(item, empty);
+
+            if (empty || item == null) {
+                setGraphic(null);
+            } else {
+                setGraphic(borderPane);
+                bar.visibleProperty().bind(Bindings.createBooleanBinding(() -> item.progressProperty().get() != -1, item.progressProperty()));
+                bar.progressProperty().bind(item.progressProperty());
+                state.textProperty().bind(Bindings.createObjectBinding(() -> {
+                    if (item.getState() == Task.TaskState.FAILED) {
+                        return item.getLastException().getLocalizedMessage();
+                    } else {
+                        return item.messageProperty().get();
+                    }
+                }, item.messageProperty(), item.stateProperty()));
+                title.setText(item.getName());
+            }
         }
     }
 }

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

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

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

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

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

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

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java

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

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorPage.java

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

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java

@@ -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;
@@ -73,8 +74,12 @@ public class DecoratorSkin extends SkinBase<Decorator> {
 
         BorderPane root = new BorderPane();
         root.getStyleClass().setAll("jfx-decorator", "resize-border");
-        root.setMaxHeight(519);
-        root.setMaxWidth(800);
+        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);
@@ -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

HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorWizardDisplayer.java

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

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

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

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

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

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

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