From 65fc3d0c4f262bd6b484366f35887bc7cd6d31b1 Mon Sep 17 00:00:00 2001 From: YLDK <116365019+YELANDAOKONG@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:29:02 +0800 Subject: [PATCH] =?UTF-8?q?Support=20#3087:=20=E9=9A=90=E8=97=8F=E6=95=B4?= =?UTF-8?q?=E5=90=88=E5=8C=85=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20(#3088)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Support #3087: 隐藏整合包文件位置显示 * Support #3087: 移除整合包文件位置显示代码 * Support #3087: 移除整合包文件位置显示代码 --- .../jackhuang/hmcl/ui/download/LocalModpackPage.java | 3 --- .../org/jackhuang/hmcl/ui/download/ModpackPage.java | 12 +----------- .../hmcl/ui/download/RemoteModpackPage.java | 1 - HMCL/src/main/resources/assets/lang/I18N.properties | 1 - .../main/resources/assets/lang/I18N_es.properties | 3 +-- .../main/resources/assets/lang/I18N_ja.properties | 1 - .../main/resources/assets/lang/I18N_ru.properties | 1 - .../main/resources/assets/lang/I18N_zh.properties | 1 - .../main/resources/assets/lang/I18N_zh_CN.properties | 1 - 9 files changed, 2 insertions(+), 22 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java index 4c71fd6ee..3b8525b06 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java @@ -108,7 +108,6 @@ public final class LocalModpackPage extends ModpackPage { hideSpinner(); lblName.setText(selectedFile.getName()); installAsVersion.set(false); - lblModpackLocation.setText(selectedFile.getAbsolutePath()); if (!name.isPresent()) { // trim: https://github.com/HMCL-dev/HMCL/issues/962 @@ -131,8 +130,6 @@ public final class LocalModpackPage extends ModpackPage { lblVersion.setText(manifest.getVersion()); lblAuthor.setText(manifest.getAuthor()); - lblModpackLocation.setText(selectedFile.getAbsolutePath()); - if (!name.isPresent()) { // trim: https://github.com/HMCL-dev/HMCL/issues/962 txtModpackName.setText(manifest.getName().trim()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java index 2240b5d18..c54317e41 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/ModpackPage.java @@ -22,7 +22,6 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage { protected final Label lblName; protected final Label lblVersion; protected final Label lblAuthor; - protected final Label lblModpackLocation; protected final JFXTextField txtModpackName; protected final JFXButton btnInstall; @@ -37,15 +36,6 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage { ComponentList componentList = new ComponentList(); { - BorderPane locationPane = new BorderPane(); - { - locationPane.setLeft(new Label(i18n("modpack.task.install.will"))); - - lblModpackLocation = new Label(); - BorderPane.setAlignment(lblModpackLocation, Pos.CENTER_RIGHT); - locationPane.setCenter(lblModpackLocation); - } - BorderPane archiveNamePane = new BorderPane(); { Label label = new Label(i18n("archive.file.name")); @@ -99,7 +89,7 @@ public abstract class ModpackPage extends SpinnerPane implements WizardPage { } componentList.getContent().setAll( - locationPane, archiveNamePane, modpackNamePane, versionPane, authorPane, descriptionPane); + archiveNamePane, modpackNamePane, versionPane, authorPane, descriptionPane); } borderPane.getChildren().setAll(componentList); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/RemoteModpackPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/RemoteModpackPage.java index 9f396efec..b29583fd3 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/RemoteModpackPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/RemoteModpackPage.java @@ -43,7 +43,6 @@ public final class RemoteModpackPage extends ModpackPage { manifest = tryCast(controller.getSettings().get(MODPACK_SERVER_MANIFEST), ServerModpackManifest.class) .orElseThrow(() -> new IllegalStateException("MODPACK_SERVER_MANIFEST should exist")); - lblModpackLocation.setText(manifest.getFileApi()); try { controller.getSettings().put(MODPACK_MANIFEST, manifest.toModpack(null)); diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 7c3098022..5f7e8bfe5 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -822,7 +822,6 @@ modpack.origin.mcbbs.prompt=Post ID modpack.scan=Parsing Modpack Index modpack.task.install=Import Modpack modpack.task.install.error=Unable to identify this modpack. We currently only support Curse, Modrinth, MultiMC, and MCBBS modpacks. -modpack.task.install.will=The location of the modpack you are going to install: modpack.type.curse=Curse modpack.type.curse.tolerable_error=Unable to download dependencies, you can try continuing to download by launching this game instance. modpack.type.curse.error=Unable to download dependencies, please try again or use a proxy connection. diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index e3c983843..8cb900847 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -731,8 +731,7 @@ modpack.origin.mcbbs=MCBBS modpack.origin.mcbbs.prompt=ID de publicación modpack.scan=Análisis del índice de modpacks modpack.task.install=Instalar Modpack -modpack.task.install.error=No se ha podido identificar este modpack. Actualmente sólo soportamos los modpacks Curse, Modrinth, MultiMC y MCBBS. -modpack.task.install.will=Vas a instalar el modpack: +modpack.task.install.error=No se ha podido identificar este modpack. Actualmente sólo soportamos los modpacks Curse, Modrinth, MultiMC y MCBBS. modpack.type.curse=Curse modpack.type.curse.tolerable_error=No se han podido descargar las dependencias, puedes intentar continuar la descarga ejecutando esta instancia del juego. modpack.type.curse.error=No se han podido descargar las dependencias de CurseForge, inténtalo de nuevo o utiliza una conexión proxy. diff --git a/HMCL/src/main/resources/assets/lang/I18N_ja.properties b/HMCL/src/main/resources/assets/lang/I18N_ja.properties index 5aef7a019..8e705640a 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ja.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ja.properties @@ -573,7 +573,6 @@ modpack.origin.mcbbs.prompt=スレッドID modpack.scan=このmodpackをスキャンしています modpack.task.install=Modpackのインポート modpack.task.install.error=このmodpackファイルは認識できません。CurseおよびMultiMCmodpackのみがサポートされています。 -modpack.task.install.will=modpackをインストールします： modpack.type.curse=Curse modpack.type.curse.completion=Cursemodpackに関連するファイルをインストールします modpack.type.curse.tolerable_error=このmodpackのすべてのファイルのダウンロードを完了できません。対応するゲームバージョンを開始するときに、ダウンロードを再試行できます。ネットワークの問題により、数回再試行する場合があります。 diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index 1454eeb20..36c792bf7 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -601,7 +601,6 @@ modpack.origin.mcbbs.prompt=ID записи modpack.scan=Разбор индекса модпака modpack.task.install=Установить модпак modpack.task.install.error=Не удаётся идентифицировать этот модпак. Поддерживаются только модпаки Curse, Modrinth, MultiMC и MCBBS. -modpack.task.install.will=Вы собираетесь установить модпак\: modpack.type.curse=Curse modpack.type.curse.completion=Установите файлы, связанные с модпаком Curse modpack.type.curse.tolerable_error=Мы не можем завершить скачивание всех файлов этого модпака. Вы можете повторить скачивание при запуске соответствующей версии игры. Вы можете повторить попытку несколько раз из-за проблем с сетью. diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 42d71bf8c..8373e0da1 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -702,7 +702,6 @@ modpack.origin.mcbbs.prompt=貼子 id modpack.scan=解析模組包 modpack.task.install=匯入模組包 modpack.task.install.error=無法識別該模組包，目前僅支援匯入 Curse、Modrinth、MultiMC、MCBBS 模組包。 -modpack.task.install.will=將會安裝模組包: modpack.type.curse=Curse modpack.type.curse.tolerable_error=但未能完成該模組包檔案的下載，您可以在啟動該遊戲版本時繼續該模組包檔案的下載。由於網路問題，您可能需要重試多次…… modpack.type.curse.error=無法完成該模組包所需的依賴下載，請多次重試或設定代理…… 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 0d8202b40..2f7bf8962 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -701,7 +701,6 @@ modpack.origin.mcbbs.prompt=贴子 id modpack.scan=解析整合包 modpack.task.install=导入整合包 modpack.task.install.error=无法识别该整合包，目前仅支持导入 Curse、Modrinth、MultiMC、MCBBS 整合包。\n你可以点击右上角帮助按钮进行求助。 -modpack.task.install.will=导入的整合包文件位置： modpack.type.curse=Curse modpack.type.curse.tolerable_error=但未能完成该整合包所需的依赖下载，您可以在启动该游戏版本时继续该整合包文件的下载。由于网络问题，您可能需要重试多次。\n你可以点击右上角帮助按钮进行求助。 modpack.type.curse.error=未能完成该整合包所需的依赖下载，请多次重试或设置代理。\n你可以点击右上角帮助按钮进行求助。