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 c4ab15689..34ec25827 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 @@ -24,7 +24,7 @@ public class AboutPage extends StackPane { launcher.setExternalLink("https://hmcl.huangyuhui.net"); IconedTwoLineListItem author = new IconedTwoLineListItem(); - author.setImage(new Image("/assets/img/yellow_fish.png", 32, 32, false, true)); + author.setImage(new Image("/assets/img/yellow_fish.jpg", 32, 32, false, true)); author.setTitle("huanghongxun"); author.setSubtitle("https://www.huangyuhui.net"); author.setExternalLink("https://www.huangyuhui.net"); @@ -35,26 +35,41 @@ public class AboutPage extends StackPane { ComponentList thanks = new ComponentList(); { IconedTwoLineListItem yushijinhun = new IconedTwoLineListItem(); + yushijinhun.setImage(new Image("/assets/img/yushijinhun.jpg", 32, 32, false, true)); yushijinhun.setTitle("yushijinhun"); yushijinhun.setSubtitle(i18n("about.thanks_to.yushijinhun.statement")); yushijinhun.setExternalLink("https://yushi.moe/"); IconedTwoLineListItem bangbang93 = new IconedTwoLineListItem(); + bangbang93.setImage(new Image("/assets/img/bangbang93.jpg", 32, 32, false, true)); bangbang93.setTitle("bangbang93"); 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")); gamerteam.setExternalLink("http://www.zhaisoul.com/"); + IconedTwoLineListItem mcbbs = new IconedTwoLineListItem(); + mcbbs.setImage(new Image("/assets/img/chest.png", 32, 32, false, true)); + mcbbs.setTitle(i18n("about.thanks_to.mcbbs")); + mcbbs.setSubtitle(i18n("about.thanks_to.mcbbs.statement")); + mcbbs.setExternalLink("https://www.mcbbs.net/"); + IconedTwoLineListItem contributors = new IconedTwoLineListItem(); + contributors.setImage(new Image("/assets/img/github.png", 32, 32, false, true)); contributors.setTitle(i18n("about.thanks_to.contributors")); contributors.setSubtitle(i18n("about.thanks_to.contributors.statement")); contributors.setExternalLink("https://github.com/huanghongxun/HMCL/graphs/contributors"); - thanks.getContent().setAll(yushijinhun, bangbang93, gamerteam, contributors); + IconedTwoLineListItem users = new IconedTwoLineListItem(); + users.setImage(new Image("/assets/img/craft_table.png", 32, 32, false, true)); + users.setTitle(i18n("about.thanks_to.users")); + users.setSubtitle(i18n("about.thanks_to.users.statement")); + + thanks.getContent().setAll(yushijinhun, bangbang93, gamerteam, mcbbs, users, contributors); } ComponentList dep = new ComponentList(); diff --git a/HMCL/src/main/resources/assets/img/bangbang93.jpg b/HMCL/src/main/resources/assets/img/bangbang93.jpg new file mode 100644 index 000000000..64a801f9c Binary files /dev/null and b/HMCL/src/main/resources/assets/img/bangbang93.jpg differ diff --git a/HMCL/src/main/resources/assets/img/chest.png b/HMCL/src/main/resources/assets/img/chest.png new file mode 100644 index 000000000..3bd2a7f00 Binary files /dev/null and b/HMCL/src/main/resources/assets/img/chest.png differ 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/github.png b/HMCL/src/main/resources/assets/img/github.png new file mode 100644 index 000000000..182a1a3f7 Binary files /dev/null and b/HMCL/src/main/resources/assets/img/github.png differ diff --git a/HMCL/src/main/resources/assets/img/yellow_fish.jpg b/HMCL/src/main/resources/assets/img/yellow_fish.jpg new file mode 100644 index 000000000..63037ce62 Binary files /dev/null and b/HMCL/src/main/resources/assets/img/yellow_fish.jpg differ diff --git a/HMCL/src/main/resources/assets/img/yellow_fish.png b/HMCL/src/main/resources/assets/img/yellow_fish.png deleted file mode 100644 index 1b57f07f3..000000000 Binary files a/HMCL/src/main/resources/assets/img/yellow_fish.png and /dev/null differ diff --git a/HMCL/src/main/resources/assets/img/yushijinhun.jpg b/HMCL/src/main/resources/assets/img/yushijinhun.jpg new file mode 100644 index 000000000..748b12bb8 Binary files /dev/null and b/HMCL/src/main/resources/assets/img/yushijinhun.jpg differ diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index bd2e4e437..253512a46 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -17,17 +17,25 @@ # # Contributors: dxNeil, machinesmith42 +about=About about.copyright=Copyright about.copyright.statement=Copyright (c) 2021 huangyuhui. about.author=Author about.author.statement=huanghongxun (hmcl@huangyuhui.net) -about.thanks_to=Thanks to -about.thanks_to.statement=bangbang93 (BMCLAPI, https://bmclapi2.bangbang93.com/)\ngamerteam (Default background image)\nAll contributors who participated in this project via issues, pull requests, etc. -about.dependency=Dependencies -# Due to space limitations, only first authors are listed -about.dependency.statement=JFoenix (Shadi Shaheen, Apache 2.0)\nGson (Google, Apache 2.0)\nApache Commons Compress (ASF, Apache 2.0)\nXZ for Java (Lasse Collin, Public Domain)\nfx-gson (Joffrey Bion, MIT)\nConstant Pool Scanner (jenkins-ci, CDDL, GPL 2)\nOpenNBT (Steveice10, BSD 3-Clause) about.claim=Statement about.claim.statement=Minecraft is copyrighted by Mojang AB. We are not responsible for any copyright infringement arising from the use of this software. +about.dependency=Dependencies +about.donations=Donations +about.legal=Legal Acknowledgement +about.thanks_to=Thanks to +about.thanks_to.bangbang93.statement=BMCLAPI +about.thanks_to.contributors=All contributors who participated in this project via issues, pull requests, etc. +about.thanks_to.gamerteam.statement=gamerteam (Default background image) +about.thanks_to.mcbbs=MCBBS +about.thanks_to.mcbbs.statement=Provide MCBBS download source +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 about.open_source=Open Source about.open_source.statement=GPL v3 (https://github.com/huanghongxun/HMCL/) 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 d2244803e..b7f5a05b5 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -31,7 +31,11 @@ about.thanks_to=鸣谢 about.thanks_to.bangbang93.statement=提供 BMCLAPI 下载源，请赞助支持 BMCLAPI！ about.thanks_to.contributors=所有通过 Issues、Pull Requests 等方式参与本项目的贡献者 about.thanks_to.contributors.statement=没有开源社区的支持，Hello Minecraft! Launcher 无法走到今天 -about.thanks_to.gamerteam.statement=默认背景图与 HMCL 官方网站 CDN +about.thanks_to.gamerteam.statement=提供默认背景图与 HMCL 官方网站 CDN +about.thanks_to.mcbbs=MCBBS 我的世界中文论坛 +about.thanks_to.mcbbs.statement=提供 MCBBS 下载源 +about.thanks_to.users=HMCL 用户群成员 +about.thanks_to.users.statement=感谢用户群成员赞助充电、积极催更、反馈问题、出谋划策 about.thanks_to.yushijinhun.statement=authlib-injector 相关支持 about.open_source=开源 about.open_source.statement=GPL v3 (https://github.com/huanghongxun/HMCL/)