From 759921d00e780c60c2e2b628b69a33ddb28b8cd6 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 15:38:35 +0800
Subject: [PATCH 1/9] Fix missing license headers

---
 .../hmcl/ui/AuthlibInjectorServersPage.java     | 17 +++++++++++++++++
 .../org/jackhuang/hmcl/ui/TwoLineListItem.java  | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
index 7b676d198..49fd0961a 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.*;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java
index b4380785e..2cbcc6a79 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/TwoLineListItem.java
@@ -1,3 +1,20 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
 package org.jackhuang.hmcl.ui;
 
 import javafx.beans.property.SimpleStringProperty;

From 785790ccc445437be25ec768ab38a341590e40f3 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 15:43:32 +0800
Subject: [PATCH 2/9] Move promptText of cboServers to FXML

---
 HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java | 1 -
 HMCL/src/main/resources/assets/fxml/account-add.fxml         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
index 138acab4f..c266fd266 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
@@ -82,7 +82,6 @@ public class AddAccountPane extends StackPane {
         cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl())));
         cboServers.setConverter(stringConverter(AuthlibInjectorServer::getName));
         cboServers.setItems(Settings.SETTINGS.authlibInjectorServers);
-        cboServers.setPromptText(i18n("general.prompt.empty"));
 
         // workaround: otherwise the combox will be black
         if (!cboServers.getItems().isEmpty())
diff --git a/HMCL/src/main/resources/assets/fxml/account-add.fxml b/HMCL/src/main/resources/assets/fxml/account-add.fxml
index cabe52503..2567bd210 100644
--- a/HMCL/src/main/resources/assets/fxml/account-add.fxml
+++ b/HMCL/src/main/resources/assets/fxml/account-add.fxml
@@ -29,7 +29,7 @@
                 <Label fx:id="lblInjectorServer" text="%account.injector.server" GridPane.halignment="RIGHT"
                        GridPane.columnIndex="0" GridPane.rowIndex="1"/>
 
-                <JFXComboBox fx:id="cboServers" maxHeight="25" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                <JFXComboBox fx:id="cboServers" promptText="%general.prompt.empty" maxHeight="25" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
 
                 <Hyperlink fx:id="linkManageInjectorServers" text="%account.injector.manage"
                            onMouseClicked="#onManageInjecterServers" GridPane.columnIndex="2" GridPane.rowIndex="1"/>

From 87904109ca7e2557ebe8c28c55dc9d6baeca924b Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 17:26:20 +0800
Subject: [PATCH 3/9] [TransitionHandler]Set mouseTransparent of the whole view
 , fix bug introduced in 3fb5048f103ed958bdd87207f6b6c929b5ef7eca

---
 .../org/jackhuang/hmcl/ui/animation/TransitionHandler.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java
index cec4a9d47..b350bb9a2 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java
@@ -86,7 +86,7 @@ public final class TransitionHandler implements AnimationHandler {
             Timeline nowAnimation = new Timeline();
             nowAnimation.getKeyFrames().addAll(transition.animate(this));
             nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
-                previousNode.setMouseTransparent((Boolean) previousNode.getProperties().get(MOUSE_TRANSPARENT));
+                view.setMouseTransparent(false);
                 view.getChildren().remove(previousNode);
             }));
             nowAnimation.play();
@@ -105,14 +105,12 @@ public final class TransitionHandler implements AnimationHandler {
         if (previousNode == newView)
             previousNode = NULL;
 
-        previousNode.getProperties().put(MOUSE_TRANSPARENT, previousNode.isMouseTransparent());
-        previousNode.setMouseTransparent(true);
+        view.setMouseTransparent(true);
 
         currentNode = newView;
 
         view.getChildren().setAll(previousNode, currentNode);
     }
 
-    private static final String MOUSE_TRANSPARENT = "TransitionHandler.MOUSE_TRANSPARENT";
     private static final StackPane NULL = new StackPane();
 }

From f2596013977a3b68b5d5db92e3cf46f5e17d1085 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 17:30:43 +0800
Subject: [PATCH 4/9] Each TransitionHandler instance uses its own empty pane

Using shared empty pane may cause some probleams
---
 .../jackhuang/hmcl/ui/animation/TransitionHandler.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java
index b350bb9a2..8959c05e3 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/animation/TransitionHandler.java
@@ -98,12 +98,12 @@ public final class TransitionHandler implements AnimationHandler {
         if (view.getWidth() > 0 && view.getHeight() > 0) {
             previousNode = currentNode;
             if (previousNode == null)
-                previousNode = NULL;
+                previousNode = EMPTY_PANE;
         } else
-            previousNode = NULL;
+            previousNode = EMPTY_PANE;
 
         if (previousNode == newView)
-            previousNode = NULL;
+            previousNode = EMPTY_PANE;
 
         view.setMouseTransparent(true);
 
@@ -112,5 +112,5 @@ public final class TransitionHandler implements AnimationHandler {
         view.getChildren().setAll(previousNode, currentNode);
     }
 
-    private static final StackPane NULL = new StackPane();
+    private final StackPane EMPTY_PANE = new StackPane();
 }

From d0b994fa9ddb16fb60443913a3e299d42c8d74fb Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 17:46:22 +0800
Subject: [PATCH 5/9] Move add authentication server dialog to a new file

---
 .../ui/AddAuthlibInjectorServerDialog.java    | 131 ++++++++++++++++
 .../hmcl/ui/AuthlibInjectorServersPage.java   | 141 +++---------------
 .../fxml/authlib-injector-server-add.fxml     |  66 ++++++++
 .../assets/fxml/authlib-injector-servers.fxml |  63 +-------
 4 files changed, 222 insertions(+), 179 deletions(-)
 create mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
 create mode 100644 HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
