Remove authlib-injector-servers.fxml

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

@@ -39,6 +39,7 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
         SpinnerPane spinnerPane = new SpinnerPane();
         spinnerPane.getStyleClass().add("large-spinner-pane");
         Pane placeholder = new Pane();
+        VBox list = new VBox();
 
         StackPane contentPane = new StackPane();
         {
@@ -46,10 +47,8 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
             {
                 scrollPane.setFitToWidth(true);
 
-                VBox list = new VBox();
                 list.maxWidthProperty().bind(scrollPane.widthProperty());
                 list.setSpacing(10);
-                list.setPadding(new Insets(10));
 
                 VBox content = new VBox();
                 content.getChildren().setAll(list, placeholder);
@@ -87,8 +86,13 @@ public class ListPageSkin extends SkinBase<ListPage<?>> {
 
                 FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
                         refreshable -> {
-                            if (refreshable) vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            if (refreshable) {
-                            else vBox.getChildren().setAll(btnAdd);
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnRefresh, btnAdd);
+                            } else {
+                                list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
+                                vBox.getChildren().setAll(btnAdd);
+                            }
                         });
             }
 

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

@@ -27,6 +27,7 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
 import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.ListPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.javafx.MappedObservableList;
 
@@ -35,21 +36,14 @@ 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;
 
-public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
+public class AuthlibInjectorServersPage extends ListPage<AuthlibInjectorServerItem> implements DecoratorPage {
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
 
-    @FXML private ScrollPane scrollPane;
+    private final ObservableList<AuthlibInjectorServerItem> serverItems;
-    @FXML private VBox listPane;
-    @FXML private StackPane contentPane;
-
-    private ObservableList<AuthlibInjectorServerItem> serverItems;
 
     public AuthlibInjectorServersPage() {
-        loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
-        smoothScrolling(scrollPane);
-
         serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
-        Bindings.bindContent(listPane.getChildren(), serverItems);
+        Bindings.bindContent(itemsProperty(), serverItems);
     }
 
     private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
@@ -57,8 +51,8 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
                 item -> config().getAuthlibInjectorServers().remove(item.getServer()));
     }
 
-    @FXML
+    @Override
-    private void onAdd() {
+    public void add() {
         Controllers.dialog(new AddAuthlibInjectorServerPane());
     }
 

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

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import com.jfoenix.controls.*?>
-
-<fx:root xmlns="http://javafx.com/javafx"
-         xmlns:fx="http://javafx.com/fxml"
-         type="StackPane">
-    <StackPane fx:id="contentPane">
-        <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true">
-            <VBox fx:id="listPane" spacing="10" style="-fx-padding: 20 20 70 20;">
-
-            </VBox>
-        </ScrollPane>
-        <VBox style="-fx-padding: 15;" spacing="15" pickOnBounds="false" alignment="BOTTOM_RIGHT">
-            <JFXButton prefWidth="40" prefHeight="40" buttonType="RAISED" onMouseClicked="#onAdd" styleClass="jfx-button-raised-round">
-                <graphic>
-                    <fx:include source="/assets/svg/plus.fxml"/>
-                </graphic>
-            </JFXButton>
-        </VBox>
-    </StackPane>
-</fx:root>

HMCL/src/main/resources/assets/fxml/download/additional-installers.fxml

@@ -19,7 +19,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblForge">Install Forge</Label>
+                                <Label fx:id="lblForge"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -31,7 +31,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblLiteLoader">Install LiteLoader</Label>
+                                <Label fx:id="lblLiteLoader"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -43,7 +43,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblOptiFine">Install OptiFine</Label>
+                                <Label fx:id="lblOptiFine"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>

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

@@ -19,7 +19,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblForge">Install Forge</Label>
+                                <Label fx:id="lblForge"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -31,7 +31,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblLiteLoader">Install LiteLoader</Label>
+                                <Label fx:id="lblLiteLoader"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>
@@ -43,7 +43,7 @@
                     <graphic>
                         <BorderPane mouseTransparent="true">
                             <left>
-                                <Label fx:id="lblOptiFine">Install OptiFine</Label>
+                                <Label fx:id="lblOptiFine"/>
                             </left>
                             <right>
                                 <fx:include source="/assets/svg/arrow-right.fxml"/>