Support Server Auto-Update Task. Closes #624

2019-11-11 17:34:19 +08:00
parent 177935241f
commit 4e0ffc8d1e
28 changed files with 614 additions and 50 deletions
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackExportTask.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLModpackExportTask.java
@@ -62,17 +62,7 @@ public class HMCLModpackExportTask extends Task<Void> {
        blackList.add(version + ".json");
        Logging.LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
        try (Zipper zip = new Zipper(output.toPath())) {
-            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
-                if (path.isEmpty())
-                    return true;
-                for (String s : blackList)
-                    if (path.equals(s))
-                        return false;
-                for (String s : whitelist)
-                    if (path.equals(s))
-                        return true;
-                return false;
-            });
+            zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> Modpack.acceptFile(path, blackList, whitelist));

            Version mv = repository.getResolvedPreservingPatchesVersion(version);
            String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
@@ -31,9 +31,10 @@ import org.jackhuang.hmcl.launch.NotDecompressingNativesException;
 import org.jackhuang.hmcl.launch.PermissionException;
 import org.jackhuang.hmcl.launch.ProcessCreationException;
 import org.jackhuang.hmcl.launch.ProcessListener;
+import org.jackhuang.hmcl.mod.ModpackConfiguration;
 import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
 import org.jackhuang.hmcl.mod.curse.CurseCompletionTask;
-import org.jackhuang.hmcl.mod.ModpackConfiguration;
+import org.jackhuang.hmcl.mod.server.ServerModpackCompletionTask;
 import org.jackhuang.hmcl.setting.LauncherVisibility;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -62,13 +63,7 @@ import org.jackhuang.hmcl.util.versioning.VersionNumber;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -147,6 +142,8 @@ public final class LauncherHelper {
                        ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
                        if ("Curse".equals(configuration.getType()))
                            return new CurseCompletionTask(dependencyManager, selectedVersion);
+                        else if ("Server".equals(configuration.getType()))
+                            return new ServerModpackCompletionTask(dependencyManager, selectedVersion);
                        else
                            return null;
                    } catch (IOException e) {
--- a/HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/ModpackHelper.java
@@ -25,6 +25,8 @@ import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
 import org.jackhuang.hmcl.mod.curse.CurseManifest;
 import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
 import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackInstallTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
 import org.jackhuang.hmcl.setting.EnumGameDirectory;
 import org.jackhuang.hmcl.setting.Profile;
 import org.jackhuang.hmcl.setting.VersionSetting;
@@ -65,6 +67,12 @@ public final class ModpackHelper {
            // ignore it, not a valid MultiMC modpack.
        }

+        try {
+            return ServerModpackManifest.readManifest(file, charset);
+        } catch (Exception e) {
+            // ignore it, not a valid Server modpack.
+        }
+
        throw new UnsupportedModpackException(file.toString());
    }

