diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java index 8788de983..b0dd7b698 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java @@ -64,10 +64,15 @@ public class AboutPage extends StackPane { bangbang93.setSubtitle(i18n("about.thanks_to.bangbang93.statement")); bangbang93.setExternalLink("https://bmclapi2.bangbang93.com/"); + IconedTwoLineListItem gamerteam = new IconedTwoLineListItem(); + gamerteam.setTitle("gamerteam"); + gamerteam.setImage(new Image("/assets/img/gamerteam.jpg", 32, 32, false, true)); + gamerteam.setSubtitle(i18n("about.thanks_to.gamerteam.statement")); + IconedTwoLineListItem redLnn = new IconedTwoLineListItem(); redLnn.setTitle("Red_lnn"); redLnn.setImage(new Image("/assets/img/red_lnn.jpg", 32, 32, false, true)); - redLnn.setSubtitle(i18n("about.thanks_to.gamerteam.statement")); + redLnn.setSubtitle(i18n("about.thanks_to.red_lnn.statement")); IconedTwoLineListItem mcbbs = new IconedTwoLineListItem(); mcbbs.setImage(new Image("/assets/img/chest.png", 32, 32, false, true)); @@ -81,6 +86,12 @@ public class AboutPage extends StackPane { mcmod.setSubtitle(i18n("about.thanks_to.mcmod.statement")); mcmod.setExternalLink("https://www.mcmod.cn/"); + IconedTwoLineListItem noin = new IconedTwoLineListItem(); + noin.setImage(new Image("/assets/img/noin.png", 32, 32, false, true)); + noin.setTitle(i18n("about.thanks_to.noin")); + noin.setSubtitle(i18n("about.thanks_to.noin.statement")); + noin.setExternalLink("https://noin.cn/"); + IconedTwoLineListItem contributors = new IconedTwoLineListItem(); contributors.setImage(new Image("/assets/img/github.png", 32, 32, false, true)); contributors.setTitle(i18n("about.thanks_to.contributors")); @@ -93,7 +104,7 @@ public class AboutPage extends StackPane { users.setSubtitle(i18n("about.thanks_to.users.statement")); users.setExternalLink("https://hmcl.huangyuhui.net/api/redirect/sponsor"); - thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, redLnn, users, contributors); + thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, noin, gamerteam, redLnn, users, contributors); } ComponentList dep = new ComponentList(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPageSkin.java index 4c242215c..f702f6c62 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/multiplayer/MultiplayerPageSkin.java @@ -186,12 +186,21 @@ public class MultiplayerPageSkin extends SkinBase { natDetectionPane.getContent().add(pane); } + ComponentList thanksPane = new ComponentList(); + { + Label label = new Label(i18n("multiplayer.powered_by")); + + thanksPane.getContent().add(label); + } + content.getChildren().setAll( hint, ComponentList.createComponentListTitle(i18n("multiplayer.session")), roomPane, ComponentList.createComponentListTitle(i18n("multiplayer.nat")), - natDetectionPane + natDetectionPane, + ComponentList.createComponentListTitle(i18n("about.thanks_to")), + thanksPane ); } } diff --git a/HMCL/src/main/resources/assets/img/gamerteam.jpg b/HMCL/src/main/resources/assets/img/gamerteam.jpg new file mode 100644 index 000000000..0ee98e3ce Binary files /dev/null and b/HMCL/src/main/resources/assets/img/gamerteam.jpg differ diff --git a/HMCL/src/main/resources/assets/img/noin.png b/HMCL/src/main/resources/assets/img/noin.png new file mode 100644 index 000000000..b0529b009 Binary files /dev/null and b/HMCL/src/main/resources/assets/img/noin.png differ diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index d4aa8f7eb..3bbd10de6 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -27,14 +27,17 @@ about.claim.statement=Minecraft is copyrighted by Mojang AB. We are not responsi about.dependency=Dependencies about.legal=Legal Acknowledgement about.thanks_to=Thanks to -about.thanks_to.bangbang93.statement=BMCLAPI +about.thanks_to.bangbang93.statement=BMCLAPI download source provider. about.thanks_to.contributors=All contributors who participated in this project via issues, pull requests, etc. about.thanks_to.contributors.statement=Thanks to the open source community for supporting the Hello Minecraft! Launcher -about.thanks_to.gamerteam.statement=Default background image +about.thanks_to.gamerteam.statement=Default background image provider. about.thanks_to.mcbbs=MCBBS -about.thanks_to.mcbbs.statement=Provide MCBBS download source +about.thanks_to.mcbbs.statement=MCBBS download source provider. about.thanks_to.mcmod=mcmod.cn -about.thanks_to.mcmod.statement=Provide Mod Chinese name translations +about.thanks_to.mcmod.statement=Mod Chinese name translations provider. +about.thanks_to.noin=noin.cn +about.thanks_to.noin.statement=Multiplayer service provider. +about.thanks_to.red_lnn.statement=Default background image provider. about.thanks_to.users=Members of HMCL User Group about.thanks_to.users.statement=Thanks to donations, bug reports and so on. about.thanks_to.yushijinhun.statement=authlib-injector diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index cf36b5aee..98d14d709 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -35,6 +35,9 @@ 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.noin=這裡 (noin.cn) +about.thanks_to.noin.statement=提供多人聯機服務 (cato - ioi 系列作品) +about.thanks_to.red_lnn.statement=提供默認背景圖 about.thanks_to.users=HMCL 用戶群成員 about.thanks_to.users.statement=感謝用戶群成員贊助充電、積極催更、迴響問題、出謀劃策 about.thanks_to.yushijinhun.statement=authlib-injector 相关支援 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 277b014f2..7b7855c4c 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -35,6 +35,9 @@ 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.noin=这里 (noin.cn) +about.thanks_to.noin.statement=提供多人联机服务 (cato - ioi 系列作品) +about.thanks_to.red_lnn.statement=提供默认背景图 about.thanks_to.users=HMCL 用户群成员 about.thanks_to.users.statement=感谢用户群成员赞助充电、积极催更、反馈问题、出谋划策 about.thanks_to.yushijinhun.statement=authlib-injector 相关支持 @@ -564,7 +567,7 @@ multiplayer.nat.type.restricted_cone=中（受限圆锥型） multiplayer.nat.type.symmetric=差（对称型） multiplayer.nat.type.symmetric_udp_firewall=差（对称型+防火墙） multiplayer.nat.type.unknown=未知 -multiplayer.powered_by=由 cato 提供技术支持 +multiplayer.powered_by=多人联机服务由 这里 (noin.cn) 提供 multiplayer.session=房间 multiplayer.session.name.format=%1$s 的房间 multiplayer.session.name.motd=HMCL 多人联机房间 - %s