new file mode 100644
index 000000000..b037168b4
--- /dev/null
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
@@ -0,0 +1,131 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui;
+
+import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import java.io.IOException;
+
+import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
+import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
+import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.construct.SpinnerPane;
+import org.jackhuang.hmcl.util.NetworkUtils;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialog;
+import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXTextField;
+
+import javafx.beans.binding.Bindings;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.StackPane;
+
+public class AddAuthlibInjectorServerDialog extends JFXDialog {
+
+    @FXML private StackPane addServerContainer;
+    @FXML private Label lblServerUrl;
+    @FXML private Label lblServerName;
+    @FXML private Label lblCreationWarning;
+    @FXML private Label lblServerWarning;
+    @FXML private JFXTextField txtServerUrl;
+    @FXML private JFXDialogLayout addServerPane;
+    @FXML private JFXDialogLayout confirmServerPane;
+    @FXML private SpinnerPane nextPane;
+    @FXML private JFXButton btnAddNext;
+
+    private TransitionHandler transitionHandler;
+
+    private AuthlibInjectorServer serverBeingAdded;
+
+    public AddAuthlibInjectorServerDialog() {
+        loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
+        transitionHandler = new TransitionHandler(addServerContainer);
+        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
+
+        btnAddNext.disableProperty().bind(
+                Bindings.createBooleanBinding(txtServerUrl::validate, txtServerUrl.textProperty()).not());
+        nextPane.hideSpinner();
+    }
+
+    private String fixInputUrl(String url) {
+        if (!url.endsWith("/")) {
+            url += "/";
+        }
+        return url;
+    }
+
+    private String resolveFetchExceptionMessage(Throwable exception) {
+        if (exception instanceof IOException) {
+            return i18n("account.failed.connect_injector_server");
+        } else {
+            return exception.getClass() + ": " + exception.getLocalizedMessage();
+        }
+    }
+
+    @FXML
+    private void onAddCancel() {
+        this.close();
+    }
+
+    @FXML
+    private void onAddNext() {
+        String url = fixInputUrl(txtServerUrl.getText());
+
+        nextPane.showSpinner();
+        addServerPane.setDisable(true);
+
+        Task.of(() -> {
+            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
+        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
+            addServerPane.setDisable(false);
+            nextPane.hideSpinner();
+
+            if (isDependentsSucceeded) {
+                lblServerName.setText(serverBeingAdded.getName());
+                lblServerUrl.setText(serverBeingAdded.getUrl());
+
+                lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
+
+                transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
+            } else {
+                lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
+            }
+        }).start();
+
+    }
+
+    @FXML
+    private void onAddPrev() {
+        transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
+    }
+
+    @FXML
+    private void onAddFinish() {
+        if (!Settings.INSTANCE.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
+            Settings.INSTANCE.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
+        }
+        this.close();
+    }
+
+}
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
index 49fd0961a..4bf95687a 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
@@ -17,137 +17,57 @@
  */
 package org.jackhuang.hmcl.ui;
 
-import com.jfoenix.controls.*;
+import static java.util.stream.Collectors.toList;
+import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
+import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+
+import org.jackhuang.hmcl.setting.Settings;
+import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 
-import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
-import org.jackhuang.hmcl.setting.Settings;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
-import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
-import org.jackhuang.hmcl.ui.animation.TransitionHandler;
-import org.jackhuang.hmcl.ui.construct.SpinnerPane;
-import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
-import org.jackhuang.hmcl.util.NetworkUtils;
-import static java.util.stream.Collectors.toList;
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
-import java.io.IOException;
-
 public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
     private final StringProperty title = new SimpleStringProperty(this, "title", i18n("account.injector.server"));
 
     @FXML private ScrollPane scrollPane;
-    @FXML private StackPane addServerContainer;
-    @FXML private Label lblServerUrl;
-    @FXML private Label lblServerName;
-    @FXML private Label lblCreationWarning;
-    @FXML private Label lblServerWarning;
     @FXML private VBox listPane;
-    @FXML private JFXTextField txtServerUrl;
-    @FXML private JFXDialogLayout addServerPane;
-    @FXML private JFXDialogLayout confirmServerPane;
-    @FXML private JFXDialog dialog;
     @FXML private StackPane contentPane;
-    @FXML private SpinnerPane nextPane;
-    @FXML private JFXButton btnAddNext;
 
-    private final TransitionHandler transitionHandler;
+    private InvalidationListener serversListener;
 
-    private AuthlibInjectorServer serverBeingAdded;
+    public AuthlibInjectorServersPage() {
+        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
+        smoothScrolling(scrollPane);
 
-    {
-        FXUtils.loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        FXUtils.smoothScrolling(scrollPane);
-        transitionHandler = new TransitionHandler(addServerContainer);
-
-        getChildren().remove(dialog);
-        dialog.setDialogContainer(this);
-
-        txtServerUrl.textProperty().addListener((a, b, newValue) ->
-                btnAddNext.setDisable(!txtServerUrl.validate()));
-
-        reload();
+        serversListener = observable -> updateServersList();
+        Settings.SETTINGS.authlibInjectorServers.addListener(new WeakInvalidationListener(serversListener));
+        updateServersList();
     }
 
-    private void removeServer(AuthlibInjectorServerItem item) {
-        Settings.SETTINGS.authlibInjectorServers.remove(item.getServer());
-        reload();
-    }
-
-    private void reload() {
+    private void updateServersList() {
         listPane.getChildren().setAll(
                 Settings.SETTINGS.authlibInjectorServers.stream()
-                        .map(server -> new AuthlibInjectorServerItem(server, this::removeServer))
+                        .map(server -> new AuthlibInjectorServerItem(server,
+                                item -> Settings.SETTINGS.authlibInjectorServers.remove(item.getServer())))
                         .collect(toList()));
-        if (Settings.SETTINGS.authlibInjectorServers.isEmpty()) {
-            onAdd();
-        }
     }
 
+
     @FXML
     private void onAdd() {
-        transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
-        txtServerUrl.setText("");
-        txtServerUrl.resetValidation();
-        lblCreationWarning.setText("");
-        addServerPane.setDisable(false);
-        nextPane.hideSpinner();
+        AddAuthlibInjectorServerDialog dialog = new AddAuthlibInjectorServerDialog();
+        dialog.setDialogContainer(this);
         dialog.show();
     }
 
-    @FXML
-    private void onAddCancel() {
-        dialog.close();
-    }
-
-    @FXML
-    private void onAddNext() {
-        String url = fixInputUrl(txtServerUrl.getText());
-
-        nextPane.showSpinner();
-        addServerPane.setDisable(true);
-
-        Task.of(() -> {
-            serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
-        }).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
-            nextPane.hideSpinner();
-            addServerPane.setDisable(false);
-
-            if (isDependentsSucceeded) {
-                lblServerName.setText(serverBeingAdded.getName());
-                lblServerUrl.setText(serverBeingAdded.getUrl());
-
-                lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
-
-                transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
-            } else {
-                lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
-            }
-        }).start();
-
-    }
-
-    @FXML
-    private void onAddPrev() {
-        transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
-    }
-
-    @FXML
-    private void onAddFinish() {
-        if (!Settings.INSTANCE.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
-            Settings.INSTANCE.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
-        }
-        reload();
-        dialog.close();
-    }
-
     public String getTitle() {
         return title.get();
     }
