From 9fb2bc4c7ed221baa3960b9e737d47323191b7cc Mon Sep 17 00:00:00 2001 From: zkitefly Date: Fri, 29 Sep 2023 19:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E7=9A=84=E9=98=BF?= =?UTF-8?q?=E9=87=8C=E9=95=9C=E5=83=8F=E6=BA=90=E5=9C=B0=E5=9D=80=E6=8D=A2?= =?UTF-8?q?=E6=88=90=E8=85=BE=E8=AE=AF=E4=BA=91=E9=95=9C=E5=83=8F=E6=BA=90?= =?UTF-8?q?=20(#2524)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/util/SelfDependencyPatcher.java | 8 ++++---- HMCL/src/main/resources/assets/lang/I18N.properties | 2 +- HMCL/src/main/resources/assets/lang/I18N_es.properties | 2 +- HMCL/src/main/resources/assets/lang/I18N_ja.properties | 2 +- HMCL/src/main/resources/assets/lang/I18N_ru.properties | 2 +- HMCL/src/main/resources/assets/lang/I18N_zh.properties | 2 +- HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 2 +- .../jackhuang/hmcl/download/BMCLAPIDownloadProvider.java | 2 +- javafx.gradle.kts | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java index 7c9282416..d8263f351 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/SelfDependencyPatcher.java @@ -88,14 +88,14 @@ public final class SelfDependencyPatcher { final String customUrl = System.getProperty("hmcl.openjfx.repo"); if (customUrl == null) { if (System.getProperty("user.country", "").equalsIgnoreCase("CN")) { - defaultRepository = Repository.ALIYUN_MIRROR; + defaultRepository = Repository.TENCENT_MIRROR; } else { defaultRepository = Repository.MAVEN_CENTRAL; } - repositories = Collections.unmodifiableList(Arrays.asList(Repository.MAVEN_CENTRAL, Repository.ALIYUN_MIRROR)); + repositories = Collections.unmodifiableList(Arrays.asList(Repository.MAVEN_CENTRAL, Repository.TENCENT_MIRROR)); } else { defaultRepository = new Repository(String.format(i18n("repositories.custom"), customUrl), customUrl); - repositories = Collections.unmodifiableList(Arrays.asList(Repository.MAVEN_CENTRAL, Repository.ALIYUN_MIRROR, defaultRepository)); + repositories = Collections.unmodifiableList(Arrays.asList(Repository.MAVEN_CENTRAL, Repository.TENCENT_MIRROR, defaultRepository)); } } @@ -150,7 +150,7 @@ public final class SelfDependencyPatcher { private static final class Repository { public static final Repository MAVEN_CENTRAL = new Repository(i18n("repositories.maven_central"), "https://repo1.maven.org/maven2"); - public static final Repository ALIYUN_MIRROR = new Repository(i18n("repositories.aliyun_mirror"), "https://maven.aliyun.com/repository/central"); + public static final Repository TENCENT_MIRROR = new Repository(i18n("repositories.tencent_mirror"), "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"); private final String name; private final String url; diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index ec6c13213..ad12af641 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -965,7 +965,7 @@ profile.use_relative_path=Use relative path for game path if possible repositories.custom=Custom Maven Repository (%s) repositories.maven_central=Universal (Maven Central) -repositories.aliyun_mirror=Mainland China Mirror (Aliyun Maven Repository) +repositories.tencent_mirror=Mainland China Mirror (Aliyun Maven Repository) repositories.chooser=HMCL requires JavaFX to work.\n\ \n\ Please click on 'OK' to download JavaFX from the specified repository, or click on 'Cancel' to exit.\n\ diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index c80dc1c13..3257f51d1 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -865,7 +865,7 @@ profile.use_relative_path=Utilizar ruta relativa para la ruta del juego si es po repositories.custom=Repositorio Maven personalizado (%s) repositories.maven_central=Universal (Maven Central) -repositories.aliyun_mirror=Espejo de China continental (Repositorio Maven Aliyun) +repositories.tencent_mirror=Espejo de China continental (Repositorio Maven Aliyun) repositories.chooser=HMCL requiere JavaFX para funcionar.\n\ \n\ Por favor, haga clic en "Aceptar" para descargar JavaFX desde el repositorio especificado, o haga clic en "Cancelar" para salir.\n\ diff --git a/HMCL/src/main/resources/assets/lang/I18N_ja.properties b/HMCL/src/main/resources/assets/lang/I18N_ja.properties index 21a0dd495..8c7083585 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ja.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ja.properties @@ -697,7 +697,7 @@ profile.use_relative_path=可能であれば、ゲームディレクトリの相 repositories.custom=カスタムMavenリポジトリ（%s） repositories.maven_central=Universal（Maven Central） -repositories.aliyun_mirror=中国本土（Aliyun Mavenリポジトリ） +repositories.tencent_mirror=中国本土（Aliyun Mavenリポジトリ） repositories.chooser=JavaFXがないため、HMCLが機能するにはJavaFXが必要です。\n [OK]をクリックして指定したダウンロードソースからJavaFXランタイムコンポーネントをダウンロードしてHMCLを起動するか、[キャンセル]をクリックして終了します。\nダウンロードソースを選択： repositories.chooser.title=ダウンロードソースを選択してJavaFXをダウンロードします diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index 28b46f113..0400c3c7b 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -702,7 +702,7 @@ profile.use_relative_path=По возможности используйте о repositories.custom=Пользовательский репозиторий Maven (%s) repositories.maven_central=Универсальный (Maven Central) -repositories.aliyun_mirror=Материковый Китай (Репозиторий Aliyun Maven) +repositories.tencent_mirror=Материковый Китай (Репозиторий Aliyun Maven) repositories.chooser=JavaFX отсутствует, для работы HMCL требуется JavaFX.\nНажмите кнопку «ОК», чтобы скачать компоненты среды выполнения JavaFX из указанного источника и запустить HMCL, или нажмите кнопку «Отмена», чтобы выйти.\nВыберите источники скачивания: repositories.chooser.title=Выберите источник для скачивания JavaFX diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index ea34c5e3e..fc92c65d0 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -834,7 +834,7 @@ profile.use_relative_path=如可行，則在遊戲目錄使用相對路徑 repositories.custom=自定義 Maven 倉庫（%s） repositories.maven_central=全球（Maven Central） -repositories.aliyun_mirror=中國大陸（阿里雲 Maven 倉庫） +repositories.tencent_mirror=中國大陸（阿里雲 Maven 倉庫） repositories.chooser=缺少 JavaFX 運行環境，HMCL 需要 JavaFX 才能正常運行。\n點擊“確認”從指定下載源下載 JavaFX 運行時組件並啟動 HMCL，點擊“取消”退出程式。\n選擇下載源： repositories.chooser.title=選擇下載源下載JavaFX 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 f0e553c2f..94d790859 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -833,7 +833,7 @@ profile.use_relative_path=若可能，游戏目录使用相对路径 repositories.custom=自定义 Maven 仓库（%s） repositories.maven_central=全球（Maven Central） -repositories.aliyun_mirror=中国大陆（阿里云 Maven 仓库） +repositories.tencent_mirror=中国大陆（阿里云 Maven 仓库） repositories.chooser=缺少 JavaFX 运行环境，HMCL 需要 JavaFX 才能正常运行。\n点击“确认”从指定下载源下载 JavaFX 运行时组件并启动 HMCL，点击“取消”退出程序。\n选择下载源： repositories.chooser.title=选择下载源下载 JavaFX diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java index 1f5eb5368..69aeebda7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java @@ -107,7 +107,7 @@ public class BMCLAPIDownloadProvider implements DownloadProvider { .replace("https://meta.fabricmc.net", apiRoot + "/fabric-meta") .replace("https://maven.fabricmc.net", apiRoot + "/maven") .replace("https://authlib-injector.yushi.moe", apiRoot + "/mirrors/authlib-injector") - .replace("https://repo1.maven.org/maven2", "https://maven.aliyun.com/repository/central"); + .replace("https://repo1.maven.org/maven2", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"); } @Override diff --git a/javafx.gradle.kts b/javafx.gradle.kts index e07ac013b..64e748d9f 100644 --- a/javafx.gradle.kts +++ b/javafx.gradle.kts @@ -29,7 +29,7 @@ data class Platform( } val jfxModules = listOf("base", "graphics", "controls", "media", "web") -val jfxMirrorRepos = listOf("https://maven.aliyun.com/repository/central") +val jfxMirrorRepos = listOf("https://mirrors.cloud.tencent.com/nexus/repository/maven-public") val jfxDependenciesFile = project("HMCL").buildDir.resolve("openjfx-dependencies.json") val jfxPlatforms = listOf( Platform("windows-x86", "win-x86"),