修复下载光影时对话框的标题文字错误 (#5034)

This commit is contained in:
Wulian233
2026-01-02 21:06:59 +08:00
committed by GitHub
parent a07c0d9746
commit 8923be50ec
8 changed files with 22 additions and 19 deletions

View File

@@ -25,7 +25,6 @@ import org.jackhuang.hmcl.download.*;
import org.jackhuang.hmcl.download.game.GameRemoteVersion; import org.jackhuang.hmcl.download.game.GameRemoteVersion;
import org.jackhuang.hmcl.mod.RemoteMod; import org.jackhuang.hmcl.mod.RemoteMod;
import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository; import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
import org.jackhuang.hmcl.setting.DownloadProviders; import org.jackhuang.hmcl.setting.DownloadProviders;
import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profile;
import org.jackhuang.hmcl.setting.Profiles; import org.jackhuang.hmcl.setting.Profiles;
@@ -96,7 +95,7 @@ public class DownloadPage extends DecoratorAnimatedPage implements DecoratorPage
})); }));
modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, file) -> download(profile, version, file, "mods"), true))); modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, file) -> download(profile, version, file, "mods"), true)));
resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, file) -> download(profile, version, file, "resourcepacks"), true))); resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, file) -> download(profile, version, file, "resourcepacks"), true)));
shaderTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(ModrinthRemoteModRepository.SHADER_PACKS, (profile, version, file) -> download(profile, version, file, "shaderpacks"), true))); shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS))); worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab); tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);

View File

