Skip to content

Commit d6535f5

Browse files
Wulian2333gf8jv4dv
authored andcommitted
修复下载光影时对话框的标题文字错误 (#5034)
1 parent e8b9d98 commit d6535f5

7 files changed

Lines changed: 16 additions & 3 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/DownloadPage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.jackhuang.hmcl.download.game.GameRemoteVersion;
2626
import org.jackhuang.hmcl.mod.RemoteMod;
2727
import org.jackhuang.hmcl.mod.curse.CurseForgeRemoteModRepository;
28-
import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository;
2928
import org.jackhuang.hmcl.setting.DownloadProviders;
3029
import org.jackhuang.hmcl.setting.Profile;
3130
import org.jackhuang.hmcl.setting.Profiles;
@@ -100,7 +99,7 @@ public DownloadPage(String uploadVersion) {
10099
}));
101100
modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, file) -> download(profile, version, file, "mods"), true)));
102101
resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, file) -> download(profile, version, file, "resourcepacks"), true)));
103-
shaderTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(ModrinthRemoteModRepository.SHADER_PACKS, (profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
102+
shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
104103
worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
105104
tab = new TabHeader(newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);
106105

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@ public ModVersion(RemoteMod.Version version, DownloadPage selfPage) {
453453
case RESOURCE_PACK:
454454
title = "resourcepack.download.title";
455455
break;
456+
case SHADER_PACK:
457+
title = "shaderpack.download.title";
458+
break;
456459
case MOD:
457460
default:
458461
title = "mods.download.title";

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/HMCLLocalizedDownloadListPage.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
import java.util.MissingResourceException;
2727

28-
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
2928
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
29+
import static org.jackhuang.hmcl.util.logging.Logger.LOG;
3030

3131
public final class HMCLLocalizedDownloadListPage extends DownloadListPage {
3232
public static DownloadListPage ofMod(DownloadPage.DownloadCallback callback, boolean versionSelection) {
@@ -49,6 +49,10 @@ public static DownloadListPage ofResourcePack(DownloadPage.DownloadCallback call
4949
return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.RESOURCE_PACK, CurseForgeRemoteModRepository.RESOURCE_PACKS, ModrinthRemoteModRepository.RESOURCE_PACKS);
5050
}
5151

52+
public static DownloadListPage ofShaderPack(DownloadPage.DownloadCallback callback, boolean versionSelection) {
53+
return new HMCLLocalizedDownloadListPage(callback, versionSelection, RemoteModRepository.Type.SHADER_PACK, null, ModrinthRemoteModRepository.SHADER_PACKS);
54+
}
55+
5256
private HMCLLocalizedDownloadListPage(DownloadPage.DownloadCallback callback, boolean versionSelection, RemoteModRepository.Type type, CurseForgeRemoteModRepository curseForge, ModrinthRemoteModRepository modrinth) {
5357
super(null, callback, versionSelection);
5458

HMCL/src/main/resources/assets/lang/I18N.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,6 +1387,8 @@ settings.type.special.enable=Enable Instance-specific Settings
13871387
settings.type.special.edit=Edit Current Instance Settings
13881388
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.
13891389

1390+
shaderpack.download.title=Download Shader - %1s
1391+
13901392
sponsor=Donors
13911393
sponsor.bmclapi=Downloads for the Chinese Mainland are provided by BMCLAPI. Click here for more information.
13921394
sponsor.hmcl=Hello Minecraft! Launcher is a FOSS Minecraft launcher that allows users to manage multiple Minecraft instances easily. Click here for more information.

HMCL/src/main/resources/assets/lang/I18N_zh.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,8 @@ settings.type.special.enable=啟用實例特定遊戲設定 (不影響其他實
11751175
settings.type.special.edit=編輯實例特定遊戲設定
11761176
settings.type.special.edit.hint=目前實例「%s」啟用了「實例特定遊戲設定」,本頁面選項不對目前實例生效。點擊連結以修改目前實例設定。
11771177

1178+
shaderpack.download.title=光影下載 - %1s
1179+
11781180
sponsor=贊助
11791181
sponsor.bmclapi=中國大陸下載源由 BMCLAPI 提供高速下載服務。點選此處查閱詳細訊息。
11801182
sponsor.hmcl=Hello Minecraft! Launcher 是一個免費、自由、開源的 Minecraft 啟動器,允許玩家方便快捷地安裝、管理、執行遊戲。點選此處查閱詳細訊息。

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,6 +1185,8 @@ settings.type.special.enable=启用实例特定游戏设置 (不影响其他游
11851185
settings.type.special.edit=编辑实例特定游戏设置
11861186
settings.type.special.edit.hint=当前游戏实例“%s”启用了“实例特定游戏设置”,因此本页面选项不对该实例生效。点击链接前往该实例的“游戏设置”页。
11871187

1188+
shaderpack.download.title=光影下载 - %1s
1189+
11881190
sponsor=赞助
11891191
sponsor.bmclapi=国内下载源由 BMCLAPI 提供高速下载服务。BMCLAPI 为公益服务,赞助 BMCLAPI 可以帮助作者更好地提供稳定高速的下载服务。[点击此处查阅详细信息]
11901192
sponsor.hmcl=Hello Minecraft! Launcher 是一个免费、自由、开放源代码的 Minecraft 启动器。[点击此处查阅详细信息]

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/RemoteModRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ enum Type {
3131
MOD,
3232
MODPACK,
3333
RESOURCE_PACK,
34+
SHADER_PACK,
3435
WORLD,
3536
CUSTOMIZATION
3637
}

0 commit comments

Comments
 (0)