@@ -120,7 +128,10 @@ public final class ModpackHelper {
            return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
                    .whenComplete(Schedulers.defaultScheduler(), success, failure)
                    .thenComposeAsync(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
-        else throw new IllegalArgumentException("Unrecognized modpack: " + modpack);
+        else if (modpack.getManifest() instanceof ServerModpackManifest)
+            return new ServerModpackInstallTask(profile.getDependency(), zipFile, modpack, ((ServerModpackManifest) modpack.getManifest()), name)
+                    .whenComplete(Schedulers.defaultScheduler(), success, failure);
+        else throw new IllegalArgumentException("Unrecognized modpack: " + modpack.getManifest());
    }

    public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java
@@ -151,7 +151,7 @@ public final class ModpackPage extends StackPane implements WizardPage {
        if (manifest != null) {
            WebStage stage = new WebStage();
            stage.getWebView().getEngine().loadContent(manifest.getDescription());
-            stage.setTitle(i18n("modpack.wizard.step.3"));
+            stage.setTitle(i18n("modpack.description"));
            stage.showAndWait();
        }
    }
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java
@@ -55,7 +55,7 @@ public final class ModpackSelectionPage extends StackPane implements WizardPage
        Optional<File> filePath = tryCast(controller.getSettings().get(MODPACK_FILE), File.class);
        if (filePath.isPresent()) {
            controller.getSettings().put(MODPACK_FILE, filePath.get());
-            controller.onNext();
+            Platform.runLater(controller::onNext);
        }

        FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java
@@ -24,6 +24,7 @@ import org.jackhuang.hmcl.mod.ModAdviser;
 import org.jackhuang.hmcl.mod.Modpack;
 import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
 import org.jackhuang.hmcl.mod.multimc.MultiMCModpackExportTask;
+import org.jackhuang.hmcl.mod.server.ServerModpackExportTask;
 import org.jackhuang.hmcl.setting.Config;
 import org.jackhuang.hmcl.setting.ConfigHolder;
 import org.jackhuang.hmcl.setting.Profile;
@@ -74,6 +75,8 @@ public final class ExportWizardProvider implements WizardProvider {
                return exportAsHMCL(whitelist, modpackFile, modpackName, modpackAuthor, modpackVersion, modpackDescription, includeLauncher);
            case ModpackTypeSelectionPage.MODPACK_TYPE_MULTIMC:
                return exportAsMultiMC(whitelist, modpackFile, modpackName, modpackAuthor, modpackVersion, modpackDescription);
+            case ModpackTypeSelectionPage.MODPACK_TYPE_SERVER:
+                return exportAsServer(whitelist, modpackFile, modpackName, modpackAuthor, modpackVersion, modpackDescription);
            default:
                throw new IllegalStateException("Unrecognized modpack type " + modpackType);
        }
@@ -177,7 +180,22 @@ public final class ExportWizardProvider implements WizardProvider {
        };
    }

