Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61597cb83d | ||
|
|
2f17552b2c | ||
|
|
f2d3d24338 | ||
|
|
e8a64f52f0 | ||
|
|
f55fe0fc45 | ||
|
|
1e3a5f9515 | ||
|
|
a9c7eb0954 | ||
|
|
289472d8ba | ||
|
|
f191e80100 | ||
|
|
607248e8b3 | ||
|
|
cecabe5bc4 | ||
|
|
947a2e3d91 | ||
|
|
382e0f3b1d | ||
|
|
6e440783dc | ||
|
|
fcd7d8ba83 | ||
|
|
a53d2a1370 | ||
|
|
20148d0b02 | ||
|
|
3114e33067 | ||
|
|
e137d72b76 | ||
|
|
cc087dee81 | ||
|
|
eed475cb28 | ||
|
|
d07c45f0b5 | ||
|
|
0aa0fa1b78 | ||
|
|
e91ec13dbd | ||
|
|
e36105d937 | ||
|
|
07d4df312d | ||
|
|
b521c5b76a | ||
|
|
c1596443f5 | ||
|
|
cadeb1f59c | ||
|
|
2d4223f7ed | ||
|
|
c453bbc7cd | ||
|
|
2184961e3c | ||
|
|
8afd8bde8b | ||
|
|
65952a5d81 | ||
|
|
ac1f2ec1ed | ||
|
|
454cc1e702 | ||
|
|
e3fa7428bf | ||
|
|
7ece35e28a | ||
|
|
d22dae9834 | ||
|
|
63bd707741 | ||
|
|
734c1e14f0 | ||
|
|
46869ad5f7 | ||
|
|
13fa713d58 | ||
|
|
94cd33af5c | ||
|
|
7efd9607e5 | ||
|
|
94539ad77b | ||
|
|
f2a86857bc | ||
|
|
3f2be63d08 | ||
|
|
2d7c1393d6 | ||
|
|
3d33230e25 | ||
|
|
dd4683e693 | ||
|
|
8bc5d2112f | ||
|
|
a828896989 | ||
|
|
5e8734aa95 | ||
|
|
1ac844f398 | ||
|
|
3f85ac208c | ||
|
|
c191186023 | ||
|
|
4715a95a54 | ||
|
|
8108f11c45 | ||
|
|
f4f1850271 | ||
|
|
5a81972f68 | ||
|
|
674dfca34d | ||
|
|
cafcb74e22 | ||
|
|
88c595dab2 | ||
|
|
48e2fcc601 | ||
|
|
2f10948239 | ||
|
|
7f674f237b | ||
|
|
c3f19d2c4a | ||
|
|
94b2cafa7a | ||
|
|
1d66ebef58 | ||
|
|
66459a124c | ||
|
|
5bbb565bd4 | ||
|
|
58819b6361 | ||
|
|
2de6a45ca1 | ||
|
|
c60261d917 | ||
|
|
94b6d7596e | ||
|
|
ae63b9712e | ||
|
|
00b945f6e3 | ||
|
|
37c47fc2dc | ||
|
|
51325d2423 | ||
|
|
469a7df4d4 | ||
|
|
ec56e24b7e | ||
|
|
00c350cd82 | ||
|
|
55d78aeba7 | ||
|
|
85c01cde00 | ||
|
|
4ce0a83845 | ||
|
|
d6859d1956 | ||
|
|
61447f0964 | ||
|
|
22a02faced | ||
|
|
a60c288335 | ||
|
|
3c224198e7 | ||
|
|
dc03f28d56 | ||
|
|
bd18355a1a | ||
|
|
1208d6dabc | ||
|
|
63082f5a5e | ||
|
|
c24ef2a200 | ||
|
|
891b64ee0f | ||
|
|
82763f3c32 | ||
|
|
3119b4d88d | ||
|
|
6532dc72db | ||
|
|
fd24fcc0f2 | ||
|
|
0d3e204f0d | ||
|
|
64d9fa7c6b | ||
|
|
53ff657106 | ||
|
|
6eb0c16fcc | ||
|
|
0984c23253 | ||
|
|
5805914ebb | ||
|
|
bfb55a3813 | ||
|
|
476c41b29b | ||
|
|
a2ef477ae0 | ||
|
|
42d42e9750 | ||
|
|
182e8ba2e8 | ||
|
|
e6d11fe9a3 | ||
|
|
7c510f9fb8 | ||
|
|
b53a3ebcc2 | ||
|
|
8e9f706d37 | ||
|
|
8997895a82 | ||
|
|
94db91b7c1 | ||
|
|
4f70465395 | ||
|
|
b2693cd3f9 | ||
|
|
3ae1c3467b | ||
|
|
1bba1b427c | ||
|
|
63e2fdf56d | ||
|
|
cf1b91ec55 | ||
|
|
4bac9380d1 | ||
|
|
fec5c9a5ce | ||
|
|
810ea9ace9 | ||
|
|
b933938f1b | ||
|
|
c408cccd35 | ||
|
|
bc842437fa | ||
|
|
9bda50f66e | ||
|
|
886ebe6885 | ||
|
|
d574d8d78b | ||
|
|
a3b74e0c75 | ||
|
|
eb9d123176 | ||
|
|
383de6cb2e | ||
|
|
43de254a98 | ||
|
|
02cb2a3fb1 | ||
|
|
62b6c07401 | ||
|
|
e630c6dff7 | ||
|
|
0639d82914 | ||
|
|
2701a84b94 | ||
|
|
859da37d71 | ||
|
|
5893eae87f | ||
|
|
99f42db370 | ||
|
|
32e9076198 | ||
|
|
e1cacad6b8 | ||
|
|
02ce950020 | ||
|
|
1eeba344f7 | ||
|
|
f84c4310f9 | ||
|
|
97e8ff91ea | ||
|
|
1c865e3d8d | ||
|
|
6ca7a86189 | ||
|
|
3c716ea170 | ||
|
|
3a7800db61 | ||
|
|
b04430528e | ||
|
|
4382326dec | ||
|
|
5adbac3cc9 | ||
|
|
d8b84a2574 | ||
|
|
0d59e52ff9 | ||
|
|
feb30a7349 | ||
|
|
3082e4cd16 | ||
|
|
c28dfd0ae0 | ||
|
|
986a430e92 | ||
|
|
80f27f5ea4 | ||
|
|
4c44a3c410 | ||
|
|
14cfd6abeb | ||
|
|
b957ca1931 | ||
|
|
9372d818a5 | ||
|
|
aee9c9bb32 | ||
|
|
5ed42d1654 | ||
|
|
dd94d2254f | ||
|
|
bf4c831047 | ||
|
|
33df069803 | ||
|
|
c360a4abb0 | ||
|
|
d29a198f7f | ||
|
|
8df651c5a8 | ||
|
|
191b88ab2a | ||
|
|
d00b269786 | ||
|
|
cbc85dd99e | ||
|
|
cf25e6c27b | ||
|
|
76807e1cd2 | ||
|
|
d84877dfcc | ||
|
|
f38d3b0026 | ||
|
|
511b555255 | ||
|
|
e79206bcb6 | ||
|
|
d8fa97e8c7 | ||
|
|
be2b55cc67 | ||
|
|
e68a3c7cd4 | ||
|
|
b3bf9d5c94 | ||
|
|
e166651fe7 | ||
|
|
516c73ee15 | ||
|
|
ac532c9400 | ||
|
|
b2f6ef72c3 | ||
|
|
3e2bb9678d | ||
|
|
0074f12a14 | ||
|
|
6a982b2a5c | ||
|
|
bde76707f3 | ||
|
|
2bc7bdba8a | ||
|
|
2e4f6ce076 | ||
|
|
5d3a382d26 | ||
|
|
ee8be3166f | ||
|
|
8fd500e931 | ||
|
|
2b9f070279 | ||
|
|
a53603dbbf | ||
|
|
4332bc124e | ||
|
|
20d0a2ae62 | ||
|
|
646bfa5be7 | ||
|
|
16d92454f4 | ||
|
|
129ce9a545 | ||
|
|
7b6a96b4b6 | ||
|
|
7260ae9b5e | ||
|
|
d333f54430 | ||
|
|
3efec78732 | ||
|
|
4f51ab00a1 | ||
|
|
6857200d75 | ||
|
|
1c3b3bf050 | ||
|
|
e11a5389c6 | ||
|
|
120238b234 | ||
|
|
c093c6e23d | ||
|
|
11d47bf9b1 | ||
|
|
fa13b1fc0d | ||
|
|
334e93196b | ||
|
|
de6cdeab52 | ||
|
|
24a6c2d3ba | ||
|
|
58cdc68b6e | ||
|
|
7389e210a7 | ||
|
|
b117769711 | ||
|
|
1ca4045a2f | ||
|
|
fb4a499fe9 | ||
|
|
4aac45f3b4 | ||
|
|
506786e932 | ||
|
|
1726cc7ec7 | ||
|
|
5b1c72ad5c | ||
|
|
0fa324452f | ||
|
|
6ad5ba3736 | ||
|
|
5707e1d57e | ||
|
|
f3424e0796 | ||
|
|
0b0118446f | ||
|
|
5c19dcd208 | ||
|
|
0a68e52fca | ||
|
|
5c25ab3eda | ||
|
|
91682aeafa | ||
|
|
cd9180c69a | ||
|
|
3269841207 | ||
|
|
b4ec71d65f | ||
|
|
1a0be11ae3 | ||
|
|
b72d42a09a | ||
|
|
ed5e225cdc | ||
|
|
c26579bebd | ||
|
|
1ea9170b2e | ||
|
|
a144a5eee0 | ||
|
|
1b1f532988 | ||
|
|
ca577475fc | ||
|
|
bc4b41e8cd | ||
|
|
a1226012ff | ||
|
|
cfd51915d3 | ||
|
|
030d54bc5c | ||
|
|
97a5d7e71a | ||
|
|
8b16e8be4d | ||
|
|
89dbc1be4a | ||
|
|
25bc8f5cb3 | ||
|
|
37d62b665e | ||
|
|
aa2838d219 | ||
|
|
979e58edf1 | ||
|
|
0f72d98067 | ||
|
|
eea401f99d | ||
|
|
b1301dcdec | ||
|
|
bdb6784a9b | ||
|
|
0d906e0adf | ||
|
|
4923370897 | ||
|
|
bdee33456b | ||
|
|
5a8446524a | ||
|
|
7c75e3d4a0 | ||
|
|
e67a1d16f5 | ||
|
|
b864ea89d7 | ||
|
|
04aa257b48 | ||
|
|
1b466eb33f | ||
|
|
a162828f0a | ||
|
|
b154871207 | ||
|
|
c7e3639155 | ||
|
|
9c1905bb51 | ||
|
|
31e39900b6 | ||
|
|
2b604bfd93 | ||
|
|
29f138ab94 | ||
|
|
8325021f9d | ||
|
|
25e4fa3834 | ||
|
|
9849b5659b | ||
|
|
43428c054a | ||
|
|
1d579c52eb | ||
|
|
214ff9de94 | ||
|
|
bb2e74009e | ||
|
|
53366ee284 | ||
|
|
8ec9a7a218 | ||
|
|
f3434fe2a8 | ||
|
|
acda1952ca | ||
|
|
084b15e113 | ||
|
|
d6d8c60e5b | ||
|
|
d3f24f0147 | ||
|
|
30499aa623 | ||
|
|
20d5957331 | ||
|
|
d859eeeb19 | ||
|
|
076733e6ce | ||
|
|
8fab4349bf | ||
|
|
829d92c8bb | ||
|
|
71131dadb7 | ||
|
|
61abed04f3 | ||
|
|
6e79d287f3 | ||
|
|
30f8657174 | ||
|
|
f516854226 | ||
|
|
0cee859e15 | ||
|
|
7b987c9b95 | ||
|
|
8cdd8b3f70 | ||
|
|
956b4e4a6a | ||
|
|
4e0ffc8d1e | ||
|
|
177935241f | ||
|
|
f133fcf66c | ||
|
|
869f57cbf1 | ||
|
|
de7c2e4f07 | ||
|
|
8bc2650f7b | ||
|
|
cef9f0b2bb | ||
|
|
e36b28c957 | ||
|
|
a770a7ee5c | ||
|
|
e3e9a19f6f | ||
|
|
4772a144ae | ||
|
|
d32ba75d5f | ||
|
|
96f869278b | ||
|
|
df1f9c76ad | ||
|
|
0b934bf6b5 | ||
|
|
f5319fa94c | ||
|
|
28229471f4 | ||
|
|
d00c61b89f | ||
|
|
1f7d3591b9 | ||
|
|
4e537de894 | ||
|
|
e130a14ebe | ||
|
|
31aa2f3a27 | ||
|
|
1f9c94dbc4 | ||
|
|
a2540c2e9b | ||
|
|
4737240c91 | ||
|
|
944d88b8af | ||
|
|
529c4ed420 | ||
|
|
e0ebb02530 | ||
|
|
be22d55cec | ||
|
|
993ce660aa | ||
|
|
79e120dd74 | ||
|
|
d4155bc14d | ||
|
|
ba699c4ed5 | ||
|
|
bc96afd0cd | ||
|
|
cf1a66e858 | ||
|
|
5eba896e6d | ||
|
|
e69d149c34 | ||
|
|
2f9955febd | ||
|
|
df39be708f | ||
|
|
ce3b9e3b1f | ||
|
|
a9feb65fc8 | ||
|
|
93837a28fa | ||
|
|
678f3b8eb7 | ||
|
|
0833fa9e7d | ||
|
|
369b9bb6cf | ||
|
|
c9b6f2f62f | ||
|
|
e2787af044 | ||
|
|
30c27bbb67 | ||
|
|
7aee7e33d0 | ||
|
|
a26061c388 | ||
|
|
11e66ac13c | ||
|
|
a2ac3c1f18 | ||
|
|
e7142e4032 | ||
|
|
0dd9dc6c17 | ||
|
|
a53bfed060 | ||
|
|
c5919f2719 | ||
|
|
fb24516b90 | ||
|
|
60fa4eb0a1 | ||
|
|
536576084d | ||
|
|
c62cc499c5 | ||
|
|
c11bbf8836 | ||
|
|
71c0cede24 | ||
|
|
ad16bbc96d | ||
|
|
520ffe4c09 | ||
|
|
e3f603c145 | ||
|
|
880b8cb072 | ||
|
|
86bf3d473a | ||
|
|
eb6baa8ad1 | ||
|
|
d53d56d93a | ||
|
|
d143ff48fa | ||
|
|
b11acb7762 | ||
|
|
51aa0dd851 | ||
|
|
861b0a1c62 | ||
|
|
27a33f567f | ||
|
|
e862a4b46b | ||
|
|
2b3e8ebfc0 | ||
|
|
6118877ad6 | ||
|
|
0454ff9bf7 | ||
|
|
4faad50d99 | ||
|
|
272599b448 | ||
|
|
c12d76e2fa | ||
|
|
55550f1773 | ||
|
|
e8992d5ad7 | ||
|
|
a8bd589b18 | ||
|
|
602cf7b110 | ||
|
|
1e7b731485 | ||
|
|
824b8e410c | ||
|
|
ba47953485 | ||
|
|
c7e666261f | ||
|
|
0c4c98d2c9 | ||
|
|
0c63be37bb | ||
|
|
9623a311a0 | ||
|
|
13da61d895 | ||
|
|
a7c02e2dea | ||
|
|
cfb9610afc | ||
|
|
a141c6b137 | ||
|
|
300efb99d2 | ||
|
|
6fb3610bcc | ||
|
|
43fb3ca10a | ||
|
|
adc360eaaa | ||
|
|
5e659352d7 | ||
|
|
6595e0a3cf | ||
|
|
c43b2b3bb9 | ||
|
|
ea19e6efd8 | ||
|
|
55d38f2b36 | ||
|
|
e0abf3e0c1 | ||
|
|
974cba8dee | ||
|
|
019cf5fc8f | ||
|
|
1956ba7a73 | ||
|
|
c209617ee7 | ||
|
|
f4b5e061a4 | ||
|
|
06b67a4b9a | ||
|
|
a385265956 | ||
|
|
6ac32a40c7 | ||
|
|
20c612c660 | ||
|
|
7e8cc5fe6c | ||
|
|
9ed14b227b | ||
|
|
ee466d0f4c | ||
|
|
b198eea9e4 | ||
|
|
8c7580488e | ||
|
|
3f4364c67c | ||
|
|
23e2df5e58 | ||
|
|
79136db162 | ||
|
|
3d008dcab5 | ||
|
|
5953cc6411 | ||
|
|
2dce675fe2 | ||
|
|
aa013a86dd | ||
|
|
f866f692e2 | ||
|
|
68a2514cef | ||
|
|
32562d7435 | ||
|
|
78be1aaa7c | ||
|
|
1eb4b1ca9e | ||
|
|
bf37db2cbe | ||
|
|
5b30617a6b | ||
|
|
266c686a3a | ||
|
|
32d0d6a7ee | ||
|
|
d9a336e50b | ||
|
|
3c958d06c8 | ||
|
|
15a75a69b3 | ||
|
|
cae32cff4c | ||
|
|
eeef76594f | ||
|
|
8f2a1030bc | ||
|
|
dc1df98277 | ||
|
|
def45cc3e4 | ||
|
|
8007f1958e | ||
|
|
b22e724a3f | ||
|
|
ed66b016db | ||
|
|
34890f21b3 | ||
|
|
9f85e4a63b | ||
|
|
7fcd4d94a6 | ||
|
|
84fbca7905 | ||
|
|
9add2387b9 | ||
|
|
a388450f94 | ||
|
|
fff7abc2ac | ||
|
|
e5587418c7 | ||
|
|
7c89fac1e9 | ||
|
|
bc9a9ffb72 | ||
|
|
46d27a04a2 | ||
|
|
0f33981c96 | ||
|
|
b396e0b208 | ||
|
|
1bf2f17538 | ||
|
|
608a531655 | ||
|
|
e57180eb15 | ||
|
|
3ae826d9ca | ||
|
|
e940845c60 | ||
|
|
d8aa989cc4 | ||
|
|
31ed4268b6 | ||
|
|
c698eaac6f | ||
|
|
d0dd23fa14 | ||
|
|
c6f1aa21c5 | ||
|
|
a3dc7798e7 | ||
|
|
88f6fd1965 | ||
|
|
9062c2e447 | ||
|
|
e3d2a4bf9d | ||
|
|
c2d609cdb4 | ||
|
|
b3721e29c6 | ||
|
|
eab4463c2d | ||
|
|
394873864f | ||
|
|
758216245f | ||
|
|
6edfd112a2 | ||
|
|
625215b068 | ||
|
|
4759e4957c | ||
|
|
b62f9494ae | ||
|
|
12b47e7d51 | ||
|
|
9ced29aa93 | ||
|
|
5095640ba2 | ||
|
|
c889d7cb3f | ||
|
|
84636f3f50 | ||
|
|
9a6f07d7c9 | ||
|
|
e8f5088049 | ||
|
|
0bee306d67 | ||
|
|
8d75b2d413 | ||
|
|
426ea607e8 | ||
|
|
507cade50d | ||
|
|
f0c7f54cc6 | ||
|
|
62c38482f6 | ||
|
|
0ff6ca18ed | ||
|
|
bbe6c388a3 | ||
|
|
639bc58e84 | ||
|
|
c0bcafd747 | ||
|
|
bcaa019551 | ||
|
|
38725abc48 | ||
|
|
00f1173bac | ||
|
|
68a02966d0 | ||
|
|
4721fcea66 | ||
|
|
5ea63273be | ||
|
|
7cee25aab2 | ||
|
|
9298f5e030 | ||
|
|
93f943d40c | ||
|
|
f20c11a4e2 | ||
|
|
0c25f31493 | ||
|
|
8d774e267f | ||
|
|
6c1de5d485 | ||
|
|
77c86ed3bc | ||
|
|
d75c3bbf96 | ||
|
|
8bb6cb714c | ||
|
|
28d002f6d3 | ||
|
|
78fcc69d29 | ||
|
|
cdfae54ab9 | ||
|
|
0813211c20 | ||
|
|
056a4eead2 | ||
|
|
2635d31425 | ||
|
|
76d35af5b9 | ||
|
|
bcff1695d3 | ||
|
|
3d04447c2f | ||
|
|
2736b88a10 | ||
|
|
0804a2fbf8 | ||
|
|
7224ed6a7d | ||
|
|
c41737364c | ||
|
|
320e579844 | ||
|
|
fc3f2e045b | ||
|
|
481b47bf10 | ||
|
|
0fb87f0b1d | ||
|
|
1252d7700f | ||
|
|
30c2d88f62 | ||
|
|
718a98d7ec | ||
|
|
fb3ba220b6 | ||
|
|
d655c9ec6b | ||
|
|
8a67f33cf6 | ||
|
|
2e53688c52 | ||
|
|
11ce04fba4 | ||
|
|
8b191e4a3b | ||
|
|
6405263616 | ||
|
|
a2119ab008 | ||
|
|
b21d8f094a | ||
|
|
90c41a83b1 | ||
|
|
a1ec774089 | ||
|
|
631056064a | ||
|
|
97e90de71e | ||
|
|
bbaed35160 | ||
|
|
778f26d55f | ||
|
|
fab5bdc2e1 | ||
|
|
b7723a88c3 | ||
|
|
1d2b59d5a2 | ||
|
|
7d42c0f581 | ||
|
|
bfe7398e17 | ||
|
|
c4f0a6a197 | ||
|
|
1ca9d0fa2c | ||
|
|
a015585bd1 | ||
|
|
bc34427793 | ||
|
|
0fe867cd93 | ||
|
|
70f0393bde | ||
|
|
9f060be3fd | ||
|
|
176968d883 | ||
|
|
e6bd55aa69 | ||
|
|
f5ffa875b8 | ||
|
|
2cb23cbfcb | ||
|
|
31dc9b0925 | ||
|
|
af7cd9a821 | ||
|
|
b34a64f425 | ||
|
|
11820e31a8 | ||
|
|
672b6054a6 | ||
|
|
d2486732d2 | ||
|
|
924067e4dd | ||
|
|
7820f748a0 | ||
|
|
e8757deb0d | ||
|
|
c371924dc0 | ||
|
|
cf28b27d50 | ||
|
|
b78f9c8cd5 | ||
|
|
91bd67dc26 | ||
|
|
0671b49c98 | ||
|
|
900f483a03 | ||
|
|
4d7af2e68b | ||
|
|
db59dcea65 | ||
|
|
ef6cfa785f | ||
|
|
2b792e73c9 | ||
|
|
0f2922dab4 | ||
|
|
45b55e2853 | ||
|
|
9c7795687f | ||
|
|
b273c80a02 | ||
|
|
8cdab4710b | ||
|
|
ea5b31d537 | ||
|
|
bb0c11fa12 | ||
|
|
37186439cb | ||
|
|
ab9f93d68e | ||
|
|
ca6920e82a | ||
|
|
d9db108a31 | ||
|
|
34b7e1d582 | ||
|
|
4d73187376 | ||
|
|
dcd0a42705 | ||
|
|
1b40916046 | ||
|
|
a4e4782f2f | ||
|
|
875b0c27ef | ||
|
|
a38a1775a0 | ||
|
|
fd6ae986c3 | ||
|
|
74a87e65c8 | ||
|
|
a285d2c27d | ||
|
|
44ac3bc900 | ||
|
|
1c346c97a8 | ||
|
|
d890b41380 | ||
|
|
cbcc89b48f | ||
|
|
521bd00a70 | ||
|
|
b4693423ef | ||
|
|
594a2741d7 | ||
|
|
a1d9b52b9d | ||
|
|
c9d825b6c1 | ||
|
|
7dcd0eb616 | ||
|
|
e79a95b885 | ||
|
|
5d232c3f5e | ||
|
|
ee1c0d362d | ||
|
|
aafcd57c82 | ||
|
|
66a4566dc5 | ||
|
|
4c317f5b03 | ||
|
|
12d706a812 | ||
|
|
c006068580 | ||
|
|
f8a838506d | ||
|
|
270844bbb1 | ||
|
|
c9466cf8ef | ||
|
|
7d6f1f98f1 | ||
|
|
fb9418dead | ||
|
|
4a1b06b80c | ||
|
|
8905f2e855 | ||
|
|
6c74364fa5 | ||
|
|
f0720c1755 | ||
|
|
f1acc1d2c1 | ||
|
|
82bddbfa6e | ||
|
|
841755fe56 | ||
|
|
340ee751e8 | ||
|
|
cf70f72f9c | ||
|
|
16ea88a659 | ||
|
|
eaa6790013 | ||
|
|
af571d533d | ||
|
|
004c3c588a | ||
|
|
2a44167c22 | ||
|
|
cf6b735026 | ||
|
|
5918b04b48 | ||
|
|
8004cb3a64 | ||
|
|
9981423927 | ||
|
|
0e5250dfb3 | ||
|
|
2dc956b357 | ||
|
|
b8bd0a08e0 | ||
|
|
fb31eebcf2 | ||
|
|
3c8689a3f1 | ||
|
|
2957d66dd6 | ||
|
|
6f6efe0874 | ||
|
|
355fc04069 | ||
|
|
b4738f383b | ||
|
|
b12711969c | ||
|
|
94727353c4 | ||
|
|
5eb7449b74 | ||
|
|
dae41dfb30 | ||
|
|
07a701e572 | ||
|
|
5323aaed6d | ||
|
|
daf659373f | ||
|
|
0eb81c29df | ||
|
|
8aea89c103 | ||
|
|
f1d97454c2 | ||
|
|
ffb6a45e28 | ||
|
|
f0d1c9b361 | ||
|
|
aedd4c290e | ||
|
|
749ecfe37f | ||
|
|
c51da28e31 | ||
|
|
f3dca75a10 | ||
|
|
c3dcb0292c | ||
|
|
2a42ecda78 | ||
|
|
08be1896ee | ||
|
|
6b3152c4b5 | ||
|
|
19ea27dece | ||
|
|
b9e26a4112 | ||
|
|
a71aea8e43 | ||
|
|
1b1f22b9fa | ||
|
|
705a5659b6 | ||
|
|
4121921aca | ||
|
|
8cb4ca0e8b | ||
|
|
6205937a10 | ||
|
|
2f522b744f | ||
|
|
b8a84f831a | ||
|
|
5f9490d780 | ||
|
|
a1c5b87b55 | ||
|
|
641e308c53 | ||
|
|
64bc70a15d | ||
|
|
acadbdb5c9 | ||
|
|
3323ea2be0 | ||
|
|
45f55b2075 | ||
|
|
372005dae1 | ||
|
|
2c7ca6d354 | ||
|
|
e21f315239 | ||
|
|
223c2bc7c7 | ||
|
|
3facbba4ee | ||
|
|
b8bf56c8c3 | ||
|
|
2fa08e0a70 | ||
|
|
8e1e13058b | ||
|
|
92520e46a3 | ||
|
|
6ae6c9c971 | ||
|
|
caf85d2a92 | ||
|
|
030b577dee | ||
|
|
83516ba679 | ||
|
|
c8f74ee8e3 | ||
|
|
c50e41ab91 | ||
|
|
c03a0feb75 | ||
|
|
7da5b8fbc8 | ||
|
|
83f7e61d37 | ||
|
|
86765275c8 | ||
|
|
a01e15d841 | ||
|
|
5e5db332d0 | ||
|
|
2de2f45124 | ||
|
|
b1b3eb9369 | ||
|
|
507665cd91 | ||
|
|
c779172cc2 | ||
|
|
684813e131 | ||
|
|
76ef47efc4 | ||
|
|
71a8fa0e66 | ||
|
|
48d98b2424 | ||
|
|
5a0e17b121 | ||
|
|
5f686f7205 | ||
|
|
518969d2f2 | ||
|
|
01ff1327f7 | ||
|
|
4d366397a8 | ||
|
|
80f79d20a5 | ||
|
|
1611d11544 | ||
|
|
c8e8b25c85 | ||
|
|
92cfc3c1d3 | ||
|
|
c4cebe72b4 | ||
|
|
6d346a3ad6 | ||
|
|
6e2696dea3 | ||
|
|
ba67c968cf | ||
|
|
332719f49a | ||
|
|
fb18975c5c | ||
|
|
08a7c27353 | ||
|
|
4c9cb99a94 | ||
|
|
cbecca5f55 | ||
|
|
4a0831a155 | ||
|
|
fa38c53915 | ||
|
|
e7c2170ce3 | ||
|
|
9b69fe8c56 | ||
|
|
ed91771594 | ||
|
|
b33e014f71 | ||
|
|
19632ac162 | ||
|
|
74e3a9e2d1 | ||
|
|
b15291dc57 | ||
|
|
1b5d4c1b42 | ||
|
|
923924638e | ||
|
|
8b52c46664 | ||
|
|
aa8c386cdd | ||
|
|
bafe17107c | ||
|
|
9c169fb560 | ||
|
|
61ab8a6769 | ||
|
|
b1cd7057db | ||
|
|
d426952d47 | ||
|
|
67b6a60382 | ||
|
|
9d5da5a39d | ||
|
|
efb14572d6 |
No files matched your search
@@ -0,0 +1 @@
|
|||||||
|
*.exe filter=lfs diff=lfs merge=lfs -text
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# 公告
|
||||||
|
|
||||||
|
提交前请确保你的启动器版本是**最新的开发版**,可以在启动器设置中更换更新通道至开发版获取更新。
|
||||||
|
|
||||||
|
**如果你在阅读完本公告后仍然希望在此处发布 issue,请将公告内容删去,并按照下面的模板填入相关信息。**
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
我们发现,对于不经常检查邮箱的人来说,GitHub Issues 的反馈效率太低,时隔几个小时甚至一天的情况很多。为了改善反馈效率,并将积极为 HMCL 提供问题反馈和建议的人聚集起来,我们希望在这里反馈的人可以在 HMCL 3 用户 QQ 群:219177735 中反馈信息,**而不在 GitHub Issues 中反馈问题**。
|
||||||
|
|
||||||
|
如果你希望在 QQ 群中反馈问题,也请将下面的信息表填好直接发在群中,加快我们的沟通速度。
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# 问题提交
|
||||||
|
|
||||||
|
*完整地填下面的问题提交表对我们很重要,这可以加快我们分析问题原因的速度。*
|
||||||
|
|
||||||
|
* 启动器版本:
|
||||||
|
* 操作系统:
|
||||||
|
* Java 版本:
|
||||||
|
* 错误截图(最好请将整个电脑屏幕的截图发上来):
|
||||||
|
* 游戏版本(如果是启动通过启动器自带的自动安装功能安装的游戏):
|
||||||
|
* 对游戏做的修改(是否自行通过安装器安装 Rift 等 API,以及 mod):
|
||||||
|
* 游戏崩溃报告(如果有):
|
||||||
|
* 启动器崩溃报告(如果有):
|
||||||
|
* 启动器日志文件(出现问题后点击启动器设置中的【导出启动器日志】按钮):
|
||||||
|
* 问题描述(如何触发问题):
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
name: Java CI
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v1
|
||||||
|
- name: Set up JDK 1.8
|
||||||
|
uses: actions/setup-java@v1
|
||||||
|
with:
|
||||||
|
java-version: 1.8
|
||||||
|
java-package: jdk+fx
|
||||||
|
- name: Build with Gradle
|
||||||
|
run: ./gradlew build
|
||||||
+10
-1
@@ -17,16 +17,25 @@ NVIDIA
|
|||||||
/build/
|
/build/
|
||||||
/HMCL/build/
|
/HMCL/build/
|
||||||
/HMCLCore/build/
|
/HMCLCore/build/
|
||||||
|
/HMCLTransformerDiscoveryService/build/
|
||||||
|
|
||||||
# idea
|
# idea
|
||||||
.idea
|
.idea
|
||||||
/out/
|
/out/
|
||||||
/HMCL/out/
|
/HMCL/out/
|
||||||
/HMCLCore/out/
|
/HMCLCore/out/
|
||||||
|
/HMCLTransformerDiscoveryService/out/
|
||||||
|
|
||||||
# eclipse
|
# eclipse
|
||||||
|
/bin/
|
||||||
|
/HMCL/bin/
|
||||||
|
/HMCLCore/bin/
|
||||||
|
/HMCLTransformerDiscoveryService/bin/
|
||||||
.classpath
|
.classpath
|
||||||
.project
|
.project
|
||||||
|
.settings
|
||||||
|
|
||||||
# netbeans
|
# netbeans
|
||||||
.nb-gradle
|
.nb-gradle
|
||||||
|
|
||||||
|
*.exe
|
||||||
+90
-19
@@ -1,5 +1,15 @@
|
|||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath 'org.tukaani:xz:1.8'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.github.johnrengelman.shadow' version '2.0.4'
|
id 'application'
|
||||||
|
id 'com.github.johnrengelman.shadow' version '7.0.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
import java.nio.file.FileSystems
|
import java.nio.file.FileSystems
|
||||||
@@ -23,9 +33,11 @@ if (System.getenv("BUILD_NUMBER") != null && System.getenv("BUILD_NUMBER_OFFSET"
|
|||||||
def versionroot = System.getenv("VERSION_ROOT") ?: "3.2"
|
def versionroot = System.getenv("VERSION_ROOT") ?: "3.2"
|
||||||
version = versionroot + '.' + buildnumber
|
version = versionroot + '.' + buildnumber
|
||||||
|
|
||||||
|
mainClassName = 'org.jackhuang.hmcl.Main'
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(":HMCLCore")
|
implementation project(":HMCLCore")
|
||||||
compile rootProject.files("lib/JFoenix.jar")
|
implementation rootProject.files("lib/JFoenix.jar")
|
||||||
}
|
}
|
||||||
|
|
||||||
def digest(String algorithm, byte[] bytes) {
|
def digest(String algorithm, byte[] bytes) {
|
||||||
@@ -66,35 +78,70 @@ ext.packer = Pack200.newPacker()
|
|||||||
packer.properties()["pack.effort"] = "9"
|
packer.properties()["pack.effort"] = "9"
|
||||||
ext.unpacker = Pack200.newUnpacker()
|
ext.unpacker = Pack200.newUnpacker()
|
||||||
|
|
||||||
|
// Pack200 does not guarantee that unpacked .class file is bit-wise same as the .class file before packing
|
||||||
|
// because of shrinking. So we should pack .class files and unpack it to make sure that after unpacking
|
||||||
|
// .class files remain the same.
|
||||||
def repack(File file) {
|
def repack(File file) {
|
||||||
def packed = new ByteArrayOutputStream()
|
def packed = new ByteArrayOutputStream()
|
||||||
new JarFile(file).withCloseable { packer.pack(it, packed) }
|
new JarFile(file).withCloseable { packer.pack(it, packed) }
|
||||||
new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
|
new JarOutputStream(file.newOutputStream()).withCloseable { unpacker.unpack(new ByteArrayInputStream(packed.toByteArray()), it) }
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
sourceSets {
|
||||||
manifest {
|
java11 {
|
||||||
attributes 'Created-By': 'Copyright(c) 2013-2018 huangyuhui.',
|
java {
|
||||||
'Main-Class': 'org.jackhuang.hmcl.Main',
|
srcDirs = ['src/main/java11']
|
||||||
'Multi-Release': 'true',
|
}
|
||||||
'Implementation-Version': version
|
|
||||||
}
|
}
|
||||||
finalizedBy shadowJar
|
}
|
||||||
|
|
||||||
|
compileJava11Java {
|
||||||
|
javaCompiler = javaToolchains.compilerFor {
|
||||||
|
languageVersion = JavaLanguageVersion.of(11)
|
||||||
|
}
|
||||||
|
options.compilerArgs.add('--add-exports=java.base/jdk.internal.loader=ALL-UNNAMED')
|
||||||
|
sourceCompatibility = 11
|
||||||
|
targetCompatibility = 11
|
||||||
|
}
|
||||||
|
|
||||||
|
jar {
|
||||||
|
enabled = false
|
||||||
|
dependsOn shadowJar
|
||||||
}
|
}
|
||||||
|
|
||||||
shadowJar {
|
shadowJar {
|
||||||
classifier = null
|
classifier = null
|
||||||
|
|
||||||
exclude 'META-INF/maven/**'
|
manifest {
|
||||||
exclude 'META-INF/NOTICE.txt'
|
attributes 'Created-By': 'Copyright(c) 2013-2020 huangyuhui.',
|
||||||
exclude 'META-INF/LICENSE.txt'
|
'Main-Class': mainClassName,
|
||||||
|
'Multi-Release': 'true',
|
||||||
dependencies {
|
'Implementation-Version': version,
|
||||||
exclude(dependency('org.jetbrains:annotations'))
|
'Add-Opens': [
|
||||||
|
'java.base/java.lang',
|
||||||
|
'java.base/java.lang.reflect',
|
||||||
|
'javafx.graphics/javafx.css',
|
||||||
|
'javafx.base/com.sun.javafx.runtime',
|
||||||
|
'javafx.controls/com.sun.javafx.scene.control.behavior',
|
||||||
|
'javafx.controls/javafx.scene.control.skin',
|
||||||
|
'javafx.controls/com.sun.javafx.scene.control',
|
||||||
|
'javafx.base/com.sun.javafx.binding',
|
||||||
|
'javafx.base/com.sun.javafx.event',
|
||||||
|
'javafx.graphics/com.sun.javafx.stage'
|
||||||
|
].join(" "),
|
||||||
|
'Add-Exports': [
|
||||||
|
'java.base/jdk.internal.loader',
|
||||||
|
'javafx.controls/com.sun.javafx.scene.control.behavior',
|
||||||
|
'javafx.controls/javafx.scene.control.skin',
|
||||||
|
'javafx.controls/com.sun.javafx.scene.control',
|
||||||
|
'javafx.base/com.sun.javafx.binding',
|
||||||
|
'javafx.graphics/com.sun.javafx.stage',
|
||||||
|
'javafx.base/com.sun.javafx.event'
|
||||||
|
].join(" ")
|
||||||
}
|
}
|
||||||
|
|
||||||
doLast {
|
doLast {
|
||||||
repack(jar.archivePath)
|
repack(jar.archivePath) // see repack()
|
||||||
attachSignature(jar.archivePath)
|
attachSignature(jar.archivePath)
|
||||||
createChecksum(jar.archivePath)
|
createChecksum(jar.archivePath)
|
||||||
}
|
}
|
||||||
@@ -107,6 +154,29 @@ def createExecutable(String suffix, String header) {
|
|||||||
createChecksum(output)
|
createChecksum(output)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
processResources {
|
||||||
|
ext.convertToBSS = { String resource ->
|
||||||
|
// exclude resource
|
||||||
|
doFirst {
|
||||||
|
def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
|
||||||
|
def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
|
||||||
|
bssFile.parentFile.mkdirs()
|
||||||
|
exec {
|
||||||
|
commandLine 'javapackager', '-createbss', '-outdir', bssFile.parent, '-srcfiles', cssFile.path
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
from "build/compiled-resources"
|
||||||
|
|
||||||
|
convertToBSS "assets/css/root.css"
|
||||||
|
convertToBSS "assets/css/blue.css"
|
||||||
|
|
||||||
|
into('META-INF/versions/11') {
|
||||||
|
from sourceSets.java11.output
|
||||||
|
}
|
||||||
|
dependsOn java11Classes
|
||||||
|
}
|
||||||
|
|
||||||
task makePack(dependsOn: jar) {
|
task makePack(dependsOn: jar) {
|
||||||
ext.outputPath = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + "pack")
|
ext.outputPath = new File(jar.archivePath.parentFile, jar.archivePath.name[0..-4] + "pack")
|
||||||
doLast {
|
doLast {
|
||||||
@@ -119,7 +189,8 @@ task makePack(dependsOn: jar) {
|
|||||||
|
|
||||||
task makePackXz(dependsOn: makePack) doLast {
|
task makePackXz(dependsOn: makePack) doLast {
|
||||||
def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
|
def packXz = new File(makePack.outputPath.parentFile, makePack.outputPath.name + ".xz")
|
||||||
new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(6)).withCloseable { it << makePack.outputPath.bytes }
|
// Our CI server does not have enough memory space to compress file at highest level.
|
||||||
|
new XZOutputStream(packXz.newOutputStream(), new LZMA2Options(5)).withCloseable { it << makePack.outputPath.bytes }
|
||||||
createChecksum(packXz)
|
createChecksum(packXz)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,4 +207,4 @@ task makeExecutables(dependsOn: jar) doLast {
|
|||||||
|
|
||||||
build.dependsOn makePackXz
|
build.dependsOn makePackXz
|
||||||
build.dependsOn makePackGz
|
build.dependsOn makePackGz
|
||||||
build.dependsOn makeExecutables
|
build.dependsOn makeExecutables
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,81 +13,104 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl;
|
package org.jackhuang.hmcl;
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import javafx.application.Application;
|
import javafx.application.Application;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
import org.jackhuang.hmcl.setting.ConfigHolder;
|
import org.jackhuang.hmcl.setting.ConfigHolder;
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
|
import org.jackhuang.hmcl.task.AsyncTaskExecutor;
|
||||||
|
import org.jackhuang.hmcl.ui.AwtUtils;
|
||||||
import org.jackhuang.hmcl.ui.Controllers;
|
import org.jackhuang.hmcl.ui.Controllers;
|
||||||
import org.jackhuang.hmcl.upgrade.UpdateChecker;
|
import org.jackhuang.hmcl.upgrade.UpdateChecker;
|
||||||
import org.jackhuang.hmcl.util.*;
|
import org.jackhuang.hmcl.upgrade.UpdateHandler;
|
||||||
|
import org.jackhuang.hmcl.util.CrashReporter;
|
||||||
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.OperatingSystem;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.management.ManagementFactory;
|
import java.lang.management.ManagementFactory;
|
||||||
import java.net.URISyntaxException;
|
import java.net.*;
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLClassLoader;
|
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
|
||||||
import static org.jackhuang.hmcl.util.Logging.LOG;
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public final class Launcher extends Application {
|
public final class Launcher extends Application {
|
||||||
|
public static final CookieManager COOKIE_MANAGER = new CookieManager();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage primaryStage) {
|
public void start(Stage primaryStage) {
|
||||||
Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
|
Thread.currentThread().setUncaughtExceptionHandler(CRASH_REPORTER);
|
||||||
|
|
||||||
try {
|
CookieHandler.setDefault(COOKIE_MANAGER);
|
||||||
ConfigHolder.init();
|
|
||||||
} catch (IOException e) {
|
|
||||||
Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
|
try {
|
||||||
// Stage.show() cannot work again because JavaFX Toolkit have already shut down.
|
ConfigHolder.init();
|
||||||
Platform.setImplicitExit(false);
|
} catch (IOException e) {
|
||||||
Controllers.initialize(primaryStage);
|
LOG.log(Level.SEVERE, "Failed to load config", e);
|
||||||
primaryStage.setResizable(false);
|
Main.showErrorAndExit(i18n("fatal.config_loading_failure", Paths.get("").toAbsolutePath().normalize()));
|
||||||
primaryStage.setScene(Controllers.getScene());
|
}
|
||||||
|
|
||||||
UpdateChecker.init();
|
// runLater to ensure ConfigHolder.init() finished initialization
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
// When launcher visibility is set to "hide and reopen" without Platform.implicitExit = false,
|
||||||
|
// Stage.show() cannot work again because JavaFX Toolkit have already shut down.
|
||||||
|
Platform.setImplicitExit(false);
|
||||||
|
Controllers.initialize(primaryStage);
|
||||||
|
|
||||||
primaryStage.show();
|
initIcon();
|
||||||
|
|
||||||
|
UpdateChecker.init();
|
||||||
|
|
||||||
|
primaryStage.show();
|
||||||
|
});
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
|
CRASH_REPORTER.uncaughtException(Thread.currentThread(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
@Override
|
||||||
Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
|
public void stop() throws Exception {
|
||||||
|
super.stop();
|
||||||
|
Controllers.onApplicationStop();
|
||||||
|
}
|
||||||
|
|
||||||
if (!FileUtils.makeDirectory(LOG_DIRECTORY))
|
private void initIcon() {
|
||||||
System.out.println("Unable to create log directory " + LOG_DIRECTORY + ", log files cannot be generated.");
|
Toolkit toolkit = Toolkit.getDefaultToolkit();
|
||||||
|
Image image = toolkit.getImage(Launcher.class.getResource("/assets/img/icon.png"));
|
||||||
|
AwtUtils.setAppleIcon(image);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
if (UpdateHandler.processArguments(args)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Thread.setDefaultUncaughtExceptionHandler(CRASH_REPORTER);
|
||||||
|
AsyncTaskExecutor.setUncaughtExceptionHandler(new CrashReporter(false));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Logging.start(LOG_DIRECTORY);
|
|
||||||
|
|
||||||
// NetworkUtils.setUserAgentSupplier(() -> "Hello Minecraft! Launcher");
|
|
||||||
Constants.UI_THREAD_SCHEDULER = Constants.JAVAFX_UI_THREAD_SCHEDULER;
|
|
||||||
|
|
||||||
LOG.info("*** " + Metadata.TITLE + " ***");
|
LOG.info("*** " + Metadata.TITLE + " ***");
|
||||||
LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
|
LOG.info("Operating System: " + System.getProperty("os.name") + ' ' + OperatingSystem.SYSTEM_VERSION);
|
||||||
LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
|
LOG.info("Java Version: " + System.getProperty("java.version") + ", " + System.getProperty("java.vendor"));
|
||||||
LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
|
LOG.info("Java VM Version: " + System.getProperty("java.vm.name") + " (" + System.getProperty("java.vm.info") + "), " + System.getProperty("java.vm.vendor"));
|
||||||
LOG.info("Java Home: " + System.getProperty("java.home"));
|
LOG.info("Java Home: " + System.getProperty("java.home"));
|
||||||
LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
|
LOG.info("Current Directory: " + Paths.get("").toAbsolutePath());
|
||||||
LOG.info("HMCL Directory: " + HMCL_DIRECTORY);
|
LOG.info("HMCL Directory: " + Metadata.HMCL_DIRECTORY);
|
||||||
LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
|
LOG.info("Memory: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 + "MB");
|
||||||
ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
|
ManagementFactory.getMemoryPoolMXBeans().stream().filter(bean -> bean.getName().equals("Metaspace")).findAny()
|
||||||
.ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));
|
.ifPresent(bean -> LOG.info("Metaspace: " + bean.getUsage().getUsed() / 1024 / 1024 + "MB"));
|
||||||
@@ -101,21 +124,20 @@ public final class Launcher extends Application {
|
|||||||
public static void stopApplication() {
|
public static void stopApplication() {
|
||||||
LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
|
LOG.info("Stopping application.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
|
||||||
|
|
||||||
JFXUtilities.runInFX(() -> {
|
runInFX(() -> {
|
||||||
if (Controllers.getStage() == null)
|
if (Controllers.getStage() == null)
|
||||||
return;
|
return;
|
||||||
Controllers.getStage().close();
|
Controllers.getStage().close();
|
||||||
Schedulers.shutdown();
|
Schedulers.shutdown();
|
||||||
Controllers.shutdown();
|
Controllers.shutdown();
|
||||||
Platform.exit();
|
Platform.exit();
|
||||||
Lang.executeDelayed(OperatingSystem::forceGC, TimeUnit.SECONDS, 5, true);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void stopWithoutPlatform() {
|
public static void stopWithoutPlatform() {
|
||||||
LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
|
LOG.info("Stopping application without JavaFX Toolkit.\n" + StringUtils.getStackTrace(Thread.currentThread().getStackTrace()));
|
||||||
|
|
||||||
JFXUtilities.runInFX(() -> {
|
runInFX(() -> {
|
||||||
if (Controllers.getStage() == null)
|
if (Controllers.getStage() == null)
|
||||||
return;
|
return;
|
||||||
Controllers.getStage().close();
|
Controllers.getStage().close();
|
||||||
@@ -137,6 +159,11 @@ public final class Launcher extends Application {
|
|||||||
} catch (URISyntaxException e) {
|
} catch (URISyntaxException e) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
File jarFile = new File(Launcher.class.getProtectionDomain().getCodeSource().getLocation().getPath());
|
||||||
|
String ext = FileUtils.getExtension(jarFile);
|
||||||
|
if ("jar".equals(ext) || "exe".equals(ext))
|
||||||
|
result.add(jarFile);
|
||||||
}
|
}
|
||||||
if (result.isEmpty())
|
if (result.isEmpty())
|
||||||
return null;
|
return null;
|
||||||
@@ -144,9 +171,5 @@ public final class Launcher extends Application {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final File MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
|
public static final CrashReporter CRASH_REPORTER = new CrashReporter(true);
|
||||||
public static final File HMCL_DIRECTORY = OperatingSystem.getWorkingDirectory("hmcl");
|
|
||||||
public static final File LOG_DIRECTORY = new File(Launcher.HMCL_DIRECTORY, "logs");
|
|
||||||
|
|
||||||
public static final CrashReporter CRASH_REPORTER = new CrashReporter();
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,26 +13,31 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl;
|
package org.jackhuang.hmcl;
|
||||||
|
|
||||||
import org.jackhuang.hmcl.setting.ConfigHolder;
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
import org.jackhuang.hmcl.upgrade.UpdateHandler;
|
import org.jackhuang.hmcl.util.SelfDependencyPatcher;
|
||||||
|
|
||||||
import javax.net.ssl.TrustManager;
|
import javax.net.ssl.*;
|
||||||
import javax.net.ssl.TrustManagerFactory;
|
|
||||||
import javax.net.ssl.X509TrustManager;
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
|
import java.security.KeyManagementException;
|
||||||
import java.security.KeyStore;
|
import java.security.KeyStore;
|
||||||
import java.security.KeyStoreException;
|
import java.security.KeyStoreException;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.security.cert.CertificateException;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.util.Lang.thread;
|
||||||
import static org.jackhuang.hmcl.util.Logging.LOG;
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
@@ -40,14 +45,23 @@ public final class Main {
|
|||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
System.setProperty("java.net.useSystemProxies", "true");
|
System.setProperty("java.net.useSystemProxies", "true");
|
||||||
|
System.setProperty("http.agent", "HMCL/" + Metadata.VERSION);
|
||||||
|
System.setProperty("javafx.autoproxy.disable", "true");
|
||||||
|
|
||||||
|
checkDirectoryPath();
|
||||||
|
|
||||||
|
// This environment check will take ~300ms
|
||||||
|
thread(() -> {
|
||||||
|
fixLetsEncrypt();
|
||||||
|
checkDSTRootCAX3();
|
||||||
|
}, "CA Certificate Check", true);
|
||||||
|
|
||||||
|
Logging.start(Metadata.HMCL_DIRECTORY.resolve("logs"));
|
||||||
|
|
||||||
checkJavaFX();
|
checkJavaFX();
|
||||||
checkDirectoryPath();
|
|
||||||
checkDSTRootCAX3();
|
|
||||||
|
|
||||||
if (UpdateHandler.processArguments(args)) {
|
// Fix title bar not displaying in GTK systems
|
||||||
return;
|
System.setProperty("jdk.gtk.version", "2");
|
||||||
}
|
|
||||||
|
|
||||||
Launcher.main(args);
|
Launcher.main(args);
|
||||||
}
|
}
|
||||||
@@ -63,9 +77,13 @@ public final class Main {
|
|||||||
|
|
||||||
private static void checkJavaFX() {
|
private static void checkJavaFX() {
|
||||||
try {
|
try {
|
||||||
Class.forName("javafx.application.Application");
|
SelfDependencyPatcher.patch();
|
||||||
} catch (ClassNotFoundException e) {
|
} catch (SelfDependencyPatcher.PatchException e) {
|
||||||
showErrorAndExit(i18n("fatal.missing_javafx"));
|
LOG.log(Level.SEVERE, "unable to patch JVM", e);
|
||||||
|
showErrorAndExit(i18n("fatal.javafx.missing"));
|
||||||
|
} catch (SelfDependencyPatcher.IncompatibleVersionException e) {
|
||||||
|
LOG.log(Level.SEVERE, "unable to patch JVM", e);
|
||||||
|
showErrorAndExit(i18n("fatal.javafx.incompatible"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,4 +128,34 @@ public final class Main {
|
|||||||
JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
|
JOptionPane.showMessageDialog(null, message, "Warning", JOptionPane.WARNING_MESSAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void fixLetsEncrypt() {
|
||||||
|
try {
|
||||||
|
KeyStore defaultKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
|
||||||
|
Path ksPath = Paths.get(System.getProperty("java.home"), "lib", "security", "cacerts");
|
||||||
|
|
||||||
|
try (InputStream ksStream = Files.newInputStream(ksPath)) {
|
||||||
|
defaultKeyStore.load(ksStream, "changeit".toCharArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
KeyStore letsEncryptKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
|
||||||
|
InputStream letsEncryptFile = Main.class.getResourceAsStream("/assets/lekeystore.jks");
|
||||||
|
letsEncryptKeyStore.load(letsEncryptFile, "supersecretpassword".toCharArray());
|
||||||
|
|
||||||
|
KeyStore merged = KeyStore.getInstance(KeyStore.getDefaultType());
|
||||||
|
merged.load(null, new char[0]);
|
||||||
|
for (String alias : Collections.list(letsEncryptKeyStore.aliases()))
|
||||||
|
merged.setCertificateEntry(alias, letsEncryptKeyStore.getCertificate(alias));
|
||||||
|
for (String alias : Collections.list(defaultKeyStore.aliases()))
|
||||||
|
merged.setCertificateEntry(alias, defaultKeyStore.getCertificate(alias));
|
||||||
|
|
||||||
|
TrustManagerFactory instance = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
|
||||||
|
instance.init(merged);
|
||||||
|
SSLContext tls = SSLContext.getInstance("TLS");
|
||||||
|
tls.init(null, instance.getTrustManagers(), null);
|
||||||
|
HttpsURLConnection.setDefaultSSLSocketFactory(tls.getSocketFactory());
|
||||||
|
LOG.info("Added Lets Encrypt root certificates as additional trust");
|
||||||
|
} catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException | KeyManagementException e) {
|
||||||
|
LOG.log(Level.SEVERE, "Failed to load lets encrypt certificate. Expect problems", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,11 +13,15 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl;
|
package org.jackhuang.hmcl;
|
||||||
|
|
||||||
import org.jackhuang.hmcl.util.JarUtils;
|
import org.jackhuang.hmcl.util.io.JarUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.OperatingSystem;
|
||||||
|
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stores metadata about this application.
|
* Stores metadata about this application.
|
||||||
@@ -32,5 +36,18 @@ public final class Metadata {
|
|||||||
public static final String UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
|
public static final String UPDATE_URL = System.getProperty("hmcl.update_source.override", "https://hmcl.huangyuhui.net/api/update_link");
|
||||||
public static final String CONTACT_URL = "https://hmcl.huangyuhui.net/contact";
|
public static final String CONTACT_URL = "https://hmcl.huangyuhui.net/contact";
|
||||||
public static final String HELP_URL = "https://hmcl.huangyuhui.net/help";
|
public static final String HELP_URL = "https://hmcl.huangyuhui.net/help";
|
||||||
|
public static final String CHANGELOG_URL = "https://hmcl.huangyuhui.net/changelog/";
|
||||||
public static final String PUBLISH_URL = "http://www.mcbbs.net/thread-142335-1-1.html";
|
public static final String PUBLISH_URL = "http://www.mcbbs.net/thread-142335-1-1.html";
|
||||||
|
|
||||||
|
public static final Path MINECRAFT_DIRECTORY = OperatingSystem.getWorkingDirectory("minecraft");
|
||||||
|
public static final Path HMCL_DIRECTORY = getHMCLDirectory();
|
||||||
|
|
||||||
|
private static Path getHMCLDirectory() {
|
||||||
|
String home = System.getProperty("user.home", ".");
|
||||||
|
if (OperatingSystem.CURRENT_OS == OperatingSystem.LINUX) {
|
||||||
|
// to fulfill XDG standard.
|
||||||
|
return Paths.get(home, ".cache", "hmcl");
|
||||||
|
}
|
||||||
|
return OperatingSystem.getWorkingDirectory("hmcl");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,176 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.game;
|
|
||||||
|
|
||||||
import javafx.geometry.Rectangle2D;
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import org.jackhuang.hmcl.Launcher;
|
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
|
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.Texture;
|
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
|
||||||
import org.jackhuang.hmcl.setting.Accounts;
|
|
||||||
import org.jackhuang.hmcl.task.FileDownloadTask;
|
|
||||||
import org.jackhuang.hmcl.task.Scheduler;
|
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
|
||||||
import org.jackhuang.hmcl.task.Task;
|
|
||||||
import org.jackhuang.hmcl.ui.DialogController;
|
|
||||||
import org.jackhuang.hmcl.util.NetworkUtils;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
public final class AccountHelper {
|
|
||||||
|
|
||||||
private AccountHelper() {}
|
|
||||||
|
|
||||||
public static final File SKIN_DIR = new File(Launcher.HMCL_DIRECTORY, "skins");
|
|
||||||
|
|
||||||
public static void loadSkins() {
|
|
||||||
for (Account account : Accounts.getAccounts()) {
|
|
||||||
if (account instanceof YggdrasilAccount) {
|
|
||||||
new SkinLoadTask((YggdrasilAccount) account, false).start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Task loadSkinAsync(YggdrasilAccount account) {
|
|
||||||
return new SkinLoadTask(account, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Task refreshSkinAsync(YggdrasilAccount account) {
|
|
||||||
return new SkinLoadTask(account, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static File getSkinFile(UUID uuid) {
|
|
||||||
return new File(SKIN_DIR, uuid + ".png");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image getSkin(YggdrasilAccount account) {
|
|
||||||
return getSkin(account, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image getSkin(YggdrasilAccount account, double scaleRatio) {
|
|
||||||
UUID uuid = account.getUUID();
|
|
||||||
if (uuid == null)
|
|
||||||
return getSteveSkin(scaleRatio);
|
|
||||||
|
|
||||||
File file = getSkinFile(uuid);
|
|
||||||
if (file.exists()) {
|
|
||||||
Image original = new Image("file:" + file.getAbsolutePath());
|
|
||||||
return new Image("file:" + file.getAbsolutePath(),
|
|
||||||
original.getWidth() * scaleRatio,
|
|
||||||
original.getHeight() * scaleRatio,
|
|
||||||
false, false);
|
|
||||||
}
|
|
||||||
return getDefaultSkin(uuid, scaleRatio);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image getSkinImmediately(YggdrasilAccount account, GameProfile profile, double scaleRatio) throws Exception {
|
|
||||||
File file = getSkinFile(profile.getId());
|
|
||||||
downloadSkin(account, profile, true);
|
|
||||||
if (!file.exists())
|
|
||||||
return getDefaultSkin(profile.getId(), scaleRatio);
|
|
||||||
|
|
||||||
String url = "file:" + file.getAbsolutePath();
|
|
||||||
return scale(url, scaleRatio);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Rectangle2D getViewport(double scaleRatio) {
|
|
||||||
double size = 8.0 * scaleRatio;
|
|
||||||
return new Rectangle2D(size, size, size, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class SkinLoadTask extends Task {
|
|
||||||
private final YggdrasilAccount account;
|
|
||||||
private final boolean refresh;
|
|
||||||
private final List<Task> dependencies = new LinkedList<>();
|
|
||||||
|
|
||||||
public SkinLoadTask(YggdrasilAccount account, boolean refresh) {
|
|
||||||
this.account = account;
|
|
||||||
this.refresh = refresh;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Scheduler getScheduler() {
|
|
||||||
return Schedulers.io();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Collection<Task> getDependencies() {
|
|
||||||
return dependencies;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() throws Exception {
|
|
||||||
if (!account.isLoggedIn() && (account.getCharacter() == null || refresh))
|
|
||||||
DialogController.logIn(account);
|
|
||||||
|
|
||||||
downloadSkin(account, refresh);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void downloadSkin(YggdrasilAccount account, GameProfile profile, boolean refresh) throws Exception {
|
|
||||||
account.clearCache();
|
|
||||||
|
|
||||||
Optional<Texture> texture = account.getSkin(profile);
|
|
||||||
if (!texture.isPresent()) return;
|
|
||||||
String url = texture.get().getUrl();
|
|
||||||
File file = getSkinFile(profile.getId());
|
|
||||||
if (!refresh && file.exists())
|
|
||||||
return;
|
|
||||||
new FileDownloadTask(NetworkUtils.toURL(url), file).run();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void downloadSkin(YggdrasilAccount account, boolean refresh) throws Exception {
|
|
||||||
account.clearCache();
|
|
||||||
|
|
||||||
if (account.getCharacter() == null) return;
|
|
||||||
Optional<Texture> texture = account.getSkin();
|
|
||||||
if (!texture.isPresent()) return;
|
|
||||||
String url = texture.get().getUrl();
|
|
||||||
File file = getSkinFile(account.getUUID());
|
|
||||||
if (!refresh && file.exists())
|
|
||||||
return;
|
|
||||||
new FileDownloadTask(NetworkUtils.toURL(url), file).run();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image scale(String url, double scaleRatio) {
|
|
||||||
Image origin = new Image(url);
|
|
||||||
return new Image(url,
|
|
||||||
origin.getWidth() * scaleRatio,
|
|
||||||
origin.getHeight() * scaleRatio,
|
|
||||||
false, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image getSteveSkin(double scaleRatio) {
|
|
||||||
return scale("/assets/img/steve.png", 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image getAlexSkin(double scaleRatio) {
|
|
||||||
return scale("/assets/img/alex.png", 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Image getDefaultSkin(UUID uuid, double scaleRatio) {
|
|
||||||
int type = uuid.hashCode() & 1;
|
|
||||||
if (type == 1)
|
|
||||||
return getAlexSkin(scaleRatio);
|
|
||||||
else
|
|
||||||
return getSteveSkin(scaleRatio);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
@@ -21,24 +21,32 @@ import org.jackhuang.hmcl.Metadata;
|
|||||||
import org.jackhuang.hmcl.auth.AuthInfo;
|
import org.jackhuang.hmcl.auth.AuthInfo;
|
||||||
import org.jackhuang.hmcl.launch.DefaultLauncher;
|
import org.jackhuang.hmcl.launch.DefaultLauncher;
|
||||||
import org.jackhuang.hmcl.launch.ProcessListener;
|
import org.jackhuang.hmcl.launch.ProcessListener;
|
||||||
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
|
import org.jackhuang.hmcl.util.i18n.I18n;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.ManagedProcess;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
*/
|
*/
|
||||||
public final class HMCLGameLauncher extends DefaultLauncher {
|
public final class HMCLGameLauncher extends DefaultLauncher {
|
||||||
|
|
||||||
public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options) {
|
public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options) {
|
||||||
this(repository, versionId, authInfo, options, null);
|
this(repository, version, authInfo, options, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
|
public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener) {
|
||||||
this(repository, versionId, authInfo, options, listener, true);
|
this(repository, version, authInfo, options, listener, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public HMCLGameLauncher(GameRepository repository, String versionId, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
|
public HMCLGameLauncher(GameRepository repository, Version version, AuthInfo authInfo, LaunchOptions options, ProcessListener listener, boolean daemon) {
|
||||||
super(repository, versionId, authInfo, options, listener, daemon);
|
super(repository, version, authInfo, options, listener, daemon);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -48,4 +56,29 @@ public final class HMCLGameLauncher extends DefaultLauncher {
|
|||||||
res.put("${launcher_version}", Metadata.VERSION);
|
res.put("${launcher_version}", Metadata.VERSION);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void generateOptionsTxt() {
|
||||||
|
File optionsFile = new File(repository.getRunDirectory(version.getId()), "options.txt");
|
||||||
|
if (optionsFile.exists())
|
||||||
|
return;
|
||||||
|
try {
|
||||||
|
// TODO: Dirty implementation here
|
||||||
|
if (I18n.getCurrentLocale().getLocale() == Locale.CHINA)
|
||||||
|
FileUtils.writeText(optionsFile, "lang:zh_cn\nforceUnicodeFont:true\n");
|
||||||
|
} catch (IOException e) {
|
||||||
|
Logging.LOG.log(Level.WARNING, "Unable to generate options.txt", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ManagedProcess launch() throws IOException, InterruptedException {
|
||||||
|
generateOptionsTxt();
|
||||||
|
return super.launch();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void makeLaunchScript(File scriptFile) throws IOException {
|
||||||
|
generateOptionsTxt();
|
||||||
|
super.makeLaunchScript(scriptFile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,33 +13,46 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.GsonBuilder;
|
import com.google.gson.GsonBuilder;
|
||||||
import org.jackhuang.hmcl.event.EventBus;
|
import com.google.gson.JsonParseException;
|
||||||
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
|
import javafx.scene.image.Image;
|
||||||
import org.jackhuang.hmcl.setting.EnumGameDirectory;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
|
import org.jackhuang.hmcl.download.LibraryAnalyzer;
|
||||||
|
import org.jackhuang.hmcl.mod.Modpack;
|
||||||
|
import org.jackhuang.hmcl.mod.ModpackConfiguration;
|
||||||
|
import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackLocalInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackManifest;
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
import org.jackhuang.hmcl.setting.Profile;
|
||||||
import org.jackhuang.hmcl.setting.Settings;
|
import org.jackhuang.hmcl.setting.ProxyManager;
|
||||||
import org.jackhuang.hmcl.setting.VersionSetting;
|
import org.jackhuang.hmcl.setting.VersionSetting;
|
||||||
import org.jackhuang.hmcl.util.FileUtils;
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
import org.jackhuang.hmcl.util.Logging;
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.JavaVersion;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.newImage;
|
||||||
|
|
||||||
public class HMCLGameRepository extends DefaultGameRepository {
|
public class HMCLGameRepository extends DefaultGameRepository {
|
||||||
private final Profile profile;
|
private final Profile profile;
|
||||||
private final Map<String, VersionSetting> versionSettings = new HashMap<>();
|
|
||||||
private final Set<String> beingModpackVersions = new HashSet<>();
|
|
||||||
|
|
||||||
public boolean checkedModpack = false, checkingModpack = false;
|
// local version settings
|
||||||
|
private final Map<String, VersionSetting> localVersionSettings = new HashMap<>();
|
||||||
|
private final Set<String> beingModpackVersions = new HashSet<>();
|
||||||
|
|
||||||
public HMCLGameRepository(Profile profile, File baseDirectory) {
|
public HMCLGameRepository(Profile profile, File baseDirectory) {
|
||||||
super(baseDirectory);
|
super(baseDirectory);
|
||||||
@@ -50,26 +63,41 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
return profile;
|
return profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GameDirectoryType getGameDirectoryType(String id) {
|
||||||
|
if (beingModpackVersions.contains(id) || isModpack(id)) {
|
||||||
|
return GameDirectoryType.VERSION_FOLDER;
|
||||||
|
} else {
|
||||||
|
return getVersionSetting(id).getGameDirType();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public File getRunDirectory(String id) {
|
public File getRunDirectory(String id) {
|
||||||
if (beingModpackVersions.contains(id) || isModpack(id))
|
switch (getGameDirectoryType(id)) {
|
||||||
return getVersionRoot(id);
|
case VERSION_FOLDER:
|
||||||
else {
|
return getVersionRoot(id);
|
||||||
VersionSetting vs = profile.getVersionSetting(id);
|
case ROOT_FOLDER:
|
||||||
switch (vs.getGameDirType()) {
|
return super.getRunDirectory(id);
|
||||||
case VERSION_FOLDER: return getVersionRoot(id);
|
case CUSTOM:
|
||||||
case ROOT_FOLDER: return super.getRunDirectory(id);
|
File dir = new File(getVersionSetting(id).getGameDir());
|
||||||
case CUSTOM: return new File(vs.getGameDir());
|
if (!FileUtils.isValidPath(dir)) return getVersionRoot(id);
|
||||||
default: throw new Error();
|
return dir;
|
||||||
}
|
default:
|
||||||
|
throw new Error();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void refreshVersionsImpl() {
|
protected void refreshVersionsImpl() {
|
||||||
versionSettings.clear();
|
localVersionSettings.clear();
|
||||||
super.refreshVersionsImpl();
|
super.refreshVersionsImpl();
|
||||||
versions.keySet().forEach(this::loadVersionSetting);
|
versions.keySet().forEach(this::loadLocalVersionSetting);
|
||||||
|
versions.keySet().forEach(version -> {
|
||||||
|
if (isModpack(version)) {
|
||||||
|
specializeVersionSetting(version);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
File file = new File(getBaseDirectory(), "launcher_profiles.json");
|
File file = new File(getBaseDirectory(), "launcher_profiles.json");
|
||||||
@@ -80,31 +108,72 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void refreshVersions() {
|
|
||||||
EventBus.EVENT_BUS.fireEvent(new RefreshingVersionsEvent(this));
|
|
||||||
refreshVersionsImpl();
|
|
||||||
EventBus.EVENT_BUS.fireEvent(new RefreshedVersionsEvent(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void changeDirectory(File newDirectory) {
|
public void changeDirectory(File newDirectory) {
|
||||||
setBaseDirectory(newDirectory);
|
setBaseDirectory(newDirectory);
|
||||||
refreshVersionsAsync().start();
|
refreshVersionsAsync().start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private File getVersionSettingFile(String id) {
|
private void clean(File directory) throws IOException {
|
||||||
|
FileUtils.deleteDirectory(new File(directory, "crash-reports"));
|
||||||
|
FileUtils.deleteDirectory(new File(directory, "logs"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clean(String id) throws IOException {
|
||||||
|
clean(getBaseDirectory());
|
||||||
|
clean(getRunDirectory(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void duplicateVersion(String srcId, String dstId, boolean copySaves) throws IOException {
|
||||||
|
File srcDir = getVersionRoot(srcId);
|
||||||
|
File dstDir = getVersionRoot(dstId);
|
||||||
|
|
||||||
|
if (dstDir.exists()) throw new IOException("Version exists");
|
||||||
|
FileUtils.copyDirectory(srcDir.toPath(), dstDir.toPath());
|
||||||
|
Files.move(dstDir.toPath().resolve(srcId + ".jar"), dstDir.toPath().resolve(dstId + ".jar"));
|
||||||
|
Files.move(dstDir.toPath().resolve(srcId + ".json"), dstDir.toPath().resolve(dstId + ".json"));
|
||||||
|
VersionSetting oldVersionSetting = getVersionSetting(srcId).clone();
|
||||||
|
GameDirectoryType originalGameDirType = oldVersionSetting.getGameDirType();
|
||||||
|
oldVersionSetting.setUsesGlobal(false);
|
||||||
|
oldVersionSetting.setGameDirType(GameDirectoryType.VERSION_FOLDER);
|
||||||
|
VersionSetting newVersionSetting = initLocalVersionSetting(dstId, oldVersionSetting);
|
||||||
|
saveVersionSetting(dstId);
|
||||||
|
|
||||||
|
File srcGameDir = getRunDirectory(srcId);
|
||||||
|
File dstGameDir = getRunDirectory(dstId);
|
||||||
|
|
||||||
|
List<String> blackList = new ArrayList<>(Arrays.asList(
|
||||||
|
"regex:(.*?)\\.log",
|
||||||
|
"usernamecache.json", "usercache.json", // Minecraft
|
||||||
|
"launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
|
||||||
|
"backup", "pack.json", "launcher.jar", "cache", // HMCL
|
||||||
|
".curseclient", // Curse
|
||||||
|
".fabric", ".mixin.out", // Fabric
|
||||||
|
"jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
|
||||||
|
"downloads", // Curse
|
||||||
|
"asm", "backups", "TCNodeTracker", "CustomDISkins", "data", "CustomSkinLoader/caches" // Mods
|
||||||
|
));
|
||||||
|
blackList.add(srcId + ".jar");
|
||||||
|
blackList.add(srcId + ".json");
|
||||||
|
if (!copySaves)
|
||||||
|
blackList.add("saves");
|
||||||
|
|
||||||
|
if (originalGameDirType != GameDirectoryType.VERSION_FOLDER)
|
||||||
|
FileUtils.copyDirectory(srcGameDir.toPath(), dstGameDir.toPath(), path -> Modpack.acceptFile(path, blackList, null));
|
||||||
|
}
|
||||||
|
|
||||||
|
private File getLocalVersionSettingFile(String id) {
|
||||||
return new File(getVersionRoot(id), "hmclversion.cfg");
|
return new File(getVersionRoot(id), "hmclversion.cfg");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadVersionSetting(String id) {
|
private void loadLocalVersionSetting(String id) {
|
||||||
File file = getVersionSettingFile(id);
|
File file = getLocalVersionSettingFile(id);
|
||||||
if (file.exists())
|
if (file.exists())
|
||||||
try {
|
try {
|
||||||
VersionSetting versionSetting = GSON.fromJson(FileUtils.readText(file), VersionSetting.class);
|
VersionSetting versionSetting = GSON.fromJson(FileUtils.readText(file), VersionSetting.class);
|
||||||
initVersionSetting(id, versionSetting);
|
initLocalVersionSetting(id, versionSetting);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
// If [JsonParseException], [IOException] or [NullPointerException] happens, the json file is malformed and needed to be recreated.
|
// If [JsonParseException], [IOException] or [NullPointerException] happens, the json file is malformed and needed to be recreated.
|
||||||
initVersionSetting(id, new VersionSetting());
|
initLocalVersionSetting(id, new VersionSetting());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,18 +182,18 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
* @param id the version id.
|
* @param id the version id.
|
||||||
* @return new version setting, null if given version does not exist.
|
* @return new version setting, null if given version does not exist.
|
||||||
*/
|
*/
|
||||||
public VersionSetting createVersionSetting(String id) {
|
public VersionSetting createLocalVersionSetting(String id) {
|
||||||
if (!hasVersion(id))
|
if (!hasVersion(id))
|
||||||
return null;
|
return null;
|
||||||
if (versionSettings.containsKey(id))
|
if (localVersionSettings.containsKey(id))
|
||||||
return getVersionSetting(id);
|
return getLocalVersionSetting(id);
|
||||||
else
|
else
|
||||||
return initVersionSetting(id, new VersionSetting());
|
return initLocalVersionSetting(id, new VersionSetting());
|
||||||
}
|
}
|
||||||
|
|
||||||
private VersionSetting initVersionSetting(String id, VersionSetting vs) {
|
private VersionSetting initLocalVersionSetting(String id, VersionSetting vs) {
|
||||||
|
localVersionSettings.put(id, vs);
|
||||||
vs.addPropertyChangedListener(a -> saveVersionSetting(id));
|
vs.addPropertyChangedListener(a -> saveVersionSetting(id));
|
||||||
versionSettings.put(id, vs);
|
|
||||||
return vs;
|
return vs;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -133,30 +202,57 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
*
|
*
|
||||||
* @param id version id
|
* @param id version id
|
||||||
*
|
*
|
||||||
* @return may return null if the id not exists
|
* @return corresponding version setting, null if the version has no its own version setting.
|
||||||
*/
|
*/
|
||||||
public VersionSetting getVersionSetting(String id) {
|
public VersionSetting getLocalVersionSetting(String id) {
|
||||||
if (!versionSettings.containsKey(id))
|
if (!localVersionSettings.containsKey(id))
|
||||||
loadVersionSetting(id);
|
loadLocalVersionSetting(id);
|
||||||
VersionSetting setting = versionSettings.get(id);
|
VersionSetting setting = localVersionSettings.get(id);
|
||||||
if (setting != null && isModpack(id))
|
if (setting != null && isModpack(id))
|
||||||
setting.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
|
setting.setGameDirType(GameDirectoryType.VERSION_FOLDER);
|
||||||
return setting;
|
return setting;
|
||||||
}
|
}
|
||||||
|
|
||||||
public File getVersionIcon(String id) {
|
public VersionSetting getVersionSetting(String id) {
|
||||||
|
VersionSetting vs = getLocalVersionSetting(id);
|
||||||
|
if (vs == null || vs.isUsesGlobal()) {
|
||||||
|
profile.getGlobal().setGlobal(true); // always keep global.isGlobal = true
|
||||||
|
profile.getGlobal().setUsesGlobal(true);
|
||||||
|
return profile.getGlobal();
|
||||||
|
} else
|
||||||
|
return vs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public File getVersionIconFile(String id) {
|
||||||
return new File(getVersionRoot(id), "icon.png");
|
return new File(getVersionRoot(id), "icon.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Image getVersionIconImage(String id) {
|
||||||
|
if (id == null || !isLoaded())
|
||||||
|
return newImage("/assets/img/grass.png");
|
||||||
|
|
||||||
|
Version version = getVersion(id).resolve(this);
|
||||||
|
File iconFile = getVersionIconFile(id);
|
||||||
|
if (iconFile.exists())
|
||||||
|
return new Image("file:" + iconFile.getAbsolutePath());
|
||||||
|
else if (version.getMainClass() != null &&
|
||||||
|
(LibraryAnalyzer.LAUNCH_WRAPPER_MAIN.equals(version.getMainClass())
|
||||||
|
|| version.getMainClass().startsWith("net.fabricmc")
|
||||||
|
|| LibraryAnalyzer.MOD_LAUNCHER_MAIN.equals(version.getMainClass())))
|
||||||
|
return newImage("/assets/img/furnace.png");
|
||||||
|
else
|
||||||
|
return newImage("/assets/img/grass.png");
|
||||||
|
}
|
||||||
|
|
||||||
public boolean saveVersionSetting(String id) {
|
public boolean saveVersionSetting(String id) {
|
||||||
if (!versionSettings.containsKey(id))
|
if (!localVersionSettings.containsKey(id))
|
||||||
return false;
|
return false;
|
||||||
File file = getVersionSettingFile(id);
|
File file = getLocalVersionSettingFile(id);
|
||||||
if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
|
if (!FileUtils.makeDirectory(file.getAbsoluteFile().getParentFile()))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
FileUtils.writeText(file, GSON.toJson(versionSettings.get(id)));
|
FileUtils.writeText(file, GSON.toJson(localVersionSettings.get(id)));
|
||||||
return true;
|
return true;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
Logging.LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
|
Logging.LOG.log(Level.SEVERE, "Unable to save version setting of " + id, e);
|
||||||
@@ -170,9 +266,9 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
* @return specialized version setting, null if given version does not exist.
|
* @return specialized version setting, null if given version does not exist.
|
||||||
*/
|
*/
|
||||||
public VersionSetting specializeVersionSetting(String id) {
|
public VersionSetting specializeVersionSetting(String id) {
|
||||||
VersionSetting vs = getVersionSetting(id);
|
VersionSetting vs = getLocalVersionSetting(id);
|
||||||
if (vs == null)
|
if (vs == null)
|
||||||
vs = createVersionSetting(id);
|
vs = createLocalVersionSetting(id);
|
||||||
if (vs == null)
|
if (vs == null)
|
||||||
return null;
|
return null;
|
||||||
vs.setUsesGlobal(false);
|
vs.setUsesGlobal(false);
|
||||||
@@ -180,7 +276,7 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void globalizeVersionSetting(String id) {
|
public void globalizeVersionSetting(String id) {
|
||||||
VersionSetting vs = getVersionSetting(id);
|
VersionSetting vs = getLocalVersionSetting(id);
|
||||||
if (vs != null)
|
if (vs != null)
|
||||||
vs.setUsesGlobal(true);
|
vs.setUsesGlobal(true);
|
||||||
}
|
}
|
||||||
@@ -189,6 +285,54 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
return FORBIDDEN.contains(id);
|
return FORBIDDEN.contains(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LaunchOptions getLaunchOptions(String version, File gameDir, boolean checkJava) throws InterruptedException {
|
||||||
|
VersionSetting vs = getVersionSetting(version);
|
||||||
|
|
||||||
|
JavaVersion javaVersion = Optional.ofNullable(vs.getJavaVersion(checkJava)).orElse(JavaVersion.fromCurrentEnvironment());
|
||||||
|
LaunchOptions.Builder builder = new LaunchOptions.Builder()
|
||||||
|
.setGameDir(gameDir)
|
||||||
|
.setJava(javaVersion)
|
||||||
|
.setVersionName(Metadata.TITLE)
|
||||||
|
.setVersionType(Metadata.TITLE)
|
||||||
|
.setProfileName(Metadata.TITLE)
|
||||||
|
.setGameArguments(StringUtils.tokenize(vs.getMinecraftArgs()))
|
||||||
|
.setJavaArguments(StringUtils.tokenize(vs.getJavaArgs()))
|
||||||
|
.setMaxMemory(vs.getMaxMemory())
|
||||||
|
.setMinMemory(vs.getMinMemory())
|
||||||
|
.setMetaspace(Lang.toIntOrNull(vs.getPermSize()))
|
||||||
|
.setWidth(vs.getWidth())
|
||||||
|
.setHeight(vs.getHeight())
|
||||||
|
.setFullscreen(vs.isFullscreen())
|
||||||
|
.setServerIp(vs.getServerIp())
|
||||||
|
.setWrapper(vs.getWrapper())
|
||||||
|
.setPrecalledCommand(vs.getPreLaunchCommand())
|
||||||
|
.setNoGeneratedJVMArgs(vs.isNoJVMArgs());
|
||||||
|
if (config().hasProxy()) {
|
||||||
|
builder.setProxy(ProxyManager.getProxy());
|
||||||
|
if (config().hasProxyAuth()) {
|
||||||
|
builder.setProxyUser(config().getProxyUser());
|
||||||
|
builder.setProxyPass(config().getProxyPass());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
File json = getModpackConfiguration(version);
|
||||||
|
if (json.exists()) {
|
||||||
|
try {
|
||||||
|
String jsonText = FileUtils.readText(json);
|
||||||
|
ModpackConfiguration<?> modpackConfiguration = JsonUtils.GSON.fromJson(jsonText, ModpackConfiguration.class);
|
||||||
|
if (McbbsModpackLocalInstallTask.MODPACK_TYPE.equals(modpackConfiguration.getType())) {
|
||||||
|
ModpackConfiguration<McbbsModpackManifest> config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<McbbsModpackManifest>>() {
|
||||||
|
}.getType());
|
||||||
|
config.getManifest().injectLaunchOptions(builder);
|
||||||
|
}
|
||||||
|
} catch (IOException | JsonParseException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.create();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public File getModpackConfiguration(String version) {
|
public File getModpackConfiguration(String version) {
|
||||||
return new File(getVersionRoot(version), "modpack.cfg");
|
return new File(getVersionRoot(version), "modpack.cfg");
|
||||||
@@ -202,8 +346,22 @@ public class HMCLGameRepository extends DefaultGameRepository {
|
|||||||
beingModpackVersions.remove(id);
|
beingModpackVersions.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Gson GSON = new GsonBuilder().setPrettyPrinting()
|
public void markVersionLaunchedAbnormally(String id) {
|
||||||
.registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
|
try {
|
||||||
|
Files.createFile(getVersionRoot(id).toPath().resolve(".abnormal"));
|
||||||
|
} catch (IOException ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean unmarkVersionLaunchedAbnormally(String id) {
|
||||||
|
File file = new File(getVersionRoot(id), ".abnormal");
|
||||||
|
boolean result = file.isFile();
|
||||||
|
file.delete();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Gson GSON = new GsonBuilder()
|
||||||
|
.setPrettyPrinting()
|
||||||
.create();
|
.create();
|
||||||
|
|
||||||
private static final HashSet<String> FORBIDDEN = new HashSet<>(Arrays.asList("modpack", "minecraftinstance", "manifest"));
|
private static final HashSet<String> FORBIDDEN = new HashSet<>(Arrays.asList("modpack", "minecraftinstance", "manifest"));
|
||||||
|
|||||||
@@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.game;
|
|
||||||
|
|
||||||
import org.jackhuang.hmcl.mod.Modpack;
|
|
||||||
import org.jackhuang.hmcl.task.Task;
|
|
||||||
import org.jackhuang.hmcl.util.Constants;
|
|
||||||
import org.jackhuang.hmcl.util.Logging;
|
|
||||||
import org.jackhuang.hmcl.util.Zipper;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Export the game to a mod pack file.
|
|
||||||
*/
|
|
||||||
public class HMCLModpackExportTask extends Task {
|
|
||||||
private final DefaultGameRepository repository;
|
|
||||||
private final String version;
|
|
||||||
private final List<String> whitelist;
|
|
||||||
private final Modpack modpack;
|
|
||||||
private final File output;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param output mod pack file.
|
|
||||||
* @param version to locate version.json
|
|
||||||
*/
|
|
||||||
public HMCLModpackExportTask(DefaultGameRepository repository, String version, List<String> whitelist, Modpack modpack, File output) {
|
|
||||||
this.repository = repository;
|
|
||||||
this.version = version;
|
|
||||||
this.whitelist = whitelist;
|
|
||||||
this.modpack = modpack;
|
|
||||||
this.output = output;
|
|
||||||
|
|
||||||
onDone().register(event -> {
|
|
||||||
if (event.isFailed()) output.delete();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() throws Exception {
|
|
||||||
ArrayList<String> blackList = new ArrayList<>(HMCLModpackManager.MODPACK_BLACK_LIST);
|
|
||||||
blackList.add(version + ".jar");
|
|
||||||
blackList.add(version + ".json");
|
|
||||||
Logging.LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
|
|
||||||
try (Zipper zip = new Zipper(output.toPath())) {
|
|
||||||
zip.putDirectory(repository.getRunDirectory(version).toPath(), "minecraft", path -> {
|
|
||||||
for (String s : blackList)
|
|
||||||
if (path.equals(s))
|
|
||||||
return false;
|
|
||||||
for (String s : whitelist)
|
|
||||||
if (path.equals(s))
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
Version mv = repository.getResolvedVersion(version);
|
|
||||||
String gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version))
|
|
||||||
.orElseThrow(() -> new IllegalStateException("Cannot parse the version of " + version));
|
|
||||||
zip.putTextFile(Constants.GSON.toJson(mv.setJar(gameVersion)), "minecraft/pack.json"); // Making "jar" to gameVersion is to be compatible with old HMCL.
|
|
||||||
zip.putTextFile(Constants.GSON.toJson(modpack.setGameVersion(gameVersion)), "modpack.json"); // Newer HMCL only reads 'gameVersion' field.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,39 +13,42 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
import com.google.gson.JsonParseException;
|
import com.google.gson.JsonParseException;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import org.jackhuang.hmcl.download.DependencyManager;
|
import org.jackhuang.hmcl.download.DefaultDependencyManager;
|
||||||
import org.jackhuang.hmcl.download.game.VersionJsonSaveTask;
|
import org.jackhuang.hmcl.download.LibraryAnalyzer;
|
||||||
import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
|
import org.jackhuang.hmcl.mod.MinecraftInstanceTask;
|
||||||
import org.jackhuang.hmcl.mod.Modpack;
|
import org.jackhuang.hmcl.mod.Modpack;
|
||||||
import org.jackhuang.hmcl.mod.ModpackConfiguration;
|
import org.jackhuang.hmcl.mod.ModpackConfiguration;
|
||||||
import org.jackhuang.hmcl.mod.ModpackInstallTask;
|
import org.jackhuang.hmcl.mod.ModpackInstallTask;
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
import org.jackhuang.hmcl.setting.Profile;
|
||||||
import org.jackhuang.hmcl.task.Task;
|
import org.jackhuang.hmcl.task.Task;
|
||||||
import org.jackhuang.hmcl.util.CompressingUtils;
|
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
||||||
import org.jackhuang.hmcl.util.Constants;
|
import org.jackhuang.hmcl.util.io.CompressingUtils;
|
||||||
import org.jackhuang.hmcl.util.FileUtils;
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
public final class HMCLModpackInstallTask extends Task {
|
public final class HMCLModpackInstallTask extends Task<Void> {
|
||||||
private final File zipFile;
|
private final File zipFile;
|
||||||
private final String name;
|
private final String name;
|
||||||
private final HMCLGameRepository repository;
|
private final HMCLGameRepository repository;
|
||||||
|
private final DefaultDependencyManager dependency;
|
||||||
private final Modpack modpack;
|
private final Modpack modpack;
|
||||||
private final List<Task> dependencies = new LinkedList<>();
|
private final List<Task<?>> dependencies = new LinkedList<>();
|
||||||
private final List<Task> dependents = new LinkedList<>();
|
private final List<Task<?>> dependents = new LinkedList<>();
|
||||||
|
|
||||||
public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
|
public HMCLModpackInstallTask(Profile profile, File zipFile, Modpack modpack, String name) {
|
||||||
DependencyManager dependency = profile.getDependency();
|
dependency = profile.getDependency();
|
||||||
repository = profile.getRepository();
|
repository = profile.getRepository();
|
||||||
this.zipFile = zipFile;
|
this.zipFile = zipFile;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
@@ -65,7 +68,7 @@ public final class HMCLModpackInstallTask extends Task {
|
|||||||
ModpackConfiguration<Modpack> config = null;
|
ModpackConfiguration<Modpack> config = null;
|
||||||
try {
|
try {
|
||||||
if (json.exists()) {
|
if (json.exists()) {
|
||||||
config = Constants.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
|
config = JsonUtils.GSON.fromJson(FileUtils.readText(json), new TypeToken<ModpackConfiguration<Modpack>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
|
|
||||||
if (!MODPACK_TYPE.equals(config.getType()))
|
if (!MODPACK_TYPE.equals(config.getType()))
|
||||||
@@ -73,25 +76,43 @@ public final class HMCLModpackInstallTask extends Task {
|
|||||||
}
|
}
|
||||||
} catch (JsonParseException | IOException ignore) {
|
} catch (JsonParseException | IOException ignore) {
|
||||||
}
|
}
|
||||||
dependents.add(new ModpackInstallTask<>(zipFile, run, "/minecraft", it -> !"pack.json".equals(it), config));
|
dependents.add(new ModpackInstallTask<>(zipFile, run, modpack.getEncoding(), "/minecraft", it -> !"pack.json".equals(it), config));
|
||||||
|
dependents.add(new MinecraftInstanceTask<>(zipFile, modpack.getEncoding(), "/minecraft", modpack, MODPACK_TYPE, modpack.getName(), modpack.getVersion(), repository.getModpackConfiguration(name)).withStage("hmcl.modpack"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Task> getDependencies() {
|
public List<Task<?>> getDependencies() {
|
||||||
return dependencies;
|
return dependencies;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Task> getDependents() {
|
public List<Task<?>> getDependents() {
|
||||||
return dependents;
|
return dependents;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute() throws Exception {
|
public void execute() throws Exception {
|
||||||
String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
|
String json = CompressingUtils.readTextZipEntry(zipFile, "minecraft/pack.json");
|
||||||
Version version = Constants.GSON.fromJson(json, Version.class).setId(name).setJar(null);
|
Version originalVersion = JsonUtils.GSON.fromJson(json, Version.class).setId(name).setJar(null);
|
||||||
dependencies.add(new VersionJsonSaveTask(repository, version));
|
LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(originalVersion);
|
||||||
dependencies.add(new MinecraftInstanceTask<>(zipFile, "/minecraft", modpack, MODPACK_TYPE, repository.getModpackConfiguration(name)));
|
Task<Version> libraryTask = Task.supplyAsync(() -> originalVersion);
|
||||||
|
// reinstall libraries
|
||||||
|
// libraries of Forge and OptiFine should be obtained by installation.
|
||||||
|
for (LibraryAnalyzer.LibraryMark mark : analyzer) {
|
||||||
|
if (LibraryAnalyzer.LibraryType.MINECRAFT.getPatchId().equals(mark.getLibraryId()))
|
||||||
|
continue;
|
||||||
|
libraryTask = libraryTask.thenComposeAsync(version -> dependency.installLibraryAsync(modpack.getGameVersion(), version, mark.getLibraryId(), mark.getLibraryVersion()));
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies.add(libraryTask.thenComposeAsync(repository::saveAsync));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getStages() {
|
||||||
|
return Stream.concat(
|
||||||
|
dependents.stream().flatMap(task -> task.getStages().stream()),
|
||||||
|
Stream.of("hmcl.modpack")
|
||||||
|
).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String MODPACK_TYPE = "HMCL";
|
public static final String MODPACK_TYPE = "HMCL";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,76 +13,38 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
import com.google.gson.JsonParseException;
|
import com.google.gson.JsonParseException;
|
||||||
import org.jackhuang.hmcl.mod.Modpack;
|
import org.jackhuang.hmcl.mod.Modpack;
|
||||||
import org.jackhuang.hmcl.util.CompressingUtils;
|
|
||||||
import org.jackhuang.hmcl.util.JsonUtils;
|
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
|
||||||
import org.jackhuang.hmcl.util.StringUtils;
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.CompressingUtils;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.nio.charset.Charset;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
*/
|
*/
|
||||||
public final class HMCLModpackManager {
|
public final class HMCLModpackManager {
|
||||||
|
|
||||||
public static final List<String> MODPACK_BLACK_LIST = Lang.immutableListOf(
|
|
||||||
"usernamecache.json", "usercache.json", // Minecraft
|
|
||||||
"launcher_profiles.json", "launcher.pack.lzma", // Minecraft Launcher
|
|
||||||
"pack.json", "launcher.jar", "hmclmc.log", // HMCL
|
|
||||||
"manifest.json", "minecraftinstance.json", ".curseclient", // Curse
|
|
||||||
"minetweaker.log", // Mods
|
|
||||||
"jars", "logs", "versions", "assets", "libraries", "crash-reports", "NVIDIA", "AMD", "screenshots", "natives", "native", "$native", "server-resource-packs", // Minecraft
|
|
||||||
"downloads", // Curse
|
|
||||||
"asm", "backups", "TCNodeTracker", "CustomDISkins", "data" // Mods
|
|
||||||
);
|
|
||||||
public static final List<String> MODPACK_SUGGESTED_BLACK_LIST = Lang.immutableListOf(
|
|
||||||
"fonts", // BetterFonts
|
|
||||||
"saves", "servers.dat", "options.txt", // Minecraft
|
|
||||||
"blueprints" /* BuildCraft */,
|
|
||||||
"optionsof.txt" /* OptiFine */,
|
|
||||||
"journeymap" /* JourneyMap */,
|
|
||||||
"optionsshaders.txt",
|
|
||||||
"mods/VoxelMods");
|
|
||||||
|
|
||||||
public static ModAdviser.ModSuggestion suggestMod(String fileName, boolean isDirectory) {
|
|
||||||
if (match(MODPACK_BLACK_LIST, fileName, isDirectory))
|
|
||||||
return ModAdviser.ModSuggestion.HIDDEN;
|
|
||||||
if (match(MODPACK_SUGGESTED_BLACK_LIST, fileName, isDirectory))
|
|
||||||
return ModAdviser.ModSuggestion.NORMAL;
|
|
||||||
else
|
|
||||||
return ModAdviser.ModSuggestion.SUGGESTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean match(List<String> l, String fileName, boolean isDirectory) {
|
|
||||||
for (String s : l)
|
|
||||||
if (isDirectory) {
|
|
||||||
if (fileName.startsWith(s + "/"))
|
|
||||||
return true;
|
|
||||||
} else if (fileName.equals(s))
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Read the manifest in a HMCL modpack.
|
* Read the manifest in a HMCL modpack.
|
||||||
*
|
*
|
||||||
* @param file a HMCL modpack file.
|
* @param file a HMCL modpack file.
|
||||||
|
* @param encoding encoding of modpack zip file.
|
||||||
* @throws IOException if the file is not a valid zip file.
|
* @throws IOException if the file is not a valid zip file.
|
||||||
* @throws JsonParseException if the manifest.json is missing or malformed.
|
* @throws JsonParseException if the manifest.json is missing or malformed.
|
||||||
* @return the manifest of HMCL modpack.
|
* @return the manifest of HMCL modpack.
|
||||||
*/
|
*/
|
||||||
public static Modpack readHMCLModpackManifest(File file) throws IOException, JsonParseException {
|
public static Modpack readHMCLModpackManifest(Path file, Charset encoding) throws IOException, JsonParseException {
|
||||||
String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json");
|
String manifestJson = CompressingUtils.readTextZipEntry(file, "modpack.json", encoding);
|
||||||
Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class);
|
Modpack manifest = JsonUtils.fromNonNullJson(manifestJson, Modpack.class).setEncoding(encoding);
|
||||||
String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json");
|
String gameJson = CompressingUtils.readTextZipEntry(file, "minecraft/pack.json", encoding);
|
||||||
Version game = JsonUtils.fromNonNullJson(gameJson, Version.class);
|
Version game = JsonUtils.fromNonNullJson(gameJson, Version.class);
|
||||||
if (game.getJar() == null)
|
if (game.getJar() == null)
|
||||||
if (StringUtils.isBlank(manifest.getVersion()))
|
if (StringUtils.isBlank(manifest.getVersion()))
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,23 +13,34 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
|
import javafx.stage.Stage;
|
||||||
import org.jackhuang.hmcl.Launcher;
|
import org.jackhuang.hmcl.Launcher;
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
import org.jackhuang.hmcl.auth.*;
|
||||||
import org.jackhuang.hmcl.auth.AuthInfo;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
|
||||||
import org.jackhuang.hmcl.auth.AuthenticationException;
|
|
||||||
import org.jackhuang.hmcl.auth.CredentialExpiredException;
|
|
||||||
import org.jackhuang.hmcl.download.DefaultDependencyManager;
|
import org.jackhuang.hmcl.download.DefaultDependencyManager;
|
||||||
|
import org.jackhuang.hmcl.download.LibraryAnalyzer;
|
||||||
import org.jackhuang.hmcl.download.MaintainTask;
|
import org.jackhuang.hmcl.download.MaintainTask;
|
||||||
|
import org.jackhuang.hmcl.download.game.GameAssetIndexDownloadTask;
|
||||||
|
import org.jackhuang.hmcl.download.game.GameVerificationFixTask;
|
||||||
import org.jackhuang.hmcl.download.game.LibraryDownloadException;
|
import org.jackhuang.hmcl.download.game.LibraryDownloadException;
|
||||||
import org.jackhuang.hmcl.launch.*;
|
import org.jackhuang.hmcl.download.java.JavaRepository;
|
||||||
import org.jackhuang.hmcl.mod.CurseCompletionException;
|
import org.jackhuang.hmcl.launch.NotDecompressingNativesException;
|
||||||
import org.jackhuang.hmcl.mod.CurseCompletionTask;
|
import org.jackhuang.hmcl.launch.PermissionException;
|
||||||
|
import org.jackhuang.hmcl.launch.ProcessCreationException;
|
||||||
|
import org.jackhuang.hmcl.launch.ProcessListener;
|
||||||
import org.jackhuang.hmcl.mod.ModpackConfiguration;
|
import org.jackhuang.hmcl.mod.ModpackConfiguration;
|
||||||
|
import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
|
||||||
|
import org.jackhuang.hmcl.mod.curse.CurseCompletionTask;
|
||||||
|
import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackCompletionTask;
|
||||||
|
import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackLocalInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.server.ServerModpackCompletionTask;
|
||||||
|
import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
|
||||||
import org.jackhuang.hmcl.setting.LauncherVisibility;
|
import org.jackhuang.hmcl.setting.LauncherVisibility;
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
import org.jackhuang.hmcl.setting.Profile;
|
||||||
import org.jackhuang.hmcl.setting.VersionSetting;
|
import org.jackhuang.hmcl.setting.VersionSetting;
|
||||||
@@ -38,155 +49,188 @@ import org.jackhuang.hmcl.ui.Controllers;
|
|||||||
import org.jackhuang.hmcl.ui.DialogController;
|
import org.jackhuang.hmcl.ui.DialogController;
|
||||||
import org.jackhuang.hmcl.ui.LogWindow;
|
import org.jackhuang.hmcl.ui.LogWindow;
|
||||||
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
||||||
import org.jackhuang.hmcl.ui.construct.MessageBox;
|
import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
|
||||||
import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
|
import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
|
||||||
import org.jackhuang.hmcl.util.*;
|
import org.jackhuang.hmcl.util.*;
|
||||||
|
import org.jackhuang.hmcl.util.gson.UUIDTypeAdapter;
|
||||||
|
import org.jackhuang.hmcl.util.i18n.I18n;
|
||||||
|
import org.jackhuang.hmcl.util.io.ResponseCodeException;
|
||||||
|
import org.jackhuang.hmcl.util.platform.*;
|
||||||
|
import org.jackhuang.hmcl.util.versioning.VersionNumber;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.SocketTimeoutException;
|
||||||
|
import java.net.URL;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.RejectedExecutionException;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.util.Lang.mapOf;
|
import static org.jackhuang.hmcl.util.Lang.mapOf;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
import static org.jackhuang.hmcl.util.Pair.pair;
|
import static org.jackhuang.hmcl.util.Pair.pair;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public final class LauncherHelper {
|
public final class LauncherHelper {
|
||||||
public static final LauncherHelper INSTANCE = new LauncherHelper();
|
|
||||||
private LauncherHelper(){}
|
|
||||||
|
|
||||||
public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
|
private final Profile profile;
|
||||||
|
private final Account account;
|
||||||
|
private final String selectedVersion;
|
||||||
|
private File scriptFile;
|
||||||
|
private final VersionSetting setting;
|
||||||
|
private LauncherVisibility launcherVisibility;
|
||||||
|
private boolean showLogs;
|
||||||
|
|
||||||
|
public LauncherHelper(Profile profile, Account account, String selectedVersion) {
|
||||||
|
this.profile = Objects.requireNonNull(profile);
|
||||||
|
this.account = Objects.requireNonNull(account);
|
||||||
|
this.selectedVersion = Objects.requireNonNull(selectedVersion);
|
||||||
|
this.setting = profile.getVersionSetting(selectedVersion);
|
||||||
|
this.launcherVisibility = setting.getLauncherVisibility();
|
||||||
|
this.showLogs = setting.isShowLogs();
|
||||||
|
this.launchingStepsPane.setTitle(i18n("version.launch"));
|
||||||
|
}
|
||||||
|
|
||||||
private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
|
private final TaskExecutorDialogPane launchingStepsPane = new TaskExecutorDialogPane(it -> {});
|
||||||
|
|
||||||
public void launch(Profile profile, Account account, String selectedVersion, File scriptFile) {
|
public void setTestMode() {
|
||||||
if (account == null)
|
launcherVisibility = LauncherVisibility.KEEP;
|
||||||
throw new IllegalArgumentException("No account");
|
showLogs = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void launch() {
|
||||||
Logging.LOG.info("Launching game version: " + selectedVersion);
|
Logging.LOG.info("Launching game version: " + selectedVersion);
|
||||||
|
|
||||||
GameRepository repository = profile.getRepository();
|
GameRepository repository = profile.getRepository();
|
||||||
|
|
||||||
Version version = repository.getResolvedVersion(selectedVersion);
|
Version version = repository.getResolvedVersion(selectedVersion);
|
||||||
VersionSetting setting = profile.getVersionSetting(selectedVersion);
|
|
||||||
|
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
try {
|
try {
|
||||||
checkGameState(profile, setting, version, () -> {
|
checkGameState(profile, setting, version, () -> {
|
||||||
Controllers.dialog(launchingStepsPane);
|
Controllers.dialog(launchingStepsPane);
|
||||||
Schedulers.newThread().schedule(() -> launch0(profile, account, selectedVersion, scriptFile));
|
Schedulers.defaultScheduler().execute(this::launch0);
|
||||||
});
|
});
|
||||||
} catch (InterruptedException ignore) {
|
} catch (InterruptedException | RejectedExecutionException ignore) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launch0(Profile profile, Account account, String selectedVersion, File scriptFile) {
|
public void makeLaunchScript(File scriptFile) {
|
||||||
|
this.scriptFile = Objects.requireNonNull(scriptFile);
|
||||||
|
|
||||||
|
launch();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void launch0() {
|
||||||
HMCLGameRepository repository = profile.getRepository();
|
HMCLGameRepository repository = profile.getRepository();
|
||||||
DefaultDependencyManager dependencyManager = profile.getDependency();
|
DefaultDependencyManager dependencyManager = profile.getDependency();
|
||||||
Version version = MaintainTask.maintain(repository.getResolvedVersion(selectedVersion));
|
Version version = MaintainTask.maintain(repository, repository.getResolvedVersion(selectedVersion));
|
||||||
VersionSetting setting = profile.getVersionSetting(selectedVersion);
|
|
||||||
Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
|
Optional<String> gameVersion = GameVersion.minecraftVersion(repository.getVersionJar(version));
|
||||||
|
boolean integrityCheck = repository.unmarkVersionLaunchedAbnormally(selectedVersion);
|
||||||
|
CountDownLatch launchingLatch = new CountDownLatch(1);
|
||||||
|
|
||||||
TaskExecutor executor = Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.DEPENDENCIES))
|
TaskExecutor executor = dependencyManager.checkPatchCompletionAsync(repository.getVersion(selectedVersion), integrityCheck)
|
||||||
.then(variables -> {
|
.thenComposeAsync(Task.allOf(
|
||||||
if (setting.isNotCheckGame())
|
Task.composeAsync(() -> {
|
||||||
return null;
|
if (setting.isNotCheckGame())
|
||||||
else
|
return null;
|
||||||
return dependencyManager.checkGameCompletionAsync(version);
|
else
|
||||||
|
return dependencyManager.checkGameCompletionAsync(version, integrityCheck);
|
||||||
|
}), Task.composeAsync(() -> {
|
||||||
|
try {
|
||||||
|
ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
|
||||||
|
if (CurseInstallTask.MODPACK_TYPE.equals(configuration.getType()))
|
||||||
|
return new CurseCompletionTask(dependencyManager, selectedVersion);
|
||||||
|
else if (ServerModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
|
||||||
|
return new ServerModpackCompletionTask(dependencyManager, selectedVersion);
|
||||||
|
else if (McbbsModpackLocalInstallTask.MODPACK_TYPE.equals(configuration.getType()))
|
||||||
|
return new McbbsModpackCompletionTask(dependencyManager, selectedVersion);
|
||||||
|
else
|
||||||
|
return null;
|
||||||
|
} catch (IOException e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}))).withStage("launch.state.dependencies")
|
||||||
|
.thenComposeAsync(() -> {
|
||||||
|
return gameVersion.map(s -> new GameVerificationFixTask(dependencyManager, s, version)).orElse(null);
|
||||||
})
|
})
|
||||||
.then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.MODS)))
|
.thenComposeAsync(Task.supplyAsync(() -> {
|
||||||
.then(var -> {
|
|
||||||
try {
|
try {
|
||||||
ModpackConfiguration<?> configuration = ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(selectedVersion));
|
return account.logIn();
|
||||||
if ("Curse".equals(configuration.getType()))
|
|
||||||
return new CurseCompletionTask(dependencyManager, selectedVersion);
|
|
||||||
else
|
|
||||||
return null;
|
|
||||||
} catch (IOException e) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LOGGING_IN)))
|
|
||||||
.then(Task.of(i18n("account.methods"), variables -> {
|
|
||||||
try {
|
|
||||||
variables.set("account", account.logIn());
|
|
||||||
} catch (CredentialExpiredException e) {
|
} catch (CredentialExpiredException e) {
|
||||||
variables.set("account", DialogController.logIn(account));
|
LOG.info("Credential has expired: " + e);
|
||||||
|
return DialogController.logIn(account);
|
||||||
} catch (AuthenticationException e) {
|
} catch (AuthenticationException e) {
|
||||||
variables.set("account",
|
LOG.warning("Authentication failed, try playing offline: " + e);
|
||||||
account.playOffline().orElseThrow(() -> e));
|
return account.playOffline().orElseThrow(() -> e);
|
||||||
}
|
}
|
||||||
}))
|
}).withStage("launch.state.logging_in"))
|
||||||
.then(Task.of(Schedulers.javafx(), () -> emitStatus(LoadingState.LAUNCHING)))
|
.thenComposeAsync(authInfo -> Task.supplyAsync(() -> {
|
||||||
.then(Task.of(variables -> {
|
return new HMCLGameLauncher(
|
||||||
variables.set("launcher", new HMCLGameLauncher(
|
|
||||||
repository,
|
repository,
|
||||||
selectedVersion,
|
version.getPatches().isEmpty() ? repository.getResolvedVersion(selectedVersion) : version,
|
||||||
variables.get("account"),
|
authInfo,
|
||||||
setting.toLaunchOptions(profile.getGameDir()),
|
repository.getLaunchOptions(selectedVersion, profile.getGameDir(), !setting.isNotCheckJVM()),
|
||||||
setting.getLauncherVisibility() == LauncherVisibility.CLOSE
|
launcherVisibility == LauncherVisibility.CLOSE
|
||||||
? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
|
? null // Unnecessary to start listening to game process output when close launcher immediately after game launched.
|
||||||
: new HMCLProcessListener(variables.get("account"), setting, gameVersion.isPresent())
|
: new HMCLProcessListener(repository, selectedVersion, authInfo, launchingLatch, gameVersion.isPresent())
|
||||||
));
|
);
|
||||||
}))
|
}).thenComposeAsync(launcher -> { // launcher is prev task's result
|
||||||
.then(variables -> {
|
|
||||||
DefaultLauncher launcher = variables.get("launcher");
|
|
||||||
if (scriptFile == null) {
|
if (scriptFile == null) {
|
||||||
return new LaunchTask<>(launcher::launch).setName(i18n("version.launch"));
|
return Task.supplyAsync(launcher::launch);
|
||||||
} else {
|
} else {
|
||||||
return new LaunchTask<>(() -> {
|
return Task.supplyAsync(() -> {
|
||||||
launcher.makeLaunchScript(scriptFile);
|
launcher.makeLaunchScript(scriptFile);
|
||||||
return null;
|
return null;
|
||||||
}).setName(i18n("version.launch_script"));
|
});
|
||||||
}
|
}
|
||||||
})
|
}).thenAcceptAsync(process -> { // process is LaunchTask's result
|
||||||
.then(Task.of(variables -> {
|
|
||||||
if (scriptFile == null) {
|
if (scriptFile == null) {
|
||||||
ManagedProcess process = variables.get(LaunchTask.LAUNCH_ID);
|
|
||||||
PROCESSES.add(process);
|
PROCESSES.add(process);
|
||||||
if (setting.getLauncherVisibility() == LauncherVisibility.CLOSE)
|
if (launcherVisibility == LauncherVisibility.CLOSE)
|
||||||
Launcher.stopApplication();
|
Launcher.stopApplication();
|
||||||
else
|
else
|
||||||
launchingStepsPane.setCancel(it -> {
|
launchingStepsPane.setCancel(it -> {
|
||||||
process.stop();
|
process.stop();
|
||||||
it.fireEvent(new DialogCloseEvent());
|
it.fireEvent(new DialogCloseEvent());
|
||||||
});
|
});
|
||||||
} else
|
} else {
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
launchingStepsPane.fireEvent(new DialogCloseEvent());
|
launchingStepsPane.fireEvent(new DialogCloseEvent());
|
||||||
Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
|
Controllers.dialog(i18n("version.launch_script.success", scriptFile.getAbsolutePath()));
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}))
|
}).thenRunAsync(() -> {
|
||||||
|
launchingLatch.await();
|
||||||
|
}).withStage("launch.state.waiting_launching"))
|
||||||
|
.withStagesHint(Lang.immutableListOf(
|
||||||
|
"launch.state.dependencies",
|
||||||
|
"launch.state.logging_in",
|
||||||
|
"launch.state.waiting_launching"))
|
||||||
.executor();
|
.executor();
|
||||||
|
launchingStepsPane.setExecutor(executor, false);
|
||||||
launchingStepsPane.setExecutor(executor);
|
|
||||||
executor.addTaskListener(new TaskListener() {
|
executor.addTaskListener(new TaskListener() {
|
||||||
final AtomicInteger finished = new AtomicInteger(0);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFinished(Task task) {
|
|
||||||
finished.incrementAndGet();
|
|
||||||
int runningTasks = executor.getRunningTasks();
|
|
||||||
Platform.runLater(() -> launchingStepsPane.setProgress(1.0 * finished.get() / runningTasks));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStop(boolean success, TaskExecutor executor) {
|
public void onStop(boolean success, TaskExecutor executor) {
|
||||||
if (!success && !Controllers.isStopped()) {
|
Platform.runLater(() -> {
|
||||||
Platform.runLater(() -> {
|
// Check if the application has stopped
|
||||||
// Check if the application has stopped
|
// because onStop will be invoked if tasks fail when the executor service shut down.
|
||||||
// because onStop will be invoked if tasks fail when the executor service shut down.
|
if (!Controllers.isStopped()) {
|
||||||
if (!Controllers.isStopped()) {
|
launchingStepsPane.fireEvent(new DialogCloseEvent());
|
||||||
launchingStepsPane.fireEvent(new DialogCloseEvent());
|
if (!success) {
|
||||||
Exception ex = executor.getLastException();
|
Exception ex = executor.getException();
|
||||||
if (ex != null) {
|
if (ex != null) {
|
||||||
String message;
|
String message;
|
||||||
if (ex instanceof CurseCompletionException) {
|
if (ex instanceof CurseCompletionException) {
|
||||||
message = i18n("modpack.type.curse.error");
|
if (ex.getCause() instanceof FileNotFoundException)
|
||||||
|
message = i18n("modpack.type.curse.not_found");
|
||||||
|
else
|
||||||
|
message = i18n("modpack.type.curse.error");
|
||||||
} else if (ex instanceof PermissionException) {
|
} else if (ex instanceof PermissionException) {
|
||||||
message = i18n("launch.failed.executable_permission");
|
message = i18n("launch.failed.executable_permission");
|
||||||
} else if (ex instanceof ProcessCreationException) {
|
} else if (ex instanceof ProcessCreationException) {
|
||||||
@@ -194,18 +238,57 @@ public final class LauncherHelper {
|
|||||||
} else if (ex instanceof NotDecompressingNativesException) {
|
} else if (ex instanceof NotDecompressingNativesException) {
|
||||||
message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
|
message = i18n("launch.failed.decompressing_natives") + ex.getLocalizedMessage();
|
||||||
} else if (ex instanceof LibraryDownloadException) {
|
} else if (ex instanceof LibraryDownloadException) {
|
||||||
message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n" + StringUtils.getStackTrace(ex.getCause());
|
message = i18n("launch.failed.download_library", ((LibraryDownloadException) ex).getLibrary().getName()) + "\n";
|
||||||
|
if (ex.getCause() instanceof ResponseCodeException) {
|
||||||
|
ResponseCodeException rce = (ResponseCodeException) ex.getCause();
|
||||||
|
int responseCode = rce.getResponseCode();
|
||||||
|
URL url = rce.getUrl();
|
||||||
|
if (responseCode == 404)
|
||||||
|
message += i18n("download.code.404", url);
|
||||||
|
else
|
||||||
|
message += i18n("download.failed", url, responseCode);
|
||||||
|
} else {
|
||||||
|
message += StringUtils.getStackTrace(ex.getCause());
|
||||||
|
}
|
||||||
|
} else if (ex instanceof DownloadException) {
|
||||||
|
URL url = ((DownloadException) ex).getUrl();
|
||||||
|
if (ex.getCause() instanceof SocketTimeoutException) {
|
||||||
|
message = i18n("install.failed.downloading.timeout", url);
|
||||||
|
} else if (ex.getCause() instanceof ResponseCodeException) {
|
||||||
|
ResponseCodeException responseCodeException = (ResponseCodeException) ex.getCause();
|
||||||
|
if (I18n.hasKey("download.code." + responseCodeException.getResponseCode())) {
|
||||||
|
message = i18n("download.code." + responseCodeException.getResponseCode(), url);
|
||||||
|
} else {
|
||||||
|
message = i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(ex.getCause());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
message = i18n("install.failed.downloading.detail", url) + "\n" + StringUtils.getStackTrace(ex.getCause());
|
||||||
|
}
|
||||||
|
} else if (ex instanceof GameAssetIndexDownloadTask.GameAssetIndexMalformedException) {
|
||||||
|
message = i18n("assets.index.malformed");
|
||||||
|
} else if (ex instanceof AuthlibInjectorDownloadException) {
|
||||||
|
message = i18n("account.failed.injector_download_failure");
|
||||||
|
} else if (ex instanceof CharacterDeletedException) {
|
||||||
|
message = i18n("account.failed.character_deleted");
|
||||||
|
} else if (ex instanceof ResponseCodeException) {
|
||||||
|
ResponseCodeException rce = (ResponseCodeException) ex;
|
||||||
|
int responseCode = rce.getResponseCode();
|
||||||
|
URL url = rce.getUrl();
|
||||||
|
if (responseCode == 404)
|
||||||
|
message = i18n("download.code.404", url);
|
||||||
|
else
|
||||||
|
message = i18n("download.failed", url, responseCode);
|
||||||
} else {
|
} else {
|
||||||
message = StringUtils.getStackTrace(ex);
|
message = StringUtils.getStackTrace(ex);
|
||||||
}
|
}
|
||||||
Controllers.dialog(message,
|
Controllers.dialog(message,
|
||||||
scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
|
scriptFile == null ? i18n("launch.failed") : i18n("version.launch_script.failed"),
|
||||||
MessageBox.ERROR_MESSAGE);
|
MessageType.ERROR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
}
|
launchingStepsPane.setExecutor(null);
|
||||||
launchingStepsPane.setExecutor(null);
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -213,6 +296,11 @@ public final class LauncherHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
|
private static void checkGameState(Profile profile, VersionSetting setting, Version version, Runnable onAccept) throws InterruptedException {
|
||||||
|
if (setting.isNotCheckJVM()) {
|
||||||
|
onAccept.run();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
boolean java8required = false;
|
boolean java8required = false;
|
||||||
boolean newJavaRequired = false;
|
boolean newJavaRequired = false;
|
||||||
@@ -222,16 +310,32 @@ public final class LauncherHelper {
|
|||||||
VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
|
VersionNumber gameVersion = VersionNumber.asVersion(GameVersion.minecraftVersion(profile.getRepository().getVersionJar(version)).orElse("Unknown"));
|
||||||
JavaVersion java = setting.getJavaVersion();
|
JavaVersion java = setting.getJavaVersion();
|
||||||
if (java == null) {
|
if (java == null) {
|
||||||
Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
|
Controllers.dialog(i18n("launch.wrong_javadir"), i18n("message.warning"), MessageType.WARNING, onAccept);
|
||||||
setting.setJava(null);
|
setting.setJava(null);
|
||||||
setting.setDefaultJavaPath(null);
|
setting.setDefaultJavaPath(null);
|
||||||
java = JavaVersion.fromCurrentEnvironment();
|
java = JavaVersion.fromCurrentEnvironment();
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!flag && version.getJavaVersion() != null) {
|
||||||
|
if (java.getParsedVersion() < version.getJavaVersion().getMajorVersion()) {
|
||||||
|
Optional<JavaVersion> acceptableJava = JavaVersion.getJavas().stream()
|
||||||
|
.filter(javaVersion -> javaVersion.getParsedVersion() >= version.getJavaVersion().getMajorVersion())
|
||||||
|
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
||||||
|
if (acceptableJava.isPresent()) {
|
||||||
|
setting.setJavaVersion(acceptableJava.get());
|
||||||
|
} else {
|
||||||
|
Controllers.dialog(i18n("launch.advice.require_newer_java_version", gameVersion.toString(), version.getJavaVersion().getMajorVersion()), i18n("message.warning"), MessageType.WARNING, () -> {
|
||||||
|
downloadJava(version.getJavaVersion(), profile).thenAccept(x -> onAccept.run());
|
||||||
|
});
|
||||||
|
flag = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Game later than 1.7.2 accepts Java 8.
|
// Game later than 1.7.2 accepts Java 8.
|
||||||
if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8 && gameVersion.compareTo(VersionNumber.asVersion("1.7.2")) > 0) {
|
if (!flag && java.getParsedVersion() < JavaVersion.JAVA_8 && gameVersion.compareTo(VersionNumber.asVersion("1.7.2")) > 0) {
|
||||||
Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
|
Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
|
||||||
.filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
|
.filter(javaVersion -> javaVersion.getParsedVersion() >= JavaVersion.JAVA_8)
|
||||||
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
||||||
if (java8.isPresent()) {
|
if (java8.isPresent()) {
|
||||||
@@ -241,10 +345,10 @@ public final class LauncherHelper {
|
|||||||
if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
|
if (gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0) {
|
||||||
// Minecraft 1.13 and later versions only support Java 8 or later.
|
// Minecraft 1.13 and later versions only support Java 8 or later.
|
||||||
// Terminate launching operation.
|
// Terminate launching operation.
|
||||||
Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
|
Controllers.dialog(i18n("launch.advice.java8_1_13"), i18n("message.error"), MessageType.ERROR, null);
|
||||||
} else {
|
} else {
|
||||||
// Most mods require Java 8 or later version.
|
// Most mods require Java 8 or later version.
|
||||||
Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
|
Controllers.dialog(i18n("launch.advice.newer_java"), i18n("message.warning"), MessageType.WARNING, onAccept);
|
||||||
}
|
}
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
@@ -252,42 +356,44 @@ public final class LauncherHelper {
|
|||||||
|
|
||||||
// LaunchWrapper 1.12 will crash because of assuming the system class loader is an instance of URLClassLoader.
|
// LaunchWrapper 1.12 will crash because of assuming the system class loader is an instance of URLClassLoader.
|
||||||
if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9
|
if (!flag && java.getParsedVersion() >= JavaVersion.JAVA_9
|
||||||
&& version.getMainClass().contains("launchwrapper")
|
&& LibraryAnalyzer.LAUNCH_WRAPPER_MAIN.equals(version.getMainClass())
|
||||||
&& version.getLibraries().stream()
|
&& version.getLibraries().stream()
|
||||||
.filter(library -> "launchwrapper".equals(library.getArtifactId()))
|
.filter(library -> "launchwrapper".equals(library.getArtifactId()))
|
||||||
.anyMatch(library -> VersionNumber.asVersion(library.getVersion()).compareTo(VersionNumber.asVersion("1.13")) < 0)) {
|
.anyMatch(library -> VersionNumber.asVersion(library.getVersion()).compareTo(VersionNumber.asVersion("1.13")) < 0)) {
|
||||||
Optional<JavaVersion> java8 = JavaVersion.getJREs().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
|
Optional<JavaVersion> java8 = JavaVersion.getJavas().stream().filter(javaVersion -> javaVersion.getParsedVersion() == JavaVersion.JAVA_8).findAny();
|
||||||
if (java8.isPresent()) {
|
if (java8.isPresent()) {
|
||||||
java8required = true;
|
java8required = true;
|
||||||
setting.setJavaVersion(java8.get());
|
setting.setJavaVersion(java8.get());
|
||||||
|
Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.corrected"), i18n("message.info"), MessageType.INFORMATION, onAccept);
|
||||||
|
flag = true;
|
||||||
} else {
|
} else {
|
||||||
Controllers.dialog(i18n("launch.advice.java9"), i18n("message.error"), MessageBox.ERROR_MESSAGE, null);
|
Controllers.dialog(i18n("launch.advice.java9") + "\n" + i18n("launch.advice.uncorrected"), i18n("message.error"), MessageType.ERROR, null);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
|
// Minecraft 1.13 may crash when generating world on Java 8 earlier than 1.8.0_51
|
||||||
VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0.51");
|
VersionNumber JAVA_8 = VersionNumber.asVersion("1.8.0_51");
|
||||||
if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
|
if (!flag && gameVersion.compareTo(VersionNumber.asVersion("1.13")) >= 0 && java.getParsedVersion() == JavaVersion.JAVA_8 && java.getVersionNumber().compareTo(JAVA_8) < 0) {
|
||||||
Optional<JavaVersion> java8 = JavaVersion.getJREs().stream()
|
Optional<JavaVersion> java8 = JavaVersion.getJavas().stream()
|
||||||
.filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
|
.filter(javaVersion -> javaVersion.getVersionNumber().compareTo(JAVA_8) >= 0)
|
||||||
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
||||||
if (java8.isPresent()) {
|
if (java8.isPresent()) {
|
||||||
newJavaRequired = true;
|
newJavaRequired = true;
|
||||||
setting.setJavaVersion(java8.get());
|
setting.setJavaVersion(java8.get());
|
||||||
} else {
|
} else {
|
||||||
Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageBox.WARNING_MESSAGE, onAccept);
|
Controllers.dialog(i18n("launch.advice.java8_51_1_13"), i18n("message.warning"), MessageType.WARNING, onAccept);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
|
if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
|
||||||
org.jackhuang.hmcl.util.Platform.IS_64_BIT) {
|
Architecture.CURRENT.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_64) {
|
||||||
final JavaVersion java32 = java;
|
final JavaVersion java32 = java;
|
||||||
|
|
||||||
// First find if same java version but whose platform is 64-bit installed.
|
// First find if same java version but whose platform is 64-bit installed.
|
||||||
Optional<JavaVersion> java64 = JavaVersion.getJREs().stream()
|
Optional<JavaVersion> java64 = JavaVersion.getJavas().stream()
|
||||||
.filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
|
.filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
|
||||||
.filter(javaVersion -> javaVersion.getParsedVersion() == java32.getParsedVersion())
|
.filter(javaVersion -> javaVersion.getParsedVersion() == java32.getParsedVersion())
|
||||||
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
.max(Comparator.comparing(JavaVersion::getVersionNumber));
|
||||||
|
|
||||||
@@ -295,8 +401,8 @@ public final class LauncherHelper {
|
|||||||
final boolean java8requiredFinal = java8required, newJavaRequiredFinal = newJavaRequired;
|
final boolean java8requiredFinal = java8required, newJavaRequiredFinal = newJavaRequired;
|
||||||
|
|
||||||
// Then find if other java version which satisfies requirements installed.
|
// Then find if other java version which satisfies requirements installed.
|
||||||
java64 = JavaVersion.getJREs().stream()
|
java64 = JavaVersion.getJavas().stream()
|
||||||
.filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.Platform.PLATFORM)
|
.filter(javaVersion -> javaVersion.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.PLATFORM)
|
||||||
.filter(javaVersion -> {
|
.filter(javaVersion -> {
|
||||||
if (java8requiredFinal) return javaVersion.getParsedVersion() == JavaVersion.JAVA_8;
|
if (java8requiredFinal) return javaVersion.getParsedVersion() == JavaVersion.JAVA_8;
|
||||||
if (newJavaRequiredFinal) return javaVersion.getParsedVersion() >= JavaVersion.JAVA_8;
|
if (newJavaRequiredFinal) return javaVersion.getParsedVersion() >= JavaVersion.JAVA_8;
|
||||||
@@ -308,46 +414,92 @@ public final class LauncherHelper {
|
|||||||
if (java64.isPresent()) {
|
if (java64.isPresent()) {
|
||||||
setting.setJavaVersion(java64.get());
|
setting.setJavaVersion(java64.get());
|
||||||
} else {
|
} else {
|
||||||
Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
|
Controllers.dialog(i18n("launch.advice.different_platform"), i18n("message.error"), MessageType.ERROR, onAccept);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.Platform.BIT_32 &&
|
// 32-bit JVM cannot make use of too much memory.
|
||||||
|
if (!flag && java.getPlatform() == org.jackhuang.hmcl.util.platform.Platform.BIT_32 &&
|
||||||
setting.getMaxMemory() > 1.5 * 1024) {
|
setting.getMaxMemory() > 1.5 * 1024) {
|
||||||
// 1.5 * 1024 is an inaccurate number.
|
// 1.5 * 1024 is an inaccurate number.
|
||||||
// Actual memory limit depends on operating system and memory.
|
// Actual memory limit depends on operating system and memory.
|
||||||
Controllers.dialog(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
|
Controllers.confirm(i18n("launch.advice.too_large_memory_for_32bit"), i18n("message.error"), onAccept, null);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Cannot allocate too much memory exceeding free space.
|
||||||
if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
|
if (!flag && OperatingSystem.TOTAL_MEMORY > 0 && OperatingSystem.TOTAL_MEMORY < setting.getMaxMemory()) {
|
||||||
Controllers.dialog(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), MessageBox.ERROR_MESSAGE, onAccept);
|
Controllers.confirm(i18n("launch.advice.not_enough_space", OperatingSystem.TOTAL_MEMORY), i18n("message.error"), onAccept, null);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Forge 2760~2773 will crash game with LiteLoader.
|
||||||
|
if (!flag) {
|
||||||
|
boolean hasForge2760 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
|
||||||
|
.anyMatch(it ->
|
||||||
|
VersionNumber.VERSION_COMPARATOR.compare("1.12.2-14.23.5.2760", it.getVersion()) <= 0 &&
|
||||||
|
VersionNumber.VERSION_COMPARATOR.compare(it.getVersion(), "1.12.2-14.23.5.2773") < 0);
|
||||||
|
boolean hasLiteLoader = version.getLibraries().stream().anyMatch(it -> it.is("com.mumfrey", "liteloader"));
|
||||||
|
if (hasForge2760 && hasLiteLoader && gameVersion.compareTo(VersionNumber.asVersion("1.12.2")) == 0) {
|
||||||
|
Controllers.confirm(i18n("launch.advice.forge2760_liteloader"), i18n("message.error"), onAccept, null);
|
||||||
|
flag = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptiFine 1.14.4 is not compatible with Forge 28.2.2 and later versions.
|
||||||
|
if (!flag) {
|
||||||
|
boolean hasForge28_2_2 = version.getLibraries().stream().filter(it -> it.is("net.minecraftforge", "forge"))
|
||||||
|
.anyMatch(it ->
|
||||||
|
VersionNumber.VERSION_COMPARATOR.compare("1.14.4-28.2.2", it.getVersion()) <= 0);
|
||||||
|
boolean hasOptiFine = version.getLibraries().stream().anyMatch(it -> it.is("optifine", "OptiFine"));
|
||||||
|
if (hasForge28_2_2 && hasOptiFine && gameVersion.compareTo(VersionNumber.asVersion("1.14.4")) == 0) {
|
||||||
|
Controllers.confirm(i18n("launch.advice.forge28_2_2_optifine"), i18n("message.error"), onAccept, null);
|
||||||
|
flag = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!flag)
|
if (!flag)
|
||||||
onAccept.run();
|
onAccept.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void stopManagedProcesses() {
|
private static CompletableFuture<Void> downloadJava(GameJavaVersion javaVersion, Profile profile) {
|
||||||
while (!PROCESSES.isEmpty())
|
CompletableFuture<Void> future = new CompletableFuture<>();
|
||||||
Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
|
|
||||||
|
TaskExecutorDialogPane javaDownloadingPane = new TaskExecutorDialogPane(it -> {
|
||||||
|
});
|
||||||
|
|
||||||
|
TaskExecutor executor = JavaRepository.downloadJava(javaVersion,
|
||||||
|
profile.getDependency().getDownloadProvider()).executor(false);
|
||||||
|
executor.addTaskListener(new TaskListener() {
|
||||||
|
@Override
|
||||||
|
public void onStop(boolean success, TaskExecutor executor) {
|
||||||
|
super.onStop(success, executor);
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
if (!success) {
|
||||||
|
future.completeExceptionally(executor.getException());
|
||||||
|
} else {
|
||||||
|
future.complete(null);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
javaDownloadingPane.setExecutor(executor, true);
|
||||||
|
Controllers.dialog(javaDownloadingPane);
|
||||||
|
executor.start();
|
||||||
|
|
||||||
|
|
||||||
|
return future;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void emitStatus(LoadingState state) {
|
private void checkExit() {
|
||||||
if (state == LoadingState.DONE) {
|
switch (launcherVisibility) {
|
||||||
launchingStepsPane.fireEvent(new DialogCloseEvent());
|
|
||||||
}
|
|
||||||
|
|
||||||
launchingStepsPane.setTitle(state.getLocalizedMessage());
|
|
||||||
launchingStepsPane.setSubtitle((state.ordinal() + 1) + " / " + LoadingState.values().length);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void checkExit(LauncherVisibility v) {
|
|
||||||
switch (v) {
|
|
||||||
case HIDE_AND_REOPEN:
|
case HIDE_AND_REOPEN:
|
||||||
Platform.runLater(Controllers.getStage()::show);
|
Platform.runLater(() -> {
|
||||||
|
Optional.ofNullable(Controllers.getStage())
|
||||||
|
.ifPresent(Stage::show);
|
||||||
|
});
|
||||||
break;
|
break;
|
||||||
case KEEP:
|
case KEEP:
|
||||||
// No operations here
|
// No operations here
|
||||||
@@ -365,26 +517,6 @@ public final class LauncherHelper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class LaunchTask<T> extends TaskResult<T> {
|
|
||||||
private final ExceptionalSupplier<T, Exception> supplier;
|
|
||||||
|
|
||||||
public LaunchTask(ExceptionalSupplier<T, Exception> supplier) {
|
|
||||||
this.supplier = supplier;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() throws Exception {
|
|
||||||
setResult(supplier.get());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getId() {
|
|
||||||
return LAUNCH_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
static final String LAUNCH_ID = "launch";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The managed process listener.
|
* The managed process listener.
|
||||||
* Guarantee that one [JavaProcess], one [HMCLProcessListener].
|
* Guarantee that one [JavaProcess], one [HMCLProcessListener].
|
||||||
@@ -392,18 +524,21 @@ public final class LauncherHelper {
|
|||||||
*/
|
*/
|
||||||
class HMCLProcessListener implements ProcessListener {
|
class HMCLProcessListener implements ProcessListener {
|
||||||
|
|
||||||
private final VersionSetting setting;
|
private final HMCLGameRepository repository;
|
||||||
|
private final String version;
|
||||||
private final Map<String, String> forbiddenTokens;
|
private final Map<String, String> forbiddenTokens;
|
||||||
private final LauncherVisibility visibility;
|
|
||||||
private ManagedProcess process;
|
private ManagedProcess process;
|
||||||
private boolean lwjgl;
|
private boolean lwjgl;
|
||||||
private LogWindow logWindow;
|
private LogWindow logWindow;
|
||||||
private final boolean detectWindow;
|
private final boolean detectWindow;
|
||||||
private final LinkedList<Pair<String, Log4jLevel>> logs;
|
private final LinkedList<Pair<String, Log4jLevel>> logs;
|
||||||
private final CountDownLatch latch = new CountDownLatch(1);
|
private final CountDownLatch logWindowLatch = new CountDownLatch(1);
|
||||||
|
private final CountDownLatch launchingLatch;
|
||||||
|
|
||||||
public HMCLProcessListener(AuthInfo authInfo, VersionSetting setting, boolean detectWindow) {
|
public HMCLProcessListener(HMCLGameRepository repository, String version, AuthInfo authInfo, CountDownLatch launchingLatch, boolean detectWindow) {
|
||||||
this.setting = setting;
|
this.repository = repository;
|
||||||
|
this.version = version;
|
||||||
|
this.launchingLatch = launchingLatch;
|
||||||
this.detectWindow = detectWindow;
|
this.detectWindow = detectWindow;
|
||||||
|
|
||||||
if (authInfo == null)
|
if (authInfo == null)
|
||||||
@@ -415,7 +550,6 @@ public final class LauncherHelper {
|
|||||||
pair(authInfo.getUsername(), "<player>")
|
pair(authInfo.getUsername(), "<player>")
|
||||||
);
|
);
|
||||||
|
|
||||||
visibility = setting.getLauncherVisibility();
|
|
||||||
logs = new LinkedList<>();
|
logs = new LinkedList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -423,96 +557,128 @@ public final class LauncherHelper {
|
|||||||
public void setProcess(ManagedProcess process) {
|
public void setProcess(ManagedProcess process) {
|
||||||
this.process = process;
|
this.process = process;
|
||||||
|
|
||||||
if (setting.isShowLogs())
|
String command = new CommandBuilder().addAll(process.getCommands()).toString();
|
||||||
|
for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
|
||||||
|
command = command.replace(entry.getKey(), entry.getValue());
|
||||||
|
|
||||||
|
LOG.info("Launched process: " + command);
|
||||||
|
|
||||||
|
if (showLogs)
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
logWindow = new LogWindow();
|
logWindow = new LogWindow();
|
||||||
logWindow.show();
|
logWindow.show();
|
||||||
latch.countDown();
|
logWindowLatch.countDown();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void finishLaunch() {
|
||||||
|
switch (launcherVisibility) {
|
||||||
|
case HIDE_AND_REOPEN:
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
// If application was stopped and execution services did not finish termination,
|
||||||
|
// these codes will be executed.
|
||||||
|
if (Controllers.getStage() != null) {
|
||||||
|
Controllers.getStage().hide();
|
||||||
|
launchingLatch.countDown();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case CLOSE:
|
||||||
|
// Never come to here.
|
||||||
|
break;
|
||||||
|
case KEEP:
|
||||||
|
Platform.runLater(launchingLatch::countDown);
|
||||||
|
break;
|
||||||
|
case HIDE:
|
||||||
|
launchingLatch.countDown();
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
// If application was stopped and execution services did not finish termination,
|
||||||
|
// these codes will be executed.
|
||||||
|
if (Controllers.getStage() != null) {
|
||||||
|
Controllers.getStage().close();
|
||||||
|
Controllers.shutdown();
|
||||||
|
Schedulers.shutdown();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void onLog(String log, Log4jLevel level) {
|
public synchronized void onLog(String log, Log4jLevel level) {
|
||||||
String newLog = log;
|
String newLog = log;
|
||||||
for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
|
for (Map.Entry<String, String> entry : forbiddenTokens.entrySet())
|
||||||
newLog = newLog.replace(entry.getKey(), entry.getValue());
|
newLog = newLog.replace(entry.getKey(), entry.getValue());
|
||||||
|
String filteredLog = newLog;
|
||||||
|
|
||||||
if (level.lessOrEqual(Log4jLevel.ERROR))
|
if (level.lessOrEqual(Log4jLevel.ERROR))
|
||||||
System.err.print(log);
|
System.err.println(filteredLog);
|
||||||
else
|
else
|
||||||
System.out.print(log);
|
System.out.println(filteredLog);
|
||||||
|
|
||||||
logs.add(pair(log, level));
|
logs.add(pair(filteredLog, level));
|
||||||
if (logs.size() > config().getLogLines())
|
if (logs.size() > config().getLogLines())
|
||||||
logs.removeFirst();
|
logs.removeFirst();
|
||||||
|
|
||||||
if (setting.isShowLogs()) {
|
if (showLogs) {
|
||||||
try {
|
try {
|
||||||
latch.await();
|
logWindowLatch.await();
|
||||||
logWindow.waitForLoaded();
|
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Platform.runLater(() -> logWindow.logLine(log, level));
|
Platform.runLater(() -> logWindow.logLine(filteredLog, level));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!lwjgl && (log.contains("LWJGL Version: ") || !detectWindow)) {
|
if (!lwjgl && (filteredLog.toLowerCase().contains("lwjgl version") || filteredLog.toLowerCase().contains("lwjgl openal") || !detectWindow)) {
|
||||||
lwjgl = true;
|
lwjgl = true;
|
||||||
switch (visibility) {
|
finishLaunch();
|
||||||
case HIDE_AND_REOPEN:
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
Controllers.getStage().hide();
|
|
||||||
emitStatus(LoadingState.DONE);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case CLOSE:
|
|
||||||
// Never come to here.
|
|
||||||
break;
|
|
||||||
case KEEP:
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
emitStatus(LoadingState.DONE);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case HIDE:
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
Controllers.getStage().close();
|
|
||||||
emitStatus(LoadingState.DONE);
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(int exitCode, ExitType exitType) {
|
public void onExit(int exitCode, ExitType exitType) {
|
||||||
|
launchingLatch.countDown();
|
||||||
|
|
||||||
if (exitType == ExitType.INTERRUPTED)
|
if (exitType == ExitType.INTERRUPTED)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (exitType != ExitType.NORMAL && logWindow == null)
|
// Game crashed before opening the game window.
|
||||||
|
if (!lwjgl) finishLaunch();
|
||||||
|
|
||||||
|
if (exitType != ExitType.NORMAL) {
|
||||||
|
repository.markVersionLaunchedAbnormally(version);
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
logWindow = new LogWindow();
|
if (logWindow == null) {
|
||||||
|
logWindow = new LogWindow();
|
||||||
|
|
||||||
switch (exitType) {
|
switch (exitType) {
|
||||||
case JVM_ERROR:
|
case JVM_ERROR:
|
||||||
logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
|
logWindow.setTitle(i18n("launch.failed.cannot_create_jvm"));
|
||||||
break;
|
break;
|
||||||
case APPLICATION_ERROR:
|
case APPLICATION_ERROR:
|
||||||
logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
|
logWindow.setTitle(i18n("launch.failed.exited_abnormally"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
logWindow.show();
|
|
||||||
logWindow.onDone.register(() -> {
|
|
||||||
logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
|
logWindow.logLine("Command: " + new CommandBuilder().addAll(process.getCommands()).toString(), Log4jLevel.INFO);
|
||||||
for (Map.Entry<String, Log4jLevel> entry : logs)
|
for (Map.Entry<String, Log4jLevel> entry : logs)
|
||||||
logWindow.logLine(entry.getKey(), entry.getValue());
|
logWindow.logLine(entry.getKey(), entry.getValue());
|
||||||
});
|
}
|
||||||
});
|
|
||||||
|
|
||||||
checkExit(visibility);
|
logWindow.showGameCrashReport();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
checkExit();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static final Queue<ManagedProcess> PROCESSES = new ConcurrentLinkedQueue<>();
|
||||||
|
public static void stopManagedProcesses() {
|
||||||
|
while (!PROCESSES.isEmpty())
|
||||||
|
Optional.ofNullable(PROCESSES.poll()).ifPresent(ManagedProcess::stop);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,49 +13,76 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.game;
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
import com.google.gson.JsonParseException;
|
import com.google.gson.JsonParseException;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import org.jackhuang.hmcl.mod.*;
|
import org.jackhuang.hmcl.mod.*;
|
||||||
import org.jackhuang.hmcl.setting.EnumGameDirectory;
|
import org.jackhuang.hmcl.mod.curse.CurseCompletionException;
|
||||||
|
import org.jackhuang.hmcl.mod.curse.CurseInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.curse.CurseManifest;
|
||||||
|
import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackLocalInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.mcbbs.McbbsModpackManifest;
|
||||||
|
import org.jackhuang.hmcl.mod.multimc.MultiMCInstanceConfiguration;
|
||||||
|
import org.jackhuang.hmcl.mod.multimc.MultiMCModpackInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.server.ServerModpackLocalInstallTask;
|
||||||
|
import org.jackhuang.hmcl.mod.server.ServerModpackManifest;
|
||||||
|
import org.jackhuang.hmcl.mod.server.ServerModpackRemoteInstallTask;
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
import org.jackhuang.hmcl.setting.Profile;
|
||||||
import org.jackhuang.hmcl.setting.VersionSetting;
|
import org.jackhuang.hmcl.setting.VersionSetting;
|
||||||
import org.jackhuang.hmcl.task.FinalizedCallback;
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
import org.jackhuang.hmcl.task.Task;
|
import org.jackhuang.hmcl.task.Task;
|
||||||
import org.jackhuang.hmcl.util.Constants;
|
|
||||||
import org.jackhuang.hmcl.util.FileUtils;
|
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
|
import org.jackhuang.hmcl.util.function.ExceptionalConsumer;
|
||||||
|
import org.jackhuang.hmcl.util.function.ExceptionalRunnable;
|
||||||
|
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.Charset;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
public final class ModpackHelper {
|
public final class ModpackHelper {
|
||||||
private ModpackHelper() {}
|
private ModpackHelper() {}
|
||||||
|
|
||||||
public static Modpack readModpackManifest(File file) throws UnsupportedModpackException {
|
public static Modpack readModpackManifest(Path file, Charset charset) throws UnsupportedModpackException {
|
||||||
try {
|
try {
|
||||||
return CurseManifest.readCurseForgeModpackManifest(file);
|
return McbbsModpackManifest.readManifest(file, charset);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
ignored.printStackTrace();
|
||||||
|
// ignore it, not a valid MCBBS modpack.
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return CurseManifest.readCurseForgeModpackManifest(file, charset);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// ignore it, not a valid CurseForge modpack.
|
// ignore it, not a valid CurseForge modpack.
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return HMCLModpackManager.readHMCLModpackManifest(file);
|
return HMCLModpackManager.readHMCLModpackManifest(file, charset);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// ignore it, not a valid HMCL modpack.
|
// ignore it, not a valid HMCL modpack.
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file);
|
return MultiMCInstanceConfiguration.readMultiMCModpackManifest(file, charset);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// ignore it, not a valid MultiMC modpack.
|
// ignore it, not a valid MultiMC modpack.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return ServerModpackManifest.readManifest(file, charset);
|
||||||
|
} catch (Exception e) {
|
||||||
|
// ignore it, not a valid Server modpack.
|
||||||
|
}
|
||||||
|
|
||||||
throw new UnsupportedModpackException(file.toString());
|
throw new UnsupportedModpackException(file.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,7 +91,7 @@ public final class ModpackHelper {
|
|||||||
throw new FileNotFoundException(file.getPath());
|
throw new FileNotFoundException(file.getPath());
|
||||||
else
|
else
|
||||||
try {
|
try {
|
||||||
return Constants.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
|
return JsonUtils.GSON.fromJson(FileUtils.readText(file), new TypeToken<ModpackConfiguration<?>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
} catch (JsonParseException e) {
|
} catch (JsonParseException e) {
|
||||||
throw new IOException("Malformed modpack configuration");
|
throw new IOException("Malformed modpack configuration");
|
||||||
@@ -82,52 +109,106 @@ public final class ModpackHelper {
|
|||||||
throw new UnsupportedModpackException();
|
throw new UnsupportedModpackException();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Task getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
|
public static Task<Void> getInstallTask(Profile profile, ServerModpackManifest manifest, String name, Modpack modpack) {
|
||||||
profile.getRepository().markVersionAsModpack(name);
|
profile.getRepository().markVersionAsModpack(name);
|
||||||
|
|
||||||
FinalizedCallback finalizeTask = (variables, isDependentsSucceeded) -> {
|
ExceptionalRunnable<?> success = () -> {
|
||||||
if (isDependentsSucceeded) {
|
HMCLGameRepository repository = profile.getRepository();
|
||||||
HMCLGameRepository repository = profile.getRepository();
|
repository.refreshVersions();
|
||||||
repository.refreshVersions();
|
VersionSetting vs = repository.specializeVersionSetting(name);
|
||||||
VersionSetting vs = repository.specializeVersionSetting(name);
|
repository.undoMark(name);
|
||||||
repository.undoMark(name);
|
if (vs != null)
|
||||||
if (vs != null)
|
vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
|
||||||
vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
|
};
|
||||||
|
|
||||||
|
ExceptionalConsumer<Exception, ?> failure = ex -> {
|
||||||
|
if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
|
||||||
|
success.run();
|
||||||
|
// This is tolerable and we will not delete the game
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name)
|
||||||
|
.whenComplete(Schedulers.defaultScheduler(), success, failure);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Task<Void> getInstallTask(Profile profile, File zipFile, String name, Modpack modpack) {
|
||||||
|
profile.getRepository().markVersionAsModpack(name);
|
||||||
|
|
||||||
|
ExceptionalRunnable<?> success = () -> {
|
||||||
|
HMCLGameRepository repository = profile.getRepository();
|
||||||
|
repository.refreshVersions();
|
||||||
|
VersionSetting vs = repository.specializeVersionSetting(name);
|
||||||
|
repository.undoMark(name);
|
||||||
|
if (vs != null)
|
||||||
|
vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
|
||||||
|
};
|
||||||
|
|
||||||
|
ExceptionalConsumer<Exception, ?> failure = ex -> {
|
||||||
|
if (ex instanceof CurseCompletionException && !(ex.getCause() instanceof FileNotFoundException)) {
|
||||||
|
success.run();
|
||||||
|
// This is tolerable and we will not delete the game
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (modpack.getManifest() instanceof CurseManifest)
|
if (modpack.getManifest() instanceof CurseManifest)
|
||||||
return new CurseInstallTask(profile.getDependency(), zipFile, ((CurseManifest) modpack.getManifest()), name)
|
return new CurseInstallTask(profile.getDependency(), zipFile, modpack, ((CurseManifest) modpack.getManifest()), name)
|
||||||
.finalized(finalizeTask);
|
.whenComplete(Schedulers.defaultScheduler(), success, failure);
|
||||||
else if (modpack.getManifest() instanceof HMCLModpackManifest)
|
else if (modpack.getManifest() instanceof HMCLModpackManifest)
|
||||||
return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
|
return new HMCLModpackInstallTask(profile, zipFile, modpack, name)
|
||||||
.finalized(finalizeTask);
|
.whenComplete(Schedulers.defaultScheduler(), success, failure);
|
||||||
else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
|
else if (modpack.getManifest() instanceof MultiMCInstanceConfiguration)
|
||||||
return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name)
|
return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name)
|
||||||
.finalized(finalizeTask)
|
.whenComplete(Schedulers.defaultScheduler(), success, failure)
|
||||||
.then(new MultiMCInstallVersionSettingTask(profile, ((MultiMCInstanceConfiguration) modpack.getManifest()), name));
|
.thenComposeAsync(createMultiMCPostInstallTask(profile, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
|
||||||
else throw new IllegalStateException("Unrecognized modpack: " + modpack);
|
else if (modpack.getManifest() instanceof ServerModpackManifest)
|
||||||
|
return new ServerModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (ServerModpackManifest) modpack.getManifest(), name)
|
||||||
|
.whenComplete(Schedulers.defaultScheduler(), success, failure);
|
||||||
|
else if (modpack.getManifest() instanceof McbbsModpackManifest)
|
||||||
|
return new McbbsModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (McbbsModpackManifest) modpack.getManifest(), name)
|
||||||
|
.whenComplete(Schedulers.defaultScheduler(), success, failure)
|
||||||
|
.thenComposeAsync(createMcbbsPostInstallTask(profile, (McbbsModpackManifest) modpack.getManifest(), name));
|
||||||
|
else throw new IllegalArgumentException("Unrecognized modpack: " + modpack.getManifest());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Task getUpdateTask(Profile profile, File zipFile, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
|
public static Task<Void> getUpdateTask(Profile profile, ServerModpackManifest manifest, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException {
|
||||||
Modpack modpack = ModpackHelper.readModpackManifest(zipFile);
|
switch (configuration.getType()) {
|
||||||
|
case ServerModpackRemoteInstallTask.MODPACK_TYPE:
|
||||||
|
return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackRemoteInstallTask(profile.getDependency(), manifest, name));
|
||||||
|
default:
|
||||||
|
throw new UnsupportedModpackException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Task<Void> getUpdateTask(Profile profile, File zipFile, Charset charset, String name, ModpackConfiguration<?> configuration) throws UnsupportedModpackException, MismatchedModpackTypeException {
|
||||||
|
Modpack modpack = ModpackHelper.readModpackManifest(zipFile.toPath(), charset);
|
||||||
|
|
||||||
switch (configuration.getType()) {
|
switch (configuration.getType()) {
|
||||||
case CurseInstallTask.MODPACK_TYPE:
|
case CurseInstallTask.MODPACK_TYPE:
|
||||||
if (!(modpack.getManifest() instanceof CurseManifest))
|
if (!(modpack.getManifest() instanceof CurseManifest))
|
||||||
throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
throw new MismatchedModpackTypeException(CurseInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
||||||
|
|
||||||
return new CurseInstallTask(profile.getDependency(), zipFile, (CurseManifest) modpack.getManifest(), name);
|
return new ModpackUpdateTask(profile.getRepository(), name, new CurseInstallTask(profile.getDependency(), zipFile, modpack, (CurseManifest) modpack.getManifest(), name));
|
||||||
case MultiMCModpackInstallTask.MODPACK_TYPE:
|
case MultiMCModpackInstallTask.MODPACK_TYPE:
|
||||||
if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
|
if (!(modpack.getManifest() instanceof MultiMCInstanceConfiguration))
|
||||||
throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
throw new MismatchedModpackTypeException(MultiMCModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
||||||
|
|
||||||
return new MultiMCModpackInstallTask(profile.getDependency(), zipFile, (MultiMCInstanceConfiguration) modpack.getManifest(), name);
|
return new ModpackUpdateTask(profile.getRepository(), name, new MultiMCModpackInstallTask(profile.getDependency(), zipFile, modpack, (MultiMCInstanceConfiguration) modpack.getManifest(), name));
|
||||||
case HMCLModpackInstallTask.MODPACK_TYPE:
|
case HMCLModpackInstallTask.MODPACK_TYPE:
|
||||||
if (!(modpack.getManifest() instanceof HMCLModpackManifest))
|
if (!(modpack.getManifest() instanceof HMCLModpackManifest))
|
||||||
throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
throw new MismatchedModpackTypeException(HMCLModpackInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
||||||
|
|
||||||
return new HMCLModpackInstallTask(profile, zipFile, modpack, name);
|
return new ModpackUpdateTask(profile.getRepository(), name, new HMCLModpackInstallTask(profile, zipFile, modpack, name));
|
||||||
|
case McbbsModpackLocalInstallTask.MODPACK_TYPE:
|
||||||
|
if (!(modpack.getManifest() instanceof McbbsModpackManifest))
|
||||||
|
throw new MismatchedModpackTypeException(McbbsModpackLocalInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
||||||
|
|
||||||
|
return new ModpackUpdateTask(profile.getRepository(), name, new McbbsModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (McbbsModpackManifest) modpack.getManifest(), name));
|
||||||
|
case ServerModpackLocalInstallTask.MODPACK_TYPE:
|
||||||
|
if (!(modpack.getManifest() instanceof ServerModpackManifest))
|
||||||
|
throw new MismatchedModpackTypeException(ServerModpackLocalInstallTask.MODPACK_TYPE, getManifestType(modpack.getManifest()));
|
||||||
|
|
||||||
|
return new ModpackUpdateTask(profile.getRepository(), name, new ServerModpackLocalInstallTask(profile.getDependency(), zipFile, modpack, (ServerModpackManifest) modpack.getManifest(), name));
|
||||||
default:
|
default:
|
||||||
throw new UnsupportedModpackException();
|
throw new UnsupportedModpackException();
|
||||||
}
|
}
|
||||||
@@ -135,7 +216,7 @@ public final class ModpackHelper {
|
|||||||
|
|
||||||
public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {
|
public static void toVersionSetting(MultiMCInstanceConfiguration c, VersionSetting vs) {
|
||||||
vs.setUsesGlobal(false);
|
vs.setUsesGlobal(false);
|
||||||
vs.setGameDirType(EnumGameDirectory.VERSION_FOLDER);
|
vs.setGameDirType(GameDirectoryType.VERSION_FOLDER);
|
||||||
|
|
||||||
if (c.isOverrideJavaLocation()) {
|
if (c.isOverrideJavaLocation()) {
|
||||||
vs.setJavaDir(Lang.nonNull(c.getJavaPath(), ""));
|
vs.setJavaDir(Lang.nonNull(c.getJavaPath(), ""));
|
||||||
@@ -170,5 +251,18 @@ public final class ModpackHelper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static Task<Void> createMultiMCPostInstallTask(Profile profile, MultiMCInstanceConfiguration manifest, String version) {
|
||||||
|
return Task.runAsync(Schedulers.javafx(), () -> {
|
||||||
|
VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
|
||||||
|
ModpackHelper.toVersionSetting(manifest, vs);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Task<Void> createMcbbsPostInstallTask(Profile profile, McbbsModpackManifest manifest, String version) {
|
||||||
|
return Task.runAsync(Schedulers.javafx(), () -> {
|
||||||
|
VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
|
||||||
|
if (manifest.getLaunchInfo().getMinMemory() > vs.getMaxMemory())
|
||||||
|
vs.setMaxMemory(manifest.getLaunchInfo().getMinMemory());
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.game;
|
|
||||||
|
|
||||||
import org.jackhuang.hmcl.mod.MultiMCInstanceConfiguration;
|
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
|
||||||
import org.jackhuang.hmcl.setting.VersionSetting;
|
|
||||||
import org.jackhuang.hmcl.task.Scheduler;
|
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
|
||||||
import org.jackhuang.hmcl.task.Task;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public final class MultiMCInstallVersionSettingTask extends Task {
|
|
||||||
private final Profile profile;
|
|
||||||
private final MultiMCInstanceConfiguration manifest;
|
|
||||||
private final String version;
|
|
||||||
|
|
||||||
public MultiMCInstallVersionSettingTask(Profile profile, MultiMCInstanceConfiguration manifest, String version) {
|
|
||||||
this.profile = profile;
|
|
||||||
this.manifest = manifest;
|
|
||||||
this.version = version;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Scheduler getScheduler() {
|
|
||||||
return Schedulers.javafx();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
VersionSetting vs = Objects.requireNonNull(profile.getRepository().specializeVersionSetting(version));
|
|
||||||
ModpackHelper.toVersionSetting(manifest, vs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,266 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.game;
|
||||||
|
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.binding.ObjectBinding;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.scene.image.PixelWriter;
|
||||||
|
import javafx.scene.image.WritableImage;
|
||||||
|
import org.jackhuang.hmcl.Metadata;
|
||||||
|
import org.jackhuang.hmcl.auth.Account;
|
||||||
|
import org.jackhuang.hmcl.auth.ServerResponseMalformedException;
|
||||||
|
import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.Texture;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.TextureModel;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
|
||||||
|
import org.jackhuang.hmcl.task.FileDownloadTask;
|
||||||
|
import org.jackhuang.hmcl.util.ResourceNotFoundError;
|
||||||
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.awt.image.WritableRaster;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static java.util.Collections.emptyMap;
|
||||||
|
import static java.util.Collections.singletonMap;
|
||||||
|
import static java.util.Objects.requireNonNull;
|
||||||
|
import static org.jackhuang.hmcl.util.Lang.threadPool;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author yushijinhun
|
||||||
|
*/
|
||||||
|
public final class TexturesLoader {
|
||||||
|
|
||||||
|
private TexturesLoader() {
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==== Texture Loading ====
|
||||||
|
public static class LoadedTexture {
|
||||||
|
private final BufferedImage image;
|
||||||
|
private final Map<String, String> metadata;
|
||||||
|
|
||||||
|
public LoadedTexture(BufferedImage image, Map<String, String> metadata) {
|
||||||
|
this.image = requireNonNull(image);
|
||||||
|
this.metadata = requireNonNull(metadata);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BufferedImage getImage() {
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, String> getMetadata() {
|
||||||
|
return metadata;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final ThreadPoolExecutor POOL = threadPool("TexturesDownload", true, 2, 10, TimeUnit.SECONDS);
|
||||||
|
private static final Path TEXTURES_DIR = Metadata.MINECRAFT_DIRECTORY.resolve("assets").resolve("skins");
|
||||||
|
|
||||||
|
private static Path getTexturePath(Texture texture) {
|
||||||
|
String url = texture.getUrl();
|
||||||
|
int slash = url.lastIndexOf('/');
|
||||||
|
int dot = url.lastIndexOf('.');
|
||||||
|
if (dot < slash) {
|
||||||
|
dot = url.length();
|
||||||
|
}
|
||||||
|
String hash = url.substring(slash + 1, dot);
|
||||||
|
String prefix = hash.length() > 2 ? hash.substring(0, 2) : "xx";
|
||||||
|
return TEXTURES_DIR.resolve(prefix).resolve(hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LoadedTexture loadTexture(Texture texture) throws IOException {
|
||||||
|
if (StringUtils.isBlank(texture.getUrl())) {
|
||||||
|
throw new IOException("Texture url is empty");
|
||||||
|
}
|
||||||
|
|
||||||
|
Path file = getTexturePath(texture);
|
||||||
|
if (!Files.isRegularFile(file)) {
|
||||||
|
// download it
|
||||||
|
try {
|
||||||
|
new FileDownloadTask(new URL(texture.getUrl()), file.toFile()).run();
|
||||||
|
LOG.info("Texture downloaded: " + texture.getUrl());
|
||||||
|
} catch (Exception e) {
|
||||||
|
if (Files.isRegularFile(file)) {
|
||||||
|
// concurrency conflict?
|
||||||
|
LOG.log(Level.WARNING, "Failed to download texture " + texture.getUrl() + ", but the file is available", e);
|
||||||
|
} else {
|
||||||
|
throw new IOException("Failed to download texture " + texture.getUrl());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
BufferedImage img;
|
||||||
|
try (InputStream in = Files.newInputStream(file)) {
|
||||||
|
img = ImageIO.read(in);
|
||||||
|
}
|
||||||
|
if (img == null)
|
||||||
|
throw new IOException("Texture is malformed");
|
||||||
|
|
||||||
|
Map<String, String> metadata = texture.getMetadata();
|
||||||
|
if (metadata == null) {
|
||||||
|
metadata = emptyMap();
|
||||||
|
}
|
||||||
|
return new LoadedTexture(img, metadata);
|
||||||
|
}
|
||||||
|
// ====
|
||||||
|
|
||||||
|
// ==== Skins ====
|
||||||
|
private final static Map<TextureModel, LoadedTexture> DEFAULT_SKINS = new EnumMap<>(TextureModel.class);
|
||||||
|
|
||||||
|
static {
|
||||||
|
loadDefaultSkin("/assets/img/steve.png", TextureModel.STEVE);
|
||||||
|
loadDefaultSkin("/assets/img/alex.png", TextureModel.ALEX);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadDefaultSkin(String path, TextureModel model) {
|
||||||
|
try (InputStream in = ResourceNotFoundError.getResourceAsStream(path)) {
|
||||||
|
DEFAULT_SKINS.put(model, new LoadedTexture(ImageIO.read(in), singletonMap("model", model.modelName)));
|
||||||
|
} catch (Throwable e) {
|
||||||
|
throw new ResourceNotFoundError("Cannoot load default skin from " + path, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static LoadedTexture getDefaultSkin(TextureModel model) {
|
||||||
|
return DEFAULT_SKINS.get(model);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ObjectBinding<LoadedTexture> skinBinding(YggdrasilService service, UUID uuid) {
|
||||||
|
LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(uuid));
|
||||||
|
return BindingMapping.of(service.getProfileRepository().binding(uuid))
|
||||||
|
.map(profile -> profile
|
||||||
|
.flatMap(it -> {
|
||||||
|
try {
|
||||||
|
return YggdrasilService.getTextures(it);
|
||||||
|
} catch (ServerResponseMalformedException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to parse texture payload", e);
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
|
||||||
|
.filter(it -> StringUtils.isNotBlank(it.getUrl())))
|
||||||
|
.asyncMap(it -> {
|
||||||
|
if (it.isPresent()) {
|
||||||
|
Texture texture = it.get();
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
try {
|
||||||
|
return loadTexture(texture);
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
|
||||||
|
return uuidFallback;
|
||||||
|
}
|
||||||
|
}, POOL);
|
||||||
|
} else {
|
||||||
|
return CompletableFuture.completedFuture(uuidFallback);
|
||||||
|
}
|
||||||
|
}, uuidFallback);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ObjectBinding<LoadedTexture> skinBinding(Account account) {
|
||||||
|
LoadedTexture uuidFallback = getDefaultSkin(TextureModel.detectUUID(account.getUUID()));
|
||||||
|
return BindingMapping.of(account.getTextures())
|
||||||
|
.map(textures -> textures
|
||||||
|
.flatMap(it -> Optional.ofNullable(it.get(TextureType.SKIN)))
|
||||||
|
.filter(it -> StringUtils.isNotBlank(it.getUrl())))
|
||||||
|
.asyncMap(it -> {
|
||||||
|
if (it.isPresent()) {
|
||||||
|
Texture texture = it.get();
|
||||||
|
return CompletableFuture.supplyAsync(() -> {
|
||||||
|
try {
|
||||||
|
return loadTexture(texture);
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to load texture " + texture.getUrl() + ", using fallback texture", e);
|
||||||
|
return uuidFallback;
|
||||||
|
}
|
||||||
|
}, POOL);
|
||||||
|
} else {
|
||||||
|
return CompletableFuture.completedFuture(uuidFallback);
|
||||||
|
}
|
||||||
|
}, uuidFallback);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ====
|
||||||
|
|
||||||
|
// ==== Avatar ====
|
||||||
|
public static BufferedImage toAvatar(BufferedImage skin, int size) {
|
||||||
|
BufferedImage avatar = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
|
||||||
|
Graphics2D g = avatar.createGraphics();
|
||||||
|
|
||||||
|
int scale = skin.getWidth() / 64;
|
||||||
|
int faceOffset = (int) Math.round(size / 18.0);
|
||||||
|
g.drawImage(skin,
|
||||||
|
faceOffset, faceOffset, size - faceOffset, size - faceOffset,
|
||||||
|
8 * scale, 8 * scale, 16 * scale, 16 * scale,
|
||||||
|
null);
|
||||||
|
g.drawImage(skin,
|
||||||
|
0, 0, size, size,
|
||||||
|
40 * scale, 8 * scale, 48 * scale, 16 * scale, null);
|
||||||
|
|
||||||
|
g.dispose();
|
||||||
|
return avatar;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ObjectBinding<Image> fxAvatarBinding(YggdrasilService service, UUID uuid, int size) {
|
||||||
|
return BindingMapping.of(skinBinding(service, uuid))
|
||||||
|
.map(it -> toAvatar(it.image, size))
|
||||||
|
.map(TexturesLoader::toFXImage);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ObjectBinding<Image> fxAvatarBinding(Account account, int size) {
|
||||||
|
if (account instanceof YggdrasilAccount || account instanceof MicrosoftAccount) {
|
||||||
|
return BindingMapping.of(skinBinding(account))
|
||||||
|
.map(it -> toAvatar(it.image, size))
|
||||||
|
.map(TexturesLoader::toFXImage);
|
||||||
|
} else {
|
||||||
|
return Bindings.createObjectBinding(
|
||||||
|
() -> toFXImage(toAvatar(getDefaultSkin(TextureModel.detectUUID(account.getUUID())).image, size)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// ====
|
||||||
|
|
||||||
|
// Based on https://stackoverflow.com/a/57552025
|
||||||
|
// Fix #874: Use it instead of SwingFXUtils.toFXImage
|
||||||
|
private static WritableImage toFXImage(BufferedImage image) {
|
||||||
|
WritableImage wr = new WritableImage(image.getWidth(), image.getHeight());
|
||||||
|
PixelWriter pw = wr.getPixelWriter();
|
||||||
|
|
||||||
|
final int iw = image.getWidth();
|
||||||
|
final int ih = image.getHeight();
|
||||||
|
for (int x = 0; x < iw; x++) {
|
||||||
|
for (int y = 0; y < ih; y++) {
|
||||||
|
pw.setArgb(x, y, image.getRGB(x, y));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return wr;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
@@ -23,20 +23,31 @@ import javafx.beans.property.ReadOnlyListProperty;
|
|||||||
import javafx.beans.property.ReadOnlyListWrapper;
|
import javafx.beans.property.ReadOnlyListWrapper;
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
import javafx.beans.property.SimpleObjectProperty;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import org.jackhuang.hmcl.Launcher;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
import org.jackhuang.hmcl.auth.Account;
|
||||||
import org.jackhuang.hmcl.auth.AccountFactory;
|
import org.jackhuang.hmcl.auth.AccountFactory;
|
||||||
|
import org.jackhuang.hmcl.auth.AuthenticationException;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccountFactory;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorArtifactInfo;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorArtifactProvider;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloader;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.SimpleAuthlibInjectorArtifactProvider;
|
||||||
|
import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccount;
|
||||||
|
import org.jackhuang.hmcl.auth.microsoft.MicrosoftAccountFactory;
|
||||||
|
import org.jackhuang.hmcl.auth.microsoft.MicrosoftService;
|
||||||
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
|
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
|
||||||
import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
|
import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.MojangYggdrasilProvider;
|
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccountFactory;
|
||||||
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
|
import org.jackhuang.hmcl.ui.account.MicrosoftAccountLoginStage;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
@@ -45,6 +56,7 @@ import static java.util.stream.Collectors.toList;
|
|||||||
import static javafx.collections.FXCollections.observableArrayList;
|
import static javafx.collections.FXCollections.observableArrayList;
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
||||||
|
import static org.jackhuang.hmcl.util.Lang.immutableListOf;
|
||||||
import static org.jackhuang.hmcl.util.Lang.mapOf;
|
import static org.jackhuang.hmcl.util.Lang.mapOf;
|
||||||
import static org.jackhuang.hmcl.util.Logging.LOG;
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
import static org.jackhuang.hmcl.util.Pair.pair;
|
import static org.jackhuang.hmcl.util.Pair.pair;
|
||||||
@@ -56,44 +68,65 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|||||||
public final class Accounts {
|
public final class Accounts {
|
||||||
private Accounts() {}
|
private Accounts() {}
|
||||||
|
|
||||||
|
private static final AuthlibInjectorArtifactProvider AUTHLIB_INJECTOR_DOWNLOADER = createAuthlibInjectorArtifactProvider();
|
||||||
|
private static void triggerAuthlibInjectorUpdateCheck() {
|
||||||
|
if (AUTHLIB_INJECTOR_DOWNLOADER instanceof AuthlibInjectorDownloader) {
|
||||||
|
Schedulers.io().execute(() -> {
|
||||||
|
try {
|
||||||
|
((AuthlibInjectorDownloader) AUTHLIB_INJECTOR_DOWNLOADER).checkUpdate();
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to check update for authlib-injector", e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
|
public static final OfflineAccountFactory FACTORY_OFFLINE = OfflineAccountFactory.INSTANCE;
|
||||||
public static final YggdrasilAccountFactory FACTORY_YGGDRASIL = new YggdrasilAccountFactory(MojangYggdrasilProvider.INSTANCE);
|
public static final YggdrasilAccountFactory FACTORY_MOJANG = YggdrasilAccountFactory.MOJANG;
|
||||||
public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(
|
public static final AuthlibInjectorAccountFactory FACTORY_AUTHLIB_INJECTOR = new AuthlibInjectorAccountFactory(AUTHLIB_INJECTOR_DOWNLOADER, Accounts::getOrCreateAuthlibInjectorServer);
|
||||||
new AuthlibInjectorDownloader(Launcher.HMCL_DIRECTORY.toPath(), DownloadProviders::getDownloadProvider)::getArtifactInfo,
|
public static final MicrosoftAccountFactory FACTORY_MICROSOFT = new MicrosoftAccountFactory(new MicrosoftService(MicrosoftAccountLoginStage.INSTANCE));
|
||||||
Accounts::getOrCreateAuthlibInjectorServer);
|
public static final List<AccountFactory<?>> FACTORIES = immutableListOf(FACTORY_OFFLINE, FACTORY_MOJANG, FACTORY_AUTHLIB_INJECTOR, FACTORY_MICROSOFT);
|
||||||
|
|
||||||
private static final String TYPE_OFFLINE = "offline";
|
// ==== login type / account factory mapping ====
|
||||||
private static final String TYPE_YGGDRASIL_ACCOUNT = "yggdrasil";
|
private static final Map<String, AccountFactory<?>> type2factory = new HashMap<>();
|
||||||
private static final String TYPE_AUTHLIB_INJECTOR = "authlibInjector";
|
private static final Map<AccountFactory<?>, String> factory2type = new HashMap<>();
|
||||||
|
static {
|
||||||
|
type2factory.put("offline", FACTORY_OFFLINE);
|
||||||
|
type2factory.put("yggdrasil", FACTORY_MOJANG);
|
||||||
|
type2factory.put("authlibInjector", FACTORY_AUTHLIB_INJECTOR);
|
||||||
|
type2factory.put("microsoft", FACTORY_MICROSOFT);
|
||||||
|
|
||||||
private static Map<String, AccountFactory<?>> type2factory = mapOf(
|
type2factory.forEach((type, factory) -> factory2type.put(factory, type));
|
||||||
pair(TYPE_OFFLINE, FACTORY_OFFLINE),
|
}
|
||||||
pair(TYPE_YGGDRASIL_ACCOUNT, FACTORY_YGGDRASIL),
|
|
||||||
pair(TYPE_AUTHLIB_INJECTOR, FACTORY_AUTHLIB_INJECTOR));
|
|
||||||
|
|
||||||
private static String accountType(Account account) {
|
public static String getLoginType(AccountFactory<?> factory) {
|
||||||
|
return Optional.ofNullable(factory2type.get(factory))
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static AccountFactory<?> getAccountFactory(String loginType) {
|
||||||
|
return Optional.ofNullable(type2factory.get(loginType))
|
||||||
|
.orElseThrow(() -> new IllegalArgumentException("Unrecognized login type"));
|
||||||
|
}
|
||||||
|
// ====
|
||||||
|
|
||||||
|
public static AccountFactory<?> getAccountFactory(Account account) {
|
||||||
if (account instanceof OfflineAccount)
|
if (account instanceof OfflineAccount)
|
||||||
return TYPE_OFFLINE;
|
return FACTORY_OFFLINE;
|
||||||
else if (account instanceof AuthlibInjectorAccount)
|
else if (account instanceof AuthlibInjectorAccount)
|
||||||
return TYPE_AUTHLIB_INJECTOR;
|
return FACTORY_AUTHLIB_INJECTOR;
|
||||||
else if (account instanceof YggdrasilAccount)
|
else if (account instanceof YggdrasilAccount)
|
||||||
return TYPE_YGGDRASIL_ACCOUNT;
|
return FACTORY_MOJANG;
|
||||||
|
else if (account instanceof MicrosoftAccount)
|
||||||
|
return FACTORY_MICROSOFT;
|
||||||
else
|
else
|
||||||
throw new IllegalArgumentException("Failed to determine account type: " + account);
|
throw new IllegalArgumentException("Failed to determine account type: " + account);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static AccountFactory<?> getAccountFactory(Account account) {
|
|
||||||
return type2factory.get(accountType(account));
|
|
||||||
}
|
|
||||||
|
|
||||||
static String accountId(Account account) {
|
|
||||||
return account.getUsername() + ":" + account.getCharacter();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
|
private static ObservableList<Account> accounts = observableArrayList(account -> new Observable[] { account });
|
||||||
private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(accounts);
|
private static ReadOnlyListWrapper<Account> accountsWrapper = new ReadOnlyListWrapper<>(Accounts.class, "accounts", accounts);
|
||||||
|
|
||||||
private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
|
private static ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>(Accounts.class, "selectedAccount") {
|
||||||
{
|
{
|
||||||
accounts.addListener(onInvalidating(this::invalidated));
|
accounts.addListener(onInvalidating(this::invalidated));
|
||||||
}
|
}
|
||||||
@@ -124,7 +157,7 @@ public final class Accounts {
|
|||||||
// selection is valid, store it
|
// selection is valid, store it
|
||||||
if (!initialized)
|
if (!initialized)
|
||||||
return;
|
return;
|
||||||
config().setSelectedAccount(selected == null ? "" : accountId(selected));
|
updateAccountStorages();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -137,9 +170,12 @@ public final class Accounts {
|
|||||||
accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
|
accounts.addListener(onInvalidating(Accounts::updateAccountStorages));
|
||||||
}
|
}
|
||||||
|
|
||||||
static Map<Object, Object> getAccountStorage(Account account) {
|
private static Map<Object, Object> getAccountStorage(Account account) {
|
||||||
Map<Object, Object> storage = account.toStorage();
|
Map<Object, Object> storage = account.toStorage();
|
||||||
storage.put("type", accountType(account));
|
storage.put("type", getLoginType(getAccountFactory(account)));
|
||||||
|
if (account == selectedAccount.get()) {
|
||||||
|
storage.put("selected", true);
|
||||||
|
}
|
||||||
return storage;
|
return storage;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,18 +210,42 @@ public final class Accounts {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
accounts.add(account);
|
accounts.add(account);
|
||||||
|
|
||||||
|
if (Boolean.TRUE.equals(storage.get("selected"))) {
|
||||||
|
selectedAccount.set(account);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
initialized = true;
|
initialized = true;
|
||||||
|
|
||||||
config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));
|
config().getAuthlibInjectorServers().addListener(onInvalidating(Accounts::removeDanglingAuthlibInjectorAccounts));
|
||||||
|
|
||||||
// load selected account
|
Account selected = selectedAccount.get();
|
||||||
selectedAccount.set(
|
if (selected != null) {
|
||||||
accounts.stream()
|
Schedulers.io().execute(() -> {
|
||||||
.filter(it -> accountId(it).equals(config().getSelectedAccount()))
|
try {
|
||||||
.findFirst()
|
selected.logIn();
|
||||||
.orElse(null));
|
} catch (AuthenticationException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to log " + selected + " in", e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!config().getAuthlibInjectorServers().isEmpty()) {
|
||||||
|
triggerAuthlibInjectorUpdateCheck();
|
||||||
|
}
|
||||||
|
|
||||||
|
for (AuthlibInjectorServer server : config().getAuthlibInjectorServers()) {
|
||||||
|
if (selected instanceof AuthlibInjectorAccount && ((AuthlibInjectorAccount) selected).getServer() == server)
|
||||||
|
continue;
|
||||||
|
Schedulers.io().execute(() -> {
|
||||||
|
try {
|
||||||
|
server.fetchMetadataResponse();
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to fetch authlib-injector server metdata: " + server, e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ObservableList<Account> getAccounts() {
|
public static ObservableList<Account> getAccounts() {
|
||||||
@@ -209,21 +269,34 @@ public final class Accounts {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ==== authlib-injector ====
|
// ==== authlib-injector ====
|
||||||
|
private static AuthlibInjectorArtifactProvider createAuthlibInjectorArtifactProvider() {
|
||||||
|
String authlibinjectorLocation = System.getProperty("hmcl.authlibinjector.location");
|
||||||
|
if (authlibinjectorLocation == null) {
|
||||||
|
return new AuthlibInjectorDownloader(
|
||||||
|
Metadata.HMCL_DIRECTORY.resolve("authlib-injector.jar"),
|
||||||
|
DownloadProviders::getDownloadProvider) {
|
||||||
|
@Override
|
||||||
|
public Optional<AuthlibInjectorArtifactInfo> getArtifactInfoImmediately() {
|
||||||
|
Optional<AuthlibInjectorArtifactInfo> local = super.getArtifactInfoImmediately();
|
||||||
|
if (local.isPresent()) {
|
||||||
|
return local;
|
||||||
|
}
|
||||||
|
// search authlib-injector.jar in current directory, it's used as a fallback
|
||||||
|
return parseArtifact(Paths.get("authlib-injector.jar"));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
LOG.info("Using specified authlib-injector: " + authlibinjectorLocation);
|
||||||
|
return new SimpleAuthlibInjectorArtifactProvider(Paths.get(authlibinjectorLocation));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {
|
private static AuthlibInjectorServer getOrCreateAuthlibInjectorServer(String url) {
|
||||||
return config().getAuthlibInjectorServers().stream()
|
return config().getAuthlibInjectorServers().stream()
|
||||||
.filter(server -> url.equals(server.getUrl()))
|
.filter(server -> url.equals(server.getUrl()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElseGet(() -> {
|
.orElseGet(() -> {
|
||||||
// this usually happens when migrating data from an older version
|
AuthlibInjectorServer server = new AuthlibInjectorServer(url);
|
||||||
AuthlibInjectorServer server;
|
|
||||||
try {
|
|
||||||
server = AuthlibInjectorServer.fetchServerInfo(url);
|
|
||||||
LOG.info("Migrated authlib injector server " + server);
|
|
||||||
} catch (IOException e) {
|
|
||||||
server = new AuthlibInjectorServer(url, url);
|
|
||||||
LOG.log(Level.WARNING, "Failed to migrate authlib injector server " + url, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
config().getAuthlibInjectorServers().add(server);
|
config().getAuthlibInjectorServers().add(server);
|
||||||
return server;
|
return server;
|
||||||
});
|
});
|
||||||
@@ -244,18 +317,15 @@ public final class Accounts {
|
|||||||
// ====
|
// ====
|
||||||
|
|
||||||
// ==== Login type name i18n ===
|
// ==== Login type name i18n ===
|
||||||
private static Map<AccountFactory<?>, String> loginType2name = mapOf(
|
private static Map<AccountFactory<?>, String> unlocalizedLoginTypeNames = mapOf(
|
||||||
pair(Accounts.FACTORY_OFFLINE, i18n("account.methods.offline")),
|
pair(Accounts.FACTORY_OFFLINE, "account.methods.offline"),
|
||||||
pair(Accounts.FACTORY_YGGDRASIL, i18n("account.methods.yggdrasil")),
|
pair(Accounts.FACTORY_MOJANG, "account.methods.yggdrasil"),
|
||||||
pair(Accounts.FACTORY_AUTHLIB_INJECTOR, i18n("account.methods.authlib_injector")));
|
pair(Accounts.FACTORY_AUTHLIB_INJECTOR, "account.methods.authlib_injector"),
|
||||||
|
pair(Accounts.FACTORY_MICROSOFT, "account.methods.microsoft"));
|
||||||
|
|
||||||
public static String getAccountTypeName(AccountFactory<?> factory) {
|
public static String getLocalizedLoginTypeName(AccountFactory<?> factory) {
|
||||||
return Optional.ofNullable(loginType2name.get(factory))
|
return i18n(Optional.ofNullable(unlocalizedLoginTypeNames.get(factory))
|
||||||
.orElseThrow(() -> new IllegalArgumentException("No corresponding login type name"));
|
.orElseThrow(() -> new IllegalArgumentException("Unrecognized account factory")));
|
||||||
}
|
|
||||||
|
|
||||||
public static String getAccountTypeName(Account account) {
|
|
||||||
return getAccountTypeName(getAccountFactory(account));
|
|
||||||
}
|
}
|
||||||
// ====
|
// ====
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
|
import com.google.gson.JsonParseException;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
|
import org.jackhuang.hmcl.task.Task;
|
||||||
|
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
||||||
|
import org.jackhuang.hmcl.util.gson.Validation;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
|
|
||||||
|
public class AuthlibInjectorServers implements Validation {
|
||||||
|
|
||||||
|
public static final String CONFIG_FILENAME = "authlib-injectors.json";
|
||||||
|
|
||||||
|
private final List<String> urls;
|
||||||
|
|
||||||
|
public AuthlibInjectorServers(List<String> urls) {
|
||||||
|
this.urls = urls;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getUrls() {
|
||||||
|
return urls;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void validate() throws JsonParseException {
|
||||||
|
if (urls == null)
|
||||||
|
throw new JsonParseException("authlib-injectors.json -> urls cannot be null");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Path configLocation = Paths.get(CONFIG_FILENAME);
|
||||||
|
private static AuthlibInjectorServers configInstance;
|
||||||
|
|
||||||
|
public synchronized static void init() {
|
||||||
|
if (configInstance != null) {
|
||||||
|
throw new IllegalStateException("AuthlibInjectorServers is already loaded");
|
||||||
|
}
|
||||||
|
|
||||||
|
configInstance = new AuthlibInjectorServers(Collections.emptyList());
|
||||||
|
|
||||||
|
if (Files.exists(configLocation)) {
|
||||||
|
try {
|
||||||
|
String content = FileUtils.readText(configLocation);
|
||||||
|
configInstance = JsonUtils.GSON.fromJson(content, AuthlibInjectorServers.class);
|
||||||
|
} catch (IOException | JsonParseException e) {
|
||||||
|
LOG.log(Level.WARNING, "Malformed authlib-injectors.json", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ConfigHolder.isNewlyCreated() && !AuthlibInjectorServers.getConfigInstance().getUrls().isEmpty()) {
|
||||||
|
config().setPreferredLoginType(Accounts.getLoginType(Accounts.FACTORY_AUTHLIB_INJECTOR));
|
||||||
|
for (String url : AuthlibInjectorServers.getConfigInstance().getUrls()) {
|
||||||
|
Task.supplyAsync(Schedulers.io(), () -> AuthlibInjectorServer.locateServer(url))
|
||||||
|
.thenAcceptAsync(Schedulers.javafx(), server -> config().getAuthlibInjectorServers().add(server))
|
||||||
|
.start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static AuthlibInjectorServers getConfigInstance() {
|
||||||
|
return configInstance;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
@@ -32,44 +32,45 @@ import org.hildan.fxgson.creators.ObservableListCreator;
|
|||||||
import org.hildan.fxgson.creators.ObservableMapCreator;
|
import org.hildan.fxgson.creators.ObservableMapCreator;
|
||||||
import org.hildan.fxgson.creators.ObservableSetCreator;
|
import org.hildan.fxgson.creators.ObservableSetCreator;
|
||||||
import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
|
import org.hildan.fxgson.factories.JavaFxPropertyTypeAdapterFactory;
|
||||||
import org.jackhuang.hmcl.Launcher;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
import org.jackhuang.hmcl.upgrade.UpdateChannel;
|
import org.jackhuang.hmcl.upgrade.UpdateChannel;
|
||||||
import org.jackhuang.hmcl.util.EnumOrdinalDeserializer;
|
import org.jackhuang.hmcl.util.gson.EnumOrdinalDeserializer;
|
||||||
import org.jackhuang.hmcl.util.FileTypeAdapter;
|
import org.jackhuang.hmcl.util.gson.FileTypeAdapter;
|
||||||
import org.jackhuang.hmcl.util.ObservableHelper;
|
|
||||||
import org.jackhuang.hmcl.util.i18n.Locales;
|
import org.jackhuang.hmcl.util.i18n.Locales;
|
||||||
import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
|
import org.jackhuang.hmcl.util.i18n.Locales.SupportedLocale;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.ObservableHelper;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.PropertyUtils;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.net.Proxy;
|
import java.net.Proxy;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
public final class Config implements Cloneable, Observable {
|
public final class Config implements Cloneable, Observable {
|
||||||
|
|
||||||
|
public static final int CURRENT_UI_VERSION = 0;
|
||||||
|
|
||||||
private static final Gson CONFIG_GSON = new GsonBuilder()
|
private static final Gson CONFIG_GSON = new GsonBuilder()
|
||||||
.registerTypeAdapter(VersionSetting.class, VersionSetting.Serializer.INSTANCE)
|
|
||||||
.registerTypeAdapter(Profile.class, Profile.Serializer.INSTANCE)
|
|
||||||
.registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
|
.registerTypeAdapter(File.class, FileTypeAdapter.INSTANCE)
|
||||||
.registerTypeAdapter(ObservableList.class, new ObservableListCreator())
|
.registerTypeAdapter(ObservableList.class, new ObservableListCreator())
|
||||||
.registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
|
.registerTypeAdapter(ObservableSet.class, new ObservableSetCreator())
|
||||||
.registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
|
.registerTypeAdapter(ObservableMap.class, new ObservableMapCreator())
|
||||||
.registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
|
.registerTypeAdapterFactory(new JavaFxPropertyTypeAdapterFactory(true, true))
|
||||||
.registerTypeAdapter(Theme.class, new Theme.TypeAdapter())
|
|
||||||
.registerTypeAdapter(SupportedLocale.class, new SupportedLocale.TypeAdapter())
|
|
||||||
.registerTypeAdapter(EnumBackgroundImage.class, new EnumOrdinalDeserializer<>(EnumBackgroundImage.class)) // backward compatibility for backgroundType
|
.registerTypeAdapter(EnumBackgroundImage.class, new EnumOrdinalDeserializer<>(EnumBackgroundImage.class)) // backward compatibility for backgroundType
|
||||||
.registerTypeAdapter(Proxy.Type.class, new EnumOrdinalDeserializer<>(Proxy.Type.class)) // backward compatibility for hasProxy
|
.registerTypeAdapter(Proxy.Type.class, new EnumOrdinalDeserializer<>(Proxy.Type.class)) // backward compatibility for hasProxy
|
||||||
.setPrettyPrinting()
|
.setPrettyPrinting()
|
||||||
.create();
|
.create();
|
||||||
|
|
||||||
|
@Nullable
|
||||||
public static Config fromJson(String json) throws JsonParseException {
|
public static Config fromJson(String json) throws JsonParseException {
|
||||||
Config instance = CONFIG_GSON.fromJson(json, Config.class);
|
Config loaded = CONFIG_GSON.fromJson(json, Config.class);
|
||||||
// Gson will replace the property fields (even they are final!)
|
if (loaded == null) {
|
||||||
// So we have to add the listeners again after deserialization
|
return null;
|
||||||
instance.addListenerToProperties();
|
}
|
||||||
|
Config instance = new Config();
|
||||||
|
PropertyUtils.copyProperties(loaded, instance);
|
||||||
return instance;
|
return instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,7 +87,7 @@ public final class Config implements Cloneable, Observable {
|
|||||||
private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
|
private ObjectProperty<EnumCommonDirectory> commonDirType = new SimpleObjectProperty<>(EnumCommonDirectory.DEFAULT);
|
||||||
|
|
||||||
@SerializedName("commonpath")
|
@SerializedName("commonpath")
|
||||||
private StringProperty commonDirectory = new SimpleStringProperty(Launcher.MINECRAFT_DIRECTORY.getAbsolutePath());
|
private StringProperty commonDirectory = new SimpleStringProperty(Metadata.MINECRAFT_DIRECTORY.toString());
|
||||||
|
|
||||||
@SerializedName("hasProxy")
|
@SerializedName("hasProxy")
|
||||||
private BooleanProperty hasProxy = new SimpleBooleanProperty();
|
private BooleanProperty hasProxy = new SimpleBooleanProperty();
|
||||||
@@ -95,13 +96,13 @@ public final class Config implements Cloneable, Observable {
|
|||||||
private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
|
private BooleanProperty hasProxyAuth = new SimpleBooleanProperty();
|
||||||
|
|
||||||
@SerializedName("proxyType")
|
@SerializedName("proxyType")
|
||||||
private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.DIRECT);
|
private ObjectProperty<Proxy.Type> proxyType = new SimpleObjectProperty<>(Proxy.Type.HTTP);
|
||||||
|
|
||||||
@SerializedName("proxyHost")
|
@SerializedName("proxyHost")
|
||||||
private StringProperty proxyHost = new SimpleStringProperty();
|
private StringProperty proxyHost = new SimpleStringProperty();
|
||||||
|
|
||||||
@SerializedName("proxyPort")
|
@SerializedName("proxyPort")
|
||||||
private StringProperty proxyPort = new SimpleStringProperty();
|
private IntegerProperty proxyPort = new SimpleIntegerProperty();
|
||||||
|
|
||||||
@SerializedName("proxyUserName")
|
@SerializedName("proxyUserName")
|
||||||
private StringProperty proxyUser = new SimpleStringProperty();
|
private StringProperty proxyUser = new SimpleStringProperty();
|
||||||
@@ -109,6 +110,12 @@ public final class Config implements Cloneable, Observable {
|
|||||||
@SerializedName("proxyPassword")
|
@SerializedName("proxyPassword")
|
||||||
private StringProperty proxyPass = new SimpleStringProperty();
|
private StringProperty proxyPass = new SimpleStringProperty();
|
||||||
|
|
||||||
|
@SerializedName("width")
|
||||||
|
private DoubleProperty width = new SimpleDoubleProperty();
|
||||||
|
|
||||||
|
@SerializedName("height")
|
||||||
|
private DoubleProperty height = new SimpleDoubleProperty();
|
||||||
|
|
||||||
@SerializedName("theme")
|
@SerializedName("theme")
|
||||||
private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);
|
private ObjectProperty<Theme> theme = new SimpleObjectProperty<>(Theme.BLUE);
|
||||||
|
|
||||||
@@ -124,9 +131,6 @@ public final class Config implements Cloneable, Observable {
|
|||||||
@SerializedName("accounts")
|
@SerializedName("accounts")
|
||||||
private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
|
private ObservableList<Map<Object, Object>> accountStorages = FXCollections.observableArrayList();
|
||||||
|
|
||||||
@SerializedName("selectedAccount")
|
|
||||||
private StringProperty selectedAccount = new SimpleStringProperty("");
|
|
||||||
|
|
||||||
@SerializedName("fontFamily")
|
@SerializedName("fontFamily")
|
||||||
private StringProperty fontFamily = new SimpleStringProperty("Consolas");
|
private StringProperty fontFamily = new SimpleStringProperty("Consolas");
|
||||||
|
|
||||||
@@ -137,38 +141,34 @@ public final class Config implements Cloneable, Observable {
|
|||||||
private IntegerProperty logLines = new SimpleIntegerProperty(100);
|
private IntegerProperty logLines = new SimpleIntegerProperty(100);
|
||||||
|
|
||||||
@SerializedName("authlibInjectorServers")
|
@SerializedName("authlibInjectorServers")
|
||||||
private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList();
|
private ObservableList<AuthlibInjectorServer> authlibInjectorServers = FXCollections.observableArrayList(server -> new Observable[] { server });
|
||||||
|
|
||||||
@SerializedName("updateChannel")
|
@SerializedName("updateChannel")
|
||||||
private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);
|
private ObjectProperty<UpdateChannel> updateChannel = new SimpleObjectProperty<>(UpdateChannel.STABLE);
|
||||||
|
|
||||||
@SerializedName("enableMainPageGameList")
|
|
||||||
private BooleanProperty enableMainPageGameList = new SimpleBooleanProperty(false);
|
|
||||||
|
|
||||||
@SerializedName("_version")
|
@SerializedName("_version")
|
||||||
private IntegerProperty configVersion = new SimpleIntegerProperty(0);
|
private IntegerProperty configVersion = new SimpleIntegerProperty(0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The version of UI that the user have last used.
|
||||||
|
* If there is a major change in UI, {@link Config#CURRENT_UI_VERSION} should be increased.
|
||||||
|
* When {@link #CURRENT_UI_VERSION} is higher than the property, the user guide should be shown,
|
||||||
|
* then this property is set to the same value as {@link #CURRENT_UI_VERSION}.
|
||||||
|
* In particular, the property is default to 0, so that whoever open the application for the first time will see the guide.
|
||||||
|
*/
|
||||||
|
@SerializedName("uiVersion")
|
||||||
|
private IntegerProperty uiVersion = new SimpleIntegerProperty(0);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The preferred login type to use when the user wants to add an account.
|
||||||
|
*/
|
||||||
|
@SerializedName("preferredLoginType")
|
||||||
|
private StringProperty preferredLoginType = new SimpleStringProperty();
|
||||||
|
|
||||||
private transient ObservableHelper helper = new ObservableHelper(this);
|
private transient ObservableHelper helper = new ObservableHelper(this);
|
||||||
|
|
||||||
public Config() {
|
public Config() {
|
||||||
addListenerToProperties();
|
PropertyUtils.attachListener(this, helper);
|
||||||
}
|
|
||||||
|
|
||||||
private void addListenerToProperties() {
|
|
||||||
Stream.of(getClass().getDeclaredFields())
|
|
||||||
.filter(it -> {
|
|
||||||
int modifiers = it.getModifiers();
|
|
||||||
return !Modifier.isTransient(modifiers) && !Modifier.isStatic(modifiers);
|
|
||||||
})
|
|
||||||
.filter(it -> Observable.class.isAssignableFrom(it.getType()))
|
|
||||||
.map(it -> {
|
|
||||||
try {
|
|
||||||
return (Observable) it.get(this);
|
|
||||||
} catch (IllegalAccessException e) {
|
|
||||||
throw new IllegalStateException("Failed to get my own properties");
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.forEach(helper::receiveUpdatesFrom);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -299,15 +299,15 @@ public final class Config implements Cloneable, Observable {
|
|||||||
return proxyHost;
|
return proxyHost;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getProxyPort() {
|
public int getProxyPort() {
|
||||||
return proxyPort.get();
|
return proxyPort.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setProxyPort(String proxyPort) {
|
public void setProxyPort(int proxyPort) {
|
||||||
this.proxyPort.set(proxyPort);
|
this.proxyPort.set(proxyPort);
|
||||||
}
|
}
|
||||||
|
|
||||||
public StringProperty proxyPortProperty() {
|
public IntegerProperty proxyPortProperty() {
|
||||||
return proxyPort;
|
return proxyPort;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,6 +335,30 @@ public final class Config implements Cloneable, Observable {
|
|||||||
return proxyPass;
|
return proxyPass;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getWidth() {
|
||||||
|
return width.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DoubleProperty widthProperty() {
|
||||||
|
return width;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWidth(double width) {
|
||||||
|
this.width.set(width);
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getHeight() {
|
||||||
|
return height.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public DoubleProperty heightProperty() {
|
||||||
|
return height;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setHeight(double height) {
|
||||||
|
this.height.set(height);
|
||||||
|
}
|
||||||
|
|
||||||
public Theme getTheme() {
|
public Theme getTheme() {
|
||||||
return theme.get();
|
return theme.get();
|
||||||
}
|
}
|
||||||
@@ -379,18 +403,6 @@ public final class Config implements Cloneable, Observable {
|
|||||||
return accountStorages;
|
return accountStorages;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getSelectedAccount() {
|
|
||||||
return selectedAccount.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSelectedAccount(String selectedAccount) {
|
|
||||||
this.selectedAccount.set(selectedAccount);
|
|
||||||
}
|
|
||||||
|
|
||||||
public StringProperty selectedAccountProperty() {
|
|
||||||
return selectedAccount;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getFontFamily() {
|
public String getFontFamily() {
|
||||||
return fontFamily.get();
|
return fontFamily.get();
|
||||||
}
|
}
|
||||||
@@ -443,15 +455,39 @@ public final class Config implements Cloneable, Observable {
|
|||||||
this.updateChannel.set(updateChannel);
|
this.updateChannel.set(updateChannel);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEnableMainPageGameList() {
|
public int getConfigVersion() {
|
||||||
return enableMainPageGameList.get();
|
return configVersion.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BooleanProperty enableMainPageGameListProperty() {
|
public IntegerProperty configVersionProperty() {
|
||||||
return enableMainPageGameList;
|
return configVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setEnableMainPageGameList(boolean enableMainPageGameList) {
|
public void setConfigVersion(int configVersion) {
|
||||||
this.enableMainPageGameList.set(enableMainPageGameList);
|
this.configVersion.set(configVersion);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getUiVersion() {
|
||||||
|
return uiVersion.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IntegerProperty uiVersionProperty() {
|
||||||
|
return uiVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUiVersion(int uiVersion) {
|
||||||
|
this.uiVersion.set(uiVersion);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPreferredLoginType() {
|
||||||
|
return preferredLoginType.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPreferredLoginType(String preferredLoginType) {
|
||||||
|
this.preferredLoginType.set(preferredLoginType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StringProperty preferredLoginTypeProperty() {
|
||||||
|
return preferredLoginType;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,13 +13,16 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.JsonParseException;
|
import com.google.gson.JsonParseException;
|
||||||
import org.jackhuang.hmcl.util.OperatingSystem;
|
import org.jackhuang.hmcl.util.InvocationDispatcher;
|
||||||
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.OperatingSystem;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
@@ -50,9 +53,6 @@ public final class ConfigHolder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isNewlyCreated() {
|
public static boolean isNewlyCreated() {
|
||||||
if (configInstance == null) {
|
|
||||||
throw new IllegalStateException("Configuration hasn't been loaded");
|
|
||||||
}
|
|
||||||
return newlyCreated;
|
return newlyCreated;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,13 +62,16 @@ public final class ConfigHolder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
configLocation = locateConfig();
|
configLocation = locateConfig();
|
||||||
|
|
||||||
|
LOG.log(Level.INFO, "Config location: " + configLocation);
|
||||||
|
|
||||||
configInstance = loadConfig();
|
configInstance = loadConfig();
|
||||||
configInstance.addListener(source -> markConfigDirty());
|
configInstance.addListener(source -> markConfigDirty());
|
||||||
|
|
||||||
Settings.init();
|
Settings.init();
|
||||||
|
|
||||||
if (newlyCreated) {
|
if (newlyCreated) {
|
||||||
saveConfig();
|
saveConfigSync();
|
||||||
|
|
||||||
// hide the config file on windows
|
// hide the config file on windows
|
||||||
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
|
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
|
||||||
@@ -88,6 +91,26 @@ public final class ConfigHolder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static Path locateConfig() {
|
private static Path locateConfig() {
|
||||||
|
Path exePath = Paths.get("");
|
||||||
|
try {
|
||||||
|
Path jarPath = Paths.get(ConfigHolder.class.getProtectionDomain().getCodeSource().getLocation()
|
||||||
|
.toURI()).toAbsolutePath();
|
||||||
|
if (Files.isRegularFile(jarPath)) {
|
||||||
|
jarPath = jarPath.getParent();
|
||||||
|
exePath = jarPath;
|
||||||
|
|
||||||
|
Path config = jarPath.resolve(CONFIG_FILENAME);
|
||||||
|
if (Files.isRegularFile(config))
|
||||||
|
return config;
|
||||||
|
|
||||||
|
Path dotConfig = jarPath.resolve(CONFIG_FILENAME_LINUX);
|
||||||
|
if (Files.isRegularFile(dotConfig))
|
||||||
|
return dotConfig;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Throwable ignore) {
|
||||||
|
}
|
||||||
|
|
||||||
Path config = Paths.get(CONFIG_FILENAME);
|
Path config = Paths.get(CONFIG_FILENAME);
|
||||||
if (Files.isRegularFile(config))
|
if (Files.isRegularFile(config))
|
||||||
return config;
|
return config;
|
||||||
@@ -97,13 +120,13 @@ public final class ConfigHolder {
|
|||||||
return dotConfig;
|
return dotConfig;
|
||||||
|
|
||||||
// create new
|
// create new
|
||||||
return OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? config : dotConfig;
|
return exePath.resolve(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS ? CONFIG_FILENAME : CONFIG_FILENAME_LINUX);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Config loadConfig() throws IOException {
|
private static Config loadConfig() throws IOException {
|
||||||
if (Files.exists(configLocation)) {
|
if (Files.exists(configLocation)) {
|
||||||
try {
|
try {
|
||||||
String content = new String(Files.readAllBytes(configLocation), UTF_8);
|
String content = FileUtils.readText(configLocation);
|
||||||
Config deserialized = Config.fromJson(content);
|
Config deserialized = Config.fromJson(content);
|
||||||
if (deserialized == null) {
|
if (deserialized == null) {
|
||||||
LOG.info("Config is empty");
|
LOG.info("Config is empty");
|
||||||
@@ -122,22 +145,26 @@ public final class ConfigHolder {
|
|||||||
return new Config();
|
return new Config();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void saveConfig() throws IOException {
|
private static InvocationDispatcher<String> configWriter = InvocationDispatcher.runOn(Lang::thread, content -> {
|
||||||
LOG.info("Saving config");
|
|
||||||
try {
|
try {
|
||||||
Files.write(configLocation, configInstance.toJson().getBytes(UTF_8));
|
writeToConfig(content);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LOG.log(Level.SEVERE, "Failed to save config", e);
|
LOG.log(Level.SEVERE, "Failed to save config", e);
|
||||||
throw e;
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
private static void writeToConfig(String content) throws IOException {
|
||||||
|
LOG.info("Saving config");
|
||||||
|
synchronized (configLocation) {
|
||||||
|
Files.write(configLocation, content.getBytes(UTF_8));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void markConfigDirty() {
|
static void markConfigDirty() {
|
||||||
// TODO: change this to async
|
configWriter.accept(configInstance.toJson());
|
||||||
try {
|
}
|
||||||
saveConfig();
|
|
||||||
} catch (IOException ignored) {
|
private static void saveConfigSync() throws IOException {
|
||||||
// ignore it as it has been logged
|
writeToConfig(configInstance.toJson());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,22 +13,19 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
|
|
||||||
import org.jackhuang.hmcl.auth.offline.OfflineAccountFactory;
|
|
||||||
import org.jackhuang.hmcl.util.StringUtils;
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
import org.jackhuang.hmcl.util.UUIDTypeAdapter;
|
import java.util.HashMap;
|
||||||
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.Lang.tryCast;
|
import static org.jackhuang.hmcl.util.Lang.tryCast;
|
||||||
|
|
||||||
final class ConfigUpgrader {
|
final class ConfigUpgrader {
|
||||||
|
private static final int VERSION = 0;
|
||||||
|
|
||||||
private ConfigUpgrader() {
|
private ConfigUpgrader() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,10 +34,22 @@ final class ConfigUpgrader {
|
|||||||
*
|
*
|
||||||
* @param deserialized deserialized config settings
|
* @param deserialized deserialized config settings
|
||||||
* @param rawJson raw json structure of the config settings without modification
|
* @param rawJson raw json structure of the config settings without modification
|
||||||
|
* @return true if config version is upgraded
|
||||||
*/
|
*/
|
||||||
static void upgradeConfig(Config deserialized, Map<?, ?> rawJson) {
|
static boolean upgradeConfig(Config deserialized, Map<?, ?> rawJson) {
|
||||||
|
boolean upgraded;
|
||||||
|
if (deserialized.getConfigVersion() < VERSION) {
|
||||||
|
deserialized.setConfigVersion(VERSION);
|
||||||
|
// TODO: Add upgrade code here.
|
||||||
|
upgraded = true;
|
||||||
|
} else {
|
||||||
|
upgraded = false;
|
||||||
|
}
|
||||||
|
|
||||||
upgradeV2(deserialized, rawJson);
|
upgradeV2(deserialized, rawJson);
|
||||||
upgradeV3(deserialized, rawJson);
|
upgradeV3(deserialized, rawJson);
|
||||||
|
|
||||||
|
return upgraded;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -53,20 +62,21 @@ final class ConfigUpgrader {
|
|||||||
// Convert OfflineAccounts whose stored uuid is important.
|
// Convert OfflineAccounts whose stored uuid is important.
|
||||||
tryCast(rawJson.get("auth"), Map.class).ifPresent(auth -> {
|
tryCast(rawJson.get("auth"), Map.class).ifPresent(auth -> {
|
||||||
tryCast(auth.get("offline"), Map.class).ifPresent(offline -> {
|
tryCast(auth.get("offline"), Map.class).ifPresent(offline -> {
|
||||||
List<OfflineAccount> accounts = new LinkedList<>();
|
String selected = rawJson.containsKey("selectedAccount") ? null
|
||||||
|
: tryCast(offline.get("IAuthenticator_UserName"), String.class).orElse(null);
|
||||||
|
|
||||||
tryCast(offline.get("uuidMap"), Map.class).ifPresent(uuidMap -> {
|
tryCast(offline.get("uuidMap"), Map.class).ifPresent(uuidMap -> {
|
||||||
((Map<?, ?>) uuidMap).forEach((key, value) -> {
|
((Map<?, ?>) uuidMap).forEach((key, value) -> {
|
||||||
OfflineAccount account = OfflineAccountFactory.INSTANCE.create((String) key, UUIDTypeAdapter.fromString((String) value));
|
Map<Object, Object> storage = new HashMap<>();
|
||||||
accounts.add(account);
|
storage.put("type", "offline");
|
||||||
deserialized.getAccountStorages().add(Accounts.getAccountStorage(account));
|
storage.put("username", key);
|
||||||
|
storage.put("uuid", value);
|
||||||
|
if (key.equals(selected)) {
|
||||||
|
storage.put("selected", true);
|
||||||
|
}
|
||||||
|
deserialized.getAccountStorages().add(storage);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
tryCast(offline.get("IAuthenticator_UserName"), String.class).ifPresent(selected -> {
|
|
||||||
if (!rawJson.containsKey("selectedAccount"))
|
|
||||||
accounts.stream().filter(account -> selected.equals(account.getUsername())).findAny().ifPresent(account ->
|
|
||||||
deserialized.setSelectedAccount(Accounts.accountId(account)));
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -98,5 +108,22 @@ final class ConfigUpgrader {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tryCast(rawJson.get("selectedAccount"), String.class)
|
||||||
|
.ifPresent(selected -> {
|
||||||
|
deserialized.getAccountStorages().stream()
|
||||||
|
.filter(storage -> {
|
||||||
|
Object type = storage.get("type");
|
||||||
|
if ("offline".equals(type)) {
|
||||||
|
return selected.equals(storage.get("username") + ":" + storage.get("username"));
|
||||||
|
} else if ("yggdrasil".equals(type) || "authlibInjector".equals(type)) {
|
||||||
|
return selected.equals(storage.get("username") + ":" + storage.get("displayName"));
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.findFirst()
|
||||||
|
.ifPresent(storage -> storage.put("selected", true));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,48 +13,83 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
|
import org.jackhuang.hmcl.download.AdaptedDownloadProvider;
|
||||||
|
import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
|
||||||
|
import org.jackhuang.hmcl.download.DownloadProvider;
|
||||||
|
import org.jackhuang.hmcl.download.MojangDownloadProvider;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.util.Lang.mapOf;
|
import static org.jackhuang.hmcl.util.Lang.mapOf;
|
||||||
import static org.jackhuang.hmcl.util.Pair.pair;
|
import static org.jackhuang.hmcl.util.Pair.pair;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
|
|
||||||
import org.jackhuang.hmcl.download.DownloadProvider;
|
|
||||||
import org.jackhuang.hmcl.download.MojangDownloadProvider;
|
|
||||||
|
|
||||||
import javafx.beans.binding.Bindings;
|
|
||||||
import javafx.beans.binding.ObjectBinding;
|
|
||||||
import javafx.beans.value.ObservableObjectValue;
|
|
||||||
|
|
||||||
public final class DownloadProviders {
|
public final class DownloadProviders {
|
||||||
private DownloadProviders() {}
|
private DownloadProviders() {}
|
||||||
|
|
||||||
public static final Map<String, DownloadProvider> providersById = mapOf(
|
private static final AdaptedDownloadProvider DOWNLOAD_PROVIDER = new AdaptedDownloadProvider();
|
||||||
pair("mojang", new MojangDownloadProvider()),
|
|
||||||
pair("bmclapi", new BMCLAPIDownloadProvider()));
|
|
||||||
|
|
||||||
public static final String DEFAULT_PROVIDER_ID = "bmclapi";
|
public static final Map<String, DownloadProvider> providersById;
|
||||||
|
|
||||||
private static ObjectBinding<DownloadProvider> downloadProviderProperty;
|
public static final String DEFAULT_PROVIDER_ID = "mcbbs";
|
||||||
|
|
||||||
|
static {
|
||||||
|
String bmclapiRoot = "https://bmclapi2.bangbang93.com";
|
||||||
|
String bmclapiRootOverride = System.getProperty("hmcl.bmclapi.override");
|
||||||
|
if (bmclapiRootOverride != null) bmclapiRoot = bmclapiRootOverride;
|
||||||
|
|
||||||
|
providersById = mapOf(
|
||||||
|
pair("mojang", new MojangDownloadProvider()),
|
||||||
|
pair("bmclapi", new BMCLAPIDownloadProvider(bmclapiRoot)),
|
||||||
|
pair("mcbbs", new BMCLAPIDownloadProvider("https://download.mcbbs.net")));
|
||||||
|
}
|
||||||
|
|
||||||
static void init() {
|
static void init() {
|
||||||
downloadProviderProperty = Bindings.createObjectBinding(
|
FXUtils.onChangeAndOperate(config().downloadTypeProperty(), downloadType -> {
|
||||||
() -> Optional.ofNullable(providersById.get(config().getDownloadType()))
|
DownloadProvider primary = Optional.ofNullable(providersById.get(config().getDownloadType()))
|
||||||
.orElse(providersById.get(DEFAULT_PROVIDER_ID)),
|
.orElse(providersById.get(DEFAULT_PROVIDER_ID));
|
||||||
config().downloadTypeProperty());
|
DOWNLOAD_PROVIDER.setDownloadProviderCandidates(
|
||||||
|
Stream.concat(
|
||||||
|
Stream.of(primary),
|
||||||
|
providersById.values().stream().filter(x -> x != primary)
|
||||||
|
).collect(Collectors.toList())
|
||||||
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static DownloadProvider getDownloadProvider() {
|
public static String getPrimaryDownloadProviderId() {
|
||||||
return downloadProviderProperty.get();
|
String downloadType = config().getDownloadType();
|
||||||
|
if (providersById.containsKey(downloadType))
|
||||||
|
return downloadType;
|
||||||
|
else
|
||||||
|
return DEFAULT_PROVIDER_ID;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ObservableObjectValue<DownloadProvider> downloadProviderProperty() {
|
public static AdaptedDownloadProvider getDownloadProviderByPrimaryId(String primaryId) {
|
||||||
return downloadProviderProperty;
|
AdaptedDownloadProvider adaptedDownloadProvider = new AdaptedDownloadProvider();
|
||||||
|
DownloadProvider primary = Optional.ofNullable(providersById.get(primaryId))
|
||||||
|
.orElse(providersById.get(DEFAULT_PROVIDER_ID));
|
||||||
|
adaptedDownloadProvider.setDownloadProviderCandidates(
|
||||||
|
Stream.concat(
|
||||||
|
Stream.of(primary),
|
||||||
|
providersById.values().stream().filter(x -> x != primary)
|
||||||
|
).collect(Collectors.toList())
|
||||||
|
);
|
||||||
|
return adaptedDownloadProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get current primary preferred download provider
|
||||||
|
*/
|
||||||
|
public static AdaptedDownloadProvider getDownloadProvider() {
|
||||||
|
return DOWNLOAD_PROVIDER;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,39 +13,43 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import com.google.gson.*;
|
import com.google.gson.*;
|
||||||
|
import com.google.gson.annotations.JsonAdapter;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.beans.InvalidationListener;
|
import javafx.beans.InvalidationListener;
|
||||||
import javafx.beans.Observable;
|
import javafx.beans.Observable;
|
||||||
import javafx.beans.property.*;
|
import javafx.beans.property.*;
|
||||||
import org.jackhuang.hmcl.download.DefaultDependencyManager;
|
import org.jackhuang.hmcl.download.DefaultDependencyManager;
|
||||||
|
import org.jackhuang.hmcl.download.DownloadProvider;
|
||||||
import org.jackhuang.hmcl.event.EventBus;
|
import org.jackhuang.hmcl.event.EventBus;
|
||||||
|
import org.jackhuang.hmcl.event.EventPriority;
|
||||||
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
|
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
|
||||||
import org.jackhuang.hmcl.game.HMCLCacheRepository;
|
import org.jackhuang.hmcl.game.HMCLCacheRepository;
|
||||||
import org.jackhuang.hmcl.game.HMCLGameRepository;
|
import org.jackhuang.hmcl.game.HMCLGameRepository;
|
||||||
import org.jackhuang.hmcl.game.Version;
|
import org.jackhuang.hmcl.game.Version;
|
||||||
import org.jackhuang.hmcl.mod.ModManager;
|
|
||||||
import org.jackhuang.hmcl.ui.WeakListenerHolder;
|
import org.jackhuang.hmcl.ui.WeakListenerHolder;
|
||||||
import org.jackhuang.hmcl.util.*;
|
import org.jackhuang.hmcl.util.ToStringBuilder;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.ObservableHelper;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
*/
|
*/
|
||||||
|
@JsonAdapter(Profile.Serializer.class)
|
||||||
public final class Profile implements Observable {
|
public final class Profile implements Observable {
|
||||||
private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
|
private final WeakListenerHolder listenerHolder = new WeakListenerHolder();
|
||||||
private final HMCLGameRepository repository;
|
private final HMCLGameRepository repository;
|
||||||
private final ModManager modManager;
|
|
||||||
|
|
||||||
private final StringProperty selectedVersion = new SimpleStringProperty();
|
private final StringProperty selectedVersion = new SimpleStringProperty();
|
||||||
|
|
||||||
@@ -85,9 +89,9 @@ public final class Profile implements Observable {
|
|||||||
return global.get();
|
return global.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty name;
|
private final SimpleStringProperty name;
|
||||||
|
|
||||||
public ImmediateStringProperty nameProperty() {
|
public StringProperty nameProperty() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,53 +130,48 @@ public final class Profile implements Observable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Profile(String name, File initialGameDir, VersionSetting global, String selectedVersion, boolean useRelativePath) {
|
public Profile(String name, File initialGameDir, VersionSetting global, String selectedVersion, boolean useRelativePath) {
|
||||||
this.name = new ImmediateStringProperty(this, "name", name);
|
this.name = new SimpleStringProperty(this, "name", name);
|
||||||
gameDir = new ImmediateObjectProperty<>(this, "gameDir", initialGameDir);
|
gameDir = new SimpleObjectProperty<>(this, "gameDir", initialGameDir);
|
||||||
repository = new HMCLGameRepository(this, initialGameDir);
|
repository = new HMCLGameRepository(this, initialGameDir);
|
||||||
modManager = new ModManager(repository);
|
|
||||||
this.global.set(global == null ? new VersionSetting() : global);
|
this.global.set(global == null ? new VersionSetting() : global);
|
||||||
this.selectedVersion.set(selectedVersion);
|
this.selectedVersion.set(selectedVersion);
|
||||||
this.useRelativePath.set(useRelativePath);
|
this.useRelativePath.set(useRelativePath);
|
||||||
|
|
||||||
gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
|
gameDir.addListener((a, b, newValue) -> repository.changeDirectory(newValue));
|
||||||
this.selectedVersion.addListener(o -> checkSelectedVersion());
|
this.selectedVersion.addListener(o -> checkSelectedVersion());
|
||||||
listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion()));
|
listenerHolder.add(EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> checkSelectedVersion(), EventPriority.HIGHEST));
|
||||||
|
|
||||||
addPropertyChangedListener(onInvalidating(this::invalidate));
|
addPropertyChangedListener(onInvalidating(this::invalidate));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkSelectedVersion() {
|
private void checkSelectedVersion() {
|
||||||
if (!repository.isLoaded()) return;
|
runInFX(() -> {
|
||||||
String newValue = selectedVersion.get();
|
if (!repository.isLoaded()) return;
|
||||||
if (!repository.hasVersion(newValue)) {
|
String newValue = selectedVersion.get();
|
||||||
Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
|
if (!repository.hasVersion(newValue)) {
|
||||||
if (version.isPresent())
|
Optional<String> version = repository.getVersions().stream().findFirst().map(Version::getId);
|
||||||
selectedVersion.setValue(version.get());
|
if (version.isPresent())
|
||||||
else if (newValue != null)
|
selectedVersion.setValue(version.get());
|
||||||
selectedVersion.setValue(null);
|
else if (newValue != null)
|
||||||
}
|
selectedVersion.setValue(null);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public HMCLGameRepository getRepository() {
|
public HMCLGameRepository getRepository() {
|
||||||
return repository;
|
return repository;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ModManager getModManager() {
|
public DefaultDependencyManager getDependency() {
|
||||||
return modManager;
|
return getDependency(DownloadProviders.getDownloadProvider());
|
||||||
}
|
}
|
||||||
|
|
||||||
public DefaultDependencyManager getDependency() {
|
public DefaultDependencyManager getDependency(DownloadProvider downloadProvider) {
|
||||||
return new DefaultDependencyManager(repository, DownloadProviders.getDownloadProvider(), HMCLCacheRepository.REPOSITORY);
|
return new DefaultDependencyManager(repository, downloadProvider, HMCLCacheRepository.REPOSITORY);
|
||||||
}
|
}
|
||||||
|
|
||||||
public VersionSetting getVersionSetting(String id) {
|
public VersionSetting getVersionSetting(String id) {
|
||||||
VersionSetting vs = repository.getVersionSetting(id);
|
return repository.getVersionSetting(id);
|
||||||
if (vs == null || vs.isUsesGlobal()) {
|
|
||||||
getGlobal().setGlobal(true); // always keep global.isGlobal = true
|
|
||||||
getGlobal().setUsesGlobal(true);
|
|
||||||
return getGlobal();
|
|
||||||
} else
|
|
||||||
return vs;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -210,11 +209,6 @@ public final class Profile implements Observable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
|
public static final class Serializer implements JsonSerializer<Profile>, JsonDeserializer<Profile> {
|
||||||
public static final Serializer INSTANCE = new Serializer();
|
|
||||||
|
|
||||||
private Serializer() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JsonElement serialize(Profile src, Type typeOfSrc, JsonSerializationContext context) {
|
public JsonElement serialize(Profile src, Type typeOfSrc, JsonSerializationContext context) {
|
||||||
if (src == null)
|
if (src == null)
|
||||||
@@ -231,7 +225,7 @@ public final class Profile implements Observable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Profile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
public Profile deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||||
if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
|
if (json == JsonNull.INSTANCE || !(json instanceof JsonObject)) return null;
|
||||||
JsonObject obj = (JsonObject) json;
|
JsonObject obj = (JsonObject) json;
|
||||||
String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
|
String gameDir = Optional.ofNullable(obj.get("gameDir")).map(JsonElement::getAsString).orElse("");
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,27 +13,29 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.beans.Observable;
|
import javafx.beans.Observable;
|
||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.property.*;
|
||||||
import javafx.beans.property.ReadOnlyListProperty;
|
|
||||||
import javafx.beans.property.ReadOnlyListWrapper;
|
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import org.jackhuang.hmcl.Launcher;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
|
import org.jackhuang.hmcl.event.EventBus;
|
||||||
|
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static java.util.stream.Collectors.toList;
|
|
||||||
import static javafx.collections.FXCollections.observableArrayList;
|
import static javafx.collections.FXCollections.observableArrayList;
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public final class Profiles {
|
public final class Profiles {
|
||||||
@@ -65,7 +67,11 @@ public final class Profiles {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidated() {
|
protected void invalidated() {
|
||||||
|
if (!initialized)
|
||||||
|
return;
|
||||||
|
|
||||||
Profile profile = get();
|
Profile profile = get();
|
||||||
|
|
||||||
if (profiles.isEmpty()) {
|
if (profiles.isEmpty()) {
|
||||||
if (profile != null) {
|
if (profile != null) {
|
||||||
set(null);
|
set(null);
|
||||||
@@ -78,16 +84,27 @@ public final class Profiles {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!initialized)
|
|
||||||
return;
|
|
||||||
config().setSelectedProfile(profile == null ? "" : profile.getName());
|
config().setSelectedProfile(profile == null ? "" : profile.getName());
|
||||||
|
if (profile != null) {
|
||||||
|
if (profile.getRepository().isLoaded())
|
||||||
|
selectedVersion.bind(profile.selectedVersionProperty());
|
||||||
|
else {
|
||||||
|
selectedVersion.unbind();
|
||||||
|
selectedVersion.set(null);
|
||||||
|
// bind when repository was reloaded.
|
||||||
|
profile.getRepository().refreshVersionsAsync().start();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
selectedVersion.unbind();
|
||||||
|
selectedVersion.set(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
private static void checkProfiles() {
|
private static void checkProfiles() {
|
||||||
if (profiles.isEmpty()) {
|
if (profiles.isEmpty()) {
|
||||||
Profile current = new Profile(Profiles.DEFAULT_PROFILE, new File(".minecraft"), new VersionSetting(), null, true);
|
Profile current = new Profile(Profiles.DEFAULT_PROFILE, new File(".minecraft"), new VersionSetting(), null, true);
|
||||||
Profile home = new Profile(Profiles.HOME_PROFILE, Launcher.MINECRAFT_DIRECTORY);
|
Profile home = new Profile(Profiles.HOME_PROFILE, Metadata.MINECRAFT_DIRECTORY.toFile());
|
||||||
Platform.runLater(() -> profiles.addAll(current, home));
|
Platform.runLater(() -> profiles.addAll(current, home));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,18 +144,33 @@ public final class Profiles {
|
|||||||
HashSet<String> names = new HashSet<>();
|
HashSet<String> names = new HashSet<>();
|
||||||
config().getConfigurations().forEach((name, profile) -> {
|
config().getConfigurations().forEach((name, profile) -> {
|
||||||
if (!names.add(name)) return;
|
if (!names.add(name)) return;
|
||||||
profile.setName(name);
|
|
||||||
profiles.add(profile);
|
profiles.add(profile);
|
||||||
|
profile.setName(name);
|
||||||
});
|
});
|
||||||
checkProfiles();
|
checkProfiles();
|
||||||
|
|
||||||
initialized = true;
|
// Platform.runLater is necessary or profiles will be empty
|
||||||
|
// since checkProfiles adds 2 base profile later.
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
initialized = true;
|
||||||
|
|
||||||
selectedProfile.set(
|
selectedProfile.set(
|
||||||
profiles.stream()
|
profiles.stream()
|
||||||
.filter(it -> it.getName().equals(config().getSelectedProfile()))
|
.filter(it -> it.getName().equals(config().getSelectedProfile()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElse(profiles.get(0)));
|
.orElse(profiles.get(0)));
|
||||||
|
});
|
||||||
|
|
||||||
|
EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).registerWeak(event -> {
|
||||||
|
runInFX(() -> {
|
||||||
|
Profile profile = selectedProfile.get();
|
||||||
|
if (profile != null && profile.getRepository() == event.getSource()) {
|
||||||
|
selectedVersion.bind(profile.selectedVersionProperty());
|
||||||
|
for (Consumer<Profile> listener : versionsListeners)
|
||||||
|
listener.accept(profile);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ObservableList<Profile> getProfiles() {
|
public static ObservableList<Profile> getProfiles() {
|
||||||
@@ -160,4 +192,24 @@ public final class Profiles {
|
|||||||
public static ObjectProperty<Profile> selectedProfileProperty() {
|
public static ObjectProperty<Profile> selectedProfileProperty() {
|
||||||
return selectedProfile;
|
return selectedProfile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final ReadOnlyStringWrapper selectedVersion = new ReadOnlyStringWrapper();
|
||||||
|
|
||||||
|
public static ReadOnlyStringProperty selectedVersionProperty() {
|
||||||
|
return selectedVersion.getReadOnlyProperty();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Guaranteed that the repository is loaded.
|
||||||
|
public static String getSelectedVersion() {
|
||||||
|
return selectedVersion.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final List<Consumer<Profile>> versionsListeners = new LinkedList<>();
|
||||||
|
|
||||||
|
public static void registerVersionsListener(Consumer<Profile> listener) {
|
||||||
|
Profile profile = getSelectedProfile();
|
||||||
|
if (profile != null && profile.getRepository().isLoaded())
|
||||||
|
listener.accept(profile);
|
||||||
|
versionsListeners.add(listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,14 +13,13 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.beans.binding.ObjectBinding;
|
import javafx.beans.binding.ObjectBinding;
|
||||||
import javafx.beans.value.ObservableObjectValue;
|
import javafx.beans.value.ObservableObjectValue;
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
|
||||||
import org.jackhuang.hmcl.util.StringUtils;
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
|
||||||
import java.net.Authenticator;
|
import java.net.Authenticator;
|
||||||
@@ -30,6 +29,7 @@ import java.net.Proxy;
|
|||||||
import java.net.Proxy.Type;
|
import java.net.Proxy.Type;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
|
|
||||||
public final class ProxyManager {
|
public final class ProxyManager {
|
||||||
private ProxyManager() {
|
private ProxyManager() {
|
||||||
@@ -49,10 +49,14 @@ public final class ProxyManager {
|
|||||||
proxyProperty = Bindings.createObjectBinding(
|
proxyProperty = Bindings.createObjectBinding(
|
||||||
() -> {
|
() -> {
|
||||||
String host = config().getProxyHost();
|
String host = config().getProxyHost();
|
||||||
Integer port = Lang.toIntOrNull(config().getProxyPort());
|
int port = config().getProxyPort();
|
||||||
if (!config().hasProxy() || StringUtils.isBlank(host) || port == null || config().getProxyType() == Proxy.Type.DIRECT) {
|
if (!config().hasProxy() || StringUtils.isBlank(host) || config().getProxyType() == Proxy.Type.DIRECT) {
|
||||||
return Proxy.NO_PROXY;
|
return Proxy.NO_PROXY;
|
||||||
} else {
|
} else {
|
||||||
|
if (port < 0 || port > 0xFFFF) {
|
||||||
|
LOG.warning("Illegal proxy port: " + port);
|
||||||
|
return Proxy.NO_PROXY;
|
||||||
|
}
|
||||||
return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
|
return new Proxy(config().getProxyType(), new InetSocketAddress(host, port));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,17 +13,20 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import javafx.scene.text.Font;
|
import javafx.beans.binding.Bindings;
|
||||||
import org.jackhuang.hmcl.Launcher;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
import org.jackhuang.hmcl.game.HMCLCacheRepository;
|
import org.jackhuang.hmcl.game.HMCLCacheRepository;
|
||||||
import org.jackhuang.hmcl.util.CacheRepository;
|
import org.jackhuang.hmcl.util.CacheRepository;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
public class Settings {
|
public class Settings {
|
||||||
|
|
||||||
private static Settings instance;
|
private static Settings instance;
|
||||||
@@ -43,26 +46,27 @@ public class Settings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Settings() {
|
private Settings() {
|
||||||
|
config().localizationProperty().addListener(unused -> updateSystemLocale());
|
||||||
|
updateSystemLocale();
|
||||||
|
|
||||||
DownloadProviders.init();
|
DownloadProviders.init();
|
||||||
ProxyManager.init();
|
ProxyManager.init();
|
||||||
Accounts.init();
|
Accounts.init();
|
||||||
Profiles.init();
|
Profiles.init();
|
||||||
|
AuthlibInjectorServers.init();
|
||||||
|
|
||||||
CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
|
CacheRepository.setInstance(HMCLCacheRepository.REPOSITORY);
|
||||||
HMCLCacheRepository.REPOSITORY.directoryProperty().bind(config().commonDirectoryProperty());
|
HMCLCacheRepository.REPOSITORY.directoryProperty().bind(Bindings.createStringBinding(() -> {
|
||||||
}
|
if (FileUtils.canCreateDirectory(getCommonDirectory())) {
|
||||||
|
return getCommonDirectory();
|
||||||
public Font getFont() {
|
} else {
|
||||||
return Font.font(config().getFontFamily(), config().getFontSize());
|
return getDefaultCommonDirectory();
|
||||||
}
|
}
|
||||||
|
}, config().commonDirectoryProperty(), config().commonDirTypeProperty()));
|
||||||
public void setFont(Font font) {
|
|
||||||
config().setFontFamily(font.getFamily());
|
|
||||||
config().setFontSize(font.getSize());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getDefaultCommonDirectory() {
|
public static String getDefaultCommonDirectory() {
|
||||||
return Launcher.MINECRAFT_DIRECTORY.getAbsolutePath();
|
return Metadata.MINECRAFT_DIRECTORY.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getCommonDirectory() {
|
public String getCommonDirectory() {
|
||||||
@@ -75,4 +79,8 @@ public class Settings {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void updateSystemLocale() {
|
||||||
|
Locale.setDefault(config().getLocalization().getLocale());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,18 +13,21 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.JsonAdapter;
|
||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
import com.google.gson.stream.JsonWriter;
|
import com.google.gson.stream.JsonWriter;
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.beans.binding.ObjectBinding;
|
import javafx.beans.binding.ObjectBinding;
|
||||||
import javafx.scene.paint.Color;
|
import javafx.scene.paint.Color;
|
||||||
import org.jackhuang.hmcl.util.FileUtils;
|
|
||||||
import org.jackhuang.hmcl.util.IOUtils;
|
|
||||||
import org.jackhuang.hmcl.util.Logging;
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
|
import org.jackhuang.hmcl.util.ResourceNotFoundError;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.IOUtils;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -33,24 +36,27 @@ import java.util.logging.Level;
|
|||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
|
||||||
|
@JsonAdapter(Theme.TypeAdapter.class)
|
||||||
public class Theme {
|
public class Theme {
|
||||||
public static final Theme BLUE = new Theme("blue", "#5C6BC0");
|
public static final Theme BLUE = new Theme("blue", "#5C6BC0");
|
||||||
|
public static final Color BLACK = Color.web("#292929");
|
||||||
public static final Color[] SUGGESTED_COLORS = new Color[]{
|
public static final Color[] SUGGESTED_COLORS = new Color[]{
|
||||||
Color.web("#5C6BC0"), // blue
|
Color.web("#5C6BC0"), // blue
|
||||||
Color.web("#283593"), // dark blue
|
Color.web("#283593"), // dark blue
|
||||||
Color.web("#43A047"), // green
|
Color.web("#43A047"), // green
|
||||||
Color.web("#E67E22"), // orange
|
Color.web("#E67E22"), // orange
|
||||||
Color.web("#9C27B0"), // purple
|
Color.web("#9C27B0"), // purple
|
||||||
Color.web("#F44336") // red
|
Color.web("#B71C1C") // red
|
||||||
};
|
};
|
||||||
|
|
||||||
|
private final Color paint;
|
||||||
private final String color;
|
private final String color;
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
Theme(String name, String color) {
|
Theme(String name, String color) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.color = color;
|
this.color = color;
|
||||||
|
this.paint = Color.web(color);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
@@ -74,21 +80,26 @@ public class Theme {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String[] getStylesheets() {
|
public String[] getStylesheets() {
|
||||||
|
Color textFill = getForegroundColor();
|
||||||
|
|
||||||
String css;
|
String css;
|
||||||
try {
|
try {
|
||||||
File temp = File.createTempFile("hmcl", ".css");
|
File temp = File.createTempFile("hmcl", ".css");
|
||||||
FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css"))
|
FileUtils.writeText(temp, IOUtils.readFullyAsString(ResourceNotFoundError.getResourceAsStream("/assets/css/custom.css"))
|
||||||
.replace("%base-color%", color)
|
.replace("%base-color%", color)
|
||||||
.replace("%font-color%", getColorDisplayName(getForegroundColor())));
|
.replace("%base-rippler-color%", String.format("rgba(%d, %d, %d, 0.3)", (int) Math.ceil(paint.getRed() * 256), (int) Math.ceil(paint.getGreen() * 256), (int) Math.ceil(paint.getBlue() * 256)))
|
||||||
|
.replace("%disabled-font-color%", String.format("rgba(%d, %d, %d, 0.7)", (int) Math.ceil(textFill.getRed() * 256), (int) Math.ceil(textFill.getGreen() * 256), (int) Math.ceil(textFill.getBlue() * 256)))
|
||||||
|
.replace("%font-color%", getColorDisplayName(getForegroundColor()))
|
||||||
|
.replace("%font%", Optional.ofNullable(System.getProperty("hmcl.font.override")).map(fontFamily -> "-fx-font-family: " + fontFamily + ";").orElse("")));
|
||||||
css = temp.toURI().toString();
|
css = temp.toURI().toString();
|
||||||
} catch (IOException e) {
|
} catch (IOException | NullPointerException e) {
|
||||||
Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
|
Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
|
||||||
css = Theme.class.getResource("/assets/css/blue.css").toExternalForm();
|
css = "/assets/css/blue.css";
|
||||||
}
|
}
|
||||||
|
|
||||||
return new String[]{
|
return new String[]{
|
||||||
css,
|
css,
|
||||||
Theme.class.getResource("/assets/css/root.css").toExternalForm()
|
"/assets/css/root.css"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,11 +140,12 @@ public class Theme {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static ObjectBinding<Color> foregroundFillBinding() {
|
public static ObjectBinding<Color> foregroundFillBinding() {
|
||||||
return Bindings.createObjectBinding(() -> config().getTheme().getForegroundColor(), config().themeProperty());
|
return BindingMapping.of(config().themeProperty())
|
||||||
|
.map(Theme::getForegroundColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ObjectBinding<Color> blackFillBinding() {
|
public static ObjectBinding<Color> blackFillBinding() {
|
||||||
return Bindings.createObjectBinding(() -> Color.BLACK);
|
return Bindings.createObjectBinding(() -> BLACK);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ObjectBinding<Color> whiteFillBinding() {
|
public static ObjectBinding<Color> whiteFillBinding() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,30 +13,35 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.setting;
|
package org.jackhuang.hmcl.setting;
|
||||||
|
|
||||||
import com.google.gson.*;
|
import com.google.gson.*;
|
||||||
|
import com.google.gson.annotations.JsonAdapter;
|
||||||
import javafx.beans.InvalidationListener;
|
import javafx.beans.InvalidationListener;
|
||||||
import org.jackhuang.hmcl.Metadata;
|
import javafx.beans.property.*;
|
||||||
import org.jackhuang.hmcl.game.LaunchOptions;
|
import org.jackhuang.hmcl.game.GameDirectoryType;
|
||||||
import org.jackhuang.hmcl.util.*;
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.JavaVersion;
|
||||||
|
import org.jackhuang.hmcl.util.platform.OperatingSystem;
|
||||||
|
import org.jackhuang.hmcl.util.platform.Platform;
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
|
import java.nio.file.InvalidPathException;
|
||||||
|
import java.nio.file.Paths;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
*/
|
*/
|
||||||
public final class VersionSetting {
|
@JsonAdapter(VersionSetting.Serializer.class)
|
||||||
|
public final class VersionSetting implements Cloneable {
|
||||||
|
|
||||||
public transient String id;
|
public transient String id;
|
||||||
|
|
||||||
@@ -50,9 +55,9 @@ public final class VersionSetting {
|
|||||||
this.global = global;
|
this.global = global;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateBooleanProperty usesGlobalProperty = new ImmediateBooleanProperty(this, "usesGlobal", false);
|
private final BooleanProperty usesGlobalProperty = new SimpleBooleanProperty(this, "usesGlobal", false);
|
||||||
|
|
||||||
public ImmediateBooleanProperty usesGlobalProperty() {
|
public BooleanProperty usesGlobalProperty() {
|
||||||
return usesGlobalProperty;
|
return usesGlobalProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,9 +79,9 @@ public final class VersionSetting {
|
|||||||
|
|
||||||
// java
|
// java
|
||||||
|
|
||||||
private final ImmediateStringProperty javaProperty = new ImmediateStringProperty(this, "java", "");
|
private final StringProperty javaProperty = new SimpleStringProperty(this, "java", "");
|
||||||
|
|
||||||
public ImmediateStringProperty javaProperty() {
|
public StringProperty javaProperty() {
|
||||||
return javaProperty;
|
return javaProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,7 +105,7 @@ public final class VersionSetting {
|
|||||||
setDefaultJavaPath(null);
|
setDefaultJavaPath(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty defaultJavaPathProperty = new ImmediateStringProperty(this, "defaultJavaPath", "");
|
private final StringProperty defaultJavaPathProperty = new SimpleStringProperty(this, "defaultJavaPath", "");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Path to Java executable, or null if user customizes java directory.
|
* Path to Java executable, or null if user customizes java directory.
|
||||||
@@ -114,9 +119,9 @@ public final class VersionSetting {
|
|||||||
defaultJavaPathProperty.set(defaultJavaPath);
|
defaultJavaPathProperty.set(defaultJavaPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty javaDirProperty = new ImmediateStringProperty(this, "javaDir", "");
|
private final StringProperty javaDirProperty = new SimpleStringProperty(this, "javaDir", "");
|
||||||
|
|
||||||
public ImmediateStringProperty javaDirProperty() {
|
public StringProperty javaDirProperty() {
|
||||||
return javaDirProperty;
|
return javaDirProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,9 +136,9 @@ public final class VersionSetting {
|
|||||||
javaDirProperty.set(javaDir);
|
javaDirProperty.set(javaDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty wrapperProperty = new ImmediateStringProperty(this, "wrapper", "");
|
private final StringProperty wrapperProperty = new SimpleStringProperty(this, "wrapper", "");
|
||||||
|
|
||||||
public ImmediateStringProperty wrapperProperty() {
|
public StringProperty wrapperProperty() {
|
||||||
return wrapperProperty;
|
return wrapperProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,9 +153,9 @@ public final class VersionSetting {
|
|||||||
wrapperProperty.set(wrapper);
|
wrapperProperty.set(wrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty permSizeProperty = new ImmediateStringProperty(this, "permSize", "");
|
private final StringProperty permSizeProperty = new SimpleStringProperty(this, "permSize", "");
|
||||||
|
|
||||||
public ImmediateStringProperty permSizeProperty() {
|
public StringProperty permSizeProperty() {
|
||||||
return permSizeProperty;
|
return permSizeProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,9 +170,9 @@ public final class VersionSetting {
|
|||||||
permSizeProperty.set(permSize);
|
permSizeProperty.set(permSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateIntegerProperty maxMemoryProperty = new ImmediateIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
|
private final IntegerProperty maxMemoryProperty = new SimpleIntegerProperty(this, "maxMemory", OperatingSystem.SUGGESTED_MEMORY);
|
||||||
|
|
||||||
public ImmediateIntegerProperty maxMemoryProperty() {
|
public IntegerProperty maxMemoryProperty() {
|
||||||
return maxMemoryProperty;
|
return maxMemoryProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,9 +190,9 @@ public final class VersionSetting {
|
|||||||
/**
|
/**
|
||||||
* The minimum memory that JVM can allocate for heap.
|
* The minimum memory that JVM can allocate for heap.
|
||||||
*/
|
*/
|
||||||
private final ImmediateObjectProperty<Integer> minMemoryProperty = new ImmediateObjectProperty<>(this, "minMemory", null);
|
private final ObjectProperty<Integer> minMemoryProperty = new SimpleObjectProperty<>(this, "minMemory", null);
|
||||||
|
|
||||||
public ImmediateObjectProperty<Integer> minMemoryProperty() {
|
public ObjectProperty<Integer> minMemoryProperty() {
|
||||||
return minMemoryProperty;
|
return minMemoryProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,9 +204,9 @@ public final class VersionSetting {
|
|||||||
minMemoryProperty.set(minMemory);
|
minMemoryProperty.set(minMemory);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty preLaunchCommandProperty = new ImmediateStringProperty(this, "precalledCommand", "");
|
private final StringProperty preLaunchCommandProperty = new SimpleStringProperty(this, "precalledCommand", "");
|
||||||
|
|
||||||
public ImmediateStringProperty preLaunchCommandProperty() {
|
public StringProperty preLaunchCommandProperty() {
|
||||||
return preLaunchCommandProperty;
|
return preLaunchCommandProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,9 +224,9 @@ public final class VersionSetting {
|
|||||||
|
|
||||||
// options
|
// options
|
||||||
|
|
||||||
private final ImmediateStringProperty javaArgsProperty = new ImmediateStringProperty(this, "javaArgs", "");
|
private final StringProperty javaArgsProperty = new SimpleStringProperty(this, "javaArgs", "");
|
||||||
|
|
||||||
public ImmediateStringProperty javaArgsProperty() {
|
public StringProperty javaArgsProperty() {
|
||||||
return javaArgsProperty;
|
return javaArgsProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,9 +241,9 @@ public final class VersionSetting {
|
|||||||
javaArgsProperty.set(javaArgs);
|
javaArgsProperty.set(javaArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateStringProperty minecraftArgsProperty = new ImmediateStringProperty(this, "minecraftArgs", "");
|
private final StringProperty minecraftArgsProperty = new SimpleStringProperty(this, "minecraftArgs", "");
|
||||||
|
|
||||||
public ImmediateStringProperty minecraftArgsProperty() {
|
public StringProperty minecraftArgsProperty() {
|
||||||
return minecraftArgsProperty;
|
return minecraftArgsProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -253,9 +258,9 @@ public final class VersionSetting {
|
|||||||
minecraftArgsProperty.set(minecraftArgs);
|
minecraftArgsProperty.set(minecraftArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateBooleanProperty noJVMArgsProperty = new ImmediateBooleanProperty(this, "noJVMArgs", false);
|
private final BooleanProperty noJVMArgsProperty = new SimpleBooleanProperty(this, "noJVMArgs", false);
|
||||||
|
|
||||||
public ImmediateBooleanProperty noJVMArgsProperty() {
|
public BooleanProperty noJVMArgsProperty() {
|
||||||
return noJVMArgsProperty;
|
return noJVMArgsProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,9 +275,26 @@ public final class VersionSetting {
|
|||||||
noJVMArgsProperty.set(noJVMArgs);
|
noJVMArgsProperty.set(noJVMArgs);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateBooleanProperty notCheckGameProperty = new ImmediateBooleanProperty(this, "notCheckGame", false);
|
private final BooleanProperty notCheckJVMProperty = new SimpleBooleanProperty(this, "notCheckJVM", false);
|
||||||
|
|
||||||
public ImmediateBooleanProperty notCheckGameProperty() {
|
public BooleanProperty notCheckJVMProperty() {
|
||||||
|
return notCheckJVMProperty;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* True if HMCL does not check JVM validity.
|
||||||
|
*/
|
||||||
|
public boolean isNotCheckJVM() {
|
||||||
|
return notCheckJVMProperty.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNotCheckJVM(boolean notCheckJVM) {
|
||||||
|
notCheckJVMProperty.set(notCheckJVM);
|
||||||
|
}
|
||||||
|
|
||||||
|
private final BooleanProperty notCheckGameProperty = new SimpleBooleanProperty(this, "notCheckGame", false);
|
||||||
|
|
||||||
|
public BooleanProperty notCheckGameProperty() {
|
||||||
return notCheckGameProperty;
|
return notCheckGameProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -287,9 +309,9 @@ public final class VersionSetting {
|
|||||||
notCheckGameProperty.set(notCheckGame);
|
notCheckGameProperty.set(notCheckGame);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateBooleanProperty showLogsProperty = new ImmediateBooleanProperty(this, "showLogs", false);
|
private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false);
|
||||||
|
|
||||||
public ImmediateBooleanProperty showLogsProperty() {
|
public BooleanProperty showLogsProperty() {
|
||||||
return showLogsProperty;
|
return showLogsProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -306,14 +328,14 @@ public final class VersionSetting {
|
|||||||
|
|
||||||
// Minecraft settings.
|
// Minecraft settings.
|
||||||
|
|
||||||
private final ImmediateStringProperty serverIpProperty = new ImmediateStringProperty(this, "serverIp", "");
|
private final StringProperty serverIpProperty = new SimpleStringProperty(this, "serverIp", "");
|
||||||
|
|
||||||
public ImmediateStringProperty serverIpProperty() {
|
public StringProperty serverIpProperty() {
|
||||||
return serverIpProperty;
|
return serverIpProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The server ip that will be entered after Minecraft successfully loaded immediately.
|
* The server ip that will be entered after Minecraft successfully loaded ly.
|
||||||
*
|
*
|
||||||
* Format: ip:port or without port.
|
* Format: ip:port or without port.
|
||||||
*/
|
*/
|
||||||
@@ -326,9 +348,9 @@ public final class VersionSetting {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private final ImmediateBooleanProperty fullscreenProperty = new ImmediateBooleanProperty(this, "fullscreen", false);
|
private final BooleanProperty fullscreenProperty = new SimpleBooleanProperty(this, "fullscreen", false);
|
||||||
|
|
||||||
public ImmediateBooleanProperty fullscreenProperty() {
|
public BooleanProperty fullscreenProperty() {
|
||||||
return fullscreenProperty;
|
return fullscreenProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -343,9 +365,9 @@ public final class VersionSetting {
|
|||||||
fullscreenProperty.set(fullscreen);
|
fullscreenProperty.set(fullscreen);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final ImmediateIntegerProperty widthProperty = new ImmediateIntegerProperty(this, "width", 854);
|
private final IntegerProperty widthProperty = new SimpleIntegerProperty(this, "width", 854);
|
||||||
|
|
||||||
public ImmediateIntegerProperty widthProperty() {
|
public IntegerProperty widthProperty() {
|
||||||
return widthProperty;
|
return widthProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -365,9 +387,9 @@ public final class VersionSetting {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private final ImmediateIntegerProperty heightProperty = new ImmediateIntegerProperty(this, "height", 480);
|
private final IntegerProperty heightProperty = new SimpleIntegerProperty(this, "height", 480);
|
||||||
|
|
||||||
public ImmediateIntegerProperty heightProperty() {
|
public IntegerProperty heightProperty() {
|
||||||
return heightProperty;
|
return heightProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -390,26 +412,26 @@ public final class VersionSetting {
|
|||||||
* 0 - .minecraft<br/>
|
* 0 - .minecraft<br/>
|
||||||
* 1 - .minecraft/versions/<version>/<br/>
|
* 1 - .minecraft/versions/<version>/<br/>
|
||||||
*/
|
*/
|
||||||
private final ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty = new ImmediateObjectProperty<>(this, "gameDirType", EnumGameDirectory.ROOT_FOLDER);
|
private final ObjectProperty<GameDirectoryType> gameDirTypeProperty = new SimpleObjectProperty<>(this, "gameDirType", GameDirectoryType.ROOT_FOLDER);
|
||||||
|
|
||||||
public ImmediateObjectProperty<EnumGameDirectory> gameDirTypeProperty() {
|
public ObjectProperty<GameDirectoryType> gameDirTypeProperty() {
|
||||||
return gameDirTypeProperty;
|
return gameDirTypeProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
public EnumGameDirectory getGameDirType() {
|
public GameDirectoryType getGameDirType() {
|
||||||
return gameDirTypeProperty.get();
|
return gameDirTypeProperty.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setGameDirType(EnumGameDirectory gameDirType) {
|
public void setGameDirType(GameDirectoryType gameDirType) {
|
||||||
gameDirTypeProperty.set(gameDirType);
|
gameDirTypeProperty.set(gameDirType);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Your custom gameDir
|
* Your custom gameDir
|
||||||
*/
|
*/
|
||||||
private final ImmediateStringProperty gameDirProperty = new ImmediateStringProperty(this, "gameDir", "");
|
private final StringProperty gameDirProperty = new SimpleStringProperty(this, "gameDir", "");
|
||||||
|
|
||||||
public ImmediateStringProperty gameDirProperty() {
|
public StringProperty gameDirProperty() {
|
||||||
return gameDirProperty;
|
return gameDirProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -428,9 +450,9 @@ public final class VersionSetting {
|
|||||||
* 1 - Hide the launcher when the game starts.<br/>
|
* 1 - Hide the launcher when the game starts.<br/>
|
||||||
* 2 - Keep the launcher open.<br/>
|
* 2 - Keep the launcher open.<br/>
|
||||||
*/
|
*/
|
||||||
private final ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty = new ImmediateObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
|
private final ObjectProperty<LauncherVisibility> launcherVisibilityProperty = new SimpleObjectProperty<>(this, "launcherVisibility", LauncherVisibility.HIDE);
|
||||||
|
|
||||||
public ImmediateObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
|
public ObjectProperty<LauncherVisibility> launcherVisibilityProperty() {
|
||||||
return launcherVisibilityProperty;
|
return launcherVisibilityProperty;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -443,18 +465,25 @@ public final class VersionSetting {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public JavaVersion getJavaVersion() throws InterruptedException {
|
public JavaVersion getJavaVersion() throws InterruptedException {
|
||||||
|
return getJavaVersion(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public JavaVersion getJavaVersion(boolean checkJava) throws InterruptedException {
|
||||||
// TODO: lazy initialization may result in UI suspension.
|
// TODO: lazy initialization may result in UI suspension.
|
||||||
if (StringUtils.isBlank(getJava()))
|
if (StringUtils.isBlank(getJava()))
|
||||||
setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
|
setJava(StringUtils.isBlank(getJavaDir()) ? "Default" : "Custom");
|
||||||
if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
|
if ("Default".equals(getJava())) return JavaVersion.fromCurrentEnvironment();
|
||||||
else if (isUsesCustomJavaDir()) {
|
else if (isUsesCustomJavaDir()) {
|
||||||
try {
|
try {
|
||||||
return JavaVersion.fromExecutable(new File(getJavaDir()));
|
if (checkJava)
|
||||||
} catch (IOException e) {
|
return JavaVersion.fromExecutable(Paths.get(getJavaDir()));
|
||||||
|
else
|
||||||
|
return new JavaVersion(Paths.get(getJavaDir()), "", Platform.PLATFORM);
|
||||||
|
} catch (IOException | InvalidPathException e) {
|
||||||
return null; // Custom Java Directory not found,
|
return null; // Custom Java Directory not found,
|
||||||
}
|
}
|
||||||
} else if (StringUtils.isNotBlank(getJava())) {
|
} else if (StringUtils.isNotBlank(getJava())) {
|
||||||
List<JavaVersion> matchedJava = JavaVersion.getJREs().stream()
|
List<JavaVersion> matchedJava = JavaVersion.getJavas().stream()
|
||||||
.filter(java -> java.getVersion().equals(getJava()))
|
.filter(java -> java.getVersion().equals(getJava()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
if (matchedJava.isEmpty()) {
|
if (matchedJava.isEmpty()) {
|
||||||
@@ -487,6 +516,7 @@ public final class VersionSetting {
|
|||||||
minecraftArgsProperty.addListener(listener);
|
minecraftArgsProperty.addListener(listener);
|
||||||
noJVMArgsProperty.addListener(listener);
|
noJVMArgsProperty.addListener(listener);
|
||||||
notCheckGameProperty.addListener(listener);
|
notCheckGameProperty.addListener(listener);
|
||||||
|
notCheckJVMProperty.addListener(listener);
|
||||||
showLogsProperty.addListener(listener);
|
showLogsProperty.addListener(listener);
|
||||||
serverIpProperty.addListener(listener);
|
serverIpProperty.addListener(listener);
|
||||||
fullscreenProperty.addListener(listener);
|
fullscreenProperty.addListener(listener);
|
||||||
@@ -498,38 +528,35 @@ public final class VersionSetting {
|
|||||||
defaultJavaPathProperty.addListener(listener);
|
defaultJavaPathProperty.addListener(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public LaunchOptions toLaunchOptions(File gameDir) throws InterruptedException {
|
@Override
|
||||||
JavaVersion javaVersion = Optional.ofNullable(getJavaVersion()).orElse(JavaVersion.fromCurrentEnvironment());
|
public VersionSetting clone() {
|
||||||
return new LaunchOptions.Builder()
|
VersionSetting versionSetting = new VersionSetting();
|
||||||
.setGameDir(gameDir)
|
versionSetting.setUsesGlobal(isUsesGlobal());
|
||||||
.setJava(javaVersion)
|
versionSetting.setJava(getJava());
|
||||||
.setVersionName(Metadata.TITLE)
|
versionSetting.setDefaultJavaPath(getDefaultJavaPath());
|
||||||
.setProfileName(Metadata.TITLE)
|
versionSetting.setJavaDir(getJavaDir());
|
||||||
.setMinecraftArgs(getMinecraftArgs())
|
versionSetting.setWrapper(getWrapper());
|
||||||
.setJavaArgs(getJavaArgs())
|
versionSetting.setPermSize(getPermSize());
|
||||||
.setMaxMemory(getMaxMemory())
|
versionSetting.setMaxMemory(getMaxMemory());
|
||||||
.setMinMemory(getMinMemory())
|
versionSetting.setMinMemory(getMinMemory());
|
||||||
.setMetaspace(Lang.toIntOrNull(getPermSize()))
|
versionSetting.setPreLaunchCommand(getPreLaunchCommand());
|
||||||
.setWidth(getWidth())
|
versionSetting.setJavaArgs(getJavaArgs());
|
||||||
.setHeight(getHeight())
|
versionSetting.setMinecraftArgs(getMinecraftArgs());
|
||||||
.setFullscreen(isFullscreen())
|
versionSetting.setNoJVMArgs(isNoJVMArgs());
|
||||||
.setServerIp(getServerIp())
|
versionSetting.setNotCheckGame(isNotCheckGame());
|
||||||
.setWrapper(getWrapper())
|
versionSetting.setNotCheckJVM(isNotCheckJVM());
|
||||||
.setProxyHost(config().getProxyHost())
|
versionSetting.setShowLogs(isShowLogs());
|
||||||
.setProxyPort(config().getProxyPort())
|
versionSetting.setServerIp(getServerIp());
|
||||||
.setProxyUser(config().getProxyUser())
|
versionSetting.setFullscreen(isFullscreen());
|
||||||
.setProxyPass(config().getProxyPass())
|
versionSetting.setWidth(getWidth());
|
||||||
.setPrecalledCommand(getPreLaunchCommand())
|
versionSetting.setHeight(getHeight());
|
||||||
.setNoGeneratedJVMArgs(isNoJVMArgs())
|
versionSetting.setGameDirType(getGameDirType());
|
||||||
.create();
|
versionSetting.setGameDir(getGameDir());
|
||||||
|
versionSetting.setLauncherVisibility(getLauncherVisibility());
|
||||||
|
return versionSetting;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {
|
public static class Serializer implements JsonSerializer<VersionSetting>, JsonDeserializer<VersionSetting> {
|
||||||
public static final Serializer INSTANCE = new Serializer();
|
|
||||||
|
|
||||||
private Serializer() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public JsonElement serialize(VersionSetting src, Type typeOfSrc, JsonSerializationContext context) {
|
public JsonElement serialize(VersionSetting src, Type typeOfSrc, JsonSerializationContext context) {
|
||||||
if (src == null) return JsonNull.INSTANCE;
|
if (src == null) return JsonNull.INSTANCE;
|
||||||
@@ -551,6 +578,7 @@ public final class VersionSetting {
|
|||||||
obj.addProperty("fullscreen", src.isFullscreen());
|
obj.addProperty("fullscreen", src.isFullscreen());
|
||||||
obj.addProperty("noJVMArgs", src.isNoJVMArgs());
|
obj.addProperty("noJVMArgs", src.isNoJVMArgs());
|
||||||
obj.addProperty("notCheckGame", src.isNotCheckGame());
|
obj.addProperty("notCheckGame", src.isNotCheckGame());
|
||||||
|
obj.addProperty("notCheckJVM", src.isNotCheckJVM());
|
||||||
obj.addProperty("showLogs", src.isShowLogs());
|
obj.addProperty("showLogs", src.isShowLogs());
|
||||||
obj.addProperty("gameDir", src.getGameDir());
|
obj.addProperty("gameDir", src.getGameDir());
|
||||||
obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
|
obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal());
|
||||||
@@ -562,7 +590,7 @@ public final class VersionSetting {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||||
if (json == null || json == JsonNull.INSTANCE || !(json instanceof JsonObject))
|
if (json == JsonNull.INSTANCE || !(json instanceof JsonObject))
|
||||||
return null;
|
return null;
|
||||||
JsonObject obj = (JsonObject) json;
|
JsonObject obj = (JsonObject) json;
|
||||||
|
|
||||||
@@ -588,9 +616,10 @@ public final class VersionSetting {
|
|||||||
vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
|
vs.setFullscreen(Optional.ofNullable(obj.get("fullscreen")).map(JsonElement::getAsBoolean).orElse(false));
|
||||||
vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
|
vs.setNoJVMArgs(Optional.ofNullable(obj.get("noJVMArgs")).map(JsonElement::getAsBoolean).orElse(false));
|
||||||
vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
|
vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false));
|
||||||
|
vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false));
|
||||||
vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
|
vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false));
|
||||||
vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
|
vs.setLauncherVisibility(LauncherVisibility.values()[Optional.ofNullable(obj.get("launcherVisibility")).map(JsonElement::getAsInt).orElse(1)]);
|
||||||
vs.setGameDirType(EnumGameDirectory.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
|
vs.setGameDirType(GameDirectoryType.values()[Optional.ofNullable(obj.get("gameDirType")).map(JsonElement::getAsInt).orElse(0)]);
|
||||||
vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
|
vs.setDefaultJavaPath(Optional.ofNullable(obj.get("defaultJavaPath")).map(JsonElement::getAsString).orElse(null));
|
||||||
|
|
||||||
return vs;
|
return vs;
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
|
||||||
|
public class AwtUtils {
|
||||||
|
public static void setAppleIcon(Image image) {
|
||||||
|
try {
|
||||||
|
Class<?> taskbarClass = Class.forName("java.awt.TaskBar");
|
||||||
|
Method getTaskBarMethod = taskbarClass.getDeclaredMethod("getTaskBar");
|
||||||
|
Object taskBar = getTaskBarMethod.invoke(null);
|
||||||
|
Method setIconImageMethod = taskbarClass.getDeclaredMethod("setIconImage", Image.class);
|
||||||
|
setIconImageMethod.invoke(taskBar, image);
|
||||||
|
} catch (Throwable ignore) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,50 +13,57 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import javafx.beans.property.DoubleProperty;
|
||||||
|
import javafx.beans.property.SimpleDoubleProperty;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.layout.Region;
|
import javafx.scene.layout.Region;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
import javafx.stage.StageStyle;
|
||||||
import org.jackhuang.hmcl.Launcher;
|
import org.jackhuang.hmcl.Launcher;
|
||||||
import org.jackhuang.hmcl.Metadata;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
import org.jackhuang.hmcl.setting.Accounts;
|
import org.jackhuang.hmcl.download.java.JavaRepository;
|
||||||
import org.jackhuang.hmcl.setting.Profiles;
|
import org.jackhuang.hmcl.setting.EnumCommonDirectory;
|
||||||
import org.jackhuang.hmcl.task.Task;
|
import org.jackhuang.hmcl.task.Task;
|
||||||
import org.jackhuang.hmcl.task.TaskExecutor;
|
import org.jackhuang.hmcl.task.TaskExecutor;
|
||||||
import org.jackhuang.hmcl.ui.account.AccountList;
|
|
||||||
import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
|
import org.jackhuang.hmcl.ui.account.AuthlibInjectorServersPage;
|
||||||
|
import org.jackhuang.hmcl.ui.account.MicrosoftAccountLoginStage;
|
||||||
|
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
|
||||||
import org.jackhuang.hmcl.ui.construct.InputDialogPane;
|
import org.jackhuang.hmcl.ui.construct.InputDialogPane;
|
||||||
import org.jackhuang.hmcl.ui.construct.MessageBox;
|
|
||||||
import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
|
import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.PromptDialogPane;
|
||||||
import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
|
import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
|
||||||
import org.jackhuang.hmcl.ui.decorator.DecoratorController;
|
import org.jackhuang.hmcl.ui.decorator.DecoratorController;
|
||||||
import org.jackhuang.hmcl.ui.profile.ProfileList;
|
import org.jackhuang.hmcl.ui.main.RootPage;
|
||||||
import org.jackhuang.hmcl.ui.versions.GameList;
|
|
||||||
import org.jackhuang.hmcl.ui.versions.VersionPage;
|
import org.jackhuang.hmcl.ui.versions.VersionPage;
|
||||||
import org.jackhuang.hmcl.util.FutureCallback;
|
import org.jackhuang.hmcl.util.FutureCallback;
|
||||||
import org.jackhuang.hmcl.util.JavaVersion;
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.platform.JavaVersion;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.newImage;
|
||||||
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public final class Controllers {
|
public final class Controllers {
|
||||||
|
private static DoubleProperty stageWidth = new SimpleDoubleProperty();
|
||||||
|
private static DoubleProperty stageHeight = new SimpleDoubleProperty();
|
||||||
|
|
||||||
private static Scene scene;
|
private static Scene scene;
|
||||||
private static Stage stage;
|
private static Stage stage;
|
||||||
private static MainPage mainPage = null;
|
|
||||||
private static SettingsPage settingsPage = null;
|
|
||||||
private static VersionPage versionPage = null;
|
private static VersionPage versionPage = null;
|
||||||
private static GameList gameListPage = null;
|
|
||||||
private static AccountList accountListPage = null;
|
|
||||||
private static ProfileList profileListPage = null;
|
|
||||||
private static AuthlibInjectorServersPage serversPage = null;
|
private static AuthlibInjectorServersPage serversPage = null;
|
||||||
private static LeftPaneController leftPaneController;
|
private static RootPage rootPage;
|
||||||
private static DecoratorController decorator;
|
private static DecoratorController decorator;
|
||||||
|
|
||||||
public static Scene getScene() {
|
public static Scene getScene() {
|
||||||
@@ -67,40 +74,6 @@ public final class Controllers {
|
|||||||
return stage;
|
return stage;
|
||||||
}
|
}
|
||||||
|
|
||||||
// FXThread
|
|
||||||
public static SettingsPage getSettingsPage() {
|
|
||||||
if (settingsPage == null)
|
|
||||||
settingsPage = new SettingsPage();
|
|
||||||
return settingsPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
// FXThread
|
|
||||||
public static GameList getGameListPage() {
|
|
||||||
if (gameListPage == null)
|
|
||||||
gameListPage = new GameList();
|
|
||||||
return gameListPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
// FXThread
|
|
||||||
public static AccountList getAccountListPage() {
|
|
||||||
if (accountListPage == null) {
|
|
||||||
accountListPage = new AccountList();
|
|
||||||
accountListPage.selectedAccountProperty().bindBidirectional(Accounts.selectedAccountProperty());
|
|
||||||
accountListPage.accountsProperty().bindContent(Accounts.accountsProperty());
|
|
||||||
}
|
|
||||||
return accountListPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
// FXThread
|
|
||||||
public static ProfileList getProfileListPage() {
|
|
||||||
if (profileListPage == null) {
|
|
||||||
profileListPage = new ProfileList();
|
|
||||||
profileListPage.selectedProfileProperty().bindBidirectional(Profiles.selectedProfileProperty());
|
|
||||||
profileListPage.profilesProperty().bindContent(Profiles.profilesProperty());
|
|
||||||
}
|
|
||||||
return profileListPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
// FXThread
|
// FXThread
|
||||||
public static VersionPage getVersionPage() {
|
public static VersionPage getVersionPage() {
|
||||||
if (versionPage == null)
|
if (versionPage == null)
|
||||||
@@ -108,6 +81,13 @@ public final class Controllers {
|
|||||||
return versionPage;
|
return versionPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FXThread
|
||||||
|
public static RootPage getRootPage() {
|
||||||
|
if (rootPage == null)
|
||||||
|
rootPage = new RootPage();
|
||||||
|
return rootPage;
|
||||||
|
}
|
||||||
|
|
||||||
// FXThread
|
// FXThread
|
||||||
public static AuthlibInjectorServersPage getServersPage() {
|
public static AuthlibInjectorServersPage getServersPage() {
|
||||||
if (serversPage == null)
|
if (serversPage == null)
|
||||||
@@ -120,32 +100,46 @@ public final class Controllers {
|
|||||||
return decorator;
|
return decorator;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static MainPage getMainPage() {
|
public static void onApplicationStop() {
|
||||||
if (mainPage == null)
|
config().setHeight(stageHeight.get());
|
||||||
mainPage = new MainPage();
|
config().setWidth(stageWidth.get());
|
||||||
return mainPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LeftPaneController getLeftPaneController() {
|
|
||||||
return leftPaneController;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void initialize(Stage stage) {
|
public static void initialize(Stage stage) {
|
||||||
|
Logging.LOG.info("Start initializing application");
|
||||||
|
|
||||||
Controllers.stage = stage;
|
Controllers.stage = stage;
|
||||||
|
MicrosoftAccountLoginStage.INSTANCE.initOwner(stage);
|
||||||
|
|
||||||
|
stage.setHeight(config().getHeight());
|
||||||
|
stageHeight.bind(stage.heightProperty());
|
||||||
|
stage.setWidth(config().getWidth());
|
||||||
|
stageWidth.bind(stage.widthProperty());
|
||||||
|
|
||||||
stage.setOnCloseRequest(e -> Launcher.stopApplication());
|
stage.setOnCloseRequest(e -> Launcher.stopApplication());
|
||||||
|
|
||||||
decorator = new DecoratorController(stage, getMainPage());
|
decorator = new DecoratorController(stage, getRootPage());
|
||||||
leftPaneController = new LeftPaneController();
|
|
||||||
decorator.getDecorator().drawerProperty().setAll(leftPaneController);
|
|
||||||
|
|
||||||
Task.of(JavaVersion::initialize).start();
|
if (config().getCommonDirType() == EnumCommonDirectory.CUSTOM &&
|
||||||
|
!FileUtils.canCreateDirectory(config().getCommonDirectory())) {
|
||||||
|
config().setCommonDirType(EnumCommonDirectory.DEFAULT);
|
||||||
|
dialog(i18n("launcher.cache_directory.invalid"));
|
||||||
|
}
|
||||||
|
|
||||||
scene = new Scene(decorator.getDecorator(), 800, 519);
|
Task.runAsync(JavaVersion::initialize).thenRunAsync(JavaRepository::initialize).start();
|
||||||
|
|
||||||
|
scene = new Scene(decorator.getDecorator());
|
||||||
|
scene.setFill(Color.TRANSPARENT);
|
||||||
|
stage.setMinHeight(482 + 32);
|
||||||
|
stage.setMinWidth(802 + 32);
|
||||||
|
decorator.getDecorator().prefWidthProperty().bind(scene.widthProperty());
|
||||||
|
decorator.getDecorator().prefHeightProperty().bind(scene.heightProperty());
|
||||||
scene.getStylesheets().setAll(config().getTheme().getStylesheets());
|
scene.getStylesheets().setAll(config().getTheme().getStylesheets());
|
||||||
|
|
||||||
stage.getIcons().add(new Image("/assets/img/icon.png"));
|
stage.getIcons().add(newImage("/assets/img/icon.png"));
|
||||||
stage.setTitle(Metadata.TITLE);
|
stage.setTitle(Metadata.TITLE);
|
||||||
|
stage.initStyle(StageStyle.TRANSPARENT);
|
||||||
|
stage.setScene(scene);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void dialog(Region content) {
|
public static void dialog(Region content) {
|
||||||
@@ -158,42 +152,51 @@ public final class Controllers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void dialog(String text, String title) {
|
public static void dialog(String text, String title) {
|
||||||
dialog(text, title, MessageBox.INFORMATION_MESSAGE);
|
dialog(text, title, MessageType.INFORMATION);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void dialog(String text, String title, int type) {
|
public static void dialog(String text, String title, MessageType type) {
|
||||||
dialog(text, title, type, null);
|
dialog(text, title, type, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void dialog(String text, String title, int type, Runnable onAccept) {
|
public static void dialog(String text, String title, MessageType type, Runnable onAccept) {
|
||||||
dialog(new MessageDialogPane(text, title, type, onAccept));
|
dialog(new MessageDialogPane(text, title, type, onAccept));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void confirmDialog(String text, String title, Runnable onAccept, Runnable onCancel) {
|
public static void confirm(String text, String title, Runnable onAccept, Runnable onCancel) {
|
||||||
dialog(new MessageDialogPane(text, title, onAccept, onCancel));
|
dialog(new MessageDialogPane(text, title, onAccept, onCancel));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
|
public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult) {
|
||||||
InputDialogPane pane = new InputDialogPane(text, onResult);
|
return prompt(title, onResult, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CompletableFuture<String> prompt(String title, FutureCallback<String> onResult, String initialValue) {
|
||||||
|
InputDialogPane pane = new InputDialogPane(title, initialValue, onResult);
|
||||||
dialog(pane);
|
dialog(pane);
|
||||||
return pane;
|
return pane.getCompletableFuture();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
|
public static CompletableFuture<List<PromptDialogPane.Builder.Question<?>>> prompt(PromptDialogPane.Builder builder) {
|
||||||
return taskDialog(executor, title, subtitle, null);
|
PromptDialogPane pane = new PromptDialogPane(builder);
|
||||||
|
dialog(pane);
|
||||||
|
return pane.getCompletableFuture();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Region taskDialog(TaskExecutor executor, String title, String subtitle, Consumer<Region> onCancel) {
|
public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title) {
|
||||||
|
return taskDialog(executor, title, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TaskExecutorDialogPane taskDialog(TaskExecutor executor, String title, Consumer<Region> onCancel) {
|
||||||
TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
|
TaskExecutorDialogPane pane = new TaskExecutorDialogPane(onCancel);
|
||||||
pane.setTitle(title);
|
pane.setTitle(title);
|
||||||
pane.setSubtitle(subtitle);
|
|
||||||
pane.setExecutor(executor);
|
pane.setExecutor(executor);
|
||||||
dialog(pane);
|
dialog(pane);
|
||||||
return pane;
|
return pane;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void navigate(Node node) {
|
public static void navigate(Node node) {
|
||||||
decorator.getNavigator().navigate(node);
|
decorator.getNavigator().navigate(node, ContainerAnimations.FADE.getAnimationProducer());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isStopped() {
|
public static boolean isStopped() {
|
||||||
@@ -201,15 +204,11 @@ public final class Controllers {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void shutdown() {
|
public static void shutdown() {
|
||||||
mainPage = null;
|
rootPage = null;
|
||||||
settingsPage = null;
|
|
||||||
versionPage = null;
|
versionPage = null;
|
||||||
serversPage = null;
|
serversPage = null;
|
||||||
decorator = null;
|
decorator = null;
|
||||||
stage = null;
|
stage = null;
|
||||||
scene = null;
|
scene = null;
|
||||||
gameListPage = null;
|
|
||||||
accountListPage = null;
|
|
||||||
profileListPage = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
@@ -22,7 +22,6 @@ import javafx.scene.Scene;
|
|||||||
import javafx.scene.control.Button;
|
import javafx.scene.control.Button;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.TextArea;
|
import javafx.scene.control.TextArea;
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
@@ -30,6 +29,7 @@ import javafx.stage.Stage;
|
|||||||
import org.jackhuang.hmcl.Metadata;
|
import org.jackhuang.hmcl.Metadata;
|
||||||
import org.jackhuang.hmcl.upgrade.UpdateChecker;
|
import org.jackhuang.hmcl.upgrade.UpdateChecker;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.newImage;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -67,7 +67,7 @@ public class CrashWindow extends Stage {
|
|||||||
|
|
||||||
Scene scene = new Scene(pane, 800, 480);
|
Scene scene = new Scene(pane, 800, 480);
|
||||||
setScene(scene);
|
setScene(scene);
|
||||||
getIcons().add(new Image("/assets/img/icon.png"));
|
getIcons().add(newImage("/assets/img/icon.png"));
|
||||||
setTitle(i18n("message.error"));
|
setTitle(i18n("message.error"));
|
||||||
|
|
||||||
setOnCloseRequest(e -> System.exit(1));
|
setOnCloseRequest(e -> System.exit(1));
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,28 +13,30 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
import org.jackhuang.hmcl.auth.Account;
|
||||||
import org.jackhuang.hmcl.auth.AuthInfo;
|
import org.jackhuang.hmcl.auth.AuthInfo;
|
||||||
|
import org.jackhuang.hmcl.auth.AuthenticationException;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
||||||
import org.jackhuang.hmcl.task.SilentException;
|
|
||||||
import org.jackhuang.hmcl.ui.account.AccountLoginPane;
|
import org.jackhuang.hmcl.ui.account.AccountLoginPane;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.concurrent.CancellationException;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
|
||||||
|
|
||||||
public final class DialogController {
|
public final class DialogController {
|
||||||
|
|
||||||
public static AuthInfo logIn(Account account) throws Exception {
|
public static AuthInfo logIn(Account account) throws CancellationException, AuthenticationException, InterruptedException {
|
||||||
if (account instanceof YggdrasilAccount) {
|
if (account instanceof YggdrasilAccount) {
|
||||||
CountDownLatch latch = new CountDownLatch(1);
|
CountDownLatch latch = new CountDownLatch(1);
|
||||||
AtomicReference<AuthInfo> res = new AtomicReference<>(null);
|
AtomicReference<AuthInfo> res = new AtomicReference<>(null);
|
||||||
JFXUtilities.runInFX(() -> {
|
runInFX(() -> {
|
||||||
AccountLoginPane pane = new AccountLoginPane(account, it -> {
|
AccountLoginPane pane = new AccountLoginPane(account, it -> {
|
||||||
res.set(it);
|
res.set(it);
|
||||||
latch.countDown();
|
latch.countDown();
|
||||||
@@ -42,7 +44,7 @@ public final class DialogController {
|
|||||||
Controllers.dialog(pane);
|
Controllers.dialog(pane);
|
||||||
});
|
});
|
||||||
latch.await();
|
latch.await();
|
||||||
return Optional.ofNullable(res.get()).orElseThrow(SilentException::new);
|
return Optional.ofNullable(res.get()).orElseThrow(CancellationException::new);
|
||||||
}
|
}
|
||||||
return account.logIn();
|
return account.logIn();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,15 +13,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import com.jfoenix.controls.*;
|
import com.jfoenix.controls.*;
|
||||||
import javafx.animation.Animation;
|
|
||||||
import javafx.animation.Interpolator;
|
import javafx.animation.Interpolator;
|
||||||
import javafx.animation.KeyFrame;
|
import javafx.animation.KeyFrame;
|
||||||
|
import javafx.animation.KeyValue;
|
||||||
import javafx.animation.Timeline;
|
import javafx.animation.Timeline;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.beans.InvalidationListener;
|
import javafx.beans.InvalidationListener;
|
||||||
@@ -29,32 +28,43 @@ import javafx.beans.property.Property;
|
|||||||
import javafx.beans.value.ChangeListener;
|
import javafx.beans.value.ChangeListener;
|
||||||
import javafx.beans.value.ObservableValue;
|
import javafx.beans.value.ObservableValue;
|
||||||
import javafx.beans.value.WeakChangeListener;
|
import javafx.beans.value.WeakChangeListener;
|
||||||
import javafx.event.EventHandler;
|
import javafx.beans.value.WritableValue;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.*;
|
import javafx.scene.control.*;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
import javafx.scene.image.ImageView;
|
import javafx.scene.image.ImageView;
|
||||||
import javafx.scene.input.MouseEvent;
|
import javafx.scene.input.TransferMode;
|
||||||
import javafx.scene.input.ScrollEvent;
|
|
||||||
import javafx.scene.layout.Region;
|
import javafx.scene.layout.Region;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
import javafx.scene.shape.Rectangle;
|
import javafx.scene.shape.Rectangle;
|
||||||
import javafx.util.Callback;
|
import javafx.util.Callback;
|
||||||
import javafx.util.Duration;
|
import javafx.util.Duration;
|
||||||
import javafx.util.StringConverter;
|
import javafx.util.StringConverter;
|
||||||
import org.jackhuang.hmcl.util.*;
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
|
import org.jackhuang.hmcl.util.ResourceNotFoundError;
|
||||||
import org.jackhuang.hmcl.util.i18n.I18n;
|
import org.jackhuang.hmcl.util.i18n.I18n;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.ExtendedProperties;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.SafeStringConverter;
|
||||||
|
import org.jackhuang.hmcl.util.platform.OperatingSystem;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileFilter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.io.UncheckedIOException;
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.List;
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
import java.util.Objects;
|
||||||
|
import java.util.function.BooleanSupplier;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.function.Supplier;
|
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.Lang.thread;
|
import static org.jackhuang.hmcl.util.Lang.thread;
|
||||||
import static org.jackhuang.hmcl.util.Lang.tryCast;
|
import static org.jackhuang.hmcl.util.Lang.tryCast;
|
||||||
@@ -63,6 +73,14 @@ public final class FXUtils {
|
|||||||
private FXUtils() {
|
private FXUtils() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void runInFX(Runnable runnable) {
|
||||||
|
if (Platform.isFxApplicationThread()) {
|
||||||
|
runnable.run();
|
||||||
|
} else {
|
||||||
|
Platform.runLater(runnable);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void checkFxUserThread() {
|
public static void checkFxUserThread() {
|
||||||
if (!Platform.isFxApplicationThread()) {
|
if (!Platform.isFxApplicationThread()) {
|
||||||
throw new IllegalStateException("Not on FX application thread; currentThread = "
|
throw new IllegalStateException("Not on FX application thread; currentThread = "
|
||||||
@@ -78,18 +96,25 @@ public final class FXUtils {
|
|||||||
value.addListener((a, b, c) -> consumer.accept(c));
|
value.addListener((a, b, c) -> consumer.accept(c));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> void onWeakChange(ObservableValue<T> value, Consumer<T> consumer) {
|
public static <T> WeakChangeListener<T> onWeakChange(ObservableValue<T> value, Consumer<T> consumer) {
|
||||||
value.addListener(new WeakChangeListener<>((a, b, c) -> consumer.accept(c)));
|
WeakChangeListener<T> listener = new WeakChangeListener<>((a, b, c) -> consumer.accept(c));
|
||||||
|
value.addListener(listener);
|
||||||
|
return listener;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> void onChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
|
public static <T> void onChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
|
||||||
onChange(value, consumer);
|
|
||||||
consumer.accept(value.getValue());
|
consumer.accept(value.getValue());
|
||||||
|
onChange(value, consumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> void onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
|
public static <T> WeakChangeListener<T> onWeakChangeAndOperate(ObservableValue<T> value, Consumer<T> consumer) {
|
||||||
onWeakChange(value, consumer);
|
|
||||||
consumer.accept(value.getValue());
|
consumer.accept(value.getValue());
|
||||||
|
return onWeakChange(value, consumer);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void runLaterIf(BooleanSupplier condition, Runnable runnable) {
|
||||||
|
if (condition.getAsBoolean()) Platform.runLater(() -> runLaterIf(condition, runnable));
|
||||||
|
else runnable.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void limitSize(ImageView imageView, double maxWidth, double maxHeight) {
|
public static void limitSize(ImageView imageView, double maxWidth, double maxHeight) {
|
||||||
@@ -137,6 +162,20 @@ public final class FXUtils {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static <K, T> void setupCellValueFactory(JFXTreeTableColumn<K, T> column, Function<K, ObservableValue<T>> mapper) {
|
||||||
|
column.setCellValueFactory(param -> {
|
||||||
|
if (column.validateValue(param))
|
||||||
|
return mapper.apply(param.getValue().getValue());
|
||||||
|
else
|
||||||
|
return column.getComputedValue(param);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node wrapMargin(Node node, Insets insets) {
|
||||||
|
StackPane.setMargin(node, insets);
|
||||||
|
return new StackPane(node);
|
||||||
|
}
|
||||||
|
|
||||||
public static void setValidateWhileTextChanged(Node field, boolean validate) {
|
public static void setValidateWhileTextChanged(Node field, boolean validate) {
|
||||||
if (field instanceof JFXTextField) {
|
if (field instanceof JFXTextField) {
|
||||||
if (validate) {
|
if (validate) {
|
||||||
@@ -160,19 +199,19 @@ public final class FXUtils {
|
|||||||
return field.getProperties().containsKey("FXUtils.validation");
|
return field.getProperties().containsKey("FXUtils.validation");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setOverflowHidden(Region region, boolean hidden) {
|
public static Rectangle setOverflowHidden(Region region) {
|
||||||
if (hidden) {
|
Rectangle rectangle = new Rectangle();
|
||||||
Rectangle rectangle = new Rectangle();
|
rectangle.widthProperty().bind(region.widthProperty());
|
||||||
rectangle.widthProperty().bind(region.widthProperty());
|
rectangle.heightProperty().bind(region.heightProperty());
|
||||||
rectangle.heightProperty().bind(region.heightProperty());
|
region.setClip(rectangle);
|
||||||
region.setClip(rectangle);
|
return rectangle;
|
||||||
} else {
|
|
||||||
region.setClip(null);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean getOverflowHidden(Region region) {
|
public static Rectangle setOverflowHidden(Region region, double arc) {
|
||||||
return region.getClip() != null;
|
Rectangle rectangle = setOverflowHidden(region);
|
||||||
|
rectangle.setArcWidth(arc);
|
||||||
|
rectangle.setArcHeight(arc);
|
||||||
|
return rectangle;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setLimitWidth(Region region, double width) {
|
public static void setLimitWidth(Region region, double width) {
|
||||||
@@ -195,6 +234,14 @@ public final class FXUtils {
|
|||||||
return region.getMaxHeight();
|
return region.getMaxHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Node limitingSize(Node node, double width, double height) {
|
||||||
|
StackPane pane = new StackPane(node);
|
||||||
|
pane.setAlignment(Pos.CENTER);
|
||||||
|
FXUtils.setLimitWidth(pane, width);
|
||||||
|
FXUtils.setLimitHeight(pane, height);
|
||||||
|
return pane;
|
||||||
|
}
|
||||||
|
|
||||||
public static void smoothScrolling(ScrollPane scrollPane) {
|
public static void smoothScrolling(ScrollPane scrollPane) {
|
||||||
JFXScrollPane.smoothScrolling(scrollPane);
|
JFXScrollPane.smoothScrolling(scrollPane);
|
||||||
}
|
}
|
||||||
@@ -203,15 +250,31 @@ public final class FXUtils {
|
|||||||
FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
|
FXMLLoader loader = new FXMLLoader(node.getClass().getResource(absolutePath), I18n.getResourceBundle());
|
||||||
loader.setRoot(node);
|
loader.setRoot(node);
|
||||||
loader.setController(node);
|
loader.setController(node);
|
||||||
Lang.invoke((ExceptionalSupplier<Object, IOException>) loader::load);
|
try {
|
||||||
|
loader.load();
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new UncheckedIOException(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void installTooltip(Node node, String tooltip) {
|
public static void installFastTooltip(Node node, Tooltip tooltip) {
|
||||||
installTooltip(node, 0, 5000, 0, new Tooltip(tooltip));
|
installTooltip(node, 50, 5000, 0, tooltip);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void installFastTooltip(Node node, String tooltip) {
|
||||||
|
installFastTooltip(node, new Tooltip(tooltip));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void installSlowTooltip(Node node, Tooltip tooltip) {
|
||||||
|
installTooltip(node, 500, 5000, 0, tooltip);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void installSlowTooltip(Node node, String tooltip) {
|
||||||
|
installSlowTooltip(node, new Tooltip(tooltip));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
|
public static void installTooltip(Node node, double openDelay, double visibleDelay, double closeDelay, Tooltip tooltip) {
|
||||||
JFXUtilities.runInFX(() -> {
|
runInFX(() -> {
|
||||||
try {
|
try {
|
||||||
// Java 8
|
// Java 8
|
||||||
Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
|
Class<?> behaviorClass = Class.forName("javafx.scene.control.Tooltip$TooltipBehavior");
|
||||||
@@ -236,6 +299,27 @@ public final class FXUtils {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void playAnimation(Node node, String animationKey, Timeline timeline) {
|
||||||
|
animationKey = "FXUTILS.ANIMATION." + animationKey;
|
||||||
|
Object oldTimeline = node.getProperties().get(animationKey);
|
||||||
|
if (oldTimeline instanceof Timeline) ((Timeline) oldTimeline).stop();
|
||||||
|
if (timeline != null) timeline.play();
|
||||||
|
node.getProperties().put(animationKey, timeline);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static <T> void playAnimation(Node node, String animationKey, Duration duration, WritableValue<T> property, T from, T to, Interpolator interpolator) {
|
||||||
|
if (from == null) from = property.getValue();
|
||||||
|
if (duration == null || Objects.equals(duration, Duration.ZERO) || Objects.equals(from, to)) {
|
||||||
|
playAnimation(node, animationKey, null);
|
||||||
|
property.setValue(to);
|
||||||
|
} else {
|
||||||
|
playAnimation(node, animationKey, new Timeline(
|
||||||
|
new KeyFrame(Duration.ZERO, new KeyValue(property, from, interpolator)),
|
||||||
|
new KeyFrame(duration, new KeyValue(property, to, interpolator))
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void openFolder(File file) {
|
public static void openFolder(File file) {
|
||||||
if (!FileUtils.makeDirectory(file)) {
|
if (!FileUtils.makeDirectory(file)) {
|
||||||
Logging.LOG.log(Level.SEVERE, "Unable to make directory " + file);
|
Logging.LOG.log(Level.SEVERE, "Unable to make directory " + file);
|
||||||
@@ -291,7 +375,7 @@ public final class FXUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void bindInt(JFXTextField textField, Property<Number> property) {
|
public static void bindInt(JFXTextField textField, Property<Number> property) {
|
||||||
textField.textProperty().bindBidirectional(property, SafeIntStringConverter.INSTANCE);
|
textField.textProperty().bindBidirectional(property, SafeStringConverter.fromInteger());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void unbindInt(JFXTextField textField, Property<Number> property) {
|
public static void unbindInt(JFXTextField textField, Property<Number> property) {
|
||||||
@@ -328,11 +412,11 @@ public final class FXUtils {
|
|||||||
* @param comboBox the combo box being bound with {@code property}.
|
* @param comboBox the combo box being bound with {@code property}.
|
||||||
* @param property the property being bound with {@code combo box}.
|
* @param property the property being bound with {@code combo box}.
|
||||||
* @see #unbindEnum(JFXComboBox)
|
* @see #unbindEnum(JFXComboBox)
|
||||||
* @deprecated Use {@link SelectionModelSelectedItemProperty#selectedItemPropertyFor(ComboBox)}
|
* @deprecated Use {@link ExtendedProperties#selectedItemPropertyFor(ComboBox)}
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum> property) {
|
public static void bindEnum(JFXComboBox<?> comboBox, Property<? extends Enum<?>> property) {
|
||||||
unbindEnum(comboBox);
|
unbindEnum(comboBox);
|
||||||
ChangeListener<Number> listener = (a, b, newValue) ->
|
ChangeListener<Number> listener = (a, b, newValue) ->
|
||||||
((Property) property).setValue(property.getValue().getClass().getEnumConstants()[newValue.intValue()]);
|
((Property) property).setValue(property.getValue().getClass().getEnumConstants()[newValue.intValue()]);
|
||||||
@@ -355,70 +439,47 @@ public final class FXUtils {
|
|||||||
comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
|
comboBox.getSelectionModel().selectedIndexProperty().removeListener(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void smoothScrolling(ListView<?> listView) {
|
/**
|
||||||
listView.skinProperty().addListener(o -> {
|
* Suppress IllegalArgumentException since the url is supposed to be correct definitely.
|
||||||
ScrollBar bar = (ScrollBar) listView.lookup(".scroll-bar");
|
* @param url the url of image. The image resource should be a file within the jar.
|
||||||
Node virtualFlow = listView.lookup(".virtual-flow");
|
* @return the image resource within the jar.
|
||||||
double[] frictions = new double[]{0.99, 0.1, 0.05, 0.04, 0.03, 0.02, 0.01, 0.04, 0.01, 0.008, 0.008, 0.008, 0.008, 0.0006, 0.0005, 0.00003, 0.00001};
|
* @see org.jackhuang.hmcl.util.CrashReporter
|
||||||
double[] pushes = new double[]{1};
|
* @see ResourceNotFoundError
|
||||||
double[] derivatives = new double[frictions.length];
|
*/
|
||||||
|
public static Image newImage(String url) {
|
||||||
Timeline timeline = new Timeline();
|
try {
|
||||||
bar.addEventHandler(MouseEvent.DRAG_DETECTED, e -> timeline.stop());
|
return new Image(url);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
EventHandler<ScrollEvent> scrollEventHandler = event -> {
|
throw new ResourceNotFoundError("Cannot access image: " + url, e);
|
||||||
if (event.getEventType() == ScrollEvent.SCROLL) {
|
}
|
||||||
int direction = event.getDeltaY() > 0 ? -1 : 1;
|
|
||||||
for (int i = 0; i < pushes.length; ++i)
|
|
||||||
derivatives[i] += direction * pushes[i];
|
|
||||||
if (timeline.getStatus() == Animation.Status.STOPPED)
|
|
||||||
timeline.play();
|
|
||||||
event.consume();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
bar.addEventHandler(ScrollEvent.ANY, scrollEventHandler);
|
|
||||||
virtualFlow.setOnScroll(scrollEventHandler);
|
|
||||||
|
|
||||||
timeline.getKeyFrames().add(new KeyFrame(Duration.millis(3), event -> {
|
|
||||||
for (int i = 0; i < derivatives.length; ++i)
|
|
||||||
derivatives[i] *= frictions[i];
|
|
||||||
for (int i = 1; i < derivatives.length; ++i)
|
|
||||||
derivatives[i] += derivatives[i - 1];
|
|
||||||
double dy = derivatives[derivatives.length - 1];
|
|
||||||
double height = listView.getLayoutBounds().getHeight();
|
|
||||||
bar.setValue(Math.min(Math.max(bar.getValue() + dy / height, 0), 1));
|
|
||||||
if (Math.abs(dy) < 0.001)
|
|
||||||
timeline.stop();
|
|
||||||
listView.requestLayout();
|
|
||||||
}));
|
|
||||||
timeline.setCycleCount(Animation.INDEFINITE);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> T runInUIThread(Supplier<T> supplier) {
|
public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback) {
|
||||||
if (javafx.application.Platform.isFxApplicationThread()) {
|
applyDragListener(node, filter, callback, null);
|
||||||
return supplier.get();
|
}
|
||||||
} else {
|
|
||||||
CountDownLatch doneLatch = new CountDownLatch(1);
|
|
||||||
AtomicReference<T> reference = new AtomicReference<>();
|
|
||||||
Platform.runLater(() -> {
|
|
||||||
try {
|
|
||||||
reference.set(supplier.get());
|
|
||||||
} finally {
|
|
||||||
doneLatch.countDown();
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
public static void applyDragListener(Node node, FileFilter filter, Consumer<List<File>> callback, Runnable dragDropped) {
|
||||||
|
node.setOnDragOver(event -> {
|
||||||
try {
|
if (event.getGestureSource() != node && event.getDragboard().hasFiles()) {
|
||||||
doneLatch.await();
|
if (event.getDragboard().getFiles().stream().anyMatch(filter::accept))
|
||||||
} catch (InterruptedException var3) {
|
event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
}
|
}
|
||||||
|
event.consume();
|
||||||
|
});
|
||||||
|
|
||||||
return reference.get();
|
node.setOnDragDropped(event -> {
|
||||||
}
|
List<File> files = event.getDragboard().getFiles();
|
||||||
|
if (files != null) {
|
||||||
|
List<File> acceptFiles = files.stream().filter(filter::accept).collect(Collectors.toList());
|
||||||
|
if (!acceptFiles.isEmpty()) {
|
||||||
|
callback.accept(acceptFiles);
|
||||||
|
event.setDropCompleted(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (dragDropped != null)
|
||||||
|
dragDropped.run();
|
||||||
|
event.consume();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T> StringConverter<T> stringConverter(Function<T, String> func) {
|
public static <T> StringConverter<T> stringConverter(Function<T, String> func) {
|
||||||
@@ -442,6 +503,7 @@ public final class FXUtils {
|
|||||||
public void updateItem(T item, boolean empty) {
|
public void updateItem(T item, boolean empty) {
|
||||||
super.updateItem(item, empty);
|
super.updateItem(item, empty);
|
||||||
if (!empty) {
|
if (!empty) {
|
||||||
|
setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
|
||||||
setGraphic(graphicBuilder.apply(item));
|
setGraphic(graphicBuilder.apply(item));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -459,4 +521,11 @@ public final class FXUtils {
|
|||||||
return "Interpolator.SINE";
|
return "Interpolator.SINE";
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public static Runnable withJFXPopupClosing(Runnable runnable, JFXPopup popup) {
|
||||||
|
return () -> {
|
||||||
|
runnable.run();
|
||||||
|
popup.hide();
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,241 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.ui;
|
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import com.jfoenix.controls.*;
|
|
||||||
import javafx.geometry.Insets;
|
|
||||||
import javafx.geometry.Pos;
|
|
||||||
import javafx.scene.Node;
|
|
||||||
import javafx.scene.control.ScrollPane;
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.input.MouseButton;
|
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.scene.layout.StackPane;
|
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
import javafx.stage.FileChooser;
|
|
||||||
import org.jackhuang.hmcl.download.LibraryAnalyzer;
|
|
||||||
import org.jackhuang.hmcl.event.EventBus;
|
|
||||||
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
|
|
||||||
import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
|
|
||||||
import org.jackhuang.hmcl.game.GameVersion;
|
|
||||||
import org.jackhuang.hmcl.game.HMCLGameRepository;
|
|
||||||
import org.jackhuang.hmcl.game.ModpackHelper;
|
|
||||||
import org.jackhuang.hmcl.game.Version;
|
|
||||||
import org.jackhuang.hmcl.mod.MismatchedModpackTypeException;
|
|
||||||
import org.jackhuang.hmcl.mod.UnsupportedModpackException;
|
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
|
||||||
import org.jackhuang.hmcl.setting.Profiles;
|
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
|
||||||
import org.jackhuang.hmcl.task.Task;
|
|
||||||
import org.jackhuang.hmcl.task.TaskExecutor;
|
|
||||||
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
|
||||||
import org.jackhuang.hmcl.ui.construct.MessageBox;
|
|
||||||
import org.jackhuang.hmcl.ui.versions.Versions;
|
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
|
||||||
import org.jackhuang.hmcl.util.VersionNumber;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
|
|
||||||
import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|
||||||
|
|
||||||
public class GameVersionListPage extends StackPane {
|
|
||||||
private final JFXSpinner spinner;
|
|
||||||
private final StackPane contentPane;
|
|
||||||
private final JFXMasonryPane masonryPane;
|
|
||||||
|
|
||||||
private Profile profile;
|
|
||||||
|
|
||||||
public GameVersionListPage() {
|
|
||||||
spinner = new JFXSpinner();
|
|
||||||
spinner.getStyleClass().setAll("first-spinner");
|
|
||||||
|
|
||||||
contentPane = new StackPane();
|
|
||||||
|
|
||||||
ScrollPane scrollPane = new ScrollPane();
|
|
||||||
scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
|
|
||||||
scrollPane.setFitToWidth(true);
|
|
||||||
|
|
||||||
masonryPane = new JFXMasonryPane();
|
|
||||||
masonryPane.setHSpacing(3);
|
|
||||||
masonryPane.setVSpacing(3);
|
|
||||||
masonryPane.setCellWidth(182);
|
|
||||||
masonryPane.setCellHeight(153);
|
|
||||||
|
|
||||||
scrollPane.setContent(masonryPane);
|
|
||||||
|
|
||||||
VBox vBox = new VBox();
|
|
||||||
vBox.setPadding(new Insets(15));
|
|
||||||
vBox.setPickOnBounds(false);
|
|
||||||
vBox.setAlignment(Pos.BOTTOM_RIGHT);
|
|
||||||
vBox.setSpacing(15);
|
|
||||||
|
|
||||||
JFXButton btnRefresh = new JFXButton();
|
|
||||||
btnRefresh.setPrefWidth(40);
|
|
||||||
btnRefresh.setPrefHeight(40);
|
|
||||||
btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
|
|
||||||
btnRefresh.getStyleClass().setAll("jfx-button-raised-round");
|
|
||||||
btnRefresh.setGraphic(SVG.refresh(Theme.foregroundFillBinding(), -1, -1));
|
|
||||||
btnRefresh.setOnMouseClicked(e -> profile.getRepository().refreshVersionsAsync().start());
|
|
||||||
FXUtils.installTooltip(btnRefresh, i18n("button.refresh"));
|
|
||||||
|
|
||||||
vBox.getChildren().setAll(btnRefresh);
|
|
||||||
|
|
||||||
contentPane.getChildren().setAll(scrollPane, vBox);
|
|
||||||
|
|
||||||
getChildren().setAll(spinner);
|
|
||||||
|
|
||||||
Profiles.selectedProfileProperty().addListener((o, a, b) -> this.profile = b);
|
|
||||||
profile = Profiles.getSelectedProfile();
|
|
||||||
|
|
||||||
EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> {
|
|
||||||
if (event.getSource() == profile.getRepository())
|
|
||||||
loadVersions((HMCLGameRepository) event.getSource());
|
|
||||||
});
|
|
||||||
EventBus.EVENT_BUS.channel(RefreshingVersionsEvent.class).register(event -> {
|
|
||||||
if (event.getSource() == profile.getRepository())
|
|
||||||
// This will occupy 0.5s. Too slow!
|
|
||||||
JFXUtilities.runInFX(this::loadingVersions);
|
|
||||||
});
|
|
||||||
if (profile.getRepository().isLoaded())
|
|
||||||
loadVersions(profile.getRepository());
|
|
||||||
else
|
|
||||||
profile.getRepository().refreshVersionsAsync().start();
|
|
||||||
}
|
|
||||||
|
|
||||||
private String modifyVersion(String gameVersion, String version) {
|
|
||||||
return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
|
|
||||||
}
|
|
||||||
|
|
||||||
private Node buildNode(HMCLGameRepository repository, Version version, Callable<String> gameCallable) {
|
|
||||||
Profile profile = repository.getProfile();
|
|
||||||
String id = version.getId();
|
|
||||||
VersionItem item = new VersionItem();
|
|
||||||
item.setUpdate(repository.isModpack(id));
|
|
||||||
Task.ofResult("game", gameCallable).subscribe(Schedulers.javafx(), vars -> {
|
|
||||||
String game = vars.get("game");
|
|
||||||
item.setGameVersion(game);
|
|
||||||
|
|
||||||
StringBuilder libraries = new StringBuilder();
|
|
||||||
LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
|
|
||||||
analyzer.getForge().ifPresent(library -> libraries.append(i18n("install.installer.forge")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)forge", ""))).append("\n"));
|
|
||||||
analyzer.getLiteLoader().ifPresent(library -> libraries.append(i18n("install.installer.liteloader")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)liteloader", ""))).append("\n"));
|
|
||||||
analyzer.getOptiFine().ifPresent(library -> libraries.append(i18n("install.installer.optifine")).append(": ").append(modifyVersion(game, library.getVersion().replaceAll("(?i)optifine", ""))).append("\n"));
|
|
||||||
|
|
||||||
item.setLibraries(libraries.toString());
|
|
||||||
});
|
|
||||||
item.setVersionName(id);
|
|
||||||
item.setOnLaunchButtonClicked(e -> Versions.launch(profile, id));
|
|
||||||
item.setOnScriptButtonClicked(e -> Versions.generateLaunchScript(profile, id));
|
|
||||||
item.setOnSettingsButtonClicked(e -> {
|
|
||||||
Controllers.getVersionPage().load(id, profile);
|
|
||||||
Controllers.navigate(Controllers.getVersionPage());
|
|
||||||
});
|
|
||||||
item.setOnUpdateButtonClicked(event -> {
|
|
||||||
FileChooser chooser = new FileChooser();
|
|
||||||
chooser.setTitle(i18n("modpack.choose"));
|
|
||||||
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("modpack"), "*.zip"));
|
|
||||||
File selectedFile = chooser.showOpenDialog(Controllers.getStage());
|
|
||||||
if (selectedFile != null) {
|
|
||||||
AtomicReference<Region> region = new AtomicReference<>();
|
|
||||||
try {
|
|
||||||
TaskExecutor executor = ModpackHelper.getUpdateTask(profile, selectedFile, id, ModpackHelper.readModpackConfiguration(repository.getModpackConfiguration(id)))
|
|
||||||
.then(Task.of(Schedulers.javafx(), () -> region.get().fireEvent(new DialogCloseEvent()))).executor();
|
|
||||||
region.set(Controllers.taskDialog(executor, i18n("modpack.update"), ""));
|
|
||||||
executor.start();
|
|
||||||
} catch (UnsupportedModpackException e) {
|
|
||||||
region.get().fireEvent(new DialogCloseEvent());
|
|
||||||
Controllers.dialog(i18n("modpack.unsupported"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
|
|
||||||
} catch (MismatchedModpackTypeException e) {
|
|
||||||
region.get().fireEvent(new DialogCloseEvent());
|
|
||||||
Controllers.dialog(i18n("modpack.mismatched_type"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
|
|
||||||
} catch (IOException e) {
|
|
||||||
region.get().fireEvent(new DialogCloseEvent());
|
|
||||||
Controllers.dialog(i18n("modpack.invalid"), i18n("message.error"), MessageBox.ERROR_MESSAGE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
item.setOnMouseClicked(event -> {
|
|
||||||
if (event.getButton() == MouseButton.SECONDARY) {
|
|
||||||
JFXListView<String> versionList = new JFXListView<>();
|
|
||||||
JFXPopup versionPopup = new JFXPopup(versionList);
|
|
||||||
versionList.getStyleClass().add("option-list-view");
|
|
||||||
FXUtils.setLimitWidth(versionList, 150);
|
|
||||||
versionList.getItems().setAll(Lang.immutableListOf(
|
|
||||||
i18n("version.manage.rename"),
|
|
||||||
i18n("version.manage.remove"),
|
|
||||||
i18n("modpack.export"),
|
|
||||||
i18n("folder.game")
|
|
||||||
));
|
|
||||||
versionList.setOnMouseClicked(e -> {
|
|
||||||
versionPopup.hide();
|
|
||||||
switch (versionList.getSelectionModel().getSelectedIndex()) {
|
|
||||||
case 0:
|
|
||||||
Versions.renameVersion(profile, id);
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
Versions.deleteVersion(profile, id);
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
Versions.exportVersion(profile, id);
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
FXUtils.openFolder(repository.getRunDirectory(id));
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
versionPopup.show(item, JFXPopup.PopupVPosition.TOP, JFXPopup.PopupHPosition.LEFT, event.getX(), event.getY());
|
|
||||||
} else if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
|
|
||||||
Versions.launch(profile, id);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
File iconFile = repository.getVersionIcon(id);
|
|
||||||
if (iconFile.exists())
|
|
||||||
item.setImage(new Image("file:" + iconFile.getAbsolutePath()));
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadingVersions() {
|
|
||||||
getChildren().setAll(spinner);
|
|
||||||
masonryPane.getChildren().clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadVersions(HMCLGameRepository repository) {
|
|
||||||
List<Node> children = repository.getVersions().parallelStream()
|
|
||||||
.filter(version -> !version.isHidden())
|
|
||||||
.sorted((a, b) -> VersionNumber.COMPARATOR.compare(VersionNumber.asVersion(a.getId()), VersionNumber.asVersion(b.getId())))
|
|
||||||
.map(version -> buildNode(repository, version, () -> GameVersion.minecraftVersion(repository.getVersionJar(version.getId())).orElse("Unknown")))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
JFXUtilities.runInFX(() -> {
|
|
||||||
if (profile == repository.getProfile()) {
|
|
||||||
masonryPane.getChildren().setAll(children);
|
|
||||||
getChildren().setAll(contentPane);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,43 +13,204 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.effects.JFXDepthManager;
|
import com.jfoenix.effects.JFXDepthManager;
|
||||||
import javafx.fxml.FXML;
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.property.*;
|
||||||
|
import javafx.event.EventHandler;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.geometry.Pos;
|
||||||
|
import javafx.scene.Cursor;
|
||||||
|
import javafx.scene.control.Control;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
|
import javafx.scene.control.Skin;
|
||||||
|
import javafx.scene.control.SkinBase;
|
||||||
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.scene.image.ImageView;
|
||||||
|
import javafx.scene.input.MouseEvent;
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
|
import javafx.scene.layout.HBox;
|
||||||
|
import javafx.scene.layout.Priority;
|
||||||
|
import org.jackhuang.hmcl.download.LibraryAnalyzer;
|
||||||
|
import org.jackhuang.hmcl.setting.Theme;
|
||||||
|
import org.jackhuang.hmcl.util.i18n.I18n;
|
||||||
|
|
||||||
import java.util.function.Consumer;
|
import static org.jackhuang.hmcl.download.LibraryAnalyzer.LibraryType.*;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author huangyuhui
|
* @author huangyuhui
|
||||||
*/
|
*/
|
||||||
public class InstallerItem extends BorderPane {
|
public class InstallerItem extends Control {
|
||||||
private final Consumer<InstallerItem> deleteCallback;
|
private final String id;
|
||||||
|
private final String imageUrl;
|
||||||
|
public final StringProperty libraryVersion = new SimpleStringProperty();
|
||||||
|
public final StringProperty incompatibleLibraryName = new SimpleStringProperty();
|
||||||
|
public final BooleanProperty incompatibleWithGame = new SimpleBooleanProperty();
|
||||||
|
public final BooleanProperty removable = new SimpleBooleanProperty();
|
||||||
|
public final BooleanProperty upgradable = new SimpleBooleanProperty(false);
|
||||||
|
public final BooleanProperty installable = new SimpleBooleanProperty(true);
|
||||||
|
public final ObjectProperty<EventHandler<? super MouseEvent>> removeAction = new SimpleObjectProperty<>();
|
||||||
|
public final ObjectProperty<EventHandler<? super MouseEvent>> action = new SimpleObjectProperty<>();
|
||||||
|
|
||||||
@FXML
|
public InstallerItem(LibraryAnalyzer.LibraryType id) {
|
||||||
private Label lblInstallerArtifact;
|
this(id.getPatchId());
|
||||||
|
|
||||||
@FXML
|
|
||||||
private Label lblInstallerVersion;
|
|
||||||
|
|
||||||
public InstallerItem(String artifact, String version, Consumer<InstallerItem> deleteCallback) {
|
|
||||||
this.deleteCallback = deleteCallback;
|
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/version/installer-item.fxml");
|
|
||||||
|
|
||||||
setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
|
|
||||||
JFXDepthManager.setDepth(this, 1);
|
|
||||||
lblInstallerArtifact.setText(artifact);
|
|
||||||
lblInstallerVersion.setText(i18n("archive.version") + ": " + version);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
public InstallerItem(String id) {
|
||||||
private void onDelete() {
|
this.id = id;
|
||||||
deleteCallback.accept(this);
|
|
||||||
|
switch (id) {
|
||||||
|
case "game":
|
||||||
|
imageUrl = "/assets/img/grass.png";
|
||||||
|
break;
|
||||||
|
case "fabric":
|
||||||
|
imageUrl = "/assets/img/fabric.png";
|
||||||
|
break;
|
||||||
|
case "forge":
|
||||||
|
imageUrl = "/assets/img/forge.png";
|
||||||
|
break;
|
||||||
|
case "liteloader":
|
||||||
|
imageUrl = "/assets/img/chicken.png";
|
||||||
|
break;
|
||||||
|
case "optifine":
|
||||||
|
imageUrl = "/assets/img/command.png";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
imageUrl = null;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setState(String libraryVersion, boolean incompatibleWithGame, boolean removable) {
|
||||||
|
this.libraryVersion.set(libraryVersion);
|
||||||
|
this.incompatibleWithGame.set(incompatibleWithGame);
|
||||||
|
this.removable.set(removable);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLibraryId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Skin<?> createDefaultSkin() {
|
||||||
|
return new InstallerItemSkin(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class InstallerItemGroup {
|
||||||
|
public InstallerItem game = new InstallerItem(MINECRAFT);
|
||||||
|
public InstallerItem fabric = new InstallerItem(FABRIC);
|
||||||
|
public InstallerItem forge = new InstallerItem(FORGE);
|
||||||
|
public InstallerItem liteLoader = new InstallerItem(LITELOADER);
|
||||||
|
public InstallerItem optiFine = new InstallerItem(OPTIFINE);
|
||||||
|
|
||||||
|
public InstallerItemGroup() {
|
||||||
|
forge.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
|
||||||
|
if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
|
||||||
|
return null;
|
||||||
|
}, fabric.libraryVersion));
|
||||||
|
|
||||||
|
liteLoader.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
|
||||||
|
if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
|
||||||
|
return null;
|
||||||
|
}, fabric.libraryVersion));
|
||||||
|
|
||||||
|
optiFine.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
|
||||||
|
if (fabric.libraryVersion.get() != null) return FABRIC.getPatchId();
|
||||||
|
return null;
|
||||||
|
}, fabric.libraryVersion));
|
||||||
|
|
||||||
|
fabric.incompatibleLibraryName.bind(Bindings.createStringBinding(() -> {
|
||||||
|
if (liteLoader.libraryVersion.get() != null) return LITELOADER.getPatchId();
|
||||||
|
if (optiFine.libraryVersion.get() != null) return OPTIFINE.getPatchId();
|
||||||
|
if (forge.libraryVersion.get() != null) return FORGE.getPatchId();
|
||||||
|
return null;
|
||||||
|
}, optiFine.libraryVersion, forge.libraryVersion));
|
||||||
|
}
|
||||||
|
|
||||||
|
public InstallerItem[] getLibraries() {
|
||||||
|
return new InstallerItem[]{game, fabric, forge, liteLoader, optiFine};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class InstallerItemSkin extends SkinBase<InstallerItem> {
|
||||||
|
|
||||||
|
InstallerItemSkin(InstallerItem control) {
|
||||||
|
super(control);
|
||||||
|
|
||||||
|
HBox hbox = new HBox();
|
||||||
|
getChildren().setAll(hbox);
|
||||||
|
JFXDepthManager.setDepth(hbox, 1);
|
||||||
|
|
||||||
|
hbox.getStyleClass().add("card");
|
||||||
|
|
||||||
|
hbox.setAlignment(Pos.CENTER_LEFT);
|
||||||
|
|
||||||
|
if (control.imageUrl != null) {
|
||||||
|
hbox.getChildren().add(FXUtils.limitingSize(new ImageView(new Image(control.imageUrl, 32, 32, true, true)), 32, 32));
|
||||||
|
}
|
||||||
|
|
||||||
|
Label nameLabel = new Label();
|
||||||
|
hbox.getChildren().add(nameLabel);
|
||||||
|
nameLabel.setPrefWidth(80);
|
||||||
|
nameLabel.textProperty().set(I18n.hasKey("install.installer." + control.id) ? i18n("install.installer." + control.id) : control.id);
|
||||||
|
HBox.setMargin(nameLabel, new Insets(0, 4, 0, 4));
|
||||||
|
|
||||||
|
Label label = new Label();
|
||||||
|
hbox.getChildren().add(label);
|
||||||
|
label.setMaxWidth(Double.MAX_VALUE);
|
||||||
|
HBox.setHgrow(label, Priority.ALWAYS);
|
||||||
|
label.textProperty().bind(Bindings.createStringBinding(() -> {
|
||||||
|
String incompatibleWith = control.incompatibleLibraryName.get();
|
||||||
|
String version = control.libraryVersion.get();
|
||||||
|
if (control.incompatibleWithGame.get()) {
|
||||||
|
return i18n("install.installer.change_version", version);
|
||||||
|
} else if (incompatibleWith != null) {
|
||||||
|
return i18n("install.installer.incompatible", i18n("install.installer." + incompatibleWith));
|
||||||
|
} else if (version == null) {
|
||||||
|
return i18n("install.installer.not_installed");
|
||||||
|
} else {
|
||||||
|
return i18n("install.installer.version", version);
|
||||||
|
}
|
||||||
|
}, control.incompatibleLibraryName, control.incompatibleWithGame, control.libraryVersion));
|
||||||
|
BorderPane.setMargin(label, new Insets(0, 0, 0, 8));
|
||||||
|
BorderPane.setAlignment(label, Pos.CENTER_LEFT);
|
||||||
|
|
||||||
|
JFXButton closeButton = new JFXButton();
|
||||||
|
closeButton.setGraphic(SVG.close(Theme.blackFillBinding(), -1, -1));
|
||||||
|
closeButton.getStyleClass().add("toggle-icon4");
|
||||||
|
closeButton.visibleProperty().bind(control.removable);
|
||||||
|
closeButton.managedProperty().bind(closeButton.visibleProperty());
|
||||||
|
closeButton.onMouseClickedProperty().bind(control.removeAction);
|
||||||
|
hbox.getChildren().add(closeButton);
|
||||||
|
|
||||||
|
JFXButton arrowButton = new JFXButton();
|
||||||
|
arrowButton.graphicProperty().bind(Bindings.createObjectBinding(() -> control.upgradable.get()
|
||||||
|
? SVG.update(Theme.blackFillBinding(), -1, -1)
|
||||||
|
: SVG.arrowRight(Theme.blackFillBinding(), -1, -1),
|
||||||
|
control.upgradable));
|
||||||
|
arrowButton.getStyleClass().add("toggle-icon4");
|
||||||
|
arrowButton.visibleProperty().bind(Bindings.createBooleanBinding(
|
||||||
|
() -> control.installable.get() && control.incompatibleLibraryName.get() == null,
|
||||||
|
control.installable, control.incompatibleLibraryName));
|
||||||
|
arrowButton.managedProperty().bind(arrowButton.visibleProperty());
|
||||||
|
arrowButton.onMouseClickedProperty().bind(control.action);
|
||||||
|
hbox.getChildren().add(arrowButton);
|
||||||
|
|
||||||
|
FXUtils.onChangeAndOperate(arrowButton.visibleProperty(), clickable -> {
|
||||||
|
if (clickable) {
|
||||||
|
hbox.onMouseClickedProperty().bind(control.action);
|
||||||
|
hbox.setCursor(Cursor.HAND);
|
||||||
|
} else {
|
||||||
|
hbox.onMouseClickedProperty().unbind();
|
||||||
|
hbox.onMouseClickedProperty().set(null);
|
||||||
|
hbox.setCursor(Cursor.DEFAULT);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.ui;
|
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import javafx.application.Platform;
|
|
||||||
import javafx.beans.binding.When;
|
|
||||||
import javafx.scene.layout.Region;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import org.jackhuang.hmcl.event.EventBus;
|
|
||||||
import org.jackhuang.hmcl.event.RefreshedVersionsEvent;
|
|
||||||
import org.jackhuang.hmcl.game.HMCLGameRepository;
|
|
||||||
import org.jackhuang.hmcl.game.ModpackHelper;
|
|
||||||
import org.jackhuang.hmcl.mod.Modpack;
|
|
||||||
import org.jackhuang.hmcl.mod.UnsupportedModpackException;
|
|
||||||
import org.jackhuang.hmcl.setting.Accounts;
|
|
||||||
import org.jackhuang.hmcl.setting.Profiles;
|
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
|
||||||
import org.jackhuang.hmcl.task.Task;
|
|
||||||
import org.jackhuang.hmcl.task.TaskExecutor;
|
|
||||||
import org.jackhuang.hmcl.ui.account.AccountAdvancedListItem;
|
|
||||||
import org.jackhuang.hmcl.ui.account.AddAccountPane;
|
|
||||||
import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
|
|
||||||
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
|
||||||
import org.jackhuang.hmcl.ui.construct.IconedItem;
|
|
||||||
import org.jackhuang.hmcl.ui.profile.ProfileAdvancedListItem;
|
|
||||||
import org.jackhuang.hmcl.ui.versions.GameAdvancedListItem;
|
|
||||||
import org.jackhuang.hmcl.upgrade.UpdateChecker;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|
||||||
|
|
||||||
public final class LeftPaneController extends AdvancedListBox {
|
|
||||||
|
|
||||||
public LeftPaneController() {
|
|
||||||
|
|
||||||
AccountAdvancedListItem accountListItem = new AccountAdvancedListItem();
|
|
||||||
accountListItem.setOnAction(e -> Controllers.navigate(Controllers.getAccountListPage()));
|
|
||||||
accountListItem.accountProperty().bind(Accounts.selectedAccountProperty());
|
|
||||||
GameAdvancedListItem gameListItem = new GameAdvancedListItem();
|
|
||||||
gameListItem.setOnAction(e -> Controllers.navigate(Controllers.getGameListPage()));
|
|
||||||
ProfileAdvancedListItem profileListItem = new ProfileAdvancedListItem();
|
|
||||||
profileListItem.setOnAction(e -> Controllers.navigate(Controllers.getProfileListPage()));
|
|
||||||
profileListItem.profileProperty().bind(Profiles.selectedProfileProperty());
|
|
||||||
|
|
||||||
IconedItem launcherSettingsItem = new IconedItem(SVG.gear(Theme.blackFillBinding(), 20, 20), "iconed-item");
|
|
||||||
|
|
||||||
launcherSettingsItem.getLabel().textProperty().bind(
|
|
||||||
new When(UpdateChecker.outdatedProperty())
|
|
||||||
.then(i18n("update.found"))
|
|
||||||
.otherwise(i18n("settings.launcher")));
|
|
||||||
|
|
||||||
launcherSettingsItem.getLabel().textFillProperty().bind(
|
|
||||||
new When(UpdateChecker.outdatedProperty())
|
|
||||||
.then(Color.RED)
|
|
||||||
.otherwise(Color.BLACK));
|
|
||||||
|
|
||||||
launcherSettingsItem.setOnMouseClicked(e -> Controllers.navigate(Controllers.getSettingsPage()));
|
|
||||||
|
|
||||||
this
|
|
||||||
.startCategory(i18n("account").toUpperCase())
|
|
||||||
.add(accountListItem)
|
|
||||||
.startCategory(i18n("version").toUpperCase())
|
|
||||||
.add(gameListItem)
|
|
||||||
.startCategory(i18n("profile.title").toUpperCase())
|
|
||||||
.add(profileListItem)
|
|
||||||
.startCategory(i18n("launcher").toUpperCase())
|
|
||||||
.add(launcherSettingsItem);
|
|
||||||
|
|
||||||
EventBus.EVENT_BUS.channel(RefreshedVersionsEvent.class).register(event -> onRefreshedVersions((HMCLGameRepository) event.getSource()));
|
|
||||||
if (Profiles.selectedProfileProperty().get().getRepository().isLoaded())
|
|
||||||
onRefreshedVersions(Profiles.selectedProfileProperty().get().getRepository());
|
|
||||||
}
|
|
||||||
|
|
||||||
// ==== Accounts ====
|
|
||||||
public void checkAccount() {
|
|
||||||
if (Accounts.getAccounts().isEmpty())
|
|
||||||
Platform.runLater(this::addNewAccount);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addNewAccount() {
|
|
||||||
Controllers.dialog(new AddAccountPane());
|
|
||||||
}
|
|
||||||
// ====
|
|
||||||
|
|
||||||
private boolean checkedModpack = false;
|
|
||||||
private static boolean showNewAccount = true;
|
|
||||||
|
|
||||||
private void onRefreshedVersions(HMCLGameRepository repository) {
|
|
||||||
JFXUtilities.runInFX(() -> {
|
|
||||||
if (!checkedModpack) {
|
|
||||||
checkedModpack = true;
|
|
||||||
|
|
||||||
if (repository.getVersionCount() == 0) {
|
|
||||||
File modpackFile = new File("modpack.zip").getAbsoluteFile();
|
|
||||||
if (modpackFile.exists()) {
|
|
||||||
try {
|
|
||||||
AtomicReference<Region> region = new AtomicReference<>();
|
|
||||||
Modpack modpack = ModpackHelper.readModpackManifest(modpackFile);
|
|
||||||
TaskExecutor executor = ModpackHelper.getInstallTask(repository.getProfile(), modpackFile, modpack.getName(), modpack)
|
|
||||||
.with(Task.of(Schedulers.javafx(), () -> {
|
|
||||||
region.get().fireEvent(new DialogCloseEvent());
|
|
||||||
checkAccount();
|
|
||||||
})).executor();
|
|
||||||
region.set(Controllers.taskDialog(executor, i18n("modpack.installing"), ""));
|
|
||||||
executor.start();
|
|
||||||
showNewAccount = false;
|
|
||||||
} catch (UnsupportedModpackException ignore) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (showNewAccount) {
|
|
||||||
showNewAccount = false;
|
|
||||||
checkAccount();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,35 +13,37 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
import javafx.beans.property.BooleanProperty;
|
import javafx.beans.property.BooleanProperty;
|
||||||
import javafx.beans.property.ListProperty;
|
|
||||||
import javafx.beans.property.SimpleBooleanProperty;
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
import javafx.beans.property.SimpleListProperty;
|
|
||||||
import javafx.collections.FXCollections;
|
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Control;
|
|
||||||
import javafx.scene.control.Skin;
|
import javafx.scene.control.Skin;
|
||||||
|
|
||||||
public abstract class ListPage<T extends Node> extends Control {
|
public abstract class ListPage<T extends Node> extends ListPageBase<T> {
|
||||||
private final ListProperty<T> items = new SimpleListProperty<>(FXCollections.observableArrayList());
|
private final BooleanProperty refreshable = new SimpleBooleanProperty(this, "refreshable", false);
|
||||||
private final BooleanProperty loading = new SimpleBooleanProperty(false);
|
|
||||||
|
|
||||||
public abstract void add();
|
public abstract void add();
|
||||||
|
|
||||||
public ListProperty<T> itemsProperty() {
|
public void refresh() {
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BooleanProperty loadingProperty() {
|
|
||||||
return loading;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Skin<?> createDefaultSkin() {
|
protected Skin<?> createDefaultSkin() {
|
||||||
return new ListPageSkin(this);
|
return new ListPageSkin(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isRefreshable() {
|
||||||
|
return refreshable.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BooleanProperty refreshableProperty() {
|
||||||
|
return refreshable;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRefreshable(boolean refreshable) {
|
||||||
|
this.refreshable.set(refreshable);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import javafx.beans.property.BooleanProperty;
|
||||||
|
import javafx.beans.property.ListProperty;
|
||||||
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
|
import javafx.beans.property.SimpleListProperty;
|
||||||
|
import javafx.collections.FXCollections;
|
||||||
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.scene.control.Control;
|
||||||
|
|
||||||
|
public class ListPageBase<T> extends Control {
|
||||||
|
private final ListProperty<T> items = new SimpleListProperty<>(this, "items", FXCollections.observableArrayList());
|
||||||
|
private final BooleanProperty loading = new SimpleBooleanProperty(this, "loading", false);
|
||||||
|
|
||||||
|
public ObservableList<T> getItems() {
|
||||||
|
return items.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setItems(ObservableList<T> items) {
|
||||||
|
this.items.set(items);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ListProperty<T> itemsProperty() {
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isLoading() {
|
||||||
|
return loading.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLoading(boolean loading) {
|
||||||
|
this.loading.set(loading);
|
||||||
|
}
|
||||||
|
|
||||||
|
public BooleanProperty loadingProperty() {
|
||||||
|
return loading;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,32 +13,33 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXScrollPane;
|
import com.jfoenix.controls.JFXScrollPane;
|
||||||
import com.jfoenix.controls.JFXSpinner;
|
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.control.ScrollPane;
|
import javafx.scene.control.ScrollPane;
|
||||||
import javafx.scene.control.SkinBase;
|
import javafx.scene.control.SkinBase;
|
||||||
|
import javafx.scene.layout.BorderPane;
|
||||||
|
import javafx.scene.layout.Pane;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
import javafx.scene.layout.VBox;
|
import javafx.scene.layout.VBox;
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
import org.jackhuang.hmcl.setting.Theme;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.SpinnerPane;
|
||||||
|
|
||||||
public class ListPageSkin extends SkinBase<ListPage> {
|
public class ListPageSkin extends SkinBase<ListPage<?>> {
|
||||||
|
|
||||||
public ListPageSkin(ListPage<?> skinnable) {
|
public ListPageSkin(ListPage<?> skinnable) {
|
||||||
super(skinnable);
|
super(skinnable);
|
||||||
|
|
||||||
StackPane rootPane = new StackPane();
|
SpinnerPane spinnerPane = new SpinnerPane();
|
||||||
|
spinnerPane.getStyleClass().add("large-spinner-pane");
|
||||||
JFXSpinner spinner = new JFXSpinner();
|
Pane placeholder = new Pane();
|
||||||
spinner.setRadius(16);
|
VBox list = new VBox();
|
||||||
spinner.getStyleClass().setAll("materialDesign-purple", "first-spinner");
|
|
||||||
|
|
||||||
StackPane contentPane = new StackPane();
|
StackPane contentPane = new StackPane();
|
||||||
{
|
{
|
||||||
@@ -46,17 +47,18 @@ public class ListPageSkin extends SkinBase<ListPage> {
|
|||||||
{
|
{
|
||||||
scrollPane.setFitToWidth(true);
|
scrollPane.setFitToWidth(true);
|
||||||
|
|
||||||
VBox accountList = new VBox();
|
list.maxWidthProperty().bind(scrollPane.widthProperty());
|
||||||
accountList.maxWidthProperty().bind(scrollPane.widthProperty());
|
list.setSpacing(10);
|
||||||
accountList.setSpacing(10);
|
|
||||||
accountList.setStyle("-fx-padding: 10 10 10 10;");
|
|
||||||
|
|
||||||
Bindings.bindContent(accountList.getChildren(), skinnable.itemsProperty());
|
VBox content = new VBox();
|
||||||
|
content.getChildren().setAll(list, placeholder);
|
||||||
|
|
||||||
scrollPane.setContent(accountList);
|
Bindings.bindContent(list.getChildren(), skinnable.itemsProperty());
|
||||||
|
|
||||||
|
scrollPane.setContent(content);
|
||||||
JFXScrollPane.smoothScrolling(scrollPane);
|
JFXScrollPane.smoothScrolling(scrollPane);
|
||||||
}
|
}
|
||||||
|
|
||||||
VBox vBox = new VBox();
|
VBox vBox = new VBox();
|
||||||
{
|
{
|
||||||
vBox.setAlignment(Pos.BOTTOM_RIGHT);
|
vBox.setAlignment(Pos.BOTTOM_RIGHT);
|
||||||
@@ -67,24 +69,45 @@ public class ListPageSkin extends SkinBase<ListPage> {
|
|||||||
JFXButton btnAdd = new JFXButton();
|
JFXButton btnAdd = new JFXButton();
|
||||||
FXUtils.setLimitWidth(btnAdd, 40);
|
FXUtils.setLimitWidth(btnAdd, 40);
|
||||||
FXUtils.setLimitHeight(btnAdd, 40);
|
FXUtils.setLimitHeight(btnAdd, 40);
|
||||||
btnAdd.getStyleClass().setAll("jfx-button-raised-round");
|
btnAdd.getStyleClass().add("jfx-button-raised-round");
|
||||||
btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
|
btnAdd.setButtonType(JFXButton.ButtonType.RAISED);
|
||||||
btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
|
btnAdd.setGraphic(SVG.plus(Theme.whiteFillBinding(), -1, -1));
|
||||||
btnAdd.setOnMouseClicked(e -> skinnable.add());
|
btnAdd.setOnMouseClicked(e -> skinnable.add());
|
||||||
|
|
||||||
|
JFXButton btnRefresh = new JFXButton();
|
||||||
|
FXUtils.setLimitWidth(btnRefresh, 40);
|
||||||
|
FXUtils.setLimitHeight(btnRefresh, 40);
|
||||||
|
btnRefresh.getStyleClass().add("jfx-button-raised-round");
|
||||||
|
btnRefresh.setButtonType(JFXButton.ButtonType.RAISED);
|
||||||
|
btnRefresh.setGraphic(SVG.refresh(Theme.whiteFillBinding(), -1, -1));
|
||||||
|
btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
|
||||||
|
|
||||||
vBox.getChildren().setAll(btnAdd);
|
vBox.getChildren().setAll(btnAdd);
|
||||||
|
|
||||||
|
FXUtils.onChangeAndOperate(skinnable.refreshableProperty(),
|
||||||
|
refreshable -> {
|
||||||
|
if (refreshable) {
|
||||||
|
list.setPadding(new Insets(10, 10, 15 + 40 + 15 + 40 + 15, 10));
|
||||||
|
vBox.getChildren().setAll(btnRefresh, btnAdd);
|
||||||
|
} else {
|
||||||
|
list.setPadding(new Insets(10, 10, 15 + 40 + 15, 10));
|
||||||
|
vBox.getChildren().setAll(btnAdd);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
contentPane.getChildren().setAll(scrollPane, vBox);
|
// Keep a blank space to prevent buttons from blocking up mod items.
|
||||||
|
BorderPane group = new BorderPane();
|
||||||
|
group.setPickOnBounds(false);
|
||||||
|
group.setBottom(vBox);
|
||||||
|
placeholder.minHeightProperty().bind(vBox.heightProperty());
|
||||||
|
|
||||||
|
contentPane.getChildren().setAll(scrollPane, group);
|
||||||
}
|
}
|
||||||
|
|
||||||
rootPane.getChildren().setAll(contentPane);
|
spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
|
||||||
|
spinnerPane.setContent(contentPane);
|
||||||
|
|
||||||
skinnable.loadingProperty().addListener((a, b, newValue) -> {
|
getChildren().setAll(spinnerPane);
|
||||||
if (newValue) rootPane.getChildren().setAll(spinner);
|
|
||||||
else rootPane.getChildren().setAll(contentPane);
|
|
||||||
});
|
|
||||||
|
|
||||||
getChildren().setAll(rootPane);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,38 +13,51 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXButton;
|
||||||
|
import com.jfoenix.controls.JFXCheckBox;
|
||||||
|
import com.jfoenix.controls.JFXComboBox;
|
||||||
|
import com.jfoenix.controls.JFXListView;
|
||||||
|
import javafx.application.Platform;
|
||||||
|
import javafx.beans.InvalidationListener;
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.beans.property.ReadOnlyIntegerProperty;
|
import javafx.beans.property.*;
|
||||||
import javafx.beans.property.ReadOnlyIntegerWrapper;
|
import javafx.beans.value.WeakChangeListener;
|
||||||
import javafx.concurrent.Worker;
|
import javafx.css.PseudoClass;
|
||||||
import javafx.fxml.FXML;
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.scene.control.ComboBox;
|
import javafx.scene.control.*;
|
||||||
import javafx.scene.control.ToggleButton;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.layout.*;
|
||||||
import javafx.scene.layout.StackPane;
|
|
||||||
import javafx.scene.web.WebEngine;
|
|
||||||
import javafx.scene.web.WebView;
|
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
import org.jackhuang.hmcl.event.Event;
|
|
||||||
import org.jackhuang.hmcl.event.EventManager;
|
|
||||||
import org.jackhuang.hmcl.game.LauncherHelper;
|
import org.jackhuang.hmcl.game.LauncherHelper;
|
||||||
import org.jackhuang.hmcl.setting.Settings;
|
|
||||||
import org.jackhuang.hmcl.util.IOUtils;
|
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
|
||||||
import org.jackhuang.hmcl.util.Log4jLevel;
|
import org.jackhuang.hmcl.util.Log4jLevel;
|
||||||
import org.jackhuang.hmcl.util.StringUtils;
|
|
||||||
import org.w3c.dom.Document;
|
|
||||||
import org.w3c.dom.Element;
|
|
||||||
import org.w3c.dom.Node;
|
|
||||||
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
import javax.swing.*;
|
||||||
|
import java.awt.*;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.util.ArrayDeque;
|
||||||
|
import java.util.EnumMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.newImage;
|
||||||
|
import static org.jackhuang.hmcl.util.Lang.thread;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
|
import static org.jackhuang.hmcl.util.StringUtils.parseEscapeSequence;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -53,141 +66,94 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|||||||
*/
|
*/
|
||||||
public final class LogWindow extends Stage {
|
public final class LogWindow extends Stage {
|
||||||
|
|
||||||
private final ReadOnlyIntegerWrapper fatal = new ReadOnlyIntegerWrapper(0);
|
private final ArrayDeque<Log> logs = new ArrayDeque<>();
|
||||||
private final ReadOnlyIntegerWrapper error = new ReadOnlyIntegerWrapper(0);
|
private final Map<Log4jLevel, SimpleIntegerProperty> levelCountMap = new EnumMap<Log4jLevel, SimpleIntegerProperty>(Log4jLevel.class) {
|
||||||
private final ReadOnlyIntegerWrapper warn = new ReadOnlyIntegerWrapper(0);
|
{
|
||||||
private final ReadOnlyIntegerWrapper info = new ReadOnlyIntegerWrapper(0);
|
for (Log4jLevel level : Log4jLevel.values()) put(level, new SimpleIntegerProperty());
|
||||||
private final ReadOnlyIntegerWrapper debug = new ReadOnlyIntegerWrapper(0);
|
}
|
||||||
|
};
|
||||||
|
private final Map<Log4jLevel, SimpleBooleanProperty> levelShownMap = new EnumMap<Log4jLevel, SimpleBooleanProperty>(Log4jLevel.class) {
|
||||||
|
{
|
||||||
|
for (Log4jLevel level : Log4jLevel.values()) {
|
||||||
|
SimpleBooleanProperty property = new SimpleBooleanProperty(true);
|
||||||
|
put(level, property);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
private final LogWindowImpl impl = new LogWindowImpl();
|
private final LogWindowImpl impl = new LogWindowImpl();
|
||||||
private final CountDownLatch latch = new CountDownLatch(1);
|
private final WeakChangeListener<Number> logLinesListener = FXUtils.onWeakChange(config().logLinesProperty(), logLines -> checkLogCount());
|
||||||
public final EventManager<Event> onDone = new EventManager<>();
|
|
||||||
|
private boolean stopCheckLogCount = false;
|
||||||
|
|
||||||
public LogWindow() {
|
public LogWindow() {
|
||||||
setScene(new Scene(impl, 800, 480));
|
setScene(new Scene(impl, 800, 480));
|
||||||
getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
|
getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
|
||||||
setTitle(i18n("logwindow.title"));
|
setTitle(i18n("logwindow.title"));
|
||||||
getIcons().add(new Image("/assets/img/icon.png"));
|
getIcons().add(newImage("/assets/img/icon.png"));
|
||||||
}
|
|
||||||
|
|
||||||
public LogWindow(String text) {
|
levelShownMap.values().forEach(property -> property.addListener((a, b, newValue) -> shakeLogs()));
|
||||||
this();
|
|
||||||
|
|
||||||
onDone.register(() -> logLine(text, Log4jLevel.INFO));
|
|
||||||
}
|
|
||||||
|
|
||||||
public ReadOnlyIntegerProperty fatalProperty() {
|
|
||||||
return fatal.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getFatal() {
|
|
||||||
return fatal.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ReadOnlyIntegerProperty errorProperty() {
|
|
||||||
return error.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getError() {
|
|
||||||
return error.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ReadOnlyIntegerProperty warnProperty() {
|
|
||||||
return warn.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getWarn() {
|
|
||||||
return warn.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ReadOnlyIntegerProperty infoProperty() {
|
|
||||||
return info.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getInfo() {
|
|
||||||
return info.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ReadOnlyIntegerProperty debugProperty() {
|
|
||||||
return debug.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getDebug() {
|
|
||||||
return debug.get();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void logLine(String line, Log4jLevel level) {
|
public void logLine(String line, Log4jLevel level) {
|
||||||
Element div = impl.document.createElement("div");
|
Log log = new Log(parseEscapeSequence(line), level);
|
||||||
// a <pre> element to prevent multiple spaces and tabs being removed.
|
logs.add(log);
|
||||||
Element pre = impl.document.createElement("pre");
|
if (levelShownMap.get(level).get())
|
||||||
pre.setTextContent(line);
|
impl.listView.getItems().add(log);
|
||||||
div.appendChild(pre);
|
|
||||||
impl.body.appendChild(div);
|
|
||||||
impl.engine.executeScript("checkNewLog(\"" + level.name().toLowerCase() + "\");scrollToBottom();");
|
|
||||||
|
|
||||||
switch (level) {
|
levelCountMap.get(level).setValue(levelCountMap.get(level).getValue() + 1);
|
||||||
case FATAL:
|
if (!stopCheckLogCount) checkLogCount();
|
||||||
fatal.set(fatal.get() + 1);
|
}
|
||||||
break;
|
|
||||||
case ERROR:
|
public void showGameCrashReport() {
|
||||||
error.set(error.get() + 1);
|
stopCheckLogCount = true;
|
||||||
break;
|
for (Log log : impl.listView.getItems()) {
|
||||||
case WARN:
|
if (log.log.contains("Minecraft Crash Report")) {
|
||||||
warn.set(warn.get() + 1);
|
Platform.runLater(() -> {
|
||||||
break;
|
impl.listView.scrollTo(log);
|
||||||
case INFO:
|
});
|
||||||
info.set(info.get() + 1);
|
|
||||||
break;
|
|
||||||
case DEBUG:
|
|
||||||
debug.set(debug.get() + 1);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
// ignore
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
show();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void shakeLogs() {
|
||||||
|
impl.listView.getItems().setAll(logs.stream().filter(log -> levelShownMap.get(log.level).get()).collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkLogCount() {
|
||||||
|
while (logs.size() > config().getLogLines()) {
|
||||||
|
Log removedLog = logs.removeFirst();
|
||||||
|
if (!impl.listView.getItems().isEmpty() && impl.listView.getItems().get(0) == removedLog) {
|
||||||
|
// TODO: fix O(n)
|
||||||
|
impl.listView.getItems().remove(0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void waitForLoaded() throws InterruptedException {
|
private static class Log {
|
||||||
latch.await();
|
private final String log;
|
||||||
|
private final Log4jLevel level;
|
||||||
|
|
||||||
|
public Log(String log, Log4jLevel level) {
|
||||||
|
this.log = log;
|
||||||
|
this.level = level;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class LogWindowImpl extends StackPane {
|
public class LogWindowImpl extends Control {
|
||||||
|
|
||||||
@FXML
|
private ListView<Log> listView = new JFXListView<>();
|
||||||
private WebView webView;
|
private BooleanProperty autoScroll = new SimpleBooleanProperty();
|
||||||
@FXML
|
private List<StringProperty> buttonText = IntStream.range(0, 5).mapToObj(x -> new SimpleStringProperty()).collect(Collectors.toList());
|
||||||
private ToggleButton btnFatals;
|
private List<BooleanProperty> showLevel = IntStream.range(0, 5).mapToObj(x -> new SimpleBooleanProperty(true)).collect(Collectors.toList());
|
||||||
@FXML
|
private JFXComboBox<String> cboLines = new JFXComboBox<>();
|
||||||
private ToggleButton btnErrors;
|
|
||||||
@FXML
|
|
||||||
private ToggleButton btnWarns;
|
|
||||||
@FXML
|
|
||||||
private ToggleButton btnInfos;
|
|
||||||
@FXML
|
|
||||||
private ToggleButton btnDebugs;
|
|
||||||
@FXML
|
|
||||||
private ComboBox<String> cboLines;
|
|
||||||
|
|
||||||
final WebEngine engine;
|
|
||||||
Node body;
|
|
||||||
Document document;
|
|
||||||
|
|
||||||
LogWindowImpl() {
|
LogWindowImpl() {
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/log.fxml");
|
getStyleClass().add("log-window");
|
||||||
|
|
||||||
engine = webView.getEngine();
|
|
||||||
engine.loadContent(Lang.ignoringException(() -> IOUtils.readFullyAsString(getClass().getResourceAsStream("/assets/log-window-content.html")))
|
|
||||||
.replace("${FONT}", Settings.instance().getFont().getSize() + "px \"" + Settings.instance().getFont().getFamily() + "\""));
|
|
||||||
engine.getLoadWorker().stateProperty().addListener((a, b, newValue) -> {
|
|
||||||
if (newValue == Worker.State.SUCCEEDED) {
|
|
||||||
document = engine.getDocument();
|
|
||||||
body = document.getElementsByTagName("body").item(0);
|
|
||||||
engine.executeScript("limitedLogs=" + config().getLogLines());
|
|
||||||
latch.countDown();
|
|
||||||
onDone.fireEvent(new Event(LogWindow.this));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
|
cboLines.getItems().setAll("500", "2000", "5000");
|
||||||
for (String i : cboLines.getItems())
|
for (String i : cboLines.getItems())
|
||||||
if (Integer.toString(config().getLogLines()).equals(i)) {
|
if (Integer.toString(config().getLogLines()).equals(i)) {
|
||||||
cboLines.getSelectionModel().select(i);
|
cboLines.getSelectionModel().select(i);
|
||||||
@@ -196,50 +162,173 @@ public final class LogWindow extends Stage {
|
|||||||
|
|
||||||
cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
|
cboLines.getSelectionModel().selectedItemProperty().addListener((a, b, newValue) -> {
|
||||||
config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
|
config().setLogLines(newValue == null ? 100 : Integer.parseInt(newValue));
|
||||||
engine.executeScript("limitedLogs=" + config().getLogLines());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!flag)
|
if (!flag)
|
||||||
cboLines.getSelectionModel().select(0);
|
cboLines.getSelectionModel().select(0);
|
||||||
|
|
||||||
btnFatals.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(fatal.get()) + " fatals", fatal));
|
Log4jLevel[] levels = new Log4jLevel[]{Log4jLevel.FATAL, Log4jLevel.ERROR, Log4jLevel.WARN, Log4jLevel.INFO, Log4jLevel.DEBUG};
|
||||||
btnErrors.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(error.get()) + " errors", error));
|
String[] suffix = new String[]{"fatals", "errors", "warns", "infos", "debugs"};
|
||||||
btnWarns.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(warn.get()) + " warns", warn));
|
for (int i = 0; i < 5; ++i) {
|
||||||
btnInfos.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(info.get()) + " infos", info));
|
buttonText.get(i).bind(Bindings.concat(levelCountMap.get(levels[i]), " " + suffix[i]));
|
||||||
btnDebugs.textProperty().bind(Bindings.createStringBinding(() -> Integer.toString(debug.get()) + " debugs", debug));
|
levelShownMap.get(levels[i]).bind(showLevel.get(i));
|
||||||
|
}
|
||||||
btnFatals.selectedProperty().addListener(o -> specificChanged());
|
|
||||||
btnErrors.selectedProperty().addListener(o -> specificChanged());
|
|
||||||
btnWarns.selectedProperty().addListener(o -> specificChanged());
|
|
||||||
btnInfos.selectedProperty().addListener(o -> specificChanged());
|
|
||||||
btnDebugs.selectedProperty().addListener(o -> specificChanged());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void specificChanged() {
|
|
||||||
String res = "";
|
|
||||||
if (btnFatals.isSelected())
|
|
||||||
res += "\"fatal\", ";
|
|
||||||
if (btnErrors.isSelected())
|
|
||||||
res += "\"error\", ";
|
|
||||||
if (btnWarns.isSelected())
|
|
||||||
res += "\"warn\", ";
|
|
||||||
if (btnInfos.isSelected())
|
|
||||||
res += "\"info\", ";
|
|
||||||
if (btnDebugs.isSelected())
|
|
||||||
res += "\"debug\", ";
|
|
||||||
if (StringUtils.isNotBlank(res))
|
|
||||||
res = StringUtils.substringBeforeLast(res, ", ");
|
|
||||||
engine.executeScript("specific([" + res + "])");
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private void onTerminateGame() {
|
private void onTerminateGame() {
|
||||||
LauncherHelper.stopManagedProcesses();
|
LauncherHelper.stopManagedProcesses();
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
|
||||||
private void onClear() {
|
private void onClear() {
|
||||||
engine.executeScript("clear()");
|
impl.listView.getItems().clear();
|
||||||
|
logs.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onExportLogs() {
|
||||||
|
thread(() -> {
|
||||||
|
Path logFile = Paths.get("minecraft-exported-logs-" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH-mm-ss")) + ".log").toAbsolutePath();
|
||||||
|
try {
|
||||||
|
Files.write(logFile, logs.stream().map(x -> x.log).collect(Collectors.toList()));
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to export logs", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
JOptionPane.showMessageDialog(null, i18n("settings.launcher.launcher_log.export.success", logFile), i18n("settings.launcher.launcher_log.export"), JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
if (Desktop.isDesktopSupported()) {
|
||||||
|
try {
|
||||||
|
Desktop.getDesktop().open(logFile.toFile());
|
||||||
|
} catch (IOException | IllegalArgumentException ignored) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Skin<?> createDefaultSkin() {
|
||||||
|
return new LogWindowSkin(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class LogWindowSkin extends SkinBase<LogWindowImpl> {
|
||||||
|
private static PseudoClass EMPTY = PseudoClass.getPseudoClass("empty");
|
||||||
|
private static PseudoClass FATAL = PseudoClass.getPseudoClass("fatal");
|
||||||
|
private static PseudoClass ERROR = PseudoClass.getPseudoClass("error");
|
||||||
|
private static PseudoClass WARN = PseudoClass.getPseudoClass("warn");
|
||||||
|
private static PseudoClass INFO = PseudoClass.getPseudoClass("info");
|
||||||
|
private static PseudoClass DEBUG = PseudoClass.getPseudoClass("debug");
|
||||||
|
private static PseudoClass TRACE = PseudoClass.getPseudoClass("trace");
|
||||||
|
|
||||||
|
private static ToggleButton createToggleButton(String backgroundColor, StringProperty buttonText, BooleanProperty showLevel) {
|
||||||
|
ToggleButton button = new ToggleButton();
|
||||||
|
button.setStyle("-fx-background-color: " + backgroundColor + ";");
|
||||||
|
button.getStyleClass().add("log-toggle");
|
||||||
|
button.textProperty().bind(buttonText);
|
||||||
|
button.setSelected(true);
|
||||||
|
showLevel.bind(button.selectedProperty());
|
||||||
|
return button;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected LogWindowSkin(LogWindowImpl control) {
|
||||||
|
super(control);
|
||||||
|
|
||||||
|
VBox vbox = new VBox(3);
|
||||||
|
vbox.setPadding(new Insets(3, 0, 3, 0));
|
||||||
|
vbox.setStyle("-fx-background-color: white");
|
||||||
|
getChildren().setAll(vbox);
|
||||||
|
|
||||||
|
{
|
||||||
|
BorderPane borderPane = new BorderPane();
|
||||||
|
borderPane.setPadding(new Insets(0, 3, 0, 3));
|
||||||
|
|
||||||
|
{
|
||||||
|
HBox hBox = new HBox(3);
|
||||||
|
hBox.setPadding(new Insets(0, 0, 0, 4));
|
||||||
|
hBox.setAlignment(Pos.CENTER_LEFT);
|
||||||
|
|
||||||
|
Label label = new Label(i18n("logwindow.show_lines"));
|
||||||
|
hBox.getChildren().setAll(label, control.cboLines);
|
||||||
|
|
||||||
|
borderPane.setLeft(hBox);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
HBox hBox = new HBox(3);
|
||||||
|
hBox.getChildren().setAll(
|
||||||
|
createToggleButton("#F7A699", control.buttonText.get(0), control.showLevel.get(0)),
|
||||||
|
createToggleButton("#FFCCBB", control.buttonText.get(1), control.showLevel.get(1)),
|
||||||
|
createToggleButton("#FFEECC", control.buttonText.get(2), control.showLevel.get(2)),
|
||||||
|
createToggleButton("#FBFBFB", control.buttonText.get(3), control.showLevel.get(3)),
|
||||||
|
createToggleButton("#EEE9E0", control.buttonText.get(4), control.showLevel.get(4))
|
||||||
|
);
|
||||||
|
borderPane.setRight(hBox);
|
||||||
|
}
|
||||||
|
|
||||||
|
vbox.getChildren().add(borderPane);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
ListView<Log> listView = control.listView;
|
||||||
|
listView.getItems().addListener((InvalidationListener) observable -> {
|
||||||
|
if (!listView.getItems().isEmpty() && control.autoScroll.get())
|
||||||
|
listView.scrollTo(listView.getItems().size() - 1);
|
||||||
|
});
|
||||||
|
listView.setStyle("-fx-font-family: " + config().getFontFamily() + "; -fx-font-size: " + config().getFontSize() + "px;");
|
||||||
|
listView.setCellFactory(x -> new ListCell<Log>() {
|
||||||
|
{
|
||||||
|
Region clippedContainer = (Region)listView.lookup(".clipped-container");
|
||||||
|
if (clippedContainer != null) {
|
||||||
|
maxWidthProperty().bind(clippedContainer.widthProperty());
|
||||||
|
prefWidthProperty().bind(clippedContainer.widthProperty());
|
||||||
|
}
|
||||||
|
setPadding(new Insets(2));
|
||||||
|
setWrapText(true);
|
||||||
|
setGraphic(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateItem(Log item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
pseudoClassStateChanged(EMPTY, empty);
|
||||||
|
pseudoClassStateChanged(FATAL, !empty && item.level == Log4jLevel.FATAL);
|
||||||
|
pseudoClassStateChanged(ERROR, !empty && item.level == Log4jLevel.ERROR);
|
||||||
|
pseudoClassStateChanged(WARN, !empty && item.level == Log4jLevel.WARN);
|
||||||
|
pseudoClassStateChanged(INFO, !empty && item.level == Log4jLevel.INFO);
|
||||||
|
pseudoClassStateChanged(DEBUG, !empty && item.level == Log4jLevel.DEBUG);
|
||||||
|
pseudoClassStateChanged(TRACE, !empty && item.level == Log4jLevel.TRACE);
|
||||||
|
if (empty) {
|
||||||
|
setText(null);
|
||||||
|
} else {
|
||||||
|
setText(item.log);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
VBox.setVgrow(listView, Priority.ALWAYS);
|
||||||
|
vbox.getChildren().add(listView);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
HBox hBox = new HBox(3);
|
||||||
|
hBox.setAlignment(Pos.CENTER_RIGHT);
|
||||||
|
hBox.setPadding(new Insets(0, 3, 0, 3));
|
||||||
|
|
||||||
|
JFXCheckBox autoScrollCheckBox = new JFXCheckBox(i18n("logwindow.autoscroll"));
|
||||||
|
autoScrollCheckBox.setSelected(true);
|
||||||
|
control.autoScroll.bind(autoScrollCheckBox.selectedProperty());
|
||||||
|
|
||||||
|
JFXButton terminateButton = new JFXButton(i18n("logwindow.terminate_game"));
|
||||||
|
terminateButton.setOnMouseClicked(e -> getSkinnable().onTerminateGame());
|
||||||
|
|
||||||
|
JFXButton exportLogsButton = new JFXButton(i18n("button.export"));
|
||||||
|
exportLogsButton.setOnMouseClicked(e -> getSkinnable().onExportLogs());
|
||||||
|
|
||||||
|
JFXButton clearButton = new JFXButton(i18n("button.clear"));
|
||||||
|
clearButton.setOnMouseClicked(e -> getSkinnable().onClear());
|
||||||
|
hBox.getChildren().setAll(autoScrollCheckBox, exportLogsButton, terminateButton, clearButton);
|
||||||
|
|
||||||
|
vbox.getChildren().add(hBox);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.ui;
|
|
||||||
|
|
||||||
import javafx.beans.property.ReadOnlyStringProperty;
|
|
||||||
import javafx.beans.property.ReadOnlyStringWrapper;
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.scene.layout.StackPane;
|
|
||||||
import org.jackhuang.hmcl.setting.ConfigHolder;
|
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
|
||||||
import org.jackhuang.hmcl.setting.Profiles;
|
|
||||||
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
|
|
||||||
import org.jackhuang.hmcl.ui.versions.Versions;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|
||||||
|
|
||||||
public final class MainPage extends StackPane implements DecoratorPage {
|
|
||||||
|
|
||||||
private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("main_page"));
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private StackPane main;
|
|
||||||
|
|
||||||
{
|
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/main.fxml");
|
|
||||||
|
|
||||||
FXUtils.onChangeAndOperate(ConfigHolder.config().enableMainPageGameListProperty(), newValue -> {
|
|
||||||
if (newValue)
|
|
||||||
getChildren().setAll(new GameVersionListPage());
|
|
||||||
else
|
|
||||||
getChildren().setAll(main);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@FXML
|
|
||||||
private void launch() {
|
|
||||||
Profile profile = Profiles.getSelectedProfile();
|
|
||||||
Versions.launch(profile, profile.getSelectedVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ReadOnlyStringProperty titleProperty() {
|
|
||||||
return title.getReadOnlyProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title.set(title);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
@@ -29,11 +29,15 @@ public final class SVG {
|
|||||||
private SVG() {
|
private SVG() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public interface SVGIcon {
|
||||||
|
Node createIcon(ObjectBinding<? extends Paint> fill, double width, double height);
|
||||||
|
}
|
||||||
|
|
||||||
private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
|
private static Node createSVGPath(String d, ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
SVGPath path = new SVGPath();
|
SVGPath path = new SVGPath();
|
||||||
path.getStyleClass().add("svg");
|
path.getStyleClass().add("svg");
|
||||||
path.setContent(d);
|
path.setContent(d);
|
||||||
path.fillProperty().bind(fill);
|
if (fill != null) path.fillProperty().bind(fill);
|
||||||
|
|
||||||
if (width < 0 || height < 0) {
|
if (width < 0 || height < 0) {
|
||||||
StackPane pane = new StackPane(path);
|
StackPane pane = new StackPane(path);
|
||||||
@@ -63,10 +67,18 @@ public final class SVG {
|
|||||||
return createSVGPath("M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z", fill, width, height);
|
return createSVGPath("M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z", fill, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Node copy(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M19,21H8V7H19M19,5H8A2,2 0 0,0 6,7V21A2,2 0 0,0 8,23H19A2,2 0 0,0 21,21V7A2,2 0 0,0 19,5M16,1H4A2,2 0 0,0 2,3V17H4V3H16V1Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
public static Node dotsVertical(ObjectBinding<? extends Paint> fill, double width, double height) {
|
public static Node dotsVertical(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
return createSVGPath("M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z", fill, width, height);
|
return createSVGPath("M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z", fill, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Node dotsHorizontal(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2 0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1 6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
public static Node delete(ObjectBinding<? extends Paint> fill, double width, double height) {
|
public static Node delete(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
return createSVGPath("M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z", fill, width, height);
|
return createSVGPath("M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z", fill, width, height);
|
||||||
}
|
}
|
||||||
@@ -150,4 +162,36 @@ public final class SVG {
|
|||||||
public static Node openInNew(ObjectBinding<? extends Paint> fill, double width, double height) {
|
public static Node openInNew(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
return createSVGPath("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z", fill, width, height);
|
return createSVGPath("M14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V12H19V19Z", fill, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Node triangle(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M1,21H23L12,2", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node home(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node viewList(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M7,5H21V7H7V5M7,13V11H21V13H7M4,4.5A1.5,1.5 0 0,1 5.5,6A1.5,1.5 0 0,1 4,7.5A1.5,1.5 0 0,1 2.5,6A1.5,1.5 0 0,1 4,4.5M4,10.5A1.5,1.5 0 0,1 5.5,12A1.5,1.5 0 0,1 4,13.5A1.5,1.5 0 0,1 2.5,12A1.5,1.5 0 0,1 4,10.5M7,19V17H21V19H7M4,16.5A1.5,1.5 0 0,1 5.5,18A1.5,1.5 0 0,1 4,19.5A1.5,1.5 0 0,1 2.5,18A1.5,1.5 0 0,1 4,16.5Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node check(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node arrowRight(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node wrench(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M22.7,19L13.6,9.9C14.5,7.6 14,4.9 12.1,3C10.1,1 7.1,0.6 4.7,1.7L9,6L6,9L1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1C4.8,14 7.5,14.5 9.8,13.6L18.9,22.7C19.3,23.1 19.9,23.1 20.3,22.7L22.6,20.4C23.1,20 23.1,19.3 22.7,19Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node upload(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M9,16V10H5L12,3L19,10H15V16H9M5,20V18H19V20H5Z", fill, width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node hanger(ObjectBinding<? extends Paint> fill, double width, double height) {
|
||||||
|
return createSVGPath("M12 4A3.5 3.5 0 0 0 8.5 7.5H10.5A1.5 1.5 0 0 1 12 6A1.5 1.5 0 0 1 13.5 7.5A1.5 1.5 0 0 1 12 9C11.45 9 11 9.45 11 10V11.75L2.4 18.2A1 1 0 0 0 3 20H21A1 1 0 0 0 21.6 18.2L13 11.75V10.85A3.5 3.5 0 0 0 15.5 7.5A3.5 3.5 0 0 0 12 4M12 13.5L18 18H6Z", fill, width, height);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.ui;
|
|
||||||
|
|
||||||
import javafx.util.StringConverter;
|
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author huangyuhui
|
|
||||||
*/
|
|
||||||
public final class SafeIntStringConverter extends StringConverter<Number> {
|
|
||||||
public static final SafeIntStringConverter INSTANCE = new SafeIntStringConverter();
|
|
||||||
|
|
||||||
private SafeIntStringConverter() {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Number fromString(String string) {
|
|
||||||
return Optional.ofNullable(string).map(Lang::toIntOrNull).orElse(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString(Number object) {
|
|
||||||
return Optional.ofNullable(object).map(Object::toString).orElse("");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXButton;
|
||||||
|
import com.jfoenix.controls.JFXScrollPane;
|
||||||
|
import com.jfoenix.effects.JFXDepthManager;
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.scene.Node;
|
||||||
|
import javafx.scene.control.ScrollPane;
|
||||||
|
import javafx.scene.control.SkinBase;
|
||||||
|
import javafx.scene.layout.BorderPane;
|
||||||
|
import javafx.scene.layout.HBox;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
|
import javafx.scene.layout.VBox;
|
||||||
|
import org.jackhuang.hmcl.setting.Theme;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.SpinnerPane;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
|
||||||
|
|
||||||
|
public ToolbarListPageSkin(T skinnable) {
|
||||||
|
super(skinnable);
|
||||||
|
|
||||||
|
SpinnerPane spinnerPane = new SpinnerPane();
|
||||||
|
spinnerPane.getStyleClass().add("large-spinner-pane");
|
||||||
|
|
||||||
|
BorderPane root = new BorderPane();
|
||||||
|
|
||||||
|
List<Node> toolbarButtons = initializeToolbar(skinnable);
|
||||||
|
if (!toolbarButtons.isEmpty()) {
|
||||||
|
HBox toolbar = new HBox();
|
||||||
|
toolbar.getStyleClass().add("jfx-tool-bar-second");
|
||||||
|
JFXDepthManager.setDepth(toolbar, 1);
|
||||||
|
toolbar.setPickOnBounds(false);
|
||||||
|
toolbar.getChildren().setAll(toolbarButtons);
|
||||||
|
root.setTop(toolbar);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
ScrollPane scrollPane = new ScrollPane();
|
||||||
|
scrollPane.setFitToWidth(true);
|
||||||
|
|
||||||
|
VBox content = new VBox();
|
||||||
|
content.setSpacing(10);
|
||||||
|
content.setPadding(new Insets(10));
|
||||||
|
|
||||||
|
Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
|
||||||
|
|
||||||
|
scrollPane.setContent(content);
|
||||||
|
JFXScrollPane.smoothScrolling(scrollPane);
|
||||||
|
|
||||||
|
root.setCenter(scrollPane);
|
||||||
|
}
|
||||||
|
|
||||||
|
spinnerPane.loadingProperty().bind(skinnable.loadingProperty());
|
||||||
|
spinnerPane.setContent(root);
|
||||||
|
|
||||||
|
getChildren().setAll(spinnerPane);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node wrap(Node node) {
|
||||||
|
StackPane stackPane = new StackPane();
|
||||||
|
stackPane.setPadding(new Insets(0, 5, 0, 2));
|
||||||
|
stackPane.getChildren().setAll(node);
|
||||||
|
return stackPane;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static JFXButton createToolbarButton(String text, SVG.SVGIcon creator, Runnable onClick) {
|
||||||
|
JFXButton ret = new JFXButton();
|
||||||
|
ret.getStyleClass().add("jfx-tool-bar-button");
|
||||||
|
ret.textFillProperty().bind(Theme.foregroundFillBinding());
|
||||||
|
ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
|
||||||
|
ret.setText(text);
|
||||||
|
ret.setOnMouseClicked(e -> onClick.run());
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static JFXButton createDecoratorButton(String tooltip, SVG.SVGIcon creator, Runnable onClick) {
|
||||||
|
JFXButton ret = new JFXButton();
|
||||||
|
ret.getStyleClass().add("jfx-decorator-button");
|
||||||
|
ret.textFillProperty().bind(Theme.foregroundFillBinding());
|
||||||
|
ret.setGraphic(wrap(creator.createIcon(Theme.foregroundFillBinding(), -1, -1)));
|
||||||
|
FXUtils.installFastTooltip(ret, tooltip);
|
||||||
|
ret.setOnMouseClicked(e -> onClick.run());
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract List<Node> initializeToolbar(T skinnable);
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXButton;
|
||||||
|
import com.jfoenix.controls.JFXDialogLayout;
|
||||||
|
import javafx.scene.control.Label;
|
||||||
|
import javafx.scene.web.WebEngine;
|
||||||
|
import javafx.scene.web.WebView;
|
||||||
|
import org.jackhuang.hmcl.Metadata;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.Metadata.CHANGELOG_URL;
|
||||||
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
|
public class UpgradeDialog extends JFXDialogLayout {
|
||||||
|
public UpgradeDialog(Runnable updateRunnable) {
|
||||||
|
{
|
||||||
|
setHeading(new Label(i18n("update.changelog")));
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
WebView webView = new WebView();
|
||||||
|
webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
|
||||||
|
WebEngine engine = webView.getEngine();
|
||||||
|
engine.load(CHANGELOG_URL + config().getUpdateChannel().channelName);
|
||||||
|
engine.getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
|
||||||
|
String url = engine.getLoadWorker().getMessage().trim();
|
||||||
|
if (!url.startsWith(CHANGELOG_URL)) {
|
||||||
|
engine.getLoadWorker().cancel();
|
||||||
|
FXUtils.openLink(url);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
setBody(webView);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
JFXButton updateButton = new JFXButton(i18n("update.accept"));
|
||||||
|
updateButton.getStyleClass().add("dialog-accept");
|
||||||
|
updateButton.setOnMouseClicked(e -> updateRunnable.run());
|
||||||
|
|
||||||
|
JFXButton cancelButton = new JFXButton(i18n("button.cancel"));
|
||||||
|
cancelButton.getStyleClass().add("dialog-cancel");
|
||||||
|
cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
|
||||||
|
|
||||||
|
setActions(updateButton, cancelButton);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,231 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.ui;
|
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
|
||||||
import javafx.beans.binding.Bindings;
|
|
||||||
import javafx.event.EventHandler;
|
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.geometry.Insets;
|
|
||||||
import javafx.geometry.Pos;
|
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.effect.BlurType;
|
|
||||||
import javafx.scene.effect.DropShadow;
|
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.image.ImageView;
|
|
||||||
import javafx.scene.input.MouseButton;
|
|
||||||
import javafx.scene.input.MouseEvent;
|
|
||||||
import javafx.scene.layout.*;
|
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.text.TextAlignment;
|
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|
||||||
|
|
||||||
public final class VersionItem extends StackPane {
|
|
||||||
@FXML
|
|
||||||
private Pane icon;
|
|
||||||
@FXML
|
|
||||||
private VBox content;
|
|
||||||
@FXML
|
|
||||||
private StackPane header;
|
|
||||||
@FXML
|
|
||||||
private StackPane body;
|
|
||||||
@FXML
|
|
||||||
private JFXButton btnSettings;
|
|
||||||
@FXML
|
|
||||||
private JFXButton btnUpdate;
|
|
||||||
@FXML
|
|
||||||
private JFXButton btnLaunch;
|
|
||||||
@FXML
|
|
||||||
private JFXButton btnScript;
|
|
||||||
@FXML
|
|
||||||
private Label lblVersionName;
|
|
||||||
@FXML
|
|
||||||
private Label lblGameVersion;
|
|
||||||
@FXML
|
|
||||||
private Label lblLibraries;
|
|
||||||
@FXML
|
|
||||||
private ImageView iconView;
|
|
||||||
|
|
||||||
private EventHandler<? super MouseEvent> launchClickedHandler = null;
|
|
||||||
|
|
||||||
private void initializeComponents() {
|
|
||||||
setPickOnBounds(false);
|
|
||||||
FXUtils.setLimitWidth(this, 160);
|
|
||||||
FXUtils.setLimitHeight(this, 149);
|
|
||||||
|
|
||||||
content = new VBox();
|
|
||||||
{
|
|
||||||
header = new StackPane();
|
|
||||||
VBox.setVgrow(header, Priority.ALWAYS);
|
|
||||||
header.setPickOnBounds(false);
|
|
||||||
header.setPadding(new Insets(8));
|
|
||||||
header.setStyle("-fx-background-radius: 2 2 0 0; -fx-background-color: rgb(255,255,255,0.87);");
|
|
||||||
{
|
|
||||||
VBox headerContent = new VBox();
|
|
||||||
headerContent.setPadding(new Insets(8, 8, 0, 8));
|
|
||||||
{
|
|
||||||
lblVersionName = new Label();
|
|
||||||
lblVersionName.setStyle("-fx-font-size: 15;");
|
|
||||||
lblVersionName.setTextAlignment(TextAlignment.JUSTIFY);
|
|
||||||
lblVersionName.setWrapText(true);
|
|
||||||
headerContent.getChildren().add(lblVersionName);
|
|
||||||
|
|
||||||
lblGameVersion = new Label();
|
|
||||||
lblGameVersion.setStyle("-fx-font-size: 11;");
|
|
||||||
lblGameVersion.setTextAlignment(TextAlignment.JUSTIFY);
|
|
||||||
lblGameVersion.setWrapText(true);
|
|
||||||
headerContent.getChildren().add(lblGameVersion);
|
|
||||||
|
|
||||||
lblLibraries = new Label();
|
|
||||||
lblLibraries.setStyle("-fx-font-size: 10; -fx-text-fill: gray;");
|
|
||||||
lblLibraries.setTextAlignment(TextAlignment.JUSTIFY);
|
|
||||||
lblLibraries.setWrapText(true);
|
|
||||||
headerContent.getChildren().add(lblLibraries);
|
|
||||||
}
|
|
||||||
header.getChildren().add(headerContent);
|
|
||||||
}
|
|
||||||
content.getChildren().add(header);
|
|
||||||
|
|
||||||
body = new StackPane();
|
|
||||||
body.setStyle("-fx-background-radius: 0 0 2 2; -fx-background-color: rgb(255,255,255,0.87); -fx-padding: 8;");
|
|
||||||
body.setMinHeight(40);
|
|
||||||
body.setPickOnBounds(false);
|
|
||||||
{
|
|
||||||
BorderPane bodyContent = new BorderPane();
|
|
||||||
{
|
|
||||||
HBox hbox = new HBox();
|
|
||||||
hbox.setSpacing(8);
|
|
||||||
{
|
|
||||||
btnSettings = new JFXButton();
|
|
||||||
btnSettings.getStyleClass().add("toggle-icon4");
|
|
||||||
FXUtils.setLimitWidth(btnSettings, 30);
|
|
||||||
FXUtils.setLimitHeight(btnSettings, 30);
|
|
||||||
hbox.getChildren().add(btnSettings);
|
|
||||||
|
|
||||||
btnUpdate = new JFXButton();
|
|
||||||
btnUpdate.getStyleClass().add("toggle-icon4");
|
|
||||||
FXUtils.setLimitWidth(btnUpdate, 30);
|
|
||||||
FXUtils.setLimitHeight(btnUpdate, 30);
|
|
||||||
hbox.getChildren().add(btnUpdate);
|
|
||||||
}
|
|
||||||
bodyContent.setLeft(hbox);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
HBox hbox = new HBox();
|
|
||||||
hbox.setSpacing(8);
|
|
||||||
{
|
|
||||||
btnScript = new JFXButton();
|
|
||||||
btnScript.getStyleClass().add("toggle-icon4");
|
|
||||||
FXUtils.setLimitWidth(btnScript, 30);
|
|
||||||
FXUtils.setLimitHeight(btnScript, 30);
|
|
||||||
hbox.getChildren().add(btnScript);
|
|
||||||
|
|
||||||
btnLaunch = new JFXButton();
|
|
||||||
btnLaunch.getStyleClass().add("toggle-icon4");
|
|
||||||
FXUtils.setLimitWidth(btnLaunch, 30);
|
|
||||||
FXUtils.setLimitHeight(btnLaunch, 30);
|
|
||||||
hbox.getChildren().add(btnLaunch);
|
|
||||||
}
|
|
||||||
bodyContent.setRight(hbox);
|
|
||||||
}
|
|
||||||
body.getChildren().setAll(bodyContent);
|
|
||||||
}
|
|
||||||
content.getChildren().add(body);
|
|
||||||
}
|
|
||||||
getChildren().add(content);
|
|
||||||
|
|
||||||
icon = new StackPane();
|
|
||||||
StackPane.setAlignment(icon, Pos.TOP_RIGHT);
|
|
||||||
icon.setPickOnBounds(false);
|
|
||||||
{
|
|
||||||
iconView = new ImageView();
|
|
||||||
StackPane.setAlignment(iconView, Pos.CENTER_RIGHT);
|
|
||||||
StackPane.setMargin(iconView, new Insets(0, 12, 0, 0));
|
|
||||||
iconView.setImage(new Image("/assets/img/icon.png"));
|
|
||||||
icon.getChildren().add(iconView);
|
|
||||||
}
|
|
||||||
getChildren().add(icon);
|
|
||||||
}
|
|
||||||
|
|
||||||
public VersionItem() {
|
|
||||||
initializeComponents();
|
|
||||||
setEffect(new DropShadow(BlurType.GAUSSIAN, Color.rgb(0, 0, 0, 0.26), 5.0, 0.12, -1.0, 1.0));
|
|
||||||
btnSettings.setGraphic(SVG.gear(Theme.blackFillBinding(), 15, 15));
|
|
||||||
btnUpdate.setGraphic(SVG.update(Theme.blackFillBinding(), 15, 15));
|
|
||||||
btnLaunch.setGraphic(SVG.launch(Theme.blackFillBinding(), 15, 15));
|
|
||||||
btnScript.setGraphic(SVG.script(Theme.blackFillBinding(), 15, 15));
|
|
||||||
|
|
||||||
JFXUtilities.runInFX(() -> {
|
|
||||||
FXUtils.installTooltip(btnSettings, i18n("version.settings"));
|
|
||||||
FXUtils.installTooltip(btnUpdate, i18n("version.update"));
|
|
||||||
FXUtils.installTooltip(btnLaunch, i18n("version.launch"));
|
|
||||||
FXUtils.installTooltip(btnScript, i18n("version.launch_script"));
|
|
||||||
});
|
|
||||||
|
|
||||||
icon.translateYProperty().bind(Bindings.createDoubleBinding(() -> header.getBoundsInParent().getHeight() - icon.getHeight() / 2 - 16, header.boundsInParentProperty(), icon.heightProperty()));
|
|
||||||
FXUtils.limitSize(iconView, 32, 32);
|
|
||||||
|
|
||||||
setOnMouseClicked(e -> {
|
|
||||||
if (e.getButton() == MouseButton.PRIMARY)
|
|
||||||
if (e.getClickCount() == 2)
|
|
||||||
Optional.ofNullable(launchClickedHandler).ifPresent(h -> h.handle(e));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUpdate(boolean update) {
|
|
||||||
btnUpdate.setVisible(update);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setVersionName(String versionName) {
|
|
||||||
lblVersionName.setText(versionName);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGameVersion(String gameVersion) {
|
|
||||||
lblGameVersion.setText(gameVersion);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setLibraries(String libraries) {
|
|
||||||
lblLibraries.setText(libraries);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setImage(Image image) {
|
|
||||||
iconView.setImage(image);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnSettingsButtonClicked(EventHandler<? super MouseEvent> handler) {
|
|
||||||
btnSettings.setOnMouseClicked(handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnScriptButtonClicked(EventHandler<? super MouseEvent> handler) {
|
|
||||||
btnScript.setOnMouseClicked(handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnLaunchButtonClicked(EventHandler<? super MouseEvent> handler) {
|
|
||||||
launchClickedHandler = handler;
|
|
||||||
btnLaunch.setOnMouseClicked(handler);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnUpdateButtonClicked(EventHandler<? super MouseEvent> handler) {
|
|
||||||
btnUpdate.setOnMouseClicked(handler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,24 +13,57 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui;
|
package org.jackhuang.hmcl.ui;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXProgressBar;
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.layout.BorderPane;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
|
import javafx.scene.web.WebEngine;
|
||||||
import javafx.scene.web.WebView;
|
import javafx.scene.web.WebView;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
import org.jackhuang.hmcl.Metadata;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.newImage;
|
||||||
|
|
||||||
public class WebStage extends Stage {
|
public class WebStage extends Stage {
|
||||||
private final WebView webView = new WebView();
|
protected final StackPane pane = new StackPane();
|
||||||
|
protected final JFXProgressBar progressBar = new JFXProgressBar();
|
||||||
|
protected final WebView webView = new WebView();
|
||||||
|
protected final WebEngine webEngine = webView.getEngine();
|
||||||
|
|
||||||
public WebStage() {
|
public WebStage() {
|
||||||
setScene(new Scene(webView, 800, 480));
|
this(800, 480);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebStage(int width, int height) {
|
||||||
|
setScene(new Scene(pane, width, height));
|
||||||
getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
|
getScene().getStylesheets().addAll(config().getTheme().getStylesheets());
|
||||||
getIcons().add(new Image("/assets/img/icon.png"));
|
getIcons().add(newImage("/assets/img/icon.png"));
|
||||||
|
webView.getEngine().setUserDataDirectory(Metadata.HMCL_DIRECTORY.toFile());
|
||||||
|
webView.setContextMenuEnabled(false);
|
||||||
|
progressBar.progressProperty().bind(webView.getEngine().getLoadWorker().progressProperty());
|
||||||
|
|
||||||
|
progressBar.visibleProperty().bind(Bindings.createBooleanBinding(() -> {
|
||||||
|
switch (webView.getEngine().getLoadWorker().getState()) {
|
||||||
|
case SUCCEEDED:
|
||||||
|
case FAILED:
|
||||||
|
case CANCELLED:
|
||||||
|
return false;
|
||||||
|
default:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}, webEngine.getLoadWorker().stateProperty()));
|
||||||
|
|
||||||
|
BorderPane borderPane = new BorderPane();
|
||||||
|
borderPane.setPickOnBounds(false);
|
||||||
|
borderPane.setTop(progressBar);
|
||||||
|
progressBar.prefWidthProperty().bind(borderPane.widthProperty());
|
||||||
|
pane.getChildren().setAll(webView, borderPane);
|
||||||
}
|
}
|
||||||
|
|
||||||
public WebView getWebView() {
|
public WebView getWebView() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,51 +13,69 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
import javafx.beans.property.*;
|
||||||
import javafx.scene.image.Image;
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.scene.control.Tooltip;
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
import org.jackhuang.hmcl.auth.Account;
|
||||||
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
||||||
import org.jackhuang.hmcl.game.AccountHelper;
|
import org.jackhuang.hmcl.game.TexturesLoader;
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
import org.jackhuang.hmcl.setting.Accounts;
|
||||||
|
import org.jackhuang.hmcl.setting.Theme;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
import org.jackhuang.hmcl.ui.SVG;
|
||||||
import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
|
import org.jackhuang.hmcl.ui.construct.AdvancedListItem;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.newImage;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public class AccountAdvancedListItem extends AdvancedListItem {
|
public class AccountAdvancedListItem extends AdvancedListItem {
|
||||||
|
private final Tooltip tooltip;
|
||||||
|
|
||||||
private ObjectProperty<Account> account = new SimpleObjectProperty<Account>() {
|
private ObjectProperty<Account> account = new SimpleObjectProperty<Account>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void invalidated() {
|
protected void invalidated() {
|
||||||
Account account = get();
|
Account account = get();
|
||||||
if (account == null) {
|
if (account == null) {
|
||||||
titleProperty().set(i18n("account.missing"));
|
titleProperty().unbind();
|
||||||
subtitleProperty().set(i18n("account.missing.add"));
|
setTitle(i18n("account.missing"));
|
||||||
imageProperty().set(new Image("/assets/img/craft_table.png"));
|
setSubtitle(i18n("account.missing.add"));
|
||||||
viewportProperty().set(null);
|
imageProperty().unbind();
|
||||||
|
setImage(newImage("/assets/img/craft_table.png"));
|
||||||
|
tooltip.setText("");
|
||||||
} else {
|
} else {
|
||||||
titleProperty().set(account.getCharacter());
|
titleProperty().bind(Bindings.createStringBinding(account::getCharacter, account));
|
||||||
subtitleProperty().set(accountSubtitle(account));
|
setSubtitle(accountSubtitle(account));
|
||||||
|
imageProperty().bind(TexturesLoader.fxAvatarBinding(account, 32));
|
||||||
imageProperty().set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
|
tooltip.setText(account.getCharacter() + " " + accountTooltip(account));
|
||||||
viewportProperty().set(AccountHelper.getViewport(4));
|
|
||||||
|
|
||||||
if (account instanceof YggdrasilAccount) {
|
|
||||||
AccountHelper.loadSkinAsync((YggdrasilAccount) account).subscribe(Schedulers.javafx(), () -> {
|
|
||||||
Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
|
|
||||||
imageProperty().set(image);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public AccountAdvancedListItem() {
|
public AccountAdvancedListItem() {
|
||||||
|
setRightGraphic(SVG.viewList(Theme.blackFillBinding(), -1, -1));
|
||||||
|
tooltip = new Tooltip();
|
||||||
|
FXUtils.installFastTooltip(this, tooltip);
|
||||||
|
|
||||||
|
setOnScroll(event -> {
|
||||||
|
Account current = account.get();
|
||||||
|
if (current == null) return;
|
||||||
|
ObservableList<Account> accounts = Accounts.getAccounts();
|
||||||
|
int currentIndex = accounts.indexOf(account.get());
|
||||||
|
if (event.getDeltaY() > 0) { // up
|
||||||
|
currentIndex--;
|
||||||
|
} else { // down
|
||||||
|
currentIndex++;
|
||||||
|
}
|
||||||
|
Accounts.setSelectedAccount(accounts.get((currentIndex + accounts.size()) % accounts.size()));
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObjectProperty<Account> accountProperty() {
|
public ObjectProperty<Account> accountProperty() {
|
||||||
@@ -65,11 +83,22 @@ public class AccountAdvancedListItem extends AdvancedListItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static String accountSubtitle(Account account) {
|
private static String accountSubtitle(Account account) {
|
||||||
if (account instanceof OfflineAccount)
|
String loginTypeName = Accounts.getLocalizedLoginTypeName(Accounts.getAccountFactory(account));
|
||||||
return i18n("account.methods.offline");
|
if (account instanceof AuthlibInjectorAccount) {
|
||||||
else if (account instanceof YggdrasilAccount)
|
return ((AuthlibInjectorAccount) account).getServer().getName();
|
||||||
|
} else {
|
||||||
|
return loginTypeName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String accountTooltip(Account account) {
|
||||||
|
if (account instanceof AuthlibInjectorAccount) {
|
||||||
|
AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
|
||||||
|
return account.getUsername() + ", " + i18n("account.injector.server") + ": " + server.getName();
|
||||||
|
} else if (account instanceof YggdrasilAccount) {
|
||||||
return account.getUsername();
|
return account.getUsername();
|
||||||
else
|
} else {
|
||||||
return "";
|
return "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,54 +13,29 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import javafx.beans.property.*;
|
import javafx.beans.property.*;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ObservableList;
|
|
||||||
import javafx.scene.control.ToggleGroup;
|
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
import org.jackhuang.hmcl.auth.Account;
|
||||||
import org.jackhuang.hmcl.ui.Controllers;
|
import org.jackhuang.hmcl.ui.Controllers;
|
||||||
import org.jackhuang.hmcl.ui.ListPage;
|
import org.jackhuang.hmcl.ui.ListPage;
|
||||||
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
|
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
|
||||||
import org.jackhuang.hmcl.util.MappedObservableList;
|
import org.jackhuang.hmcl.util.javafx.MappedObservableList;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.onInvalidating;
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor;
|
||||||
|
|
||||||
public class AccountList extends ListPage<AccountListItem> implements DecoratorPage {
|
public class AccountList extends ListPage<AccountListItem> implements DecoratorPage {
|
||||||
private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(i18n("account.manage"));
|
private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("account.manage")));
|
||||||
private ObjectProperty<Account> selectedAccount = new SimpleObjectProperty<Account>() {
|
private final ListProperty<Account> accounts = new SimpleListProperty<>(this, "accounts", FXCollections.observableArrayList());
|
||||||
{
|
private final ObjectProperty<Account> selectedAccount;
|
||||||
itemsProperty().addListener(onInvalidating(this::invalidated));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void invalidated() {
|
|
||||||
Account selected = get();
|
|
||||||
itemsProperty().forEach(item -> item.selectedProperty().set(item.getAccount() == selected));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
private final ListProperty<Account> accounts = new SimpleListProperty<>(FXCollections.observableArrayList());
|
|
||||||
|
|
||||||
private ToggleGroup toggleGroup;
|
|
||||||
private final ObservableList<AccountListItem> accountItems;
|
|
||||||
|
|
||||||
public AccountList() {
|
public AccountList() {
|
||||||
toggleGroup = new ToggleGroup();
|
setItems(MappedObservableList.create(accounts, AccountListItem::new));
|
||||||
|
selectedAccount = createSelectedItemPropertyFor(getItems(), Account.class);
|
||||||
accountItems = MappedObservableList.create(
|
|
||||||
accountsProperty(),
|
|
||||||
account -> new AccountListItem(toggleGroup, account));
|
|
||||||
|
|
||||||
itemsProperty().bindContent(accountItems);
|
|
||||||
|
|
||||||
toggleGroup.selectedToggleProperty().addListener((o, a, toggle) -> {
|
|
||||||
if (toggle == null || toggle.getUserData() == null) return;
|
|
||||||
selectedAccount.set(((AccountListItem) toggle.getUserData()).getAccount());
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObjectProperty<Account> selectedAccountProperty() {
|
public ObjectProperty<Account> selectedAccountProperty() {
|
||||||
@@ -77,7 +52,7 @@ public class AccountList extends ListPage<AccountListItem> implements DecoratorP
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ReadOnlyStringProperty titleProperty() {
|
public ReadOnlyObjectProperty<State> stateProperty() {
|
||||||
return title.getReadOnlyProperty();
|
return state.getReadOnlyProperty();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,60 +13,86 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.binding.ObjectBinding;
|
||||||
|
import javafx.beans.binding.StringBinding;
|
||||||
import javafx.beans.property.*;
|
import javafx.beans.property.*;
|
||||||
import javafx.geometry.Rectangle2D;
|
import javafx.beans.value.ObservableBooleanValue;
|
||||||
import javafx.scene.control.Control;
|
import javafx.scene.control.RadioButton;
|
||||||
import javafx.scene.control.Skin;
|
import javafx.scene.control.Skin;
|
||||||
import javafx.scene.control.ToggleGroup;
|
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.stage.FileChooser;
|
||||||
import org.jackhuang.hmcl.auth.Account;
|
import org.jackhuang.hmcl.auth.Account;
|
||||||
|
import org.jackhuang.hmcl.auth.AuthenticationException;
|
||||||
|
import org.jackhuang.hmcl.auth.CredentialExpiredException;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
|
import org.jackhuang.hmcl.auth.offline.OfflineAccount;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.CompleteGameProfile;
|
||||||
|
import org.jackhuang.hmcl.auth.yggdrasil.TextureType;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
||||||
import org.jackhuang.hmcl.game.AccountHelper;
|
import org.jackhuang.hmcl.game.TexturesLoader;
|
||||||
import org.jackhuang.hmcl.setting.Accounts;
|
import org.jackhuang.hmcl.setting.Accounts;
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
|
import org.jackhuang.hmcl.task.Task;
|
||||||
|
import org.jackhuang.hmcl.ui.Controllers;
|
||||||
|
import org.jackhuang.hmcl.ui.DialogController;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
|
||||||
|
import org.jackhuang.hmcl.util.skin.InvalidSkinException;
|
||||||
|
import org.jackhuang.hmcl.util.skin.NormalizedSkin;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.CancellationException;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import javax.imageio.ImageIO;
|
||||||
|
|
||||||
|
import static java.util.Collections.emptySet;
|
||||||
|
import static javafx.beans.binding.Bindings.createBooleanBinding;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public class AccountListItem extends Control {
|
public class AccountListItem extends RadioButton {
|
||||||
|
|
||||||
private final Account account;
|
private final Account account;
|
||||||
private final ToggleGroup toggleGroup;
|
|
||||||
private final StringProperty title = new SimpleStringProperty();
|
private final StringProperty title = new SimpleStringProperty();
|
||||||
private final StringProperty subtitle = new SimpleStringProperty();
|
private final StringProperty subtitle = new SimpleStringProperty();
|
||||||
private final BooleanProperty selected = new SimpleBooleanProperty();
|
|
||||||
private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
|
private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
|
||||||
private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();
|
|
||||||
|
|
||||||
public AccountListItem(ToggleGroup toggleGroup, Account account) {
|
public AccountListItem(Account account) {
|
||||||
this.account = account;
|
this.account = account;
|
||||||
this.toggleGroup = toggleGroup;
|
getStyleClass().clear();
|
||||||
|
setUserData(account);
|
||||||
|
|
||||||
StringBuilder subtitleString = new StringBuilder(Accounts.getAccountTypeName(account));
|
String loginTypeName = Accounts.getLocalizedLoginTypeName(Accounts.getAccountFactory(account));
|
||||||
if (account instanceof AuthlibInjectorAccount) {
|
if (account instanceof AuthlibInjectorAccount) {
|
||||||
AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
|
AuthlibInjectorServer server = ((AuthlibInjectorAccount) account).getServer();
|
||||||
subtitleString.append(", ").append(i18n("account.injector.server")).append(": ").append(server.getName());
|
subtitle.bind(Bindings.concat(
|
||||||
}
|
loginTypeName, ", ", i18n("account.injector.server"), ": ",
|
||||||
|
Bindings.createStringBinding(server::getName, server)));
|
||||||
if (account instanceof OfflineAccount)
|
|
||||||
title.set(account.getCharacter());
|
|
||||||
else
|
|
||||||
title.set(account.getUsername() + " - " + account.getCharacter());
|
|
||||||
subtitle.set(subtitleString.toString());
|
|
||||||
selected.set(Accounts.selectedAccountProperty().get() == account);
|
|
||||||
|
|
||||||
viewport.set(AccountHelper.getViewport(4));
|
|
||||||
if (account instanceof YggdrasilAccount) {
|
|
||||||
Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
|
|
||||||
this.image.set(image);
|
|
||||||
} else {
|
} else {
|
||||||
this.image.set(AccountHelper.getDefaultSkin(account.getUUID(), 4));
|
subtitle.set(loginTypeName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StringBinding characterName = Bindings.createStringBinding(account::getCharacter, account);
|
||||||
|
if (account instanceof OfflineAccount) {
|
||||||
|
title.bind(characterName);
|
||||||
|
} else {
|
||||||
|
title.bind(
|
||||||
|
account.getUsername().isEmpty() ? characterName :
|
||||||
|
Bindings.concat(account.getUsername(), " - ", characterName));
|
||||||
|
}
|
||||||
|
|
||||||
|
image.bind(TexturesLoader.fxAvatarBinding(account, 32));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -74,50 +100,128 @@ public class AccountListItem extends Control {
|
|||||||
return new AccountListItemSkin(this);
|
return new AccountListItemSkin(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ToggleGroup getToggleGroup() {
|
public Task<?> refreshAsync() {
|
||||||
return toggleGroup;
|
return Task.runAsync(() -> {
|
||||||
|
account.clearCache();
|
||||||
|
try {
|
||||||
|
account.logIn();
|
||||||
|
} catch (CredentialExpiredException e) {
|
||||||
|
try {
|
||||||
|
DialogController.logIn(account);
|
||||||
|
} catch (CancellationException e1) {
|
||||||
|
// ignore cancellation
|
||||||
|
} catch (Exception e1) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to refresh " + account + " with password", e1);
|
||||||
|
throw e1;
|
||||||
|
}
|
||||||
|
} catch (AuthenticationException e) {
|
||||||
|
LOG.log(Level.WARNING, "Failed to refresh " + account + " with token", e);
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public ObservableBooleanValue canUploadSkin() {
|
||||||
|
if (account instanceof YggdrasilAccount) {
|
||||||
|
if (account instanceof AuthlibInjectorAccount) {
|
||||||
|
AuthlibInjectorAccount aiAccount = (AuthlibInjectorAccount) account;
|
||||||
|
ObjectBinding<Optional<CompleteGameProfile>> profile = aiAccount.getYggdrasilService().getProfileRepository().binding(aiAccount.getUUID());
|
||||||
|
return createBooleanBinding(() -> {
|
||||||
|
Set<TextureType> uploadableTextures = profile.get()
|
||||||
|
.map(AuthlibInjectorAccount::getUploadableTextures)
|
||||||
|
.orElse(emptySet());
|
||||||
|
return uploadableTextures.contains(TextureType.SKIN);
|
||||||
|
}, profile);
|
||||||
|
} else {
|
||||||
|
return createBooleanBinding(() -> true);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return createBooleanBinding(() -> false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the skin upload task, null if no file is selected
|
||||||
|
*/
|
||||||
|
@Nullable
|
||||||
|
public Task<?> uploadSkin() {
|
||||||
|
if (!(account instanceof YggdrasilAccount)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
FileChooser chooser = new FileChooser();
|
||||||
|
chooser.setTitle(i18n("account.skin.upload"));
|
||||||
|
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("account.skin.file"), "*.png"));
|
||||||
|
File selectedFile = chooser.showOpenDialog(Controllers.getStage());
|
||||||
|
if (selectedFile == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return refreshAsync()
|
||||||
|
.thenRunAsync(() -> {
|
||||||
|
BufferedImage skinImg;
|
||||||
|
try {
|
||||||
|
skinImg = ImageIO.read(selectedFile);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new InvalidSkinException("Failed to read skin image", e);
|
||||||
|
}
|
||||||
|
if (skinImg == null) {
|
||||||
|
throw new InvalidSkinException("Failed to read skin image");
|
||||||
|
}
|
||||||
|
NormalizedSkin skin = new NormalizedSkin(skinImg);
|
||||||
|
String model = skin.isSlim() ? "slim" : "";
|
||||||
|
LOG.info("Uploading skin [" + selectedFile + "], model [" + model + "]");
|
||||||
|
((YggdrasilAccount) account).uploadSkin(model, selectedFile.toPath());
|
||||||
|
})
|
||||||
|
.thenComposeAsync(refreshAsync())
|
||||||
|
.whenComplete(Schedulers.javafx(), e -> {
|
||||||
|
if (e != null) {
|
||||||
|
Controllers.dialog(AddAccountPane.accountException(e), i18n("account.skin.upload.failed"), MessageType.ERROR);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void remove() {
|
||||||
|
Accounts.getAccounts().remove(account);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Account getAccount() {
|
public Account getAccount() {
|
||||||
return account;
|
return account;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title.set(title);
|
||||||
|
}
|
||||||
|
|
||||||
public StringProperty titleProperty() {
|
public StringProperty titleProperty() {
|
||||||
return title;
|
return title;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getSubtitle() {
|
||||||
|
return subtitle.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSubtitle(String subtitle) {
|
||||||
|
this.subtitle.set(subtitle);
|
||||||
|
}
|
||||||
|
|
||||||
public StringProperty subtitleProperty() {
|
public StringProperty subtitleProperty() {
|
||||||
return subtitle;
|
return subtitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
public BooleanProperty selectedProperty() {
|
public Image getImage() {
|
||||||
return selected;
|
return image.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setImage(Image image) {
|
||||||
|
this.image.set(image);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObjectProperty<Image> imageProperty() {
|
public ObjectProperty<Image> imageProperty() {
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObjectProperty<Rectangle2D> viewportProperty() {
|
|
||||||
return viewport;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void refresh() {
|
|
||||||
if (account instanceof YggdrasilAccount) {
|
|
||||||
// progressBar.setVisible(true);
|
|
||||||
AccountHelper.refreshSkinAsync((YggdrasilAccount) account)
|
|
||||||
.finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
|
|
||||||
// progressBar.setVisible(false);
|
|
||||||
|
|
||||||
if (isDependentsSucceeded) {
|
|
||||||
Image image = AccountHelper.getSkin((YggdrasilAccount) account, 4);
|
|
||||||
this.image.set(image);
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void remove() {
|
|
||||||
Accounts.getAccounts().remove(account);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,25 +13,32 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXRadioButton;
|
import com.jfoenix.controls.JFXRadioButton;
|
||||||
import com.jfoenix.effects.JFXDepthManager;
|
import com.jfoenix.effects.JFXDepthManager;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.SkinBase;
|
import javafx.scene.control.SkinBase;
|
||||||
|
import javafx.scene.control.Tooltip;
|
||||||
import javafx.scene.image.ImageView;
|
import javafx.scene.image.ImageView;
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.VBox;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorAccount;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
import org.jackhuang.hmcl.setting.Theme;
|
||||||
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
|
import org.jackhuang.hmcl.task.Task;
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
import org.jackhuang.hmcl.ui.SVG;
|
import org.jackhuang.hmcl.ui.SVG;
|
||||||
import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
|
import org.jackhuang.hmcl.ui.construct.SpinnerPane;
|
||||||
|
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.ui.FXUtils.runInFX;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public class AccountListItemSkin extends SkinBase<AccountListItem> {
|
public class AccountListItemSkin extends SkinBase<AccountListItem> {
|
||||||
@@ -41,54 +48,92 @@ public class AccountListItemSkin extends SkinBase<AccountListItem> {
|
|||||||
|
|
||||||
BorderPane root = new BorderPane();
|
BorderPane root = new BorderPane();
|
||||||
|
|
||||||
JFXRadioButton chkSelected = new JFXRadioButton();
|
JFXRadioButton chkSelected = new JFXRadioButton() {
|
||||||
|
@Override
|
||||||
|
public void fire() {
|
||||||
|
skinnable.fire();
|
||||||
|
}
|
||||||
|
};
|
||||||
BorderPane.setAlignment(chkSelected, Pos.CENTER);
|
BorderPane.setAlignment(chkSelected, Pos.CENTER);
|
||||||
chkSelected.setUserData(skinnable);
|
chkSelected.selectedProperty().bind(skinnable.selectedProperty());
|
||||||
chkSelected.selectedProperty().bindBidirectional(skinnable.selectedProperty());
|
|
||||||
chkSelected.setToggleGroup(skinnable.getToggleGroup());
|
|
||||||
root.setLeft(chkSelected);
|
root.setLeft(chkSelected);
|
||||||
|
|
||||||
HBox center = new HBox();
|
HBox center = new HBox();
|
||||||
center.setSpacing(8);
|
center.setSpacing(8);
|
||||||
center.setAlignment(Pos.CENTER_LEFT);
|
center.setAlignment(Pos.CENTER_LEFT);
|
||||||
|
|
||||||
StackPane imageViewContainer = new StackPane();
|
|
||||||
FXUtils.setLimitWidth(imageViewContainer, 32);
|
|
||||||
FXUtils.setLimitHeight(imageViewContainer, 32);
|
|
||||||
|
|
||||||
ImageView imageView = new ImageView();
|
ImageView imageView = new ImageView();
|
||||||
FXUtils.limitSize(imageView, 32, 32);
|
FXUtils.limitSize(imageView, 32, 32);
|
||||||
imageView.imageProperty().bind(skinnable.imageProperty());
|
imageView.imageProperty().bind(skinnable.imageProperty());
|
||||||
imageView.viewportProperty().bind(skinnable.viewportProperty());
|
|
||||||
imageViewContainer.getChildren().setAll(imageView);
|
|
||||||
|
|
||||||
TwoLineListItem item = new TwoLineListItem();
|
Label title = new Label();
|
||||||
|
title.getStyleClass().add("title");
|
||||||
|
title.textProperty().bind(skinnable.titleProperty());
|
||||||
|
Label subtitle = new Label();
|
||||||
|
subtitle.getStyleClass().add("subtitle");
|
||||||
|
subtitle.textProperty().bind(skinnable.subtitleProperty());
|
||||||
|
if (skinnable.getAccount() instanceof AuthlibInjectorAccount) {
|
||||||
|
Tooltip tooltip = new Tooltip();
|
||||||
|
AuthlibInjectorServer server = ((AuthlibInjectorAccount) skinnable.getAccount()).getServer();
|
||||||
|
tooltip.textProperty().bind(BindingMapping.of(server, AuthlibInjectorServer::toString));
|
||||||
|
FXUtils.installSlowTooltip(subtitle, tooltip);
|
||||||
|
}
|
||||||
|
VBox item = new VBox(title, subtitle);
|
||||||
|
item.getStyleClass().add("two-line-list-item");
|
||||||
BorderPane.setAlignment(item, Pos.CENTER);
|
BorderPane.setAlignment(item, Pos.CENTER);
|
||||||
|
|
||||||
center.getChildren().setAll(imageView, item);
|
center.getChildren().setAll(imageView, item);
|
||||||
root.setCenter(center);
|
root.setCenter(center);
|
||||||
|
|
||||||
HBox right = new HBox();
|
HBox right = new HBox();
|
||||||
right.setAlignment(Pos.CENTER_RIGHT);
|
right.setAlignment(Pos.CENTER_RIGHT);
|
||||||
|
|
||||||
JFXButton btnRefresh = new JFXButton();
|
JFXButton btnRefresh = new JFXButton();
|
||||||
btnRefresh.setOnMouseClicked(e -> skinnable.refresh());
|
SpinnerPane spinnerRefresh = new SpinnerPane();
|
||||||
|
btnRefresh.setOnMouseClicked(e -> {
|
||||||
|
spinnerRefresh.showSpinner();
|
||||||
|
skinnable.refreshAsync()
|
||||||
|
.whenComplete(ex -> spinnerRefresh.hideSpinner())
|
||||||
|
.start();
|
||||||
|
});
|
||||||
btnRefresh.getStyleClass().add("toggle-icon4");
|
btnRefresh.getStyleClass().add("toggle-icon4");
|
||||||
btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
|
btnRefresh.setGraphic(SVG.refresh(Theme.blackFillBinding(), -1, -1));
|
||||||
JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRefresh, i18n("button.refresh")));
|
runInFX(() -> FXUtils.installFastTooltip(btnRefresh, i18n("button.refresh")));
|
||||||
right.getChildren().add(btnRefresh);
|
spinnerRefresh.setContent(btnRefresh);
|
||||||
|
right.getChildren().add(spinnerRefresh);
|
||||||
|
|
||||||
|
JFXButton btnUpload = new JFXButton();
|
||||||
|
SpinnerPane spinnerUpload = new SpinnerPane();
|
||||||
|
btnUpload.setOnMouseClicked(e -> {
|
||||||
|
Task<?> uploadTask = skinnable.uploadSkin();
|
||||||
|
if (uploadTask != null) {
|
||||||
|
spinnerUpload.showSpinner();
|
||||||
|
uploadTask
|
||||||
|
.whenComplete(Schedulers.javafx(), ex -> spinnerUpload.hideSpinner())
|
||||||
|
.start();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
btnUpload.getStyleClass().add("toggle-icon4");
|
||||||
|
btnUpload.setGraphic(SVG.hanger(Theme.blackFillBinding(), -1, -1));
|
||||||
|
runInFX(() -> FXUtils.installFastTooltip(btnUpload, i18n("account.skin.upload")));
|
||||||
|
spinnerUpload.managedProperty().bind(spinnerUpload.visibleProperty());
|
||||||
|
spinnerUpload.visibleProperty().bind(skinnable.canUploadSkin());
|
||||||
|
spinnerUpload.setContent(btnUpload);
|
||||||
|
spinnerUpload.getStyleClass().add("small-spinner-pane");
|
||||||
|
right.getChildren().add(spinnerUpload);
|
||||||
|
|
||||||
JFXButton btnRemove = new JFXButton();
|
JFXButton btnRemove = new JFXButton();
|
||||||
btnRemove.setOnMouseClicked(e -> skinnable.remove());
|
btnRemove.setOnMouseClicked(e -> skinnable.remove());
|
||||||
btnRemove.getStyleClass().add("toggle-icon4");
|
btnRemove.getStyleClass().add("toggle-icon4");
|
||||||
BorderPane.setAlignment(btnRemove, Pos.CENTER);
|
BorderPane.setAlignment(btnRemove, Pos.CENTER);
|
||||||
btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
|
btnRemove.setGraphic(SVG.delete(Theme.blackFillBinding(), -1, -1));
|
||||||
JFXUtilities.runInFX(() -> FXUtils.installTooltip(btnRemove, i18n("button.delete")));
|
runInFX(() -> FXUtils.installFastTooltip(btnRemove, i18n("button.delete")));
|
||||||
right.getChildren().add(btnRemove);
|
right.getChildren().add(btnRemove);
|
||||||
root.setRight(right);
|
root.setRight(right);
|
||||||
|
|
||||||
root.setStyle("-fx-background-color: white; -fx-padding: 8 8 8 0;");
|
root.getStyleClass().add("card");
|
||||||
|
root.setStyle("-fx-padding: 8 8 8 0;");
|
||||||
JFXDepthManager.setDepth(root, 1);
|
JFXDepthManager.setDepth(root, 1);
|
||||||
item.titleProperty().bind(skinnable.titleProperty());
|
|
||||||
item.subtitleProperty().bind(skinnable.subtitleProperty());
|
|
||||||
|
|
||||||
getChildren().setAll(root);
|
getChildren().setAll(root);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
@@ -31,14 +31,16 @@ import org.jackhuang.hmcl.ui.FXUtils;
|
|||||||
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
||||||
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
|
|
||||||
public class AccountLoginPane extends StackPane {
|
public class AccountLoginPane extends StackPane {
|
||||||
private final Account oldAccount;
|
private final Account oldAccount;
|
||||||
private final Consumer<AuthInfo> success;
|
private final Consumer<AuthInfo> success;
|
||||||
private final Runnable failed;
|
private final Runnable failed;
|
||||||
|
|
||||||
@FXML
|
@FXML private Label lblUsername;
|
||||||
private Label lblUsername;
|
|
||||||
@FXML private JFXPasswordField txtPassword;
|
@FXML private JFXPasswordField txtPassword;
|
||||||
@FXML private Label lblCreationWarning;
|
@FXML private Label lblCreationWarning;
|
||||||
@FXML private JFXProgressBar progressBar;
|
@FXML private JFXProgressBar progressBar;
|
||||||
@@ -59,25 +61,20 @@ public class AccountLoginPane extends StackPane {
|
|||||||
String password = txtPassword.getText();
|
String password = txtPassword.getText();
|
||||||
progressBar.setVisible(true);
|
progressBar.setVisible(true);
|
||||||
lblCreationWarning.setText("");
|
lblCreationWarning.setText("");
|
||||||
Task.ofResult("login", () -> {
|
Task.supplyAsync(() -> oldAccount.logInWithPassword(password))
|
||||||
try {
|
.whenComplete(Schedulers.javafx(), authInfo -> {
|
||||||
return oldAccount.logInWithPassword(password);
|
success.accept(authInfo);
|
||||||
} catch (Exception e) {
|
fireEvent(new DialogCloseEvent());
|
||||||
return e;
|
progressBar.setVisible(false);
|
||||||
}
|
}, e -> {
|
||||||
}).subscribe(Schedulers.javafx(), variable -> {
|
LOG.log(Level.INFO, "Failed to login with password: " + oldAccount, e);
|
||||||
Object account = variable.get("login");
|
if (e instanceof NoSelectedCharacterException) {
|
||||||
if (account instanceof AuthInfo) {
|
fireEvent(new DialogCloseEvent());
|
||||||
success.accept(((AuthInfo) account));
|
} else {
|
||||||
fireEvent(new DialogCloseEvent());
|
lblCreationWarning.setText(AddAccountPane.accountException(e));
|
||||||
} else if (account instanceof NoSelectedCharacterException) {
|
}
|
||||||
fireEvent(new DialogCloseEvent());
|
progressBar.setVisible(false);
|
||||||
} else if (account instanceof Exception) {
|
}).start();
|
||||||
lblCreationWarning.setText(AddAccountPane.accountException((Exception) account));
|
|
||||||
}
|
|
||||||
|
|
||||||
progressBar.setVisible(false);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,42 +13,51 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import com.jfoenix.concurrency.JFXUtilities;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.*;
|
import com.jfoenix.controls.JFXComboBox;
|
||||||
|
import com.jfoenix.controls.JFXPasswordField;
|
||||||
|
import com.jfoenix.controls.JFXTextField;
|
||||||
|
import javafx.application.Platform;
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.property.ListProperty;
|
||||||
import javafx.beans.property.ReadOnlyObjectProperty;
|
import javafx.beans.property.ReadOnlyObjectProperty;
|
||||||
|
import javafx.beans.property.SimpleListProperty;
|
||||||
|
import javafx.collections.FXCollections;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.control.Hyperlink;
|
import javafx.scene.control.Hyperlink;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.image.Image;
|
|
||||||
import javafx.scene.image.ImageView;
|
import javafx.scene.image.ImageView;
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
import org.jackhuang.hmcl.auth.*;
|
import org.jackhuang.hmcl.auth.*;
|
||||||
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorDownloadException;
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
|
import org.jackhuang.hmcl.auth.yggdrasil.GameProfile;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
|
import org.jackhuang.hmcl.auth.yggdrasil.RemoteAuthenticationException;
|
||||||
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilAccount;
|
import org.jackhuang.hmcl.auth.yggdrasil.YggdrasilService;
|
||||||
import org.jackhuang.hmcl.game.AccountHelper;
|
import org.jackhuang.hmcl.game.TexturesLoader;
|
||||||
import org.jackhuang.hmcl.setting.Accounts;
|
import org.jackhuang.hmcl.setting.Accounts;
|
||||||
import org.jackhuang.hmcl.task.Schedulers;
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
import org.jackhuang.hmcl.task.Task;
|
import org.jackhuang.hmcl.task.Task;
|
||||||
import org.jackhuang.hmcl.ui.Controllers;
|
import org.jackhuang.hmcl.ui.Controllers;
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
import org.jackhuang.hmcl.ui.construct.*;
|
import org.jackhuang.hmcl.ui.construct.*;
|
||||||
import org.jackhuang.hmcl.util.Constants;
|
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
||||||
import org.jackhuang.hmcl.util.Logging;
|
import org.jackhuang.hmcl.util.skin.InvalidSkinException;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
|
import static java.util.Collections.emptyList;
|
||||||
|
import static java.util.Collections.unmodifiableList;
|
||||||
import static java.util.Objects.requireNonNull;
|
import static java.util.Objects.requireNonNull;
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.*;
|
import static org.jackhuang.hmcl.ui.FXUtils.*;
|
||||||
@@ -60,13 +69,17 @@ public class AddAccountPane extends StackPane {
|
|||||||
@FXML private JFXPasswordField txtPassword;
|
@FXML private JFXPasswordField txtPassword;
|
||||||
@FXML private Label lblCreationWarning;
|
@FXML private Label lblCreationWarning;
|
||||||
@FXML private Label lblPassword;
|
@FXML private Label lblPassword;
|
||||||
|
@FXML private Label lblUsername;
|
||||||
@FXML private JFXComboBox<AccountFactory<?>> cboType;
|
@FXML private JFXComboBox<AccountFactory<?>> cboType;
|
||||||
@FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
|
@FXML private JFXComboBox<AuthlibInjectorServer> cboServers;
|
||||||
@FXML private Label lblInjectorServer;
|
@FXML private Label lblInjectorServer;
|
||||||
@FXML private Hyperlink linkManageInjectorServers;
|
|
||||||
@FXML private JFXDialogLayout layout;
|
|
||||||
@FXML private JFXButton btnAccept;
|
@FXML private JFXButton btnAccept;
|
||||||
|
@FXML private JFXButton btnAddServer;
|
||||||
|
@FXML private JFXButton btnManageServer;
|
||||||
@FXML private SpinnerPane acceptPane;
|
@FXML private SpinnerPane acceptPane;
|
||||||
|
@FXML private HBox linksContainer;
|
||||||
|
|
||||||
|
private ListProperty<Hyperlink> links = new SimpleListProperty<>();
|
||||||
|
|
||||||
public AddAccountPane() {
|
public AddAccountPane() {
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
|
FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
|
||||||
@@ -77,34 +90,88 @@ public class AddAccountPane extends StackPane {
|
|||||||
cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
|
cboServers.getItems().addListener(onInvalidating(this::selectDefaultServer));
|
||||||
selectDefaultServer();
|
selectDefaultServer();
|
||||||
|
|
||||||
cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
|
cboType.getItems().setAll(Accounts.FACTORIES);
|
||||||
cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
|
cboType.setConverter(stringConverter(Accounts::getLocalizedLoginTypeName));
|
||||||
cboType.getSelectionModel().select(0);
|
// try selecting the preferred login type
|
||||||
|
cboType.getSelectionModel().select(
|
||||||
|
cboType.getItems().stream()
|
||||||
|
.filter(type -> Accounts.getLoginType(type).equals(config().getPreferredLoginType()))
|
||||||
|
.findFirst()
|
||||||
|
.orElse(Accounts.FACTORY_OFFLINE));
|
||||||
|
|
||||||
|
btnAddServer.visibleProperty().bind(cboServers.visibleProperty());
|
||||||
|
btnManageServer.visibleProperty().bind(cboServers.visibleProperty());
|
||||||
|
|
||||||
cboServers.getItems().addListener(onInvalidating(this::checkIfNoServer));
|
cboServers.getItems().addListener(onInvalidating(this::checkIfNoServer));
|
||||||
checkIfNoServer();
|
checkIfNoServer();
|
||||||
|
|
||||||
ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
|
ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
|
||||||
|
|
||||||
txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE));
|
// remember the last used login type
|
||||||
|
loginType.addListener((observable, oldValue, newValue) -> config().setPreferredLoginType(Accounts.getLoginType(newValue)));
|
||||||
|
|
||||||
|
txtUsername.visibleProperty().bind(Bindings.createBooleanBinding(() -> loginType.get().getLoginType().requiresUsername, loginType));
|
||||||
|
lblUsername.visibleProperty().bind(txtUsername.visibleProperty());
|
||||||
|
txtPassword.visibleProperty().bind(Bindings.createBooleanBinding(() -> loginType.get().getLoginType().requiresPassword, loginType));
|
||||||
lblPassword.visibleProperty().bind(txtPassword.visibleProperty());
|
lblPassword.visibleProperty().bind(txtPassword.visibleProperty());
|
||||||
|
|
||||||
cboServers.visibleProperty().bind(loginType.isEqualTo(Accounts.FACTORY_AUTHLIB_INJECTOR));
|
cboServers.visibleProperty().bind(loginType.isEqualTo(Accounts.FACTORY_AUTHLIB_INJECTOR));
|
||||||
lblInjectorServer.visibleProperty().bind(cboServers.visibleProperty());
|
lblInjectorServer.visibleProperty().bind(cboServers.visibleProperty());
|
||||||
linkManageInjectorServers.visibleProperty().bind(cboServers.visibleProperty());
|
|
||||||
|
|
||||||
txtUsername.getValidators().add(new Validator(i18n("input.email"), str -> !txtPassword.isVisible() || str.contains("@")));
|
txtUsername.getValidators().add(new Validator(i18n("input.email"), this::validateUsername));
|
||||||
|
|
||||||
btnAccept.disableProperty().bind(Bindings.createBooleanBinding(
|
btnAccept.disableProperty().bind(Bindings.createBooleanBinding(
|
||||||
() -> !( // consider the opposite situation: input is valid
|
() -> !( // consider the opposite situation: input is valid
|
||||||
txtUsername.validate() &&
|
(!txtUsername.isVisible() || txtUsername.validate()) &&
|
||||||
// invisible means the field is not needed, neither should it be validated
|
// invisible means the field is not needed, neither should it be validated
|
||||||
(!txtPassword.isVisible() || txtPassword.validate()) &&
|
(!txtPassword.isVisible() || txtPassword.validate()) &&
|
||||||
(!cboServers.isVisible() || cboServers.getSelectionModel().getSelectedItem() != null)
|
(!cboServers.isVisible() || cboServers.getSelectionModel().getSelectedItem() != null)
|
||||||
),
|
),
|
||||||
txtUsername.textProperty(),
|
txtUsername.textProperty(), txtPassword.textProperty(),
|
||||||
txtPassword.textProperty(), txtPassword.visibleProperty(),
|
loginType, cboServers.getSelectionModel().selectedItemProperty(),
|
||||||
cboServers.getSelectionModel().selectedItemProperty(), cboServers.visibleProperty()));
|
txtPassword.visibleProperty(), cboServers.visibleProperty()));
|
||||||
|
|
||||||
|
// authlib-injector links
|
||||||
|
links.bind(BindingMapping.of(cboServers.getSelectionModel().selectedItemProperty())
|
||||||
|
.map(AddAccountPane::createHyperlinks)
|
||||||
|
.map(FXCollections::observableList));
|
||||||
|
Bindings.bindContent(linksContainer.getChildren(), links);
|
||||||
|
linksContainer.visibleProperty().bind(cboServers.visibleProperty());
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean validateUsername(String username) {
|
||||||
|
AccountFactory<?> loginType = cboType.getSelectionModel().getSelectedItem();
|
||||||
|
if (loginType == Accounts.FACTORY_OFFLINE) {
|
||||||
|
return true;
|
||||||
|
} else if (loginType == Accounts.FACTORY_AUTHLIB_INJECTOR) {
|
||||||
|
AuthlibInjectorServer server = cboServers.getSelectionModel().getSelectedItem();
|
||||||
|
if (server != null && server.isNonEmailLogin()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return username.contains("@");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final String[] ALLOWED_LINKS = { "register" };
|
||||||
|
|
||||||
|
public static List<Hyperlink> createHyperlinks(AuthlibInjectorServer server) {
|
||||||
|
if (server == null) {
|
||||||
|
return emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, String> links = server.getLinks();
|
||||||
|
List<Hyperlink> result = new ArrayList<>();
|
||||||
|
for (String key : ALLOWED_LINKS) {
|
||||||
|
String value = links.get(key);
|
||||||
|
if (value != null) {
|
||||||
|
Hyperlink link = new Hyperlink(i18n("account.injector.link." + key));
|
||||||
|
FXUtils.installSlowTooltip(link, value);
|
||||||
|
link.setOnAction(e -> FXUtils.openLink(value));
|
||||||
|
result.add(link);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return unmodifiableList(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -148,10 +215,8 @@ public class AddAccountPane extends StackPane {
|
|||||||
AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
|
AccountFactory<?> factory = cboType.getSelectionModel().getSelectedItem();
|
||||||
Object additionalData = getAuthAdditionalData();
|
Object additionalData = getAuthAdditionalData();
|
||||||
|
|
||||||
Task.ofResult("create_account", () -> factory.create(new Selector(), username, password, additionalData))
|
Task.supplyAsync(() -> factory.create(new Selector(), username, password, additionalData))
|
||||||
.finalized(Schedulers.javafx(), variables -> {
|
.whenComplete(Schedulers.javafx(), account -> {
|
||||||
|
|
||||||
Account account = variables.get("create_account");
|
|
||||||
int oldIndex = Accounts.getAccounts().indexOf(account);
|
int oldIndex = Accounts.getAccounts().indexOf(account);
|
||||||
if (oldIndex == -1) {
|
if (oldIndex == -1) {
|
||||||
Accounts.getAccounts().add(account);
|
Accounts.getAccounts().add(account);
|
||||||
@@ -189,14 +254,20 @@ public class AddAccountPane extends StackPane {
|
|||||||
Controllers.navigate(Controllers.getServersPage());
|
Controllers.navigate(Controllers.getServersPage());
|
||||||
}
|
}
|
||||||
|
|
||||||
private class Selector extends BorderPane implements CharacterSelector {
|
@FXML
|
||||||
|
private void onAddInjecterServer() {
|
||||||
|
Controllers.dialog(new AddAuthlibInjectorServerPane());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class Selector extends BorderPane implements CharacterSelector {
|
||||||
|
|
||||||
private final AdvancedListBox listBox = new AdvancedListBox();
|
private final AdvancedListBox listBox = new AdvancedListBox();
|
||||||
private final JFXButton cancel = new JFXButton();
|
private final JFXButton cancel = new JFXButton();
|
||||||
|
|
||||||
private final CountDownLatch latch = new CountDownLatch(1);
|
private final CountDownLatch latch = new CountDownLatch(1);
|
||||||
private GameProfile selectedProfile = null;
|
private GameProfile selectedProfile = null;
|
||||||
|
|
||||||
{
|
public Selector() {
|
||||||
setStyle("-fx-padding: 8px;");
|
setStyle("-fx-padding: 8px;");
|
||||||
|
|
||||||
cancel.setText(i18n("button.cancel"));
|
cancel.setText(i18n("button.cancel"));
|
||||||
@@ -214,50 +285,35 @@ public class AddAccountPane extends StackPane {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public GameProfile select(Account account, List<GameProfile> names) throws NoSelectedCharacterException {
|
public GameProfile select(YggdrasilService service, List<GameProfile> profiles) throws NoSelectedCharacterException {
|
||||||
if (!(account instanceof YggdrasilAccount))
|
Platform.runLater(() -> {
|
||||||
return CharacterSelector.DEFAULT.select(account, names);
|
for (GameProfile profile : profiles) {
|
||||||
YggdrasilAccount yggdrasilAccount = (YggdrasilAccount) account;
|
ImageView portraitView = new ImageView();
|
||||||
|
portraitView.setSmooth(false);
|
||||||
|
portraitView.imageProperty().bind(TexturesLoader.fxAvatarBinding(service, profile.getId(), 32));
|
||||||
|
FXUtils.limitSize(portraitView, 32, 32);
|
||||||
|
|
||||||
for (GameProfile profile : names) {
|
IconedItem accountItem = new IconedItem(portraitView, profile.getName());
|
||||||
Image image;
|
accountItem.setOnMouseClicked(e -> {
|
||||||
try {
|
selectedProfile = profile;
|
||||||
image = AccountHelper.getSkinImmediately(yggdrasilAccount, profile, 4);
|
latch.countDown();
|
||||||
} catch (Exception e) {
|
});
|
||||||
Logging.LOG.log(Level.WARNING, "Failed to get skin for " + profile.getName(), e);
|
listBox.add(accountItem);
|
||||||
image = null;
|
|
||||||
}
|
}
|
||||||
ImageView portraitView = new ImageView();
|
Controllers.dialog(this);
|
||||||
portraitView.setSmooth(false);
|
});
|
||||||
if (image == null) {
|
|
||||||
portraitView.setImage(Constants.DEFAULT_ICON.get());
|
|
||||||
} else {
|
|
||||||
portraitView.setImage(image);
|
|
||||||
portraitView.setViewport(AccountHelper.getViewport(4));
|
|
||||||
}
|
|
||||||
FXUtils.limitSize(portraitView, 32, 32);
|
|
||||||
|
|
||||||
IconedItem accountItem = new IconedItem(portraitView, profile.getName());
|
|
||||||
accountItem.setOnMouseClicked(e -> {
|
|
||||||
selectedProfile = profile;
|
|
||||||
latch.countDown();
|
|
||||||
});
|
|
||||||
listBox.add(accountItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
JFXUtilities.runInFX(() -> Controllers.dialog(this));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
latch.await();
|
latch.await();
|
||||||
|
|
||||||
if (selectedProfile == null)
|
if (selectedProfile == null)
|
||||||
throw new NoSelectedCharacterException(account);
|
throw new NoSelectedCharacterException();
|
||||||
|
|
||||||
return selectedProfile;
|
return selectedProfile;
|
||||||
} catch (InterruptedException ignore) {
|
} catch (InterruptedException ignore) {
|
||||||
throw new NoSelectedCharacterException(account);
|
throw new NoSelectedCharacterException();
|
||||||
} finally {
|
} finally {
|
||||||
JFXUtilities.runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
|
runInFX(() -> Selector.this.fireEvent(new DialogCloseEvent()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -279,8 +335,18 @@ public class AddAccountPane extends StackPane {
|
|||||||
return i18n("account.failed.invalid_token");
|
return i18n("account.failed.invalid_token");
|
||||||
else if (remoteMessage.contains("Invalid username or password"))
|
else if (remoteMessage.contains("Invalid username or password"))
|
||||||
return i18n("account.failed.invalid_password");
|
return i18n("account.failed.invalid_password");
|
||||||
|
else
|
||||||
|
return remoteMessage;
|
||||||
}
|
}
|
||||||
return exception.getMessage();
|
return exception.getMessage();
|
||||||
|
} else if (exception instanceof AuthlibInjectorDownloadException) {
|
||||||
|
return i18n("account.failed.injector_download_failure");
|
||||||
|
} else if (exception instanceof CharacterDeletedException) {
|
||||||
|
return i18n("account.failed.character_deleted");
|
||||||
|
} else if (exception instanceof InvalidSkinException) {
|
||||||
|
return i18n("account.skin.invalid_skin");
|
||||||
|
} else if (exception.getClass() == AuthenticationException.class) {
|
||||||
|
return exception.getLocalizedMessage();
|
||||||
} else {
|
} else {
|
||||||
return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
|
return exception.getClass().getName() + ": " + exception.getLocalizedMessage();
|
||||||
}
|
}
|
||||||
|
|||||||
+24
-27
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,14 +13,13 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXDialogLayout;
|
import com.jfoenix.controls.JFXDialogLayout;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
||||||
import javafx.beans.binding.Bindings;
|
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
@@ -28,20 +27,23 @@ import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
|||||||
import org.jackhuang.hmcl.task.Schedulers;
|
import org.jackhuang.hmcl.task.Schedulers;
|
||||||
import org.jackhuang.hmcl.task.Task;
|
import org.jackhuang.hmcl.task.Task;
|
||||||
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
|
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
|
||||||
import org.jackhuang.hmcl.ui.animation.TransitionHandler;
|
import org.jackhuang.hmcl.ui.animation.TransitionPane;
|
||||||
|
import org.jackhuang.hmcl.ui.construct.DialogAware;
|
||||||
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
import org.jackhuang.hmcl.ui.construct.DialogCloseEvent;
|
||||||
import org.jackhuang.hmcl.ui.construct.SpinnerPane;
|
import org.jackhuang.hmcl.ui.construct.SpinnerPane;
|
||||||
import org.jackhuang.hmcl.util.NetworkUtils;
|
import org.jackhuang.hmcl.util.io.NetworkUtils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
|
import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
|
||||||
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public class AddAuthlibInjectorServerPane extends StackPane {
|
public class AddAuthlibInjectorServerPane extends StackPane implements DialogAware {
|
||||||
|
|
||||||
@FXML private StackPane addServerContainer;
|
@FXML private TransitionPane root;
|
||||||
@FXML private Label lblServerUrl;
|
@FXML private Label lblServerUrl;
|
||||||
@FXML private Label lblServerName;
|
@FXML private Label lblServerName;
|
||||||
@FXML private Label lblCreationWarning;
|
@FXML private Label lblCreationWarning;
|
||||||
@@ -52,8 +54,6 @@ public class AddAuthlibInjectorServerPane extends StackPane {
|
|||||||
@FXML private SpinnerPane nextPane;
|
@FXML private SpinnerPane nextPane;
|
||||||
@FXML private JFXButton btnAddNext;
|
@FXML private JFXButton btnAddNext;
|
||||||
|
|
||||||
private TransitionHandler transitionHandler;
|
|
||||||
|
|
||||||
private AuthlibInjectorServer serverBeingAdded;
|
private AuthlibInjectorServer serverBeingAdded;
|
||||||
|
|
||||||
public AddAuthlibInjectorServerPane(String url) {
|
public AddAuthlibInjectorServerPane(String url) {
|
||||||
@@ -64,19 +64,15 @@ public class AddAuthlibInjectorServerPane extends StackPane {
|
|||||||
|
|
||||||
public AddAuthlibInjectorServerPane() {
|
public AddAuthlibInjectorServerPane() {
|
||||||
loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
|
loadFXML(this, "/assets/fxml/authlib-injector-server-add.fxml");
|
||||||
transitionHandler = new TransitionHandler(addServerContainer);
|
root.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
|
||||||
transitionHandler.setContent(addServerPane, ContainerAnimations.NONE.getAnimationProducer());
|
|
||||||
|
|
||||||
btnAddNext.disableProperty().bind(
|
btnAddNext.disableProperty().bind(txtServerUrl.textProperty().isEmpty());
|
||||||
Bindings.createBooleanBinding(txtServerUrl::validate, txtServerUrl.textProperty()).not());
|
|
||||||
nextPane.hideSpinner();
|
nextPane.hideSpinner();
|
||||||
}
|
}
|
||||||
|
|
||||||
private String fixInputUrl(String url) {
|
@Override
|
||||||
if (!url.endsWith("/")) {
|
public void onDialogShown() {
|
||||||
url += "/";
|
txtServerUrl.requestFocus();
|
||||||
}
|
|
||||||
return url;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String resolveFetchExceptionMessage(Throwable exception) {
|
private String resolveFetchExceptionMessage(Throwable exception) {
|
||||||
@@ -99,26 +95,27 @@ public class AddAuthlibInjectorServerPane extends StackPane {
|
|||||||
|
|
||||||
lblCreationWarning.setText("");
|
lblCreationWarning.setText("");
|
||||||
|
|
||||||
String url = fixInputUrl(txtServerUrl.getText());
|
String url = txtServerUrl.getText();
|
||||||
|
|
||||||
nextPane.showSpinner();
|
nextPane.showSpinner();
|
||||||
addServerPane.setDisable(true);
|
addServerPane.setDisable(true);
|
||||||
|
|
||||||
Task.of(() -> {
|
Task.runAsync(() -> {
|
||||||
serverBeingAdded = AuthlibInjectorServer.fetchServerInfo(url);
|
serverBeingAdded = AuthlibInjectorServer.locateServer(url);
|
||||||
}).finalized(Schedulers.javafx(), (variables, isDependentsSucceeded) -> {
|
}).whenComplete(Schedulers.javafx(), exception -> {
|
||||||
addServerPane.setDisable(false);
|
addServerPane.setDisable(false);
|
||||||
nextPane.hideSpinner();
|
nextPane.hideSpinner();
|
||||||
|
|
||||||
if (isDependentsSucceeded) {
|
if (exception == null) {
|
||||||
lblServerName.setText(serverBeingAdded.getName());
|
lblServerName.setText(serverBeingAdded.getName());
|
||||||
lblServerUrl.setText(serverBeingAdded.getUrl());
|
lblServerUrl.setText(serverBeingAdded.getUrl());
|
||||||
|
|
||||||
lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
|
lblServerWarning.setVisible("http".equals(NetworkUtils.toURL(serverBeingAdded.getUrl()).getProtocol()));
|
||||||
|
|
||||||
transitionHandler.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
|
root.setContent(confirmServerPane, ContainerAnimations.SWIPE_LEFT.getAnimationProducer());
|
||||||
} else {
|
} else {
|
||||||
lblCreationWarning.setText(resolveFetchExceptionMessage(variables.<Exception>get("lastException")));
|
LOG.log(Level.WARNING, "Failed to resolve auth server: " + url, exception);
|
||||||
|
lblCreationWarning.setText(resolveFetchExceptionMessage(exception));
|
||||||
}
|
}
|
||||||
}).start();
|
}).start();
|
||||||
|
|
||||||
@@ -126,7 +123,7 @@ public class AddAuthlibInjectorServerPane extends StackPane {
|
|||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void onAddPrev() {
|
private void onAddPrev() {
|
||||||
transitionHandler.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
|
root.setContent(addServerPane, ContainerAnimations.SWIPE_RIGHT.getAnimationProducer());
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,12 +13,14 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.effects.JFXDepthManager;
|
import com.jfoenix.effects.JFXDepthManager;
|
||||||
|
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.layout.BorderPane;
|
import javafx.scene.layout.BorderPane;
|
||||||
@@ -33,17 +35,17 @@ public final class AuthlibInjectorServerItem extends BorderPane {
|
|||||||
private final AuthlibInjectorServer server;
|
private final AuthlibInjectorServer server;
|
||||||
|
|
||||||
private final Label lblServerName = new Label();
|
private final Label lblServerName = new Label();
|
||||||
private final Label lblServerIp = new Label();
|
private final Label lblServerUrl = new Label();
|
||||||
|
|
||||||
public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
|
public AuthlibInjectorServerItem(AuthlibInjectorServer server, Consumer<AuthlibInjectorServerItem> deleteCallback) {
|
||||||
this.server = server;
|
this.server = server;
|
||||||
|
|
||||||
lblServerName.setStyle("-fx-font-size: 15;");
|
lblServerName.setStyle("-fx-font-size: 15;");
|
||||||
lblServerIp.setStyle("-fx-font-size: 10;");
|
lblServerUrl.setStyle("-fx-font-size: 10;");
|
||||||
|
|
||||||
VBox center = new VBox();
|
VBox center = new VBox();
|
||||||
BorderPane.setAlignment(center, Pos.CENTER);
|
BorderPane.setAlignment(center, Pos.CENTER);
|
||||||
center.getChildren().addAll(lblServerName, lblServerIp);
|
center.getChildren().addAll(lblServerName, lblServerUrl);
|
||||||
setCenter(center);
|
setCenter(center);
|
||||||
|
|
||||||
JFXButton right = new JFXButton();
|
JFXButton right = new JFXButton();
|
||||||
@@ -55,8 +57,8 @@ public final class AuthlibInjectorServerItem extends BorderPane {
|
|||||||
|
|
||||||
setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
|
setStyle("-fx-background-radius: 2; -fx-background-color: white; -fx-padding: 8;");
|
||||||
JFXDepthManager.setDepth(this, 1);
|
JFXDepthManager.setDepth(this, 1);
|
||||||
lblServerName.setText(server.getName());
|
lblServerName.textProperty().bind(Bindings.createStringBinding(server::getName, server));
|
||||||
lblServerIp.setText(server.getUrl());
|
lblServerUrl.setText(server.getUrl());
|
||||||
}
|
}
|
||||||
|
|
||||||
public AuthlibInjectorServer getServer() {
|
public AuthlibInjectorServer getServer() {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,43 +13,30 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.account;
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.beans.property.ReadOnlyStringProperty;
|
import javafx.beans.property.ReadOnlyObjectWrapper;
|
||||||
import javafx.beans.property.ReadOnlyStringWrapper;
|
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.fxml.FXML;
|
|
||||||
import javafx.scene.control.ScrollPane;
|
|
||||||
import javafx.scene.layout.StackPane;
|
|
||||||
import javafx.scene.layout.VBox;
|
|
||||||
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
import org.jackhuang.hmcl.auth.authlibinjector.AuthlibInjectorServer;
|
||||||
import org.jackhuang.hmcl.ui.Controllers;
|
import org.jackhuang.hmcl.ui.Controllers;
|
||||||
|
import org.jackhuang.hmcl.ui.ListPage;
|
||||||
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
|
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
|
||||||
import org.jackhuang.hmcl.util.MappedObservableList;
|
import org.jackhuang.hmcl.util.javafx.MappedObservableList;
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
import static org.jackhuang.hmcl.setting.ConfigHolder.config;
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.loadFXML;
|
|
||||||
import static org.jackhuang.hmcl.ui.FXUtils.smoothScrolling;
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public class AuthlibInjectorServersPage extends StackPane implements DecoratorPage {
|
public class AuthlibInjectorServersPage extends ListPage<AuthlibInjectorServerItem> implements DecoratorPage {
|
||||||
private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper(this, "title", i18n("account.injector.manage.title"));
|
private final ReadOnlyObjectWrapper<State> state = new ReadOnlyObjectWrapper<>(State.fromTitle(i18n("account.injector.manage.title")));
|
||||||
|
|
||||||
@FXML private ScrollPane scrollPane;
|
private final ObservableList<AuthlibInjectorServerItem> serverItems;
|
||||||
@FXML private VBox listPane;
|
|
||||||
@FXML private StackPane contentPane;
|
|
||||||
|
|
||||||
private ObservableList<AuthlibInjectorServerItem> serverItems;
|
|
||||||
|
|
||||||
public AuthlibInjectorServersPage() {
|
public AuthlibInjectorServersPage() {
|
||||||
loadFXML(this, "/assets/fxml/authlib-injector-servers.fxml");
|
|
||||||
smoothScrolling(scrollPane);
|
|
||||||
|
|
||||||
serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
|
serverItems = MappedObservableList.create(config().getAuthlibInjectorServers(), this::createServerItem);
|
||||||
Bindings.bindContent(listPane.getChildren(), serverItems);
|
Bindings.bindContent(itemsProperty(), serverItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
|
private AuthlibInjectorServerItem createServerItem(AuthlibInjectorServer server) {
|
||||||
@@ -57,21 +44,13 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
|
|||||||
item -> config().getAuthlibInjectorServers().remove(item.getServer()));
|
item -> config().getAuthlibInjectorServers().remove(item.getServer()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@Override
|
||||||
private void onAdd() {
|
public void add() {
|
||||||
Controllers.dialog(new AddAuthlibInjectorServerPane());
|
Controllers.dialog(new AddAuthlibInjectorServerPane());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title.get();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ReadOnlyStringProperty titleProperty() {
|
public ReadOnlyObjectWrapper<State> stateProperty() {
|
||||||
return title.getReadOnlyProperty();
|
return state;
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title.set(title);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui.account;
|
||||||
|
|
||||||
|
import javafx.application.Platform;
|
||||||
|
import javafx.stage.Modality;
|
||||||
|
import org.jackhuang.hmcl.auth.microsoft.MicrosoftService;
|
||||||
|
import org.jackhuang.hmcl.ui.WebStage;
|
||||||
|
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
|
import static org.jackhuang.hmcl.Launcher.COOKIE_MANAGER;
|
||||||
|
|
||||||
|
public class MicrosoftAccountLoginStage extends WebStage implements MicrosoftService.WebViewCallback {
|
||||||
|
public static final MicrosoftAccountLoginStage INSTANCE = new MicrosoftAccountLoginStage();
|
||||||
|
|
||||||
|
CompletableFuture<String> future;
|
||||||
|
Predicate<String> urlTester;
|
||||||
|
|
||||||
|
public MicrosoftAccountLoginStage() {
|
||||||
|
super(600, 600);
|
||||||
|
initModality(Modality.APPLICATION_MODAL);
|
||||||
|
|
||||||
|
titleProperty().bind(webEngine.titleProperty());
|
||||||
|
|
||||||
|
webEngine.locationProperty().addListener((observable, oldValue, newValue) -> {
|
||||||
|
if (urlTester != null && urlTester.test(newValue)) {
|
||||||
|
future.complete(newValue);
|
||||||
|
hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
showingProperty().addListener((observable, oldValue, newValue) -> {
|
||||||
|
if (!newValue) {
|
||||||
|
if (future != null) {
|
||||||
|
future.completeExceptionally(new InterruptedException());
|
||||||
|
}
|
||||||
|
future = null;
|
||||||
|
urlTester = null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<String> show(MicrosoftService service, Predicate<String> urlTester, String initialURL) {
|
||||||
|
Platform.runLater(() -> {
|
||||||
|
COOKIE_MANAGER.getCookieStore().removeAll();
|
||||||
|
|
||||||
|
webEngine.load(initialURL);
|
||||||
|
show();
|
||||||
|
});
|
||||||
|
this.future = new CompletableFuture<>();
|
||||||
|
this.urlTester = urlTester;
|
||||||
|
return future;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.animation;
|
package org.jackhuang.hmcl.ui.animation;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,11 +13,12 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.animation;
|
package org.jackhuang.hmcl.ui.animation;
|
||||||
|
|
||||||
import javafx.animation.KeyFrame;
|
import javafx.animation.KeyFrame;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -25,4 +26,6 @@ public interface AnimationProducer {
|
|||||||
void init(AnimationHandler handler);
|
void init(AnimationHandler handler);
|
||||||
|
|
||||||
List<KeyFrame> animate(AnimationHandler handler);
|
List<KeyFrame> animate(AnimationHandler handler);
|
||||||
|
|
||||||
|
@Nullable AnimationProducer opposite();
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright c 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.animation;
|
package org.jackhuang.hmcl.ui.animation;
|
||||||
|
|
||||||
@@ -21,6 +21,8 @@ import javafx.animation.Interpolator;
|
|||||||
import javafx.animation.KeyFrame;
|
import javafx.animation.KeyFrame;
|
||||||
import javafx.animation.KeyValue;
|
import javafx.animation.KeyValue;
|
||||||
import javafx.util.Duration;
|
import javafx.util.Duration;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@@ -41,6 +43,7 @@ public enum ContainerAnimations {
|
|||||||
c.getCurrentNode().setScaleY(1);
|
c.getCurrentNode().setScaleY(1);
|
||||||
c.getCurrentNode().setOpacity(1);
|
c.getCurrentNode().setOpacity(1);
|
||||||
}, c -> Collections.emptyList()),
|
}, c -> Collections.emptyList()),
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A fade between the old and new view
|
* A fade between the old and new view
|
||||||
*/
|
*/
|
||||||
@@ -62,6 +65,36 @@ public enum ContainerAnimations {
|
|||||||
new KeyFrame(c.getDuration(),
|
new KeyFrame(c.getDuration(),
|
||||||
new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
|
new KeyValue(c.getPreviousNode().opacityProperty(), 0, Interpolator.EASE_BOTH),
|
||||||
new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
|
new KeyValue(c.getCurrentNode().opacityProperty(), 1, Interpolator.EASE_BOTH)))),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A fade between the old and new view
|
||||||
|
*/
|
||||||
|
FADE_IN(c -> {
|
||||||
|
c.getCurrentNode().setTranslateX(0);
|
||||||
|
c.getCurrentNode().setTranslateY(0);
|
||||||
|
c.getCurrentNode().setScaleX(1);
|
||||||
|
c.getCurrentNode().setScaleY(1);
|
||||||
|
c.getCurrentNode().setOpacity(0);
|
||||||
|
}, c ->
|
||||||
|
Arrays.asList(new KeyFrame(Duration.ZERO,
|
||||||
|
new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)),
|
||||||
|
new KeyFrame(c.getDuration(),
|
||||||
|
new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)))),
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A fade between the old and new view
|
||||||
|
*/
|
||||||
|
FADE_OUT(c -> {
|
||||||
|
c.getCurrentNode().setTranslateX(0);
|
||||||
|
c.getCurrentNode().setTranslateY(0);
|
||||||
|
c.getCurrentNode().setScaleX(1);
|
||||||
|
c.getCurrentNode().setScaleY(1);
|
||||||
|
c.getCurrentNode().setOpacity(1);
|
||||||
|
}, c ->
|
||||||
|
Arrays.asList(new KeyFrame(Duration.ZERO,
|
||||||
|
new KeyValue(c.getCurrentNode().opacityProperty(), 1, FXUtils.SINE)),
|
||||||
|
new KeyFrame(c.getDuration(),
|
||||||
|
new KeyValue(c.getCurrentNode().opacityProperty(), 0, FXUtils.SINE)))),
|
||||||
/**
|
/**
|
||||||
* A zoom effect
|
* A zoom effect
|
||||||
*/
|
*/
|
||||||
@@ -143,6 +176,7 @@ public enum ContainerAnimations {
|
|||||||
new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH))));
|
new KeyValue(c.getPreviousNode().translateXProperty(), c.getCurrentRoot().getWidth(), Interpolator.EASE_BOTH))));
|
||||||
|
|
||||||
private final AnimationProducer animationProducer;
|
private final AnimationProducer animationProducer;
|
||||||
|
private ContainerAnimations opposite;
|
||||||
|
|
||||||
ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
|
ContainerAnimations(Consumer<AnimationHandler> init, Function<AnimationHandler, List<KeyFrame>> animationProducer) {
|
||||||
this.animationProducer = new AnimationProducer() {
|
this.animationProducer = new AnimationProducer() {
|
||||||
@@ -155,10 +189,30 @@ public enum ContainerAnimations {
|
|||||||
public List<KeyFrame> animate(AnimationHandler handler) {
|
public List<KeyFrame> animate(AnimationHandler handler) {
|
||||||
return animationProducer.apply(handler);
|
return animationProducer.apply(handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @Nullable AnimationProducer opposite() {
|
||||||
|
return opposite != null ? opposite.getAnimationProducer() : null;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public AnimationProducer getAnimationProducer() {
|
public AnimationProducer getAnimationProducer() {
|
||||||
return animationProducer;
|
return animationProducer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ContainerAnimations getOpposite() {
|
||||||
|
return opposite;
|
||||||
|
}
|
||||||
|
|
||||||
|
static {
|
||||||
|
NONE.opposite = NONE;
|
||||||
|
FADE.opposite = FADE;
|
||||||
|
SWIPE_LEFT.opposite = SWIPE_RIGHT;
|
||||||
|
SWIPE_RIGHT.opposite = SWIPE_LEFT;
|
||||||
|
FADE_IN.opposite = FADE_OUT;
|
||||||
|
FADE_OUT.opposite = FADE_IN;
|
||||||
|
ZOOM_IN.opposite = ZOOM_OUT;
|
||||||
|
ZOOM_OUT.opposite = ZOOM_IN;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+20
-37
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.animation;
|
package org.jackhuang.hmcl.ui.animation;
|
||||||
|
|
||||||
@@ -21,29 +21,17 @@ import javafx.animation.KeyFrame;
|
|||||||
import javafx.animation.Timeline;
|
import javafx.animation.Timeline;
|
||||||
import javafx.application.Platform;
|
import javafx.application.Platform;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.Parent;
|
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
import javafx.scene.shape.Rectangle;
|
|
||||||
import javafx.util.Duration;
|
import javafx.util.Duration;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
|
||||||
public final class TransitionHandler implements AnimationHandler {
|
public class TransitionPane extends StackPane implements AnimationHandler {
|
||||||
private final StackPane view;
|
|
||||||
private Timeline animation;
|
|
||||||
private Duration duration;
|
private Duration duration;
|
||||||
private Node previousNode, currentNode;
|
private Node previousNode, currentNode;
|
||||||
|
|
||||||
/**
|
{
|
||||||
* @param view A stack pane that contains another control that is {@link Parent}
|
currentNode = getChildren().stream().findFirst().orElse(null);
|
||||||
*/
|
FXUtils.setOverflowHidden(this);
|
||||||
public TransitionHandler(StackPane view) {
|
|
||||||
this.view = view;
|
|
||||||
currentNode = view.getChildren().stream().findFirst().orElse(null);
|
|
||||||
|
|
||||||
// prevent content overflow
|
|
||||||
Rectangle clip = new Rectangle();
|
|
||||||
clip.widthProperty().bind(view.widthProperty());
|
|
||||||
clip.heightProperty().bind(view.heightProperty());
|
|
||||||
view.setClip(clip);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -58,7 +46,7 @@ public final class TransitionHandler implements AnimationHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public StackPane getCurrentRoot() {
|
public StackPane getCurrentRoot() {
|
||||||
return view;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -67,35 +55,30 @@ public final class TransitionHandler implements AnimationHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setContent(Node newView, AnimationProducer transition) {
|
public void setContent(Node newView, AnimationProducer transition) {
|
||||||
setContent(newView, transition, Duration.millis(320));
|
setContent(newView, transition, Duration.millis(160));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setContent(Node newView, AnimationProducer transition, Duration duration) {
|
public void setContent(Node newView, AnimationProducer transition, Duration duration) {
|
||||||
this.duration = duration;
|
this.duration = duration;
|
||||||
|
|
||||||
Timeline prev = animation;
|
|
||||||
if (prev != null)
|
|
||||||
prev.stop();
|
|
||||||
|
|
||||||
updateContent(newView);
|
updateContent(newView);
|
||||||
|
|
||||||
transition.init(this);
|
transition.init(this);
|
||||||
|
|
||||||
// runLater or "init" will not work
|
// runLater or "init" will not work
|
||||||
Platform.runLater(() -> {
|
Platform.runLater(() -> {
|
||||||
Timeline nowAnimation = new Timeline();
|
Timeline newAnimation = new Timeline();
|
||||||
nowAnimation.getKeyFrames().addAll(transition.animate(this));
|
newAnimation.getKeyFrames().addAll(transition.animate(this));
|
||||||
nowAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
|
newAnimation.getKeyFrames().add(new KeyFrame(duration, e -> {
|
||||||
view.setMouseTransparent(false);
|
setMouseTransparent(false);
|
||||||
view.getChildren().remove(previousNode);
|
getChildren().remove(previousNode);
|
||||||
}));
|
}));
|
||||||
nowAnimation.play();
|
FXUtils.playAnimation(this, "transition_pane", newAnimation);
|
||||||
animation = nowAnimation;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateContent(Node newView) {
|
private void updateContent(Node newView) {
|
||||||
if (view.getWidth() > 0 && view.getHeight() > 0) {
|
if (getWidth() > 0 && getHeight() > 0) {
|
||||||
previousNode = currentNode;
|
previousNode = currentNode;
|
||||||
if (previousNode == null)
|
if (previousNode == null)
|
||||||
previousNode = EMPTY_PANE;
|
previousNode = EMPTY_PANE;
|
||||||
@@ -105,11 +88,11 @@ public final class TransitionHandler implements AnimationHandler {
|
|||||||
if (previousNode == newView)
|
if (previousNode == newView)
|
||||||
previousNode = EMPTY_PANE;
|
previousNode = EMPTY_PANE;
|
||||||
|
|
||||||
view.setMouseTransparent(true);
|
setMouseTransparent(true);
|
||||||
|
|
||||||
currentNode = newView;
|
currentNode = newView;
|
||||||
|
|
||||||
view.getChildren().setAll(previousNode, currentNode);
|
getChildren().setAll(previousNode, currentNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final StackPane EMPTY_PANE = new StackPane();
|
private final StackPane EMPTY_PANE = new StackPane();
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
@@ -53,22 +53,37 @@ public class AdvancedListBox extends ScrollPane {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public AdvancedListBox remove(Node child) {
|
public AdvancedListBox add(int index, Node child) {
|
||||||
if (child instanceof Pane)
|
if (child instanceof Pane || child instanceof AdvancedListItem)
|
||||||
container.getChildren().remove(child);
|
container.getChildren().add(index, child);
|
||||||
else {
|
else {
|
||||||
StackPane pane = null;
|
StackPane pane = new StackPane();
|
||||||
for (Node node : container.getChildren())
|
pane.getStyleClass().add("advanced-list-box-item");
|
||||||
|
pane.getChildren().setAll(child);
|
||||||
|
container.getChildren().add(index, pane);
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public AdvancedListBox remove(Node child) {
|
||||||
|
container.getChildren().remove(indexOf(child));
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int indexOf(Node child) {
|
||||||
|
if (child instanceof Pane) {
|
||||||
|
return container.getChildren().indexOf(child);
|
||||||
|
} else {
|
||||||
|
for (int i = 0; i < container.getChildren().size(); ++i) {
|
||||||
|
Node node = container.getChildren().get(i);
|
||||||
if (node instanceof StackPane) {
|
if (node instanceof StackPane) {
|
||||||
ObservableList<Node> list = ((StackPane) node).getChildren();
|
ObservableList<Node> list = ((StackPane) node).getChildren();
|
||||||
if (list.size() == 1 && list.get(0) == child)
|
if (list.size() == 1 && list.get(0) == child)
|
||||||
pane = (StackPane) node;
|
return i;
|
||||||
}
|
}
|
||||||
if (pane == null)
|
}
|
||||||
throw new Error();
|
return -1;
|
||||||
container.getChildren().remove(pane);
|
|
||||||
}
|
}
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public AdvancedListBox startCategory(String category) {
|
public AdvancedListBox startCategory(String category) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,43 +13,104 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.property.*;
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
|
||||||
import javafx.beans.property.StringProperty;
|
|
||||||
import javafx.event.ActionEvent;
|
import javafx.event.ActionEvent;
|
||||||
import javafx.event.EventHandler;
|
import javafx.event.EventHandler;
|
||||||
import javafx.geometry.Rectangle2D;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Control;
|
import javafx.scene.control.Control;
|
||||||
import javafx.scene.control.Skin;
|
import javafx.scene.control.Skin;
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.image.Image;
|
||||||
|
import javafx.scene.input.MouseEvent;
|
||||||
|
|
||||||
public class AdvancedListItem extends Control {
|
public class AdvancedListItem extends Control {
|
||||||
private final ObjectProperty<Image> image = new SimpleObjectProperty<>();
|
private final ObjectProperty<Image> image = new SimpleObjectProperty<>(this, "image");
|
||||||
private final ObjectProperty<Rectangle2D> viewport = new SimpleObjectProperty<>();
|
private final ObjectProperty<Node> rightGraphic = new SimpleObjectProperty<>(this, "rightGraphic");
|
||||||
private final StringProperty title = new SimpleStringProperty();
|
private final StringProperty title = new SimpleStringProperty(this, "title");
|
||||||
private final StringProperty subtitle = new SimpleStringProperty();
|
private final BooleanProperty active = new SimpleBooleanProperty(this, "active");
|
||||||
|
private final StringProperty subtitle = new SimpleStringProperty(this, "subtitle");
|
||||||
|
private final BooleanProperty actionButtonVisible = new SimpleBooleanProperty(this, "actionButtonVisible", true);
|
||||||
|
|
||||||
|
public AdvancedListItem() {
|
||||||
|
getStyleClass().add("advanced-list-item");
|
||||||
|
addEventHandler(MouseEvent.MOUSE_CLICKED, e -> fireEvent(new ActionEvent()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public Image getImage() {
|
||||||
|
return image.get();
|
||||||
|
}
|
||||||
|
|
||||||
public ObjectProperty<Image> imageProperty() {
|
public ObjectProperty<Image> imageProperty() {
|
||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObjectProperty<Rectangle2D> viewportProperty() {
|
public void setImage(Image image) {
|
||||||
return viewport;
|
this.image.set(image);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Node getRightGraphic() {
|
||||||
|
return rightGraphic.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ObjectProperty<Node> rightGraphicProperty() {
|
||||||
|
return rightGraphic;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRightGraphic(Node rightGraphic) {
|
||||||
|
this.rightGraphic.set(rightGraphic);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public StringProperty titleProperty() {
|
public StringProperty titleProperty() {
|
||||||
return title;
|
return title;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title.set(title);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isActive() {
|
||||||
|
return active.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BooleanProperty activeProperty() {
|
||||||
|
return active;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setActive(boolean active) {
|
||||||
|
this.active.set(active);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSubtitle() {
|
||||||
|
return subtitle.get();
|
||||||
|
}
|
||||||
|
|
||||||
public StringProperty subtitleProperty() {
|
public StringProperty subtitleProperty() {
|
||||||
return subtitle;
|
return subtitle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setSubtitle(String subtitle) {
|
||||||
|
this.subtitle.set(subtitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isActionButtonVisible() {
|
||||||
|
return actionButtonVisible.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BooleanProperty actionButtonVisibleProperty() {
|
||||||
|
return actionButtonVisible;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setActionButtonVisible(boolean actionButtonVisible) {
|
||||||
|
this.actionButtonVisible.set(actionButtonVisible);
|
||||||
|
}
|
||||||
|
|
||||||
public final ObjectProperty<EventHandler<ActionEvent>> onActionProperty() {
|
public final ObjectProperty<EventHandler<ActionEvent>> onActionProperty() {
|
||||||
return onAction;
|
return onAction;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,11 +13,11 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import javafx.css.PseudoClass;
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
@@ -28,16 +28,21 @@ import javafx.scene.layout.HBox;
|
|||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
import javafx.scene.layout.VBox;
|
import javafx.scene.layout.VBox;
|
||||||
import javafx.scene.text.TextAlignment;
|
import javafx.scene.text.TextAlignment;
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
import org.jackhuang.hmcl.ui.SVG;
|
|
||||||
|
|
||||||
public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
|
public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
|
||||||
|
private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
|
||||||
|
|
||||||
public AdvancedListItemSkin(AdvancedListItem skinnable) {
|
public AdvancedListItemSkin(AdvancedListItem skinnable) {
|
||||||
super(skinnable);
|
super(skinnable);
|
||||||
|
|
||||||
StackPane stackPane = new StackPane();
|
StackPane stackPane = new StackPane();
|
||||||
|
stackPane.getStyleClass().add("container");
|
||||||
|
RipplerContainer container = new RipplerContainer(stackPane);
|
||||||
|
|
||||||
|
FXUtils.onChangeAndOperate(skinnable.activeProperty(), active -> {
|
||||||
|
skinnable.pseudoClassStateChanged(SELECTED, active);
|
||||||
|
});
|
||||||
|
|
||||||
BorderPane root = new BorderPane();
|
BorderPane root = new BorderPane();
|
||||||
root.setPickOnBounds(false);
|
root.setPickOnBounds(false);
|
||||||
@@ -54,7 +59,6 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
|
|||||||
FXUtils.limitSize(imageView, 32, 32);
|
FXUtils.limitSize(imageView, 32, 32);
|
||||||
imageView.setPreserveRatio(true);
|
imageView.setPreserveRatio(true);
|
||||||
imageView.imageProperty().bind(skinnable.imageProperty());
|
imageView.imageProperty().bind(skinnable.imageProperty());
|
||||||
imageView.viewportProperty().bind(skinnable.viewportProperty());
|
|
||||||
imageViewContainer.getChildren().setAll(imageView);
|
imageViewContainer.getChildren().setAll(imageView);
|
||||||
|
|
||||||
VBox vbox = new VBox();
|
VBox vbox = new VBox();
|
||||||
@@ -85,20 +89,27 @@ public class AdvancedListItemSkin extends SkinBase<AdvancedListItem> {
|
|||||||
|
|
||||||
HBox right = new HBox();
|
HBox right = new HBox();
|
||||||
right.setAlignment(Pos.CENTER);
|
right.setAlignment(Pos.CENTER);
|
||||||
right.setPickOnBounds(false);
|
right.setMouseTransparent(true);
|
||||||
|
right.getStyleClass().add("toggle-icon4");
|
||||||
JFXButton settings = new JFXButton();
|
FXUtils.setLimitWidth(right, 40);
|
||||||
FXUtils.setLimitWidth(settings, 40);
|
FXUtils.onChangeAndOperate(skinnable.rightGraphicProperty(),
|
||||||
settings.getStyleClass().setAll("toggle-icon4");
|
newGraphic -> {
|
||||||
settings.setGraphic(SVG.dotsVertical(Theme.blackFillBinding(), -1, -1));
|
if (newGraphic == null) {
|
||||||
right.getChildren().setAll(settings);
|
right.getChildren().clear();
|
||||||
|
} else {
|
||||||
|
right.getChildren().setAll(newGraphic);
|
||||||
|
}
|
||||||
|
});
|
||||||
root.setRight(right);
|
root.setRight(right);
|
||||||
|
|
||||||
|
FXUtils.onChangeAndOperate(skinnable.actionButtonVisibleProperty(),
|
||||||
|
visible -> root.setRight(visible ? right : null));
|
||||||
|
|
||||||
stackPane.setStyle("-fx-padding: 10 16 10 16;");
|
stackPane.setStyle("-fx-padding: 10 16 10 16;");
|
||||||
stackPane.getStyleClass().setAll("transparent");
|
stackPane.getStyleClass().add("transparent");
|
||||||
stackPane.setPickOnBounds(false);
|
stackPane.setPickOnBounds(false);
|
||||||
stackPane.getChildren().setAll(root);
|
stackPane.getChildren().setAll(root);
|
||||||
|
|
||||||
getChildren().setAll(stackPane);
|
getChildren().setAll(container);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,26 +13,28 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import org.jackhuang.hmcl.util.javafx.MappedObservableList;
|
||||||
|
|
||||||
import javafx.beans.DefaultProperty;
|
import javafx.beans.DefaultProperty;
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.binding.ObjectBinding;
|
||||||
import javafx.beans.property.IntegerProperty;
|
import javafx.beans.property.IntegerProperty;
|
||||||
import javafx.beans.property.SimpleIntegerProperty;
|
import javafx.beans.property.SimpleIntegerProperty;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.beans.property.StringProperty;
|
import javafx.beans.property.StringProperty;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ListChangeListener;
|
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.css.PseudoClass;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Control;
|
import javafx.scene.control.Control;
|
||||||
import javafx.scene.control.Skin;
|
|
||||||
import javafx.scene.control.SkinBase;
|
import javafx.scene.control.SkinBase;
|
||||||
import javafx.scene.layout.StackPane;
|
|
||||||
import javafx.scene.layout.VBox;
|
import javafx.scene.layout.VBox;
|
||||||
import org.jackhuang.hmcl.util.MappedObservableList;
|
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
@DefaultProperty("content")
|
@DefaultProperty("content")
|
||||||
public class ComponentList extends Control {
|
public class ComponentList extends Control {
|
||||||
@@ -41,6 +43,8 @@ public class ComponentList extends Control {
|
|||||||
private final IntegerProperty depth = new SimpleIntegerProperty(this, "depth", 0);
|
private final IntegerProperty depth = new SimpleIntegerProperty(this, "depth", 0);
|
||||||
private boolean hasSubtitle = false;
|
private boolean hasSubtitle = false;
|
||||||
public final ObservableList<Node> content = FXCollections.observableArrayList();
|
public final ObservableList<Node> content = FXCollections.observableArrayList();
|
||||||
|
private boolean expanded = false;
|
||||||
|
private Consumer<ComponentList> lazyInitializer;
|
||||||
|
|
||||||
public ComponentList() {
|
public ComponentList() {
|
||||||
getStyleClass().add("options-list");
|
getStyleClass().add("options-list");
|
||||||
@@ -94,29 +98,63 @@ public class ComponentList extends Control {
|
|||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setLazyInitializer(Consumer<ComponentList> lazyInitializer) {
|
||||||
|
this.lazyInitializer = lazyInitializer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onExpand() {
|
||||||
|
if (!expanded && lazyInitializer != null) {
|
||||||
|
lazyInitializer.accept(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
expanded = true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected javafx.scene.control.Skin<?> createDefaultSkin() {
|
protected javafx.scene.control.Skin<?> createDefaultSkin() {
|
||||||
return new Skin(this);
|
return new Skin(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static class Skin extends SkinBase<ComponentList> {
|
protected static class Skin extends SkinBase<ComponentList> {
|
||||||
|
private static final PseudoClass PSEUDO_CLASS_FIRST = PseudoClass.getPseudoClass("first");
|
||||||
|
private static final PseudoClass PSEUDO_CLASS_LAST = PseudoClass.getPseudoClass("last");
|
||||||
|
|
||||||
private final ObservableList<Node> list;
|
private final ObservableList<Node> list;
|
||||||
|
private final ObjectBinding<Node> firstItem;
|
||||||
|
private final ObjectBinding<Node> lastItem;
|
||||||
|
|
||||||
protected Skin(ComponentList control) {
|
protected Skin(ComponentList control) {
|
||||||
super(control);
|
super(control);
|
||||||
|
|
||||||
list = MappedObservableList.create(control.getContent(), this::mapper);
|
list = MappedObservableList.create(control.getContent(), node -> {
|
||||||
|
ComponentListCell cell = new ComponentListCell(node);
|
||||||
|
cell.getStyleClass().add("options-list-item");
|
||||||
|
return cell;
|
||||||
|
});
|
||||||
|
|
||||||
|
firstItem = Bindings.valueAt(list, 0);
|
||||||
|
firstItem.addListener((observable, oldValue, newValue) -> {
|
||||||
|
if (newValue != null)
|
||||||
|
newValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
|
||||||
|
if (oldValue != null)
|
||||||
|
oldValue.pseudoClassStateChanged(PSEUDO_CLASS_FIRST, false);
|
||||||
|
});
|
||||||
|
if (!list.isEmpty())
|
||||||
|
list.get(0).pseudoClassStateChanged(PSEUDO_CLASS_FIRST, true);
|
||||||
|
|
||||||
|
lastItem = Bindings.valueAt(list, Bindings.subtract(Bindings.size(list), 1));
|
||||||
|
lastItem.addListener((observable, oldValue, newValue) -> {
|
||||||
|
if (newValue != null)
|
||||||
|
newValue.pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
|
||||||
|
if (oldValue != null)
|
||||||
|
oldValue.pseudoClassStateChanged(PSEUDO_CLASS_LAST, false);
|
||||||
|
});
|
||||||
|
if (!list.isEmpty())
|
||||||
|
list.get(list.size() - 1).pseudoClassStateChanged(PSEUDO_CLASS_LAST, true);
|
||||||
|
|
||||||
VBox vbox = new VBox();
|
VBox vbox = new VBox();
|
||||||
Bindings.bindContent(vbox.getChildren(), list);
|
Bindings.bindContent(vbox.getChildren(), list);
|
||||||
getChildren().setAll(vbox);
|
getChildren().setAll(vbox);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Node mapper(Node node) {
|
|
||||||
StackPane child = new StackPane();
|
|
||||||
child.getChildren().add(new ComponentListCell(node));
|
|
||||||
child.getStyleClass().add("options-list-item");
|
|
||||||
return child;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
@@ -24,6 +24,7 @@ import javafx.animation.KeyValue;
|
|||||||
import javafx.animation.Timeline;
|
import javafx.animation.Timeline;
|
||||||
import javafx.beans.property.BooleanProperty;
|
import javafx.beans.property.BooleanProperty;
|
||||||
import javafx.beans.property.SimpleBooleanProperty;
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
@@ -78,7 +79,6 @@ class ComponentListCell extends StackPane {
|
|||||||
content.getStyleClass().add("options-sublist");
|
content.getStyleClass().add("options-sublist");
|
||||||
|
|
||||||
BorderPane groupNode = new BorderPane();
|
BorderPane groupNode = new BorderPane();
|
||||||
groupNode.getStyleClass().add("options-list-item-header");
|
|
||||||
|
|
||||||
Node expandIcon = SVG.expand(Theme.blackFillBinding(), 10, 10);
|
Node expandIcon = SVG.expand(Theme.blackFillBinding(), 10, 10);
|
||||||
JFXButton expandButton = new JFXButton();
|
JFXButton expandButton = new JFXButton();
|
||||||
@@ -86,21 +86,25 @@ class ComponentListCell extends StackPane {
|
|||||||
expandButton.getStyleClass().add("options-list-item-expand-button");
|
expandButton.getStyleClass().add("options-list-item-expand-button");
|
||||||
|
|
||||||
VBox labelVBox = new VBox();
|
VBox labelVBox = new VBox();
|
||||||
|
labelVBox.setAlignment(Pos.CENTER_LEFT);
|
||||||
|
|
||||||
|
boolean overrideHeaderLeft = false;
|
||||||
if (list instanceof ComponentSublist) {
|
if (list instanceof ComponentSublist) {
|
||||||
Node leftNode = ((ComponentSublist) list).getHeaderLeft();
|
Node leftNode = ((ComponentSublist) list).getHeaderLeft();
|
||||||
if (leftNode != null)
|
if (leftNode != null) {
|
||||||
labelVBox.getChildren().setAll(leftNode);
|
labelVBox.getChildren().setAll(leftNode);
|
||||||
} else {
|
overrideHeaderLeft = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!overrideHeaderLeft) {
|
||||||
Label label = new Label();
|
Label label = new Label();
|
||||||
label.textProperty().bind(list.titleProperty());
|
label.textProperty().bind(list.titleProperty());
|
||||||
label.setMouseTransparent(true);
|
|
||||||
labelVBox.getChildren().add(label);
|
labelVBox.getChildren().add(label);
|
||||||
|
|
||||||
if (list.isHasSubtitle()) {
|
if (list.isHasSubtitle()) {
|
||||||
Label subtitleLabel = new Label();
|
Label subtitleLabel = new Label();
|
||||||
subtitleLabel.textProperty().bind(list.subtitleProperty());
|
subtitleLabel.textProperty().bind(list.subtitleProperty());
|
||||||
subtitleLabel.setMouseTransparent(true);
|
|
||||||
subtitleLabel.getStyleClass().add("subtitle-label");
|
subtitleLabel.getStyleClass().add("subtitle-label");
|
||||||
labelVBox.getChildren().add(subtitleLabel);
|
labelVBox.getChildren().add(subtitleLabel);
|
||||||
}
|
}
|
||||||
@@ -109,6 +113,8 @@ class ComponentListCell extends StackPane {
|
|||||||
groupNode.setLeft(labelVBox);
|
groupNode.setLeft(labelVBox);
|
||||||
|
|
||||||
HBox right = new HBox();
|
HBox right = new HBox();
|
||||||
|
right.setSpacing(16);
|
||||||
|
right.setAlignment(Pos.CENTER_RIGHT);
|
||||||
if (list instanceof ComponentSublist) {
|
if (list instanceof ComponentSublist) {
|
||||||
Node rightNode = ((ComponentSublist) list).getHeaderRight();
|
Node rightNode = ((ComponentSublist) list).getHeaderRight();
|
||||||
if (rightNode != null)
|
if (rightNode != null)
|
||||||
@@ -116,21 +122,13 @@ class ComponentListCell extends StackPane {
|
|||||||
}
|
}
|
||||||
right.getChildren().add(expandButton);
|
right.getChildren().add(expandButton);
|
||||||
groupNode.setRight(right);
|
groupNode.setRight(right);
|
||||||
labelVBox.setAlignment(Pos.CENTER_LEFT);
|
|
||||||
right.setAlignment(Pos.CENTER_RIGHT);
|
|
||||||
|
|
||||||
VBox container = new VBox();
|
VBox container = new VBox();
|
||||||
container.setStyle("-fx-padding: 8 0 0 0;");
|
container.setPadding(new Insets(8, 0, 0, 0));
|
||||||
FXUtils.setLimitHeight(container, 0);
|
FXUtils.setLimitHeight(container, 0);
|
||||||
Rectangle clipRect = new Rectangle();
|
FXUtils.setOverflowHidden(container);
|
||||||
clipRect.widthProperty().bind(container.widthProperty());
|
|
||||||
clipRect.heightProperty().bind(container.heightProperty());
|
|
||||||
container.setClip(clipRect);
|
|
||||||
container.getChildren().setAll(content);
|
container.getChildren().setAll(content);
|
||||||
|
groupNode.setBottom(container);
|
||||||
VBox holder = new VBox();
|
|
||||||
holder.getChildren().setAll(groupNode, container);
|
|
||||||
holder.getStyleClass().add("options-list-item-container");
|
|
||||||
|
|
||||||
expandButton.setOnMouseClicked(e -> {
|
expandButton.setOnMouseClicked(e -> {
|
||||||
if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
|
if (expandAnimation != null && expandAnimation.getStatus() == Animation.Status.RUNNING) {
|
||||||
@@ -145,6 +143,7 @@ class ComponentListCell extends StackPane {
|
|||||||
|
|
||||||
if (isExpanded()) {
|
if (isExpanded()) {
|
||||||
updateClip(newHeight);
|
updateClip(newHeight);
|
||||||
|
list.onExpand();
|
||||||
}
|
}
|
||||||
|
|
||||||
expandAnimation = new Timeline(new KeyFrame(new Duration(320.0),
|
expandAnimation = new Timeline(new KeyFrame(new Duration(320.0),
|
||||||
@@ -162,9 +161,10 @@ class ComponentListCell extends StackPane {
|
|||||||
expandedProperty().addListener((a, b, newValue) ->
|
expandedProperty().addListener((a, b, newValue) ->
|
||||||
expandIcon.setRotate(newValue ? 180 : 0));
|
expandIcon.setRotate(newValue ? 180 : 0));
|
||||||
|
|
||||||
getChildren().setAll(holder);
|
getChildren().setAll(groupNode);
|
||||||
} else
|
} else {
|
||||||
getChildren().setAll(content);
|
getChildren().setAll(content);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isExpanded() {
|
public boolean isExpanded() {
|
||||||
|
|||||||
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import javafx.beans.DefaultProperty;
|
import javafx.beans.DefaultProperty;
|
||||||
@@ -6,7 +23,7 @@ import javafx.beans.property.SimpleObjectProperty;
|
|||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
|
|
||||||
@DefaultProperty("content")
|
@DefaultProperty("content")
|
||||||
public final class ComponentSublist extends ComponentList {
|
public class ComponentSublist extends ComponentList {
|
||||||
|
|
||||||
private final ObjectProperty<Node> headerLeft = new SimpleObjectProperty<>(this, "headerLeft");
|
private final ObjectProperty<Node> headerLeft = new SimpleObjectProperty<>(this, "headerLeft");
|
||||||
private final ObjectProperty<Node> headerRight = new SimpleObjectProperty<>(this, "headerRight");
|
private final ObjectProperty<Node> headerRight = new SimpleObjectProperty<>(this, "headerRight");
|
||||||
|
|||||||
+13
-10
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,16 +13,19 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.task;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import org.jackhuang.hmcl.ui.Controllers;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If a task throws {@link SilentException},
|
* @author yushijinhun
|
||||||
* the task will be marked as failure but do not log the stacktrace.
|
* @see Controllers#dialog(javafx.scene.layout.Region)
|
||||||
*
|
|
||||||
* @author huangyuhui
|
|
||||||
*/
|
*/
|
||||||
public final class SilentException extends Exception {
|
public interface DialogAware {
|
||||||
|
|
||||||
|
default void onDialogShown() {
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ public class FileItem extends BorderPane {
|
|||||||
right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
|
right.setGraphic(SVG.pencil(Theme.blackFillBinding(), 15, 15));
|
||||||
right.getStyleClass().add("toggle-icon4");
|
right.getStyleClass().add("toggle-icon4");
|
||||||
right.setOnMouseClicked(e -> onExplore());
|
right.setOnMouseClicked(e -> onExplore());
|
||||||
FXUtils.installTooltip(right, i18n("button.edit"));
|
FXUtils.installFastTooltip(right, i18n("button.edit"));
|
||||||
setRight(right);
|
setRight(right);
|
||||||
|
|
||||||
Tooltip tip = new Tooltip();
|
Tooltip tip = new Tooltip();
|
||||||
@@ -75,7 +75,13 @@ public class FileItem extends BorderPane {
|
|||||||
* Converts the given path to absolute/relative(if possible) path according to {@link #convertToRelativePathProperty()}.
|
* Converts the given path to absolute/relative(if possible) path according to {@link #convertToRelativePathProperty()}.
|
||||||
*/
|
*/
|
||||||
private String processPath(String path) {
|
private String processPath(String path) {
|
||||||
Path given = Paths.get(path).toAbsolutePath();
|
Path given;
|
||||||
|
try {
|
||||||
|
given = Paths.get(path).toAbsolutePath();
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
if (isConvertToRelativePath()) {
|
if (isConvertToRelativePath()) {
|
||||||
try {
|
try {
|
||||||
return Paths.get(".").normalize().toAbsolutePath().relativize(given).normalize().toString();
|
return Paths.get(".").normalize().toAbsolutePath().relativize(given).normalize().toString();
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import com.jfoenix.effects.JFXDepthManager;
|
||||||
|
import javafx.css.PseudoClass;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.scene.Cursor;
|
||||||
|
import javafx.scene.control.ListCell;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
|
||||||
|
public abstract class FloatListCell<T> extends ListCell<T> {
|
||||||
|
private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected");
|
||||||
|
|
||||||
|
protected final StackPane pane = new StackPane();
|
||||||
|
|
||||||
|
{
|
||||||
|
setText(null);
|
||||||
|
setGraphic(null);
|
||||||
|
|
||||||
|
pane.getStyleClass().add("card");
|
||||||
|
pane.setCursor(Cursor.HAND);
|
||||||
|
setPadding(new Insets(9, 9, 0, 9));
|
||||||
|
JFXDepthManager.setDepth(pane, 1);
|
||||||
|
|
||||||
|
FXUtils.onChangeAndOperate(selectedProperty(), selected -> {
|
||||||
|
pane.pseudoClassStateChanged(SELECTED, selected);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateItem(T item, boolean empty) {
|
||||||
|
super.updateItem(item, empty);
|
||||||
|
updateControl(item, empty);
|
||||||
|
if (empty) {
|
||||||
|
setGraphic(null);
|
||||||
|
} else {
|
||||||
|
setGraphic(pane);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void updateControl(T dataItem, boolean empty);
|
||||||
|
}
|
||||||
@@ -0,0 +1,191 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.binding.NumberBinding;
|
||||||
|
import javafx.geometry.Orientation;
|
||||||
|
import javafx.geometry.Point2D;
|
||||||
|
import javafx.scene.Node;
|
||||||
|
import javafx.scene.control.ScrollBar;
|
||||||
|
import javafx.scene.control.Skin;
|
||||||
|
import javafx.scene.layout.Region;
|
||||||
|
import javafx.scene.shape.Rectangle;
|
||||||
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
|
|
||||||
|
public class FloatScrollBarSkin implements Skin<ScrollBar> {
|
||||||
|
private ScrollBar scrollBar;
|
||||||
|
private Region group;
|
||||||
|
private Rectangle track = new Rectangle();
|
||||||
|
private Rectangle thumb = new Rectangle();
|
||||||
|
|
||||||
|
public FloatScrollBarSkin(final ScrollBar scrollBar) {
|
||||||
|
this.scrollBar = scrollBar;
|
||||||
|
scrollBar.setPrefHeight(1e-18);
|
||||||
|
scrollBar.setPrefWidth(1e-18);
|
||||||
|
|
||||||
|
this.group = new Region() {
|
||||||
|
Point2D dragStart;
|
||||||
|
double preDragThumbPos;
|
||||||
|
|
||||||
|
NumberBinding range = Bindings.subtract(scrollBar.maxProperty(), scrollBar.minProperty());
|
||||||
|
NumberBinding position = Bindings.divide(Bindings.subtract(scrollBar.valueProperty(), scrollBar.minProperty()), range);
|
||||||
|
|
||||||
|
{
|
||||||
|
// Children are added unmanaged because for some reason the height of the bar keeps changing
|
||||||
|
// if they're managed in certain situations... not sure about the cause.
|
||||||
|
getChildren().addAll(track, thumb);
|
||||||
|
|
||||||
|
track.setManaged(false);
|
||||||
|
track.getStyleClass().add("track");
|
||||||
|
|
||||||
|
thumb.setManaged(false);
|
||||||
|
thumb.getStyleClass().add("thumb");
|
||||||
|
|
||||||
|
scrollBar.orientationProperty().addListener(obs -> setup());
|
||||||
|
|
||||||
|
setup();
|
||||||
|
|
||||||
|
|
||||||
|
thumb.setOnMousePressed(me -> {
|
||||||
|
if (me.isSynthesized()) {
|
||||||
|
// touch-screen events handled by Scroll handler
|
||||||
|
me.consume();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
** if max isn't greater than min then there is nothing to do here
|
||||||
|
*/
|
||||||
|
if (getSkinnable().getMax() > getSkinnable().getMin()) {
|
||||||
|
dragStart = thumb.localToParent(me.getX(), me.getY());
|
||||||
|
double clampedValue = Lang.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
|
||||||
|
preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
|
||||||
|
me.consume();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
thumb.setOnMouseDragged(me -> {
|
||||||
|
if (me.isSynthesized()) {
|
||||||
|
// touch-screen events handled by Scroll handler
|
||||||
|
me.consume();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
** if max isn't greater than min then there is nothing to do here
|
||||||
|
*/
|
||||||
|
if (getSkinnable().getMax() > getSkinnable().getMin()) {
|
||||||
|
/*
|
||||||
|
** if the tracklength isn't greater then do nothing....
|
||||||
|
*/
|
||||||
|
if (trackLength() > thumbLength()) {
|
||||||
|
Point2D cur = thumb.localToParent(me.getX(), me.getY());
|
||||||
|
if (dragStart == null) {
|
||||||
|
// we're getting dragged without getting a mouse press
|
||||||
|
dragStart = thumb.localToParent(me.getX(), me.getY());
|
||||||
|
}
|
||||||
|
double dragPos = getSkinnable().getOrientation() == Orientation.VERTICAL ? cur.getY() - dragStart.getY(): cur.getX() - dragStart.getX();
|
||||||
|
double position = preDragThumbPos + dragPos / (trackLength() - thumbLength());
|
||||||
|
if (!getSkinnable().isFocused() && getSkinnable().isFocusTraversable()) getSkinnable().requestFocus();
|
||||||
|
double newValue = (position * (getSkinnable().getMax() - getSkinnable().getMin())) + getSkinnable().getMin();
|
||||||
|
if (!Double.isNaN(newValue)) {
|
||||||
|
getSkinnable().setValue(Lang.clamp(getSkinnable().getMin(), newValue, getSkinnable().getMax()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
me.consume();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private double trackLength() {
|
||||||
|
return getSkinnable().getOrientation() == Orientation.VERTICAL ? track.getHeight() : track.getWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
private double thumbLength() {
|
||||||
|
return getSkinnable().getOrientation() == Orientation.VERTICAL ? thumb.getHeight() : thumb.getWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setup() {
|
||||||
|
track.widthProperty().unbind();
|
||||||
|
track.heightProperty().unbind();
|
||||||
|
|
||||||
|
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
|
||||||
|
track.relocate(0, -5);
|
||||||
|
track.widthProperty().bind(scrollBar.widthProperty());
|
||||||
|
track.setHeight(5);
|
||||||
|
} else {
|
||||||
|
track.relocate(-5, 0);
|
||||||
|
track.setWidth(5);
|
||||||
|
track.heightProperty().bind(scrollBar.heightProperty());
|
||||||
|
}
|
||||||
|
|
||||||
|
thumb.xProperty().unbind();
|
||||||
|
thumb.yProperty().unbind();
|
||||||
|
thumb.widthProperty().unbind();
|
||||||
|
thumb.heightProperty().unbind();
|
||||||
|
|
||||||
|
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
|
||||||
|
thumb.relocate(0, -5);
|
||||||
|
thumb.widthProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.widthProperty())));
|
||||||
|
thumb.setHeight(5);
|
||||||
|
thumb.xProperty().bind(Bindings.subtract(scrollBar.widthProperty(), thumb.widthProperty()).multiply(position));
|
||||||
|
} else {
|
||||||
|
thumb.relocate(-5, 0);
|
||||||
|
thumb.setWidth(5);
|
||||||
|
thumb.heightProperty().bind(Bindings.max(20, scrollBar.visibleAmountProperty().divide(range).multiply(scrollBar.heightProperty())));
|
||||||
|
thumb.yProperty().bind(Bindings.subtract(scrollBar.heightProperty(), thumb.heightProperty()).multiply(position));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected double computeMaxWidth(double height) {
|
||||||
|
if (scrollBar.getOrientation() == Orientation.HORIZONTAL) {
|
||||||
|
return Double.MAX_VALUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected double computeMaxHeight(double width) {
|
||||||
|
if (scrollBar.getOrientation() == Orientation.VERTICAL) {
|
||||||
|
return Double.MAX_VALUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void dispose() {
|
||||||
|
scrollBar = null;
|
||||||
|
group = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Node getNode() {
|
||||||
|
return group;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ScrollBar getSkinnable() {
|
||||||
|
return scrollBar;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,45 +13,51 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import static javafx.collections.FXCollections.emptyObservableList;
|
||||||
|
import static javafx.collections.FXCollections.observableList;
|
||||||
|
import static javafx.collections.FXCollections.singletonObservableList;
|
||||||
|
|
||||||
|
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXComboBox;
|
import com.jfoenix.controls.JFXComboBox;
|
||||||
|
import com.jfoenix.controls.JFXListCell;
|
||||||
|
|
||||||
import javafx.beans.NamedArg;
|
import javafx.beans.NamedArg;
|
||||||
import javafx.scene.control.ListCell;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.scene.text.Font;
|
import javafx.scene.text.Font;
|
||||||
|
|
||||||
public class FontComboBox extends JFXComboBox<String> {
|
public class FontComboBox extends JFXComboBox<String> {
|
||||||
|
|
||||||
private boolean loaded = false;
|
private boolean loaded = false;
|
||||||
|
|
||||||
public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize,
|
public FontComboBox(@NamedArg(value = "fontSize", defaultValue = "12.0") double fontSize) {
|
||||||
@NamedArg(value = "enableStyle", defaultValue = "false") boolean enableStyle) {
|
styleProperty().bind(Bindings.concat("-fx-font-family: \"", valueProperty(), "\""));
|
||||||
valueProperty().addListener((a, b, newValue) -> {
|
|
||||||
if (enableStyle)
|
|
||||||
setStyle("-fx-font-family: \"" + newValue + "\";");
|
|
||||||
});
|
|
||||||
|
|
||||||
setCellFactory(listView -> new ListCell<String>() {
|
setCellFactory(listView -> new JFXListCell<String>() {
|
||||||
@Override
|
@Override
|
||||||
protected void updateItem(String item, boolean empty) {
|
public void updateItem(String item, boolean empty) {
|
||||||
super.updateItem(item, empty);
|
super.updateItem(item, empty);
|
||||||
if (item != null) {
|
if (!empty) {
|
||||||
setText(item);
|
setText(item);
|
||||||
setFont(new Font(item, fontSize));
|
setGraphic(null);
|
||||||
|
setStyle("-fx-font-family: \"" + item + "\"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
itemsProperty().bind(BindingMapping.of(valueProperty())
|
||||||
|
.map(value -> value == null ? emptyObservableList() : singletonObservableList(value)));
|
||||||
|
|
||||||
setOnMouseClicked(e -> {
|
setOnMouseClicked(e -> {
|
||||||
if (loaded) return;
|
if (loaded)
|
||||||
getItems().setAll(Font.getFamilies());
|
return;
|
||||||
|
itemsProperty().unbind();
|
||||||
|
setItems(observableList(Font.getFamilies()));
|
||||||
loaded = true;
|
loaded = true;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void initValue(Font font) {
|
|
||||||
getItems().setAll(font.getFamily());
|
|
||||||
getSelectionModel().select(font.getFamily());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,11 +13,10 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import javafx.geometry.Pos;
|
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
@@ -39,12 +38,17 @@ public class IconedItem extends RipplerContainer {
|
|||||||
|
|
||||||
private static HBox createHBox(Node icon) {
|
private static HBox createHBox(Node icon) {
|
||||||
HBox hBox = new HBox();
|
HBox hBox = new HBox();
|
||||||
hBox.getStyleClass().setAll("iconed-item-container");
|
|
||||||
icon.setMouseTransparent(true);
|
if (icon != null) {
|
||||||
|
icon.setMouseTransparent(true);
|
||||||
|
hBox.getChildren().add(icon);
|
||||||
|
}
|
||||||
|
|
||||||
|
hBox.getStyleClass().add("iconed-item-container");
|
||||||
Label textLabel = new Label();
|
Label textLabel = new Label();
|
||||||
textLabel.setId("label");
|
textLabel.setId("label");
|
||||||
textLabel.setMouseTransparent(true);
|
textLabel.setMouseTransparent(true);
|
||||||
hBox.getChildren().addAll(icon, textLabel);
|
hBox.getChildren().addAll(textLabel);
|
||||||
return hBox;
|
return hBox;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,11 +13,12 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
|
||||||
public class IconedMenuItem extends IconedItem {
|
public class IconedMenuItem extends IconedItem {
|
||||||
|
|
||||||
@@ -27,4 +28,9 @@ public class IconedMenuItem extends IconedItem {
|
|||||||
getStyleClass().setAll("iconed-menu-item");
|
getStyleClass().setAll("iconed-menu-item");
|
||||||
setOnMouseClicked(e -> action.run());
|
setOnMouseClicked(e -> action.run());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public IconedMenuItem addTooltip(String tooltip) {
|
||||||
|
FXUtils.installFastTooltip(this, tooltip);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
@@ -46,7 +63,7 @@ public final class ImagePickerItem extends BorderPane {
|
|||||||
deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
|
deleteButton.onMouseClickedProperty().bind(onDeleteButtonClicked);
|
||||||
deleteButton.getStyleClass().add("toggle-icon4");
|
deleteButton.getStyleClass().add("toggle-icon4");
|
||||||
|
|
||||||
FXUtils.installTooltip(selectButton, i18n("button.edit"));
|
FXUtils.installFastTooltip(selectButton, i18n("button.edit"));
|
||||||
|
|
||||||
HBox hBox = new HBox();
|
HBox hBox = new HBox();
|
||||||
hBox.getChildren().setAll(imageView, selectButton, deleteButton);
|
hBox.getChildren().setAll(imageView, selectButton, deleteButton);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,51 +13,59 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
||||||
import javafx.beans.binding.Bindings;
|
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
|
import javafx.scene.layout.VBox;
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
import org.jackhuang.hmcl.util.FutureCallback;
|
import org.jackhuang.hmcl.util.FutureCallback;
|
||||||
|
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
public class InputDialogPane extends StackPane {
|
public class InputDialogPane extends StackPane {
|
||||||
|
private final CompletableFuture<String> future = new CompletableFuture<>();
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private JFXButton acceptButton;
|
private JFXButton acceptButton;
|
||||||
@FXML
|
@FXML
|
||||||
private JFXButton cancelButton;
|
private JFXButton cancelButton;
|
||||||
@FXML
|
@FXML
|
||||||
private JFXTextField textField;
|
private Label title;
|
||||||
@FXML
|
@FXML
|
||||||
private Label content;
|
private VBox vbox;
|
||||||
@FXML
|
@FXML
|
||||||
private Label lblCreationWarning;
|
private Label lblCreationWarning;
|
||||||
|
@FXML
|
||||||
|
private SpinnerPane acceptPane;
|
||||||
|
|
||||||
public InputDialogPane(String text, FutureCallback<String> onResult) {
|
public InputDialogPane(String text, String initialValue, FutureCallback<String> onResult) {
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
|
FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
|
||||||
content.setText(text);
|
title.setText(text);
|
||||||
|
JFXTextField textField = new JFXTextField();
|
||||||
|
textField.setText(initialValue);
|
||||||
|
vbox.getChildren().setAll(textField);
|
||||||
cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
|
cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
|
||||||
acceptButton.setOnMouseClicked(e -> {
|
acceptButton.setOnMouseClicked(e -> {
|
||||||
|
acceptPane.showSpinner();
|
||||||
|
|
||||||
onResult.call(textField.getText(), () -> {
|
onResult.call(textField.getText(), () -> {
|
||||||
|
acceptPane.hideSpinner();
|
||||||
|
future.complete(textField.getText());
|
||||||
fireEvent(new DialogCloseEvent());
|
fireEvent(new DialogCloseEvent());
|
||||||
}, msg -> {
|
}, msg -> {
|
||||||
|
acceptPane.hideSpinner();
|
||||||
lblCreationWarning.setText(msg);
|
lblCreationWarning.setText(msg);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
acceptButton.disableProperty().bind(Bindings.createBooleanBinding(
|
|
||||||
() -> !textField.validate(),
|
|
||||||
textField.textProperty()
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setInitialText(String text) {
|
public CompletableFuture<String> getCompletableFuture() {
|
||||||
textField.setText(text);
|
return future;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
|
import javafx.scene.shape.Rectangle;
|
||||||
|
|
||||||
|
public class MenuSeparator extends StackPane {
|
||||||
|
|
||||||
|
public MenuSeparator() {
|
||||||
|
Rectangle rect = new Rectangle();
|
||||||
|
rect.widthProperty().bind(widthProperty().add(-14));
|
||||||
|
rect.setHeight(1);
|
||||||
|
rect.setFill(Color.GRAY);
|
||||||
|
maxHeightProperty().set(10);
|
||||||
|
setPadding(new Insets(3));
|
||||||
|
getChildren().setAll(rect);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
/*
|
|
||||||
* Hello Minecraft! Launcher.
|
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
|
||||||
*/
|
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
|
||||||
|
|
||||||
import javafx.scene.control.Alert;
|
|
||||||
import javafx.scene.control.ButtonType;
|
|
||||||
import javafx.scene.control.TextInputDialog;
|
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|
||||||
|
|
||||||
public final class MessageBox {
|
|
||||||
private MessageBox() {
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final String TITLE = i18n("message.info");
|
|
||||||
|
|
||||||
/**
|
|
||||||
* User Operation: Yes
|
|
||||||
*/
|
|
||||||
public static final int YES_OPTION = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* User Operation: No
|
|
||||||
*/
|
|
||||||
public static final int NO_OPTION = 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* User Operation: Cancel
|
|
||||||
*/
|
|
||||||
public static final int CANCEL_OPTION = 2;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* User Operation: OK
|
|
||||||
*/
|
|
||||||
public static final int OK_OPTION = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* User Operation: Closed Message Box
|
|
||||||
*/
|
|
||||||
public static final int CLOSED_OPTION = -1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Buttons: Yes No
|
|
||||||
*/
|
|
||||||
public static final int YES_NO_OPTION = 10;
|
|
||||||
/**
|
|
||||||
* Buttons: Yes No Cancel
|
|
||||||
*/
|
|
||||||
public static final int YES_NO_CANCEL_OPTION = 11;
|
|
||||||
/**
|
|
||||||
* Buttons: OK Cancel
|
|
||||||
*/
|
|
||||||
public static final int OK_CANCEL_OPTION = 12;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Message Box Type: Error
|
|
||||||
*/
|
|
||||||
public static final int ERROR_MESSAGE = 0;
|
|
||||||
/**
|
|
||||||
* Message Box Type: Info
|
|
||||||
*/
|
|
||||||
public static final int INFORMATION_MESSAGE = 1;
|
|
||||||
/**
|
|
||||||
* Message Box Type: Warning
|
|
||||||
*/
|
|
||||||
public static final int WARNING_MESSAGE = 2;
|
|
||||||
/**
|
|
||||||
* Message Box Type: Question
|
|
||||||
*/
|
|
||||||
public static final int QUESTION_MESSAGE = 3;
|
|
||||||
/**
|
|
||||||
* Message Box Type: Fine
|
|
||||||
*/
|
|
||||||
public static final int FINE_MESSAGE = 4;
|
|
||||||
/**
|
|
||||||
* Message Box Type: Plain
|
|
||||||
*/
|
|
||||||
public static final int PLAIN_MESSAGE = -1;
|
|
||||||
|
|
||||||
|
|
||||||
public static void show(String message) {
|
|
||||||
show(message, TITLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show MsgBox with title and options
|
|
||||||
*
|
|
||||||
* @param message The Message
|
|
||||||
* @param title The title of MsgBox.
|
|
||||||
* @return user operation.
|
|
||||||
*/
|
|
||||||
public static Optional<ButtonType> show(String message, String title) {
|
|
||||||
Alert alert = new Alert(Alert.AlertType.INFORMATION);
|
|
||||||
alert.setTitle(title);
|
|
||||||
alert.setHeaderText(title);
|
|
||||||
alert.setContentText(message);
|
|
||||||
return alert.showAndWait();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int confirm(String message, String title) {
|
|
||||||
return confirm(message, title, -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int confirm(String message, int option) {
|
|
||||||
return confirm(message, TITLE, option);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int confirm(String message, String title, int option) {
|
|
||||||
return FXUtils.runInUIThread(() -> {
|
|
||||||
Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
|
|
||||||
alert.setTitle(title);
|
|
||||||
alert.setHeaderText(title);
|
|
||||||
alert.setContentText(message);
|
|
||||||
switch (option) {
|
|
||||||
case YES_NO_OPTION:
|
|
||||||
alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
|
|
||||||
break;
|
|
||||||
case YES_NO_CANCEL_OPTION:
|
|
||||||
alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO, ButtonType.CANCEL);
|
|
||||||
break;
|
|
||||||
case OK_CANCEL_OPTION:
|
|
||||||
alert.getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
throw new IllegalArgumentException("Unrecognized message box option " + option);
|
|
||||||
}
|
|
||||||
Optional<ButtonType> buttonType = alert.showAndWait();
|
|
||||||
if (!buttonType.isPresent()) return CLOSED_OPTION;
|
|
||||||
else if (buttonType.get() == ButtonType.OK) return OK_OPTION;
|
|
||||||
else if (buttonType.get() == ButtonType.YES) return YES_OPTION;
|
|
||||||
else if (buttonType.get() == ButtonType.NO) return NO_OPTION;
|
|
||||||
else if (buttonType.get() == ButtonType.CANCEL) return CANCEL_OPTION;
|
|
||||||
else throw new IllegalStateException("Unexpected button type:" + buttonType.get());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Optional<String> input(String message) {
|
|
||||||
return input(message, UIManager.getString("OptionPane.inputDialogTitle"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Optional<String> input(String message, String title) {
|
|
||||||
return input(message, title, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Optional<String> input(String message, String title, String initialValue) {
|
|
||||||
TextInputDialog dialog = new TextInputDialog(initialValue);
|
|
||||||
dialog.setTitle(title);
|
|
||||||
dialog.setHeaderText(message);
|
|
||||||
dialog.setContentText(message);
|
|
||||||
|
|
||||||
return dialog.showAndWait();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <huanghongxun4[email protected]>
|
* Copyright (C) 2020 huangyuhui <huanghongxun2[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
@@ -32,6 +32,14 @@ import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|||||||
|
|
||||||
public final class MessageDialogPane extends StackPane {
|
public final class MessageDialogPane extends StackPane {
|
||||||
|
|
||||||
|
public enum MessageType {
|
||||||
|
ERROR,
|
||||||
|
INFORMATION,
|
||||||
|
WARNING,
|
||||||
|
QUESTION,
|
||||||
|
FINE,
|
||||||
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private JFXButton acceptButton;
|
private JFXButton acceptButton;
|
||||||
@FXML
|
@FXML
|
||||||
@@ -45,7 +53,7 @@ public final class MessageDialogPane extends StackPane {
|
|||||||
@FXML
|
@FXML
|
||||||
private HBox actions;
|
private HBox actions;
|
||||||
|
|
||||||
public MessageDialogPane(String text, String title, int type, Runnable onAccept) {
|
public MessageDialogPane(String text, String title, MessageType type, Runnable onAccept) {
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
|
FXUtils.loadFXML(this, "/assets/fxml/message-dialog.fxml");
|
||||||
|
|
||||||
if (title != null)
|
if (title != null)
|
||||||
@@ -60,19 +68,19 @@ public final class MessageDialogPane extends StackPane {
|
|||||||
actions.getChildren().remove(cancelButton);
|
actions.getChildren().remove(cancelButton);
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case MessageBox.INFORMATION_MESSAGE:
|
case INFORMATION:
|
||||||
graphic.setGraphic(SVG.infoCircle(Theme.blackFillBinding(), 40, 40));
|
graphic.setGraphic(SVG.infoCircle(Theme.blackFillBinding(), 40, 40));
|
||||||
break;
|
break;
|
||||||
case MessageBox.ERROR_MESSAGE:
|
case ERROR:
|
||||||
graphic.setGraphic(SVG.closeCircle(Theme.blackFillBinding(), 40, 40));
|
graphic.setGraphic(SVG.closeCircle(Theme.blackFillBinding(), 40, 40));
|
||||||
break;
|
break;
|
||||||
case MessageBox.FINE_MESSAGE:
|
case FINE:
|
||||||
graphic.setGraphic(SVG.checkCircle(Theme.blackFillBinding(), 40, 40));
|
graphic.setGraphic(SVG.checkCircle(Theme.blackFillBinding(), 40, 40));
|
||||||
break;
|
break;
|
||||||
case MessageBox.WARNING_MESSAGE:
|
case WARNING:
|
||||||
graphic.setGraphic(SVG.alert(Theme.blackFillBinding(), 40, 40));
|
graphic.setGraphic(SVG.alert(Theme.blackFillBinding(), 40, 40));
|
||||||
break;
|
break;
|
||||||
case MessageBox.QUESTION_MESSAGE:
|
case QUESTION:
|
||||||
graphic.setGraphic(SVG.helpCircle(Theme.blackFillBinding(), 40, 40));
|
graphic.setGraphic(SVG.helpCircle(Theme.blackFillBinding(), 40, 40));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -81,7 +89,7 @@ public final class MessageDialogPane extends StackPane {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public MessageDialogPane(String text, String title, Runnable onAccept, Runnable onCancel) {
|
public MessageDialogPane(String text, String title, Runnable onAccept, Runnable onCancel) {
|
||||||
this(text, title, MessageBox.QUESTION_MESSAGE, onAccept);
|
this(text, title, MessageType.QUESTION, onAccept);
|
||||||
|
|
||||||
cancelButton.setVisible(true);
|
cancelButton.setVisible(true);
|
||||||
cancelButton.setOnMouseClicked(e -> {
|
cancelButton.setOnMouseClicked(e -> {
|
||||||
|
|||||||
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXColorPicker;
|
import com.jfoenix.controls.JFXColorPicker;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
@@ -24,6 +24,7 @@ import javafx.beans.NamedArg;
|
|||||||
import javafx.beans.property.*;
|
import javafx.beans.property.*;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
@@ -46,7 +47,7 @@ import java.util.function.Consumer;
|
|||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
||||||
|
|
||||||
public class MultiFileItem<T> extends ComponentList {
|
public class MultiFileItem<T> extends ComponentSublist {
|
||||||
private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
|
private final StringProperty customTitle = new SimpleStringProperty(this, "customTitle", i18n("selector.custom"));
|
||||||
private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
|
private final StringProperty chooserTitle = new SimpleStringProperty(this, "chooserTitle", i18n("selector.choose_file"));
|
||||||
private final BooleanProperty directory = new SimpleBooleanProperty(this, "directory", false);
|
private final BooleanProperty directory = new SimpleBooleanProperty(this, "directory", false);
|
||||||
@@ -138,7 +139,7 @@ public class MultiFileItem<T> extends ComponentList {
|
|||||||
|
|
||||||
public Node createChildren(String title, String subtitle, T userData) {
|
public Node createChildren(String title, String subtitle, T userData) {
|
||||||
BorderPane pane = new BorderPane();
|
BorderPane pane = new BorderPane();
|
||||||
pane.setStyle("-fx-padding: 3;");
|
pane.setPadding(new Insets(3));
|
||||||
FXUtils.setLimitHeight(pane, 20);
|
FXUtils.setLimitHeight(pane, 20);
|
||||||
|
|
||||||
JFXRadioButton left = new JFXRadioButton(title);
|
JFXRadioButton left = new JFXRadioButton(title);
|
||||||
@@ -147,6 +148,7 @@ public class MultiFileItem<T> extends ComponentList {
|
|||||||
pane.setLeft(left);
|
pane.setLeft(left);
|
||||||
|
|
||||||
Label right = new Label(subtitle);
|
Label right = new Label(subtitle);
|
||||||
|
right.setWrapText(true);
|
||||||
right.getStyleClass().add("subtitle-label");
|
right.getStyleClass().add("subtitle-label");
|
||||||
right.setStyle("-fx-font-size: 10;");
|
right.setStyle("-fx-font-size: 10;");
|
||||||
pane.setRight(right);
|
pane.setRight(right);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,49 +13,70 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import javafx.beans.property.BooleanProperty;
|
||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.property.ObjectProperty;
|
||||||
import javafx.beans.property.ReadOnlyBooleanWrapper;
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
import javafx.beans.property.SimpleObjectProperty;
|
||||||
import javafx.event.Event;
|
import javafx.event.Event;
|
||||||
import javafx.event.EventHandler;
|
import javafx.event.EventHandler;
|
||||||
import javafx.event.EventType;
|
import javafx.event.EventType;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.layout.Region;
|
import javafx.scene.layout.Region;
|
||||||
import javafx.scene.layout.StackPane;
|
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
import org.jackhuang.hmcl.ui.animation.AnimationProducer;
|
||||||
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
|
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
|
||||||
import org.jackhuang.hmcl.ui.animation.TransitionHandler;
|
import org.jackhuang.hmcl.ui.animation.TransitionPane;
|
||||||
|
import org.jackhuang.hmcl.util.Logging;
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Stack;
|
import java.util.Stack;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
public class Navigator extends StackPane {
|
public class Navigator extends TransitionPane {
|
||||||
private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Navigator.class.getName() + ".closeListener";
|
private static final String PROPERTY_DIALOG_CLOSE_HANDLER = Navigator.class.getName() + ".closeListener";
|
||||||
|
|
||||||
|
private final BooleanProperty backable = new SimpleBooleanProperty(this, "backable");
|
||||||
private final Stack<Node> stack = new Stack<>();
|
private final Stack<Node> stack = new Stack<>();
|
||||||
private final TransitionHandler animationHandler = new TransitionHandler(this);
|
private boolean initialized = false;
|
||||||
private final ReadOnlyBooleanWrapper canGoBack = new ReadOnlyBooleanWrapper();
|
|
||||||
|
|
||||||
public Navigator(Node init) {
|
public void init(Node init) {
|
||||||
stack.push(init);
|
stack.push(init);
|
||||||
|
backable.set(canGoBack());
|
||||||
getChildren().setAll(init);
|
getChildren().setAll(init);
|
||||||
|
|
||||||
|
fireEvent(new NavigationEvent(this, init, NavigationEvent.NAVIGATED));
|
||||||
|
|
||||||
|
initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void navigate(Node node) {
|
public void navigate(Node node, AnimationProducer animationProducer) {
|
||||||
FXUtils.checkFxUserThread();
|
FXUtils.checkFxUserThread();
|
||||||
|
|
||||||
|
if (!initialized)
|
||||||
|
throw new IllegalStateException("Navigator must have a root page");
|
||||||
|
|
||||||
Node from = stack.peek();
|
Node from = stack.peek();
|
||||||
if (from == node)
|
if (from == node)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Logging.LOG.info("Navigate to " + node);
|
||||||
|
|
||||||
stack.push(node);
|
stack.push(node);
|
||||||
fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
|
backable.set(canGoBack());
|
||||||
setContent(node);
|
|
||||||
fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
|
NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
|
||||||
|
fireEvent(navigating);
|
||||||
|
node.fireEvent(navigating);
|
||||||
|
|
||||||
|
node.getProperties().put("hmcl.navigator.animation", animationProducer);
|
||||||
|
setContent(node, animationProducer);
|
||||||
|
|
||||||
|
NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
|
||||||
|
node.fireEvent(navigated);
|
||||||
|
|
||||||
EventHandler<PageCloseEvent> handler = event -> close(node);
|
EventHandler<PageCloseEvent> handler = event -> close(node);
|
||||||
node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
|
node.getProperties().put(PROPERTY_DIALOG_CLOSE_HANDLER, handler);
|
||||||
@@ -66,15 +87,43 @@ public class Navigator extends StackPane {
|
|||||||
close(stack.peek());
|
close(stack.peek());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
while (stack.size() > 1)
|
||||||
|
close(stack.peek());
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public void close(Node from) {
|
public void close(Node from) {
|
||||||
FXUtils.checkFxUserThread();
|
FXUtils.checkFxUserThread();
|
||||||
|
|
||||||
stack.remove(from);
|
if (!initialized)
|
||||||
|
throw new IllegalStateException("Navigator must have a root page");
|
||||||
|
|
||||||
|
if (stack.peek() != from) {
|
||||||
|
// Allow page to be closed multiple times.
|
||||||
|
Logging.LOG.log(Level.INFO, "Closing already closed page: " + from, new Throwable());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Logging.LOG.info("Closed page " + from);
|
||||||
|
|
||||||
|
stack.pop();
|
||||||
|
backable.set(canGoBack());
|
||||||
Node node = stack.peek();
|
Node node = stack.peek();
|
||||||
fireEvent(new NavigationEvent(this, from, NavigationEvent.NAVIGATING));
|
|
||||||
setContent(node);
|
NavigationEvent navigating = new NavigationEvent(this, from, NavigationEvent.NAVIGATING);
|
||||||
fireEvent(new NavigationEvent(this, node, NavigationEvent.NAVIGATED));
|
fireEvent(navigating);
|
||||||
|
node.fireEvent(navigating);
|
||||||
|
|
||||||
|
Object obj = from.getProperties().get("hmcl.navigator.animation");
|
||||||
|
if (obj instanceof AnimationProducer) {
|
||||||
|
setContent(node, (AnimationProducer) obj);
|
||||||
|
} else {
|
||||||
|
setContent(node, ContainerAnimations.NONE.getAnimationProducer());
|
||||||
|
}
|
||||||
|
|
||||||
|
NavigationEvent navigated = new NavigationEvent(this, node, NavigationEvent.NAVIGATED);
|
||||||
|
node.fireEvent(navigated);
|
||||||
|
|
||||||
Optional.ofNullable(from.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
|
Optional.ofNullable(from.getProperties().get(PROPERTY_DIALOG_CLOSE_HANDLER))
|
||||||
.ifPresent(handler -> from.removeEventHandler(PageCloseEvent.CLOSE, (EventHandler<PageCloseEvent>) handler));
|
.ifPresent(handler -> from.removeEventHandler(PageCloseEvent.CLOSE, (EventHandler<PageCloseEvent>) handler));
|
||||||
@@ -88,12 +137,28 @@ public class Navigator extends StackPane {
|
|||||||
return stack.size() > 1;
|
return stack.size() > 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setContent(Node content) {
|
public boolean isBackable() {
|
||||||
animationHandler.setContent(content, ContainerAnimations.FADE.getAnimationProducer());
|
return backable.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BooleanProperty backableProperty() {
|
||||||
|
return backable;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBackable(boolean backable) {
|
||||||
|
this.backable.set(backable);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int size() {
|
||||||
|
return stack.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setContent(Node content, AnimationProducer animationProducer) {
|
||||||
|
super.setContent(content, animationProducer);
|
||||||
|
|
||||||
if (content instanceof Region) {
|
if (content instanceof Region) {
|
||||||
((Region) content).setMinSize(0, 0);
|
((Region) content).setMinSize(0, 0);
|
||||||
FXUtils.setOverflowHidden((Region) content, true);
|
FXUtils.setOverflowHidden((Region) content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,14 +204,21 @@ public class Navigator extends StackPane {
|
|||||||
public static final EventType<NavigationEvent> NAVIGATED = new EventType<>("NAVIGATED");
|
public static final EventType<NavigationEvent> NAVIGATED = new EventType<>("NAVIGATED");
|
||||||
public static final EventType<NavigationEvent> NAVIGATING = new EventType<>("NAVIGATING");
|
public static final EventType<NavigationEvent> NAVIGATING = new EventType<>("NAVIGATING");
|
||||||
|
|
||||||
|
private final Navigator source;
|
||||||
private final Node node;
|
private final Node node;
|
||||||
|
|
||||||
public NavigationEvent(Object source, Node target, EventType<? extends Event> eventType) {
|
public NavigationEvent(Navigator source, Node target, EventType<? extends Event> eventType) {
|
||||||
super(source, target, eventType);
|
super(source, target, eventType);
|
||||||
|
|
||||||
|
this.source = source;
|
||||||
this.node = target;
|
this.node = target;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Navigator getSource() {
|
||||||
|
return source;
|
||||||
|
}
|
||||||
|
|
||||||
public Node getNode() {
|
public Node getNode() {
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2017 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.binding.When;
|
||||||
|
import javafx.beans.property.BooleanProperty;
|
||||||
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
|
import javafx.collections.FXCollections;
|
||||||
|
import javafx.collections.ObservableList;
|
||||||
|
import javafx.scene.Node;
|
||||||
|
import javafx.scene.control.Control;
|
||||||
|
import javafx.scene.control.ScrollPane;
|
||||||
|
import javafx.scene.control.Skin;
|
||||||
|
import javafx.scene.control.SkinBase;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
|
import javafx.scene.layout.VBox;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
|
||||||
|
public class PopupMenu extends Control {
|
||||||
|
|
||||||
|
private final ObservableList<Node> content = FXCollections.observableArrayList();
|
||||||
|
private final BooleanProperty alwaysShowingVBar = new SimpleBooleanProperty();
|
||||||
|
|
||||||
|
public PopupMenu() {
|
||||||
|
getStyleClass().add("popup-menu");
|
||||||
|
}
|
||||||
|
|
||||||
|
public ObservableList<Node> getContent() {
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isAlwaysShowingVBar() {
|
||||||
|
return alwaysShowingVBar.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BooleanProperty alwaysShowingVBarProperty() {
|
||||||
|
return alwaysShowingVBar;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAlwaysShowingVBar(boolean alwaysShowingVBar) {
|
||||||
|
this.alwaysShowingVBar.set(alwaysShowingVBar);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Skin<?> createDefaultSkin() {
|
||||||
|
return new PopupMenuSkin();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Node wrapPopupMenuItem(Node node) {
|
||||||
|
StackPane pane = new StackPane();
|
||||||
|
pane.getChildren().setAll(node);
|
||||||
|
pane.getStyleClass().add("menu-container");
|
||||||
|
node.setMouseTransparent(true);
|
||||||
|
return new RipplerContainer(pane);
|
||||||
|
}
|
||||||
|
|
||||||
|
private class PopupMenuSkin extends SkinBase<PopupMenu> {
|
||||||
|
|
||||||
|
protected PopupMenuSkin() {
|
||||||
|
super(PopupMenu.this);
|
||||||
|
|
||||||
|
ScrollPane scrollPane = new ScrollPane();
|
||||||
|
scrollPane.setFitToHeight(true);
|
||||||
|
scrollPane.setFitToWidth(true);
|
||||||
|
scrollPane.vbarPolicyProperty().bind(new When(alwaysShowingVBar)
|
||||||
|
.then(ScrollPane.ScrollBarPolicy.ALWAYS)
|
||||||
|
.otherwise(ScrollPane.ScrollBarPolicy.AS_NEEDED));
|
||||||
|
|
||||||
|
VBox content = new VBox();
|
||||||
|
content.getStyleClass().add("content");
|
||||||
|
Bindings.bindContent(content.getChildren(), PopupMenu.this.getContent());
|
||||||
|
scrollPane.setContent(content);
|
||||||
|
|
||||||
|
FXUtils.smoothScrolling(scrollPane);
|
||||||
|
|
||||||
|
getChildren().setAll(scrollPane);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,183 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher
|
||||||
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import com.jfoenix.controls.JFXButton;
|
||||||
|
import com.jfoenix.controls.JFXCheckBox;
|
||||||
|
import com.jfoenix.controls.JFXComboBox;
|
||||||
|
import com.jfoenix.controls.JFXTextField;
|
||||||
|
import com.jfoenix.validation.base.ValidatorBase;
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
|
import javafx.beans.binding.BooleanBinding;
|
||||||
|
import javafx.fxml.FXML;
|
||||||
|
import javafx.geometry.Insets;
|
||||||
|
import javafx.scene.control.Label;
|
||||||
|
import javafx.scene.layout.HBox;
|
||||||
|
import javafx.scene.layout.StackPane;
|
||||||
|
import javafx.scene.layout.VBox;
|
||||||
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
import org.jackhuang.hmcl.util.FutureCallback;
|
||||||
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
|
public class PromptDialogPane extends StackPane {
|
||||||
|
private final CompletableFuture<List<Builder.Question<?>>> future = new CompletableFuture<>();
|
||||||
|
|
||||||
|
@FXML
|
||||||
|
private JFXButton acceptButton;
|
||||||
|
@FXML
|
||||||
|
private JFXButton cancelButton;
|
||||||
|
@FXML
|
||||||
|
private VBox vbox;
|
||||||
|
@FXML
|
||||||
|
private Label title;
|
||||||
|
@FXML
|
||||||
|
private Label lblCreationWarning;
|
||||||
|
@FXML
|
||||||
|
private SpinnerPane acceptPane;
|
||||||
|
|
||||||
|
public PromptDialogPane(Builder builder) {
|
||||||
|
FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
|
||||||
|
this.title.setText(builder.title);
|
||||||
|
|
||||||
|
List<BooleanBinding> bindings = new ArrayList<>();
|
||||||
|
for (Builder.Question<?> question : builder.questions) {
|
||||||
|
if (question instanceof Builder.StringQuestion) {
|
||||||
|
JFXTextField textField = new JFXTextField();
|
||||||
|
textField.textProperty().addListener((a, b, newValue) -> ((Builder.StringQuestion) question).value = textField.getText());
|
||||||
|
textField.setText(((Builder.StringQuestion) question).value);
|
||||||
|
textField.setValidators(((Builder.StringQuestion) question).validators.toArray(new ValidatorBase[0]));
|
||||||
|
bindings.add(Bindings.createBooleanBinding(textField::validate, textField.textProperty()));
|
||||||
|
|
||||||
|
if (StringUtils.isNotBlank(question.question)) {
|
||||||
|
vbox.getChildren().add(new Label(question.question));
|
||||||
|
}
|
||||||
|
VBox.setMargin(textField, new Insets(0, 0, 20, 0));
|
||||||
|
vbox.getChildren().add(textField);
|
||||||
|
} else if (question instanceof Builder.BooleanQuestion) {
|
||||||
|
HBox hBox = new HBox();
|
||||||
|
JFXCheckBox checkBox = new JFXCheckBox();
|
||||||
|
hBox.getChildren().setAll(checkBox);
|
||||||
|
HBox.setMargin(checkBox, new Insets(0, 0, 0, -10));
|
||||||
|
checkBox.setSelected(((Builder.BooleanQuestion) question).value);
|
||||||
|
checkBox.selectedProperty().addListener((a, b, newValue) -> ((Builder.BooleanQuestion) question).value = newValue);
|
||||||
|
checkBox.setText(question.question);
|
||||||
|
vbox.getChildren().add(hBox);
|
||||||
|
} else if (question instanceof Builder.CandidatesQuestion) {
|
||||||
|
HBox hBox = new HBox();
|
||||||
|
JFXComboBox<String> comboBox = new JFXComboBox<>();
|
||||||
|
hBox.getChildren().setAll(comboBox);
|
||||||
|
comboBox.getItems().setAll(((Builder.CandidatesQuestion) question).candidates);
|
||||||
|
comboBox.getSelectionModel().selectedIndexProperty().addListener((a, b, newValue) ->
|
||||||
|
((Builder.CandidatesQuestion) question).value = newValue.intValue());
|
||||||
|
comboBox.getSelectionModel().select(0);
|
||||||
|
if (StringUtils.isNotBlank(question.question)) {
|
||||||
|
vbox.getChildren().add(new Label(question.question));
|
||||||
|
}
|
||||||
|
vbox.getChildren().add(hBox);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
|
||||||
|
acceptButton.disableProperty().bind(Bindings.createBooleanBinding(
|
||||||
|
() -> bindings.stream().map(BooleanBinding::get).anyMatch(x -> !x),
|
||||||
|
bindings.toArray(new BooleanBinding[0])
|
||||||
|
));
|
||||||
|
|
||||||
|
acceptButton.setOnMouseClicked(e -> {
|
||||||
|
acceptPane.showSpinner();
|
||||||
|
|
||||||
|
builder.callback.call(builder.questions, () -> {
|
||||||
|
acceptPane.hideSpinner();
|
||||||
|
future.complete(builder.questions);
|
||||||
|
fireEvent(new DialogCloseEvent());
|
||||||
|
}, msg -> {
|
||||||
|
acceptPane.hideSpinner();
|
||||||
|
lblCreationWarning.setText(msg);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public CompletableFuture<List<Builder.Question<?>>> getCompletableFuture() {
|
||||||
|
return future;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private final List<Question<?>> questions = new ArrayList<>();
|
||||||
|
private final String title;
|
||||||
|
private final FutureCallback<List<Question<?>>> callback;
|
||||||
|
|
||||||
|
public Builder(String title, FutureCallback<List<Question<?>>> callback) {
|
||||||
|
this.title = title;
|
||||||
|
this.callback = callback;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <T> Builder addQuestion(Question<T> question) {
|
||||||
|
questions.add(question);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Question<T> {
|
||||||
|
public final String question;
|
||||||
|
protected T value;
|
||||||
|
|
||||||
|
public Question(String question) {
|
||||||
|
this.question = question;
|
||||||
|
}
|
||||||
|
|
||||||
|
public T getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class StringQuestion extends Question<String> {
|
||||||
|
protected final List<ValidatorBase> validators;
|
||||||
|
|
||||||
|
public StringQuestion(String question, String defaultValue, ValidatorBase... validators) {
|
||||||
|
super(question);
|
||||||
|
this.value = defaultValue;
|
||||||
|
this.validators = Arrays.asList(validators);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class CandidatesQuestion extends Question<Integer> {
|
||||||
|
protected final List<String> candidates;
|
||||||
|
|
||||||
|
public CandidatesQuestion(String question, String... candidates) {
|
||||||
|
super(question);
|
||||||
|
this.value = null;
|
||||||
|
if (candidates == null || candidates.length == 0) {
|
||||||
|
throw new IllegalArgumentException("At least one candidate required");
|
||||||
|
}
|
||||||
|
this.candidates = new ArrayList<>(Arrays.asList(candidates));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class BooleanQuestion extends Question<Boolean> {
|
||||||
|
|
||||||
|
public BooleanQuestion(String question, boolean defaultValue) {
|
||||||
|
super(question);
|
||||||
|
this.value = defaultValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
|
import com.jfoenix.validation.base.ValidatorBase;
|
||||||
|
import javafx.beans.NamedArg;
|
||||||
|
import javafx.scene.control.TextInputControl;
|
||||||
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
|
|
||||||
|
public class RequiredValidator extends ValidatorBase {
|
||||||
|
|
||||||
|
public RequiredValidator() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public RequiredValidator(@NamedArg("message") String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void eval() {
|
||||||
|
if (srcControl.get() instanceof TextInputControl) {
|
||||||
|
evalTextInputField();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void evalTextInputField() {
|
||||||
|
TextInputControl textField = ((TextInputControl) srcControl.get());
|
||||||
|
|
||||||
|
hasErrors.set(StringUtils.isBlank(textField.getText()));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Hello Minecraft! Launcher.
|
* Hello Minecraft! Launcher
|
||||||
* Copyright (C) 2018 huangyuhui <[email protected]>
|
* Copyright (C) 2020 huangyuhui <[email protected]> and contributors
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
@@ -13,12 +13,11 @@
|
|||||||
* GNU General Public License for more details.
|
* GNU General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.ui.construct;
|
package org.jackhuang.hmcl.ui.construct;
|
||||||
|
|
||||||
import com.jfoenix.controls.JFXRippler;
|
import com.jfoenix.controls.JFXRippler;
|
||||||
import javafx.animation.Transition;
|
|
||||||
import javafx.beans.DefaultProperty;
|
import javafx.beans.DefaultProperty;
|
||||||
import javafx.beans.InvalidationListener;
|
import javafx.beans.InvalidationListener;
|
||||||
import javafx.beans.NamedArg;
|
import javafx.beans.NamedArg;
|
||||||
@@ -27,7 +26,12 @@ import javafx.beans.property.BooleanProperty;
|
|||||||
import javafx.beans.property.ObjectProperty;
|
import javafx.beans.property.ObjectProperty;
|
||||||
import javafx.beans.property.SimpleBooleanProperty;
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
import javafx.beans.property.SimpleObjectProperty;
|
import javafx.beans.property.SimpleObjectProperty;
|
||||||
import javafx.css.*;
|
import javafx.css.CssMetaData;
|
||||||
|
import javafx.css.PseudoClass;
|
||||||
|
import javafx.css.SimpleStyleableObjectProperty;
|
||||||
|
import javafx.css.Styleable;
|
||||||
|
import javafx.css.StyleableObjectProperty;
|
||||||
|
import javafx.css.StyleablePropertyFactory;
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.layout.Background;
|
import javafx.scene.layout.Background;
|
||||||
@@ -39,8 +43,6 @@ import javafx.scene.paint.Paint;
|
|||||||
import javafx.scene.shape.Rectangle;
|
import javafx.scene.shape.Rectangle;
|
||||||
import org.jackhuang.hmcl.util.Lang;
|
import org.jackhuang.hmcl.util.Lang;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@DefaultProperty("container")
|
@DefaultProperty("container")
|
||||||
@@ -61,39 +63,16 @@ public class RipplerContainer extends StackPane {
|
|||||||
mask.resize(buttonContainer.getWidth() - buttonContainer.snappedRightInset() - buttonContainer.snappedLeftInset(), buttonContainer.getHeight() - buttonContainer.snappedBottomInset() - buttonContainer.snappedTopInset());
|
mask.resize(buttonContainer.getWidth() - buttonContainer.snappedRightInset() - buttonContainer.snappedLeftInset(), buttonContainer.getHeight() - buttonContainer.snappedBottomInset() - buttonContainer.snappedTopInset());
|
||||||
return mask;
|
return mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void initListeners() {
|
|
||||||
this.ripplerPane.setOnMousePressed(event -> {
|
|
||||||
if (releaseManualRippler != null)
|
|
||||||
releaseManualRippler.run();
|
|
||||||
releaseManualRippler = null;
|
|
||||||
createRipple(event.getX(), event.getY());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
private Transition clickedAnimation;
|
|
||||||
private final CornerRadii defaultRadii = new CornerRadii(3);
|
private final CornerRadii defaultRadii = new CornerRadii(3);
|
||||||
private Runnable releaseManualRippler;
|
|
||||||
|
|
||||||
public RipplerContainer(@NamedArg("container") Node container) {
|
public RipplerContainer(@NamedArg("container") Node container) {
|
||||||
setContainer(container);
|
setContainer(container);
|
||||||
|
|
||||||
getStyleClass().add(DEFAULT_STYLE_CLASS);
|
getStyleClass().add(DEFAULT_STYLE_CLASS);
|
||||||
|
buttonRippler.setPosition(JFXRippler.RipplerPos.BACK);
|
||||||
buttonContainer.getChildren().add(buttonRippler);
|
buttonContainer.getChildren().add(buttonRippler);
|
||||||
setOnMousePressed(event -> {
|
|
||||||
if (clickedAnimation != null) {
|
|
||||||
clickedAnimation.setRate(1);
|
|
||||||
clickedAnimation.play();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
setOnMouseReleased(event -> {
|
|
||||||
if (clickedAnimation != null) {
|
|
||||||
clickedAnimation.setRate(-1);
|
|
||||||
clickedAnimation.play();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
focusedProperty().addListener((a, b, newValue) -> {
|
focusedProperty().addListener((a, b, newValue) -> {
|
||||||
if (newValue) {
|
if (newValue) {
|
||||||
if (!isPressed())
|
if (!isPressed())
|
||||||
@@ -106,23 +85,7 @@ public class RipplerContainer extends StackPane {
|
|||||||
setPickOnBounds(false);
|
setPickOnBounds(false);
|
||||||
|
|
||||||
buttonContainer.setPickOnBounds(false);
|
buttonContainer.setPickOnBounds(false);
|
||||||
buttonContainer.shapeProperty().bind(shapeProperty());
|
buttonRippler.ripplerFillProperty().bind(ripplerFillProperty());
|
||||||
buttonContainer.borderProperty().bind(borderProperty());
|
|
||||||
buttonContainer.backgroundProperty().bind(Bindings.createObjectBinding(() -> {
|
|
||||||
if (getBackground() == null || isJavaDefaultBackground(getBackground()) || isJavaDefaultClickedBackground(getBackground()))
|
|
||||||
setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
|
|
||||||
|
|
||||||
try {
|
|
||||||
return new Background(new BackgroundFill(getBackground() != null ? getBackground().getFills().get(0).getFill() : Color.TRANSPARENT,
|
|
||||||
getBackground() != null ? getBackground().getFills().get(0).getRadii() : defaultRadii, Insets.EMPTY));
|
|
||||||
} catch (Exception e) {
|
|
||||||
return getBackground();
|
|
||||||
}
|
|
||||||
}, backgroundProperty()));
|
|
||||||
|
|
||||||
ripplerFillProperty().addListener((a, b, newValue) -> buttonRippler.setRipplerFill(newValue));
|
|
||||||
if (getBackground() == null || isJavaDefaultBackground(getBackground()))
|
|
||||||
setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, defaultRadii, null)));
|
|
||||||
|
|
||||||
containerProperty().addListener(o -> updateChildren());
|
containerProperty().addListener(o -> updateChildren());
|
||||||
updateChildren();
|
updateChildren();
|
||||||
@@ -150,24 +113,6 @@ public class RipplerContainer extends StackPane {
|
|||||||
getChildren().get(i).setPickOnBounds(false);
|
getChildren().get(i).setPickOnBounds(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isJavaDefaultBackground(Background background) {
|
|
||||||
try {
|
|
||||||
String firstFill = background.getFills().get(0).getFill().toString();
|
|
||||||
return "0xffffffba".equals(firstFill) || "0xffffffbf".equals(firstFill) || "0xffffffbd".equals(firstFill);
|
|
||||||
} catch (Exception e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isJavaDefaultClickedBackground(Background background) {
|
|
||||||
try {
|
|
||||||
String firstFill = background.getFills().get(0).getFill().toString();
|
|
||||||
return "0x039ed3ff".equals(firstFill);
|
|
||||||
} catch (Exception e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public Node getContainer() {
|
public Node getContainer() {
|
||||||
return container.get();
|
return container.get();
|
||||||
}
|
}
|
||||||
@@ -210,32 +155,12 @@ public class RipplerContainer extends StackPane {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
|
public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
|
||||||
return StyleableProperties.STYLEABLES;
|
return StyleableProperties.FACTORY.getCssMetaData();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class StyleableProperties {
|
private static class StyleableProperties {
|
||||||
|
private static final StyleablePropertyFactory<RipplerContainer> FACTORY = new StyleablePropertyFactory<>(StackPane.getClassCssMetaData());
|
||||||
|
|
||||||
private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = new CssMetaData<RipplerContainer, Paint>("-jfx-rippler-fill", StyleConverter.getPaintConverter(), Color.rgb(0, 200, 255)) {
|
private static final CssMetaData<RipplerContainer, Paint> RIPPLER_FILL = FACTORY.createPaintCssMetaData("-jfx-rippler-fill", s -> s.ripplerFill, Color.rgb(0, 200, 255));
|
||||||
@Override
|
|
||||||
public boolean isSettable(RipplerContainer control) {
|
|
||||||
return control.ripplerFill == null || !control.ripplerFill.isBound();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public StyleableProperty<Paint> getStyleableProperty(RipplerContainer control) {
|
|
||||||
return control.ripplerFillProperty();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
|
|
||||||
|
|
||||||
private StyleableProperties() {
|
|
||||||
}
|
|
||||||
|
|
||||||
static {
|
|
||||||
List<CssMetaData<? extends Styleable, ?>> styleables = new ArrayList<>(Node.getClassCssMetaData());
|
|
||||||
Collections.addAll(styleables, RIPPLER_FILL);
|
|
||||||
STYLEABLES = Collections.unmodifiableList(styleables);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loaded 100 of 587 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user