From 47795972c8a0fd88ea2bdefbd2e946a4fbabac36 Mon Sep 17 00:00:00 2001 From: Burning_TNT Date: Sat, 29 Jul 2023 19:48:30 +0800 Subject: [PATCH] Add a button which navigates to the modpack download page in the modpack installl page --- .../org/jackhuang/hmcl/ui/download/DownloadPage.java | 4 ++++ .../jackhuang/hmcl/ui/download/ModpackSelectionPage.java | 9 ++++++++- .../src/main/resources/assets/lang/I18N_zh_CN.properties | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java index 109df16b5f..8b6619a154 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java @@ -232,6 +232,10 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage tab.select(newGameTab); } + public void showModpackDownloads() { + tab.select(modpackTab); + } + public void showModDownloads() { tab.select(modTab); } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java index 31987d15f5..12c7a25c4d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackSelectionPage.java @@ -69,7 +69,8 @@ public final class ModpackSelectionPage extends VBox implements WizardPage { this.getChildren().setAll( title, createButton("local", this::onChooseLocalFile), - createButton("remote", this::onChooseRemoteFile) + createButton("remote", this::onChooseRemoteFile), + createButton("repository", this::onChooseRepository) ); Optional filePath = tryCast(controller.getSettings().get(MODPACK_FILE), File.class); @@ -168,6 +169,12 @@ public final class ModpackSelectionPage extends VBox implements WizardPage { }); } + public void onChooseRepository() { + DownloadPage downloadPage = new DownloadPage(); + downloadPage.showModpackDownloads(); + Controllers.navigate(downloadPage); + } + @Override public void cleanup(Map settings) { } diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 78039a97f6..b1e4f598e0 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -616,6 +616,8 @@ modpack.choose.local=导入本地整合包文件 modpack.choose.local.detail=你可以直接将整合包文件拖入本页面以安装 modpack.choose.remote=从互联网下载整合包 modpack.choose.remote.detail=需要提供整合包的下载链接 +modpack.choose.repository=从 Curseforge / Modrinth 下载整合包 +modpack.choose.repository.detail=下载后记得回到这个界面,把整合包拖进来哦 modpack.choose.remote.tooltip=要下载的整合包的链接 modpack.completion=下载整合包相关文件 modpack.desc=描述你要制作的整合包,比如整合包注意事项和更新记录,支持 HTML(图片请用网络图)