diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java index 4ac981bb8..b4a9524a5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java @@ -498,4 +498,10 @@ public final class SVG { "M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z", fill, width, height); } + + public static Node discord(ObjectBinding fill, double width, double height) { + return createSVGPath( + "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z", + fill, width, height); + } } 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 de588ab9f..3d0ed9181 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 @@ -98,13 +98,30 @@ public class AboutPage extends StackPane { contributors.setSubtitle(i18n("about.thanks_to.contributors.statement")); contributors.setExternalLink("https://github.com/huanghongxun/HMCL/graphs/contributors"); + thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, noin, gamerteam, redLnn, contributors); + } + + ComponentList community = new ComponentList(); + { 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")); users.setExternalLink("https://hmcl.huangyuhui.net/api/redirect/sponsor"); - thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, noin, gamerteam, redLnn, users, contributors); + IconedTwoLineListItem discord = new IconedTwoLineListItem(); + discord.setImage(new Image("/assets/img/discord.png", 32, 32, false, true)); + discord.setTitle(i18n("about.community.discord")); + discord.setSubtitle(i18n("about.community.discord.statement")); + discord.setExternalLink("https://discord.gg/jVvC7HfM6U"); + + IconedTwoLineListItem kaiheila = new IconedTwoLineListItem(); + kaiheila.setImage(new Image("/assets/img/kaiheila.jpeg", 32, 32, false, true)); + kaiheila.setTitle(i18n("about.community.kaiheila")); + kaiheila.setSubtitle(i18n("about.community.kaiheila.statement")); + kaiheila.setExternalLink("https://kaihei.co/Kx7n3t"); + + community.getContent().setAll(users, discord, kaiheila); } ComponentList dep = new ComponentList(); @@ -176,6 +193,9 @@ public class AboutPage extends StackPane { ComponentList.createComponentListTitle(i18n("about.thanks_to")), thanks, + ComponentList.createComponentListTitle(i18n("about.community")), + community, + ComponentList.createComponentListTitle(i18n("about.dependency")), dep, diff --git a/HMCL/src/main/resources/assets/img/discord.png b/HMCL/src/main/resources/assets/img/discord.png new file mode 100644 index 000000000..e2964bb6b Binary files /dev/null and b/HMCL/src/main/resources/assets/img/discord.png differ diff --git a/HMCL/src/main/resources/assets/img/kaiheila.jpeg b/HMCL/src/main/resources/assets/img/kaiheila.jpeg new file mode 100644 index 000000000..5172f780d Binary files /dev/null and b/HMCL/src/main/resources/assets/img/kaiheila.jpeg differ diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 104c5c3f1..50324ad1a 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -24,6 +24,11 @@ about.author=Author about.author.statement=huanghongxun (hmcl@huangyuhui.net) about.claim=EULA about.claim.statement=Click the link for the whole text. +about.community=Community +about.community.discord=Discord +about.community.discord.statement=Join chat! +about.community.kaiheila=KaiHeiLa +about.community.kaiheila.statement=Join chat! about.dependency=Dependencies about.legal=Legal Acknowledgement about.thanks_to=Thanks to diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 9018b45f0..05098185e 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -24,6 +24,11 @@ about.author=作者 about.author.statement=huanghongxun (hmcl@huangyuhui.net) about.claim=用戶協議 about.claim.statement=點擊連結以查看全文 +about.community=社區 +about.community.discord=Discord +about.community.discord.statement=歡迎加入 Discord 討論區，加入後請遵守討論區規定 +about.community.kaiheila=開黑啦 +about.community.kaiheila.statement=歡迎加入開黑啦討論區，加入後請遵守討論區規定 about.dependency=相依元件 about.legal=法律聲明 about.thanks_to=鳴謝 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 99d45eb12..462cd6461 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -24,6 +24,11 @@ about.author=作者 about.author.statement=huanghongxun (hmcl@huangyuhui.net) about.claim=用户协议 about.claim.statement=点击链接以查看全文 +about.community=社区 +about.community.discord=Discord +about.community.discord.statement=欢迎加入 Discord 讨论区，加入后请遵守讨论区规定 +about.community.kaiheila=开黑啦 +about.community.kaiheila.statement=欢迎加入开黑啦讨论区，加入后请遵守讨论区规定 about.dependency=依赖 about.legal=法律声明 about.thanks_to=鸣谢