From c11837baa46e2d44ca2d9c05f46d89c305438c44 Mon Sep 17 00:00:00 2001 From: Glavo Date: Tue, 17 Jun 2025 09:07:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=89=E5=BD=B1=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=A0=87=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9C=AA=E7=BF=BB=E8=AF=91=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20(#4007)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmcl/ui/versions/DownloadListPage.java | 11 ++++++++-- .../resources/assets/lang/I18N.properties | 20 +++++++++++++++++++ .../resources/assets/lang/I18N_zh.properties | 20 +++++++++++++++++++ .../assets/lang/I18N_zh_CN.properties | 20 +++++++++++++++++++ 4 files changed, 69 insertions(+), 2 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java index aefea6524..d2da008cc 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java @@ -42,6 +42,7 @@ import javafx.scene.layout.*; import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.mod.RemoteMod; import org.jackhuang.hmcl.mod.RemoteModRepository; +import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository; import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Task; @@ -189,7 +190,9 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP } protected String getLocalizedCategory(String category) { - return i18n("curse.category." + category); + return repository instanceof ModrinthRemoteModRepository + ? i18n("modrinth.category." + category) + : i18n("curse.category." + category); } private String getLocalizedCategoryIndent(ModDownloadListPageSkin.CategoryIndented category) { @@ -200,7 +203,11 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP } protected String getLocalizedOfficialPage() { - return i18n("mods.curseforge"); + if (repository instanceof ModrinthRemoteModRepository) { + return i18n("mods.modrinth"); + } else { + return i18n("mods.curseforge"); + } } protected Profile.ProfileVersion getProfileVersion() { diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 394e0a36a..f165673d1 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -934,11 +934,16 @@ modpack.wizard.step.initialization.warning=Before making a modpack, please make modpack.wizard.step.initialization.server=Click here for more information on how to make a server modpack that can be automatically updated. modrinth.category.adventure=Adventure +modrinth.category.atmosphere=Atmosphere modrinth.category.audio=Audio modrinth.category.blocks=Blocks +modrinth.category.bloom=Bloom modrinth.category.bukkit=Bukkit modrinth.category.bungeecord=BungeeCord +modrinth.category.canvas=Canvas +modrinth.category.cartoon=Cartoon modrinth.category.challenging=Challenging +modrinth.category.colored-lighting=Colored Lighting modrinth.category.core-shaders=Core Shaders modrinth.category.combat=Combat modrinth.category.cursed=Cursed @@ -948,19 +953,25 @@ modrinth.category.entities=Entities modrinth.category.environment=Environment modrinth.category.equipment=Equipment modrinth.category.fabric=Fabric +modrinth.category.fantasy=Fantasy +modrinth.category.foliage=Foliage modrinth.category.fonts=Fonts modrinth.category.food=Food modrinth.category.forge=Forge modrinth.category.game-mechanics=Game Mechanics modrinth.category.gui=GUI +modrinth.category.high=High +modrinth.category.iris=Iris modrinth.category.items=Items modrinth.category.kitchen-sink=Kitchen-Sink modrinth.category.library=Library modrinth.category.lightweight=Lightweight modrinth.category.liteloader=LiteLoader modrinth.category.locale=Locale +modrinth.category.low=Low modrinth.category.magic=Magic modrinth.category.management=Management +modrinth.category.medium=Medium modrinth.category.minecraft=Minecraft modrinth.category.minigame=Minigame modrinth.category.misc=Misc @@ -970,13 +981,21 @@ modrinth.category.models=Models modrinth.category.modloader=Modloader modrinth.category.multiplayer=Multiplayer modrinth.category.neoforge=NeoForge +modrinth.category.optifine=OptiFine modrinth.category.optimization=Optimization modrinth.category.paper=Paper +modrinth.category.path-tracing=Path Tracing +modrinth.category.pbr=PBR +modrinth.category.potato=Potato modrinth.category.purpur=Purpur modrinth.category.quests=Quests modrinth.category.quilt=Quilt modrinth.category.realistic=Realistic +modrinth.category.reflections=Reflections modrinth.category.rift=Rift +modrinth.category.screenshot=Screenshot +modrinth.category.semi-realistic=Semi-realistic +modrinth.category.shadows=Shadows modrinth.category.simplistic=Simplistic modrinth.category.social=Social modrinth.category.spigot=Spigot @@ -987,6 +1006,7 @@ modrinth.category.themed=Themed modrinth.category.transportation=Transportation modrinth.category.tweaks=Tweaks modrinth.category.utility=Utility +modrinth.category.vanilla=Vanilla modrinth.category.vanilla-like=Vanilla-like modrinth.category.velocity=Velocity modrinth.category.waterfall=Waterfall diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 47c7b71c4..7e7a0e6d8 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -744,11 +744,16 @@ modpack.wizard.step.initialization.warning=在製作模組包前，請你確認 modpack.wizard.step.initialization.server=點選此處查看有關伺服器自動更新模組包的製作教學 modrinth.category.adventure=冒險 +modrinth.category.atmosphere=氛圍 modrinth.category.audio=聲音 modrinth.category.blocks=方塊 +modrinth.category.bloom=泛光 modrinth.category.bukkit=Bukkit modrinth.category.bungeecord=BungeeCord +modrinth.category.canvas=Canvas +modrinth.category.cartoon=卡通 modrinth.category.challenging=高難度 +modrinth.category.colored-lighting=彩色光照 modrinth.category.core-shaders=核心著色器 modrinth.category.combat=戰鬥 modrinth.category.cursed=Cursed @@ -758,19 +763,25 @@ modrinth.category.entities=實體 modrinth.category.environment=環境 modrinth.category.equipment=裝備 modrinth.category.fabric=Fabric +modrinth.category.fantasy=幻想 +modrinth.category.foliage=植被 modrinth.category.fonts=字體 modrinth.category.food=食物 modrinth.category.forge=Forge modrinth.category.game-mechanics=遊戲機制 modrinth.category.gui=GUI +modrinth.category.high=高 +modrinth.category.iris=Iris modrinth.category.items=物品 modrinth.category.kitchen-sink=大雜燴 modrinth.category.library=支援庫 modrinth.category.lightweight=輕量 modrinth.category.liteloader=LiteLoader modrinth.category.locale=在地化 +modrinth.category.low=低 modrinth.category.magic=魔法 modrinth.category.management=管理 +modrinth.category.medium=中 modrinth.category.minecraft=Minecraft modrinth.category.minigame=小遊戲 modrinth.category.misc=其他 @@ -780,13 +791,21 @@ modrinth.category.models=模型 modrinth.category.modloader=ModLoader modrinth.category.multiplayer=多人 modrinth.category.neoforge=NeoForge +modrinth.category.optifine=OptiFine modrinth.category.optimization=最佳化 modrinth.category.paper=Paper +modrinth.category.path-tracing=路径追踪 +modrinth.category.pbr=PBR +modrinth.category.potato=極低 modrinth.category.purpur=Purpur modrinth.category.quests=任務 modrinth.category.quilt=Quilt modrinth.category.realistic=寫實 +modrinth.category.reflections=反射 modrinth.category.rift=Rift +modrinth.category.screenshot=極高 +modrinth.category.semi-realistic=半寫實 +modrinth.category.shadows=陰影 modrinth.category.simplistic=簡單 modrinth.category.social=社交 modrinth.category.spigot=Spigot @@ -797,6 +816,7 @@ modrinth.category.themed=主題 modrinth.category.transportation=運輸 modrinth.category.tweaks=最佳化 modrinth.category.utility=實用 +modrinth.category.vanilla=原生 modrinth.category.vanilla-like=類原生 modrinth.category.velocity=Velocity modrinth.category.waterfall=Waterfall 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 86f8a8bca..88ab02149 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -754,11 +754,16 @@ modpack.wizard.step.initialization.warning=在制作整合包前，请你确认 modpack.wizard.step.initialization.server=点击此处查看有关服务器自动更新整合包的制作教程 modrinth.category.adventure=冒险 +modrinth.category.atmosphere=氛围 modrinth.category.audio=声音 modrinth.category.blocks=方块 +modrinth.category.bloom=泛光 modrinth.category.bukkit=Bukkit modrinth.category.bungeecord=BungeeCord +modrinth.category.canvas=Canvas +modrinth.category.cartoon=卡通 modrinth.category.challenging=高难度 +modrinth.category.colored-lighting=彩色光照 modrinth.category.core-shaders=核心着色器 modrinth.category.combat=战斗 modrinth.category.cursed=Cursed @@ -768,19 +773,25 @@ modrinth.category.entities=实体 modrinth.category.environment=环境 modrinth.category.equipment=装备 modrinth.category.fabric=Fabric +modrinth.category.fantasy=幻想 +modrinth.category.foliage=植被 modrinth.category.fonts=字体 modrinth.category.food=食物 modrinth.category.forge=Forge modrinth.category.game-mechanics=游戏机制 modrinth.category.gui=GUI +modrinth.category.high=高 +modrinth.category.iris=Iris modrinth.category.items=物品 modrinth.category.kitchen-sink=大杂烩 modrinth.category.library=支持库 modrinth.category.lightweight=轻量 modrinth.category.liteloader=LiteLoader modrinth.category.locale=本地化 +modrinth.category.low=低 modrinth.category.magic=魔法 modrinth.category.management=管理 +modrinth.category.medium=中 modrinth.category.minecraft=Minecraft modrinth.category.minigame=小游戏 modrinth.category.misc=其他 @@ -790,13 +801,21 @@ modrinth.category.models=模型 modrinth.category.modloader=Modloader modrinth.category.multiplayer=多人 modrinth.category.neoforge=NeoForge +modrinth.category.optifine=OptiFine modrinth.category.optimization=优化 modrinth.category.paper=Paper +modrinth.category.path-tracing=路径追踪 +modrinth.category.pbr=PBR +modrinth.category.potato=极低 modrinth.category.purpur=Purpur modrinth.category.quests=任务 modrinth.category.quilt=Quilt modrinth.category.realistic=写实 +modrinth.category.reflections=反射 modrinth.category.rift=Rift +modrinth.category.screenshot=极高 +modrinth.category.semi-realistic=半写实 +modrinth.category.shadows=阴影 modrinth.category.simplistic=简单 modrinth.category.social=社交 modrinth.category.spigot=Spigot @@ -807,6 +826,7 @@ modrinth.category.themed=主题 modrinth.category.transportation=运输 modrinth.category.tweaks=优化 modrinth.category.utility=实用 +modrinth.category.vanilla=原生 modrinth.category.vanilla-like=类原生 modrinth.category.velocity=Velocity modrinth.category.waterfall=Waterfall