@@ -160,19 +80,4 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
     public void setTitle(String title) {
         this.title.set(title);
     }
-
-    private String fixInputUrl(String url) {
-        if (!url.endsWith("/")) {
-            url += "/";
-        }
-        return url;
-    }
-
-    private String resolveFetchExceptionMessage(Throwable exception) {
-        if (exception instanceof IOException) {
-            return i18n("account.failed.connect_injector_server");
-        } else {
-            return exception.getClass() + ": " + exception.getLocalizedMessage();
-        }
-    }
 }
diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml
new file mode 100644
index 000000000..97cac357d
--- /dev/null
+++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.String?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.*?>
+<?import org.jackhuang.hmcl.ui.construct.URLValidator?>
+<?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>
+
+<fx:root xmlns="http://javafx.com/javafx"
+         xmlns:fx="http://javafx.com/fxml"
+         type="JFXDialog">
+    <StackPane>
+        <StackPane fx:id="addServerContainer">
+            <JFXDialogLayout fx:id="addServerPane">
+                <heading>
+                    <Label text="%account.injector.add" />
+                </heading>
+                <body>
+                    <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url">
+                        <validators>
+                            <URLValidator message="%input.url">
+                                <protocols>
+                                    <String fx:value="http" />
+                                    <String fx:value="https" />
+                                </protocols>
+                            </URLValidator>
+                        </validators>
+                    </JFXTextField>
+                </body>
+                <actions>
+                    <Label fx:id="lblCreationWarning" />
+                    <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
+                    <SpinnerPane fx:id="nextPane" styleClass="small-spinner-pane">
+                        <JFXButton fx:id="btnAddNext"  onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
+                    </SpinnerPane>
+                </actions>
+            </JFXDialogLayout>
+
+            <JFXDialogLayout fx:id="confirmServerPane">
+                <heading>
+                    <Label text="%account.injector.add" />
+                </heading>
+                <body>
+                    <GridPane vgap="15" hgap="15" style="-fx-padding: 15 0 0 0;">
+                        <columnConstraints>
+                            <ColumnConstraints maxWidth="100" />
+                            <ColumnConstraints />
+                        </columnConstraints>
+                        <Label text="%account.injector.server_url" GridPane.columnIndex="0" GridPane.rowIndex="0" />
+                        <Label text="%account.injector.server_name" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+                        <Label fx:id="lblServerUrl" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                        <Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                        <Label fx:id="lblServerWarning" text="%account.injector.http" style="-fx-text-fill: red;"
+                            GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
+                    </GridPane>
+                </body>
+                <actions>
+                    <JFXButton onMouseClicked="#onAddPrev" text="%wizard.prev" styleClass="dialog-cancel" />
+                    <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
+                    <JFXButton onMouseClicked="#onAddFinish" text="%wizard.finish" styleClass="dialog-accept" />
+                </actions>
+            </JFXDialogLayout>
+        </StackPane>
+    </StackPane>
+</fx:root>
diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
index 5d055e20f..43fb262d1 100644
--- a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
+++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.jfoenix.controls.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import org.jackhuang.hmcl.ui.construct.URLValidator?>
-<?import java.lang.String?>
-<?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>
+<?import com.jfoenix.controls.*?>
+
 <fx:root xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          type="StackPane">
@@ -23,61 +21,4 @@
             </JFXButton>
         </VBox>
     </StackPane>
-
-    <JFXDialog fx:id="dialog">
-        <StackPane>
-            <StackPane fx:id="addServerContainer">
-                <JFXDialogLayout fx:id="addServerPane">
-                    <heading>
-                        <Label text="%account.injector.add" />
-                    </heading>
-                    <body>
-                        <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url">
-                            <validators>
-                                <URLValidator message="%input.url">
-                                    <protocols>
-                                        <String fx:value="http" />
-                                        <String fx:value="https" />
-                                    </protocols>
-                                </URLValidator>
-                            </validators>
-                        </JFXTextField>
-                    </body>
-                    <actions>
-                        <Label fx:id="lblCreationWarning" />
-                        <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
-                        <SpinnerPane fx:id="nextPane" styleClass="small-spinner-pane">
-                            <JFXButton fx:id="btnAddNext" onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
-                        </SpinnerPane>
-                    </actions>
-                </JFXDialogLayout>
-
-                <JFXDialogLayout fx:id="confirmServerPane">
-                    <heading>
-                        <Label text="%account.injector.add" />
-                    </heading>
-                    <body>
-                        <GridPane vgap="15" hgap="15" style="-fx-padding: 15 0 0 0;">
-                            <columnConstraints>
-                                <ColumnConstraints maxWidth="100" />
-                                <ColumnConstraints />
-                            </columnConstraints>
-                            <Label text="%account.injector.server_url" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-                            <Label text="%account.injector.server_name" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-
-                            <Label fx:id="lblServerUrl" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-                            <Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-
-                            <Label fx:id="lblServerWarning" text="%account.injector.http" style="-fx-text-fill: red;" GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
-                        </GridPane>
-                    </body>
-                    <actions>
-                        <JFXButton onMouseClicked="#onAddPrev" text="%wizard.prev" styleClass="dialog-cancel" />
-                        <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
-                        <JFXButton onMouseClicked="#onAddFinish" text="%wizard.finish" styleClass="dialog-accept" />
-                    </actions>
-                </JFXDialogLayout>
-            </StackPane>
-        </StackPane>
-    </JFXDialog>
 </fx:root>

From 25261c99f19e92b10b1a517b8317317ba868b3e9 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 17:50:49 +0800
Subject: [PATCH 6/9] Remove 'class ' prefix in error messages

---
 HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java    | 2 +-
 .../org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