@@ -447,22 +447,13 @@ public class DownloadPage extends Control implements DecoratorPage {
public ModVersion(RemoteMod.Version version, DownloadPage selfPage) { public ModVersion(RemoteMod.Version version, DownloadPage selfPage) {
RemoteModRepository.Type type = selfPage.repository.getType(); RemoteModRepository.Type type = selfPage.repository.getType();
String title; String title = switch (type) {
switch (type) { case WORLD -> "world.download.title";
case WORLD: case MODPACK -> "modpack.download.title";
title = "world.download.title"; case RESOURCE_PACK -> "resourcepack.download.title";
break; case SHADER_PACK -> "shaderpack.download.title";
case MODPACK: default -> "mods.download.title";
title = "modpack.download.title"; };
break;
case RESOURCE_PACK:
title = "resourcepack.download.title";
break;
case MOD:
default:
title = "mods.download.title";
break;
}
this.setHeading(new HBox(new Label(i18n(title, version.getName())))); this.setHeading(new HBox(new Label(i18n(title, version.getName()))));
VBox box = new VBox(8); VBox box = new VBox(8);

View File

@@ -25,8 +25,8 @@ import org.jackhuang.hmcl.util.i18n.I18n;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
public final class HMCLLocalizedDownloadListPage extends DownloadListPage { public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
public static DownloadListPage ofMod(DownloadPage.DownloadCallback callback, boolean versionSelection) { public static DownloadListPage ofMod(DownloadPage.DownloadCallback callback, boolean versionSelection) {
@@ -49,6 +49,10 @@ public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.RESOURCE_PACK, CurseForgeRemoteModRepository.RESOURCE_PACKS, ModrinthRemoteModRepository.RESOURCE_PACKS); return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.RESOURCE_PACK, CurseForgeRemoteModRepository.RESOURCE_PACKS, ModrinthRemoteModRepository.RESOURCE_PACKS);
} }
public static DownloadListPage ofShaderPack(DownloadPage.DownloadCallback callback, boolean versionSelection) {
return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.SHADER_PACK, null, ModrinthRemoteModRepository.SHADER_PACKS);
}
private HMCLLocalizedDownloadListPage(DownloadPage.DownloadCallback callback, boolean versionSelection, RemoteModRepository.Type type, CurseForgeRemoteModRepository curseForge, ModrinthRemoteModRepository modrinth) { private HMCLLocalizedDownloadListPage(DownloadPage.DownloadCallback callback, boolean versionSelection, RemoteModRepository.Type type, CurseForgeRemoteModRepository curseForge, ModrinthRemoteModRepository modrinth) {
super(null, callback, versionSelection); super(null, callback, versionSelection);

View File

@@ -1425,6 +1425,8 @@ settings.type.special.enable=Enable Instance-specific Settings
settings.type.special.edit=Edit Current Instance Settings settings.type.special.edit=Edit Current Instance Settings
settings.type.special.edit.hint=Current instance "%s" has enabled the "Instance-specific Settings". All options on this page will NOT affect that instance. Click here to edit its own settings. settings.type.special.edit.hint=Current instance "%s" has enabled the "Instance-specific Settings". All options on this page will NOT affect that instance. Click here to edit its own settings.
shaderpack.download.title=Download Shader - %1s
sponsor=Donors sponsor=Donors
sponsor.bmclapi=Downloads for the Chinese Mainland are provided by BMCLAPI. Click here for more information. sponsor.bmclapi=Downloads for the Chinese Mainland are provided by BMCLAPI. Click here for more information.
sponsor.hmcl=Hello Minecraft! Launcher is a FOSS Minecraft launcher that allows users to manage multiple Minecraft instances easily. Click here for more information. sponsor.hmcl=Hello Minecraft! Launcher is a FOSS Minecraft launcher that allows users to manage multiple Minecraft instances easily. Click here for more information.

View File

@@ -1201,6 +1201,8 @@ settings.type.special.enable=啟例殊戲設 (不殃余者)
settings.type.special.edit=纂例殊戲設 settings.type.special.edit=纂例殊戲設
settings.type.special.edit.hint=是戲例「%s」既啟「例殊戲設」是故本頁諸置設弗行於斯。擊此鏈赴斯版之「戲設」頁。 settings.type.special.edit.hint=是戲例「%s」既啟「例殊戲設」是故本頁諸置設弗行於斯。擊此鏈赴斯版之「戲設」頁。
shaderpack.download.title=引光影 - %1s
sponsor=資勉 sponsor=資勉
sponsor.bmclapi=本朝迅傳之功在 BMCLAPI 焉。BMCLAPI 久行善業,垂衆以慷慨解囊助作者兼濟天下也。[願聞其詳] sponsor.bmclapi=本朝迅傳之功在 BMCLAPI 焉。BMCLAPI 久行善業,垂衆以慷慨解囊助作者兼濟天下也。[願聞其詳]
sponsor.hmcl=Hello Minecraft! Launcher乃一免費自由開源之礦藝啟者。[願聞其詳] sponsor.hmcl=Hello Minecraft! Launcher乃一免費自由開源之礦藝啟者。[願聞其詳]

View File

@@ -1212,6 +1212,8 @@ settings.type.special.enable=啟用實例特定遊戲設定 (不影響其他實
settings.type.special.edit=編輯實例特定遊戲設定 settings.type.special.edit=編輯實例特定遊戲設定
settings.type.special.edit.hint=目前實例「%s」啟用了「實例特定遊戲設定」本頁面選項不對目前實例生效。點擊連結以修改目前實例設定。 settings.type.special.edit.hint=目前實例「%s」啟用了「實例特定遊戲設定」本頁面選項不對目前實例生效。點擊連結以修改目前實例設定。
shaderpack.download.title=光影下載 - %1s
sponsor=贊助 sponsor=贊助
sponsor.bmclapi=中國大陸下載源由 BMCLAPI 提供高速下載服務。點選此處查閱詳細訊息。 sponsor.bmclapi=中國大陸下載源由 BMCLAPI 提供高速下載服務。點選此處查閱詳細訊息。
sponsor.hmcl=Hello Minecraft! Launcher 是一個免費、自由、開源的 Minecraft 啟動器,允許玩家方便快捷地安裝、管理、執行遊戲。點選此處查閱詳細訊息。 sponsor.hmcl=Hello Minecraft! Launcher 是一個免費、自由、開源的 Minecraft 啟動器,允許玩家方便快捷地安裝、管理、執行遊戲。點選此處查閱詳細訊息。

View File

@@ -1222,6 +1222,8 @@ settings.type.special.enable=启用实例特定游戏设置 (不影响其他游
settings.type.special.edit=编辑实例特定游戏设置 settings.type.special.edit=编辑实例特定游戏设置
settings.type.special.edit.hint=当前游戏实例“%s”启用了“实例特定游戏设置”因此本页面选项不对该实例生效。点击链接前往该实例的“游戏设置”页。 settings.type.special.edit.hint=当前游戏实例“%s”启用了“实例特定游戏设置”因此本页面选项不对该实例生效。点击链接前往该实例的“游戏设置”页。
shaderpack.download.title=光影下载 - %1s
sponsor=赞助 sponsor=赞助
sponsor.bmclapi=国内下载源由 BMCLAPI 提供高速下载服务。BMCLAPI 为公益服务,赞助 BMCLAPI 可以帮助作者更好地提供稳定高速的下载服务。[点击此处查阅详细信息] sponsor.bmclapi=国内下载源由 BMCLAPI 提供高速下载服务。BMCLAPI 为公益服务,赞助 BMCLAPI 可以帮助作者更好地提供稳定高速的下载服务。[点击此处查阅详细信息]
sponsor.hmcl=Hello Minecraft! Launcher 是一个免费、自由、开放源代码的 Minecraft 启动器。[点击此处查阅详细信息] sponsor.hmcl=Hello Minecraft! Launcher 是一个免费、自由、开放源代码的 Minecraft 启动器。[点击此处查阅详细信息]

View File

@@ -32,6 +32,7 @@ public interface RemoteModRepository {
MOD, MOD,
MODPACK, MODPACK,
RESOURCE_PACK, RESOURCE_PACK,
SHADER_PACK,
WORLD, WORLD,
CUSTOMIZATION CUSTOMIZATION
} }