-    @Override
+    private Task<?> exportAsServer(List<String> whitelist, File modpackFile, String modpackName, String modpackAuthor, String modpackVersion, String modpackDescription) {
+        return new Task<Void>() {
+            Task<?> dependency;
+
+            @Override
+            public void execute() {
+                dependency = new ServerModpackExportTask(profile.getRepository(), version, whitelist, modpackName, modpackAuthor, modpackVersion, modpackDescription, modpackFile);
+            }
+
+            @Override
+            public Collection<Task<?>> getDependencies() {
+                return Collections.singleton(dependency);
+            }
+        };
+    }
+            @Override
    public Node createPage(WizardController controller, int step, Map<String, Object> settings) {
        switch (step) {
            case 0: return new ModpackInfoPage(controller, version);
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackFileSelectionPage.java
@@ -156,6 +156,7 @@ public final class ModpackFileSelectionPage extends StackPane implements WizardP

    public static final String MODPACK_FILE_SELECTION = "modpack.accepted";
    private static final Map<String, String> TRANSLATION = mapOf(
+            pair("minecraft/hmclversion.cfg", i18n("modpack.files.hmclversion_cfg")),
            pair("minecraft/servers.dat", i18n("modpack.files.servers_dat")),
            pair("minecraft/saves", i18n("modpack.files.saves")),
            pair("minecraft/mods", i18n("modpack.files.mods")),
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackTypeSelectionPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackTypeSelectionPage.java
@@ -34,13 +34,15 @@ public final class ModpackTypeSelectionPage extends StackPane implements WizardP
    private JFXButton btnHMCL;
    @FXML
    private JFXButton btnMultiMC;
+    @FXML
+    private JFXButton btnServer;

    public ModpackTypeSelectionPage(WizardController controller) {
        this.controller = controller;
        FXUtils.loadFXML(this, "/assets/fxml/modpack/type.fxml");

-        JFXButton[] buttons = new JFXButton[]{btnHMCL, btnMultiMC};
-        String[] types = new String[]{MODPACK_TYPE_HMCL, MODPACK_TYPE_MULTIMC};
+        JFXButton[] buttons = new JFXButton[]{btnHMCL, btnMultiMC, btnServer};
+        String[] types = new String[]{MODPACK_TYPE_HMCL, MODPACK_TYPE_MULTIMC, MODPACK_TYPE_SERVER};
        for (int i = 0; i < types.length; ++i) {
            String type = types[i];
            buttons[i].setOnMouseClicked(e -> {
@@ -61,6 +63,7 @@ public final class ModpackTypeSelectionPage extends StackPane implements WizardP

    public static final String MODPACK_TYPE = "modpack.type";

-    public static final String MODPACK_TYPE_MULTIMC = "multimc";
    public static final String MODPACK_TYPE_HMCL = "hmcl";
+    public static final String MODPACK_TYPE_MULTIMC = "multimc";
+    public static final String MODPACK_TYPE_SERVER = "server";
 }
--- a/HMCL/src/main/resources/assets/fxml/download/modpack.fxml
+++ b/HMCL/src/main/resources/assets/fxml/download/modpack.fxml
@@ -24,7 +24,7 @@
                <BorderPane><left><Label text="%archive.version"/></left><right><Label fx:id="lblVersion" /></right></BorderPane>
                <BorderPane><left><Label text="%archive.author"/></left><right><Label fx:id="lblAuthor" /></right></BorderPane>
                <BorderPane>
-                    <left><JFXButton fx:id="btnDescription" onMouseClicked="#onDescribe" text="%modpack.wizard.step.3" styleClass="jfx-button-border" /></left>
+                    <left><JFXButton fx:id="btnDescription" onMouseClicked="#onDescribe" text="%modpack.description" styleClass="jfx-button-border" /></left>
                    <right><JFXButton buttonType="RAISED" fx:id="btnInstall" onMouseClicked="#onInstall" text="%button.install" styleClass="jfx-button-raised" /></right>
                </BorderPane>
            </ComponentList>
--- a/HMCL/src/main/resources/assets/fxml/modpack/type.fxml
+++ b/HMCL/src/main/resources/assets/fxml/modpack/type.fxml
@@ -37,5 +37,17 @@
                </BorderPane>
            </graphic>
        </JFXButton>
+        <JFXButton fx:id="btnServer" prefWidth="${list.width}">
+            <graphic>
+                <BorderPane mouseTransparent="true">
+                    <left>
+                        <TwoLineListItem title="%modpack.type.server" subtitle="%modpack.type.server.export" />
+                    </left>
+                    <right>
+                        <fx:include BorderPane.alignment="CENTER" source="/assets/svg/arrow-right.fxml"/>
+                    </right>
+                </BorderPane>
+            </graphic>
+        </JFXButton>
    </VBox>
 </fx:root>
--- a/HMCL/src/main/resources/assets/lang/I18N.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N.properties
@@ -224,12 +224,14 @@ modpack.choose.remote=Download modpack from Internet
 modpack.choose.remote.detail=Requires a direct download link to the remote modpack file
 modpack.choose.remote.tooltip=A direct download link to the remote modpack file
 modpack.desc=Describe your modpack, including precautions and changelog.  Markdown and online pictures are supported.
+modpack.description=Description
 modpack.enter_name=Enter a name for this modpack.
 modpack.export=Export Modpack
 modpack.export.as=Export Modpack As...
 modpack.files.blueprints=BuildCraft blueprints
 modpack.files.config=Mod configs
 modpack.files.dumps=NEI debug output
+modpack.files.hmclversion_cfg=Launcher configuration file
 modpack.files.liteconfig=Mod configurations
 modpack.files.mods=Mods
 modpack.files.mods.voxelmods=VoxelMods (including VoxelMap) options
@@ -259,6 +261,8 @@ modpack.type.hmcl=Hello Minecraft! Launcher
 modpack.type.hmcl.export=Can be imported by Hello Minecraft! Launcher
 modpack.type.multimc=MultiMC
 modpack.type.multimc.export=Can be imported by Hello Minecraft! Launcher and MultiMC
+modpack.type.server=Server Auto-Update Modpack
+modpack.type.server.export=Allow server manager updating game client remotely
 modpack.unsupported=Unsupported modpack, only HMCL, MultiMC, and Curse modpacks are supported.
 modpack.update=Game Update
 modpack.wizard=Exporting modpack wizard
--- a/HMCL/src/main/resources/assets/lang/I18N_es.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties
@@ -218,6 +218,7 @@ message.warning=Advertencia
 modpack=Modpack
 modpack.choose=Escoja el modpack en archivo zip que quieras instalar.
 modpack.desc=Describa su modpack, incluyendo precauciones, changelog, soportando Markdown (también soportando imágenes en línea).
+modpack.description=Descripción
 modpack.enter_name=Entre su nombre deseado para este juego.
 modpack.export=Exportar modpack
 modpack.export.as=Exportar modpack como...
--- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties
@@ -218,6 +218,7 @@ message.warning=Предупреждение
 modpack=Модпак
 modpack.choose=Выберите zip-файл модпака, который вы хотите установить.
 modpack.desc=Опишите свой модпак, включая меры предосторожности, журнал изменений, поддерживая Markdown (также поддерживая онлайн-изображения).
+modpack.description=описание
 modpack.enter_name=Введите желаемое имя для этой версии.
 modpack.export=Экспортировать модпак
 modpack.export.as=Экспорт модпака как...
--- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
@@ -221,12 +221,14 @@ modpack.choose.remote=從網路下載整合包
 modpack.choose.remote.detail=需要提供整合包的下載連結
 modpack.choose.remote.tooltip=要下載的整合包的連結
 modpack.desc=描述你要製作的整合包，比如整合包注意事項和更新記錄，支援 Markdown（圖片請上傳至網路）。
+modpack.description=整合包描述
 modpack.enter_name=給遊戲取個你喜歡的名字
 modpack.export=匯出整合包
 modpack.export.as=請選擇整合包類型。若你無法決定，請選擇 HMCL 類型。
 modpack.files.blueprints=BuildCraft 藍圖
 modpack.files.config=Mod 模組設定檔案
 modpack.files.dumps=NEI 調校輸出
+modpack.files.hmclversion_cfg=啟動器設定檔案
 modpack.files.liteconfig=Mod 模組設定檔案
 modpack.files.mods=Mod 模組
 modpack.files.mods.voxelmods=VoxelMods 設定，如小地圖
@@ -256,6 +258,8 @@ modpack.type.hmcl=HMCL
 modpack.type.hmcl.export=可以被 Hello Minecraft! Launcher (HMCL) 導入
 modpack.type.multimc=MultiMC
 modpack.type.multimc.export=可以被 Hello Minecraft! Launcher (HMCL) 和 MultiMC 導入
+modpack.type.server=伺服器自動更新整合包
+modpack.type.server.export=允許伺服器管理員遠程更新遊戲用戶端
 modpack.unsupported=不支援該整合包。僅 HMCL、MultiMC、Curse 整合包受支援。
 modpack.update=正在升級整合包
 modpack.wizard=匯出整合包引導
--- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@@ -222,12 +222,14 @@ modpack.choose.remote=从互联网下载整合包
 modpack.choose.remote.detail=需要提供整合包的下载链接
 modpack.choose.remote.tooltip=要下载的整合包的链接
 modpack.desc=描述你要制作的整合包，比如整合包注意事项和更新记录，支持 Markdown（图片请用网络图）。
+modpack.description=整合包描述
 modpack.enter_name=给游戏起个你喜欢的名字
 modpack.export=导出整合包
 modpack.export.as=请选择整合包类型。若你无法决定，请选择 HMCL 类型。
 modpack.files.blueprints=BuildCraft 蓝图
 modpack.files.config=Mod 配置文件
 modpack.files.dumps=NEI 调试输出
+modpack.files.hmclversion_cfg=启动器配置文件
 modpack.files.liteconfig=Mod 配置文件
 modpack.files.mods=Mod
 modpack.files.mods.voxelmods=VoxelMods 配置，如小地图
@@ -257,6 +259,8 @@ modpack.type.hmcl=HMCL
 modpack.type.hmcl.export=可以被 Hello Minecraft! Launcher (HMCL) 导入
 modpack.type.multimc=MultiMC
 modpack.type.multimc.export=可以被 Hello Minecraft! Launcher (HMCL) 和 MultiMC 导入
+modpack.type.server=服务器自动更新整合包
+modpack.type.server.export=允许服务器管理员远程更新游戏客户端
 modpack.unsupported=该整合包不被支持。仅 HMCL、MultiMC、Curse 整合包受支持。
 modpack.update=正在升级整合包
 modpack.wizard=导出整合包向导