From 0b65431044d186e8a18a24a051fa9ee8fde3e40b Mon Sep 17 00:00:00 2001 From: Glavo Date: Mon, 25 Mar 2024 21:44:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=AE=8B=E4=BD=99=20MCBBS=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=20(#2953)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 清理残余 MCBBS 相关内容 * update --- HMCL/parse_mcmod_data.py | 1 - .../org/jackhuang/hmcl/ui/versions/DownloadPage.java | 8 -------- .../org/jackhuang/hmcl/ui/versions/ModListPageSkin.java | 9 --------- HMCL/src/main/resources/assets/lang/I18N.properties | 3 --- HMCL/src/main/resources/assets/lang/I18N_es.properties | 3 --- HMCL/src/main/resources/assets/lang/I18N_ja.properties | 3 --- HMCL/src/main/resources/assets/lang/I18N_ru.properties | 3 --- HMCL/src/main/resources/assets/lang/I18N_zh.properties | 3 --- .../src/main/resources/assets/lang/I18N_zh_CN.properties | 3 --- .../src/main/java/org/jackhuang/hmcl/mod/ModManager.java | 4 ---- 10 files changed, 40 deletions(-) diff --git a/HMCL/parse_mcmod_data.py b/HMCL/parse_mcmod_data.py index 58fa4520d..a7978156b 100644 --- a/HMCL/parse_mcmod_data.py +++ b/HMCL/parse_mcmod_data.py @@ -92,7 +92,6 @@ if __name__ == '__main__': curseforge_id = '' mcmod_id = '' - mcbbs_id = '' links = mod['links']['list'] if 'curseforge' in links and links['curseforge'] and sub_name not in black_lists and chinese_name not in black_lists: for link in links['curseforge']: diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java index 90c3fdc5a..da4b8c202 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java @@ -253,14 +253,6 @@ public class DownloadPage extends Control implements DecoratorPage { descriptionPane.getChildren().add(openMcmodButton); openMcmodButton.setMinWidth(Region.USE_PREF_SIZE); runInFX(() -> FXUtils.installFastTooltip(openMcmodButton, i18n("mods.mcmod"))); - - // if (StringUtils.isNotBlank(getSkinnable().mod.getMcbbs())) { - // JFXHyperlink openMcbbsButton = new JFXHyperlink(i18n("mods.mcbbs")); - // openMcbbsButton.setExternalLink(ModManager.getMcbbsUrl(getSkinnable().mod.getMcbbs())); - // descriptionPane.getChildren().add(openMcbbsButton); - // openMcbbsButton.setMinWidth(Region.USE_PREF_SIZE); - // runInFX(() -> FXUtils.installFastTooltip(openMcbbsButton, i18n("mods.mcbbs"))); - // } } JFXHyperlink openUrlButton = new JFXHyperlink(control.page.getLocalizedOfficialPage()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java index a7f162c5b..d2ae6dbd6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java @@ -391,15 +391,6 @@ class ModListPageSkin extends SkinBase { getActions().add(officialPageButton); } - // if (modInfo.getMod() != null && StringUtils.isNotBlank(modInfo.getMod().getMcbbs())) { - // JFXHyperlink mcbbsButton = new JFXHyperlink(i18n("mods.mcbbs")); - // mcbbsButton.setOnAction(e -> { - // fireEvent(new DialogCloseEvent()); - // FXUtils.openLink(ModManager.getMcbbsUrl(modInfo.getMod().getMcbbs())); - // }); - // getActions().add(mcbbsButton); - // } - if (modInfo.getMod() == null || StringUtils.isBlank(modInfo.getMod().getMcmod())) { JFXHyperlink searchButton = new JFXHyperlink(i18n("mods.mcmod.search")); searchButton.setOnAction(e -> { diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 47c34ea2d..e39599a7b 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -37,8 +37,6 @@ about.thanks_to.gamerteam.statement=For providing the default background image. about.thanks_to.glavo.statement=Responsible for maintaining HMCL. about.thanks_to.zekerzhayard.statement=Contribute a lot of technical support to HMCL. about.thanks_to.zkitefly.statement=Responsible for maintaining documentation of HMCL. -about.thanks_to.mcbbs=MCBBS (Minecraft Chinese Forum) -about.thanks_to.mcbbs.statement=For providing mcbbs.net download mirror for Mainland China users. about.thanks_to.mcmod=mcmod.cn about.thanks_to.mcmod.statement=For providing Chinese translations and wiki for various mods. about.thanks_to.red_lnn.statement=For providing the default background image. @@ -327,7 +325,6 @@ download.failed=Failed to download %1$s, response code: %2$d download.failed.empty=No versions are available, please click here to go back. download.failed.refresh=Unable to fetch version list. Please click here to retry. download.game=Game -download.provider.mcbbs=MCBBS (https://www.mcbbs.net/) download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/) download.provider.mojang=Mojang (OptiFine is provided by BMCLAPI) download.provider.official=From Official Sources diff --git a/HMCL/src/main/resources/assets/lang/I18N_es.properties b/HMCL/src/main/resources/assets/lang/I18N_es.properties index f2290ece7..dbc29c53d 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_es.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_es.properties @@ -36,8 +36,6 @@ about.thanks_to.gamerteam.statement=Por proporcionar la imagen de fondo por defe about.thanks_to.glavo.statement=Aportar mucho apoyo técnico a HMCL. about.thanks_to.zekerzhayard.statement=Aportar mucho apoyo técnico a HMCL. about.thanks_to.zkitefly.statement=Aportar mucho apoyo técnico a HMCL. -about.thanks_to.mcbbs=MCBBS (Foro chino de Minecraft) -about.thanks_to.mcbbs.statement=Por proporcionar un espejo de descarga de mcbbs.net para los usuarios de China continental. about.thanks_to.mcmod=mcmod.cn about.thanks_to.mcmod.statement=Por facilitar las traducciones al chino y el wiki de varios mods. about.thanks_to.red_lnn.statement=Por proporcionar la imagen de fondo por defecto. @@ -304,7 +302,6 @@ download.failed=Falló la descarga de %1$s, código de respuesta: %2$d download.failed.empty=No hay versiones disponibles, por favor haga clic aquí para volver. download.failed.refresh=No se ha podido obtener la lista de versiones. Por favor, haga clic aquí para volver a intentarlo. download.game=Juego -download.provider.mcbbs=MCBBS (https://www.mcbbs.net/) download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/) download.provider.mojang=Mojang (OptiFine es proporcionado por BMCLAPI) download.provider.official=De fuentes oficiales diff --git a/HMCL/src/main/resources/assets/lang/I18N_ja.properties b/HMCL/src/main/resources/assets/lang/I18N_ja.properties index 35fd7b612..b5ad071c3 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ja.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ja.properties @@ -34,8 +34,6 @@ about.thanks_to.gamerteam.statement=デフォルトの背景画像プロバイ about.thanks_to.glavo.statement=HMCLに多くのテクニカルサポートを提供 about.thanks_to.zekerzhayard.statement=HMCLに多くのテクニカルサポートを提供 about.thanks_to.zkitefly.statement=HMCLに多くのテクニカルサポートを提供。 -about.thanks_to.mcbbs=MCBBS -about.thanks_to.mcbbs.statement=MCBBSダウンロードソースプロバイダー。 about.thanks_to.mcmod=mcmod.cn about.thanks_to.mcmod.statement=Mod中国語の名前翻訳プロバイダー。 about.thanks_to.red_lnn.statement=デフォルトの背景画像プロバイダー。 @@ -286,7 +284,6 @@ download.failed=%1$s のダウンロードに失敗しました、応答コー download.failed.empty=候補者なし。戻るにはここをクリックしてください。 download.failed.refresh=バージョンリストをダウンロードできません。ここをクリックして再試行してください。 download.game=ゲームのダウンロード -download.provider.mcbbs=MCBBS（https://www.mcbbs.net/） download.provider.bmclapi=BMCLAPI（ミラーソース） download.provider.mojang=Mojang（OptiFineはBMCLAPIにより提供されます） 推奨 download.provider.official=公式ソースからロード diff --git a/HMCL/src/main/resources/assets/lang/I18N_ru.properties b/HMCL/src/main/resources/assets/lang/I18N_ru.properties index dfc550f5a..0d0f3f593 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_ru.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_ru.properties @@ -36,8 +36,6 @@ about.thanks_to.gamerteam.statement=За предоставление фонов about.thanks_to.glavo.statement=Оказал большую техническую поддержку HMCL. about.thanks_to.zekerzhayard.statement=Оказал большую техническую поддержку HMCL. about.thanks_to.zkitefly.statement=Оказал большую техническую поддержку HMCL. -about.thanks_to.mcbbs=MCBBS (Minecraft Chinese Forum) -about.thanks_to.mcbbs.statement=За предоставление зеркала скачивания MCBBS.NET для пользователей Китая. about.thanks_to.mcmod=mcmod.cn about.thanks_to.mcmod.statement=За предоставление перевода на китайский и вики для различных модов. about.thanks_to.red_lnn.statement=За предоставление фонового изображения. @@ -303,7 +301,6 @@ download.failed=Не удаётся скачать %1$s, код ответа\: % download.failed.empty=Версий нет. Нажмите здесь, чтобы вернуться назад. download.failed.refresh=Не удаётся получить список версий. Нажмите здесь, чтобы повторить попытку. download.game=Игра -download.provider.mcbbs=MCBBS (https://www.mcbbs.net/) download.provider.bmclapi=BMCLAPI (bangbang93, https://bmclapi2.bangbang93.com/) download.provider.mojang=Mojang (OptiFine is provided by BMCLAPI) download.provider.official=Из официальных источников diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 004f46767..aa36df4ab 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -35,8 +35,6 @@ about.thanks_to.gamerteam.statement=提供預設背景圖 about.thanks_to.glavo.statement=負責 HMCL 的日常維護 about.thanks_to.zekerzhayard.statement=為 HMCL 貢獻許多技術支持 about.thanks_to.zkitefly.statement=負責維護 HMCL 的文檔 -about.thanks_to.mcbbs=MCBBS 我的世界中文論壇 -about.thanks_to.mcbbs.statement=提供 MCBBS 下載地點 about.thanks_to.mcmod=MC 百科 about.thanks_to.mcmod.statement=提供 Mod 中文名映射表與 Mod 百科 about.thanks_to.red_lnn.statement=提供預設背景圖 @@ -336,7 +334,6 @@ download.failed=下載失敗: %1$s，錯誤碼：%2$d download.failed.empty=沒有能安裝的版本，按一下此處返回。 download.failed.refresh=載入版本列表失敗，按一下此處重試。 download.game=新遊戲 -download.provider.mcbbs=我的世界中文論壇 (MCBBS, https://www.mcbbs.net/) download.provider.bmclapi=BMCLAPI (bangbang93，https://bmclapi2.bangbang93.com/) download.provider.mojang=官方伺服器 (OptiFine 自動安裝的下載來源是 BMCLAPI) download.provider.official=儘量使用官方源（最新，但可能加載慢） 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 aec5cd986..a7776a513 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -35,8 +35,6 @@ about.thanks_to.gamerteam.statement=提供默认背景图 about.thanks_to.glavo.statement=负责 HMCL 的日常维护 about.thanks_to.zekerzhayard.statement=为 HMCL 贡献许多技术支持 about.thanks_to.zkitefly.statement=负责维护 HMCL 的文档 -about.thanks_to.mcbbs=MCBBS 我的世界中文论坛 -about.thanks_to.mcbbs.statement=提供 MCBBS 下载源 about.thanks_to.mcmod=MC 百科 about.thanks_to.mcmod.statement=提供模组中文名映射表与 Mod 百科 about.thanks_to.red_lnn.statement=提供默认背景图 @@ -337,7 +335,6 @@ download.failed=下载失败: %1$s，错误码：%2$d download.failed.empty=[没有可供安装的版本，点击此处返回] download.failed.refresh=[加载版本列表失败，点击此处重试] download.game=新游戏 -download.provider.mcbbs=我的世界中文论坛 (MCBBS, https://www.mcbbs.net) download.provider.bmclapi=BMCLAPI（bangbang93，https://bmclapi2.bangbang93.com） download.provider.mojang=官方（OptiFine 自动安装使用 BMCLAPI 下载源） download.provider.official=尽量使用官方源（最新，但可能加载慢） diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java index 16c207c14..69909323c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java @@ -322,10 +322,6 @@ public final class ModManager { return getModsDirectory().resolve(fileName); } - public static String getMcbbsUrl(String mcbbsId) { - return String.format("https://www.mcbbs.net/thread-%s-1-1.html", mcbbsId); - } - public static final String DISABLED_EXTENSION = ".disabled"; public static final String OLD_EXTENSION = ".old"; }