index c266fd266..fda658b90 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
@@ -269,7 +269,7 @@ public class AddAccountPane extends StackPane {
             }
             return exception.getMessage();
         } else {
-            return exception.getClass() + ": " + exception.getLocalizedMessage();
+            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
         }
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
index b037168b4..2b0ade607 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
@@ -79,7 +79,7 @@ public class AddAuthlibInjectorServerDialog extends JFXDialog {
         if (exception instanceof IOException) {
             return i18n("account.failed.connect_injector_server");
         } else {
-            return exception.getClass() + ": " + exception.getLocalizedMessage();
+            return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
         }
     }
 

From 76a04343d91c21787eba0c409202c0bfa444e6d1 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 18:03:21 +0800
Subject: [PATCH 7/9] Use Controllers.dialog for AddAuthlibInjectorServerDialog

---
 ...java => AddAuthlibInjectorServerPane.java} |  18 ++--
 .../hmcl/ui/AuthlibInjectorServersPage.java   |   4 +-
 .../fxml/authlib-injector-server-add.fxml     | 102 +++++++++---------
 3 files changed, 62 insertions(+), 62 deletions(-)
 rename HMCL/src/main/java/org/jackhuang/hmcl/ui/{AddAuthlibInjectorServerDialog.java => AddAuthlibInjectorServerPane.java} (89%)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java
