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 b0dd7b698..de588ab9f 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 @@ -26,7 +26,6 @@ import javafx.scene.layout.VBox; import org.jackhuang.hmcl.Metadata; import org.jackhuang.hmcl.ui.construct.ComponentList; import org.jackhuang.hmcl.ui.construct.IconedTwoLineListItem; -import org.jackhuang.hmcl.ui.construct.TwoLineListItem; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; @@ -68,6 +67,7 @@ public class AboutPage extends StackPane { 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 redLnn = new IconedTwoLineListItem(); redLnn.setTitle("Red_lnn"); @@ -149,17 +149,20 @@ public class AboutPage extends StackPane { ComponentList legal = new ComponentList(); { - TwoLineListItem copyright = new TwoLineListItem(); + IconedTwoLineListItem copyright = new IconedTwoLineListItem(); copyright.setTitle(i18n("about.copyright")); copyright.setSubtitle(i18n("about.copyright.statement")); + copyright.setExternalLink("https://hmcl.huangyuhui.net/about/"); - TwoLineListItem claim = new TwoLineListItem(); + IconedTwoLineListItem claim = new IconedTwoLineListItem(); claim.setTitle(i18n("about.claim")); claim.setSubtitle(i18n("about.claim.statement")); + claim.setExternalLink(Metadata.EULA_URL); - TwoLineListItem openSource = new TwoLineListItem(); + IconedTwoLineListItem openSource = new IconedTwoLineListItem(); openSource.setTitle(i18n("about.open_source")); openSource.setSubtitle(i18n("about.open_source.statement")); + openSource.setExternalLink("https://github.com/huanghongxun/HMCL"); legal.getContent().setAll(copyright, claim, openSource); } diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 07ef38371..104c5c3f1 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -22,8 +22,8 @@ about.copyright=Copyright about.copyright.statement=Copyright (c) 2021 huangyuhui. about.author=Author about.author.statement=huanghongxun (hmcl@huangyuhui.net) -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.claim=EULA +about.claim.statement=Click the link for the whole text. 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 b4dc76f26..9018b45f0 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -22,8 +22,8 @@ about.copyright=著作權 about.copyright.statement=著作權所有 (c) 2021 huangyuhui。 about.author=作者 about.author.statement=huanghongxun (hmcl@huangyuhui.net) -about.claim=免責聲明 -about.claim.statement=Minecraft 著作權歸 Mojang AB 所有,使用本軟體產生的著作權問題,軟體製作方概不負責。請支援正版。 +about.claim=用戶協議 +about.claim.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 08c6da8d2..99d45eb12 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -22,8 +22,8 @@ about.copyright=版权 about.copyright.statement=版权所有 (c) 2021 huangyuhui. about.author=作者 about.author.statement=huanghongxun (hmcl@huangyuhui.net) -about.claim=免责声明 -about.claim.statement=Minecraft 版权归 Mojang AB 所有,使用本软件产生的版权问题,软件制作方概不负责。请支持正版。 +about.claim=用户协议 +about.claim.statement=点击链接以查看全文 about.dependency=依赖 about.legal=法律声明 about.thanks_to=鸣谢 diff --git a/HMCL/src/test/java/org/jackhuang/hmcl/util/AggregatedObservableListTest.java b/HMCL/src/test/java/org/jackhuang/hmcl/util/AggregatedObservableListTest.java index 6d81bf48f..44f349557 100644 --- a/HMCL/src/test/java/org/jackhuang/hmcl/util/AggregatedObservableListTest.java +++ b/HMCL/src/test/java/org/jackhuang/hmcl/util/AggregatedObservableListTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; */ public class AggregatedObservableListTest { - @Test public void testInteger() { final AggregatedObservableList aggregatedWrapper = new AggregatedObservableList<>(); @@ -91,4 +90,4 @@ public class AggregatedObservableListTest { b.setAll(7, 8, 9); assertEquals("[1,7,8,9]", aggregatedWrapper.dump()); } -} \ No newline at end of file +}