Skip to content

Commit 8923be5

Browse files
authored
修复下载光影时对话框的标题文字错误 (#5034)
1 parent a07c0d9 commit 8923be5

8 files changed

Lines changed: 22 additions & 19 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;
@@ -96,7 +95,7 @@ public DownloadPage(String uploadVersion) {
9695
}));
9796
modTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofMod((profile, version, file) -> download(profile, version, file, "mods"), true)));
9897
resourcePackTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofResourcePack((profile, version, file) -> download(profile, version, file, "resourcepacks"), true)));
99-
shaderTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(ModrinthRemoteModRepository.SHADER_PACKS, (profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
98+
shaderTab.setNodeSupplier(loadVersionFor(() -> HMCLLocalizedDownloadListPage.ofShaderPack((profile, version, file) -> download(profile, version, file, "shaderpacks"), true)));
10099
worldTab.setNodeSupplier(loadVersionFor(() -> new DownloadListPage(CurseForgeRemoteModRepository.WORLDS)));
101100
tab = new TabHeader(transitionPane, newGameTab, modpackTab, modTab, resourcePackTab, shaderTab, worldTab);
102101

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -447,22 +447,13 @@ private static final class ModVersion extends JFXDialogLayout {
447447
public ModVersion(RemoteMod.Version version, DownloadPage selfPage) {
448448
RemoteModRepository.Type type = selfPage.repository.getType();
449449

450-
String title;
451-
switch (type) {
452-
case WORLD:
453-
title = "world.download.title";
454-
break;
455-
case MODPACK:
456-
title = "modpack.download.title";
457-
break;
458-
case RESOURCE_PACK:
459-
title = "resourcepack.download.title";
460-
break;
461-
case MOD:
462-
default:
463-
title = "mods.download.title";
464-
break;
465-
}
450+
String title = switch (type) {
451+
case WORLD -> "world.download.title";
452+
case MODPACK -> "modpack.download.title";
453+
case RESOURCE_PACK -> "resourcepack.download.title";
454+
case SHADER_PACK -> "shaderpack.download.title";
455+
default -> "mods.download.title";
456+
};
466457
this.setHeading(new HBox(new Label(i18n(title, version.getName()))));
467458

468459
VBox box = new VBox(8);

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
@@ -1425,6 +1425,8 @@ settings.type.special.enable=Enable Instance-specific Settings
14251425
settings.type.special.edit=Edit Current Instance Settings
14261426
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.
14271427

1428+
shaderpack.download.title=Download Shader - %1s
1429+
14281430
sponsor=Donors
14291431
sponsor.bmclapi=Downloads for the Chinese Mainland are provided by BMCLAPI. Click here for more information.
14301432
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_lzh.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,8 @@ settings.type.special.enable=啟例殊戲設 (不殃余者)
12011201
settings.type.special.edit=纂例殊戲設
12021202
settings.type.special.edit.hint=是戲例「%s」既啟「例殊戲設」,是故本頁諸置設弗行於斯。擊此鏈赴斯版之「戲設」頁。
12031203

1204+
shaderpack.download.title=引光影 - %1s
1205+
12041206
sponsor=資勉
12051207
sponsor.bmclapi=本朝迅傳之功在 BMCLAPI 焉。BMCLAPI 久行善業,垂衆以慷慨解囊助作者兼濟天下也。[願聞其詳]
12061208
sponsor.hmcl=Hello Minecraft! Launcher,乃一免費,自由,開源之礦藝啟者。[願聞其詳]

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

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

1215+
shaderpack.download.title=光影下載 - %1s
1216+
12151217
sponsor=贊助
12161218
sponsor.bmclapi=中國大陸下載源由 BMCLAPI 提供高速下載服務。點選此處查閱詳細訊息。
12171219
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
@@ -1222,6 +1222,8 @@ settings.type.special.enable=启用实例特定游戏设置 (不影响其他游
12221222
settings.type.special.edit=编辑实例特定游戏设置
12231223
settings.type.special.edit.hint=当前游戏实例“%s”启用了“实例特定游戏设置”,因此本页面选项不对该实例生效。点击链接前往该实例的“游戏设置”页。
12241224

1225+
shaderpack.download.title=光影下载 - %1s
1226+
12251227
sponsor=赞助
12261228
sponsor.bmclapi=国内下载源由 BMCLAPI 提供高速下载服务。BMCLAPI 为公益服务,赞助 BMCLAPI 可以帮助作者更好地提供稳定高速的下载服务。[点击此处查阅详细信息]
12271229
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
@@ -32,6 +32,7 @@ enum Type {
3232
MOD,
3333
MODPACK,
3434
RESOURCE_PACK,
35+
SHADER_PACK,
3536
WORLD,
3637
CUSTOMIZATION
3738
}

0 commit comments

Comments
 (0)