similarity index 89%
rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java
index 2b0ade607..7d0f7fe50 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerDialog.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java
@@ -21,6 +21,7 @@ import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.IOException;
+import java.util.function.Consumer;
 
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Settings;
@@ -32,16 +33,16 @@ import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.NetworkUtils;
 
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDialogLayout;
 import com.jfoenix.controls.JFXTextField;
 
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 
-public class AddAuthlibInjectorServerDialog extends JFXDialog {
+public class AddAuthlibInjectorServerPane extends StackPane {
 
     @FXML private StackPane addServerContainer;
     @FXML private Label lblServerUrl;
@@ -54,11 +55,14 @@ public class AddAuthlibInjectorServerDialog extends JFXDialog {
     @FXML private SpinnerPane nextPane;
     @FXML private JFXButton btnAddNext;
 
+    private Consumer<Region> finalization;
+
     private TransitionHandler transitionHandler;
 
     private AuthlibInjectorServer serverBeingAdded;
 
-    public AddAuthlibInjectorServerDialog() {
+    public AddAuthlibInjectorServerPane(Consumer<Region> finalization) {
+        this.finalization = finalization;
         loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
         transitionHandler = new TransitionHandler(addServerContainer);
         transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
@@ -85,7 +89,7 @@ public class AddAuthlibInjectorServerDialog extends JFXDialog {
 
     @FXML
     private void onAddCancel() {
-        this.close();
+        finalization.accept(this);
     }
 
     @FXML
@@ -122,10 +126,10 @@ public class AddAuthlibInjectorServerDialog extends JFXDialog {
 
     @FXML
     private void onAddFinish() {
-        if (!Settings.INSTANCE.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
-            Settings.INSTANCE.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
+        if (!Settings.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
+            Settings.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
         }
-        this.close();
+        finalization.accept(this);
     }
 
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
index 4bf95687a..ab1825ff6 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
@@ -63,9 +63,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
 
     @FXML
     private void onAdd() {
-        AddAuthlibInjectorServerDialog dialog = new AddAuthlibInjectorServerDialog();
-        dialog.setDialogContainer(this);
-        dialog.show();
+        Controllers.dialog(new AddAuthlibInjectorServerPane(Controllers::closeDialog));
     }
 
     public String getTitle() {
diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml
index 97cac357d..788bbd55b 100644
--- a/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml
+++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-server-add.fxml
@@ -9,58 +9,56 @@
 
 <fx:root xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
-         type="JFXDialog">
-    <StackPane>
-        <StackPane fx:id="addServerContainer">
-            <JFXDialogLayout fx:id="addServerPane">
-                <heading>
-                    <Label text="%account.injector.add" />
-                </heading>
-                <body>
-                    <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url">
-                        <validators>
-                            <URLValidator message="%input.url">
-                                <protocols>
-                                    <String fx:value="http" />
-                                    <String fx:value="https" />
-                                </protocols>
-                            </URLValidator>
-                        </validators>
-                    </JFXTextField>
-                </body>
-                <actions>
-                    <Label fx:id="lblCreationWarning" />
-                    <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
-                    <SpinnerPane fx:id="nextPane" styleClass="small-spinner-pane">
-                        <JFXButton fx:id="btnAddNext"  onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
-                    </SpinnerPane>
-                </actions>
-            </JFXDialogLayout>
+         type="StackPane">
+    <StackPane fx:id="addServerContainer">
+        <JFXDialogLayout fx:id="addServerPane">
+            <heading>
+                <Label text="%account.injector.add" />
+            </heading>
+            <body>
+                <JFXTextField fx:id="txtServerUrl" promptText="%account.injector.server_url">
+                    <validators>
+                        <URLValidator message="%input.url">
+                            <protocols>
+                                <String fx:value="http" />
+                                <String fx:value="https" />
+                            </protocols>
+                        </URLValidator>
+                    </validators>
+                </JFXTextField>
+            </body>
+            <actions>
+                <Label fx:id="lblCreationWarning" />
+                <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
+                <SpinnerPane fx:id="nextPane" styleClass="small-spinner-pane">
+                    <JFXButton fx:id="btnAddNext"  onMouseClicked="#onAddNext" text="%wizard.next" styleClass="dialog-accept" />
+                </SpinnerPane>
+            </actions>
+        </JFXDialogLayout>
 
-            <JFXDialogLayout fx:id="confirmServerPane">
-                <heading>
-                    <Label text="%account.injector.add" />
-                </heading>
-                <body>
-                    <GridPane vgap="15" hgap="15" style="-fx-padding: 15 0 0 0;">
-                        <columnConstraints>
-                            <ColumnConstraints maxWidth="100" />
-                            <ColumnConstraints />
-                        </columnConstraints>
-                        <Label text="%account.injector.server_url" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-                        <Label text="%account.injector.server_name" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-                        <Label fx:id="lblServerUrl" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-                        <Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                        <Label fx:id="lblServerWarning" text="%account.injector.http" style="-fx-text-fill: red;"
-                            GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
-                    </GridPane>
-                </body>
-                <actions>
-                    <JFXButton onMouseClicked="#onAddPrev" text="%wizard.prev" styleClass="dialog-cancel" />
-                    <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
-                    <JFXButton onMouseClicked="#onAddFinish" text="%wizard.finish" styleClass="dialog-accept" />
-                </actions>
-            </JFXDialogLayout>
-        </StackPane>
+        <JFXDialogLayout fx:id="confirmServerPane">
+            <heading>
+                <Label text="%account.injector.add" />
+            </heading>
+            <body>
+                <GridPane vgap="15" hgap="15" style="-fx-padding: 15 0 0 0;">
+                    <columnConstraints>
+                        <ColumnConstraints maxWidth="100" />
+                        <ColumnConstraints />
+                    </columnConstraints>
+                    <Label text="%account.injector.server_url" GridPane.columnIndex="0" GridPane.rowIndex="0" />
+                    <Label text="%account.injector.server_name" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+                    <Label fx:id="lblServerUrl" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                    <Label fx:id="lblServerName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                    <Label fx:id="lblServerWarning" text="%account.injector.http" style="-fx-text-fill: red;"
+                        GridPane.rowIndex="2" GridPane.columnSpan="2" GridPane.columnIndex="0" />
+                </GridPane>
+            </body>
+            <actions>
+                <JFXButton onMouseClicked="#onAddPrev" text="%wizard.prev" styleClass="dialog-cancel" />
+                <JFXButton onMouseClicked="#onAddCancel" text="%button.cancel" styleClass="dialog-cancel" />
+                <JFXButton onMouseClicked="#onAddFinish" text="%wizard.finish" styleClass="dialog-accept" />
+            </actions>
+        </JFXDialogLayout>
     </StackPane>
 </fx:root>

From c1596f6a11999c1aaae32692cbe91356507b823c Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 19:33:47 +0800
Subject: [PATCH 8/9] Replace Controllers.closeDialog with DialogCloseEvent

---
 .../jackhuang/hmcl/game/LauncherHelper.java   | 12 ++---
 .../jackhuang/hmcl/ui/AccountLoginPane.java   | 12 +++--
 .../org/jackhuang/hmcl/ui/AddAccountPane.java | 16 +++----
 .../hmcl/ui/AddAuthlibInjectorServerPane.java | 13 ++----
 .../hmcl/ui/AuthlibInjectorServersPage.java   |  2 +-
 .../org/jackhuang/hmcl/ui/Controllers.java    | 10 +++--
 .../java/org/jackhuang/hmcl/ui/Decorator.java | 21 ++++++---
 .../jackhuang/hmcl/ui/DialogController.java   |  2 +-
 .../jackhuang/hmcl/ui/LeftPaneController.java |  5 ++-
 .../java/org/jackhuang/hmcl/ui/MainPage.java  |  9 ++--
 .../hmcl/ui/construct/DialogCloseEvent.java   | 45 +++++++++++++++++++
 .../hmcl/ui/construct/InputDialogPane.java    |  7 ++-
 .../hmcl/ui/construct/MessageDialogPane.java  | 17 +++----
 .../TaskExecutorDialogWizardDisplayer.java    |  4 +-
 .../hmcl/upgrade/AppDataUpgrader.java         |  5 ++-
 .../hmcl/upgrade/NewFileUpgrader.java         |  3 +-
 16 files changed, 115 insertions(+), 68 deletions(-)
 create mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
index 8a066debb..c6efa3008 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
@@ -37,6 +37,7 @@ import org.jackhuang.hmcl.task.*;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.DialogController;
 import org.jackhuang.hmcl.ui.LogWindow;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
 import org.jackhuang.hmcl.util.*;
@@ -148,11 +149,11 @@ public final class LauncherHelper {
                         else
                             launchingStepsPane.setCancel(it -> {
                                 process.stop();
-                                Controllers.closeDialog(it);
+                                it.fireEvent(new DialogCloseEvent());
                             });
                     } else
                         Platform.runLater(() -> {
-                            Controllers.closeDialog(launchingStepsPane);
+                            launchingStepsPane.fireEvent(new DialogCloseEvent());
                             Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
                         });
 
@@ -177,7 +178,7 @@ public final class LauncherHelper {
                         // Check if the application has stopped
                         // because onStop will be invoked if tasks fail when the executor service shut down.
                         if (!Controllers.isStopped()) {
-                            Controllers.closeDialog(launchingStepsPane);
+                            launchingStepsPane.fireEvent(new DialogCloseEvent());
                             Exception ex = executor.getLastException();
                             if (ex != null) {
                                 String message;
@@ -267,8 +268,9 @@ public final class LauncherHelper {
     }
 
     public void emitStatus(LoadingState state) {
-        if (state == LoadingState.DONE)
-            Controllers.closeDialog(launchingStepsPane);
+        if (state == LoadingState.DONE) {
+            launchingStepsPane.fireEvent(new DialogCloseEvent());
+        }
 
         launchingStepsPane.setTitle(state.getLocalizedMessage());
         launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java
index f7f6195a7..89bd4c6bd 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AccountLoginPane.java
@@ -21,13 +21,13 @@ import com.jfoenix.controls.JFXPasswordField;
 import com.jfoenix.controls.JFXProgressBar;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.auth.Account;
 import org.jackhuang.hmcl.auth.AuthInfo;
 import org.jackhuang.hmcl.auth.NoSelectedCharacterException;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 
 import java.util.function.Consumer;
 
@@ -35,7 +35,6 @@ public class AccountLoginPane extends StackPane {
     private final Account oldAccount;
     private final Consumer<AuthInfo> success;
     private final Runnable failed;
-    private final Consumer<Region> closeConsumer;
 
     @FXML
     private Label lblUsername;
@@ -43,11 +42,10 @@ public class AccountLoginPane extends StackPane {
     @FXML private Label lblCreationWarning;
     @FXML private JFXProgressBar progressBar;
 
-    public AccountLoginPane(Account oldAccount, Consumer<Region> closeConsumer, Consumer<AuthInfo> success, Runnable failed) {
+    public AccountLoginPane(Account oldAccount, Consumer<AuthInfo> success, Runnable failed) {
         this.oldAccount = oldAccount;
         this.success = success;
         this.failed = failed;
-        this.closeConsumer = closeConsumer;
 
         FXUtils.loadFXML(this, "/assets/fxml/account-login.fxml");
 
@@ -70,9 +68,9 @@ public class AccountLoginPane extends StackPane {
             Object account = variable.get("login");
             if (account instanceof AuthInfo) {
                 success.accept(((AuthInfo) account));
-                closeConsumer.accept(this);
+                fireEvent(new DialogCloseEvent());
             } else if (account instanceof NoSelectedCharacterException) {
-                closeConsumer.accept(this);
+                fireEvent(new DialogCloseEvent());
             } else if (account instanceof Exception) {
                 lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
             }
@@ -84,6 +82,6 @@ public class AccountLoginPane extends StackPane {
     @FXML
     private void onCancel() {
         failed.run();
-        closeConsumer.accept(this);
+        fireEvent(new DialogCloseEvent());
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
index fda658b90..6724eb5bf 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAccountPane.java
@@ -28,7 +28,6 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 
 import org.jackhuang.hmcl.auth.*;
@@ -44,6 +43,7 @@ import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.IconedItem;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.ui.construct.Validator;
@@ -56,7 +56,6 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
-import java.util.function.Consumer;
 import java.util.logging.Level;
 
 public class AddAccountPane extends StackPane {
@@ -72,11 +71,8 @@ public class AddAccountPane extends StackPane {
     @FXML private JFXDialogLayout layout;
     @FXML private JFXButton btnAccept;
     @FXML private SpinnerPane acceptPane;
-    private final Consumer<Region> finalization;
-
-    public AddAccountPane(Consumer<Region> finalization) {
-        this.finalization = finalization;
 
+    public AddAccountPane() {
         FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
 
         cboServers.setCellFactory(jfxListCellFactory(server -> new TwoLineListItem(server.getName(), server.getUrl())));
@@ -148,10 +144,10 @@ public class AddAccountPane extends StackPane {
                 .finalized(Schedulers.javafx(), variables -> {
                     Settings.INSTANCE.addAccount(variables.get("create_account"));
                     acceptPane.hideSpinner();
-                    finalization.accept(this);
+                    fireEvent(new DialogCloseEvent());
                 }, exception -> {
                     if (exception instanceof NoSelectedCharacterException) {
-                        finalization.accept(this);
+                        fireEvent(new DialogCloseEvent());
                     } else {
                         lblCreationWarning.setText(accountException(exception));
                     }
@@ -161,12 +157,12 @@ public class AddAccountPane extends StackPane {
 
     @FXML
     private void onCreationCancel() {
-        finalization.accept(this);
+        fireEvent(new DialogCloseEvent());
     }
 
     @FXML
     private void onManageInjecterServers() {
-        finalization.accept(this);
+        fireEvent(new DialogCloseEvent());
         Controllers.navigate(Controllers.getServersPage());
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java
index 7d0f7fe50..83a711ae0 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AddAuthlibInjectorServerPane.java
@@ -21,14 +21,13 @@ import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.io.IOException;
-import java.util.function.Consumer;
-
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 import org.jackhuang.hmcl.util.NetworkUtils;
 
@@ -39,7 +38,6 @@ import com.jfoenix.controls.JFXTextField;
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 
 public class AddAuthlibInjectorServerPane extends StackPane {
@@ -55,14 +53,11 @@ public class AddAuthlibInjectorServerPane extends StackPane {
     @FXML private SpinnerPane nextPane;
     @FXML private JFXButton btnAddNext;
 
-    private Consumer<Region> finalization;
-
     private TransitionHandler transitionHandler;
 
     private AuthlibInjectorServer serverBeingAdded;
 
-    public AddAuthlibInjectorServerPane(Consumer<Region> finalization) {
-        this.finalization = finalization;
+    public AddAuthlibInjectorServerPane() {
         loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
         transitionHandler = new TransitionHandler(addServerContainer);
         transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
@@ -89,7 +84,7 @@ public class AddAuthlibInjectorServerPane extends StackPane {
 
     @FXML
     private void onAddCancel() {
-        finalization.accept(this);
+        fireEvent(new DialogCloseEvent());
     }
 
     @FXML
@@ -129,7 +124,7 @@ public class AddAuthlibInjectorServerPane extends StackPane {
         if (!Settings.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
             Settings.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
         }
-        finalization.accept(this);
+        fireEvent(new DialogCloseEvent());
     }
 
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
index ab1825ff6..937391866 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
@@ -63,7 +63,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
 
     @FXML
     private void onAdd() {
-        Controllers.dialog(new AddAuthlibInjectorServerPane(Controllers::closeDialog));
+        Controllers.dialog(new AddAuthlibInjectorServerPane());
     }
 
     public String getTitle() {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
index 4ae3bd74f..7edfd58db 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java
@@ -26,6 +26,7 @@ import org.jackhuang.hmcl.Launcher;
 import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.InputDialogPane;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
@@ -132,15 +133,15 @@ public final class Controllers {
     }
 
     public static void dialog(String text, String title, int type, Runnable onAccept) {
-        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, type, onAccept));
+        dialog(new MessageDialogPane(text, title, type, onAccept));
     }
 
     public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
-        dialog(new MessageDialogPane(text, title, Controllers::closeDialog, onAccept, onCancel));
+        dialog(new MessageDialogPane(text, title, onAccept, onCancel));
     }
 
     public static void inputDialog(String text, Consumer<String> onResult) {
-        dialog(new InputDialogPane(text, Controllers::closeDialog, onResult));
+        dialog(new InputDialogPane(text, onResult));
     }
 
     public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
@@ -156,6 +157,9 @@ public final class Controllers {
         return pane;
     }
 
+    /**
+     * Use {@link DialogCloseEvent}
+     */
     public static void closeDialog(Region content) {
         if (stage == null) // shut down
             return;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
index afea4c9f9..d871f9d62 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Decorator.java
@@ -32,6 +32,7 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
@@ -59,6 +60,7 @@ import org.jackhuang.hmcl.ui.animation.AnimationProducer;
 import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
 import org.jackhuang.hmcl.ui.animation.TransitionHandler;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.StackContainerPane;
 import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogWizardDisplayer;
 import org.jackhuang.hmcl.ui.wizard.*;
@@ -67,6 +69,7 @@ import org.jackhuang.hmcl.util.Lang;
 import org.jackhuang.hmcl.util.StringUtils;
 import java.io.File;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.Random;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -81,6 +84,8 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     private static final SVGGlyph close = Lang.apply(new SVGGlyph(0, "CLOSE", "M810 274l-238 238 238 238-60 60-238-238-238 238-60-60 238-238-238-238 60-60 238 238 238-238z", Color.WHITE),
             glyph -> { glyph.setPrefSize(12, 12); glyph.setSize(12, 12); });
 
+    private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Decorator.class.getName() + ".dialog.closeListener";
+
     private final ObjectProperty<Runnable> onCloseButtonAction;
     private final BooleanProperty customMaximize = new SimpleBooleanProperty(false);
 
@@ -563,20 +568,26 @@ public final class Decorator extends StackPane implements TaskExecutorDialogWiza
     public void showDialog(Node node) {
         FXUtils.checkFxUserThread();
 
+        EventHandler<DialogCloseEvent> handler = event -> closeDialog(node);
+        node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
+        node.addEventHandler(DialogCloseEvent.CLOSE, handler);
+
         if (dialogPane.isEmpty())
             dialog.show();
         dialogPane.push(node);
     }
 
+    @SuppressWarnings("unchecked")
     public void closeDialog(Node node) {
         FXUtils.checkFxUserThread();
 
+        Optional.ofNullable(node.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
+                .ifPresent(handler -> node.removeEventHandler(DialogCloseEvent.CLOSE, (EventHandler<DialogCloseEvent>) handler));
+
         dialogPane.pop(node);
-        if (dialogPane.getChildren().isEmpty())
-            Platform.runLater(() -> {
-                if (dialogPane.getChildren().isEmpty())
-                    dialog.close();
-            });
+        if (dialogPane.getChildren().isEmpty()) {
+            dialog.close();
+        }
     }
 
     public void startWizard(WizardProvider wizardProvider) {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java
index 16f9476dd..b0d4d5862 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/DialogController.java
@@ -34,7 +34,7 @@ public final class DialogController {
             CountDownLatch latch = new CountDownLatch(1);
             AtomicReference<AuthInfo> res = new AtomicReference<>(null);
             JFXUtilities.runInFX(() -> {
-                AccountLoginPane pane = new AccountLoginPane(account, Controllers::closeDialog, it -> {
+                AccountLoginPane pane = new AccountLoginPane(account, it -> {
                         res.set(it);
                         latch.countDown();
                 }, latch::countDown);
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java
index 164adfcae..f0d127d4d 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LeftPaneController.java
@@ -45,6 +45,7 @@ import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
 import org.jackhuang.hmcl.ui.construct.ClassTitle;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.IconedItem;
 import org.jackhuang.hmcl.ui.construct.RipplerContainer;
 import org.jackhuang.hmcl.util.Lang;
@@ -100,7 +101,7 @@ public final class LeftPaneController {
     }
 
     private void addNewAccount() {
-        Controllers.dialog(new AddAccountPane(Controllers::closeDialog));
+        Controllers.dialog(new AddAccountPane());
     }
 
     private void onSelectedAccountChanged(Account newAccount) {
@@ -228,7 +229,7 @@ public final class LeftPaneController {
                             Modpack modpack = ModpackHelper.readModpackManifest(modpackFile);
                             TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
                                     .with(Task.of(Schedulers.javafx(), () -> {
-                                        Controllers.closeDialog(region.get());
+                                        region.get().fireEvent(new DialogCloseEvent());
                                         checkAccount();
                                     })).executor();
                             region.set(Controllers.taskDialog(executor, i18n("modpack.installing"), ""));
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
index 943a9ddb3..f1c30cf78 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/MainPage.java
@@ -42,6 +42,7 @@ import org.jackhuang.hmcl.setting.Settings;
 import org.jackhuang.hmcl.task.Schedulers;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.ui.download.DownloadWizardProvider;
 import org.jackhuang.hmcl.ui.wizard.DecoratorPage;
@@ -165,17 +166,17 @@ public final class MainPage extends StackPane implements DecoratorPage {
                 AtomicReference<Region> region = new AtomicReference<>();
                 try {
                     TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, id, ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(id)))
-                            .then(Task.of(Schedulers.javafx(), () -> Controllers.closeDialog(region.get()))).executor();
+                            .then(Task.of(Schedulers.javafx(), () -> region.get().fireEvent(new DialogCloseEvent()))).executor();
                     region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
                     executor.start();
                 } catch (UnsupportedModpackException e) {
-                    Controllers.closeDialog(region.get());
+                    region.get().fireEvent(new DialogCloseEvent());
                     Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 } catch (MismatchedModpackTypeException e) {
-                    Controllers.closeDialog(region.get());
+                    region.get().fireEvent(new DialogCloseEvent());
                     Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 } catch (IOException e) {
-                    Controllers.closeDialog(region.get());
+                    region.get().fireEvent(new DialogCloseEvent());
                     Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
                 }
             }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java
new file mode 100644
index 000000000..6b7d7656b
--- /dev/null
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/DialogCloseEvent.java
@@ -0,0 +1,45 @@
+/*
+ * Hello Minecraft! Launcher.
+ * Copyright (C) 2018  huangyuhui <huanghongxun2008@126.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see {http://www.gnu.org/licenses/}.
+ */
+package org.jackhuang.hmcl.ui.construct;
+
+import org.jackhuang.hmcl.ui.Controllers;
+
+import javafx.event.Event;
+import javafx.event.EventTarget;
+import javafx.event.EventType;
+import javafx.scene.layout.Region;
+
+/**
+ * Indicates a close operation on the dialog.
+ *
+ * @author yushijinhun
+ * @see Controllers#dialog(Region)
+ */
+public class DialogCloseEvent extends Event {
+
+    public static final EventType<DialogCloseEvent> CLOSE = new EventType<>("CLOSE");
+
+    public DialogCloseEvent() {
+        super(CLOSE);
+    }
+
+    public DialogCloseEvent(Object source, EventTarget target) {
+        super(source, target, CLOSE);
+    }
+
+}
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java
index 5fbb315a7..8e7dfe365 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/InputDialogPane.java
@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXTextField;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import org.jackhuang.hmcl.ui.FXUtils;
 
@@ -38,13 +37,13 @@ public class InputDialogPane extends StackPane {
     @FXML
     private Label content;
 
-    public InputDialogPane(String text, Consumer<Region> closeConsumer, Consumer<String> onResult) {
+    public InputDialogPane(String text, Consumer<String> onResult) {
         FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
         content.setText(text);
-        cancelButton.setOnMouseClicked(e -> closeConsumer.accept(this));
+        cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
         acceptButton.setOnMouseClicked(e -> {
             onResult.accept(textField.getText());
-            closeConsumer.accept(this);
+            fireEvent(new DialogCloseEvent());
         });
     }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java
index 4473a7c0b..842832d97 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MessageDialogPane.java
@@ -21,7 +21,6 @@ import com.jfoenix.controls.JFXButton;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
-import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 
 import org.jackhuang.hmcl.setting.Theme;
@@ -30,10 +29,8 @@ import org.jackhuang.hmcl.ui.SVG;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
 
 import java.util.Optional;
-import java.util.function.Consumer;
 
 public final class MessageDialogPane extends StackPane {
-    private boolean closingDialog = true;
 
     @FXML
     private JFXButton acceptButton;
@@ -48,7 +45,7 @@ public final class MessageDialogPane extends StackPane {
     @FXML
     private HBox actions;
 
-    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, int type, Runnable onAccept) {
+    public MessageDialogPane(String text, String title, int type, Runnable onAccept) {
         FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
 
         if (title != null)
@@ -56,7 +53,7 @@ public final class MessageDialogPane extends StackPane {
 
         content.setText(text);
         acceptButton.setOnMouseClicked(e -> {
-            closeConsumer.accept(MessageDialogPane.this);
+            fireEvent(new DialogCloseEvent());
             Optional.ofNullable(onAccept).ifPresent(Runnable::run);
         });
 
@@ -83,12 +80,12 @@ public final class MessageDialogPane extends StackPane {
         }
     }
 
-    public MessageDialogPane(String text, String title, Consumer<Region> closeConsumer, Runnable onAccept, Runnable onCancel) {
-        this(text, title, closeConsumer, MessageBox.QUESTION_MESSAGE, onAccept);
+    public MessageDialogPane(String text, String title, Runnable onAccept, Runnable onCancel) {
+        this(text, title, MessageBox.QUESTION_MESSAGE, onAccept);
 
         cancelButton.setVisible(true);
         cancelButton.setOnMouseClicked(e -> {
-            closeConsumer.accept(MessageDialogPane.this);
+            fireEvent(new DialogCloseEvent());
             Optional.ofNullable(onCancel).ifPresent(Runnable::run);
         });
 
@@ -97,8 +94,4 @@ public final class MessageDialogPane extends StackPane {
 
         actions.getChildren().add(cancelButton);
     }
-
-    public void disableClosingDialog() {
-        closingDialog = false;
-    }
 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogWizardDisplayer.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogWizardDisplayer.java
index e306d1586..4e4aeb76a 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogWizardDisplayer.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TaskExecutorDialogWizardDisplayer.java
@@ -35,7 +35,7 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
     @Override
     default void handleTask(Map<String, Object> settings, Task task) {
         TaskExecutorDialogPane pane = new TaskExecutorDialogPane(it -> {
-            Controllers.closeDialog(it);
+            it.fireEvent(new DialogCloseEvent());
             Controllers.navigate(null);
         });
 
@@ -62,7 +62,7 @@ public interface TaskExecutorDialogWizardDisplayer extends AbstractWizardDisplay
                 @Override
                 public void onStop(boolean success, TaskExecutor executor) {
                     JFXUtilities.runInFX(() -> {
-                        Controllers.closeDialog(pane);
+                        pane.fireEvent(new DialogCloseEvent());
                         if (success) {
                             if (settings.containsKey("success_message") && settings.get("success_message") instanceof String)
                                 Controllers.dialog((String) settings.get("success_message"), null, MessageBox.FINE_MESSAGE, () -> Controllers.navigate(null));
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java
index 50914c6a8..1cd70a89b 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/AppDataUpgrader.java
@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.task.FileDownloadTask.IntegrityCheck;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.ui.construct.MessageBox;
 import org.jackhuang.hmcl.util.*;
 import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
@@ -120,7 +121,7 @@ public class AppDataUpgrader extends IUpgrader {
                                 .directory(new File("").getAbsoluteFile()).start();
                         System.exit(0);
                     }
-                    JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
+                    JFXUtilities.runInFX(() -> region.get().fireEvent(new DialogCloseEvent()));
                 } catch (IOException ex) {
                     Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                 }
@@ -138,7 +139,7 @@ public class AppDataUpgrader extends IUpgrader {
                                 .directory(new File("").getAbsoluteFile()).start();
                         System.exit(0);
                     }
-                    JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
+                    JFXUtilities.runInFX(() -> region.get().fireEvent(new DialogCloseEvent()));
                 } catch (IOException ex) {
                     Logging.LOG.log(Level.SEVERE, "Failed to create upgrader", ex);
                 }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/NewFileUpgrader.java b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/NewFileUpgrader.java
index a3344021f..d878fe963 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/NewFileUpgrader.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/upgrade/NewFileUpgrader.java
@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.task.FileDownloadTask;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.task.TaskExecutor;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
 import org.jackhuang.hmcl.util.Logging;
 import org.jackhuang.hmcl.util.VersionNumber;
 import java.io.File;
@@ -72,7 +73,7 @@ public class NewFileUpgrader extends IUpgrader {
             }
             System.exit(0);
         }
-        JFXUtilities.runInFX(() -> Controllers.closeDialog(region.get()));
+        JFXUtilities.runInFX(() -> region.get().fireEvent(new DialogCloseEvent()));
     }
 
     private static String getRealPath() {

From 310d693e2bb7b0946c53d0b4417a2cf60cd5d0f3 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 7 Jul 2018 18:43:46 +0800
Subject: [PATCH 9/9] Remove some error cause inferences

Trampoline - High frequency of false positives.
java.lang.OutOfMemoryError - It's more likely to be a memory leak.
---
 HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java
index 5298829e0..33e9eb02e 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/CrashReporter.java
@@ -51,8 +51,6 @@ public class CrashReporter implements Thread.UncaughtExceptionHandler {
             put("netscape.javascript.JSException", i18n("crash.NoClassDefFound"));
             put("java.lang.IncompatibleClassChangeError", i18n("crash.NoClassDefFound"));
             put("java.lang.ClassFormatError", i18n("crash.NoClassDefFound"));
-            put("java.lang.OutOfMemoryError", "FUCKING MEMORY LIMIT!");
-            put("Trampoline", i18n("launcher.update_java"));
             put("com.sun.javafx.css.StyleManager.findMatchingStyles", i18n("launcher.update_java"));
             put("NoSuchAlgorithmException", "Has your operating system been installed completely or is a ghost system?");
         }