mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-21 04:32:27 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da55c3b12c | ||
|
|
ebe83f970f | ||
|
|
ad9beb7f90 | ||
|
|
68bdb51c6b | ||
|
|
e4e1964dec | ||
|
|
560618024f | ||
|
|
e2a2d2a9df | ||
|
|
7163630cb1 | ||
|
|
ab168ad6ba | ||
|
|
e13e3483f0 | ||
|
|
de26547b64 | ||
|
|
c49f8808fd | ||
|
|
1c6cc8b693 | ||
|
|
9f74331116 | ||
|
|
43ae1b613a | ||
|
|
cdac4cc4a8 | ||
|
|
402c4325a6 | ||
|
|
550e85c456 | ||
|
|
1673079cbb | ||
|
|
9958dd45ff | ||
|
|
a25879aaad | ||
|
|
d8c5870a91 | ||
|
|
e6174c446a | ||
|
|
869b4571b0 | ||
|
|
96260fe68b | ||
|
|
35f5400ecb | ||
|
|
1e2801c891 | ||
|
|
f44536d2e8 | ||
|
|
1b3b495fec | ||
|
|
2844ea35bc | ||
|
|
fa8342cfed | ||
|
|
82ddc4da41 | ||
|
|
3d1d2f79e5 | ||
|
|
c020ecbf1f | ||
|
|
a105a60a1a | ||
|
|
867651ecab | ||
|
|
0674aae0ec | ||
|
|
5277fd36f5 | ||
|
|
b6b31eca33 | ||
|
|
3a4a6734dc | ||
|
|
11f9194de9 | ||
|
|
0dbeae9f68 | ||
|
|
f0547b5ca6 | ||
|
|
a685efb3b7 | ||
|
|
9f3697bb67 | ||
|
|
18abb880f8 | ||
|
|
5868187410 | ||
|
|
f84c4ef2bd | ||
|
|
a54c414595 | ||
|
|
3c472a02cb | ||
|
|
382278bebb | ||
|
|
55c9811a2b | ||
|
|
0ec87a8b9e | ||
|
|
939845a9ed | ||
|
|
e7a252a0de | ||
|
|
442118d2e4 | ||
|
|
c9db437dd1 | ||
|
|
972d0e4f3c | ||
|
|
b1f20104a6 | ||
|
|
ab8d5f275f | ||
|
|
bffef55cb8 | ||
|
|
9e87f2b158 | ||
|
|
ab512d3fd8 | ||
|
|
4a9f17590b | ||
|
|
a845e6c3e5 | ||
|
|
4f3a0826fe | ||
|
|
6cd7697ca0 | ||
|
|
38dc14eca1 | ||
|
|
1fc824410b | ||
|
|
af6dba1269 | ||
|
|
e1d19e0bfc | ||
|
|
2bf5a1cf9f | ||
|
|
2126ec78bc | ||
|
|
5f6209366a | ||
|
|
f5fc4e704d | ||
|
|
3d6c1c6e19 | ||
|
|
fda7688807 | ||
|
|
3f38e6f39b | ||
|
|
866b796411 | ||
|
|
b0c5f6fcda | ||
|
|
953638be05 | ||
|
|
7817640d96 | ||
|
|
bd595f739c | ||
|
|
4c74a01930 | ||
|
|
e53d728baf | ||
|
|
6ced1e0604 | ||
|
|
58b63671ce | ||
|
|
a1631b0f58 | ||
|
|
eafd9ff4a3 | ||
|
|
f8d00a5445 | ||
|
|
75d53b12ca | ||
|
|
f93d5977ed | ||
|
|
c4f9c54200 | ||
|
|
7d4c8b82ba | ||
|
|
c6170f9795 | ||
|
|
5a533c8994 | ||
|
|
d70a47a3a4 | ||
|
|
6c3db443d7 | ||
|
|
a51836fe9b | ||
|
|
139ca22e51 | ||
|
|
10fc78bdcf | ||
|
|
5fb5ab6698 | ||
|
|
f47a8766a9 | ||
|
|
4cc72444d9 | ||
|
|
b48956ef94 | ||
|
|
583d28ed12 | ||
|
|
384813347c | ||
|
|
2b28068382 | ||
|
|
2c204c25aa | ||
|
|
5e6ff1d63b | ||
|
|
53ce50b35a | ||
|
|
835c4f7e01 | ||
|
|
f8c1f39faf | ||
|
|
4c4716e64f | ||
|
|
c84ac27a18 | ||
|
|
47baee272c | ||
|
|
f55dc716e3 | ||
|
|
26beb079f0 | ||
|
|
841b73c6fe | ||
|
|
0c7eeebb1f | ||
|
|
65b56735a7 | ||
|
|
ff428bf538 | ||
|
|
a406021f26 | ||
|
|
8500ac57eb | ||
|
|
d97123ec13 | ||
|
|
434931bfac | ||
|
|
860011036b | ||
|
|
937c1858a4 | ||
|
|
4562ecf087 | ||
|
|
d621d5d5bd | ||
|
|
3175b316af | ||
|
|
61930ac7a8 | ||
|
|
fcbf1dcade | ||
|
|
3fa69e826c | ||
|
|
31fff21a55 | ||
|
|
2e9ab88692 | ||
|
|
a02d293d44 | ||
|
|
1265113390 | ||
|
|
4ffd614017 | ||
|
|
41554f4c5b | ||
|
|
2104184077 | ||
|
|
d5f25a4be8 | ||
|
|
ccbf94790a | ||
|
|
2f4f72a2d6 | ||
|
|
f8cec9a78c | ||
|
|
fb43a662eb | ||
|
|
b2e0b8878a | ||
|
|
374f019103 | ||
|
|
5dfcff6f30 | ||
|
|
bd17301cb9 | ||
|
|
96ccd4e109 | ||
|
|
b30ca57e68 | ||
|
|
8f949bc1d1 | ||
|
|
d25365942a | ||
|
|
eb58e1dabc | ||
|
|
f4601e7eed | ||
|
|
ba48806667 | ||
|
|
70c332796a | ||
|
|
bcc25d4369 | ||
|
|
10a3109714 | ||
|
|
b60769864f | ||
|
|
6bc899769f | ||
|
|
0ba14091fb | ||
|
|
6ed0be7961 | ||
|
|
d40b951cce | ||
|
|
ecdf7892ce | ||
|
|
1eaaac94bc | ||
|
|
e99167dddb | ||
|
|
34cb0dc43f | ||
|
|
acaad4bf91 | ||
|
|
3de75f4e26 | ||
|
|
47497090ea | ||
|
|
8b45a1757f | ||
|
|
2782f8252e | ||
|
|
a5538b2566 | ||
|
|
a1f324b796 | ||
|
|
f3b6be26df | ||
|
|
9c764e3682 | ||
|
|
08605c3d73 | ||
|
|
9ec1e0f0cd | ||
|
|
e61151186c | ||
|
|
f7787a9a22 | ||
|
|
a91083bb5a | ||
|
|
51f830bdf6 | ||
|
|
9326ac48ad | ||
|
|
c125b71ae0 | ||
|
|
805b90d6f8 | ||
|
|
900b9f90e7 | ||
|
|
06d4a96c3a | ||
|
|
9a5a4a77ef | ||
|
|
4d874ec910 | ||
|
|
7f0f2466a5 | ||
|
|
83e1966ff2 | ||
|
|
548f754823 | ||
|
|
e036fd14a8 | ||
|
|
463f4c9b60 | ||
|
|
5070fde640 | ||
|
|
454b4f7e1d | ||
|
|
7b83456f01 | ||
|
|
4b7b84b031 | ||
|
|
75309b81ec | ||
|
|
24e46bb43e | ||
|
|
2ba0773401 | ||
|
|
eac913c80c | ||
|
|
126f0ea73c | ||
|
|
cd4668ec84 | ||
|
|
7c247dd0d2 | ||
|
|
87b549fab5 | ||
|
|
8ed1f7a043 | ||
|
|
f2efa35654 | ||
|
|
bcef287e71 | ||
|
|
7f555f7a7f | ||
|
|
9fd38da205 | ||
|
|
2fa5563408 | ||
|
|
541c0e2def | ||
|
|
ac868097e7 | ||
|
|
2f0de0b6a8 | ||
|
|
32bc29e654 | ||
|
|
ef8a7d8bd5 | ||
|
|
adc5a5df16 | ||
|
|
a828ff227a | ||
|
|
9b6f98330e | ||
|
|
667c8cb5b6 | ||
|
|
a186f69444 | ||
|
|
16f4f20239 | ||
|
|
bac207cacb | ||
|
|
630e856d83 | ||
|
|
42d96aed0c | ||
|
|
bd6384bf24 | ||
|
|
af9726d356 | ||
|
|
1e1d2f1076 | ||
|
|
7cb94fb22a | ||
|
|
87aa4f9ed5 | ||
|
|
9760fd3eaf | ||
|
|
1054871982 | ||
|
|
d90a667f68 | ||
|
|
69e6df5848 | ||
|
|
25fa7ce44e | ||
|
|
e3cd7b860d | ||
|
|
2a3aabc073 | ||
|
|
76db43c835 | ||
|
|
40e53eea7a | ||
|
|
6c4d16d6b9 | ||
|
|
4a2abe9fd7 | ||
|
|
d47417302e | ||
|
|
e13401ded8 | ||
|
|
7ada842ef3 | ||
|
|
fe0c5d4e50 | ||
|
|
2ea9ae1eb9 | ||
|
|
f7f0596fda | ||
|
|
d5e919a9cd | ||
|
|
a0ed5da699 | ||
|
|
99fb5a656e | ||
|
|
4b663222b1 | ||
|
|
3e5d0088bc | ||
|
|
948be399d2 | ||
|
|
5f6091924d | ||
|
|
c5bd1f897a | ||
|
|
61d4b6ab62 | ||
|
|
791d05d5f5 | ||
|
|
66001275c4 | ||
|
|
db6b83c906 | ||
|
|
58ef6c85e0 | ||
|
|
ab0aeef872 | ||
|
|
23b7c69e2f | ||
|
|
bb89384493 | ||
|
|
e96e4dfdde | ||
|
|
0a6a6771d8 | ||
|
|
c96199a727 | ||
|
|
ab4ea2cfa1 | ||
|
|
b679883d02 | ||
|
|
0048ef80d0 | ||
|
|
84576aa7a2 | ||
|
|
c5cd5b9e61 | ||
|
|
b1bedcf403 | ||
|
|
bba0a11466 | ||
|
|
b80948f2f2 | ||
|
|
28539bbacc | ||
|
|
ec28bdf116 | ||
|
|
e5d55a9bd8 | ||
|
|
c1f7489de1 | ||
|
|
fa6fd01a3a | ||
|
|
453ba6667f | ||
|
|
4e11a45852 | ||
|
|
95274339a0 | ||
|
|
31fcd6af51 | ||
|
|
860bc059ca | ||
|
|
2fc2152809 | ||
|
|
57e865fc6f | ||
|
|
6dcd26a978 | ||
|
|
aeb59081d9 | ||
|
|
ef8706ae38 | ||
|
|
b49d066231 | ||
|
|
594fbe6f79 | ||
|
|
3edb85b317 | ||
|
|
5fd0a74363 | ||
|
|
2ae94e94a0 | ||
|
|
fa3adde3e6 | ||
|
|
56941cc45d | ||
|
|
cd7d014704 | ||
|
|
0634466851 | ||
|
|
b87e389132 | ||
|
|
c788a07cf5 | ||
|
|
7d4ed91e86 | ||
|
|
ca79cdd3c9 | ||
|
|
3a0722adc2 | ||
|
|
77fa3bafd6 | ||
|
|
e23e542aac | ||
|
|
7ec2ad132e | ||
|
|
7b43826d05 | ||
|
|
c7a18dd288 | ||
|
|
4fb1d7b1d8 | ||
|
|
081071562f | ||
|
|
81e05dc030 | ||
|
|
efc54fb662 | ||
|
|
6e75124ea2 | ||
|
|
2c9f17983a | ||
|
|
e0b6d62143 | ||
|
|
3d5e9aecf0 | ||
|
|
07cec30f3e | ||
|
|
f3add01e74 | ||
|
|
d469fdc90d | ||
|
|
763d9b8cd4 | ||
|
|
55ccb70c8b | ||
|
|
2e1c7764b7 | ||
|
|
9daa9cabb2 | ||
|
|
74dc7c34d9 | ||
|
|
e5f85e32ec | ||
|
|
5383e0891a | ||
|
|
6142d4cc6d | ||
|
|
6aa6b2e6d2 | ||
|
|
29ade6f327 | ||
|
|
5ad6095c43 | ||
|
|
8ae3304861 | ||
|
|
0dc7bc1228 | ||
|
|
19d8b42993 | ||
|
|
3b7eae67af | ||
|
|
64a747e4bd | ||
|
|
4f60928b61 | ||
|
|
8dba2ff4c1 | ||
|
|
eb40e3b112 | ||
|
|
98c8981f05 | ||
|
|
1ed35c8357 | ||
|
|
6249bab886 | ||
|
|
b525760dd3 | ||
|
|
83b4855f5e | ||
|
|
75352caf11 | ||
|
|
475f5811f6 | ||
|
|
7503e1dfcb | ||
|
|
9d1f475941 | ||
|
|
ac50d1b27e | ||
|
|
48934d621f | ||
|
|
0bbb889f39 | ||
|
|
af55a6b191 | ||
|
|
b3e1f23683 | ||
|
|
39578a4419 | ||
|
|
e3574800c0 | ||
|
|
5cd7556e6a | ||
|
|
80c2cba778 | ||
|
|
31173a1fbd | ||
|
|
fd08a93554 | ||
|
|
4dace1f6e5 | ||
|
|
0c0cf37eb0 | ||
|
|
3ec4f8dd68 | ||
|
|
e0dd6847cb | ||
|
|
6374c162ba | ||
|
|
8dd36f1c4a | ||
|
|
4613ade468 | ||
|
|
ca7030df72 | ||
|
|
b32f25c2ce | ||
|
|
4be7a30578 | ||
|
|
7ac3e32635 | ||
|
|
088d37a11a | ||
|
|
6a787dd5b7 | ||
|
|
c305649b95 | ||
|
|
b5d2815eab | ||
|
|
6049d0e9c3 | ||
|
|
9288fc4575 | ||
|
|
ec749ecc8e | ||
|
|
7471a82bca | ||
|
|
3f3c1791cb | ||
|
|
a0e16835c2 | ||
|
|
e9ce5cf72b | ||
|
|
fac011b67e | ||
|
|
f9c8ac504e | ||
|
|
f97711a33a | ||
|
|
b2934c4910 | ||
|
|
759ea69c9f | ||
|
|
36a2cafdac | ||
|
|
6100012f5b | ||
|
|
2e5781beb5 | ||
|
|
43918f3bb1 | ||
|
|
a41299dfca | ||
|
|
ee060b9253 | ||
|
|
82a2273995 | ||
|
|
06fadcc362 | ||
|
|
b328fd3db1 | ||
|
|
9563ebfe5a | ||
|
|
d9143c584e | ||
|
|
65652e5896 | ||
|
|
bd5e991a84 | ||
|
|
165afa2910 | ||
|
|
2507634196 | ||
|
|
e0171adc65 | ||
|
|
72ad8aa2e7 | ||
|
|
f0a554bcc1 | ||
|
|
65781a1649 | ||
|
|
6ad8f05323 | ||
|
|
d61a545d9d | ||
|
|
1774685af6 | ||
|
|
a63a227c3c | ||
|
|
0f115d5439 | ||
|
|
0fad93fb3b | ||
|
|
b1a34c761b | ||
|
|
cc9715d9f2 | ||
|
|
be253a00d2 | ||
|
|
5dde3b2e2f | ||
|
|
8da541460f | ||
|
|
dc4426d9c9 | ||
|
|
d05a9eafb3 | ||
|
|
5056fe5437 | ||
|
|
9fd9aad357 | ||
|
|
acaead41ee | ||
|
|
951f1b0d0d | ||
|
|
daab313288 | ||
|
|
25eaa492f7 | ||
|
|
1b34b24495 | ||
|
|
b9cd48f8f9 | ||
|
|
b2afc8c9e0 | ||
|
|
dc400ea560 | ||
|
|
ea03cfa17d | ||
|
|
94676e0934 | ||
|
|
f7ba34c0af | ||
|
|
db1fd255bb | ||
|
|
94ca7f3134 | ||
|
|
dea024173f | ||
|
|
af320a6c9f | ||
|
|
dcb10bb79d | ||
|
|
d3b6603d06 | ||
|
|
adf2065305 | ||
|
|
e30f6a41ad | ||
|
|
b1a45d0305 | ||
|
|
566d1b095d | ||
|
|
f35a92a101 | ||
|
|
fdf130f741 | ||
|
|
064f31f8db | ||
|
|
9b081ed2a7 | ||
|
|
2fc2ecf082 | ||
|
|
bc7efcfce5 | ||
|
|
0c5af2b892 | ||
|
|
0c61e559ec | ||
|
|
b94bd11e64 | ||
|
|
151a9957de | ||
|
|
b011024164 | ||
|
|
74d98a86f3 | ||
|
|
bd5946f5bf | ||
|
|
1647e8765f | ||
|
|
744b2ffc64 | ||
|
|
e88348aabf | ||
|
|
4766d90db0 | ||
|
|
1dc02a3730 | ||
|
|
a6a5e19e80 | ||
|
|
e9ab2eba9e | ||
|
|
0e3ff1ee06 | ||
|
|
95e9ac3c89 | ||
|
|
1ed004e619 | ||
|
|
153da523d6 | ||
|
|
c732361bbc | ||
|
|
bdb206b45d | ||
|
|
aa44a97f80 | ||
|
|
00c4411ec5 | ||
|
|
4f23d21d37 | ||
|
|
8569431e1d | ||
|
|
5b9c27e253 | ||
|
|
d613d06471 | ||
|
|
65ffbad491 | ||
|
|
885609720e | ||
|
|
bacf246504 | ||
|
|
1ab3350eb8 | ||
|
|
f3aa12483d | ||
|
|
d86c472790 | ||
|
|
4124151208 | ||
|
|
68ad800620 | ||
|
|
2c7207485d | ||
|
|
e8094794c3 | ||
|
|
ad86d8f9c5 | ||
|
|
30c87e9160 | ||
|
|
5eeb001534 | ||
|
|
962754ee10 | ||
|
|
0e34840c21 | ||
|
|
a12fadb10d | ||
|
|
9218e233aa | ||
|
|
23e16abae6 | ||
|
|
b3cb4db9ca | ||
|
|
45fea43a4b | ||
|
|
088d9c08a8 | ||
|
|
98547c2bcf | ||
|
|
02fa633043 | ||
|
|
9df6ab0232 | ||
|
|
89cc203875 | ||
|
|
4b247d08a5 | ||
|
|
8ecc8f20d5 | ||
|
|
74b9f8339a | ||
|
|
e20756a196 | ||
|
|
6d0f83c499 | ||
|
|
8e219c06be | ||
|
|
3fc576b6fc | ||
|
|
249cb2b308 | ||
|
|
e8d8c1994b | ||
|
|
195b47944f | ||
|
|
3224fdef7d | ||
|
|
46a159d788 | ||
|
|
bd20e00a6e | ||
|
|
bf06b09d5a | ||
|
|
1b1dd3567a | ||
|
|
f106b5e766 | ||
|
|
f1dea5460a | ||
|
|
9b73b94d16 | ||
|
|
e133afc774 | ||
|
|
75ff631f16 | ||
|
|
6f5d45c4ea | ||
|
|
fb51475bb9 | ||
|
|
99ec3a4204 | ||
|
|
8c4d609e4c | ||
|
|
336c7dc621 | ||
|
|
2130a47f6f | ||
|
|
73b492b0e3 | ||
|
|
efa69f31b6 | ||
|
|
95b437e5c9 | ||
|
|
afe3c54c29 | ||
|
|
2cab09e91b | ||
|
|
4b4ab434c0 | ||
|
|
9d108b21f9 | ||
|
|
2302dac5c0 | ||
|
|
7c2fb2df5f | ||
|
|
14aa3728ca | ||
|
|
66fc2270dd | ||
|
|
138d25dbfd | ||
|
|
d9191750a7 | ||
|
|
6d9ec0c0da | ||
|
|
617ac0600d | ||
|
|
7d7e3b61a6 | ||
|
|
748695158f | ||
|
|
a2c037e0c0 | ||
|
|
e93d23e444 | ||
|
|
748cfe3754 | ||
|
|
b64d104d7e | ||
|
|
46d90b6923 | ||
|
|
e61120099a | ||
|
|
bcb6eb214f | ||
|
|
9221434b2e | ||
|
|
02937061d4 | ||
|
|
0e6425295b |
No files matched your search
@@ -0,0 +1,2 @@
|
|||||||
|
# Ignore spotlessApply reformat
|
||||||
|
f106b5e7665df6341ae8539f74dc391a7efc98b1
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
* text eol=lf
|
||||||
|
|
||||||
|
*.[jJ][aA][rR] binary
|
||||||
|
|
||||||
|
*.[pP][nN][gG] binary
|
||||||
|
*.[jJ][pP][gG] binary
|
||||||
|
*.[jJ][pP][eE][gG] binary
|
||||||
|
*.[gG][iI][fF] binary
|
||||||
|
*.[tT][iI][fF] binary
|
||||||
|
*.[tT][iI][fF][fF] binary
|
||||||
|
*.[iI][cC][oO] binary
|
||||||
|
*.[sS][vV][gG] text
|
||||||
|
*.[eE][pP][sS] binary
|
||||||
|
*.[xX][cC][fF] binary
|
||||||
|
|
||||||
|
*.[kK][aA][rR] binary
|
||||||
|
*.[mM]4[aA] binary
|
||||||
|
*.[mM][iI][dD] binary
|
||||||
|
*.[mM][iI][dD][iI] binary
|
||||||
|
*.[mM][pP]3 binary
|
||||||
|
*.[oO][gG][gG] binary
|
||||||
|
*.[rR][aA] binary
|
||||||
|
|
||||||
|
*.7[zZ] binary
|
||||||
|
*.[gG][zZ] binary
|
||||||
|
*.[tT][aA][rR] binary
|
||||||
|
*.[tT][gG][zZ] binary
|
||||||
|
*.[zZ][iI][pP] binary
|
||||||
|
|
||||||
|
*.[tT][cC][nN] binary
|
||||||
|
*.[sS][oO] binary
|
||||||
|
*.[dD][lL][lL] binary
|
||||||
|
*.[dD][yY][lL][iI][bB] binary
|
||||||
|
*.[pP][sS][dD] binary
|
||||||
|
*.[tT][tT][fF] binary
|
||||||
|
*.[oO][tT][fF] binary
|
||||||
|
|
||||||
|
*.[pP][aA][tT][cC][hH] -text
|
||||||
|
|
||||||
|
*.[bB][aA][tT] text eol=crlf
|
||||||
|
*.[cC][mM][dD] text eol=crlf
|
||||||
|
*.[pP][sS]1 text eol=crlf
|
||||||
|
|
||||||
|
*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
name: Report Bug
|
||||||
|
description: "Report a bug."
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: "A bug/crash report with sufficient information and logs to reproduce and track down."
|
||||||
|
- type: input
|
||||||
|
id: discord
|
||||||
|
attributes:
|
||||||
|
label: Your GTNH Discord Username
|
||||||
|
description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
|
||||||
|
placeholder: "Example: Fake#1234"
|
||||||
|
- type: input
|
||||||
|
id: version
|
||||||
|
attributes:
|
||||||
|
label: Mod Version
|
||||||
|
description: "What version of the Mod are you using?"
|
||||||
|
placeholder: "Example: 1.0.0"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: report
|
||||||
|
attributes:
|
||||||
|
label: Bug Report
|
||||||
|
description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
|
||||||
|
placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: dropdown
|
||||||
|
id: java
|
||||||
|
attributes:
|
||||||
|
label: Java Version
|
||||||
|
description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
|
||||||
|
options:
|
||||||
|
- Java 8
|
||||||
|
- Java 17
|
||||||
|
- Java 21
|
||||||
|
- java 25
|
||||||
|
- java 26
|
||||||
|
- Other (Please Specify)
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: textarea
|
||||||
|
id: modlist
|
||||||
|
attributes:
|
||||||
|
label: Mod List or GTNH Pack Version
|
||||||
|
description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log). If using GTNH please indicate pack version and any changed mods, not the entire modlist."
|
||||||
|
placeholder: "List of mods or GTNH Pack version goes here"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: checkboxes
|
||||||
|
id: final
|
||||||
|
attributes:
|
||||||
|
label: Final Checklist
|
||||||
|
description: Certify that you read things
|
||||||
|
options:
|
||||||
|
- label: "I have searched the issues and haven't found a similar issue."
|
||||||
|
required: true
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
name: Feature Request
|
||||||
|
description: "Request a feature."
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: "Please use this form to request features. We ask you check if it was already requested though"
|
||||||
|
- type: input
|
||||||
|
id: discord
|
||||||
|
attributes:
|
||||||
|
label: Your GTNH Discord Username
|
||||||
|
description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
|
||||||
|
placeholder: "Example: Wumpus#1234"
|
||||||
|
- type: textarea
|
||||||
|
id: request
|
||||||
|
attributes:
|
||||||
|
label: Feature Request
|
||||||
|
description: "Relevant information, as well as relevant images"
|
||||||
|
placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
- type: checkboxes
|
||||||
|
id: final
|
||||||
|
attributes:
|
||||||
|
label: Final Checklist
|
||||||
|
description: Certify that you read things
|
||||||
|
options:
|
||||||
|
- label: "I have searched the issues and haven't found a similar issue."
|
||||||
|
required: true
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
name: Optimize images
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches: [ master, main, release/** ]
|
||||||
|
paths:
|
||||||
|
- "**/*.png"
|
||||||
|
|
||||||
|
push:
|
||||||
|
branches: [ master, main, release/** ]
|
||||||
|
paths:
|
||||||
|
- "**/*.png"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
optimize-images:
|
||||||
|
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
|
||||||
|
secrets: inherit
|
||||||
+12
-1
@@ -1,6 +1,7 @@
|
|||||||
.gradle
|
.gradle
|
||||||
.settings
|
.settings
|
||||||
/.idea/
|
/.idea/
|
||||||
|
/.vscode/
|
||||||
/run/
|
/run/
|
||||||
/build/
|
/build/
|
||||||
/eclipse/
|
/eclipse/
|
||||||
@@ -25,5 +26,15 @@ whitelist.json
|
|||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
src/main/resources/mixins.*.json
|
src/main/resources/mixins.*([!.]).json
|
||||||
*.bat
|
*.bat
|
||||||
|
*.sh
|
||||||
|
*.DS_Store
|
||||||
|
!gradlew.bat
|
||||||
|
.factorypath
|
||||||
|
addon.local.gradle
|
||||||
|
addon.local.gradle.kts
|
||||||
|
addon.late.local.gradle
|
||||||
|
addon.late.local.gradle.kts
|
||||||
|
layout.json
|
||||||
|
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
# NotEnoughItems Unofficial - By the GTNH Team
|
# NotEnoughItems Unofficial - By the GTNH Team
|
||||||
|
|
||||||
|
🌐 **Languages:** [English](README.md) | [Українська](README_uk.md)
|
||||||
|
|
||||||
A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
|
A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
|
||||||
|
|
||||||
We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods). Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
|
We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods). Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
|
||||||
@@ -12,7 +14,7 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
|
|||||||
- Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average
|
- Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average
|
||||||
- Loads the recipe handlers in parallel
|
- Loads the recipe handlers in parallel
|
||||||
* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
|
* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
|
||||||
* Bookmarks! What are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
|
* Bookmarks! Are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
|
||||||
* Toggle bookmark pane. Default shortcut key `B`. Item Subsets menu is only available if bookmarks are not visible.
|
* Toggle bookmark pane. Default shortcut key `B`. Item Subsets menu is only available if bookmarks are not visible.
|
||||||
* Utility/Cheat buttons line up and wrap based on GUI size
|
* Utility/Cheat buttons line up and wrap based on GUI size
|
||||||
* ItemList is no longer regenerated from the ItemRegistry on every inventory load
|
* ItemList is no longer regenerated from the ItemRegistry on every inventory load
|
||||||
@@ -22,6 +24,59 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
|
|||||||
* Cycle between Recipe, Utility, and Cheat mode by ctrl clicking on the Wrench Icon
|
* Cycle between Recipe, Utility, and Cheat mode by ctrl clicking on the Wrench Icon
|
||||||
* GT5u Tools/Items and GT6 tools should now properly work with the Overlay Recipe Transfer
|
* GT5u Tools/Items and GT6 tools should now properly work with the Overlay Recipe Transfer
|
||||||
|
|
||||||
|
### Information Page Handler
|
||||||
|
Want to add some information about a block or item without making a massive tooltip for it? You can add information about any block or item by registering it in the Information Handler.
|
||||||
|
|
||||||
|
Information page(s) are displayed when either the uses or recipes of a matching item are searched. All matching items will cycle at the top of the information page.
|
||||||
|
|
||||||
|
Your mod can call:
|
||||||
|
```java
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", nbt);
|
||||||
|
```
|
||||||
|
Where nbt is an NBTTagCompound formatted as described below.
|
||||||
|
|
||||||
|
| Tag | Type | Description |
|
||||||
|
|------------------|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
|
| `filter` | String | A string filter to match what items should return this information page.<br/>modname:itemname, metadata, Ore Dictionary tags, and regex can all be used. The full format may be seen in `config/NEI/collapsibleitems.cfg`. |
|
||||||
|
| `page` / `pages` | String / String NBTTagList | The actual text to display. See below for differences between single and multi-page messages.<br/>Both formats will automatically translate provided strings. |
|
||||||
|
|
||||||
|
#### Single Page Format
|
||||||
|
|
||||||
|
Use the `"page"` string tag when you only want to add one page of information:
|
||||||
|
```java
|
||||||
|
NBTTagCompound tag = new NBTTagCompound();
|
||||||
|
tag.setString("filter", "minecraft:log 3");
|
||||||
|
tag.setString("page", "Exotic wood found in tropical climates.");
|
||||||
|
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Multiple Page Format
|
||||||
|
|
||||||
|
Use the `"pages"` tag as an `NBTTagList` of strings when you want more than one page:
|
||||||
|
```java
|
||||||
|
NBTTagCompound tag = new NBTTagCompound();
|
||||||
|
tag.setString("filter", "minecraft:diamond_sword");
|
||||||
|
|
||||||
|
NBTTagList pages = new NBTTagList();
|
||||||
|
pages.appendTag(new NBTTagString("A powerful melee weapon."));
|
||||||
|
pages.appendTag(new NBTTagString("Can be enchanted for extra effects."));
|
||||||
|
|
||||||
|
tag.setTag("pages", pages);
|
||||||
|
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
||||||
|
```
|
||||||
|
* Each list entry is one page.
|
||||||
|
* Pages will appear in NEI with buttons to scroll through them.
|
||||||
|
|
||||||
|
#### Item Matching
|
||||||
|
|
||||||
|
All items that match `filter` will show your information page. See `config/NEI/collapsibleitems.cfg` for the full filter format.
|
||||||
|
|
||||||
|
#### Item Information Config File
|
||||||
|
|
||||||
|
If you're a modpack creator and want to make custom item information pages, they can easily be added in `config/NEI/informationpages.cfg`, which has a few more examples.
|
||||||
|
|
||||||
## Other items of note:
|
## Other items of note:
|
||||||
|
|
||||||
* Remove TMI style
|
* Remove TMI style
|
||||||
@@ -29,7 +84,7 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
|
|||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
GTNH Modifications Copyright (c) 2019-2022 mitchej123 and the GTNH Team
|
GTNH Modifications Copyright (c) 2019-2024 mitchej123 and the GTNH Team
|
||||||
|
|
||||||
Licensed under LGPL-3.0 or later - use this however you want, but please give back any modifications
|
Licensed under LGPL-3.0 or later - use this however you want, but please give back any modifications
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
# NotEnoughItems Unofficial — від команди GTNH
|
||||||
|
|
||||||
|
🌐 **Мови:** [English](README.md) | [Українська](README_uk.md)
|
||||||
|
|
||||||
|
Продовження модифікації NotEnoughItems для 1.7.10 від розробників збірки GregTech: New Horizons із функціями, натхненними та/або бекпортованими з JustEnoughItems.
|
||||||
|
|
||||||
|
Ми протестували цю версію з усіма модами, що входять до GTNH, а також із обмеженим набором інших модів (як-от моди від Reika). Було докладено всіх зусиль для збереження зворотної сумісності, однак основну увагу приділено модам зі збірки GTNH.
|
||||||
|
|
||||||
|
Якщо у вас виникли проблеми з NEI за межами збірки GTNH, ви можете повідомити про них у [GitHub-репозиторії GTNH NEI](https://github.com/GTNewHorizons/NotEnoughItems).
|
||||||
|
|
||||||
|
## Нові можливості:
|
||||||
|
|
||||||
|
* Швидкодія
|
||||||
|
- Використовує паралельний потік для пошуку у списку предметів на кількох ядрах процесора, що в середньому пришвидшує пошук у 2–6 разів.
|
||||||
|
- Завантажує обробники рецептів паралельно.
|
||||||
|
* Текстове поле пошуку з більшістю очікуваних функцій — переміщення курсора вперед/назад, виділення тексту тощо.
|
||||||
|
* Закладки! Перебуваєте у процесі крафту? Додайте потрібний рецепт до закладок за допомогою клавіші «A» або налаштуйте власну клавішу.
|
||||||
|
* Перемикання видимості панелі закладок. Гаряча клавіша за замовчуванням — `B`. Меню «Підгрупи предметів» доступне лише тоді, коли панель закладок прихована.
|
||||||
|
* Кнопки утиліт та читів вирівнюються в ряд та переносяться на новий рядок залежно від розміру графічного інтерфейсу.
|
||||||
|
* Список предметів (`ItemList`) більше не генерується повторно з `ItemRegistry` під час кожного відкриття інвентарю.
|
||||||
|
* Вкладки у стилі JEI (або творчого режиму) [За бажанням]. Примітка: вимагає явної підтримки для рендерингу `ItemStack`, інакше використовуються перші дві літери назви обробника.
|
||||||
|
* Вкладки/обробники завантажуються з конфігураційного CSV-файлу в JAR-архіві (або за бажанням з папки `config`). Для авторів модів доступні IMC-повідомлення з NBT-даними `registerHandlerInfo` та `removeHandlerInfo` для додавання інформації про обробники з використанням тих самих полів, що й у CSV-файлі.
|
||||||
|
* Пошук за допомогою синтаксису `@[Мод]->[предмет]`. Наприклад: `@Mod.gregtech->iron ingot`.
|
||||||
|
* Перемикання між режимами рецептів, утиліт та читів за допомогою CTRL + ЛКМ по іконці гайкового ключа.
|
||||||
|
* Інструменти/предмети з GT5u та інструменти з GT6 тепер мають коректно працювати з функцією накладення та перенесення рецепта.
|
||||||
|
|
||||||
|
### Обробник інформаційних сторінок
|
||||||
|
Хочете додати інформацію про блок чи предмет, не створюючи для нього величезну підказку? Ви можете додати інформацію про будь-який блок чи предмет, зареєструвавши його в обробнику інформації.
|
||||||
|
|
||||||
|
Інформаційні сторінки відображаються під час пошуку рецептів або способів використання відповідного предмета. Усі відповідні предмети будуть циклічно змінюватися у верхній частині інформаційної сторінки.
|
||||||
|
|
||||||
|
Ваш мод може викликати:
|
||||||
|
```java
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", nbt);
|
||||||
|
```
|
||||||
|
Де `nbt` — це `NBTTagCompound`, відформатований, як описано нижче.
|
||||||
|
|
||||||
|
| Тег | Тип | Опис |
|
||||||
|
|------------------|--------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
|
| `filter` | `String` | Текстовий фільтр для визначення предметів, для яких має відображатися ця інформаційна сторінка.<br/>Можна використовувати `modname:itemname`, метадані, теги OreDictionary та регулярні вирази. Повний формат можна переглянути у `config/NEI/collapsibleitems.cfg`. |
|
||||||
|
| `page` / `pages` | `String` / `String NBTTagList` | Безпосередньо текст для відображення. Різницю між одно- та багатосторінковими повідомленнями див. нижче.<br/>Обидва формати підтримують автоматичний переклад наданих рядків. |
|
||||||
|
|
||||||
|
#### Односторінковий формат
|
||||||
|
|
||||||
|
Використовуйте текстовий тег `"page"`, якщо хочете додати лише одну сторінку інформації:
|
||||||
|
```java
|
||||||
|
NBTTagCompound tag = new NBTTagCompound();
|
||||||
|
tag.setString("filter", "minecraft:log 3");
|
||||||
|
tag.setString("page", "Exotic wood found in tropical climates.");
|
||||||
|
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Багатосторінковий формат
|
||||||
|
|
||||||
|
Використовуйте тег `"pages"` як `NBTTagList` із рядків, якщо потрібно додати понад одну сторінку:
|
||||||
|
```java
|
||||||
|
NBTTagCompound tag = new NBTTagCompound();
|
||||||
|
tag.setString("filter", "minecraft:diamond_sword");
|
||||||
|
|
||||||
|
NBTTagList pages = new NBTTagList();
|
||||||
|
pages.appendTag(new NBTTagString("A powerful melee weapon."));
|
||||||
|
pages.appendTag(new NBTTagString("Can be enchanted for extra effects."));
|
||||||
|
|
||||||
|
tag.setTag("pages", pages);
|
||||||
|
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
|
||||||
|
```
|
||||||
|
* Кожен елемент списку — це одна сторінка.
|
||||||
|
* Сторінки з’являтимуться в NEI з кнопками для їх гортання.
|
||||||
|
|
||||||
|
#### Відповідність предметів
|
||||||
|
|
||||||
|
Усі предмети, що відповідають фільтру `filter`, відображатимуть вашу інформаційну сторінку. Повний формат фільтра див. у `config/NEI/collapsibleitems.cfg`.
|
||||||
|
|
||||||
|
#### Файл конфігурації інформації про предмети
|
||||||
|
|
||||||
|
Якщо ви творець збірки модів і хочете створити власні інформаційні сторінки для предметів, їх можна легко додати у файлі `config/NEI/informationpages.cfg`, де також наведено ще кілька прикладів.
|
||||||
|
|
||||||
|
## Інші примітки:
|
||||||
|
|
||||||
|
* Вилучено стиль TMI
|
||||||
|
* Вилучено збереження/завантаження стану інвентарю
|
||||||
|
|
||||||
|
## Ліцензія
|
||||||
|
|
||||||
|
Авторські права на модифікації від команди GTNH (c) 2019-2024 належать mitchej123 та команді GTNH.
|
||||||
|
|
||||||
|
Поширюється за ліцензією LGPL-3.0 або новішої версії — використовуйте цей код на власний розсуд, але, будь ласка, діліться з розробниками будь-якими внесеними вами змінами.
|
||||||
|
|
||||||
|
Окремі частини коду натхненні, запозичені або бекпортовані з [JEI](https://github.com/mezz/JustEnoughItems/tree/1.12) за ліцензією MIT.
|
||||||
|
|
||||||
|
Авторські права на оригінальний код (c) 2014-2015 належать mezz; код поширювався за ліцензією MIT.
|
||||||
+27
-1
@@ -1,3 +1,29 @@
|
|||||||
compileJava {
|
compileJava {
|
||||||
options.encoding = "UTF-8"
|
options.encoding = "UTF-8"
|
||||||
|
}
|
||||||
|
|
||||||
|
generateGrammarSource {
|
||||||
|
maxHeapSize = "128m"
|
||||||
|
arguments += ['-package', 'codechicken.nei.search', '-visitor', '-no-listener']
|
||||||
|
outputDirectory = file("${projectDir}/build/generated/sources/search/antlr/codechicken/nei/search/")
|
||||||
|
}
|
||||||
|
|
||||||
|
compileJava.dependsOn generateGrammarSource
|
||||||
|
sourcesJar.dependsOn generateGrammarSource
|
||||||
|
|
||||||
|
sourcesJar {
|
||||||
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
|
}
|
||||||
|
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
java.srcDirs += ["build/generated/sources/search/antlr/"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
testLogging {
|
||||||
|
events "passed", "skipped", "failed"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+3
-929
@@ -1,932 +1,6 @@
|
|||||||
//version: 1656003794
|
//version: 1707058017
|
||||||
/*
|
|
||||||
DO NOT CHANGE THIS FILE!
|
|
||||||
|
|
||||||
Also, you may replace this file at any time if there is an update available.
|
|
||||||
Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
|
|
||||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
|
||||||
import org.gradle.internal.logging.text.StyledTextOutput.Style
|
|
||||||
import org.gradle.internal.logging.text.StyledTextOutputFactory
|
|
||||||
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.Paths
|
|
||||||
import java.util.concurrent.TimeUnit
|
|
||||||
import java.util.zip.ZipEntry
|
|
||||||
import java.util.zip.ZipInputStream
|
|
||||||
import java.util.zip.ZipOutputStream
|
|
||||||
|
|
||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
name 'forge'
|
|
||||||
url 'https://maven.minecraftforge.net'
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name 'sonatype'
|
|
||||||
url 'https://oss.sonatype.org/content/repositories/snapshots/'
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name 'Scala CI dependencies'
|
|
||||||
url 'https://repo1.maven.org/maven2/'
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name 'jitpack'
|
|
||||||
url 'https://jitpack.io'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'java-library'
|
id 'antlr'
|
||||||
id 'idea'
|
id 'com.gtnewhorizons.gtnhconvention'
|
||||||
id 'eclipse'
|
|
||||||
id 'scala'
|
|
||||||
id 'maven-publish'
|
|
||||||
id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
|
|
||||||
id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
|
|
||||||
id 'com.google.devtools.ksp' version '1.5.30-1.0.0' apply false
|
|
||||||
id 'org.ajoberstar.grgit' version '4.1.1'
|
|
||||||
id 'com.github.johnrengelman.shadow' version '4.0.4'
|
|
||||||
id 'com.palantir.git-version' version '0.13.0' apply false
|
|
||||||
id 'de.undercouch.download' version '5.0.1'
|
|
||||||
id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
|
|
||||||
id "com.diffplug.spotless" version "6.7.2"
|
|
||||||
}
|
|
||||||
|
|
||||||
if (project.file('.git/HEAD').isFile()) {
|
|
||||||
apply plugin: 'com.palantir.git-version'
|
|
||||||
}
|
|
||||||
|
|
||||||
def out = services.get(StyledTextOutputFactory).create('an-output')
|
|
||||||
|
|
||||||
apply plugin: 'forge'
|
|
||||||
|
|
||||||
def projectJavaVersion = JavaLanguageVersion.of(8)
|
|
||||||
|
|
||||||
java {
|
|
||||||
toolchain {
|
|
||||||
languageVersion.set(projectJavaVersion)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
idea {
|
|
||||||
module {
|
|
||||||
inheritOutputDirs = true
|
|
||||||
downloadJavadoc = true
|
|
||||||
downloadSources = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Spotless autoformatter
|
|
||||||
// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
|
|
||||||
// Can be locally toggled via spotless:off/spotless:on comments
|
|
||||||
spotless {
|
|
||||||
encoding 'UTF-8'
|
|
||||||
|
|
||||||
format 'misc', {
|
|
||||||
target '*.md', '.gitignore'
|
|
||||||
|
|
||||||
trimTrailingWhitespace()
|
|
||||||
indentWithSpaces(4)
|
|
||||||
endWithNewline()
|
|
||||||
}
|
|
||||||
java {
|
|
||||||
toggleOffOn()
|
|
||||||
importOrder()
|
|
||||||
removeUnusedImports()
|
|
||||||
palantirJavaFormat('1.1.0') // last version supporting jvm 8
|
|
||||||
}
|
|
||||||
kotlin {
|
|
||||||
toggleOffOn()
|
|
||||||
ktfmt('0.39')
|
|
||||||
}
|
|
||||||
groovyGradle {
|
|
||||||
toggleOffOn()
|
|
||||||
importOrder()
|
|
||||||
target '*.gradle'
|
|
||||||
greclipse('4.19.0') // last version supporting jvm 8
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
|
|
||||||
throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
|
|
||||||
}
|
|
||||||
|
|
||||||
checkPropertyExists("modName")
|
|
||||||
checkPropertyExists("modId")
|
|
||||||
checkPropertyExists("modGroup")
|
|
||||||
checkPropertyExists("autoUpdateBuildScript")
|
|
||||||
checkPropertyExists("minecraftVersion")
|
|
||||||
checkPropertyExists("forgeVersion")
|
|
||||||
checkPropertyExists("replaceGradleTokenInFile")
|
|
||||||
checkPropertyExists("gradleTokenModId")
|
|
||||||
checkPropertyExists("gradleTokenModName")
|
|
||||||
checkPropertyExists("gradleTokenVersion")
|
|
||||||
checkPropertyExists("gradleTokenGroupName")
|
|
||||||
checkPropertyExists("apiPackage")
|
|
||||||
checkPropertyExists("accessTransformersFile")
|
|
||||||
checkPropertyExists("usesMixins")
|
|
||||||
checkPropertyExists("mixinPlugin")
|
|
||||||
checkPropertyExists("mixinsPackage")
|
|
||||||
checkPropertyExists("coreModClass")
|
|
||||||
checkPropertyExists("containsMixinsAndOrCoreModOnly")
|
|
||||||
checkPropertyExists("usesShadowedDependencies")
|
|
||||||
checkPropertyExists("developmentEnvironmentUserName")
|
|
||||||
|
|
||||||
boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
|
|
||||||
boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
|
|
||||||
String channel = project.findProperty('channel') ? project.channel : 'stable'
|
|
||||||
String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12'
|
|
||||||
String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
|
|
||||||
|
|
||||||
String javaSourceDir = "src/main/java/"
|
|
||||||
String scalaSourceDir = "src/main/scala/"
|
|
||||||
String kotlinSourceDir = "src/main/kotlin/"
|
|
||||||
|
|
||||||
String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
|
|
||||||
String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
|
|
||||||
String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
|
|
||||||
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
|
|
||||||
throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
|
|
||||||
}
|
|
||||||
|
|
||||||
if(apiPackage) {
|
|
||||||
targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
|
|
||||||
targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
|
|
||||||
targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
|
|
||||||
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
|
|
||||||
throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(accessTransformersFile) {
|
|
||||||
String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
|
|
||||||
if(!getFile(targetFile).exists()) {
|
|
||||||
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
|
|
||||||
throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
|
|
||||||
}
|
|
||||||
|
|
||||||
targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
|
|
||||||
targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
|
|
||||||
targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
|
|
||||||
if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
|
|
||||||
throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
|
|
||||||
}
|
|
||||||
|
|
||||||
String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
|
|
||||||
String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
|
|
||||||
String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
|
|
||||||
String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
|
|
||||||
if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
|
|
||||||
throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(coreModClass) {
|
|
||||||
String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
|
|
||||||
String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
|
|
||||||
String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
|
|
||||||
String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
|
|
||||||
if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
|
|
||||||
throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations.all {
|
|
||||||
resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
|
|
||||||
|
|
||||||
// Make sure GregTech build won't time out
|
|
||||||
System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
|
|
||||||
System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
|
|
||||||
try {
|
|
||||||
'git config core.fileMode false'.execute()
|
|
||||||
}
|
|
||||||
catch (Exception ignored) {
|
|
||||||
out.style(Style.Failure).println("git isn't installed at all")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pulls version first from the VERSION env and then git tag
|
|
||||||
String identifiedVersion
|
|
||||||
String versionOverride = System.getenv("VERSION") ?: null
|
|
||||||
try {
|
|
||||||
identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
|
|
||||||
}
|
|
||||||
catch (Exception ignored) {
|
|
||||||
out.style(Style.Failure).text(
|
|
||||||
'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
|
|
||||||
'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
|
|
||||||
'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
|
|
||||||
)
|
|
||||||
versionOverride = 'NO-GIT-TAG-SET'
|
|
||||||
identifiedVersion = versionOverride
|
|
||||||
}
|
|
||||||
version = minecraftVersion + '-' + identifiedVersion
|
|
||||||
ext {
|
|
||||||
modVersion = identifiedVersion
|
|
||||||
}
|
|
||||||
|
|
||||||
if(identifiedVersion == versionOverride) {
|
|
||||||
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
|
|
||||||
}
|
|
||||||
|
|
||||||
group = modGroup
|
|
||||||
if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
|
|
||||||
archivesBaseName = customArchiveBaseName
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
archivesBaseName = modId
|
|
||||||
}
|
|
||||||
|
|
||||||
def arguments = []
|
|
||||||
def jvmArguments = []
|
|
||||||
|
|
||||||
if (usesMixins.toBoolean()) {
|
|
||||||
arguments += [
|
|
||||||
"--tweakClass org.spongepowered.asm.launch.MixinTweaker"
|
|
||||||
]
|
|
||||||
if (usesMixinDebug.toBoolean()) {
|
|
||||||
jvmArguments += [
|
|
||||||
"-Dmixin.debug.countInjections=true",
|
|
||||||
"-Dmixin.debug.verbose=true",
|
|
||||||
"-Dmixin.debug.export=true"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
minecraft {
|
|
||||||
version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
|
|
||||||
runDir = 'run'
|
|
||||||
|
|
||||||
if (replaceGradleTokenInFile) {
|
|
||||||
replaceIn replaceGradleTokenInFile
|
|
||||||
if(gradleTokenModId) {
|
|
||||||
replace gradleTokenModId, modId
|
|
||||||
}
|
|
||||||
if(gradleTokenModName) {
|
|
||||||
replace gradleTokenModName, modName
|
|
||||||
}
|
|
||||||
if(gradleTokenVersion) {
|
|
||||||
replace gradleTokenVersion, modVersion
|
|
||||||
}
|
|
||||||
if(gradleTokenGroupName) {
|
|
||||||
replace gradleTokenGroupName, modGroup
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
clientIntellijRun {
|
|
||||||
args(arguments)
|
|
||||||
jvmArgs(jvmArguments)
|
|
||||||
|
|
||||||
if(developmentEnvironmentUserName) {
|
|
||||||
args("--username", developmentEnvironmentUserName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
serverIntellijRun {
|
|
||||||
args(arguments)
|
|
||||||
jvmArgs(jvmArguments)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(file('addon.gradle').exists()) {
|
|
||||||
apply from: 'addon.gradle'
|
|
||||||
}
|
|
||||||
|
|
||||||
apply from: 'repositories.gradle'
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
implementation.extendsFrom(shadowImplementation) // TODO: remove after all uses are refactored
|
|
||||||
implementation.extendsFrom(shadowCompile)
|
|
||||||
implementation.extendsFrom(shadeCompile)
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
name 'Overmind forge repo mirror'
|
|
||||||
url 'https://gregtech.overminddl1.com/'
|
|
||||||
}
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
maven {
|
|
||||||
name 'sponge'
|
|
||||||
url 'https://repo.spongepowered.org/repository/maven-public'
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
url 'https://jitpack.io'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
|
|
||||||
annotationProcessor('com.google.guava:guava:24.1.1-jre')
|
|
||||||
annotationProcessor('com.google.code.gson:gson:2.8.6')
|
|
||||||
annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
|
|
||||||
// using 0.8 to workaround a issue in 0.7 which fails mixin application
|
|
||||||
compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
|
|
||||||
// Mixin includes a lot of dependencies that are too up-to-date
|
|
||||||
exclude module: 'launchwrapper'
|
|
||||||
exclude module: 'guava'
|
|
||||||
exclude module: 'gson'
|
|
||||||
exclude module: 'commons-io'
|
|
||||||
exclude module: 'log4j-core'
|
|
||||||
}
|
|
||||||
compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
apply from: 'dependencies.gradle'
|
|
||||||
|
|
||||||
def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
|
|
||||||
def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
|
|
||||||
def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
|
|
||||||
|
|
||||||
task generateAssets {
|
|
||||||
if (usesMixins.toBoolean()) {
|
|
||||||
def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
|
|
||||||
if (!mixinConfigFile.exists()) {
|
|
||||||
mixinConfigFile.text = """{
|
|
||||||
"required": true,
|
|
||||||
"minVersion": "0.7.11",
|
|
||||||
"package": "${modGroup}.${mixinsPackage}",
|
|
||||||
"plugin": "${modGroup}.${mixinPlugin}",
|
|
||||||
"refmap": "${mixingConfigRefMap}",
|
|
||||||
"target": "@env(DEFAULT)",
|
|
||||||
"compatibilityLevel": "JAVA_8",
|
|
||||||
"mixins": [],
|
|
||||||
"client": [],
|
|
||||||
"server": []
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task relocateShadowJar(type: ConfigureShadowRelocation) {
|
|
||||||
target = tasks.shadowJar
|
|
||||||
prefix = modGroup + ".shadow"
|
|
||||||
}
|
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
project.configurations.shadeCompile.each { dep ->
|
|
||||||
from(project.zipTree(dep)) {
|
|
||||||
exclude 'META-INF', 'META-INF/**'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
manifest {
|
|
||||||
attributes(getManifestAttributes())
|
|
||||||
}
|
|
||||||
|
|
||||||
minimize() // This will only allow shading for actually used classes
|
|
||||||
configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
|
|
||||||
dependsOn(relocateShadowJar)
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
project.configurations.shadeCompile.each { dep ->
|
|
||||||
from(project.zipTree(dep)) {
|
|
||||||
exclude 'META-INF', 'META-INF/**'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
manifest {
|
|
||||||
attributes(getManifestAttributes())
|
|
||||||
}
|
|
||||||
|
|
||||||
if(usesShadowedDependencies.toBoolean()) {
|
|
||||||
dependsOn(shadowJar)
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
reobf {
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
addExtraSrgFile mixinSrg
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEvaluate {
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
tasks.compileJava {
|
|
||||||
options.compilerArgs += [
|
|
||||||
"-AreobfSrgFile=${tasks.reobf.srg}",
|
|
||||||
"-AoutSrgFile=${mixinSrg}",
|
|
||||||
"-AoutRefMapFile=${refMap}",
|
|
||||||
// Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
|
|
||||||
"-XDenableSunApiLintControl",
|
|
||||||
"-XDignore.symbol.file"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
runClient {
|
|
||||||
if(developmentEnvironmentUserName) {
|
|
||||||
arguments += [
|
|
||||||
"--username",
|
|
||||||
developmentEnvironmentUserName
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
args(arguments)
|
|
||||||
jvmArgs(jvmArguments)
|
|
||||||
}
|
|
||||||
|
|
||||||
runServer {
|
|
||||||
args(arguments)
|
|
||||||
jvmArgs(jvmArguments)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaExec).configureEach {
|
|
||||||
javaLauncher.set(
|
|
||||||
javaToolchains.launcherFor {
|
|
||||||
languageVersion = projectJavaVersion
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
processResources {
|
|
||||||
// this will ensure that this task is redone when the versions change.
|
|
||||||
inputs.property "version", project.version
|
|
||||||
inputs.property "mcversion", project.minecraft.version
|
|
||||||
|
|
||||||
// replace stuff in mcmod.info, nothing else
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
|
||||||
include 'mcmod.info'
|
|
||||||
|
|
||||||
// replace modVersion and minecraftVersion
|
|
||||||
expand "minecraftVersion": project.minecraft.version,
|
|
||||||
"modVersion": modVersion,
|
|
||||||
"modId": modId,
|
|
||||||
"modName": modName
|
|
||||||
}
|
|
||||||
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
from refMap
|
|
||||||
}
|
|
||||||
|
|
||||||
// copy everything else that's not the mcmod.info
|
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
|
||||||
exclude 'mcmod.info'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def getManifestAttributes() {
|
|
||||||
def manifestAttributes = [:]
|
|
||||||
if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
|
|
||||||
manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
|
|
||||||
}
|
|
||||||
|
|
||||||
if(accessTransformersFile) {
|
|
||||||
manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
|
|
||||||
}
|
|
||||||
|
|
||||||
if(coreModClass) {
|
|
||||||
manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
|
|
||||||
}
|
|
||||||
|
|
||||||
if(usesMixins.toBoolean()) {
|
|
||||||
manifestAttributes += [
|
|
||||||
"TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
|
|
||||||
"MixinConfigs" : "mixins." + modId + ".json",
|
|
||||||
"ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
|
|
||||||
]
|
|
||||||
}
|
|
||||||
return manifestAttributes
|
|
||||||
}
|
|
||||||
|
|
||||||
task sourcesJar(type: Jar) {
|
|
||||||
from (sourceSets.main.allSource)
|
|
||||||
from (file("$projectDir/LICENSE"))
|
|
||||||
getArchiveClassifier().set('sources')
|
|
||||||
}
|
|
||||||
|
|
||||||
task shadowDevJar(type: ShadowJar) {
|
|
||||||
project.configurations.shadeCompile.each { dep ->
|
|
||||||
from(project.zipTree(dep)) {
|
|
||||||
exclude 'META-INF', 'META-INF/**'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
from sourceSets.main.output
|
|
||||||
getArchiveClassifier().set("dev")
|
|
||||||
|
|
||||||
manifest {
|
|
||||||
attributes(getManifestAttributes())
|
|
||||||
}
|
|
||||||
|
|
||||||
minimize() // This will only allow shading for actually used classes
|
|
||||||
configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
|
|
||||||
}
|
|
||||||
|
|
||||||
task relocateShadowDevJar(type: ConfigureShadowRelocation) {
|
|
||||||
target = tasks.shadowDevJar
|
|
||||||
prefix = modGroup + ".shadow"
|
|
||||||
}
|
|
||||||
|
|
||||||
task circularResolverJar(type: Jar) {
|
|
||||||
dependsOn(relocateShadowDevJar)
|
|
||||||
dependsOn(shadowDevJar)
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
task devJar(type: Jar) {
|
|
||||||
project.configurations.shadeCompile.each { dep ->
|
|
||||||
from(project.zipTree(dep)) {
|
|
||||||
exclude 'META-INF', 'META-INF/**'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
from sourceSets.main.output
|
|
||||||
getArchiveClassifier().set("dev")
|
|
||||||
|
|
||||||
manifest {
|
|
||||||
attributes(getManifestAttributes())
|
|
||||||
}
|
|
||||||
|
|
||||||
if(usesShadowedDependencies.toBoolean()) {
|
|
||||||
dependsOn(circularResolverJar)
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task apiJar(type: Jar) {
|
|
||||||
from (sourceSets.main.allSource) {
|
|
||||||
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
|
|
||||||
}
|
|
||||||
|
|
||||||
from (sourceSets.main.output) {
|
|
||||||
include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
|
|
||||||
}
|
|
||||||
|
|
||||||
from (sourceSets.main.resources.srcDirs) {
|
|
||||||
include("LICENSE")
|
|
||||||
}
|
|
||||||
|
|
||||||
getArchiveClassifier().set('api')
|
|
||||||
}
|
|
||||||
|
|
||||||
artifacts {
|
|
||||||
if(!noPublishedSources) {
|
|
||||||
archives sourcesJar
|
|
||||||
}
|
|
||||||
archives devJar
|
|
||||||
if(apiPackage) {
|
|
||||||
archives apiJar
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
|
|
||||||
// and isn't strictly needed with the POM so just disable it.
|
|
||||||
tasks.withType(GenerateModuleMetadata) {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
// workaround variable hiding in pom processing
|
|
||||||
def projectConfigs = project.configurations
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
maven(MavenPublication) {
|
|
||||||
from components.java
|
|
||||||
if(usesShadowedDependencies.toBoolean()) {
|
|
||||||
artifact source: shadowJar, classifier: ""
|
|
||||||
}
|
|
||||||
if(!noPublishedSources) {
|
|
||||||
artifact source: sourcesJar, classifier: "sources"
|
|
||||||
}
|
|
||||||
artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
|
|
||||||
if (apiPackage) {
|
|
||||||
artifact source: apiJar, classifier: "api"
|
|
||||||
}
|
|
||||||
|
|
||||||
groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
|
|
||||||
artifactId = System.getenv("ARTIFACT_ID") ?: project.name
|
|
||||||
// Using the identified version, not project.version as it has the prepended 1.7.10
|
|
||||||
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
|
|
||||||
|
|
||||||
// remove extra garbage from minecraft and minecraftDeps configuration
|
|
||||||
pom.withXml {
|
|
||||||
def badArtifacts = [:].withDefault {[] as Set<String>}
|
|
||||||
for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
|
|
||||||
for (dependency in configuration.allDependencies) {
|
|
||||||
badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// example for specifying extra stuff to ignore
|
|
||||||
// badArtifacts["org.example.group"] += "artifactName"
|
|
||||||
|
|
||||||
Node pomNode = asNode()
|
|
||||||
pomNode.dependencies.'*'.findAll() {
|
|
||||||
badArtifacts[it.groupId.text()].contains(it.artifactId.text())
|
|
||||||
}.each() {
|
|
||||||
it.parent().remove(it)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
|
|
||||||
credentials {
|
|
||||||
username = System.getenv("MAVEN_USER") ?: "NONE"
|
|
||||||
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Updating
|
|
||||||
task updateBuildScript {
|
|
||||||
doLast {
|
|
||||||
if (performBuildScriptUpdate(projectDir.toString())) return
|
|
||||||
|
|
||||||
print("Build script already up-to-date!")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
|
|
||||||
if (autoUpdateBuildScript.toBoolean()) {
|
|
||||||
performBuildScriptUpdate(projectDir.toString())
|
|
||||||
} else {
|
|
||||||
out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static URL availableBuildScriptUrl() {
|
|
||||||
new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean performBuildScriptUpdate(String projectDir) {
|
|
||||||
if (isNewBuildScriptVersionAvailable(projectDir)) {
|
|
||||||
def buildscriptFile = getFile("build.gradle")
|
|
||||||
availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
|
|
||||||
out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isNewBuildScriptVersionAvailable(String projectDir) {
|
|
||||||
Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
|
|
||||||
|
|
||||||
String currentBuildScript = getFile("build.gradle").getText()
|
|
||||||
String currentBuildScriptHash = getVersionHash(currentBuildScript)
|
|
||||||
String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
|
|
||||||
String availableBuildScriptHash = getVersionHash(availableBuildScript)
|
|
||||||
|
|
||||||
boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
|
|
||||||
return !isUpToDate
|
|
||||||
}
|
|
||||||
|
|
||||||
static String getVersionHash(String buildScriptContent) {
|
|
||||||
String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
|
|
||||||
if(versionLine != null) {
|
|
||||||
return versionLine.split(": ").last()
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
configure(updateBuildScript) {
|
|
||||||
group = 'forgegradle'
|
|
||||||
description = 'Updates the build script to the latest version'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parameter Deobfuscation
|
|
||||||
|
|
||||||
task deobfParams {
|
|
||||||
doLast {
|
|
||||||
|
|
||||||
String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
|
|
||||||
String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
|
|
||||||
String paramsCSV = "$mcpDir/params.csv"
|
|
||||||
|
|
||||||
download.run {
|
|
||||||
src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
|
|
||||||
dest mcpZIP
|
|
||||||
overwrite false
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!file(paramsCSV).exists()) {
|
|
||||||
println("Extracting MCP archive ...")
|
|
||||||
unzip(mcpZIP, mcpDir)
|
|
||||||
}
|
|
||||||
|
|
||||||
println("Parsing params.csv ...")
|
|
||||||
Map<String, String> params = new HashMap<>()
|
|
||||||
Files.lines(Paths.get(paramsCSV)).forEach{line ->
|
|
||||||
String[] cells = line.split(",")
|
|
||||||
if(cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
|
|
||||||
params.put(cells[0], cells[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
|
|
||||||
out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static int replaceParams(File file, Map<String, String> params) {
|
|
||||||
int fileCount = 0
|
|
||||||
|
|
||||||
if(file.isDirectory()) {
|
|
||||||
for(File f : file.listFiles()) {
|
|
||||||
fileCount += replaceParams(f, params)
|
|
||||||
}
|
|
||||||
return fileCount
|
|
||||||
}
|
|
||||||
println("Visiting ${file.getName()} ...")
|
|
||||||
try {
|
|
||||||
String content = new String(Files.readAllBytes(file.toPath()))
|
|
||||||
int hash = content.hashCode()
|
|
||||||
params.forEach{key, value ->
|
|
||||||
content = content.replaceAll(key, value)
|
|
||||||
}
|
|
||||||
if(hash != content.hashCode()) {
|
|
||||||
Files.write(file.toPath(), content.getBytes("UTF-8"))
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
} catch(Exception e) {
|
|
||||||
e.printStackTrace()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
|
|
||||||
static unzip(String zipFileName, String outputDir) {
|
|
||||||
byte[] buffer = new byte[16384]
|
|
||||||
ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
|
|
||||||
ZipEntry zipEntry = zis.getNextEntry()
|
|
||||||
while (zipEntry != null) {
|
|
||||||
File newFile = new File(outputDir + File.separator, zipEntry.name)
|
|
||||||
if (zipEntry.isDirectory()) {
|
|
||||||
if (!newFile.isDirectory() && !newFile.mkdirs()) {
|
|
||||||
throw new IOException("Failed to create directory $newFile")
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// fix for Windows-created archives
|
|
||||||
File parent = newFile.parentFile
|
|
||||||
if (!parent.isDirectory() && !parent.mkdirs()) {
|
|
||||||
throw new IOException("Failed to create directory $parent")
|
|
||||||
}
|
|
||||||
// write file content
|
|
||||||
FileOutputStream fos = new FileOutputStream(newFile)
|
|
||||||
int len = 0
|
|
||||||
while ((len = zis.read(buffer)) > 0) {
|
|
||||||
fos.write(buffer, 0, len)
|
|
||||||
}
|
|
||||||
fos.close()
|
|
||||||
}
|
|
||||||
zipEntry = zis.getNextEntry()
|
|
||||||
}
|
|
||||||
zis.closeEntry()
|
|
||||||
zis.close()
|
|
||||||
}
|
|
||||||
|
|
||||||
configure(deobfParams) {
|
|
||||||
group = 'forgegradle'
|
|
||||||
description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dependency Deobfuscation
|
|
||||||
|
|
||||||
def deobf(String sourceURL) {
|
|
||||||
try {
|
|
||||||
URL url = new URL(sourceURL)
|
|
||||||
String fileName = url.getFile()
|
|
||||||
|
|
||||||
//get rid of directories:
|
|
||||||
int lastSlash = fileName.lastIndexOf("/")
|
|
||||||
if(lastSlash > 0) {
|
|
||||||
fileName = fileName.substring(lastSlash + 1)
|
|
||||||
}
|
|
||||||
//get rid of extension:
|
|
||||||
if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
|
|
||||||
fileName = fileName.substring(0, fileName.lastIndexOf("."))
|
|
||||||
}
|
|
||||||
|
|
||||||
String hostName = url.getHost()
|
|
||||||
if(hostName.startsWith("www.")) {
|
|
||||||
hostName = hostName.substring(4)
|
|
||||||
}
|
|
||||||
List parts = Arrays.asList(hostName.split("\\."))
|
|
||||||
Collections.reverse(parts)
|
|
||||||
hostName = String.join(".", parts)
|
|
||||||
|
|
||||||
return deobf(sourceURL, "$hostName/$fileName")
|
|
||||||
} catch(Exception e) {
|
|
||||||
return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
|
|
||||||
def deobf(String sourceURL, String rawFileName) {
|
|
||||||
String bon2Version = "2.5.1"
|
|
||||||
String fileName = URLDecoder.decode(rawFileName, "UTF-8")
|
|
||||||
String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
|
|
||||||
String bon2Dir = "$cacheDir/forge_gradle/deobf"
|
|
||||||
String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
|
|
||||||
String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
|
|
||||||
String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
|
|
||||||
|
|
||||||
if(file(deobfFile).exists()) {
|
|
||||||
return files(deobfFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
String mappingsVer
|
|
||||||
if(remoteMappings) {
|
|
||||||
String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
|
|
||||||
String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
|
|
||||||
|
|
||||||
zipMappings(mappingsZIP, remoteMappings, bon2Dir)
|
|
||||||
|
|
||||||
mappingsVer = "snapshot_$id"
|
|
||||||
} else {
|
|
||||||
mappingsVer = "${channel}_$mappingsVersion"
|
|
||||||
}
|
|
||||||
|
|
||||||
download.run {
|
|
||||||
src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
|
|
||||||
dest bon2File
|
|
||||||
quiet true
|
|
||||||
overwrite false
|
|
||||||
}
|
|
||||||
|
|
||||||
download.run {
|
|
||||||
src sourceURL
|
|
||||||
dest obfFile
|
|
||||||
quiet true
|
|
||||||
overwrite false
|
|
||||||
}
|
|
||||||
|
|
||||||
exec {
|
|
||||||
commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
|
|
||||||
workingDir bon2Dir
|
|
||||||
standardOutput = new FileOutputStream("${deobfFile}.log")
|
|
||||||
}
|
|
||||||
|
|
||||||
return files(deobfFile)
|
|
||||||
}
|
|
||||||
|
|
||||||
def zipMappings(String zipPath, String url, String bon2Dir) {
|
|
||||||
File zipFile = new File(zipPath)
|
|
||||||
if(zipFile.exists()) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
String fieldsCache = "$bon2Dir/data/fields.csv"
|
|
||||||
String methodsCache = "$bon2Dir/data/methods.csv"
|
|
||||||
|
|
||||||
download.run {
|
|
||||||
src "${url}fields.csv"
|
|
||||||
dest fieldsCache
|
|
||||||
quiet true
|
|
||||||
}
|
|
||||||
download.run {
|
|
||||||
src "${url}methods.csv"
|
|
||||||
dest methodsCache
|
|
||||||
quiet true
|
|
||||||
}
|
|
||||||
|
|
||||||
zipFile.getParentFile().mkdirs()
|
|
||||||
ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
|
|
||||||
|
|
||||||
zos.putNextEntry(new ZipEntry("fields.csv"))
|
|
||||||
Files.copy(Paths.get(fieldsCache), zos)
|
|
||||||
zos.closeEntry()
|
|
||||||
|
|
||||||
zos.putNextEntry(new ZipEntry("methods.csv"))
|
|
||||||
Files.copy(Paths.get(methodsCache), zos)
|
|
||||||
zos.closeEntry()
|
|
||||||
|
|
||||||
zos.close()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper methods
|
|
||||||
|
|
||||||
def checkPropertyExists(String propertyName) {
|
|
||||||
if (!project.hasProperty(propertyName)) {
|
|
||||||
throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def getFile(String relativePath) {
|
|
||||||
return new File(projectDir, relativePath)
|
|
||||||
}
|
}
|
||||||
+39
-3
@@ -1,7 +1,43 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
configurations.create('gtnhlibEmbed') {
|
||||||
|
canBeConsumed = false
|
||||||
|
canBeResolved = true
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
|
api('com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev')
|
||||||
compile('com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev')
|
devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.54:dev')
|
||||||
shadowImplementation('org.apache.commons:commons-csv:1.8')
|
|
||||||
|
shadowImplementation('org.apache.commons:commons-csv:1.10.0')
|
||||||
|
|
||||||
|
compileOnly('maven.modrinth:forge-essentials:7.5.1')
|
||||||
|
compileOnly('com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.14-alpha:dev')
|
||||||
|
compileOnly('com.ruling_0:MaterialLib:0.24.0-mu:dev')
|
||||||
|
|
||||||
|
antlr('org.antlr:antlr4:4.13.2')
|
||||||
|
shadowImplementation('org.antlr:antlr4-runtime:4.13.2')
|
||||||
|
|
||||||
|
testImplementation(platform('org.junit:junit-bom:5.13.4'))
|
||||||
|
testImplementation('org.junit.jupiter:junit-jupiter')
|
||||||
|
testImplementation("org.mockito:mockito-core:5.+")
|
||||||
|
|
||||||
|
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
|
||||||
|
testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.3");
|
||||||
|
|
||||||
|
compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
|
||||||
|
gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
|
||||||
|
}
|
||||||
|
|
||||||
|
def embedArchiveOperations = gtnhGradle.archiveOperations
|
||||||
|
def gtnhlibEmbedContents = configurations.gtnhlibEmbed.elements.map { files ->
|
||||||
|
files.collect { embedArchiveOperations.zipTree(it.asFile) }
|
||||||
|
}
|
||||||
|
|
||||||
|
[tasks.jar, tasks.shadowJar].each {
|
||||||
|
it.configure {
|
||||||
|
from(gtnhlibEmbedContents) {
|
||||||
|
include 'com/gtnewhorizon/gtnhlib/color/ColorResource.class'
|
||||||
|
include 'com/gtnewhorizon/gtnhlib/color/ColorResource$*.class'
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+207
-24
@@ -1,60 +1,243 @@
|
|||||||
|
# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
|
||||||
|
# LOCAL to test local config updates.
|
||||||
|
gtnh.settings.blowdryerTag = 0.2.0
|
||||||
|
|
||||||
|
# Human-readable mod name, available for mcmod.info population.
|
||||||
modName = NotEnoughItems
|
modName = NotEnoughItems
|
||||||
|
|
||||||
# This is a case-sensitive string to identify your mod. Convention is to use lower case.
|
# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
|
||||||
|
# Conventionally lowercase.
|
||||||
modId = NotEnoughItems
|
modId = NotEnoughItems
|
||||||
|
|
||||||
|
# Root package of the mod, used to find various classes in other properties,
|
||||||
|
# mcmod.info substitution, enabling assertions in run tasks, etc.
|
||||||
modGroup = codechicken.nei
|
modGroup = codechicken.nei
|
||||||
|
|
||||||
# WHY is there no version field?
|
# Whether to use modGroup as the maven publishing group.
|
||||||
# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
|
# When false, com.github.GTNewHorizons is used.
|
||||||
# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
|
useModGroupForPublishing = false
|
||||||
|
|
||||||
# Will update your build.gradle automatically whenever an update is available
|
# Updates your build.gradle and settings.gradle automatically whenever an update is available.
|
||||||
autoUpdateBuildScript = false
|
autoUpdateBuildScript = false
|
||||||
|
|
||||||
|
# Version of Minecraft to target
|
||||||
minecraftVersion = 1.7.10
|
minecraftVersion = 1.7.10
|
||||||
|
|
||||||
|
# Version of Minecraft Forge to target
|
||||||
forgeVersion = 10.13.4.1614
|
forgeVersion = 10.13.4.1614
|
||||||
|
|
||||||
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
|
# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
|
||||||
# restart Minecraft in development. Choose this dependent on your mod:
|
channel = stable
|
||||||
# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
|
|
||||||
# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
|
# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
|
||||||
|
mappingsVersion = 12
|
||||||
|
|
||||||
|
# Defines other MCP mappings for dependency deobfuscation.
|
||||||
|
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
|
||||||
|
|
||||||
|
# Select a default username for testing your mod. You can always override this per-run by running
|
||||||
|
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
|
||||||
developmentEnvironmentUserName = Developer
|
developmentEnvironmentUserName = Developer
|
||||||
|
|
||||||
# Define a source file of your project with:
|
# Enables modern Java syntax support. Valid values:
|
||||||
|
# - false: No modern syntax, Java 8 only
|
||||||
|
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
|
||||||
|
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
|
||||||
|
# - modern: Native modern Java bytecode, no downgrading
|
||||||
|
enableModernJavaSyntax = jabel
|
||||||
|
|
||||||
|
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
|
||||||
|
# and should *not* be used in most situations. -1 disables this.
|
||||||
|
# forceToolchainVersion = -1
|
||||||
|
|
||||||
|
# Target JVM version for JVM Downgrader bytecode downgrading.
|
||||||
|
# Only used when enableModernJavaSyntax = jvmDowngrader
|
||||||
|
# downgradeTargetVersion = 8
|
||||||
|
|
||||||
|
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
|
||||||
|
# Classes will be available in META-INF/versions/N/ for each version N in this list.
|
||||||
|
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
|
||||||
|
# jvmDowngraderMultiReleaseVersions = 21,25
|
||||||
|
|
||||||
|
# Specifies how JVM Downgrader API stubs are provided. Options:
|
||||||
|
# - shade: Shade minimized stubs into the jar
|
||||||
|
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
|
||||||
|
# - external: Another dependency provides stubs (no constraint, no warning)
|
||||||
|
# - (empty): Warning reminding you to configure stubs
|
||||||
|
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
|
||||||
|
# jvmDowngraderStubsProvider =
|
||||||
|
|
||||||
|
# Enables injecting missing generics into the decompiled source code for a better coding experience.
|
||||||
|
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
|
||||||
|
enableGenericInjection = true
|
||||||
|
|
||||||
|
# Generate a class with a String field for the mod version named as defined below.
|
||||||
|
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
|
||||||
|
# If gradleTokenVersion is empty or missing, the field will not be present in the class.
|
||||||
|
generateGradleTokenClass = codechicken.nei.Tags
|
||||||
|
|
||||||
|
# Name of the token containing the project's current version to generate/replace.
|
||||||
|
gradleTokenVersion = VERSION
|
||||||
|
|
||||||
|
# [DEPRECATED] Mod ID replacement token.
|
||||||
|
gradleTokenModId =
|
||||||
|
|
||||||
|
# [DEPRECATED] Mod name replacement token.
|
||||||
|
gradleTokenModName =
|
||||||
|
|
||||||
|
# [DEPRECATED] Mod Group replacement token.
|
||||||
|
gradleTokenGroupName =
|
||||||
|
|
||||||
|
# [DEPRECATED]
|
||||||
|
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
|
||||||
# public static final String VERSION = "GRADLETOKEN_VERSION";
|
# public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||||
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
|
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
|
||||||
# version in @Mod([...], version = VERSION, [...])
|
# version in @Mod([...], version = VERSION, [...]).
|
||||||
# Leave these properties empty to skip individual token replacements
|
# Leave these properties empty to skip individual token replacements.
|
||||||
replaceGradleTokenInFile = NEIModContainer.java
|
replaceGradleTokenInFile =
|
||||||
gradleTokenModId = GRADLETOKEN_MODID
|
|
||||||
gradleTokenModName = GRADLETOKEN_MODNAME
|
|
||||||
gradleTokenVersion = GRADLETOKEN_VERSION
|
|
||||||
gradleTokenGroupName =
|
|
||||||
|
|
||||||
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
|
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
|
||||||
# leave this property empty.
|
# leave this property empty.
|
||||||
# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
|
# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
|
||||||
apiPackage =
|
apiPackage =
|
||||||
|
|
||||||
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
|
||||||
# Example value: mymodid_at.cfg
|
# There can be multiple files in a space-separated list.
|
||||||
|
# Example value: mymodid_at.cfg nei_at.cfg
|
||||||
accessTransformersFile = nei_at.cfg
|
accessTransformersFile = nei_at.cfg
|
||||||
|
|
||||||
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
|
||||||
usesMixins = false
|
usesMixins = false
|
||||||
# Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise.
|
|
||||||
|
# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
|
||||||
|
# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
|
||||||
|
# Mixin classes will have access to "main" classes, but not the other way around.
|
||||||
|
separateMixinSourceSet =
|
||||||
|
|
||||||
|
# Adds some debug arguments like verbose output and class export.
|
||||||
|
usesMixinDebug = false
|
||||||
|
|
||||||
|
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
|
||||||
mixinPlugin =
|
mixinPlugin =
|
||||||
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
|
|
||||||
|
# Specify the package that contains all of your Mixins. The package must exist or
|
||||||
|
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
|
||||||
|
# it must match with this or the build will fail.
|
||||||
mixinsPackage =
|
mixinsPackage =
|
||||||
|
|
||||||
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
|
||||||
# This parameter is for legacy compatibility only
|
# This parameter is for legacy compatibility only
|
||||||
# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
|
# Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin
|
||||||
coreModClass = asm.NEICorePlugin
|
coreModClass = asm.NEICorePlugin
|
||||||
|
|
||||||
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
|
# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
|
||||||
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
|
# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
|
||||||
containsMixinsAndOrCoreModOnly = true
|
containsMixinsAndOrCoreModOnly = true
|
||||||
|
|
||||||
# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
|
# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
|
||||||
# responsibility check the licence and request permission for distribution, if required.
|
forceEnableMixins = false
|
||||||
|
|
||||||
|
# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
|
||||||
|
# responsibility to check the license and request permission for distribution if required.
|
||||||
usesShadowedDependencies = true
|
usesShadowedDependencies = true
|
||||||
|
|
||||||
|
# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
|
||||||
|
# their own classes, making the minimization unreliable.
|
||||||
|
minimizeShadowedDependencies = true
|
||||||
|
|
||||||
|
# If disabled, won't rename the shadowed classes.
|
||||||
|
relocateShadowedDependencies = true
|
||||||
|
|
||||||
|
# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
|
||||||
|
includeWellKnownRepositories = true
|
||||||
|
|
||||||
|
# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
|
||||||
|
# list of strings, with the acceptable keys being(case does not matter):
|
||||||
|
# cursemaven
|
||||||
|
# modrinth
|
||||||
|
excludeWellKnownRepositories =
|
||||||
|
|
||||||
|
# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
|
||||||
|
# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
|
||||||
|
# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
|
||||||
|
usesMavenPublishing = true
|
||||||
|
|
||||||
|
# Maven repository to publish the mod to.
|
||||||
|
# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
|
||||||
|
|
||||||
|
# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
|
||||||
|
#
|
||||||
|
# The project's ID on Modrinth. Can be either the slug or the ID.
|
||||||
|
# Leave this empty if you don't want to publish to Modrinth.
|
||||||
|
modrinthProjectId = notenoughitems-unofficial
|
||||||
|
|
||||||
|
# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
|
||||||
|
# Syntax: scope1-type1:name1;scope2-type2:name2;...
|
||||||
|
# Where scope can be one of [required, optional, incompatible, embedded],
|
||||||
|
# type can be one of [project, version],
|
||||||
|
# and the name is the Modrinth project or version slug/id of the other mod.
|
||||||
|
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
|
||||||
|
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
|
||||||
|
modrinthRelations = required-project\:codechickencore-unofficial
|
||||||
|
|
||||||
|
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
|
||||||
|
#
|
||||||
|
# The project's numeric ID on CurseForge. You can find this in the About Project box.
|
||||||
|
# Leave this empty if you don't want to publish on CurseForge.
|
||||||
|
curseForgeProjectId = 358228
|
||||||
|
|
||||||
|
# Comma-separated supported CurseForge environments: client, server (case-insensitive).
|
||||||
|
# Use client or server for mods that only support one environment. Defaults to client,server.
|
||||||
|
# These tags describe where the mod can run, not whether installation is required on both sides.
|
||||||
|
curseForgeEnvironments = client,server
|
||||||
|
|
||||||
|
# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
|
||||||
|
# Syntax: type1:name1;type2:name2;...
|
||||||
|
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
|
||||||
|
# and the name is the CurseForge project slug of the other mod.
|
||||||
|
# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
|
||||||
|
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
|
||||||
|
curseForgeRelations = requiredDependency\:codechickencore-unofficial
|
||||||
|
|
||||||
|
# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
|
||||||
|
# projects. New projects should not use this parameter.
|
||||||
|
# customArchiveBaseName =
|
||||||
|
|
||||||
|
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
|
||||||
|
# runClientWorkingDirectory = run/client
|
||||||
|
|
||||||
|
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
|
||||||
|
# runServerWorkingDirectory = run/server
|
||||||
|
|
||||||
|
# Optional parameter to have the build automatically fail if an illegal version is used.
|
||||||
|
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
|
||||||
|
# The check is ONLY performed if the version is a git tag.
|
||||||
|
# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
|
||||||
|
# versionPattern =
|
||||||
|
|
||||||
|
# Uncomment to prevent the source code from being published.
|
||||||
|
# noPublishedSources = true
|
||||||
|
|
||||||
|
# Uncomment this to disable Spotless checks.
|
||||||
|
# This should only be uncommented to keep it easier to sync with upstream/other forks.
|
||||||
|
# That is, if there is no other active fork/upstream, NEVER change this.
|
||||||
|
# disableSpotless = true
|
||||||
|
|
||||||
|
# Uncomment this to disable Checkstyle checks (currently wildcard import check).
|
||||||
|
# disableCheckstyle = true
|
||||||
|
|
||||||
|
# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
|
||||||
|
# (force use delegated build).
|
||||||
|
# This is meant to be set in $HOME/.gradle/gradle.properties.
|
||||||
|
# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
|
||||||
|
# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
|
||||||
|
# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
|
||||||
|
# ideaOverrideBuildType = idea
|
||||||
|
|
||||||
|
# Whether IDEA should run spotless checks when pressing the Build button.
|
||||||
|
# This is meant to be set in $HOME/.gradle/gradle.properties.
|
||||||
|
# ideaCheckSpotlessOnBuild = true
|
||||||
|
|
||||||
|
# Non-GTNH properties
|
||||||
|
org.gradle.configuration-cache = true
|
||||||
|
org.gradle.parallel = true
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#This file is generated by updateDaemonJvm
|
||||||
|
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
|
||||||
|
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
|
||||||
|
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
|
||||||
|
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
|
||||||
|
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
|
||||||
|
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
|
||||||
|
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
|
||||||
|
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
|
||||||
|
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
|
||||||
|
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
|
||||||
|
toolchainVersion=25
|
||||||
Vendored
BIN
Binary file not shown.
+5
-1
@@ -1,5 +1,9 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
retries=0
|
||||||
|
retryBackOffMs=500
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2015 the original author or authors.
|
# Copyright © 2015 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -15,80 +15,114 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
#
|
||||||
## Gradle start up script for UN*X
|
# gradlew start up script for POSIX generated by Gradle.
|
||||||
##
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh gradlew
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
app_path=$0
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
# Need this for daisy-chained symlinks.
|
||||||
ls=`ls -ld "$PRG"`
|
while
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
[ -h "$app_path" ]
|
||||||
PRG="$link"
|
do
|
||||||
else
|
ls=$( ls -ld "$app_path" )
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
link=${ls#*' -> '}
|
||||||
fi
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
# This is normally unused
|
||||||
APP_BASE_NAME=`basename "$0"`
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD="maximum"
|
MAX_FD=maximum
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "`uname`" in
|
case "$( uname )" in #(
|
||||||
CYGWIN* )
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
cygwin=true
|
Darwin* ) darwin=true ;; #(
|
||||||
;;
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
Darwin* )
|
NONSTOP* ) nonstop=true ;;
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
else
|
else
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -97,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD="java"
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
case $MAX_FD in #(
|
||||||
if [ $? -eq 0 ] ; then
|
max*)
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
# shellcheck disable=SC2039,SC3045
|
||||||
fi
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
ulimit -n $MAX_FD
|
warn "Could not query maximum file descriptor limit"
|
||||||
if [ $? -ne 0 ] ; then
|
esac
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
case $MAX_FD in #(
|
||||||
fi
|
'' | soft) :;; #(
|
||||||
else
|
*)
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
fi
|
# shellcheck disable=SC2039,SC3045
|
||||||
fi
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=$((i+1))
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
(0) set -- ;;
|
|
||||||
(1) set -- "$args0" ;;
|
|
||||||
(2) set -- "$args0" "$args1" ;;
|
|
||||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
save () {
|
# * args from the command line
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
# * the main class name
|
||||||
echo " "
|
# * -classpath
|
||||||
}
|
# * -D...appname settings
|
||||||
APP_ARGS=$(save "$@")
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
|
||||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
|
||||||
cd "$(dirname "$0")"
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
Vendored
+32
-50
@@ -13,22 +13,28 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem gradlew startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
@rem Set local scope for the variables, and ensure extensions are enabled
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
setlocal EnableExtensions
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
@@ -37,64 +43,40 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto init
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
"%COMSPEC%" /c exit 1
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto init
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
"%COMSPEC%" /c exit 1
|
||||||
|
|
||||||
:init
|
|
||||||
@rem Get command-line arguments, handling Windows variants
|
|
||||||
|
|
||||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
|
||||||
|
|
||||||
:win9xME_args
|
|
||||||
@rem Slurp the command line arguments.
|
|
||||||
set CMD_LINE_ARGS=
|
|
||||||
set _SKIP=2
|
|
||||||
|
|
||||||
:win9xME_args_slurp
|
|
||||||
if "x%~1" == "x" goto execute
|
|
||||||
|
|
||||||
set CMD_LINE_ARGS=%*
|
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
|
||||||
|
|
||||||
:end
|
@rem Execute gradlew
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
@rem which allows us to clear the local environment before executing the java command
|
||||||
|
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
|
||||||
|
|
||||||
:fail
|
:exitWithErrorLevel
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
||||||
rem the _cmd.exe /c_ return code!
|
"%COMSPEC%" /c exit %ERRORLEVEL%
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
+6
-15
@@ -1,18 +1,9 @@
|
|||||||
// Add any additional repositiroes for your dependencies here
|
// Add any additional repositories for your dependencies here
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenLocal()
|
||||||
maven {
|
maven {
|
||||||
name 'GTNH Maven'
|
name = "Modrinth"
|
||||||
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
|
url = "https://api.modrinth.com/maven"
|
||||||
}
|
}
|
||||||
maven {
|
|
||||||
url 'https://cursemaven.com'
|
|
||||||
content {
|
|
||||||
includeGroup 'curse.maven'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
url 'https://jitpack.io'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
|
||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
// RetroFuturaGradle
|
||||||
|
name "GTNH Maven"
|
||||||
|
url "https://nexus.gtnewhorizons.com/repository/public/"
|
||||||
|
mavenContent {
|
||||||
|
includeGroup("com.gtnewhorizons")
|
||||||
|
includeGroupByRegex("com\\.gtnewhorizons\\..+")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gradlePluginPortal()
|
||||||
|
mavenCentral()
|
||||||
|
mavenLocal()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
rootProject.name = "NotEnoughItems"
|
||||||
|
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
lexer grammar SearchExpressionLexer;
|
||||||
|
|
||||||
|
// Antlr4 generates imports with .*
|
||||||
|
@header {
|
||||||
|
// CHECKSTYLE:OFF
|
||||||
|
import codechicken.nei.SearchTokenParser;
|
||||||
|
}
|
||||||
|
|
||||||
|
@members {
|
||||||
|
private SearchTokenParser searchParser;
|
||||||
|
|
||||||
|
public SearchExpressionLexer(CharStream input, SearchTokenParser searchParser) {
|
||||||
|
this(input);
|
||||||
|
this.searchParser = searchParser;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lexer rules
|
||||||
|
REGEX_LEFT : 'r'? '/' -> pushMode(REGEX) ;
|
||||||
|
QUOTE_LEFT : '"' -> pushMode(QUOTED) ;
|
||||||
|
|
||||||
|
DASH : '-' ;
|
||||||
|
|
||||||
|
RECIPE_INGREDIENTS : '<&' | '<' ;
|
||||||
|
RECIPE_RESULT : '>&' | '>' ;
|
||||||
|
RECIPE_OTHERS : '^&' | '^' ;
|
||||||
|
|
||||||
|
OR : '|' ;
|
||||||
|
LEFT_BRACKET : '{' ;
|
||||||
|
RIGHT_BRACKET : '}' ;
|
||||||
|
NEWLINE_OR_TAB : [\t\r\n] -> skip ;
|
||||||
|
SPACE : ' ' ;
|
||||||
|
ESCAPED_SYMBOL : '\\' . ;
|
||||||
|
|
||||||
|
PREFIX : CLEAN_SYMBOL {searchParser.hasRedefinedPrefix(getText().charAt(0))}? ;
|
||||||
|
CLEAN_SYMBOL : ~[-<>^{}|/\\ "] ;
|
||||||
|
|
||||||
|
mode REGEX;
|
||||||
|
|
||||||
|
REGEX_CONTENT : (~[/] | '\\/')+ ;
|
||||||
|
REGEX_RIGHT : '/' -> popMode ;
|
||||||
|
|
||||||
|
mode QUOTED;
|
||||||
|
|
||||||
|
QUOTED_CONTENT : (~["] | '\\"')+ ;
|
||||||
|
QUOTE_RIGHT : '"' -> popMode ;
|
||||||
|
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
parser grammar SearchExpressionParser;
|
||||||
|
|
||||||
|
// Antlr4 generates imports with .*
|
||||||
|
@header {
|
||||||
|
// CHECKSTYLE:OFF
|
||||||
|
}
|
||||||
|
|
||||||
|
options { tokenVocab=SearchExpressionLexer; }
|
||||||
|
|
||||||
|
// Parser rules
|
||||||
|
|
||||||
|
// Should only be used for recipes. Thanks to antlr inability to properly
|
||||||
|
// inherit grammars, this is included where it's not supposed to be
|
||||||
|
recipeSearchExpression
|
||||||
|
: recipeClauseExpression*
|
||||||
|
;
|
||||||
|
|
||||||
|
recipeClauseExpression
|
||||||
|
: ingredientsPrefix=RECIPE_INGREDIENTS searchExpression[0, $ingredientsPrefix.getText().length() > 1]
|
||||||
|
| resultPrefix=RECIPE_RESULT searchExpression[1, $resultPrefix.getText().length() > 1]
|
||||||
|
| othersPrefix=RECIPE_OTHERS searchExpression[2, $othersPrefix.getText().length() > 1]
|
||||||
|
| searchExpression[3, false]
|
||||||
|
;
|
||||||
|
|
||||||
|
// General search expression rules
|
||||||
|
searchExpression[int type, boolean allRecipe]
|
||||||
|
: orExpression
|
||||||
|
;
|
||||||
|
|
||||||
|
orExpression
|
||||||
|
: sequenceExpression (OR sequenceExpression)*
|
||||||
|
;
|
||||||
|
|
||||||
|
sequenceExpression
|
||||||
|
: (SPACE* unaryExpression SPACE*)+
|
||||||
|
;
|
||||||
|
|
||||||
|
unaryExpression
|
||||||
|
: LEFT_BRACKET orExpression RIGHT_BRACKET?
|
||||||
|
| prefixedExpression
|
||||||
|
| negateExpression
|
||||||
|
| token['\0']
|
||||||
|
;
|
||||||
|
|
||||||
|
negateExpression
|
||||||
|
: DASH unaryExpression
|
||||||
|
;
|
||||||
|
|
||||||
|
prefixedExpression
|
||||||
|
locals [
|
||||||
|
Character prefix
|
||||||
|
]
|
||||||
|
: prefixToken=PREFIX { $prefix = $prefixToken.getText().charAt(0); } token[$prefix]
|
||||||
|
;
|
||||||
|
|
||||||
|
token[Character prefix]
|
||||||
|
: regex[prefix]
|
||||||
|
| quoted[prefix]
|
||||||
|
| plainText
|
||||||
|
;
|
||||||
|
|
||||||
|
regex[Character prefix]
|
||||||
|
: REGEX_LEFT REGEX_CONTENT REGEX_RIGHT?
|
||||||
|
;
|
||||||
|
|
||||||
|
quoted[Character prefix]
|
||||||
|
: QUOTE_LEFT QUOTED_CONTENT QUOTE_RIGHT?
|
||||||
|
;
|
||||||
|
|
||||||
|
plainText
|
||||||
|
: (CLEAN_SYMBOL | ESCAPED_SYMBOL)+
|
||||||
|
;
|
||||||
|
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.ShortcutInputHandler;
|
||||||
|
import codechicken.nei.drawable.DrawableBuilder;
|
||||||
|
import codechicken.nei.drawable.DrawableResource;
|
||||||
|
import codechicken.nei.guihook.IContainerTooltipHandler;
|
||||||
|
import codechicken.nei.recipe.GuiRecipe;
|
||||||
|
|
||||||
|
public abstract class AbstractSubpanel<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
|
||||||
|
extends Widget implements IContainerTooltipHandler {
|
||||||
|
|
||||||
|
final DrawableResource DASH = new DrawableBuilder("nei:textures/dash.png", 0, 0, 6, 1).setTextureSize(6, 1).build();
|
||||||
|
|
||||||
|
protected int mouseDownItemIndex = -1;
|
||||||
|
protected int splittingLineColor = 0xffffffff;
|
||||||
|
protected int linePaddingStart = 0;
|
||||||
|
protected T grid;
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return this.grid.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void draw(int mousex, int mousey) {
|
||||||
|
drawSplittingLine();
|
||||||
|
this.grid.draw(mousex, mousey);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void update() {
|
||||||
|
this.grid.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
public abstract int setPanelWidth(int width);
|
||||||
|
|
||||||
|
public void resize(GuiContainer gui) {
|
||||||
|
this.grid.setGridSize(x, y + 4, w, h - 8);
|
||||||
|
this.grid.refresh(gui);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
||||||
|
final ItemsGridSlot slot = getSlotMouseOver(mousex, mousey);
|
||||||
|
return slot == null ? null : slot.getItemStack();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemsGridSlot getSlotMouseOver(int mousex, int mousey) {
|
||||||
|
return this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void updateLinePadding() {
|
||||||
|
GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
|
||||||
|
this.linePaddingStart = 0;
|
||||||
|
|
||||||
|
while (GuiInfo
|
||||||
|
.hideItemPanelSlot(guiContainer, new Rectangle4i(this.x + this.linePaddingStart, this.y - 1, 10, 2))) {
|
||||||
|
this.linePaddingStart += 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawSplittingLine() {
|
||||||
|
float alpha = (this.splittingLineColor >> 24 & 255) / 255.0F;
|
||||||
|
float red = (this.splittingLineColor >> 16 & 255) / 255.0F;
|
||||||
|
float green = (this.splittingLineColor >> 8 & 255) / 255.0F;
|
||||||
|
float blue = (this.splittingLineColor & 255) / 255.0F;
|
||||||
|
|
||||||
|
int width = this.grid.columns * ItemsGrid.SLOT_SIZE - this.linePaddingStart;
|
||||||
|
int repeat = width / 6;
|
||||||
|
int shiftX = this.x + this.linePaddingStart + (this.w - width) / 2;
|
||||||
|
|
||||||
|
GL11.glColor4f(red, green, blue, alpha);
|
||||||
|
for (int i = 0; i < repeat; i++) {
|
||||||
|
DASH.draw(shiftX + i * 6, this.y);
|
||||||
|
}
|
||||||
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
|
||||||
|
|
||||||
|
if (this.mouseDownItemIndex >= 0 && ItemPanels.itemPanel.draggedStack == null
|
||||||
|
&& NEIClientUtils.getHeldItem() == null
|
||||||
|
&& NEIClientConfig.hasSMPCounterPart()) {
|
||||||
|
|
||||||
|
final ItemsGridSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (mouseOverSlot == null || mouseOverSlot.itemIndex != this.mouseDownItemIndex || heldTime > 500) {
|
||||||
|
ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(
|
||||||
|
this.grid.getItem(this.mouseDownItemIndex));
|
||||||
|
this.mouseDownItemIndex = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handleClick(int mousex, int mousey, int button) {
|
||||||
|
if (handleClickExt(mousex, mousey, button)) return true;
|
||||||
|
|
||||||
|
final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
if (hoverSlot != null) {
|
||||||
|
|
||||||
|
if (button == 2) {
|
||||||
|
ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
|
||||||
|
} else {
|
||||||
|
mouseDownItemIndex = hoverSlot.itemIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
|
||||||
|
|
||||||
|
public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
|
||||||
|
final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
|
||||||
|
return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void mouseUp(int mousex, int mousey, int button) {
|
||||||
|
final ItemsGridSlot hoverSlot = getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (hoverSlot != null && hoverSlot.itemIndex == this.mouseDownItemIndex
|
||||||
|
&& ItemPanels.itemPanel.draggedStack == null) {
|
||||||
|
|
||||||
|
if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
|
||||||
|
|| !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
|
||||||
|
ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack().copy());
|
||||||
|
} else {
|
||||||
|
NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
this.mouseDownItemIndex = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import static codechicken.lib.gui.GuiDraw.getMousePosition;
|
||||||
|
|
||||||
|
import java.awt.Point;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.GuiTextField;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.client.settings.GameSettings;
|
||||||
|
import net.minecraft.util.ChatAllowedCharacters;
|
||||||
|
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
|
|
||||||
|
public class AutoFocusWidget implements IContainerInputHandler {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implement this interface on a GuiContainer to enable the autofocus search in NEI (if the autofocus option is
|
||||||
|
* enabled) without needing to add the classname to the config file .
|
||||||
|
*/
|
||||||
|
public interface INEIAutoFocusSearchEnable {
|
||||||
|
}
|
||||||
|
|
||||||
|
public static AutoFocusWidget instance = new AutoFocusWidget();
|
||||||
|
|
||||||
|
public static List<String> enableAutoFocusPrefixes = new ArrayList<>();
|
||||||
|
|
||||||
|
protected boolean autofocus = false;
|
||||||
|
protected Point mouse;
|
||||||
|
protected Point pendingMouse;
|
||||||
|
protected GuiTextField textInputHolder;
|
||||||
|
|
||||||
|
public AutoFocusWidget() {
|
||||||
|
GuiContainerManager.addInputHandler(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void load(GuiContainer gui) {
|
||||||
|
this.autofocus = LayoutManager.searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus() != 0
|
||||||
|
&& isAllowedGuiAutoSearchFocus(gui);
|
||||||
|
this.mouse = null;
|
||||||
|
this.pendingMouse = null;
|
||||||
|
|
||||||
|
if (this.autofocus) {
|
||||||
|
beginTextInput();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void beginTextInput() {
|
||||||
|
if (this.textInputHolder == null) {
|
||||||
|
this.textInputHolder = new GuiTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.textInputHolder.setFocused(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void endTextInput() {
|
||||||
|
if (this.textInputHolder != null) {
|
||||||
|
this.textInputHolder.setFocused(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void guiTick() {
|
||||||
|
if (!this.autofocus) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final Point current = getMousePosition();
|
||||||
|
|
||||||
|
if (this.mouse == null) {
|
||||||
|
if (current.equals(this.pendingMouse)) {
|
||||||
|
this.mouse = current;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.pendingMouse = current;
|
||||||
|
} else if (!this.mouse.equals(current)) {
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void cancel() {
|
||||||
|
if (this.autofocus) {
|
||||||
|
this.autofocus = false;
|
||||||
|
endTextInput();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
||||||
|
|
||||||
|
if (this.autofocus) {
|
||||||
|
|
||||||
|
if (NEIClientConfig.searchWidgetAutofocus() == 2
|
||||||
|
&& GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindInventory)) {
|
||||||
|
cancel();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER
|
||||||
|
|| keyCode == Keyboard.KEY_ESCAPE) {
|
||||||
|
cancel();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ChatAllowedCharacters.isAllowedCharacter(keyChar)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.autofocus = false;
|
||||||
|
|
||||||
|
LayoutManager.searchField.setFocus(true);
|
||||||
|
endTextInput();
|
||||||
|
|
||||||
|
final String oldText = LayoutManager.searchField.text();
|
||||||
|
LayoutManager.searchField.handleKeyPress(keyCode, keyChar);
|
||||||
|
|
||||||
|
return !LayoutManager.searchField.text().equals(oldText);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
cancel();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
|
cancel();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) {
|
||||||
|
if (gui instanceof INEIAutoFocusSearchEnable) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
String guiClassName = gui.getClass().getName();
|
||||||
|
for (String prefix : enableAutoFocusPrefixes) {
|
||||||
|
if (guiClassName.startsWith(prefix)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiChest;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.api.IBookmarkContainerHandler;
|
||||||
|
|
||||||
|
public class BookmarkContainerInfo {
|
||||||
|
|
||||||
|
private static final HashMap<Class<? extends GuiContainer>, IBookmarkContainerHandler> handlerMap = new HashMap<>();
|
||||||
|
|
||||||
|
public static void registerBookmarkContainerHandler(Class<? extends GuiContainer> classz,
|
||||||
|
IBookmarkContainerHandler handler) {
|
||||||
|
handlerMap.put(classz, handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean hasBookmarkContainerHandler(Class<? extends GuiContainer> classz) {
|
||||||
|
return handlerMap.containsKey(classz);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IBookmarkContainerHandler getBookmarkContainerHandler(GuiContainer gui) {
|
||||||
|
if (gui != null) {
|
||||||
|
return handlerMap.get(gui.getClass());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void load() {
|
||||||
|
API.registerBookmarkContainerHandler(GuiChest.class, new DefaultBookmarkContainerHandler());
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -5,6 +5,7 @@ import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public abstract class Button extends Widget {
|
public abstract class Button extends Widget {
|
||||||
|
|
||||||
public Button(String s) {
|
public Button(String s) {
|
||||||
label = s;
|
label = s;
|
||||||
}
|
}
|
||||||
@@ -14,7 +15,7 @@ public abstract class Button extends Widget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int contentWidth() {
|
public int contentWidth() {
|
||||||
return getRenderIcon() == null ? getStringWidth(label) : getRenderIcon().width;
|
return getRenderIcon() == null ? getStringWidth(getRenderLabel()) : getRenderIcon().width;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -56,14 +57,15 @@ public abstract class Button extends Widget {
|
|||||||
return label;
|
return label;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getRenderLabelColor() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
public final String label;
|
public final String label;
|
||||||
public Image icon;
|
public Image icon;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 0x4 = state flag, as opposed to 1 click
|
* 0x4 = state flag, as opposed to 1 click 0 = normal 1 = on 2 = disabled
|
||||||
* 0 = normal
|
|
||||||
* 1 = on
|
|
||||||
* 2 = disabled
|
|
||||||
*/
|
*/
|
||||||
public int state;
|
public int state;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public abstract class ButtonCycled extends Button {
|
public abstract class ButtonCycled extends Button {
|
||||||
|
|
||||||
public ButtonCycled() {}
|
public ButtonCycled() {}
|
||||||
|
|
||||||
public ButtonCycled(int num) {
|
public ButtonCycled(int num) {
|
||||||
|
|||||||
@@ -1,80 +1,73 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.core.ClientUtils;
|
|
||||||
import codechicken.core.GuiModListScroll;
|
|
||||||
import codechicken.lib.packet.PacketCustom;
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.recipe.GuiRecipeTab;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.common.Loader;
|
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
|
||||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
|
||||||
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.io.FileWriter;
|
import java.io.FileWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
|
import java.util.function.Consumer;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
import net.minecraft.client.entity.EntityPlayerSP;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.GuiErrorScreen;
|
import net.minecraft.client.gui.GuiErrorScreen;
|
||||||
import net.minecraft.client.gui.GuiMainMenu;
|
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
import net.minecraft.client.gui.GuiScreen;
|
||||||
import net.minecraft.client.gui.GuiSelectWorld;
|
import net.minecraft.client.gui.GuiSelectWorld;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.multiplayer.WorldClient;
|
import net.minecraft.client.multiplayer.WorldClient;
|
||||||
|
import net.minecraft.client.resources.IResource;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
||||||
|
import net.minecraft.launchwrapper.Launch;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.client.event.GuiOpenEvent;
|
||||||
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
import net.minecraftforge.client.event.RenderWorldLastEvent;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import org.apache.commons.csv.CSVFormat;
|
import net.minecraftforge.event.world.WorldEvent;
|
||||||
import org.apache.commons.csv.CSVParser;
|
|
||||||
import org.apache.commons.csv.CSVRecord;
|
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
public class ClientHandler {
|
import com.google.common.collect.Lists;
|
||||||
private static String[] defaultSerialHandlers = {"WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler"};
|
|
||||||
private static String[] defaultHeightHackHandlerRegex = {
|
|
||||||
"buildcraft.compat.nei.*",
|
|
||||||
"cofh.thermalexpansion.plugins.nei.handlers.*",
|
|
||||||
"crazypants.enderio.nei.*",
|
|
||||||
"forestry.factory.recipes.nei.*",
|
|
||||||
"ic2.neiIntegration.core.recipehandler.*",
|
|
||||||
"mariculture.plugins.nei.*",
|
|
||||||
"redgear.brewcraft.plugins.nei.*",
|
|
||||||
"tconstruct.plugins.nei.*",
|
|
||||||
"WayofTime.alchemicalWizardry.client.nei.*",
|
|
||||||
};
|
|
||||||
private static String[] defaultHandlerOrdering = {
|
|
||||||
"# Each line in this file should either be a comment (starts with '#') or an ordering.",
|
|
||||||
"# Ordering lines are <handler ID>,<ordering number>.",
|
|
||||||
"# Handlers will be sorted in order of number ascending, so smaller numbers first.",
|
|
||||||
"# Any handlers that are missing from this file will be assigned to 0.",
|
|
||||||
"# Negative numbers are fine.",
|
|
||||||
"# If you delete this file, it will be regenerated with all registered handler IDs.",
|
|
||||||
};
|
|
||||||
private static ClientHandler instance;
|
|
||||||
|
|
||||||
private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
|
import codechicken.core.ClassDiscoverer;
|
||||||
|
import codechicken.core.ClientUtils;
|
||||||
|
import codechicken.lib.packet.PacketCustom;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.IConfigureNEI;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.bookmark.tree.GuiCraftingTree;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.GuiRecipeTab;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
|
||||||
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
|
import cpw.mods.fml.common.Loader;
|
||||||
|
import cpw.mods.fml.common.ModClassLoader;
|
||||||
|
import cpw.mods.fml.common.discovery.ASMDataTable;
|
||||||
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
|
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||||
|
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
public class ClientHandler {
|
||||||
|
|
||||||
|
private static ClientHandler instance;
|
||||||
|
private final ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
|
||||||
private World lastworld;
|
private World lastworld;
|
||||||
private GuiScreen lastGui;
|
|
||||||
|
|
||||||
public void addSMPMagneticItem(int i, World world) {
|
public void addSMPMagneticItem(int i, World world) {
|
||||||
WorldClient cworld = (WorldClient) world;
|
WorldClient cworld = (WorldClient) world;
|
||||||
@@ -100,9 +93,10 @@ public class ClientHandler {
|
|||||||
items = SMPmagneticItems;
|
items = SMPmagneticItems;
|
||||||
} else {
|
} else {
|
||||||
items = world.getEntitiesWithinAABB(
|
items = world.getEntitiesWithinAABB(
|
||||||
EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
|
EntityItem.class,
|
||||||
|
player.boundingBox.expand(distancexz, distancey, distancexz));
|
||||||
}
|
}
|
||||||
for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext(); ) {
|
for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext();) {
|
||||||
EntityItem item = iterator.next();
|
EntityItem item = iterator.next();
|
||||||
|
|
||||||
if (item.delayBeforeCanPickup > 0) continue;
|
if (item.delayBeforeCanPickup > 0) continue;
|
||||||
@@ -156,61 +150,137 @@ public class ClientHandler {
|
|||||||
|
|
||||||
public static void preInit() {
|
public static void preInit() {
|
||||||
loadSerialHandlers();
|
loadSerialHandlers();
|
||||||
|
loadHiddenItems();
|
||||||
loadHeightHackHandlers();
|
loadHeightHackHandlers();
|
||||||
|
loadHiddenHandlers();
|
||||||
|
loadEnableAutoFocus();
|
||||||
|
loadGuiCraftablesBlacklist();
|
||||||
|
loadDefaultBookmarkContainers();
|
||||||
ItemInfo.preInit();
|
ItemInfo.preInit();
|
||||||
StackInfo.loadGuidFilters();
|
StackInfo.loadGuidFilters();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadSerialHandlers() {
|
public static void loadSettingsFile(String resource, Consumer<Stream<String>> callback) {
|
||||||
File file = NEIClientConfig.serialHandlersFile;
|
loadSettingsFile(resource, (file, writer) -> {
|
||||||
if (!file.exists()) {
|
String folder = resource.substring(resource.lastIndexOf(".") + 1);
|
||||||
|
URL defaultResource = ClientHandler.class.getResource("/assets/nei/" + folder + "/" + resource);
|
||||||
|
|
||||||
|
if (defaultResource != null) {
|
||||||
|
try {
|
||||||
|
IOUtils.copy(defaultResource.openStream(), writer);
|
||||||
|
} catch (IOException e) {}
|
||||||
|
}
|
||||||
|
}, callback);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean loadSettingsResource(String resource, Consumer<Stream<String>> callback) {
|
||||||
|
final ResourceLocation location = new ResourceLocation("nei", resource);
|
||||||
|
|
||||||
|
try {
|
||||||
|
final IResource res = Minecraft.getMinecraft().getResourceManager().getResource(location);
|
||||||
|
|
||||||
|
try (BufferedReader reader = new BufferedReader(
|
||||||
|
new InputStreamReader(res.getInputStream(), StandardCharsets.UTF_8))) {
|
||||||
|
NEIClientConfig.logger.info("Loading '{}' from jar {}", resource, location);
|
||||||
|
callback.accept(
|
||||||
|
IOUtils.readLines(reader).stream()
|
||||||
|
.map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
|
||||||
|
.map(String::trim).filter(line -> !line.isEmpty()));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception io) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, location);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean loadSettingsFile(String resource, BiConsumer<File, FileWriter> createDefault,
|
||||||
|
Consumer<Stream<String>> callback) {
|
||||||
|
File file = new File(NEIClientConfig.configDir, resource);
|
||||||
|
|
||||||
|
if (!file.exists() && createDefault != null) {
|
||||||
try (FileWriter writer = new FileWriter(file)) {
|
try (FileWriter writer = new FileWriter(file)) {
|
||||||
NEIClientConfig.logger.info("Creating default serial handlers list {}", file);
|
NEIClientConfig.logger.info("Creating default '{}' {}", resource, file);
|
||||||
Collection<String> toSave = Loader.isModLoaded("dreamcraft")
|
createDefault.accept(file, writer);
|
||||||
? Collections.singletonList("")
|
|
||||||
: Arrays.asList(defaultSerialHandlers);
|
|
||||||
IOUtils.writeLines(toSave, "\n", writer);
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
NEIClientConfig.logger.error("Failed to save default serial handlers list to file {}", file, e);
|
NEIClientConfig.logger.error("Failed to save default '{}' to file {}", resource, file, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
try (FileReader reader = new FileReader(file)) {
|
|
||||||
NEIClientConfig.logger.info("Loading serial handlers from file {}", file);
|
if (file.exists()) {
|
||||||
NEIClientConfig.serialHandlers = new HashSet<>(IOUtils.readLines(reader));
|
try (FileReader reader = new FileReader(file)) {
|
||||||
} catch (IOException e) {
|
NEIClientConfig.logger.info("Loading '{}' file {}", resource, file);
|
||||||
NEIClientConfig.logger.error("Failed to load serial handlers from file {}", file, e);
|
callback.accept(
|
||||||
|
IOUtils.readLines(reader).stream()
|
||||||
|
.map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
|
||||||
|
.map(String::trim).filter(line -> !line.isEmpty()));
|
||||||
|
return true;
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadSerialHandlers() {
|
||||||
|
loadSettingsFile(
|
||||||
|
"serialhandlers.cfg",
|
||||||
|
lines -> NEIClientConfig.serialHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadHeightHackHandlers() {
|
public static void loadHeightHackHandlers() {
|
||||||
File file = NEIClientConfig.heightHackHandlersFile;
|
loadSettingsFile(
|
||||||
if (!file.exists()) {
|
"heighthackhandlers.cfg",
|
||||||
try (FileWriter writer = new FileWriter(file)) {
|
lines -> NEIClientConfig.heightHackHandlerRegex = lines.map(Pattern::compile)
|
||||||
NEIClientConfig.logger.info("Creating default height hack handlers list {}", file);
|
.collect(Collectors.toCollection(HashSet::new)));
|
||||||
Collection<String> toSave = Arrays.asList(defaultHeightHackHandlerRegex);
|
}
|
||||||
IOUtils.writeLines(toSave, "\n", writer);
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to save default height hack handlers list to file {}", file, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try (FileReader reader = new FileReader(file)) {
|
public static void loadHiddenHandlers() {
|
||||||
NEIClientConfig.logger.info("Loading height hack handlers from file {}", file);
|
loadSettingsFile(
|
||||||
NEIClientConfig.heightHackHandlerRegex = IOUtils.readLines(reader).stream()
|
"hiddenhandlers.cfg",
|
||||||
.map(Pattern::compile)
|
lines -> NEIClientConfig.hiddenHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
|
||||||
.collect(Collectors.toCollection(HashSet::new));
|
}
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load height hack handlers from file {}", file, e);
|
public static void loadEnableAutoFocus() {
|
||||||
}
|
loadSettingsFile(
|
||||||
|
"enableautofocus.cfg",
|
||||||
|
lines -> AutoFocusWidget.enableAutoFocusPrefixes = lines.collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadGuiCraftablesBlacklist() {
|
||||||
|
loadSettingsFile(
|
||||||
|
"guicraftablesblacklist.cfg",
|
||||||
|
lines -> ItemCraftablesPanel.guiBlacklist = lines.collect(Collectors.toList()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadDefaultBookmarkContainers() {
|
||||||
|
loadSettingsFile("defaultbookmarkcontainers.cfg", lines -> {
|
||||||
|
for (String clazz : lines.collect(Collectors.toList())) {
|
||||||
|
try {
|
||||||
|
API.registerBookmarkContainerHandler(
|
||||||
|
(Class<? extends GuiContainer>) Class.forName(clazz),
|
||||||
|
new DefaultBookmarkContainerHandler());
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load class '{}' for defaultbookmarkcontainers.cfg", clazz);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadHiddenItems() {
|
||||||
|
loadSettingsFile("hiddenitems.cfg", lines -> lines.forEach(API::hideItem));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void load() {
|
public static void load() {
|
||||||
instance = new ClientHandler();
|
instance = new ClientHandler();
|
||||||
|
|
||||||
GuiModListScroll.register("NotEnoughItems");
|
|
||||||
PacketCustom.assignHandler(NEICPH.channel, new NEICPH());
|
PacketCustom.assignHandler(NEICPH.channel, new NEICPH());
|
||||||
FMLCommonHandler.instance().bus().register(instance);
|
FMLCommonHandler.instance().bus().register(instance);
|
||||||
MinecraftForge.EVENT_BUS.register(instance);
|
MinecraftForge.EVENT_BUS.register(instance);
|
||||||
|
MinecraftForge.EVENT_BUS.register(new GuiCraftingTree.EventHandler());
|
||||||
|
|
||||||
API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
|
API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
|
||||||
HUDRenderer.load();
|
HUDRenderer.load();
|
||||||
@@ -218,54 +288,60 @@ public class ClientHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void postInit() {
|
public static void postInit() {
|
||||||
loadHandlerOrdering();
|
GuiContainerManager.registerReloadResourceListener();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadHandlerOrdering() {
|
public static void loadHandlerOrdering() {
|
||||||
File file = NEIClientConfig.handlerOrderingFile;
|
final String COMMA_DELIMITER = ",";
|
||||||
if (!file.exists()) {
|
final String[] defaultHandlerOrdering = {
|
||||||
try (FileWriter writer = new FileWriter(file)) {
|
"# Each line in this file should either be a comment (starts with '#') or an ordering.",
|
||||||
NEIClientConfig.logger.info("Creating default handler ordering CSV {}", file);
|
"# Ordering lines are <handler ID>,<ordering number>.",
|
||||||
|
"# Handlers will be sorted in order of number ascending, so smaller numbers first.",
|
||||||
List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
|
"# Any handlers that are missing from this file will be assigned to 0.", "# Negative numbers are fine.",
|
||||||
GuiRecipeTab.handlerMap.keySet().stream()
|
"# If you delete this file, it will be regenerated with all registered handler IDs.", };
|
||||||
.sorted()
|
|
||||||
.forEach(handlerId -> toWrite.add(String.format("%s,0", handlerId)));
|
|
||||||
|
|
||||||
|
loadSettingsFile("handlerordering.csv", (file, writer) -> {
|
||||||
|
List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
|
||||||
|
GuiRecipeTab.handlerMap.keySet().stream().sorted()
|
||||||
|
.forEach(handlerId -> toWrite.add(String.format("%s" + COMMA_DELIMITER + "0", handlerId)));
|
||||||
|
try {
|
||||||
IOUtils.writeLines(toWrite, "\n", writer);
|
IOUtils.writeLines(toWrite, "\n", writer);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {}
|
||||||
NEIClientConfig.logger.error("Failed to save default handler ordering to file {}", file, e);
|
}, lines -> lines.map(line -> line.split(COMMA_DELIMITER)).filter(parts -> parts.length == 2).forEach(parts -> {
|
||||||
}
|
String handlerId = parts[0];
|
||||||
}
|
int ordering = Integer.parseInt(parts[1]);
|
||||||
|
NEIClientConfig.handlerOrdering.put(handlerId, ordering);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
URL url;
|
public static void loadPluginsList() {
|
||||||
try {
|
final boolean jarjar = Launch.blackboard.getOrDefault("jarjar.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
|
||||||
url = file.toURI().toURL();
|
if (!jarjar) {
|
||||||
} catch (MalformedURLException e) {
|
// Do the old style class discovery
|
||||||
NEIClientConfig.logger.info("Invalid URL for handler ordering CSV.");
|
final ClassDiscoverer classDiscoverer = new ClassDiscoverer(
|
||||||
e.printStackTrace();
|
test -> test.startsWith("NEI") && test.endsWith("Config.class"),
|
||||||
return;
|
IConfigureNEI.class);
|
||||||
}
|
|
||||||
|
|
||||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()))) {
|
NEIClientConfig.pluginsList.addAll(classDiscoverer.findClasses());
|
||||||
NEIClientConfig.logger.info("Loading handler ordering from file {}", file);
|
NEIClientConfig.logger
|
||||||
CSVParser csvParser = CSVFormat.EXCEL.withCommentMarker('#').parse(reader);
|
.info("Loading NEI Plugins via ClassDiscoverer: " + NEIClientConfig.pluginsList.size());
|
||||||
for (CSVRecord record : csvParser) {
|
|
||||||
final String handlerId = record.get(0);
|
|
||||||
|
|
||||||
int ordering;
|
} else {
|
||||||
|
// If JarJar's loaded, the ASMDataTable now includes interfaces in addition to Annotations, so use that
|
||||||
|
// instead Includes a small change in behavior of no longer requiring the class to start with NEI and end
|
||||||
|
// with Config; This could easily be changed if desired, but the previous behavior was likely to speed
|
||||||
|
// things up by limiting the scope when looking at all of the jars and classes in the classpath.
|
||||||
|
final ASMDataTable dataTable = NEIModContainer.getAsmDataTable();
|
||||||
|
final ModClassLoader modClassLoader = (ModClassLoader) Loader.instance().getModClassLoader();
|
||||||
|
for (ASMDataTable.ASMData asmData : dataTable.getAll(IConfigureNEI.class.getName().replace('.', '/'))) {
|
||||||
|
final String className = asmData.getClassName().replace('/', '.');
|
||||||
try {
|
try {
|
||||||
ordering = Integer.parseInt(record.get(1));
|
NEIClientConfig.pluginsList.add(Class.forName(className, true, modClassLoader));
|
||||||
} catch (NumberFormatException e) {
|
} catch (ClassNotFoundException e) {
|
||||||
NEIClientConfig.logger.error("Error parsing CSV record {}: {}", record, e);
|
NEIClientConfig.logger.error("Failed to load plugin class {}", className, e);
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NEIClientConfig.handlerOrdering.put(handlerId, ordering);
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
NEIClientConfig.logger.info("Loading NEI Plugins via JarJar: " + NEIClientConfig.pluginsList.size());
|
||||||
NEIClientConfig.logger.info("Error parsing CSV");
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -279,24 +355,30 @@ public class ClientHandler {
|
|||||||
|
|
||||||
if (!NEIClientConfig.isEnabled()) return;
|
if (!NEIClientConfig.isEnabled()) return;
|
||||||
|
|
||||||
KeyManager.tickKeyStates();
|
/*
|
||||||
|
* NEI plugins are loaded in a separate thread. Make sure loading them has finished otherwise a CME might
|
||||||
|
* occur in KeyManager if a plugin calls API.addKeyBind() during initialization.
|
||||||
|
*/
|
||||||
|
if (NEIClientConfig.isLoaded()) KeyManager.tickKeyStates();
|
||||||
|
|
||||||
NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
|
NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
|
||||||
if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
|
if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
|
||||||
|
|
||||||
updateMagnetMode(mc.theWorld, mc.thePlayer);
|
updateMagnetMode(mc.theWorld, mc.thePlayer);
|
||||||
|
} else {
|
||||||
|
lastworld = null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
GuiScreen gui = mc.currentScreen;
|
@SubscribeEvent
|
||||||
if (gui != lastGui) {
|
public void onGuiScreen(GuiOpenEvent event) {
|
||||||
if (gui instanceof GuiMainMenu) lastworld = null;
|
if (event.gui instanceof GuiSelectWorld) {
|
||||||
else if (gui instanceof GuiSelectWorld) NEIClientConfig.reloadSaves();
|
NEIClientConfig.reloadSaves();
|
||||||
else if (gui == null) {
|
} else if (event.gui == null) {
|
||||||
/* prevent WorldClient reference being held in the Gui */
|
/* prevent WorldClient reference being held in the Gui */
|
||||||
NEIController.manager = null;
|
NEIController.manager = null;
|
||||||
}
|
GuiInfo.clearGuiHandlers();
|
||||||
}
|
}
|
||||||
lastGui = gui;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
@@ -309,21 +391,29 @@ public class ClientHandler {
|
|||||||
if (NEIClientConfig.isEnabled()) WorldOverlayRenderer.render(event.partialTicks);
|
if (NEIClientConfig.isEnabled()) WorldOverlayRenderer.render(event.partialTicks);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
@SubscribeEvent
|
||||||
|
public void onWorldUnload(WorldEvent.Unload event) {
|
||||||
|
Minecraft mc = Minecraft.getMinecraft();
|
||||||
|
if (event.world == mc.theWorld) {
|
||||||
|
NEIClientConfig.unloadWorld();
|
||||||
|
ItemMobSpawner.clearEntityReferences();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void loadWorld(World world, boolean fromServer) {
|
public void loadWorld(World world, boolean fromServer) {
|
||||||
if (world != lastworld) {
|
if (world != lastworld) {
|
||||||
SMPmagneticItems.clear();
|
SMPmagneticItems.clear();
|
||||||
WorldOverlayRenderer.reset();
|
if (!NEIClientConfig.getBooleanSetting("world.overlays.lock")) {
|
||||||
|
WorldOverlayRenderer.reset();
|
||||||
|
}
|
||||||
if (!fromServer) {
|
if (!fromServer) {
|
||||||
NEIClientConfig.setHasSMPCounterPart(false);
|
NEIClientConfig.setHasSMPCounterPart(false);
|
||||||
NEIClientConfig.setInternalEnabled(false);
|
NEIClientConfig.setInternalEnabled(false);
|
||||||
|
|
||||||
if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
|
if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
|
||||||
NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
|
NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
|
||||||
|
|
||||||
ItemMobSpawner.clearEntityReferences(world);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lastworld = world;
|
lastworld = world;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -334,6 +424,7 @@ public class ClientHandler {
|
|||||||
|
|
||||||
public static RuntimeException throwCME(final String message) {
|
public static RuntimeException throwCME(final String message) {
|
||||||
final GuiScreen errorGui = new GuiErrorScreen(null, null) {
|
final GuiScreen errorGui = new GuiErrorScreen(null, null) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handleMouseInput() {}
|
public void handleMouseInput() {}
|
||||||
|
|
||||||
@@ -349,19 +440,17 @@ public class ClientHandler {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@SuppressWarnings("serial")
|
|
||||||
CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
|
CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = -5593387489666663375L;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
|
public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
|
||||||
Minecraft.getMinecraft().displayGuiScreen(errorGui);
|
Minecraft.getMinecraft().displayGuiScreen(errorGui);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen(
|
public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY,
|
||||||
GuiErrorScreen errorScreen,
|
|
||||||
FontRenderer fontRenderer,
|
|
||||||
int mouseRelX,
|
|
||||||
int mouseRelY,
|
|
||||||
float tickTime) {}
|
float tickTime) {}
|
||||||
};
|
};
|
||||||
throw e;
|
throw e;
|
||||||
|
|||||||
@@ -0,0 +1,252 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTBase;
|
||||||
|
import net.minecraft.nbt.NBTBase.NBTPrimitive;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
|
import com.google.gson.JsonParser;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
|
||||||
|
import codechicken.nei.ItemList.AnyMultiItemFilter;
|
||||||
|
import codechicken.nei.ItemList.EverythingItemFilter;
|
||||||
|
import codechicken.nei.ItemList.NothingItemFilter;
|
||||||
|
import codechicken.nei.PresetsList.Preset;
|
||||||
|
import codechicken.nei.PresetsList.PresetMode;
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.util.ItemStackFilterParser;
|
||||||
|
|
||||||
|
public class CollapsibleItems {
|
||||||
|
|
||||||
|
protected static class GroupItem {
|
||||||
|
|
||||||
|
public String guid;
|
||||||
|
public ItemFilter filter;
|
||||||
|
public boolean expanded = false;
|
||||||
|
public String displayName = "";
|
||||||
|
|
||||||
|
public void setFilter(String filter) {
|
||||||
|
this.filter = ItemStackFilterParser.parse(filter.trim());
|
||||||
|
this.guid = this.filter != null ? UUID.nameUUIDFromBytes(filter.getBytes()).toString() : "";
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFilter(ItemFilter filter, String guid) {
|
||||||
|
this.filter = filter;
|
||||||
|
this.guid = guid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean matches(ItemStack stack) {
|
||||||
|
return this.filter.matches(stack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final String STATE_KEY = "collapsibleitems";
|
||||||
|
|
||||||
|
protected static File statesFile;
|
||||||
|
protected static final List<GroupItem> groups = new ArrayList<>();
|
||||||
|
protected static final Map<ItemStack, Integer> cache = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
|
private CollapsibleItems() {}
|
||||||
|
|
||||||
|
public static void load() {
|
||||||
|
CollapsibleItems.groups.clear();
|
||||||
|
CollapsibleItems.cache.clear();
|
||||||
|
|
||||||
|
for (int i = PresetsList.presets.size() - 1; i >= 0; i--) {
|
||||||
|
Preset preset = PresetsList.presets.get(i);
|
||||||
|
if (preset.enabled && preset.mode == PresetMode.GROUP) {
|
||||||
|
GroupItem group = new GroupItem();
|
||||||
|
group.setFilter(preset, UUID.nameUUIDFromBytes(preset.items.toString().getBytes()).toString());
|
||||||
|
group.displayName = preset.name;
|
||||||
|
addGroup(group);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.enableCollapsibleItems()) {
|
||||||
|
ClientHandler.loadSettingsFile(
|
||||||
|
"collapsibleitems.cfg",
|
||||||
|
lines -> parseFile(lines.collect(Collectors.toCollection(ArrayList::new))));
|
||||||
|
}
|
||||||
|
|
||||||
|
loadStates();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void parseFile(List<String> itemStrings) {
|
||||||
|
final JsonParser parser = new JsonParser();
|
||||||
|
GroupItem group = new GroupItem();
|
||||||
|
|
||||||
|
for (String itemStr : itemStrings) {
|
||||||
|
try {
|
||||||
|
|
||||||
|
if (itemStr.startsWith("; ")) {
|
||||||
|
JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
|
||||||
|
|
||||||
|
if (settings.get("displayName") != null) {
|
||||||
|
group.displayName = settings.get("displayName").getAsString();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.get("unlocalizedName") != null) {
|
||||||
|
String unlocalizedName = settings.get("unlocalizedName").getAsString();
|
||||||
|
String displayName = StatCollector.translateToLocal(unlocalizedName);
|
||||||
|
|
||||||
|
if (!displayName.equals(unlocalizedName)) {
|
||||||
|
group.displayName = displayName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.get("expanded") != null) {
|
||||||
|
group.expanded = settings.get("expanded").getAsBoolean();
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
group.setFilter(itemStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (group.filter != null) {
|
||||||
|
addGroup(group);
|
||||||
|
group = new GroupItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load collapsible items from json string:\n{}", itemStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void addGroup(GroupItem group) {
|
||||||
|
if (group == null || group.filter == null
|
||||||
|
|| group.filter instanceof EverythingItemFilter
|
||||||
|
|| group.filter instanceof NothingItemFilter)
|
||||||
|
return;
|
||||||
|
CollapsibleItems.groups.add(group);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isEmpty() {
|
||||||
|
return CollapsibleItems.groups.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemFilter getItemFilter() {
|
||||||
|
AnyMultiItemFilter filter = new AnyMultiItemFilter();
|
||||||
|
|
||||||
|
for (GroupItem group : CollapsibleItems.groups) {
|
||||||
|
filter.filters.add(group.filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
return filter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void clearCache() {
|
||||||
|
CollapsibleItems.cache.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void putItem(ItemStack stack) {
|
||||||
|
int groupIndex = -1;
|
||||||
|
|
||||||
|
for (int i = 0; i < CollapsibleItems.groups.size() && groupIndex == -1; i++) {
|
||||||
|
if (CollapsibleItems.groups.get(i).matches(stack)) {
|
||||||
|
groupIndex = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (groupIndex != -1) {
|
||||||
|
CollapsibleItems.cache.put(stack, groupIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getGroupIndex(ItemStack stack) {
|
||||||
|
|
||||||
|
if (stack == null) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return CollapsibleItems.cache.getOrDefault(stack, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getDisplayName(int groupIndex) {
|
||||||
|
|
||||||
|
if (groupIndex < CollapsibleItems.groups.size()) {
|
||||||
|
return CollapsibleItems.groups.get(groupIndex).displayName;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isExpanded(int groupIndex) {
|
||||||
|
|
||||||
|
if (groupIndex < CollapsibleItems.groups.size()) {
|
||||||
|
return CollapsibleItems.groups.get(groupIndex).expanded;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setExpanded(int groupIndex, boolean expanded) {
|
||||||
|
|
||||||
|
if (groupIndex < CollapsibleItems.groups.size()) {
|
||||||
|
CollapsibleItems.groups.get(groupIndex).expanded = expanded;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void toggleGroups(Boolean expanded) {
|
||||||
|
|
||||||
|
if (expanded == null) {
|
||||||
|
expanded = CollapsibleItems.groups.stream().noneMatch(g -> g.expanded);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (GroupItem group : CollapsibleItems.groups) {
|
||||||
|
group.expanded = expanded;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void saveStates() {
|
||||||
|
NBTTagCompound list = new NBTTagCompound();
|
||||||
|
|
||||||
|
for (GroupItem group : CollapsibleItems.groups) {
|
||||||
|
list.setBoolean(group.guid, group.expanded);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.world != null) {
|
||||||
|
NEIClientConfig.world.nbt.setTag(STATE_KEY, list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadStates() {
|
||||||
|
|
||||||
|
try {
|
||||||
|
|
||||||
|
if (NEIClientConfig.world.nbt.hasKey(STATE_KEY)) {
|
||||||
|
NBTTagCompound states = NEIClientConfig.world.nbt.getCompoundTag(STATE_KEY);
|
||||||
|
final Map<String, NBTBase> list = states.tagMap;
|
||||||
|
final Map<String, GroupItem> mapping = new HashMap<>();
|
||||||
|
|
||||||
|
for (GroupItem group : CollapsibleItems.groups) {
|
||||||
|
mapping.put(group.guid, group);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Map.Entry<String, NBTBase> nbtEntry : list.entrySet()) {
|
||||||
|
if (mapping.containsKey(nbtEntry.getKey())) {
|
||||||
|
mapping.get(nbtEntry.getKey()).expanded = ((NBTPrimitive) nbtEntry.getValue()).func_150290_f()
|
||||||
|
== 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger.error("Error loading collapsible items states", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import com.gtnewhorizon.gtnhlib.color.ColorResource;
|
||||||
|
|
||||||
|
public class ColorUtils {
|
||||||
|
|
||||||
|
private static final ColorResource.Factory color = new ColorResource.Factory("nei");
|
||||||
|
|
||||||
|
public static final ColorResource
|
||||||
|
// spotless:off
|
||||||
|
textGray = color.rgb("textGray", "0x404040"),
|
||||||
|
textLightGray = color.rgb("textLightGray", "0x606060"),
|
||||||
|
recipeTitle = color.rgb("recipeTitle", "0xFFFFFF"),
|
||||||
|
recipeTitleHover = color.rgb("recipeTitleHover", "0xFFFF55"),
|
||||||
|
subsetWidget = color.rgb("subsetWidget", "0xAA00AA"),
|
||||||
|
recipeBadge = color.rgb("recipeBadge", "0xFDD835"),
|
||||||
|
buttonLabelNormal = color.rgb("buttonLabelNormal", "0xE0E0E0"),
|
||||||
|
buttonLabelHover = color.rgb("buttonLabelHover", "0xFFFFA0"),
|
||||||
|
buttonLabelDisabled = color.rgb("buttonLabelDisabled", "0x601010"),
|
||||||
|
buttonLabelInactive = color.rgb("buttonLabelInactive", "0xA0A0A0"),
|
||||||
|
|
||||||
|
craftingTreeLine = color.argb("craftingTreeLine", "0xFF888888");
|
||||||
|
// spotless:on
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.awt.Dimension;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
|
||||||
|
|
||||||
|
public abstract class CompositeTooltipLineHandler implements ITooltipLineHandler {
|
||||||
|
|
||||||
|
protected static final int SCREEN_MARGIN = 8 * 2 + 10;
|
||||||
|
protected static final int RESERVED_HEIGHT = 40;
|
||||||
|
|
||||||
|
protected final List<ItemsTooltipLineHandler> lines = new ArrayList<>();
|
||||||
|
protected final Dimension size = new Dimension();
|
||||||
|
|
||||||
|
protected boolean created = false;
|
||||||
|
protected int screenHeight = 0;
|
||||||
|
|
||||||
|
protected abstract void createLines();
|
||||||
|
|
||||||
|
protected boolean needsUpdate() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Dimension getSize() {
|
||||||
|
ensureCreated();
|
||||||
|
return this.size;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int x, int y) {
|
||||||
|
if (this.size.height == 0) return;
|
||||||
|
|
||||||
|
for (ItemsTooltipLineHandler line : this.lines) {
|
||||||
|
line.draw(x, y);
|
||||||
|
y += line.getSize().height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void ensureCreated() {
|
||||||
|
boolean update = needsUpdate();
|
||||||
|
update = this.screenHeight != (this.screenHeight = GuiDraw.displaySize().height) || update;
|
||||||
|
|
||||||
|
if (this.created && !update) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.created = true;
|
||||||
|
this.lines.clear();
|
||||||
|
this.size.setSize(0, 0);
|
||||||
|
|
||||||
|
createLines();
|
||||||
|
fitToScreen();
|
||||||
|
|
||||||
|
for (ItemsTooltipLineHandler line : this.lines) {
|
||||||
|
this.size.width = Math.max(this.size.width, line.getSize().width);
|
||||||
|
this.size.height += line.getSize().height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void fitToScreen() {
|
||||||
|
if (this.lines.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<ItemsTooltipLineHandler> ordered = new ArrayList<>(this.lines);
|
||||||
|
ordered.sort(Comparator.comparingInt(ItemsTooltipLineHandler::getRows));
|
||||||
|
|
||||||
|
int budget = availableHeight() / ItemsTooltipLineHandler.SLOT_SIZE;
|
||||||
|
int rest = ordered.size();
|
||||||
|
|
||||||
|
for (ItemsTooltipLineHandler line : ordered) {
|
||||||
|
final int fair = Math.max(1, budget / rest);
|
||||||
|
|
||||||
|
if (line.getRows() > fair) {
|
||||||
|
line.setMaxRows(fair);
|
||||||
|
}
|
||||||
|
|
||||||
|
budget -= line.getRows();
|
||||||
|
rest--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int availableHeight() {
|
||||||
|
return GuiDraw.displaySize().height - SCREEN_MARGIN
|
||||||
|
- RESERVED_HEIGHT
|
||||||
|
- this.lines.size() * ItemsTooltipLineHandler.headerHeight();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static int maxLineRows() {
|
||||||
|
final int height = GuiDraw.displaySize().height - SCREEN_MARGIN
|
||||||
|
- RESERVED_HEIGHT
|
||||||
|
- ItemsTooltipLineHandler.headerHeight();
|
||||||
|
return Math.max(1, height / ItemsTooltipLineHandler.SLOT_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
@@ -11,8 +9,13 @@ import net.minecraft.item.ItemArmor;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class ContainerCreativeInv extends Container {
|
public class ContainerCreativeInv extends Container {
|
||||||
|
|
||||||
private class SlotArmor extends Slot {
|
private class SlotArmor extends Slot {
|
||||||
|
|
||||||
final int armorType;
|
final int armorType;
|
||||||
|
|
||||||
public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
|
public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
|
||||||
@@ -38,14 +41,15 @@ public class ContainerCreativeInv extends Container {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private class SlotBlockArmor extends SlotArmor {
|
private class SlotBlockArmor extends SlotArmor {
|
||||||
|
|
||||||
public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
|
public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
|
||||||
super(inv, x, y, slot, armor);
|
super(inv, x, y, slot, armor);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isItemValid(ItemStack stack) {
|
public boolean isItemValid(ItemStack stack) {
|
||||||
return super.isItemValid(stack)
|
return super.isItemValid(stack) || stack != null; // && Block.getBlockFromItem(stack.getItem()) !=
|
||||||
|| stack != null; // && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
|
// Blocks.air;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,33 +58,34 @@ public class ContainerCreativeInv extends Container {
|
|||||||
public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
|
public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
|
||||||
this.player = player;
|
this.player = player;
|
||||||
InventoryPlayer invPlayer = player.inventory;
|
InventoryPlayer invPlayer = player.inventory;
|
||||||
for (int row = 0; row < 6; row++)
|
for (int row = 0; row < 6; row++) for (int col = 0; col < 9; col++)
|
||||||
for (int col = 0; col < 9; col++)
|
addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
|
||||||
addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
|
|
||||||
|
|
||||||
for (int row = 0; row < 3; ++row)
|
for (int row = 0; row < 3; ++row) for (int col = 0; col < 9; ++col)
|
||||||
for (int col = 0; col < 9; ++col)
|
addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
|
||||||
addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
|
|
||||||
|
|
||||||
for (int col = 0; col < 9; ++col) addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
|
for (int col = 0; col < 9; ++col) addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
|
||||||
|
|
||||||
addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
|
addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
|
||||||
for (int armorType = 1; armorType < 4; armorType++)
|
for (int armorType = 1; armorType < 4; armorType++) addSlotToContainer(
|
||||||
addSlotToContainer(new SlotArmor(
|
new SlotArmor(
|
||||||
invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
|
invPlayer,
|
||||||
|
invPlayer.getSizeInventory() - 1 - armorType,
|
||||||
|
-15,
|
||||||
|
23 + armorType * 18,
|
||||||
|
armorType));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slotIndex) {
|
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slotIndex) {
|
||||||
ItemStack transferredStack = null;
|
ItemStack transferredStack = null;
|
||||||
Slot slot = (Slot) inventorySlots.get(slotIndex);
|
Slot slot = inventorySlots.get(slotIndex);
|
||||||
|
|
||||||
if (slot != null && slot.getHasStack()) {
|
if (slot != null && slot.getHasStack()) {
|
||||||
ItemStack stack = slot.getStack();
|
ItemStack stack = slot.getStack();
|
||||||
transferredStack = stack.copy();
|
transferredStack = stack.copy();
|
||||||
|
|
||||||
if (stack.getItem() instanceof ItemArmor) {
|
if (stack.getItem() instanceof ItemArmor armor) {
|
||||||
ItemArmor armor = (ItemArmor) stack.getItem();
|
|
||||||
if (!getSlot(90 + armor.armorType).getHasStack()) {
|
if (!getSlot(90 + armor.armorType).getHasStack()) {
|
||||||
getSlot(90 + armor.armorType).putStack(transferredStack);
|
getSlot(90 + armor.armorType).putStack(transferredStack);
|
||||||
slot.putStack(null);
|
slot.putStack(null);
|
||||||
|
|||||||
@@ -1,25 +1,29 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.render.CCRenderState;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import net.minecraft.client.gui.Gui;
|
import net.minecraft.client.gui.Gui;
|
||||||
import net.minecraft.enchantment.Enchantment;
|
import net.minecraft.enchantment.Enchantment;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.ContainerEnchantment;
|
import net.minecraft.inventory.ContainerEnchantment;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.lib.render.CCRenderState;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is crap code, don't ever do this.
|
* This is crap code, don't ever do this.
|
||||||
*/
|
*/
|
||||||
public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
||||||
|
|
||||||
public static class EnchantmentHash {
|
public static class EnchantmentHash {
|
||||||
|
|
||||||
public EnchantmentHash(Enchantment e, int i, int l) {
|
public EnchantmentHash(Enchantment e, int i, int l) {
|
||||||
enchantment = e;
|
enchantment = e;
|
||||||
state = i;
|
state = i;
|
||||||
@@ -101,9 +105,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
int barempty = height - getScrollBarHeight();
|
int barempty = height - getScrollBarHeight();
|
||||||
int sbary = rely + (int) (barempty * percentscrolled + 0.5);
|
int sbary = rely + (int) (barempty * percentscrolled + 0.5);
|
||||||
|
|
||||||
if (button == 0
|
if (button == 0 && getScrollBarHeight() < height && // the scroll bar can move (not full length)
|
||||||
&& getScrollBarHeight() < height
|
|
||||||
&& // the scroll bar can move (not full length)
|
|
||||||
mousex >= relx + cwidth
|
mousex >= relx + cwidth
|
||||||
&& mousex < relx + cwidth + getScrollBarWidth()
|
&& mousex < relx + cwidth + getScrollBarWidth()
|
||||||
&& mousey >= rely
|
&& mousey >= rely
|
||||||
@@ -161,14 +163,14 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
|
|
||||||
public boolean addEnchantment(int e, int level) {
|
public boolean addEnchantment(int e, int level) {
|
||||||
if (e < Enchantment.enchantmentsList.length && Enchantment.enchantmentsList[e] != null) {
|
if (e < Enchantment.enchantmentsList.length && Enchantment.enchantmentsList[e] != null) {
|
||||||
((Slot) inventorySlots.get(0)).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
|
inventorySlots.get(0).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removeEnchantment(int e) {
|
public void removeEnchantment(int e) {
|
||||||
ItemStack stack = ((Slot) inventorySlots.get(0)).getStack();
|
ItemStack stack = inventorySlots.get(0).getStack();
|
||||||
NBTTagList nbttaglist = stack.getEnchantmentTagList();
|
NBTTagList nbttaglist = stack.getEnchantmentTagList();
|
||||||
if (nbttaglist != null) {
|
if (nbttaglist != null) {
|
||||||
for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
||||||
@@ -217,10 +219,10 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
if (NEIServerUtils.stackHasEnchantment(toolstack, e.effectId)) {
|
if (NEIServerUtils.stackHasEnchantment(toolstack, e.effectId)) {
|
||||||
state = 2;
|
state = 2;
|
||||||
level = NEIServerUtils.getEnchantmentLevel(toolstack, e.effectId);
|
level = NEIServerUtils.getEnchantmentLevel(toolstack, e.effectId);
|
||||||
} else if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e)
|
} else
|
||||||
&& validate) {
|
if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e) && validate) {
|
||||||
state = 1;
|
state = 1;
|
||||||
}
|
}
|
||||||
slotEnchantment.add(new EnchantmentHash(e, state, level));
|
slotEnchantment.add(new EnchantmentHash(e, state, level));
|
||||||
}
|
}
|
||||||
if (numoptions != slotEnchantment.size()) {
|
if (numoptions != slotEnchantment.size()) {
|
||||||
@@ -255,7 +257,12 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
GL11.glColor3f(1, 1, 1);
|
GL11.glColor3f(1, 1, 1);
|
||||||
if (hasScrollBar()) {
|
if (hasScrollBar()) {
|
||||||
gui.drawTexturedModalRect(
|
gui.drawTexturedModalRect(
|
||||||
relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth - 30, slotheight);
|
relx,
|
||||||
|
rely + slot * slotheight,
|
||||||
|
0,
|
||||||
|
gui.ySize + slotheight * shade,
|
||||||
|
cwidth - 30,
|
||||||
|
slotheight);
|
||||||
gui.drawTexturedModalRect(
|
gui.drawTexturedModalRect(
|
||||||
relx + cwidth - 30,
|
relx + cwidth - 30,
|
||||||
rely + slot * slotheight,
|
rely + slot * slotheight,
|
||||||
@@ -265,7 +272,12 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
slotheight);
|
slotheight);
|
||||||
} else {
|
} else {
|
||||||
gui.drawTexturedModalRect(
|
gui.drawTexturedModalRect(
|
||||||
relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth + 7, slotheight);
|
relx,
|
||||||
|
rely + slot * slotheight,
|
||||||
|
0,
|
||||||
|
gui.ySize + slotheight * shade,
|
||||||
|
cwidth + 7,
|
||||||
|
slotheight);
|
||||||
}
|
}
|
||||||
|
|
||||||
gui.getFontRenderer().drawString(text, relx + 4, rely + slot * slotheight + 5, textColourFromState(shade));
|
gui.getFontRenderer().drawString(text, relx + 4, rely + slot * slotheight + 5, textColourFromState(shade));
|
||||||
@@ -284,12 +296,8 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
|
|||||||
|
|
||||||
Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020); // background
|
Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020); // background
|
||||||
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B); // corners
|
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B); // corners
|
||||||
Gui.drawRect(
|
Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFFF0F0F0); // topleft
|
||||||
sbarx,
|
// up
|
||||||
sbary,
|
|
||||||
sbarx + getScrollBarWidth() - 1,
|
|
||||||
sbary + getScrollBarHeight() - 1,
|
|
||||||
0xFFF0F0F0); // topleft up
|
|
||||||
Gui.drawRect(
|
Gui.drawRect(
|
||||||
sbarx + 1,
|
sbarx + 1,
|
||||||
sbary + 1,
|
sbary + 1,
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.inventory.ContainerExtended;
|
|
||||||
import codechicken.lib.inventory.InventoryNBT;
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import codechicken.lib.inventory.SlotHandleClicks;
|
|
||||||
import codechicken.lib.packet.PacketCustom;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
@@ -16,8 +11,16 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.potion.PotionEffect;
|
import net.minecraft.potion.PotionEffect;
|
||||||
|
|
||||||
|
import codechicken.lib.inventory.ContainerExtended;
|
||||||
|
import codechicken.lib.inventory.InventoryNBT;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.inventory.SlotHandleClicks;
|
||||||
|
import codechicken.lib.packet.PacketCustom;
|
||||||
|
|
||||||
public class ContainerPotionCreator extends ContainerExtended {
|
public class ContainerPotionCreator extends ContainerExtended {
|
||||||
|
|
||||||
public class SlotPotion extends Slot {
|
public class SlotPotion extends Slot {
|
||||||
|
|
||||||
public SlotPotion(IInventory inv, int slotIndex, int x, int y) {
|
public SlotPotion(IInventory inv, int slotIndex, int x, int y) {
|
||||||
super(inv, slotIndex, x, y);
|
super(inv, slotIndex, x, y);
|
||||||
}
|
}
|
||||||
@@ -40,6 +43,7 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public class SlotPotionStore extends SlotHandleClicks {
|
public class SlotPotionStore extends SlotHandleClicks {
|
||||||
|
|
||||||
public SlotPotionStore(IInventory inv, int slotIndex, int x, int y) {
|
public SlotPotionStore(IInventory inv, int slotIndex, int x, int y) {
|
||||||
super(inv, slotIndex, x, y);
|
super(inv, slotIndex, x, y);
|
||||||
}
|
}
|
||||||
@@ -68,6 +72,7 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class InventoryPotionStore extends InventoryNBT {
|
public static class InventoryPotionStore extends InventoryNBT {
|
||||||
|
|
||||||
public InventoryPotionStore() {
|
public InventoryPotionStore() {
|
||||||
super(9, NEIClientConfig.global.nbt.getCompoundTag("potionStore"));
|
super(9, NEIClientConfig.global.nbt.getCompoundTag("potionStore"));
|
||||||
}
|
}
|
||||||
@@ -76,7 +81,6 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
public void markDirty() {
|
public void markDirty() {
|
||||||
super.markDirty();
|
super.markDirty();
|
||||||
NEIClientConfig.global.nbt.setTag("potionStore", tag);
|
NEIClientConfig.global.nbt.setTag("potionStore", tag);
|
||||||
NEIClientConfig.global.saveNBT();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -112,7 +116,6 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
if (!player.worldObj.isRemote) InventoryUtils.dropOnClose(player, potionInv);
|
if (!player.worldObj.isRemote) InventoryUtils.dropOnClose(player, potionInv);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Override
|
@Override
|
||||||
public void handleServerPacket(PacketCustom packet) {
|
public void handleServerPacket(PacketCustom packet) {
|
||||||
ItemStack potion = potionInv.getStackInSlot(0);
|
ItemStack potion = potionInv.getStackInSlot(0);
|
||||||
@@ -128,9 +131,9 @@ public class ContainerPotionCreator extends ContainerExtended {
|
|||||||
PotionEffect e = PotionEffect.readCustomPotionEffectFromNBT(tag);
|
PotionEffect e = PotionEffect.readCustomPotionEffectFromNBT(tag);
|
||||||
if (e.getPotionID() != effectID) newEffects.appendTag(tag);
|
if (e.getPotionID() != effectID) newEffects.appendTag(tag);
|
||||||
}
|
}
|
||||||
if (add)
|
if (add) newEffects.appendTag(
|
||||||
newEffects.appendTag(new PotionEffect(effectID, packet.readInt(), packet.readUByte())
|
new PotionEffect(effectID, packet.readInt(), packet.readUByte())
|
||||||
.writeCustomPotionEffectToNBT(new NBTTagCompound()));
|
.writeCustomPotionEffectToNBT(new NBTTagCompound()));
|
||||||
potion.getTagCompound().setTag("CustomPotionEffects", newEffects);
|
potion.getTagCompound().setTag("CustomPotionEffects", newEffects);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.nei.api.IBookmarkContainerHandler;
|
||||||
|
|
||||||
|
public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList<ItemStack> bookmarkItems) {
|
||||||
|
final List<Slot> slots = guiContainer.inventorySlots.inventorySlots;
|
||||||
|
final FastTransferManager manager = new FastTransferManager();
|
||||||
|
|
||||||
|
for (ItemStack bookmarkItem : bookmarkItems) {
|
||||||
|
for (int i = 0; i < slots.size() - 4 * 9; i++) {
|
||||||
|
final Slot slot = slots.get(i);
|
||||||
|
if (slot.getHasStack() && bookmarkItem.isItemEqual(slot.getStack())) {
|
||||||
|
final int transferAmount = Math.min(bookmarkItem.stackSize, slot.getStack().stackSize);
|
||||||
|
manager.transferItems(guiContainer, i, transferAmount);
|
||||||
|
bookmarkItem.stackSize -= transferAmount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,32 +1,29 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.api.IHighlightHandler;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.MovingObjectPosition;
|
import net.minecraft.util.MovingObjectPosition;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
import codechicken.nei.api.IHighlightHandler;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
|
||||||
public class DefaultHighlightHandler implements IHighlightHandler {
|
public class DefaultHighlightHandler implements IHighlightHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> handleTextData(
|
public List<String> handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop,
|
||||||
ItemStack stack,
|
List<String> currenttip, ItemInfo.Layout layout) {
|
||||||
World world,
|
|
||||||
EntityPlayer player,
|
|
||||||
MovingObjectPosition mop,
|
|
||||||
List<String> currenttip,
|
|
||||||
ItemInfo.Layout layout) {
|
|
||||||
String name = null;
|
String name = null;
|
||||||
try {
|
try {
|
||||||
String s = GuiContainerManager.itemDisplayNameShort(stack);
|
String s = GuiContainerManager.itemDisplayNameShort(stack);
|
||||||
if (s != null && !s.endsWith("Unnamed")) name = s;
|
if (!s.endsWith("Unnamed")) name = s;
|
||||||
|
|
||||||
if (name != null) currenttip.add(name);
|
if (name != null) currenttip.add(name);
|
||||||
} catch (Exception ignored) {
|
} catch (Exception ignored) {}
|
||||||
}
|
|
||||||
|
|
||||||
if (name != null && stack.getItem() == Items.redstone) {
|
if (name != null && stack.getItem() == Items.redstone) {
|
||||||
int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ);
|
int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ);
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
|
|
||||||
public class DoubleFilteredFilter implements ItemFilter {
|
|
||||||
private ItemFilter filter;
|
|
||||||
private ItemList.PatternItemFilter patternFilter;
|
|
||||||
|
|
||||||
public DoubleFilteredFilter(ItemFilter filter, String itemFilter) {
|
|
||||||
this.filter = filter;
|
|
||||||
this.patternFilter = new ItemList.PatternItemFilter(SearchField.getPattern(itemFilter));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean matches(ItemStack item) {
|
|
||||||
if (filter.matches(item)) {
|
|
||||||
return patternFilter.matches(item);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
|
||||||
public class ExtendedCreativeInv implements IInventory {
|
public class ExtendedCreativeInv implements IInventory {
|
||||||
|
|
||||||
final PlayerSave playerSave;
|
final PlayerSave playerSave;
|
||||||
final Side side;
|
final Side side;
|
||||||
|
|
||||||
|
|||||||
@@ -4,21 +4,27 @@ import static codechicken.nei.NEIServerUtils.areStacksIdentical;
|
|||||||
import static codechicken.nei.NEIServerUtils.areStacksSameType;
|
import static codechicken.nei.NEIServerUtils.areStacksSameType;
|
||||||
import static codechicken.nei.NEIServerUtils.copyStack;
|
import static codechicken.nei.NEIServerUtils.copyStack;
|
||||||
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
|
import net.minecraft.client.entity.EntityPlayerSP;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
|
||||||
public class FastTransferManager {
|
public class FastTransferManager {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Based on the general assumption that we want to fill top to bottom, left to right
|
* Based on the general assumption that we want to fill top to bottom, left to right
|
||||||
*/
|
*/
|
||||||
public static class SlotPositionComparator implements Comparator<Integer> {
|
public static class SlotPositionComparator implements Comparator<Integer> {
|
||||||
|
|
||||||
final Container container;
|
final Container container;
|
||||||
|
|
||||||
public SlotPositionComparator(Container c) {
|
public SlotPositionComparator(Container c) {
|
||||||
@@ -85,7 +91,7 @@ public class FastTransferManager {
|
|||||||
|
|
||||||
public static void clearSlots(Container container) {
|
public static void clearSlots(Container container) {
|
||||||
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++)
|
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++)
|
||||||
((Slot) container.inventorySlots.get(slotNo)).putStack(null);
|
container.inventorySlots.get(slotNo).putStack(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void performMassTransfer(GuiContainer window, int fromSlot, int toSlot, ItemStack heldStack) {
|
public void performMassTransfer(GuiContainer window, int fromSlot, int toSlot, ItemStack heldStack) {
|
||||||
@@ -101,8 +107,7 @@ public class FastTransferManager {
|
|||||||
if (!fillZoneWithHeldItem(window, toZone)) return;
|
if (!fillZoneWithHeldItem(window, toZone)) return;
|
||||||
|
|
||||||
for (int transferFrom : slotZones.get(fromZone)) {
|
for (int transferFrom : slotZones.get(fromZone)) {
|
||||||
ItemStack transferStack =
|
ItemStack transferStack = window.inventorySlots.getSlot(transferFrom).getStack();
|
||||||
window.inventorySlots.getSlot(transferFrom).getStack();
|
|
||||||
|
|
||||||
if (!areStacksSameType(heldStack, transferStack)) continue;
|
if (!areStacksSameType(heldStack, transferStack)) continue;
|
||||||
|
|
||||||
@@ -142,12 +147,10 @@ public class FastTransferManager {
|
|||||||
ItemStack after = compareAfter.get(i);
|
ItemStack after = compareAfter.get(i);
|
||||||
|
|
||||||
if (!areStacksIdentical(before, after) && after != null)
|
if (!areStacksIdentical(before, after) && after != null)
|
||||||
if (before == null
|
if (before == null ? areStacksSameType(stack, after) : // transfered into this empty slot
|
||||||
? areStacksSameType(stack, after)
|
areStacksSameType(stack, after) && after.stackSize - before.stackSize > 0) // it added to
|
||||||
: // transfered into this empty slot
|
// this stack
|
||||||
areStacksSameType(stack, after)
|
return i;
|
||||||
&& after.stackSize - before.stackSize > 0) // it added to this stack
|
|
||||||
return i;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
@@ -180,16 +183,22 @@ public class FastTransferManager {
|
|||||||
|
|
||||||
if (from.isItemValid(from.getStack())) moveOneItem(window, fromSlot, toSlot);
|
if (from.isItemValid(from.getStack())) moveOneItem(window, fromSlot, toSlot);
|
||||||
else // slots that you can't put stuff in
|
else // slots that you can't put stuff in
|
||||||
moveOutputSet(window, fromSlot, toSlot);
|
moveOutputSet(window, fromSlot, toSlot);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void transferItems(GuiContainer window, int fromSlot, int itemCount) {
|
||||||
|
for (int i = 0; i < itemCount; i++) {
|
||||||
|
transferItem(window, fromSlot);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
|
public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
|
||||||
if (NEIClientUtils.getHeldItem() != null) return;
|
if (NEIClientUtils.getHeldItem() != null) return;
|
||||||
|
|
||||||
clickSlot(window, fromSlot); // pickup fromSlot
|
clickSlot(window, fromSlot); // pickup fromSlot
|
||||||
if (NEIClientUtils.getHeldItem()
|
if (NEIClientUtils.getHeldItem() == null) // maybe this container does auto transfers. No need to pick up the
|
||||||
== null) // maybe this container does auto transfers. No need to pick up the final item
|
// final item
|
||||||
return;
|
return;
|
||||||
clickSlot(window, toSlot); // place one in toSlot
|
clickSlot(window, toSlot); // place one in toSlot
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -202,15 +211,15 @@ public class FastTransferManager {
|
|||||||
public void retrieveItem(GuiContainer window, int toSlot) {
|
public void retrieveItem(GuiContainer window, int toSlot) {
|
||||||
Slot slot = window.inventorySlots.getSlot(toSlot);
|
Slot slot = window.inventorySlots.getSlot(toSlot);
|
||||||
ItemStack slotStack = slot.getStack();
|
ItemStack slotStack = slot.getStack();
|
||||||
if (slotStack == null
|
if (slotStack == null || slotStack.stackSize == slot.getSlotStackLimit()
|
||||||
|| slotStack.stackSize == slot.getSlotStackLimit()
|
|| slotStack.stackSize == slotStack.getMaxStackSize())
|
||||||
|| slotStack.stackSize == slotStack.getMaxStackSize()) return;
|
return;
|
||||||
|
|
||||||
generateSlotMap(window.inventorySlots, slotStack);
|
generateSlotMap(window.inventorySlots, slotStack);
|
||||||
|
|
||||||
Integer destZone = slotZoneMap.get(toSlot);
|
Integer destZone = slotZoneMap.get(toSlot);
|
||||||
if (destZone == null) // slots that don't accept
|
if (destZone == null) // slots that don't accept
|
||||||
return;
|
return;
|
||||||
|
|
||||||
int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
|
int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
|
||||||
int firstZone = -1;
|
int firstZone = -1;
|
||||||
@@ -239,9 +248,9 @@ public class FastTransferManager {
|
|||||||
Slot slot = window.inventorySlots.getSlot(i);
|
Slot slot = window.inventorySlots.getSlot(i);
|
||||||
ItemStack stack1 = slot.getStack();
|
ItemStack stack1 = slot.getStack();
|
||||||
|
|
||||||
if (areStacksSameType(stack, stack1)
|
if (areStacksSameType(stack, stack1) && stack1.stackSize != slot.getSlotStackLimit() && // get from full
|
||||||
&& stack1.stackSize != slot.getSlotStackLimit()
|
// stacks on second
|
||||||
&& // get from full stacks on second pass
|
// pass
|
||||||
stack1.stackSize != stack1.getMaxStackSize()) {
|
stack1.stackSize != stack1.getMaxStackSize()) {
|
||||||
moveOneItem(window, i, toSlot);
|
moveOneItem(window, i, toSlot);
|
||||||
return true;
|
return true;
|
||||||
@@ -274,6 +283,27 @@ public class FastTransferManager {
|
|||||||
GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier);
|
GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static int dropHeldItem(GuiContainer window) {
|
||||||
|
final EntityPlayerSP player = window.mc.thePlayer;
|
||||||
|
final ItemStack held = player.inventory.getItemStack();
|
||||||
|
|
||||||
|
if (held == null) return -1;
|
||||||
|
|
||||||
|
for (int i = 0; i < window.inventorySlots.inventorySlots.size(); i++) {
|
||||||
|
final Slot slot = window.inventorySlots.inventorySlots.get(i);
|
||||||
|
|
||||||
|
if (slot.inventory instanceof InventoryPlayer && !slot.getHasStack() && slot.isItemValid(held)) {
|
||||||
|
clickSlot(window, i, 0, 0);
|
||||||
|
|
||||||
|
if (player.inventory.getItemStack() == null) {
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) {
|
private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) {
|
||||||
for (int transferTo : slotZones.get(zoneIndex)) {
|
for (int transferTo : slotZones.get(zoneIndex)) {
|
||||||
ItemStack held = NEIClientUtils.getHeldItem();
|
ItemStack held = NEIClientUtils.getHeldItem();
|
||||||
@@ -312,7 +342,7 @@ public class FastTransferManager {
|
|||||||
generateSlotMap(window.inventorySlots, held);
|
generateSlotMap(window.inventorySlots, held);
|
||||||
Integer zone = slotZoneMap.get(pickedUpFromSlot);
|
Integer zone = slotZoneMap.get(pickedUpFromSlot);
|
||||||
if (zone == null) // something went wrong and we can't work out where the item was picked up from
|
if (zone == null) // something went wrong and we can't work out where the item was picked up from
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (int slotIndex : slotZones.get(zone)) {
|
for (int slotIndex : slotZones.get(zone)) {
|
||||||
Slot slot = window.inventorySlots.getSlot(slotIndex);
|
Slot slot = window.inventorySlots.getSlot(slotIndex);
|
||||||
|
|||||||
@@ -0,0 +1,410 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import net.minecraft.init.Blocks;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
|
import com.google.common.io.Files;
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
|
import com.google.gson.JsonParser;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
|
||||||
|
import codechicken.core.CommonUtils;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.recipe.GuiCraftingRecipe;
|
||||||
|
import codechicken.nei.recipe.GuiRecipeTab;
|
||||||
|
import codechicken.nei.recipe.ICraftingHandler;
|
||||||
|
import codechicken.nei.recipe.IRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.Recipe.RecipeId;
|
||||||
|
import codechicken.nei.recipe.RecipeHandlerRef;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.FavoriteStorage;
|
||||||
|
import codechicken.nei.util.NBTJson;
|
||||||
|
|
||||||
|
public class FavoriteRecipes {
|
||||||
|
|
||||||
|
protected static final class FastKey {
|
||||||
|
|
||||||
|
public final ItemStack stack;
|
||||||
|
private int hash;
|
||||||
|
|
||||||
|
public FastKey(ItemStack stack) {
|
||||||
|
this.stack = stack;
|
||||||
|
|
||||||
|
this.hash = 31 + Item.getIdFromItem(stack.getItem());
|
||||||
|
this.hash = 31 * this.hash + stack.getItemDamage();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return this.hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
|
||||||
|
if (o instanceof FastKey k && this.stack.getItem() == k.stack.getItem()
|
||||||
|
&& this.stack.getItemDamage() == k.stack.getItemDamage()) {
|
||||||
|
return this.stack == k.stack || Objects.equals(this.stack.stackTagCompound, k.stack.stackTagCompound);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final RestartableTask singleRecipeFavoritesTask = new RestartableTask(
|
||||||
|
"Generate Single-Recipe Favorites") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
final List<ICraftingHandler> handlers = GuiCraftingRecipe.getCraftingHandlers("all");
|
||||||
|
final Map<FastKey, RecipeHandlerRef> autogeneratedRecipes = new HashMap<>();
|
||||||
|
final Set<FastKey> whitelistItems = new HashSet<>(ItemList.items.size());
|
||||||
|
final FavoriteStorage storage = new FavoriteStorage();
|
||||||
|
|
||||||
|
for (ItemStack stack : ItemList.items) {
|
||||||
|
whitelistItems.add(new FastKey(stack));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
|
||||||
|
for (ICraftingHandler handler : handlers) {
|
||||||
|
if (!GuiRecipeTab.getHandlerInfo(handler).getShowFavoritesButton()) continue;
|
||||||
|
|
||||||
|
for (int i = 0; i < handler.numRecipes(); i++) {
|
||||||
|
RecipeHandlerRef ref = null;
|
||||||
|
|
||||||
|
for (PositionedStack result : getOutputs(handler, i)) {
|
||||||
|
ItemStack stack = StackInfo.getItemStackWithMinimumDamage(result.items);
|
||||||
|
final FastKey key = new FastKey(stack);
|
||||||
|
|
||||||
|
if (!whitelistItems.contains(key)) continue;
|
||||||
|
|
||||||
|
if (autogeneratedRecipes.get(key) == null) {
|
||||||
|
|
||||||
|
if (ref == null) {
|
||||||
|
ref = RecipeHandlerRef.of(handler, i);
|
||||||
|
}
|
||||||
|
|
||||||
|
autogeneratedRecipes.put(key, ref);
|
||||||
|
} else {
|
||||||
|
autogeneratedRecipes.remove(key);
|
||||||
|
whitelistItems.remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (interrupted()) return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final Map<RecipeHandlerRef, RecipeId> recipesCache = new HashMap<>();
|
||||||
|
|
||||||
|
for (Map.Entry<FastKey, RecipeHandlerRef> entry : autogeneratedRecipes.entrySet()) {
|
||||||
|
final RecipeId recipeId = recipesCache
|
||||||
|
.computeIfAbsent(entry.getValue(), r -> RecipeId.of(r.handler, r.recipeIndex));
|
||||||
|
storage.add(entry.getKey().stack, recipeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
FavoriteRecipes.autoFavorites = storage;
|
||||||
|
updateSubsetVisibility();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected List<PositionedStack> getOutputs(IRecipeHandler handler, int recipeIndex) {
|
||||||
|
final PositionedStack pStackResult = handler.getResultStack(recipeIndex);
|
||||||
|
return pStackResult != null ? Collections.singletonList(pStackResult) : handler.getOtherStacks(recipeIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final String FAVORITE_ITEM = "FavoriteItem";
|
||||||
|
private static final FavoriteStorage manualFavorites = new FavoriteStorage();
|
||||||
|
private static FavoriteStorage autoFavorites = new FavoriteStorage();
|
||||||
|
private static File favoriteFile;
|
||||||
|
private static int revision = 0;
|
||||||
|
|
||||||
|
static {
|
||||||
|
API.addSubset("Favorites.Manual", manualFavorites::contains);
|
||||||
|
API.addSubset("Favorites.Generated", stack -> FavoriteRecipes.autoFavorites.contains(stack));
|
||||||
|
}
|
||||||
|
|
||||||
|
private FavoriteRecipes() {}
|
||||||
|
|
||||||
|
public static void load() {
|
||||||
|
String worldPath = "global";
|
||||||
|
|
||||||
|
if (NEIClientConfig.getBooleanSetting("inventory.favorites.worldSpecific")) {
|
||||||
|
worldPath = NEIClientConfig.getWorldPath();
|
||||||
|
}
|
||||||
|
|
||||||
|
final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
|
||||||
|
|
||||||
|
if (!dir.exists()) {
|
||||||
|
dir.mkdirs();
|
||||||
|
}
|
||||||
|
|
||||||
|
favoriteFile = new File(dir, "favorites.ini");
|
||||||
|
|
||||||
|
if (!favoriteFile.exists()) {
|
||||||
|
final File globalFavorites = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/favorites.ini");
|
||||||
|
final File configFavorites = new File(NEIClientConfig.configDir, "favorites.ini");
|
||||||
|
final File defaultFavorites = configFavorites.exists() ? configFavorites : globalFavorites;
|
||||||
|
|
||||||
|
if (defaultFavorites.exists()) {
|
||||||
|
try {
|
||||||
|
if (favoriteFile.createNewFile()) {
|
||||||
|
InputStream src = new FileInputStream(defaultFavorites);
|
||||||
|
OutputStream dst = new FileOutputStream(favoriteFile);
|
||||||
|
|
||||||
|
IOUtils.copy(src, dst);
|
||||||
|
|
||||||
|
src.close();
|
||||||
|
dst.close();
|
||||||
|
}
|
||||||
|
} catch (IOException e) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
loadData();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadData() {
|
||||||
|
|
||||||
|
if (favoriteFile == null || !favoriteFile.exists()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> itemStrings;
|
||||||
|
|
||||||
|
try (FileInputStream reader = new FileInputStream(favoriteFile)) {
|
||||||
|
NEIClientConfig.logger.info("Loading favorites from file {}", favoriteFile);
|
||||||
|
itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load favorites from file {}", favoriteFile, e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final JsonParser parser = new JsonParser();
|
||||||
|
boolean hasErrors = false;
|
||||||
|
|
||||||
|
manualFavorites.clear();
|
||||||
|
|
||||||
|
for (String itemStr : itemStrings) {
|
||||||
|
|
||||||
|
if (itemStr.isEmpty() || itemStr.startsWith("#")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
JsonObject jsonObject = parser.parse(itemStr).getAsJsonObject();
|
||||||
|
|
||||||
|
if (jsonObject.get("item") != null && jsonObject.get("recipeId") != null) {
|
||||||
|
final NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(jsonObject.get("item"));
|
||||||
|
final RecipeId recipeId = RecipeId.of(jsonObject.getAsJsonObject("recipeId"));
|
||||||
|
final ItemStack stack = StackInfo.loadFromNBT(itemStackNBT);
|
||||||
|
|
||||||
|
if (recipeId == null || stack == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FAVORITE_ITEM.equals(recipeId.getHandlerName()) || RecipeHandlerRef.of(recipeId) != null) {
|
||||||
|
manualFavorites.add(stack, recipeId);
|
||||||
|
} else {
|
||||||
|
hasErrors = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load favorite from json string: {}", itemStr);
|
||||||
|
hasErrors = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasErrors) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
Files.copy(
|
||||||
|
favoriteFile,
|
||||||
|
new File(favoriteFile.getAbsolutePath() + ".backup-" + System.currentTimeMillis()));
|
||||||
|
NEIClientConfig.logger.info("Backed up invalid favorite file to {}", favoriteFile);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to backup invalid favorite file to {}", favoriteFile, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
save();
|
||||||
|
}
|
||||||
|
|
||||||
|
loadAutoGeneratedRecipes();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static RecipeId getGeneratedFavorite(ItemStack stack) {
|
||||||
|
if (NEIClientConfig.favoritesEnabled() && stack != null) {
|
||||||
|
return autoFavorites.getRecipeId(stack);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack getGeneratedFavorite(RecipeId recipeId) {
|
||||||
|
if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
|
||||||
|
return autoFavorites.getItemStack(recipeId);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static RecipeId getManualFavorite(ItemStack stack) {
|
||||||
|
if (NEIClientConfig.favoritesEnabled() && stack != null) {
|
||||||
|
return manualFavorites.getRecipeId(stack);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack getManualFavorite(RecipeId recipeId) {
|
||||||
|
if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
|
||||||
|
return manualFavorites.getItemStack(recipeId);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static RecipeId getFavorite(ItemStack stack) {
|
||||||
|
|
||||||
|
if (NEIClientConfig.favoritesEnabled() && stack != null) {
|
||||||
|
final RecipeId recipeId = manualFavorites.getRecipeId(stack);
|
||||||
|
return recipeId != null ? recipeId : autoFavorites.getRecipeId(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack getFavorite(RecipeId recipeId) {
|
||||||
|
|
||||||
|
if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
|
||||||
|
final ItemStack stack = manualFavorites.getItemStack(recipeId);
|
||||||
|
return stack != null ? stack : autoFavorites.getItemStack(recipeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int size() {
|
||||||
|
return manualFavorites.size() + autoFavorites.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void reload() {
|
||||||
|
save();
|
||||||
|
load();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean hasManual() {
|
||||||
|
return manualFavorites.size() > 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean containsManual(ItemStack stack) {
|
||||||
|
return getManualFavorite(stack) != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean contains(ItemStack stack) {
|
||||||
|
return getFavorite(stack) != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void toggleFavoriteItem(ItemStack stack) {
|
||||||
|
if (stack == null) return;
|
||||||
|
|
||||||
|
if (containsManual(stack)) {
|
||||||
|
setFavorite(stack, null);
|
||||||
|
} else {
|
||||||
|
setFavorite(
|
||||||
|
stack,
|
||||||
|
RecipeId.of(
|
||||||
|
stack,
|
||||||
|
FavoriteRecipes.FAVORITE_ITEM,
|
||||||
|
Arrays.asList(new ItemStack(Blocks.fire, 1), stack)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setFavorite(ItemStack stack, RecipeId recipeId) {
|
||||||
|
if (stack == null) return;
|
||||||
|
|
||||||
|
manualFavorites.removeItemStack(stack);
|
||||||
|
|
||||||
|
if (recipeId != null) {
|
||||||
|
manualFavorites.removeRecipeId(recipeId);
|
||||||
|
manualFavorites.add(stack, recipeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateSubsetVisibility();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadAutoGeneratedRecipes() {
|
||||||
|
if (ItemList.loadFinished
|
||||||
|
&& NEIClientConfig.getBooleanSetting("inventory.favorites.generateSingleRecipeFavorites")) {
|
||||||
|
singleRecipeFavoritesTask.restart();
|
||||||
|
} else {
|
||||||
|
singleRecipeFavoritesTask.stop();
|
||||||
|
autoFavorites.clear();
|
||||||
|
|
||||||
|
updateSubsetVisibility();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static void updateSubsetVisibility() {
|
||||||
|
SubsetWidget.updateHiddenItems();
|
||||||
|
FavoriteRecipes.revision++;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getRevision() {
|
||||||
|
return revision;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void save() {
|
||||||
|
|
||||||
|
if (favoriteFile == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<String> strings = new ArrayList<>();
|
||||||
|
|
||||||
|
for (Map.Entry<NBTTagCompound, RecipeId> entry : manualFavorites.getAllFavorites()) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
final JsonObject line = new JsonObject();
|
||||||
|
|
||||||
|
line.add("item", NBTJson.toJsonObject(entry.getKey()));
|
||||||
|
line.add("recipeId", entry.getValue().toJsonObject());
|
||||||
|
|
||||||
|
strings.add(NBTJson.toJson(line));
|
||||||
|
} catch (JsonSyntaxException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to stringify favorites ItemStack to json string");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
try (FileOutputStream output = new FileOutputStream(favoriteFile)) {
|
||||||
|
IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to save favorites list to file {}", favoriteFile, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,328 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
|
import net.minecraft.client.gui.Gui;
|
||||||
|
import net.minecraft.client.gui.GuiTextField;
|
||||||
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
|
import net.minecraft.util.ChatAllowedCharacters;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
public class FormattedTextField extends GuiTextField {
|
||||||
|
|
||||||
|
public static interface TextFormatter {
|
||||||
|
|
||||||
|
TextFormatter DEFAULT = (text) -> text;
|
||||||
|
|
||||||
|
public String format(String text);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected FontRenderer fontRenderer;
|
||||||
|
protected String rawText = "";
|
||||||
|
protected String formattedText = "";
|
||||||
|
protected String placeholder = "";
|
||||||
|
protected boolean editable = true;
|
||||||
|
protected int editableColor = 14737632;
|
||||||
|
protected int notEditableColor = 7368816;
|
||||||
|
protected TextFormatter formatter = TextFormatter.DEFAULT;
|
||||||
|
protected int lineScrollOffset = 0;
|
||||||
|
protected int frame = 0;
|
||||||
|
|
||||||
|
public FormattedTextField(FontRenderer fontRenderer, int xPosition, int yPosition, int width, int height) {
|
||||||
|
super(fontRenderer, xPosition, yPosition, width, height);
|
||||||
|
this.fontRenderer = fontRenderer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFormatter(TextFormatter formatter) {
|
||||||
|
this.formatter = formatter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public TextFormatter getFormatter() {
|
||||||
|
return this.formatter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPlaceholder(String placeholder) {
|
||||||
|
this.placeholder = placeholder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateCursorCounter() {
|
||||||
|
super.updateCursorCounter();
|
||||||
|
++this.frame;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setFocused(boolean focus) {
|
||||||
|
if (focus && !this.isFocused()) {
|
||||||
|
this.frame = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
super.setFocused(focus);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setText(String rawText) {
|
||||||
|
super.setText(EnumChatFormatting.getTextWithoutFormattingCodes(rawText));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setSelectionPos(int p_146199_1_) {
|
||||||
|
String text = this.getText();
|
||||||
|
int j = text.length();
|
||||||
|
|
||||||
|
super.setSelectionPos(p_146199_1_);
|
||||||
|
|
||||||
|
p_146199_1_ = Math.max(0, Math.min(p_146199_1_, j));
|
||||||
|
|
||||||
|
if (this.fontRenderer != null) {
|
||||||
|
|
||||||
|
if (this.lineScrollOffset > j) {
|
||||||
|
this.lineScrollOffset = j;
|
||||||
|
}
|
||||||
|
|
||||||
|
int k = this.getWidth();
|
||||||
|
String s = this.fontRenderer.trimStringToWidth(text.substring(this.lineScrollOffset), k);
|
||||||
|
int l = s.length() + this.lineScrollOffset;
|
||||||
|
|
||||||
|
if (p_146199_1_ == this.lineScrollOffset) {
|
||||||
|
this.lineScrollOffset -= this.fontRenderer.trimStringToWidth(text, k, true).length();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (p_146199_1_ > l) {
|
||||||
|
this.lineScrollOffset += p_146199_1_ - l;
|
||||||
|
} else if (p_146199_1_ <= this.lineScrollOffset) {
|
||||||
|
this.lineScrollOffset -= this.lineScrollOffset - p_146199_1_;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.lineScrollOffset = Math.max(0, Math.min(this.lineScrollOffset, j));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setTextColor(int p_146193_1_) {
|
||||||
|
super.setTextColor(p_146193_1_);
|
||||||
|
this.editableColor = p_146193_1_;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setDisabledTextColour(int p_146204_1_) {
|
||||||
|
super.setDisabledTextColour(p_146204_1_);
|
||||||
|
this.notEditableColor = p_146204_1_;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setEnabled(boolean p_146184_1_) {
|
||||||
|
super.setEnabled(p_146184_1_);
|
||||||
|
this.editable = p_146184_1_;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean beforeWrite(String text) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void writeText(String textPart) {
|
||||||
|
String newText = "";
|
||||||
|
String substr = ChatAllowedCharacters.filerAllowedCharacters(textPart);
|
||||||
|
int cursorPosition = getCursorPosition();
|
||||||
|
int maxStringLength = getMaxStringLength();
|
||||||
|
String text = getText();
|
||||||
|
|
||||||
|
if (text.isEmpty()) {
|
||||||
|
newText = substr.substring(0, Math.min(maxStringLength, substr.length()));
|
||||||
|
cursorPosition = newText.length();
|
||||||
|
} else {
|
||||||
|
int selectionEnd = getSelectionEnd();
|
||||||
|
String textStart = text.substring(0, Math.min(cursorPosition, selectionEnd));
|
||||||
|
String textEnd = text.substring(Math.max(cursorPosition, selectionEnd));
|
||||||
|
newText = textStart + substr + textEnd;
|
||||||
|
|
||||||
|
if (newText.length() > maxStringLength) {
|
||||||
|
newText = newText.substring(0, maxStringLength);
|
||||||
|
}
|
||||||
|
|
||||||
|
cursorPosition = Math.min(textStart.length() + substr.length(), newText.length());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (beforeWrite(newText)) {
|
||||||
|
setText(newText);
|
||||||
|
setCursorPosition(cursorPosition);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getNthWordFromPos(int p_146183_1_, int p_146183_2_) {
|
||||||
|
return this.func_146197_a(p_146183_1_, p_146183_2_, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void drawTextBox() {
|
||||||
|
|
||||||
|
if (!this.getVisible()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.getEnableBackgroundDrawing()) {
|
||||||
|
drawRect(
|
||||||
|
this.xPosition - 1,
|
||||||
|
this.yPosition - 1,
|
||||||
|
this.xPosition + this.width + 1,
|
||||||
|
this.yPosition + this.height + 1,
|
||||||
|
-6250336);
|
||||||
|
drawRect(
|
||||||
|
this.xPosition,
|
||||||
|
this.yPosition,
|
||||||
|
this.xPosition + this.width,
|
||||||
|
this.yPosition + this.height,
|
||||||
|
-16777216);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.rawText.equals(getText())) {
|
||||||
|
this.rawText = getText();
|
||||||
|
this.formattedText = this.formatter.format(this.rawText);
|
||||||
|
if (!EnumChatFormatting.getTextWithoutFormattingCodes(this.formattedText).toLowerCase()
|
||||||
|
.equals(this.rawText.toLowerCase())) {
|
||||||
|
this.formattedText = this.rawText;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isFocused() && this.formattedText.isEmpty()) {
|
||||||
|
int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
|
||||||
|
int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
|
||||||
|
this.fontRenderer.drawStringWithShadow(
|
||||||
|
this.fontRenderer.trimStringToWidth(this.placeholder, this.getWidth()),
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
this.notEditableColor);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int firstCharacterIndex = getFormattedTextShift(this.lineScrollOffset);
|
||||||
|
String rawTextClipped = this.fontRenderer
|
||||||
|
.trimStringToWidth(this.rawText.substring(this.lineScrollOffset), this.getWidth());
|
||||||
|
String textClipped = this.formattedText
|
||||||
|
.substring(firstCharacterIndex, getFormattedTextShift(this.lineScrollOffset + rawTextClipped.length()));
|
||||||
|
int cursorPosition = getFormattedTextShift(getCursorPosition());
|
||||||
|
int selectionEnd = getFormattedTextShift(getSelectionEnd());
|
||||||
|
|
||||||
|
int color = this.editable ? this.editableColor : this.notEditableColor;
|
||||||
|
int cursorA = cursorPosition - firstCharacterIndex;
|
||||||
|
int cursorB = selectionEnd - firstCharacterIndex;
|
||||||
|
boolean flag = cursorA >= 0 && cursorA <= textClipped.length();
|
||||||
|
boolean flag1 = isFocused() && this.frame / 6 % 2 == 0 && flag;
|
||||||
|
boolean flag2 = getCursorPosition() < this.rawText.length() || this.rawText.length() >= getMaxStringLength();
|
||||||
|
int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
|
||||||
|
int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
|
||||||
|
int x2 = x;
|
||||||
|
|
||||||
|
if (cursorB > textClipped.length()) {
|
||||||
|
cursorB = textClipped.length();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (textClipped.length() > 0) {
|
||||||
|
String s1 = flag ? textClipped.substring(0, cursorA) : textClipped;
|
||||||
|
String colorA = getPreviousColor(firstCharacterIndex);
|
||||||
|
x2 = this.fontRenderer.drawStringWithShadow(colorA + s1, x, y, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
int k1 = x2;
|
||||||
|
|
||||||
|
if (!flag) {
|
||||||
|
k1 = cursorA > 0 ? x + this.width : x;
|
||||||
|
} else if (flag2) {
|
||||||
|
k1 = x2 - 1;
|
||||||
|
--x2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (textClipped.length() > 0 && flag && cursorA < textClipped.length()) {
|
||||||
|
String colorB = getPreviousColor(firstCharacterIndex + cursorA);
|
||||||
|
this.fontRenderer.drawStringWithShadow(colorB + textClipped.substring(cursorA), x2, y, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (flag1) {
|
||||||
|
if (flag2) {
|
||||||
|
Gui.drawRect(k1, y - 1, k1 + 1, y + 1 + this.fontRenderer.FONT_HEIGHT, -3092272);
|
||||||
|
} else {
|
||||||
|
this.fontRenderer.drawStringWithShadow("_", k1, y, color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cursorB != cursorA) {
|
||||||
|
int l1 = x + this.fontRenderer.getStringWidth(textClipped.substring(0, cursorB));
|
||||||
|
drawCursorVertical(k1, y - 1, l1 - 1, y + 1 + this.fontRenderer.FONT_HEIGHT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void drawCursorVertical(int x1, int y1, int x2, int y2) {
|
||||||
|
int i1;
|
||||||
|
|
||||||
|
if (x1 < x2) {
|
||||||
|
i1 = x1;
|
||||||
|
x1 = x2;
|
||||||
|
x2 = i1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (y1 < y2) {
|
||||||
|
i1 = y1;
|
||||||
|
y1 = y2;
|
||||||
|
y2 = i1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (x2 > this.xPosition + this.width) {
|
||||||
|
x2 = this.xPosition + this.width;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (x1 > this.xPosition + this.width) {
|
||||||
|
x1 = this.xPosition + this.width;
|
||||||
|
}
|
||||||
|
|
||||||
|
Tessellator tessellator = Tessellator.instance;
|
||||||
|
GL11.glColor4f(0.0F, 0.0F, 1.0F, 1.0F);
|
||||||
|
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||||
|
GL11.glEnable(GL11.GL_COLOR_LOGIC_OP);
|
||||||
|
GL11.glLogicOp(GL11.GL_OR_REVERSE);
|
||||||
|
tessellator.startDrawingQuads();
|
||||||
|
tessellator.addVertex((double) x1, (double) y2, 0.0D);
|
||||||
|
tessellator.addVertex((double) x2, (double) y2, 0.0D);
|
||||||
|
tessellator.addVertex((double) x2, (double) y1, 0.0D);
|
||||||
|
tessellator.addVertex((double) x1, (double) y1, 0.0D);
|
||||||
|
tessellator.draw();
|
||||||
|
GL11.glDisable(GL11.GL_COLOR_LOGIC_OP);
|
||||||
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getFormattedTextShift(int position) {
|
||||||
|
int shift = 0;
|
||||||
|
|
||||||
|
for (int i = 0; i < position; i++) {
|
||||||
|
while (this.formattedText.length() > i + shift + 1 && this.formattedText.charAt(i + shift) == '\u00a7'
|
||||||
|
&& isFormattingCode(this.formattedText.charAt(i + shift + 1))) {
|
||||||
|
shift += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.min(position + shift, this.formattedText.length());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isFormattingCode(char c) {
|
||||||
|
return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')
|
||||||
|
|| (c >= 'k' && c <= 'o')
|
||||||
|
|| c == 'r'
|
||||||
|
|| (c >= 'A' && c <= 'F')
|
||||||
|
|| (c >= 'K' && c <= 'O')
|
||||||
|
|| c == 'R';
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getPreviousColor(int position) {
|
||||||
|
position = Math.min(position, this.formattedText.length() - 1);
|
||||||
|
while (position >= 0) {
|
||||||
|
if (this.formattedText.charAt(position) == '\u00a7') {
|
||||||
|
return this.formattedText.substring(position, position + 2);
|
||||||
|
}
|
||||||
|
position--;
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -2,15 +2,18 @@ package codechicken.nei;
|
|||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
import static codechicken.nei.NEIClientUtils.translate;
|
||||||
|
|
||||||
import codechicken.lib.render.CCRenderState;
|
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.lib.render.CCRenderState;
|
||||||
|
|
||||||
public class GuiEnchantmentModifier extends GuiContainer {
|
public class GuiEnchantmentModifier extends GuiContainer {
|
||||||
|
|
||||||
final ContainerEnchantmentModifier container;
|
final ContainerEnchantmentModifier container;
|
||||||
|
|
||||||
public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
|
public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
|
||||||
@@ -21,8 +24,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
|
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
|
||||||
fontRendererObj.drawString(translate("enchant"), 12, 6, 0x404040);
|
fontRendererObj.drawString(translate("enchant"), 12, 6, ColorUtils.textGray.getColor());
|
||||||
fontRendererObj.drawString(translate("enchant.level"), 19, 20, 0x404040);
|
fontRendererObj.drawString(translate("enchant.level"), 19, 20, ColorUtils.textGray.getColor());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
|
||||||
@@ -36,7 +39,11 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
container.drawScrollBar(this);
|
container.drawScrollBar(this);
|
||||||
|
|
||||||
String levelstring = "" + container.level;
|
String levelstring = "" + container.level;
|
||||||
fontRendererObj.drawString(levelstring, 33 - fontRendererObj.getStringWidth(levelstring) / 2, 34, 0xFF606060);
|
fontRendererObj.drawString(
|
||||||
|
levelstring,
|
||||||
|
33 - fontRendererObj.getStringWidth(levelstring) / 2,
|
||||||
|
34,
|
||||||
|
ColorUtils.textLightGray.getColor());
|
||||||
|
|
||||||
GL11.glTranslatef(-guiLeft, -guiTop, 0);
|
GL11.glTranslatef(-guiLeft, -guiTop, 0);
|
||||||
}
|
}
|
||||||
@@ -59,7 +66,6 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
|
|
||||||
public static void toggleEnchantmentValidation() {
|
public static void toggleEnchantmentValidation() {
|
||||||
NEIClientConfig.world.nbt.setBoolean("validateenchantments", !validateEnchantments());
|
NEIClientConfig.world.nbt.setBoolean("validateenchantments", !validateEnchantments());
|
||||||
NEIClientConfig.world.saveNBT();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void actionPerformed(GuiButton guibutton) {
|
protected void actionPerformed(GuiButton guibutton) {
|
||||||
@@ -76,8 +82,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
|
|||||||
|
|
||||||
private void changeLevel(int i) {
|
private void changeLevel(int i) {
|
||||||
container.level += i;
|
container.level += i;
|
||||||
((GuiButton) buttonList.get(0)).enabled = container.level != 1;
|
buttonList.get(0).enabled = container.level != 1;
|
||||||
((GuiButton) buttonList.get(1)).enabled = container.level != 10;
|
buttonList.get(1).enabled = container.level != 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void mouseClicked(int i, int j, int k) {
|
protected void mouseClicked(int i, int j, int k) {
|
||||||
|
|||||||
@@ -1,18 +1,23 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.render.CCRenderState;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.api.TaggedInventoryArea;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler {
|
import codechicken.lib.render.CCRenderState;
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.AutoFocusWidget.INEIAutoFocusSearchEnable;
|
||||||
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.api.TaggedInventoryArea;
|
||||||
|
|
||||||
|
public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler, INEIAutoFocusSearchEnable {
|
||||||
|
|
||||||
public GuiExtendedCreativeInv(Container par1Container) {
|
public GuiExtendedCreativeInv(Container par1Container) {
|
||||||
super(par1Container);
|
super(par1Container);
|
||||||
ySize = 198;
|
ySize = 198;
|
||||||
@@ -55,13 +60,13 @@ public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandl
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void handleMouseClick(Slot p_146984_1_, int p_146984_2_, int p_146984_3_, int p_146984_4_) {
|
protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) {
|
||||||
|
|
||||||
// Hack for armor slots, because they are outside the container
|
// Hack for armor slots, because they are outside the container
|
||||||
if (p_146984_1_ != null && p_146984_4_ == 4 && p_146984_1_.xDisplayPosition < 0) {
|
if (slotIn != null && clickType == 4 && slotIn.xDisplayPosition < 0) {
|
||||||
p_146984_4_ = 0;
|
clickType = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
super.handleMouseClick(p_146984_1_, p_146984_2_, p_146984_3_, p_146984_4_);
|
super.handleMouseClick(slotIn, slotId, clickedButton, clickType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,50 +4,57 @@ import net.minecraft.client.Minecraft;
|
|||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.GuiButton;
|
import net.minecraft.client.gui.GuiButton;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.nei.drawable.DrawableBuilder;
|
||||||
|
import codechicken.nei.drawable.DrawableResource;
|
||||||
|
|
||||||
public class GuiNEIButton extends GuiButton {
|
public class GuiNEIButton extends GuiButton {
|
||||||
|
|
||||||
protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
|
protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
|
||||||
|
private static final DrawableResource[] BACKGROUNDS = new DrawableResource[3];
|
||||||
|
|
||||||
|
static {
|
||||||
|
for (int state = 0; state < BACKGROUNDS.length; state++) {
|
||||||
|
BACKGROUNDS[state] = new DrawableBuilder(guiTex, 0, 46 + state * 20, 200, 20).setSlices(2, 2, 2, 2).build();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public GuiNEIButton(int i, int j, int k, int l, int i1, String s) {
|
public GuiNEIButton(int i, int j, int k, int l, int i1, String s) {
|
||||||
super(i, j, k, l, i1, s);
|
super(i, j, k, l, i1, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void drawButton(Minecraft minecraft, int i, int j) {
|
protected DrawableResource getBackground(int mouseX, int mouseY, boolean mouseOver) {
|
||||||
|
return BACKGROUNDS[getHoverState(mouseOver)];
|
||||||
|
}
|
||||||
|
|
||||||
|
public void drawButton(Minecraft minecraft, int x, int y) {
|
||||||
if (!visible) return;
|
if (!visible) return;
|
||||||
|
|
||||||
FontRenderer fontrenderer = minecraft.fontRenderer;
|
boolean mouseOver = x >= xPosition && y >= yPosition && x < xPosition + width && y < yPosition + height;
|
||||||
minecraft.renderEngine.bindTexture(guiTex);
|
|
||||||
GL11.glColor4f(1, 1, 1, 1);
|
|
||||||
boolean flag = i >= xPosition && j >= yPosition && i < xPosition + width && j < yPosition + height;
|
|
||||||
int k = getHoverState(flag);
|
|
||||||
drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2); // top left
|
|
||||||
drawTexturedModalRect(
|
|
||||||
xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2); // top right
|
|
||||||
drawTexturedModalRect(
|
|
||||||
xPosition,
|
|
||||||
yPosition + height / 2,
|
|
||||||
0,
|
|
||||||
46 + k * 20 + 20 - height / 2,
|
|
||||||
width / 2,
|
|
||||||
height / 2); // bottom left
|
|
||||||
drawTexturedModalRect(
|
|
||||||
xPosition + width / 2,
|
|
||||||
yPosition + height / 2,
|
|
||||||
200 - width / 2,
|
|
||||||
46 + k * 20 + 20 - height / 2,
|
|
||||||
width / 2,
|
|
||||||
height / 2); // bottom right
|
|
||||||
mouseDragged(minecraft, i, j);
|
|
||||||
|
|
||||||
if (!enabled)
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
drawCenteredString(
|
getBackground(x, y, mouseOver).draw(xPosition, yPosition, width, height);
|
||||||
fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffa0a0a0);
|
mouseDragged(minecraft, x, y);
|
||||||
else if (flag)
|
drawContent(minecraft, x, y, mouseOver);
|
||||||
drawCenteredString(
|
}
|
||||||
fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffffa0);
|
|
||||||
else
|
protected int getTextColour(boolean mouseOver) {
|
||||||
drawCenteredString(
|
|
||||||
fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xe0e0e0);
|
if (!enabled) {
|
||||||
|
return ColorUtils.buttonLabelInactive.getColor();
|
||||||
|
} else if (mouseOver) {
|
||||||
|
return ColorUtils.buttonLabelHover.getColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
return ColorUtils.buttonLabelNormal.getColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawContent(Minecraft minecraft, int x, int y, boolean mouseOver) {
|
||||||
|
FontRenderer fontrenderer = minecraft.fontRenderer;
|
||||||
|
int color = getTextColour(mouseOver);
|
||||||
|
|
||||||
|
drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,24 +2,29 @@ package codechicken.nei;
|
|||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
import static codechicken.nei.NEIClientUtils.translate;
|
||||||
|
|
||||||
|
import java.awt.Dimension;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagList;
|
||||||
|
import net.minecraft.potion.Potion;
|
||||||
|
import net.minecraft.potion.PotionEffect;
|
||||||
|
import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.core.gui.GuiCCButton;
|
import codechicken.core.gui.GuiCCButton;
|
||||||
import codechicken.core.gui.GuiCCTextField;
|
import codechicken.core.gui.GuiCCTextField;
|
||||||
import codechicken.core.gui.GuiScrollSlot;
|
import codechicken.core.gui.GuiScrollSlot;
|
||||||
import codechicken.core.inventory.GuiContainerWidget;
|
import codechicken.core.inventory.GuiContainerWidget;
|
||||||
import codechicken.lib.render.CCRenderState;
|
import codechicken.lib.render.CCRenderState;
|
||||||
import codechicken.lib.render.FontUtils;
|
import codechicken.lib.render.FontUtils;
|
||||||
import java.awt.Dimension;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.nbt.NBTTagList;
|
|
||||||
import net.minecraft.potion.Potion;
|
|
||||||
import net.minecraft.potion.PotionEffect;
|
|
||||||
import net.minecraft.util.StatCollector;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
public class GuiPotionCreator extends GuiContainerWidget {
|
public class GuiPotionCreator extends GuiContainerWidget {
|
||||||
|
|
||||||
public class GuiSlotPotionEffects extends GuiScrollSlot {
|
public class GuiSlotPotionEffects extends GuiScrollSlot {
|
||||||
|
|
||||||
public int selectedslot = -1;
|
public int selectedslot = -1;
|
||||||
public boolean enabled = true;
|
public boolean enabled = true;
|
||||||
private final ArrayList<Potion> validPotions = new ArrayList<>();
|
private final ArrayList<Potion> validPotions = new ArrayList<>();
|
||||||
@@ -69,7 +74,12 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
|
CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
|
||||||
drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
|
drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
|
||||||
drawTexturedModalRect(
|
drawTexturedModalRect(
|
||||||
x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
|
x + width - 30,
|
||||||
|
y,
|
||||||
|
width - 23,
|
||||||
|
166 + getSlotHeight(slot) * shade,
|
||||||
|
30,
|
||||||
|
getSlotHeight(slot));
|
||||||
|
|
||||||
if (potion.hasStatusIcon()) {
|
if (potion.hasStatusIcon()) {
|
||||||
CCRenderState.changeTexture("textures/gui/container/inventory.png");
|
CCRenderState.changeTexture("textures/gui/container/inventory.png");
|
||||||
@@ -94,9 +104,7 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
|
|
||||||
private PotionEffect getEffect(int id) {
|
private PotionEffect getEffect(int id) {
|
||||||
ItemStack potion = container.potionInv.getStackInSlot(0);
|
ItemStack potion = container.potionInv.getStackInSlot(0);
|
||||||
if (potion != null
|
if (potion != null && potion.hasTagCompound() && potion.getTagCompound().hasKey("CustomPotionEffects")) {
|
||||||
&& potion.hasTagCompound()
|
|
||||||
&& potion.getTagCompound().hasKey("CustomPotionEffects")) {
|
|
||||||
NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
|
NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
|
||||||
for (int i = 0; i < potionTagList.tagCount(); i++) {
|
for (int i = 0; i < potionTagList.tagCount(); i++) {
|
||||||
PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
|
PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
|
||||||
@@ -167,6 +175,7 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public class GuiDurationField extends GuiCCTextField {
|
public class GuiDurationField extends GuiCCTextField {
|
||||||
|
|
||||||
private String baseValue;
|
private String baseValue;
|
||||||
|
|
||||||
public GuiDurationField(int x, int y, int width, int height) {
|
public GuiDurationField(int x, int y, int width, int height) {
|
||||||
@@ -216,8 +225,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
@Override
|
@Override
|
||||||
public void drawText() {
|
public void drawText() {
|
||||||
String s = getText();
|
String s = getText();
|
||||||
String seconds =
|
String seconds = s
|
||||||
s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
|
.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
|
||||||
String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
|
String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
|
||||||
int ty = y + height / 2 - 4;
|
int ty = y + height / 2 - 4;
|
||||||
int tcolour = getTextColour();
|
int tcolour = getTextColour();
|
||||||
@@ -280,10 +289,10 @@ public class GuiPotionCreator extends GuiContainerWidget {
|
|||||||
CCRenderState.changeTexture("nei:textures/gui/potion.png");
|
CCRenderState.changeTexture("nei:textures/gui/potion.png");
|
||||||
drawTexturedModalRect(0, 0, 0, 0, xSize, ySize);
|
drawTexturedModalRect(0, 0, 0, 0, xSize, ySize);
|
||||||
|
|
||||||
FontUtils.drawCenteredString(translate("potion.favourite"), xSize / 2, 4, 0x404040);
|
FontUtils.drawCenteredString(translate("potion.favourite"), xSize / 2, 4, ColorUtils.textGray.getColor());
|
||||||
fontRendererObj.drawString(translate("potion.duration"), 12, 40, 0x404040);
|
fontRendererObj.drawString(translate("potion.duration"), 12, 40, ColorUtils.textGray.getColor());
|
||||||
fontRendererObj.drawString(translate("potion.level"), 19, 73, 0x404040);
|
fontRendererObj.drawString(translate("potion.level"), 19, 73, ColorUtils.textGray.getColor());
|
||||||
FontUtils.drawCenteredString(translateAmplifier(amplifier), 33, 86, 0xFF606060);
|
FontUtils.drawCenteredString(translateAmplifier(amplifier), 33, 86, ColorUtils.textGray.getColor());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -5,26 +5,30 @@ import static codechicken.lib.gui.GuiDraw.drawString;
|
|||||||
import static codechicken.lib.gui.GuiDraw.drawTooltipBox;
|
import static codechicken.lib.gui.GuiDraw.drawTooltipBox;
|
||||||
import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
import static codechicken.lib.gui.GuiDraw.getStringWidth;
|
||||||
|
|
||||||
import codechicken.lib.config.ConfigTag;
|
|
||||||
import codechicken.nei.KeyManager.IKeyStateTracker;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import java.awt.Dimension;
|
import java.awt.Dimension;
|
||||||
import java.awt.Point;
|
import java.awt.Point;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.renderer.RenderHelper;
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
import org.lwjgl.opengl.GL12;
|
import org.lwjgl.opengl.GL12;
|
||||||
|
|
||||||
|
import codechicken.lib.config.ConfigTag;
|
||||||
|
import codechicken.nei.KeyManager.IKeyStateTracker;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
|
||||||
public class HUDRenderer implements IKeyStateTracker {
|
public class HUDRenderer implements IKeyStateTracker {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void tickKeyStates() {
|
public void tickKeyStates() {
|
||||||
if (KeyManager.keyStates.get("world.highlight_tips").down) {
|
if (KeyManager.isPressed("world.highlight_tips")) {
|
||||||
ConfigTag tag = NEIClientConfig.getSetting("world.highlight_tips");
|
ConfigTag tag = NEIClientConfig.getSetting("world.highlight_tips");
|
||||||
tag.setBooleanValue(!tag.getBooleanValue());
|
tag.setBooleanValue(!tag.getBooleanValue());
|
||||||
}
|
}
|
||||||
@@ -32,20 +36,17 @@ public class HUDRenderer implements IKeyStateTracker {
|
|||||||
|
|
||||||
public static void renderOverlay() {
|
public static void renderOverlay() {
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
Minecraft mc = Minecraft.getMinecraft();
|
||||||
if (mc.currentScreen == null
|
if (mc.currentScreen == null && mc.theWorld != null
|
||||||
&& mc.theWorld != null
|
|
||||||
&& !mc.gameSettings.keyBindPlayerList.getIsKeyPressed()
|
&& !mc.gameSettings.keyBindPlayerList.getIsKeyPressed()
|
||||||
&& NEIClientConfig.getBooleanSetting("world.highlight_tips")
|
&& NEIClientConfig.getBooleanSetting("world.highlight_tips")
|
||||||
&& mc.objectMouseOver != null
|
&& mc.objectMouseOver != null
|
||||||
&& mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
|
&& mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
|
||||||
World world = mc.theWorld;
|
World world = mc.theWorld;
|
||||||
ItemStack[] items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver)
|
final List<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
|
||||||
.toArray(new ItemStack[0]);
|
|
||||||
|
|
||||||
if (items.length == 0) return;
|
if (items.isEmpty()) return;
|
||||||
|
|
||||||
ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items);
|
|
||||||
|
|
||||||
|
final ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items.toArray(new ItemStack[0]));
|
||||||
renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
|
renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,114 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import static codechicken.nei.NEIClientUtils.translate;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
|
import codechicken.nei.guihook.IContainerTooltipHandler;
|
||||||
|
import codechicken.nei.recipe.AutoCraftingManager;
|
||||||
|
|
||||||
|
public class HeldItemHandler implements IContainerInputHandler, IContainerTooltipHandler {
|
||||||
|
|
||||||
|
protected HeldItemHandler() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void load() {
|
||||||
|
HeldItemHandler instance = new HeldItemHandler();
|
||||||
|
GuiContainerManager.addInputHandler(instance);
|
||||||
|
GuiContainerManager.addTooltipHandler(instance);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean contains(int mousex, int mousey) {
|
||||||
|
return NEIClientUtils.getHeldItem() != null && !ItemPanels.bookmarkPanel.inEditingState()
|
||||||
|
&& !AutoCraftingManager.processing()
|
||||||
|
&& (ItemPanels.bookmarkPanel.contains(mousex, mousey)
|
||||||
|
|| ItemPanels.itemPanel.containsWithSubpanels(mousex, mousey));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
|
||||||
|
if (contains(mousex, mousey)) {
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")
|
||||||
|
|| NEIClientUtils.mc().playerController.isInCreativeMode()) {
|
||||||
|
if (button == 1) {
|
||||||
|
NEIClientUtils.decreaseSlotStack(-999);
|
||||||
|
} else {
|
||||||
|
NEIClientUtils.deleteHeldItem();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
NEIClientUtils.dropHeldItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
|
||||||
|
|
||||||
|
if (contains(mousex, mousey)) {
|
||||||
|
currenttip.clear();
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")
|
||||||
|
|| NEIClientUtils.mc().playerController.isInCreativeMode()) {
|
||||||
|
currenttip.add(EnumChatFormatting.RED + translate("itempanel.deleteItem"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return currenttip;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,161 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.GuiRepair;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiBrewingStand;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiCrafting;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiFurnace;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiInventory;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.recipe.BrewingOverlayHandler;
|
||||||
|
import codechicken.nei.recipe.BrewingRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.DefaultOverlayHandler;
|
||||||
|
import codechicken.nei.recipe.FireworkRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.FuelRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.FurnaceRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.InformationHandler;
|
||||||
|
import codechicken.nei.recipe.ProfilerRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.RepairOverlayHandler;
|
||||||
|
import codechicken.nei.recipe.RepairRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.ShapedRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.ShapelessRecipeHandler;
|
||||||
|
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||||
|
|
||||||
|
public class IMCForNEI {
|
||||||
|
|
||||||
|
public static void IMCSender() {
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new ShapedRecipeHandler());
|
||||||
|
API.registerUsageHandler(new ShapedRecipeHandler());
|
||||||
|
sendHandler("codechicken.nei.recipe.ShapedRecipeHandler", "minecraft:crafting_table");
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new ShapelessRecipeHandler());
|
||||||
|
API.registerUsageHandler(new ShapelessRecipeHandler());
|
||||||
|
sendHandler("codechicken.nei.recipe.ShapelessRecipeHandler", "minecraft:crafting_table");
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new FireworkRecipeHandler());
|
||||||
|
API.registerUsageHandler(new FireworkRecipeHandler());
|
||||||
|
sendHandler("codechicken.nei.recipe.FireworkRecipeHandler", "minecraft:fireworks");
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new FurnaceRecipeHandler());
|
||||||
|
API.registerUsageHandler(new FurnaceRecipeHandler());
|
||||||
|
sendHandler("codechicken.nei.recipe.FurnaceRecipeHandler", "minecraft:furnace");
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new BrewingRecipeHandler());
|
||||||
|
API.registerUsageHandler(new BrewingRecipeHandler());
|
||||||
|
sendHandler("codechicken.nei.recipe.BrewingRecipeHandler", "minecraft:brewing_stand");
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new FuelRecipeHandler());
|
||||||
|
API.registerUsageHandler(new FuelRecipeHandler());
|
||||||
|
sendFuelRecipeHandler();
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new InformationHandler());
|
||||||
|
API.registerUsageHandler(new InformationHandler());
|
||||||
|
sendInformationHandler();
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new RepairRecipeHandler());
|
||||||
|
API.registerUsageHandler(new RepairRecipeHandler());
|
||||||
|
sendRepairHandler();
|
||||||
|
sendCatalyst("repair", "minecraft:anvil");
|
||||||
|
|
||||||
|
API.registerGuiOverlay(GuiCrafting.class, "crafting");
|
||||||
|
API.registerGuiOverlay(GuiInventory.class, "crafting2x2", 63, 20);
|
||||||
|
API.registerGuiOverlay(GuiFurnace.class, "smelting");
|
||||||
|
API.registerGuiOverlay(GuiFurnace.class, "fuel");
|
||||||
|
API.registerGuiOverlay(GuiBrewingStand.class, "brewing");
|
||||||
|
API.registerGuiOverlay(GuiRepair.class, "repair", 2, 37);
|
||||||
|
|
||||||
|
API.registerGuiOverlayHandler(GuiCrafting.class, new DefaultOverlayHandler(), "crafting");
|
||||||
|
API.registerGuiOverlayHandler(GuiInventory.class, new DefaultOverlayHandler(63, 20), "crafting2x2");
|
||||||
|
API.registerGuiOverlayHandler(GuiBrewingStand.class, new BrewingOverlayHandler(), "brewing");
|
||||||
|
API.registerGuiOverlayHandler(GuiRepair.class, new RepairOverlayHandler(), "repair");
|
||||||
|
|
||||||
|
API.registerRecipeHandler(new ProfilerRecipeHandler(true));
|
||||||
|
API.registerUsageHandler(new ProfilerRecipeHandler(false));
|
||||||
|
sendProfilerRecipeHandler();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void sendHandler(String aName, String aBlock) {
|
||||||
|
NBTTagCompound aNBT = new NBTTagCompound();
|
||||||
|
aNBT.setString("handler", aName);
|
||||||
|
aNBT.setString("modName", "Minecraft");
|
||||||
|
aNBT.setString("modId", "minecraft");
|
||||||
|
aNBT.setString("itemName", aBlock);
|
||||||
|
aNBT.setInteger("handlerWidth", 166);
|
||||||
|
aNBT.setInteger("handlerHeight", 65);
|
||||||
|
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
||||||
|
aNBT.setInteger("yShift", 0);
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void sendRepairHandler() {
|
||||||
|
NBTTagCompound aNBT = new NBTTagCompound();
|
||||||
|
aNBT.setString("handler", "codechicken.nei.recipe.RepairRecipeHandler");
|
||||||
|
aNBT.setString("modName", "Minecraft");
|
||||||
|
aNBT.setString("modId", "minecraft");
|
||||||
|
aNBT.setString("itemName", "minecraft:anvil");
|
||||||
|
aNBT.setInteger("handlerHeight", 39);
|
||||||
|
aNBT.setInteger("handlerWidth", 166);
|
||||||
|
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
||||||
|
aNBT.setBoolean("showFavoritesButton", false);
|
||||||
|
aNBT.setInteger("yShift", 0);
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void sendFuelRecipeHandler() {
|
||||||
|
NBTTagCompound aNBT = new NBTTagCompound();
|
||||||
|
aNBT.setString("handler", "codechicken.nei.recipe.FuelRecipeHandler");
|
||||||
|
aNBT.setString("modName", "Minecraft");
|
||||||
|
aNBT.setString("modId", "minecraft");
|
||||||
|
aNBT.setString("imageResource", "nei:textures/nei_tabbed_sprites.png");
|
||||||
|
aNBT.setInteger("imageX", 80);
|
||||||
|
aNBT.setInteger("imageY", 0);
|
||||||
|
aNBT.setInteger("imageWidth", 14);
|
||||||
|
aNBT.setInteger("imageHeight", 14);
|
||||||
|
aNBT.setInteger("handlerHeight", 65);
|
||||||
|
aNBT.setInteger("handlerWidth", 166);
|
||||||
|
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
||||||
|
aNBT.setInteger("yShift", 0);
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void sendInformationHandler() {
|
||||||
|
NBTTagCompound aNBT = new NBTTagCompound();
|
||||||
|
aNBT.setString("handler", "codechicken.nei.recipe.InformationHandler");
|
||||||
|
aNBT.setString("modName", "Not Enough Items");
|
||||||
|
aNBT.setString("modId", "nei");
|
||||||
|
aNBT.setString("imageResource", "nei:textures/nei_tabbed_sprites.png");
|
||||||
|
aNBT.setInteger("imageX", 96);
|
||||||
|
aNBT.setInteger("imageY", 0);
|
||||||
|
aNBT.setInteger("imageWidth", 16);
|
||||||
|
aNBT.setInteger("imageHeight", 16);
|
||||||
|
aNBT.setInteger("handlerHeight", 65);
|
||||||
|
aNBT.setInteger("handlerWidth", 166);
|
||||||
|
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
||||||
|
aNBT.setInteger("yShift", 0);
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void sendProfilerRecipeHandler() {
|
||||||
|
NBTTagCompound aNBT = new NBTTagCompound();
|
||||||
|
aNBT.setString("handler", "codechicken.nei.recipe.ProfilerRecipeHandler");
|
||||||
|
aNBT.setString("modName", "Not Enough Items");
|
||||||
|
aNBT.setString("modId", "nei");
|
||||||
|
aNBT.setString("itemName", "minecraft:clock");
|
||||||
|
aNBT.setInteger("handlerHeight", 16);
|
||||||
|
aNBT.setInteger("handlerWidth", 166);
|
||||||
|
aNBT.setBoolean("multipleWidgetsAllowed", true);
|
||||||
|
aNBT.setInteger("yShift", 0);
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void sendCatalyst(String aName, String aStack) {
|
||||||
|
NBTTagCompound aNBT = new NBTTagCompound();
|
||||||
|
aNBT.setString("handlerID", aName);
|
||||||
|
aNBT.setString("itemName", aStack);
|
||||||
|
aNBT.setInteger("priority", 0);
|
||||||
|
FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public class Image {
|
public class Image {
|
||||||
|
|
||||||
public int x;
|
public int x;
|
||||||
public int y;
|
public int y;
|
||||||
public int width;
|
public int width;
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
|
|
||||||
public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
|
public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPickup(ItemStack heldItem) {
|
public void onPickup(ItemStack heldItem) {
|
||||||
heldItem.stackSize = 1;
|
heldItem.stackSize = 1;
|
||||||
@@ -28,14 +30,7 @@ public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void replenishInfiniteStack(InventoryPlayer inv, int slotNo) {
|
public void replenishInfiniteStack(InventoryPlayer inv, int slotNo) {
|
||||||
ItemStack stack = inv.getStackInSlot(slotNo);
|
inv.getStackInSlot(slotNo).stackSize = 111;
|
||||||
stack.stackSize = 111;
|
|
||||||
|
|
||||||
for (int i = 0; i < inv.getSizeInventory(); i++) {
|
|
||||||
if (i == slotNo) continue;
|
|
||||||
|
|
||||||
if (NEIServerUtils.areStacksSameType(stack, inv.getStackInSlot(i))) inv.setInventorySlotContents(i, null);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
|
|
||||||
public class InfiniteToolHandler implements IInfiniteItemHandler {
|
public class InfiniteToolHandler implements IInfiniteItemHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPickup(ItemStack heldItem) {
|
public void onPickup(ItemStack heldItem) {
|
||||||
heldItem.setItemDamage(0);
|
heldItem.setItemDamage(0);
|
||||||
|
|||||||
@@ -5,15 +5,14 @@ import net.minecraft.inventory.Container;
|
|||||||
import net.minecraft.inventory.InventoryCrafting;
|
import net.minecraft.inventory.InventoryCrafting;
|
||||||
|
|
||||||
public class InventoryCraftingDummy extends InventoryCrafting {
|
public class InventoryCraftingDummy extends InventoryCrafting {
|
||||||
|
|
||||||
public InventoryCraftingDummy() {
|
public InventoryCraftingDummy() {
|
||||||
super(
|
super(new Container() {
|
||||||
new Container() {
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canInteractWith(EntityPlayer entityplayer) {
|
public boolean canInteractWith(EntityPlayer entityplayer) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
},
|
}, 3, 3);
|
||||||
3,
|
|
||||||
3);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,503 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.IntStream;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||||
|
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
||||||
|
import codechicken.nei.ItemsGrid.MouseContext;
|
||||||
|
import codechicken.nei.NEIClientUtils.Alignment;
|
||||||
|
import codechicken.nei.recipe.AutoCraftingManager;
|
||||||
|
import codechicken.nei.recipe.GuiCraftingRecipe;
|
||||||
|
import codechicken.nei.recipe.GuiRecipe;
|
||||||
|
import codechicken.nei.recipe.ICraftingHandler;
|
||||||
|
import codechicken.nei.recipe.IRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.Recipe.RecipeId;
|
||||||
|
import codechicken.nei.recipe.RecipeInfo;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.ReadableNumberConverter;
|
||||||
|
|
||||||
|
public class ItemCraftablesPanel
|
||||||
|
extends AbstractSubpanel<ItemsGrid<ItemCraftablesPanel.CraftablesGridSlot, MouseContext>> {
|
||||||
|
|
||||||
|
public static class CraftablesGridSlot extends ItemsGridSlot {
|
||||||
|
|
||||||
|
protected final long realAmount;
|
||||||
|
protected final boolean isFluidDisplay;
|
||||||
|
protected final RecipeId recipeId;
|
||||||
|
|
||||||
|
public CraftablesGridSlot(int slotIndex, int itemIndex, ItemStack itemStack, RecipeId recipeId) {
|
||||||
|
super(slotIndex, itemIndex, itemStack);
|
||||||
|
this.realAmount = StackInfo.getAmount(itemStack);
|
||||||
|
this.isFluidDisplay = StackInfo.isFluidDisplayItem(itemStack);
|
||||||
|
this.recipeId = recipeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public RecipeId getRecipeId() {
|
||||||
|
return this.recipeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {
|
||||||
|
drawStackSize(rect);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawStackSize(Rectangle4i rect) {
|
||||||
|
long stackSize = this.realAmount;
|
||||||
|
|
||||||
|
if (stackSize > 1) {
|
||||||
|
final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
|
||||||
|
String amountString = "";
|
||||||
|
|
||||||
|
if (stackSize < 10_000) {
|
||||||
|
amountString = String.valueOf(stackSize);
|
||||||
|
} else {
|
||||||
|
amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.isFluidDisplay) {
|
||||||
|
amountString += "L";
|
||||||
|
}
|
||||||
|
|
||||||
|
NEIClientUtils.drawNEIOverlayText(
|
||||||
|
amountString,
|
||||||
|
new Rectangle4i(rect.x + 1, rect.y + 1, rect.w - 2, rect.h - 2),
|
||||||
|
panelFactor,
|
||||||
|
0xFFFFFF,
|
||||||
|
true,
|
||||||
|
this.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class CraftablesSnapshot {
|
||||||
|
|
||||||
|
final GuiContainer guiContainer;
|
||||||
|
final ItemStackAmount inventory;
|
||||||
|
final boolean showOnlyFavorites;
|
||||||
|
final int maxCandidates;
|
||||||
|
|
||||||
|
CraftablesSnapshot(GuiContainer guiContainer, ItemStackAmount inventory, boolean showOnlyFavorites,
|
||||||
|
int maxCandidates) {
|
||||||
|
this.guiContainer = guiContainer;
|
||||||
|
this.inventory = inventory;
|
||||||
|
this.showOnlyFavorites = showOnlyFavorites;
|
||||||
|
this.maxCandidates = maxCandidates;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class RecipeCandidate {
|
||||||
|
|
||||||
|
final IRecipeHandler handler;
|
||||||
|
final int recipeIndex;
|
||||||
|
final List<PositionedStack> ingredientStacks;
|
||||||
|
final ItemStack sortKeyItem;
|
||||||
|
|
||||||
|
RecipeCandidate(IRecipeHandler handler, int recipeIndex, List<PositionedStack> ingredientStacks,
|
||||||
|
ItemStack sortKeyItem) {
|
||||||
|
this.handler = handler;
|
||||||
|
this.recipeIndex = recipeIndex;
|
||||||
|
this.ingredientStacks = ingredientStacks;
|
||||||
|
this.sortKeyItem = sortKeyItem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Comparator<ItemStack> ITEM_SORT_COMPARATOR = Comparator
|
||||||
|
.comparing(FavoriteRecipes::containsManual).thenComparing(FavoriteRecipes::contains).reversed()
|
||||||
|
.thenComparing(ItemSorter.instance);
|
||||||
|
|
||||||
|
public static List<String> guiBlacklist = new ArrayList<>();
|
||||||
|
private final int MIN_DELAY = 600;
|
||||||
|
|
||||||
|
private Map<String, ArrayList<ICraftingHandler>> identHandlers = new HashMap<>();
|
||||||
|
private Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
|
||||||
|
|
||||||
|
private GuiContainer lastGuiContainer = null;
|
||||||
|
private ItemStackAmount lastPlayerInventory = null;
|
||||||
|
private long lastPlayerInventorySync = 0;
|
||||||
|
private int lastFavoritesCount = 0;
|
||||||
|
|
||||||
|
private volatile CraftablesSnapshot pendingSnapshot;
|
||||||
|
private final AtomicReference<Map<ItemStack, RecipeId>> pendingResult = new AtomicReference<>();
|
||||||
|
private final RestartableTask task = new RestartableTask("NEI Craftables Panel") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
pendingResult.set(generateCraftables(ItemCraftablesPanel.this.pendingSnapshot));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public ItemCraftablesPanel() {
|
||||||
|
this.grid = new ItemsGrid<>() {
|
||||||
|
|
||||||
|
protected List<CraftablesGridSlot> gridMask;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onGridChanged() {
|
||||||
|
this.gridMask = null;
|
||||||
|
super.onGridChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<CraftablesGridSlot> getMask() {
|
||||||
|
|
||||||
|
if (this.gridMask == null) {
|
||||||
|
final int maxSlotIndex = this.rows * this.columns;
|
||||||
|
final List<CraftablesGridSlot> gridMask = new ArrayList<>();
|
||||||
|
this.realItems.clear();
|
||||||
|
|
||||||
|
if (!ItemCraftablesPanel.this.availableRecipes.isEmpty()) {
|
||||||
|
final List<Map.Entry<ItemStack, RecipeId>> entries = ItemCraftablesPanel.this.availableRecipes
|
||||||
|
.entrySet().stream().sorted(Map.Entry.comparingByKey(ITEM_SORT_COMPARATOR))
|
||||||
|
.limit(maxSlotIndex).collect(Collectors.toList());
|
||||||
|
int slotIndex = 0;
|
||||||
|
int itemIndex = 0;
|
||||||
|
|
||||||
|
for (Map.Entry<ItemStack, RecipeId> entry : entries) {
|
||||||
|
if (!isInvalidSlot(slotIndex)) {
|
||||||
|
this.realItems.add(entry.getKey());
|
||||||
|
gridMask.add(
|
||||||
|
new CraftablesGridSlot(
|
||||||
|
slotIndex,
|
||||||
|
itemIndex++,
|
||||||
|
entry.getKey(),
|
||||||
|
entry.getValue()));
|
||||||
|
}
|
||||||
|
if (slotIndex++ >= maxSlotIndex) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.gridMask = gridMask;
|
||||||
|
} else {
|
||||||
|
this.gridMask = Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemCraftablesPanel.this.updateLinePadding();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.gridMask;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected MouseContext getMouseContext(int mousex, int mousey) {
|
||||||
|
final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (hovered != null) {
|
||||||
|
return new MouseContext(
|
||||||
|
hovered.slotIndex,
|
||||||
|
hovered.slotIndex / this.columns,
|
||||||
|
hovered.slotIndex % this.columns);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
|
||||||
|
return ItemQuantityField.prepareStackWithQuantity(itemStack, StackInfo.getAmount(itemStack));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int mousex, int mousey) {
|
||||||
|
if (!this.availableRecipes.isEmpty()) {
|
||||||
|
super.draw(mousex, mousey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int setPanelWidth(int width) {
|
||||||
|
if (getGuiContainer() != this.lastGuiContainer) updateCraftables();
|
||||||
|
|
||||||
|
final int columns = width / ItemsGrid.SLOT_SIZE;
|
||||||
|
final int useRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows");
|
||||||
|
final int rows = (int) Math.min(Math.ceil(this.availableRecipes.size() * 1f / columns), useRows);
|
||||||
|
|
||||||
|
this.w = width;
|
||||||
|
this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
|
||||||
|
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void update() {
|
||||||
|
this.splittingLineColor = NEIClientConfig.getSetting("inventory.craftables.color").getHexValue();
|
||||||
|
applyPendingResult();
|
||||||
|
updateCraftables();
|
||||||
|
super.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void applyPendingResult() {
|
||||||
|
final Map<ItemStack, RecipeId> result = this.pendingResult.getAndSet(null);
|
||||||
|
|
||||||
|
if (result != null && NEIClientConfig.showCraftablesPanelWidget()) {
|
||||||
|
this.availableRecipes = result;
|
||||||
|
this.grid.onGridChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateCraftables() {
|
||||||
|
|
||||||
|
if (!NEIClientConfig.showCraftablesPanelWidget()) {
|
||||||
|
clearCraftables();
|
||||||
|
} else if (this.lastPlayerInventory == null
|
||||||
|
|| Math.abs(System.currentTimeMillis() - this.lastPlayerInventorySync) >= MIN_DELAY) {
|
||||||
|
final GuiContainer firstGui = getGuiContainer();
|
||||||
|
this.lastPlayerInventorySync = System.currentTimeMillis();
|
||||||
|
|
||||||
|
if (firstGui != null && !ItemCraftablesPanel.guiBlacklist.contains(firstGui.getClass().getName())) {
|
||||||
|
final boolean showOnlyFavorites = NEIClientConfig
|
||||||
|
.getBooleanSetting("inventory.craftables.favoritesOnly");
|
||||||
|
final ItemStackAmount inv = AutoCraftingManager.getInventoryItems(firstGui);
|
||||||
|
|
||||||
|
if (this.lastGuiContainer != firstGui
|
||||||
|
|| showOnlyFavorites && this.lastFavoritesCount != FavoriteRecipes.size()
|
||||||
|
|| !inv.equals(this.lastPlayerInventory)) {
|
||||||
|
this.lastPlayerInventory = inv;
|
||||||
|
this.lastGuiContainer = firstGui;
|
||||||
|
this.lastFavoritesCount = FavoriteRecipes.size();
|
||||||
|
final int maxRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows") + 2;
|
||||||
|
final int maxCandidates = Math.max(this.grid.columns, 1) * maxRows;
|
||||||
|
this.pendingSnapshot = new CraftablesSnapshot(
|
||||||
|
firstGui,
|
||||||
|
inv,
|
||||||
|
showOnlyFavorites,
|
||||||
|
maxCandidates);
|
||||||
|
this.task.restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
clearCraftables();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void clearCraftables() {
|
||||||
|
if (!this.availableRecipes.isEmpty()) {
|
||||||
|
this.availableRecipes = Collections.emptyMap();
|
||||||
|
this.lastPlayerInventory = null;
|
||||||
|
this.grid.onGridChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private GuiContainer getGuiContainer() {
|
||||||
|
final GuiContainer firstGui = NEIClientUtils.getGuiContainer();
|
||||||
|
return (firstGui instanceof GuiRecipe<?>gui) ? gui.firstGui : firstGui;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<ItemStack, RecipeId> generateCraftables(CraftablesSnapshot snapshot) {
|
||||||
|
final List<IRecipeHandler> availableHandlers = getAvailableHandlers(snapshot.guiContainer);
|
||||||
|
final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
|
||||||
|
|
||||||
|
if (!availableHandlers.isEmpty()) {
|
||||||
|
final Map<Item, List<ItemStack>> invByItem = indexInventoryByItem(snapshot.inventory.values());
|
||||||
|
|
||||||
|
if (snapshot.showOnlyFavorites) {
|
||||||
|
for (IRecipeHandler handler : availableHandlers) {
|
||||||
|
availableRecipes.putAll(filterHandlerRecipes(handler, invByItem, true));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
final List<RecipeCandidate> candidates = Collections.synchronizedList(new ArrayList<>());
|
||||||
|
|
||||||
|
for (IRecipeHandler handler : availableHandlers) {
|
||||||
|
collectHandlerCandidates(handler, invByItem, candidates);
|
||||||
|
}
|
||||||
|
|
||||||
|
candidates.sort(Comparator.comparing(c -> c.sortKeyItem, ITEM_SORT_COMPARATOR));
|
||||||
|
candidates.subList(0, Math.min(candidates.size(), snapshot.maxCandidates)).parallelStream()
|
||||||
|
.forEach(candidate -> buildCandidate(candidate, availableRecipes));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return availableRecipes;
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<IRecipeHandler> getAvailableHandlers(GuiContainer firstGui) {
|
||||||
|
final List<IRecipeHandler> availableHandlers = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String ident : RecipeInfo.getOverlayHandlerIdents(firstGui)) {
|
||||||
|
availableHandlers.addAll(identHandlers.computeIfAbsent(ident, GuiCraftingRecipe::getCraftingHandlers));
|
||||||
|
}
|
||||||
|
|
||||||
|
return availableHandlers;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<Item, List<ItemStack>> indexInventoryByItem(List<ItemStack> invStacks) {
|
||||||
|
final Map<Item, List<ItemStack>> index = new HashMap<>();
|
||||||
|
|
||||||
|
for (ItemStack stack : invStacks) {
|
||||||
|
index.computeIfAbsent(stack.getItem(), i -> new ArrayList<>()).add(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void collectHandlerCandidates(IRecipeHandler handler, Map<Item, List<ItemStack>> invByItem,
|
||||||
|
List<RecipeCandidate> candidates) {
|
||||||
|
IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
|
||||||
|
final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
|
||||||
|
|
||||||
|
if (existsIngredients(ingredientStacks, invByItem)) {
|
||||||
|
final ItemStack sortKeyItem = getCheapResultItem(handler, recipeIndex);
|
||||||
|
|
||||||
|
if (sortKeyItem != null) {
|
||||||
|
candidates.add(new RecipeCandidate(handler, recipeIndex, ingredientStacks, sortKeyItem));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void buildCandidate(RecipeCandidate candidate, Map<ItemStack, RecipeId> availableRecipes) {
|
||||||
|
final ItemStack result = getCheapResult(candidate.handler, candidate.recipeIndex);
|
||||||
|
|
||||||
|
if (result != null) {
|
||||||
|
final RecipeId recipeId = RecipeId.of(candidate.handler, candidate.recipeIndex, candidate.ingredientStacks);
|
||||||
|
|
||||||
|
synchronized (availableRecipes) {
|
||||||
|
availableRecipes.put(result, recipeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ItemStack getCheapResultItem(IRecipeHandler handler, int recipeIndex) {
|
||||||
|
final PositionedStack resultStack = handler.getResultStack(recipeIndex);
|
||||||
|
|
||||||
|
if (resultStack != null) {
|
||||||
|
return resultStack.item;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<PositionedStack> otherStacks = handler.getOtherStacks(recipeIndex);
|
||||||
|
|
||||||
|
for (PositionedStack otherStack : otherStacks) {
|
||||||
|
if (!FluidContainerRegistry.isContainer(otherStack.items[0])
|
||||||
|
|| StackInfo.getFluid(otherStack.items[0]) != null) {
|
||||||
|
return otherStack.item;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return otherStacks.isEmpty() ? null : otherStacks.get(0).item;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ItemStack getCheapResult(IRecipeHandler handler, int recipeIndex) {
|
||||||
|
final PositionedStack resultStack = handler.getResultStack(recipeIndex);
|
||||||
|
final List<PositionedStack> results = resultStack != null ? Collections.singletonList(resultStack)
|
||||||
|
: handler.getOtherStacks(recipeIndex);
|
||||||
|
|
||||||
|
if (results.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemStack stack = null;
|
||||||
|
|
||||||
|
if (results.size() > 1) {
|
||||||
|
for (PositionedStack result : results) {
|
||||||
|
if (!FluidContainerRegistry.isContainer(result.item) || StackInfo.getFluid(result.item) != null) {
|
||||||
|
stack = result.item;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stack == null) {
|
||||||
|
stack = results.get(0).item;
|
||||||
|
}
|
||||||
|
|
||||||
|
int stackSize = 0;
|
||||||
|
|
||||||
|
for (PositionedStack result : results) {
|
||||||
|
if (containsSameType(result, stack)) {
|
||||||
|
stackSize += StackInfo.getAmount(result.item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return StackInfo.withAmount(stack, stackSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean containsSameType(PositionedStack pStack, ItemStack stack) {
|
||||||
|
final ItemStack normalized = StackInfo.withAmount(stack, 0);
|
||||||
|
|
||||||
|
for (ItemStack permutation : pStack.items) {
|
||||||
|
if (NEIServerUtils.areStacksSameTypeWithNBT(StackInfo.withAmount(permutation, 0), normalized)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<ItemStack, RecipeId> filterHandlerRecipes(IRecipeHandler handler, Map<Item, List<ItemStack>> invByItem,
|
||||||
|
boolean showOnlyFavorites) {
|
||||||
|
final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
|
||||||
|
|
||||||
|
IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
|
||||||
|
final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
|
||||||
|
|
||||||
|
if (existsIngredients(ingredientStacks, invByItem)) {
|
||||||
|
final ItemStack result = getCheapResult(handler, recipeIndex);
|
||||||
|
|
||||||
|
if (result != null) {
|
||||||
|
final RecipeId recipeId = RecipeId.of(handler, recipeIndex, ingredientStacks);
|
||||||
|
|
||||||
|
if (!showOnlyFavorites || FavoriteRecipes.getFavorite(recipeId) != null) {
|
||||||
|
synchronized (availableRecipes) {
|
||||||
|
availableRecipes.put(result, recipeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return availableRecipes;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean existsIngredients(List<PositionedStack> ingredients, Map<Item, List<ItemStack>> invByItem) {
|
||||||
|
final Map<ItemStack, Integer> usedItems = new HashMap<>();
|
||||||
|
|
||||||
|
for (PositionedStack pStack : ingredients) {
|
||||||
|
ItemStack used = null;
|
||||||
|
|
||||||
|
for (ItemStack permutation : pStack.items) {
|
||||||
|
final List<ItemStack> candidates = invByItem.get(permutation.getItem());
|
||||||
|
|
||||||
|
if (candidates == null) continue;
|
||||||
|
|
||||||
|
for (ItemStack is : candidates) {
|
||||||
|
if (usedItems.getOrDefault(is, is.stackSize) >= pStack.item.stackSize
|
||||||
|
&& NEIServerUtils.areStacksSameTypeCrafting(permutation, is)) {
|
||||||
|
used = is;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (used != null) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (used != null) {
|
||||||
|
usedItems.put(used, usedItems.getOrDefault(used, used.stackSize) - pStack.item.stackSize);
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return !usedItems.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,238 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
|
import com.google.gson.JsonParser;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
|
||||||
|
import codechicken.core.CommonUtils;
|
||||||
|
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
||||||
|
import codechicken.nei.ItemsGrid.MouseContext;
|
||||||
|
import codechicken.nei.recipe.Recipe.RecipeId;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.NBTJson;
|
||||||
|
|
||||||
|
public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemHistoryPanel.HistoryGridSlot, MouseContext>> {
|
||||||
|
|
||||||
|
protected File historyFile = null;
|
||||||
|
|
||||||
|
public static class HistoryGridSlot extends ItemsGridSlot {
|
||||||
|
|
||||||
|
public HistoryGridSlot(int slotIndex, int itemIndex, ItemStack item) {
|
||||||
|
super(slotIndex, itemIndex, item);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public RecipeId getRecipeId() {
|
||||||
|
return FavoriteRecipes.getFavorite(this.item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemHistoryPanel() {
|
||||||
|
this.grid = new ItemsGrid<>() {
|
||||||
|
|
||||||
|
protected List<HistoryGridSlot> gridMask;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onGridChanged() {
|
||||||
|
this.gridMask = null;
|
||||||
|
super.onGridChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<HistoryGridSlot> getMask() {
|
||||||
|
|
||||||
|
if (this.gridMask == null) {
|
||||||
|
this.gridMask = new ArrayList<>();
|
||||||
|
int itemIndex = 0;
|
||||||
|
for (int slotIndex = 0; slotIndex < this.rows * this.columns && itemIndex < size(); slotIndex++) {
|
||||||
|
if (!isInvalidSlot(slotIndex)) {
|
||||||
|
this.gridMask.add(new HistoryGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
|
||||||
|
itemIndex++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemHistoryPanel.this.updateLinePadding();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.gridMask;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected MouseContext getMouseContext(int mousex, int mousey) {
|
||||||
|
final HistoryGridSlot hovered = getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (hovered != null) {
|
||||||
|
return new MouseContext(
|
||||||
|
hovered.slotIndex,
|
||||||
|
hovered.slotIndex / this.columns,
|
||||||
|
hovered.slotIndex % this.columns);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
|
||||||
|
return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int mousex, int mousey) {
|
||||||
|
if (this.grid.size() > 0) {
|
||||||
|
super.draw(mousex, mousey);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int setPanelWidth(int width) {
|
||||||
|
final int columns = width / ItemsGrid.SLOT_SIZE;
|
||||||
|
final int useRows = NEIClientConfig.getIntSetting("inventory.history.useRows");
|
||||||
|
final int rows = (int) Math.min(Math.ceil(this.grid.size() * 1f / columns), useRows);
|
||||||
|
|
||||||
|
this.w = width;
|
||||||
|
this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
|
||||||
|
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void update() {
|
||||||
|
this.splittingLineColor = NEIClientConfig.getSetting("inventory.history.color").getHexValue();
|
||||||
|
super.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addItem(ItemStack stack) {
|
||||||
|
if (stack != null) {
|
||||||
|
ItemStack is = StackInfo.withAmount(stack, 0);
|
||||||
|
|
||||||
|
this.grid.realItems.removeIf(historyStack -> StackInfo.equalItemAndNBT(historyStack, stack, true));
|
||||||
|
this.grid.realItems.add(0, is);
|
||||||
|
|
||||||
|
if (this.grid.realItems.size() > Math.max(50, this.grid.rows * this.grid.columns)) {
|
||||||
|
this.grid.realItems.remove(this.grid.realItems.size() - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.grid.onItemsChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void load() {
|
||||||
|
|
||||||
|
if (!NEIClientConfig.getBooleanSetting("inventory.history.save")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String worldPath = "global";
|
||||||
|
|
||||||
|
if (NEIClientConfig.getBooleanSetting("inventory.history.worldSpecific")) {
|
||||||
|
worldPath = NEIClientConfig.getWorldPath();
|
||||||
|
}
|
||||||
|
|
||||||
|
final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
|
||||||
|
|
||||||
|
if (!dir.exists()) {
|
||||||
|
dir.mkdirs();
|
||||||
|
}
|
||||||
|
|
||||||
|
final File historyFile = new File(dir, "history.ini");
|
||||||
|
|
||||||
|
if (historyFile.equals(this.historyFile)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> itemStrings = Collections.emptyList();
|
||||||
|
|
||||||
|
if (historyFile.exists()) {
|
||||||
|
try (FileInputStream reader = new FileInputStream(historyFile)) {
|
||||||
|
NEIClientConfig.logger.info("Loading history from file {}", historyFile);
|
||||||
|
itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load history from file {}", historyFile, e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final JsonParser parser = new JsonParser();
|
||||||
|
final int maxSize = Math.max(50, this.grid.rows * this.grid.columns);
|
||||||
|
|
||||||
|
this.grid.realItems.clear();
|
||||||
|
|
||||||
|
for (String itemStr : itemStrings) {
|
||||||
|
|
||||||
|
if (itemStr.isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.grid.realItems.size() >= maxSize) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
JsonObject row = parser.parse(itemStr).getAsJsonObject();
|
||||||
|
NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(row.get("item"));
|
||||||
|
ItemStack itemStack = StackInfo.loadFromNBT(itemStackNBT);
|
||||||
|
|
||||||
|
if (itemStack != null) {
|
||||||
|
this.grid.realItems.add(itemStack);
|
||||||
|
} else {
|
||||||
|
NEIClientConfig.logger.warn(
|
||||||
|
"Failed to load history ItemStack from json string, the item no longer exists:\n{}",
|
||||||
|
itemStr);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load history ItemStack from json string:\n{}", itemStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.grid.onItemsChanged();
|
||||||
|
|
||||||
|
this.historyFile = historyFile;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void save() {
|
||||||
|
|
||||||
|
if (!NEIClientConfig.getBooleanSetting("inventory.history.save")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.historyFile == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<String> strings = new ArrayList<>();
|
||||||
|
|
||||||
|
for (ItemStack stack : this.grid.realItems) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
final JsonObject row = new JsonObject();
|
||||||
|
row.add("item", NBTJson.toJsonObject(StackInfo.itemStackToNBT(stack)));
|
||||||
|
strings.add(NBTJson.toJson(row));
|
||||||
|
} catch (JsonSyntaxException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to stringify history ItemStack to json string");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try (FileOutputStream output = new FileOutputStream(this.historyFile)) {
|
||||||
|
IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to save history list to file {}", this.historyFile, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,25 +1,28 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.ThreadOperationTimer.TimeoutException;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.ForkJoinPool;
|
||||||
|
import java.util.concurrent.ForkJoinWorkerThread;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
|
import com.google.common.collect.ArrayListMultimap;
|
||||||
|
import com.google.common.collect.ListMultimap;
|
||||||
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
import codechicken.nei.api.ItemFilter;
|
||||||
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
||||||
import codechicken.nei.api.ItemInfo;
|
import codechicken.nei.api.ItemInfo;
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
import codechicken.nei.util.ItemUntranslator;
|
||||||
import com.google.common.collect.ArrayListMultimap;
|
|
||||||
import com.google.common.collect.ListMultimap;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.concurrent.ForkJoinPool;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.IIcon;
|
|
||||||
|
|
||||||
public class ItemList {
|
public class ItemList {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fields are replaced atomically and contents never modified.
|
* Fields are replaced atomically and contents never modified.
|
||||||
*/
|
*/
|
||||||
@@ -32,13 +35,15 @@ public class ItemList {
|
|||||||
* Updates to this should be synchronised on this
|
* Updates to this should be synchronised on this
|
||||||
*/
|
*/
|
||||||
public static final List<ItemFilterProvider> itemFilterers = new LinkedList<>();
|
public static final List<ItemFilterProvider> itemFilterers = new LinkedList<>();
|
||||||
|
|
||||||
public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<>();
|
public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<>();
|
||||||
|
|
||||||
private static final HashSet<Item> erroredItems = new HashSet<>();
|
/**
|
||||||
private static final HashSet<String> stackTraces = new HashSet<>();
|
* Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
|
||||||
|
*/
|
||||||
|
public static boolean loadFinished;
|
||||||
|
|
||||||
public static class EverythingItemFilter implements ItemFilter {
|
public static class EverythingItemFilter implements ItemFilter {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
return true;
|
return true;
|
||||||
@@ -46,13 +51,29 @@ public class ItemList {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static class NothingItemFilter implements ItemFilter {
|
public static class NothingItemFilter implements ItemFilter {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class NegatedItemFilter implements ItemFilter {
|
||||||
|
|
||||||
|
public ItemFilter filter;
|
||||||
|
|
||||||
|
public NegatedItemFilter(ItemFilter filter) {
|
||||||
|
this.filter = filter;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean matches(ItemStack item) {
|
||||||
|
return this.filter == null || !this.filter.matches(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static class PatternItemFilter implements ItemFilter {
|
public static class PatternItemFilter implements ItemFilter {
|
||||||
|
|
||||||
public Pattern pattern;
|
public Pattern pattern;
|
||||||
|
|
||||||
public PatternItemFilter(Pattern pattern) {
|
public PatternItemFilter(Pattern pattern) {
|
||||||
@@ -61,35 +82,68 @@ public class ItemList {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
return pattern.matcher(ItemInfo.getSearchName(item)).find();
|
String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(item.getDisplayName());
|
||||||
|
|
||||||
|
if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
displayName = ItemUntranslator.getInstance().getItemStackDisplayName(item);
|
||||||
|
|
||||||
|
if (!displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (item.hasDisplayName()) {
|
||||||
|
displayName = EnumChatFormatting
|
||||||
|
.getTextWithoutFormattingCodes(item.getItem().getItemStackDisplayName(item));
|
||||||
|
|
||||||
|
if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (String alias : ItemInfo.getAliases(item)) {
|
||||||
|
if (this.pattern.matcher(StatCollector.translateToLocal(alias)).find()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class AllMultiItemFilter implements ItemFilter {
|
public static class AllMultiItemFilter implements ItemFilter {
|
||||||
|
|
||||||
public List<ItemFilter> filters;
|
public List<ItemFilter> filters;
|
||||||
|
|
||||||
public AllMultiItemFilter(List<ItemFilter> filters) {
|
public AllMultiItemFilter(List<ItemFilter> filters) {
|
||||||
this.filters = filters;
|
this.filters = filters;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public AllMultiItemFilter(ItemFilter... filters) {
|
||||||
|
this(new LinkedList<>(Arrays.asList(filters)));
|
||||||
|
}
|
||||||
|
|
||||||
public AllMultiItemFilter() {
|
public AllMultiItemFilter() {
|
||||||
this(new LinkedList<>());
|
this(new LinkedList<>());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
for (ItemFilter filter : filters)
|
for (ItemFilter filter : filters) try {
|
||||||
try {
|
if (filter != null && !filter.matches(item)) return false;
|
||||||
if (!filter.matches(item)) return false;
|
} catch (Exception e) {
|
||||||
} catch (Exception e) {
|
NEIClientConfig.logger
|
||||||
NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
|
.error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class AnyMultiItemFilter implements ItemFilter {
|
public static class AnyMultiItemFilter implements ItemFilter {
|
||||||
|
|
||||||
public List<ItemFilter> filters;
|
public List<ItemFilter> filters;
|
||||||
|
|
||||||
public AnyMultiItemFilter(List<ItemFilter> filters) {
|
public AnyMultiItemFilter(List<ItemFilter> filters) {
|
||||||
@@ -102,27 +156,29 @@ public class ItemList {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matches(ItemStack item) {
|
public boolean matches(ItemStack item) {
|
||||||
for (ItemFilter filter : filters)
|
for (ItemFilter filter : filters) try {
|
||||||
try {
|
if (filter != null && filter.matches(item)) return true;
|
||||||
if (filter.matches(item)) return true;
|
} catch (Exception e) {
|
||||||
} catch (Exception e) {
|
NEIClientConfig.logger
|
||||||
NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
|
.error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static interface ItemsLoadedCallback {
|
public static interface ItemsLoadedCallback {
|
||||||
|
|
||||||
public void itemsLoaded();
|
public void itemsLoaded();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean itemMatchesAll(ItemStack item, List<ItemFilter> filters) {
|
public static boolean itemMatchesAll(ItemStack item, List<ItemFilter> filters) {
|
||||||
for (ItemFilter filter : filters) {
|
for (ItemFilter filter : filters) {
|
||||||
try {
|
try {
|
||||||
if (!filter.matches(item)) return false;
|
if (filter != null && !filter.matches(item)) return false;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
|
NEIClientConfig.logger
|
||||||
|
.error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,7 +186,7 @@ public class ItemList {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use getItemListFilter().matches(item)
|
* @deprecated use getItemListFilter().matches(item)
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public static boolean itemMatches(ItemStack item) {
|
public static boolean itemMatches(ItemStack item) {
|
||||||
@@ -144,118 +200,38 @@ public class ItemList {
|
|||||||
public static List<ItemFilter> getItemFilters() {
|
public static List<ItemFilter> getItemFilters() {
|
||||||
LinkedList<ItemFilter> filters = new LinkedList<>();
|
LinkedList<ItemFilter> filters = new LinkedList<>();
|
||||||
synchronized (itemFilterers) {
|
synchronized (itemFilterers) {
|
||||||
for (ItemFilterProvider p : itemFilterers) filters.add(p.getFilter());
|
for (ItemFilterProvider p : itemFilterers) {
|
||||||
|
filters.add(p.getFilter());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return filters;
|
return filters;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
|
public static ForkJoinPool forkJoinPool;
|
||||||
private void damageSearch(Item item, List<ItemStack> permutations) {
|
|
||||||
HashSet<String> damageIconSet = new HashSet<>();
|
|
||||||
for (int damage = 0; damage < 16; damage++)
|
|
||||||
try {
|
|
||||||
ItemStack itemstack = new ItemStack(item, 1, damage);
|
|
||||||
IIcon icon = item.getIconIndex(itemstack);
|
|
||||||
String name = GuiContainerManager.concatenatedDisplayName(itemstack, false);
|
|
||||||
String s = name + "@" + (icon == null ? 0 : icon.hashCode());
|
|
||||||
if (!damageIconSet.contains(s)) {
|
|
||||||
damageIconSet.add(s);
|
|
||||||
permutations.add(itemstack);
|
|
||||||
}
|
|
||||||
} catch (TimeoutException t) {
|
|
||||||
throw t;
|
|
||||||
} catch (Throwable t) {
|
|
||||||
NEIServerUtils.logOnce(
|
|
||||||
t,
|
|
||||||
stackTraces,
|
|
||||||
"Ommiting " + item + ":" + damage + " "
|
|
||||||
+ item.getClass().getSimpleName(),
|
|
||||||
item.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
static {
|
||||||
@SuppressWarnings("unchecked")
|
final ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory() {
|
||||||
public void execute() {
|
|
||||||
// System.out.println("Executing NEI Item Loading");
|
|
||||||
ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
|
|
||||||
|
|
||||||
LinkedList<ItemStack> items = new LinkedList<>();
|
private int workerId;
|
||||||
LinkedList<ItemStack> permutations = new LinkedList<>();
|
|
||||||
ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
|
|
||||||
|
|
||||||
timer.setLimit(NEIClientConfig.getItemLoadingTimeout());
|
@Override
|
||||||
for (Item item : (Iterable<Item>) Item.itemRegistry) {
|
public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
|
||||||
if (interrupted()) return;
|
final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
|
||||||
|
worker.setName("NEI-worker-thread-" + workerId++);
|
||||||
if (item == null || erroredItems.contains(item)) continue;
|
return worker;
|
||||||
|
|
||||||
try {
|
|
||||||
timer.reset(item);
|
|
||||||
|
|
||||||
permutations.clear();
|
|
||||||
permutations.addAll(ItemInfo.itemOverrides.get(item));
|
|
||||||
|
|
||||||
if (permutations.isEmpty()) item.getSubItems(item, null, permutations);
|
|
||||||
|
|
||||||
if (permutations.isEmpty()) damageSearch(item, permutations);
|
|
||||||
|
|
||||||
permutations.addAll(ItemInfo.itemVariants.get(item));
|
|
||||||
|
|
||||||
timer.reset();
|
|
||||||
|
|
||||||
items.addAll(permutations);
|
|
||||||
itemMap.putAll(item, permutations);
|
|
||||||
} catch (Throwable t) {
|
|
||||||
NEIServerConfig.logger.error("Removing item: " + item + " from list.", t);
|
|
||||||
erroredItems.add(item);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
if (interrupted()) return;
|
int poolSize = Runtime.getRuntime().availableProcessors() * 2 / 3;
|
||||||
ItemList.items = items;
|
|
||||||
ItemList.itemMap = itemMap;
|
|
||||||
for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
|
|
||||||
|
|
||||||
updateFilter.restart();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
public static ForkJoinPool getPool(int poolSize) {
|
|
||||||
if (poolSize < 1) poolSize = 1;
|
if (poolSize < 1) poolSize = 1;
|
||||||
|
forkJoinPool = new ForkJoinPool(poolSize, factory, null, false);
|
||||||
return new ForkJoinPool(poolSize);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final int numProcessors = Runtime.getRuntime().availableProcessors();
|
// The item list pipeline lives in ItemListLoader; these references are kept for backward compatibility.
|
||||||
public static ForkJoinPool forkJoinPool = getPool(numProcessors * 2 / 3);
|
public static final RestartableTask loadItems = ItemListLoader.loadItems;
|
||||||
|
|
||||||
public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
|
public static final RestartableTask refreshItems = ItemListLoader.refreshItems;
|
||||||
@Override
|
|
||||||
public void execute() {
|
|
||||||
// System.out.println("Executing NEI Item Filtering");
|
|
||||||
ArrayList<ItemStack> filtered;
|
|
||||||
ItemFilter filter = getItemListFilter();
|
|
||||||
|
|
||||||
try {
|
public static final RestartableTask updateFilter = ItemListLoader.updateFilter;
|
||||||
filtered = ItemList.forkJoinPool
|
|
||||||
.submit(() -> items.parallelStream()
|
|
||||||
.filter(PresetsWidget::matches)
|
|
||||||
.filter(filter::matches)
|
|
||||||
.collect(Collectors.toCollection(ArrayList::new)))
|
|
||||||
.get();
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
filtered = new ArrayList<>();
|
|
||||||
e.printStackTrace();
|
|
||||||
stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (interrupted()) return;
|
|
||||||
ItemSorter.sort(filtered);
|
|
||||||
if (interrupted()) return;
|
|
||||||
ItemPanel.updateItemList(filtered);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use updateFilter.restart()
|
* @deprecated Use updateFilter.restart()
|
||||||
|
|||||||
@@ -0,0 +1,385 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.init.Blocks;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.IIcon;
|
||||||
|
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||||
|
|
||||||
|
import com.google.common.base.Throwables;
|
||||||
|
import com.google.common.collect.ArrayListMultimap;
|
||||||
|
import com.google.common.collect.ListMultimap;
|
||||||
|
|
||||||
|
import codechicken.nei.ItemList.ItemsLoadedCallback;
|
||||||
|
import codechicken.nei.ThreadOperationTimer.TimeoutException;
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.recipe.InformationHandler;
|
||||||
|
import codechicken.nei.recipe.RecipeHandlerRef;
|
||||||
|
import codechicken.nei.recipe.RepairRecipeHandler;
|
||||||
|
import codechicken.nei.search.TooltipFilter;
|
||||||
|
import cpw.mods.fml.common.FMLLog;
|
||||||
|
|
||||||
|
public class ItemListLoader {
|
||||||
|
|
||||||
|
private static final HashSet<Item> erroredItems = new HashSet<>();
|
||||||
|
private static final HashSet<String> stackTraces = new HashSet<>();
|
||||||
|
private static Map<ItemStack, Integer> ordering = new HashMap<>();
|
||||||
|
|
||||||
|
private ItemListLoader() {}
|
||||||
|
|
||||||
|
private static void damageSearch(Item item, List<ItemStack> permutations) {
|
||||||
|
final Set<String> damageIconSet = new HashSet<>();
|
||||||
|
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||||
|
|
||||||
|
for (int damage = 0; damage < 16; damage++) {
|
||||||
|
try {
|
||||||
|
final ItemStack itemstack = new ItemStack(item, 1, damage);
|
||||||
|
final IIcon icon = item.getIconIndex(itemstack);
|
||||||
|
final String key = itemstack.getDisplayName() + "@"
|
||||||
|
+ (icon == null ? 0 : icon.hashCode())
|
||||||
|
+ "@"
|
||||||
|
+ getInformation(itemstack, player);
|
||||||
|
|
||||||
|
if (damageIconSet.add(key)) {
|
||||||
|
permutations.add(itemstack);
|
||||||
|
}
|
||||||
|
} catch (TimeoutException t) {
|
||||||
|
throw t;
|
||||||
|
} catch (Throwable t) {
|
||||||
|
NEIServerUtils.logOnce(
|
||||||
|
t,
|
||||||
|
stackTraces,
|
||||||
|
"Ommiting " + item + ":" + damage + " " + item.getClass().getSimpleName(),
|
||||||
|
item.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getInformation(ItemStack stack, EntityPlayer player) {
|
||||||
|
try {
|
||||||
|
final List<String> tooltip = new ArrayList<>();
|
||||||
|
stack.getItem().addInformation(stack, player, tooltip, false);
|
||||||
|
return String.join("\n", tooltip);
|
||||||
|
} catch (Throwable ignored) {}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void updateOrdering(List<ItemStack> items) {
|
||||||
|
final Map<ItemStack, Integer> newOrdering = new HashMap<>();
|
||||||
|
|
||||||
|
if (!CollapsibleItems.isEmpty()) {
|
||||||
|
final HashMap<Integer, Integer> groups = new HashMap<>();
|
||||||
|
int orderIndex = 0;
|
||||||
|
|
||||||
|
for (ItemStack stack : items) {
|
||||||
|
final int groupIndex = CollapsibleItems.getGroupIndex(stack);
|
||||||
|
|
||||||
|
if (groupIndex == -1) {
|
||||||
|
newOrdering.put(stack, orderIndex++);
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (!groups.containsKey(groupIndex)) {
|
||||||
|
groups.put(groupIndex, orderIndex++);
|
||||||
|
}
|
||||||
|
|
||||||
|
newOrdering.put(stack, groups.get(groupIndex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
int orderIndex = 0;
|
||||||
|
|
||||||
|
for (ItemStack stack : items) {
|
||||||
|
newOrdering.put(stack, orderIndex++);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ordering = newOrdering;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ItemStack> getPermutations(Item item) {
|
||||||
|
final List<ItemStack> permutations = new LinkedList<>(ItemInfo.itemOverrides.get(item));
|
||||||
|
|
||||||
|
if (permutations.isEmpty()) {
|
||||||
|
item.getSubItems(item, null, permutations);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (permutations.isEmpty()) {
|
||||||
|
damageSearch(item, permutations);
|
||||||
|
}
|
||||||
|
|
||||||
|
permutations.addAll(ItemInfo.itemVariants.get(item));
|
||||||
|
|
||||||
|
return permutations.stream()
|
||||||
|
.filter(
|
||||||
|
stack -> stack.getItem() != null && stack.getItem().delegate.name() != null
|
||||||
|
&& !ItemInfo.isHidden(stack))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void runChecked(ItemStack stack, Runnable action, String reason) {
|
||||||
|
int hashOld = 0;
|
||||||
|
if (stack.hasTagCompound()) {
|
||||||
|
hashOld = stack.stackTagCompound.hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
action.run();
|
||||||
|
|
||||||
|
if (stack.hasTagCompound() && hashOld != stack.stackTagCompound.hashCode()) {
|
||||||
|
FMLLog.warning(
|
||||||
|
"NEI: Forced tag update with reason (" + reason + ") for " + stack + "(" + stack.getItem() + ")");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void forceTagCompoundInitialization(ItemStack stack) {
|
||||||
|
Item item = stack.getItem();
|
||||||
|
if (item == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (item instanceof IFluidContainerItem fluidItem) {
|
||||||
|
runChecked(stack, () -> fluidItem.getFluid(stack), "getFluid");
|
||||||
|
}
|
||||||
|
runChecked(stack, () -> item.isDamaged(stack), "isDamaged");
|
||||||
|
runChecked(stack, () -> item.getDamage(stack), "getDamage");
|
||||||
|
runChecked(stack, () -> item.showDurabilityBar(stack), "showDurabilityBar");
|
||||||
|
runChecked(stack, () -> item.getAttributeModifiers(stack), "getAttributeModifiers");
|
||||||
|
runChecked(stack, () -> item.getDurabilityForDisplay(stack), "getDurabilityForDisplay");
|
||||||
|
runChecked(stack, () -> item.getItemStackLimit(stack), "getItemStackLimit");
|
||||||
|
runChecked(stack, () -> item.getToolClasses(stack), "getToolClasses");
|
||||||
|
runChecked(stack, () -> item.getUnlocalizedNameInefficiently(stack), "getUnlocalizedNameInefficiently");
|
||||||
|
runChecked(stack, () -> item.hasEffect(stack), "hasEffect");
|
||||||
|
runChecked(stack, () -> item.getDigSpeed(stack, Blocks.stone, 0), "getDigSpeed");
|
||||||
|
|
||||||
|
/*
|
||||||
|
* unused... for now runChecked(stack, () -> GameRegistry.getFuelValue(stack), "getFuelValue");
|
||||||
|
* runChecked(stack, () -> item.getUnlocalizedName(stack), "getUnlocalizedName"); runChecked(stack, () ->
|
||||||
|
* item.doesContainerItemLeaveCraftingGrid(stack), "doesContainerItemLeaveCraftingGrid"); runChecked(stack, ()
|
||||||
|
* -> item.getItemUseAction(stack), "getItemUseAction"); runChecked(stack, () ->
|
||||||
|
* item.getMaxItemUseDuration(stack), "getMaxItemUseDuration"); runChecked(stack, () ->
|
||||||
|
* item.getPotionEffect(stack), "getPotionEffect"); runChecked(stack, () -> item.isPotionIngredient(stack),
|
||||||
|
* "isPotionIngredient"); runChecked(stack, () -> item.getRarity(stack), "getRarity"); runChecked(stack, () ->
|
||||||
|
* item.hasCustomEntity(stack), "hasCustomEntity"); runChecked(stack, () -> item.getSmeltingExperience(stack),
|
||||||
|
* "getSmeltingExperience"); runChecked(stack, () -> item.getMaxDamage(stack), "getMaxDamage");
|
||||||
|
* runChecked(stack, () -> item.getDamage(stack), "getDamage"); runChecked(stack, stack::isItemDamaged,
|
||||||
|
* "isItemDamaged"); runChecked(stack, () -> item.hasEffect(stack, 0), "hasEffect"); runChecked(stack, () ->
|
||||||
|
* item.getItemEnchantability(stack), "getItemEnchantability"); runChecked(stack, () ->
|
||||||
|
* item.isBeaconPayment(stack), "isBeaconPayment"); runChecked(stack, () -> item.getDamage(stack), "getDamage");
|
||||||
|
* runChecked(stack, () -> item.getDamage(stack), "getDamage"); runChecked(stack, () -> item.getDamage(stack),
|
||||||
|
* "getDamage");
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static List<ItemStack> gatherItems(ThreadOperationTimer timer) {
|
||||||
|
ItemSorter.instance.ordering.clear();
|
||||||
|
|
||||||
|
List<ItemStack> items = new ArrayList<>();
|
||||||
|
ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
|
||||||
|
ItemStackSet unique = new ItemStackSet();
|
||||||
|
|
||||||
|
final List<Item> registryItems = new ArrayList<>();
|
||||||
|
for (Item item : (Iterable<Item>) Item.itemRegistry) registryItems.add(item);
|
||||||
|
|
||||||
|
registryItems.parallelStream().forEach(item -> {
|
||||||
|
if (item == null || item.delegate.name() == null || erroredItems.contains(item)) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
timer.reset(item);
|
||||||
|
List<ItemStack> permutations = getPermutations(item);
|
||||||
|
timer.reset();
|
||||||
|
|
||||||
|
synchronized (itemMap) {
|
||||||
|
itemMap.putAll(item, permutations);
|
||||||
|
}
|
||||||
|
} catch (Throwable t) {
|
||||||
|
NEIServerConfig.logger.error(
|
||||||
|
"Removing item: {} from list.\n{}: {}",
|
||||||
|
item,
|
||||||
|
t.getMessage(),
|
||||||
|
Throwables.getStackTraceAsString(t));
|
||||||
|
erroredItems.add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
int index = 0;
|
||||||
|
for (Item item : (Iterable<Item>) Item.itemRegistry) {
|
||||||
|
for (ItemStack stack : itemMap.get(item)) {
|
||||||
|
ItemSorter.instance.ordering.put(stack, index++);
|
||||||
|
|
||||||
|
if (!unique.contains(stack)) {
|
||||||
|
unique.add(stack);
|
||||||
|
items.add(stack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ItemList.itemMap = itemMap;
|
||||||
|
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void buildItemCaches(List<ItemStack> items) {
|
||||||
|
SearchField.searchParser.clearCache();
|
||||||
|
TooltipFilter.clearCache();
|
||||||
|
InformationHandler.clearCache();
|
||||||
|
|
||||||
|
items.parallelStream().forEach(stack -> {
|
||||||
|
try {
|
||||||
|
forceTagCompoundInitialization(stack);
|
||||||
|
InformationHandler.populateStacks(stack);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
NEIServerConfig.logger.error(
|
||||||
|
"Failed to build caches for: {}\n{}: {}",
|
||||||
|
stack,
|
||||||
|
t.getMessage(),
|
||||||
|
Throwables.getStackTraceAsString(t));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void indexCollapsibleItems(List<ItemStack> items) {
|
||||||
|
CollapsibleItems.clearCache();
|
||||||
|
items.parallelStream().forEach(CollapsibleItems::putItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
if (!NEIClientConfig.isEnabled() || NEIClientUtils.mc().thePlayer == null) return;
|
||||||
|
|
||||||
|
final ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
|
||||||
|
LayoutManager.itemsLoaded = true;
|
||||||
|
ItemList.loadFinished = false;
|
||||||
|
warmTooltips.stop();
|
||||||
|
|
||||||
|
List<ItemStack> items = gatherItems(timer);
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
buildItemCaches(items);
|
||||||
|
indexCollapsibleItems(items);
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
ItemSorter.sort(items);
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
ItemList.items = items;
|
||||||
|
for (ItemsLoadedCallback callback : ItemList.loadCallbacks) callback.itemsLoaded();
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
updateOrdering(ItemList.items);
|
||||||
|
|
||||||
|
ItemList.loadFinished = true;
|
||||||
|
|
||||||
|
RepairRecipeHandler.findRepairRecipesOnceParallel();
|
||||||
|
RecipeHandlerRef.clearCache();
|
||||||
|
FavoriteRecipes.reload();
|
||||||
|
SubsetWidget.updateHiddenItems();
|
||||||
|
updateFilter.restart();
|
||||||
|
warmTooltips.restart();
|
||||||
|
loadBookmarks.restart();
|
||||||
|
loadHistory.restart();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final RestartableTask warmTooltips = new RestartableTask("NEI Tooltip Caching") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
if (!ItemList.loadFinished) return;
|
||||||
|
// Use the common pool, not ItemList.forkJoinPool, so it does not queue behind updateFilter.
|
||||||
|
ItemList.items.parallelStream().forEach(stack -> {
|
||||||
|
if (interrupted()) return;
|
||||||
|
try {
|
||||||
|
TooltipFilter.getSearchTooltip(stack);
|
||||||
|
} catch (Throwable ignored) {}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final RestartableTask loadBookmarks = new RestartableTask("NEI Bookmark Loading") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
ItemPanels.bookmarkPanel.load();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final RestartableTask loadHistory = new RestartableTask("NEI History Loading") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
ItemPanels.itemPanel.historyPanel.load();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final RestartableTask refreshItems = new RestartableTask("NEI Item Reordering") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
if (!ItemList.loadFinished) return;
|
||||||
|
|
||||||
|
final List<ItemStack> items = new ArrayList<>(ItemList.items);
|
||||||
|
|
||||||
|
indexCollapsibleItems(items);
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
ItemSorter.sort(items);
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
ItemList.items = items;
|
||||||
|
updateOrdering(ItemList.items);
|
||||||
|
|
||||||
|
FavoriteRecipes.reload();
|
||||||
|
SubsetWidget.updateHiddenItems();
|
||||||
|
updateFilter.restart();
|
||||||
|
loadBookmarks.restart();
|
||||||
|
loadHistory.restart();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute() {
|
||||||
|
|
||||||
|
if (!ItemList.loadFinished) return;
|
||||||
|
ItemFilter filter = ItemList.getItemListFilter();
|
||||||
|
ArrayList<ItemStack> filtered;
|
||||||
|
|
||||||
|
try {
|
||||||
|
filtered = ItemList.forkJoinPool.submit(
|
||||||
|
() -> ItemList.items.parallelStream().filter(filter::matches)
|
||||||
|
.collect(Collectors.toCollection(ArrayList::new)))
|
||||||
|
.get();
|
||||||
|
} catch (InterruptedException | ExecutionException e) {
|
||||||
|
filtered = new ArrayList<>();
|
||||||
|
e.printStackTrace();
|
||||||
|
stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
|
||||||
|
filtered.sort(Comparator.comparingInt(ordering::get));
|
||||||
|
|
||||||
|
if (interrupted()) return;
|
||||||
|
|
||||||
|
ItemPanel.updateItemList(filtered);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.lang.reflect.Modifier;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.entity.EntityList;
|
import net.minecraft.entity.EntityList;
|
||||||
@@ -14,140 +17,313 @@ import net.minecraft.init.Blocks;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.tileentity.TileEntityMobSpawner;
|
import net.minecraft.tileentity.TileEntityMobSpawner;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
import net.minecraftforge.client.MinecraftForgeClient;
|
||||||
|
import net.minecraftforge.common.util.ForgeDirection;
|
||||||
|
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class ItemMobSpawner extends ItemBlock {
|
public class ItemMobSpawner extends ItemBlock {
|
||||||
private static Map<Integer, EntityLiving> entityHashMap;
|
|
||||||
private static Map<Integer, String> IDtoNameMap;
|
|
||||||
public static int idPig;
|
|
||||||
private static boolean loaded;
|
|
||||||
|
|
||||||
public ItemMobSpawner() {
|
private static final Map<Integer, EntityLiving> entityHashMap = new ConcurrentHashMap<>();
|
||||||
super(Blocks.mob_spawner);
|
private static final Map<Integer, String> IDtoNameMap = new ConcurrentHashMap<>();
|
||||||
|
private static final Map<Class<? extends Entity>, String> ENTITY_CLASS_TO_NAME_CACHE = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
hasSubtypes = true;
|
public static int idPig = 90;
|
||||||
MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
|
private static volatile boolean loaded = false;
|
||||||
|
|
||||||
entityHashMap = new HashMap<>();
|
// For asm
|
||||||
IDtoNameMap = new HashMap<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* These are ASM translated from BlockMobSpawner
|
|
||||||
*/
|
|
||||||
public static int placedX;
|
public static int placedX;
|
||||||
|
|
||||||
public static int placedY;
|
public static int placedY;
|
||||||
public static int placedZ;
|
public static int placedZ;
|
||||||
|
|
||||||
|
public static void setLastPlacedPosition(int x, int y, int z) {
|
||||||
|
placedX = x;
|
||||||
|
placedY = y;
|
||||||
|
placedZ = z;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int[] getLastPlacedPosition() {
|
||||||
|
return new int[] { placedX, placedY, placedZ };
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemMobSpawner() {
|
||||||
|
super(Blocks.mob_spawner);
|
||||||
|
hasSubtypes = true;
|
||||||
|
MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IIcon getIconFromDamage(int par1) {
|
public IIcon getIconFromDamage(int meta) {
|
||||||
return Blocks.mob_spawner.getBlockTextureFromSide(0);
|
return Blocks.mob_spawner.getBlockTextureFromSide(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean onItemUse(
|
@Override
|
||||||
ItemStack itemstack,
|
public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int side,
|
||||||
EntityPlayer entityplayer,
|
float hitX, float hitY, float hitZ) {
|
||||||
World world,
|
int targetX = x;
|
||||||
int x,
|
int targetY = y;
|
||||||
int y,
|
int targetZ = z;
|
||||||
int z,
|
|
||||||
int par7,
|
if (!world.getBlock(x, y, z).isReplaceable(world, x, y, z)) {
|
||||||
float par8,
|
ForgeDirection direction = ForgeDirection.getOrientation(side);
|
||||||
float par9,
|
targetX += direction.offsetX;
|
||||||
float par10) {
|
targetY += direction.offsetY;
|
||||||
if (super.onItemUse(itemstack, entityplayer, world, x, y, z, par7, par8, par9, par10) && world.isRemote) {
|
targetZ += direction.offsetZ;
|
||||||
TileEntityMobSpawner tileentitymobspawner =
|
}
|
||||||
(TileEntityMobSpawner) world.getTileEntity(placedX, placedY, placedZ);
|
|
||||||
if (tileentitymobspawner != null) {
|
placedX = targetX;
|
||||||
setDefaultTag(itemstack);
|
placedY = targetY;
|
||||||
String mobtype = IDtoNameMap.get(itemstack.getItemDamage());
|
placedZ = targetZ;
|
||||||
if (mobtype != null) {
|
|
||||||
NEICPH.sendMobSpawnerID(placedX, placedY, placedZ, mobtype);
|
String mobType = getMobTypeFromItemStack(itemstack);
|
||||||
tileentitymobspawner.func_145881_a().setEntityName(mobtype);
|
|
||||||
|
boolean placed = super.onItemUse(itemstack, entityplayer, world, x, y, z, side, hitX, hitY, hitZ);
|
||||||
|
|
||||||
|
if (placed) {
|
||||||
|
TileEntity tileEntity = world.getTileEntity(targetX, targetY, targetZ);
|
||||||
|
|
||||||
|
if (tileEntity instanceof TileEntityMobSpawner spawner && mobType != null) {
|
||||||
|
spawner.func_145881_a().setEntityName(mobType);
|
||||||
|
|
||||||
|
if (!world.isRemote) {
|
||||||
|
world.markBlockForUpdate(targetX, targetY, targetZ);
|
||||||
|
NEICPH.sendMobSpawnerID(targetX, targetY, targetZ, mobType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getMobTypeFromItemStack(ItemStack stack) {
|
||||||
|
int meta = getValidMetaData(stack);
|
||||||
|
return IDtoNameMap.get(meta);
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getValidMetaData(ItemStack stack) {
|
||||||
|
int meta = stack.getItemDamage();
|
||||||
|
if (meta == 0 || !IDtoNameMap.containsKey(meta)) {
|
||||||
|
return idPig;
|
||||||
|
}
|
||||||
|
return meta;
|
||||||
|
}
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
@Override
|
@Override
|
||||||
public void addInformation(ItemStack itemstack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> tooltip, boolean advanced) {
|
||||||
setDefaultTag(itemstack);
|
int meta = getValidMetaData(itemstack);
|
||||||
int meta = itemstack.getItemDamage();
|
EntityLiving entity = getEntity(meta);
|
||||||
if (meta == 0) {
|
String mobName = IDtoNameMap.get(meta);
|
||||||
meta = idPig;
|
|
||||||
|
if (entity != null && mobName != null) {
|
||||||
|
EnumChatFormatting color = (entity instanceof IMob) ? EnumChatFormatting.DARK_RED
|
||||||
|
: EnumChatFormatting.DARK_AQUA;
|
||||||
|
tooltip.add(color + mobName);
|
||||||
}
|
}
|
||||||
Entity e = getEntity(meta);
|
|
||||||
list.add("\u00A7" + (e instanceof IMob ? "4" : "3") + IDtoNameMap.get(meta));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static EntityLiving getEntity(int ID) {
|
public static EntityLiving getEntity(int id) {
|
||||||
EntityLiving e = entityHashMap.get(ID);
|
EntityLiving cached = entityHashMap.get(id);
|
||||||
if (e == null) {
|
if (cached != null) {
|
||||||
World world = NEIClientUtils.mc().theWorld;
|
return cached;
|
||||||
loadSpawners(world);
|
|
||||||
Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
|
|
||||||
try {
|
|
||||||
e = (EntityLiving)
|
|
||||||
clazz.getConstructor(new Class[] {World.class}).newInstance(world);
|
|
||||||
} catch (Throwable t) {
|
|
||||||
if (clazz == null)
|
|
||||||
NEIClientConfig.logger.error("Null class for entity (" + ID + ", " + IDtoNameMap.get(ID));
|
|
||||||
else NEIClientConfig.logger.error("Error creating instance of entity: " + clazz.getName(), t);
|
|
||||||
e = getEntity(idPig);
|
|
||||||
}
|
|
||||||
entityHashMap.put(ID, e);
|
|
||||||
}
|
}
|
||||||
return e;
|
|
||||||
|
loadSpawners();
|
||||||
|
|
||||||
|
Class<?> entityClass = EntityList.IDtoClassMapping.get(id);
|
||||||
|
World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
|
||||||
|
|
||||||
|
if (isInvalidEntityClass(entityClass)) {
|
||||||
|
return cacheFallback(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
EntityLiving entity = createEntityInstance(entityClass, world, id);
|
||||||
|
if (entity != null) {
|
||||||
|
entityHashMap.put(id, entity);
|
||||||
|
}
|
||||||
|
|
||||||
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void clearEntityReferences(World newWorld) {
|
private static boolean isInvalidEntityClass(Class<?> entityClass) {
|
||||||
entityHashMap.values().removeIf(e -> e.worldObj != newWorld);
|
if (entityClass == null) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int modifiers = entityClass.getModifiers();
|
||||||
|
if (Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers)) {
|
||||||
|
NEIClientConfig.logger.warn("Skipping abstract/interface entity class: {}", entityClass.getName());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!EntityLiving.class.isAssignableFrom(entityClass)) {
|
||||||
|
NEIClientConfig.logger.warn("Skipping non-EntityLiving class: {}", entityClass.getName());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setDefaultTag(ItemStack itemstack) {
|
@SuppressWarnings("unchecked")
|
||||||
if (!IDtoNameMap.containsKey(itemstack.getItemDamage())) itemstack.setItemDamage(idPig);
|
private static EntityLiving createEntityInstance(Class<?> entityClass, World world, int id) {
|
||||||
|
if (entityClass == null || world == null) {
|
||||||
|
NEIClientConfig.logger.debug("World or entity class is null, using fallback for ID: {}", id);
|
||||||
|
return getFallbackEntity(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Class<? extends EntityLiving> livingClass = (Class<? extends EntityLiving>) entityClass;
|
||||||
|
return livingClass.getConstructor(World.class).newInstance(world);
|
||||||
|
} catch (Throwable t) {
|
||||||
|
logEntityCreationError(entityClass, id, t);
|
||||||
|
return getFallbackEntity(id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void loadSpawners(World world) {
|
private static void logEntityCreationError(Class<?> entityClass, int id, Throwable t) {
|
||||||
if (loaded) return;
|
String entityName = IDtoNameMap.getOrDefault(id, "unknown");
|
||||||
loaded = true;
|
if (entityClass == null) {
|
||||||
HashMap<Class<Entity>, String> classToStringMapping =
|
NEIClientConfig.logger
|
||||||
(HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
|
.error("Failed to create entity instance: Class is null for ID {}, Name {}", id, entityName, t);
|
||||||
HashMap<Class<Entity>, Integer> classToIDMapping =
|
} else {
|
||||||
(HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
|
NEIClientConfig.logger.error(
|
||||||
for (Class<Entity> eclass : classToStringMapping.keySet()) {
|
"Failed to create instance of entity: Class {}, ID {}, Name {}",
|
||||||
if (!EntityLiving.class.isAssignableFrom(eclass)) continue;
|
entityClass.getName(),
|
||||||
try {
|
id,
|
||||||
EntityLiving entityliving = (EntityLiving)
|
entityName,
|
||||||
eclass.getConstructor(new Class[] {World.class}).newInstance(world);
|
t);
|
||||||
entityliving.isChild();
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int id = classToIDMapping.get(eclass);
|
private static EntityLiving cacheFallback(int id) {
|
||||||
String name = classToStringMapping.get(eclass);
|
EntityLiving fallback = getFallbackEntity(id);
|
||||||
|
if (fallback != null) {
|
||||||
|
entityHashMap.put(id, fallback);
|
||||||
|
}
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
if (name.equals("EnderDragon")) continue;
|
private static EntityLiving getFallbackEntity(int originalId) {
|
||||||
|
EntityLiving pig = entityHashMap.get(idPig);
|
||||||
|
if (pig == null) {
|
||||||
|
World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
|
||||||
|
|
||||||
IDtoNameMap.put(id, name);
|
if (world != null) {
|
||||||
|
try {
|
||||||
if (name.equals("Pig")) idPig = id;
|
pig = new EntityPig(world);
|
||||||
} catch (Throwable ignored) {
|
entityHashMap.put(idPig, pig);
|
||||||
|
NEIClientConfig.logger.debug("Created fallback pig entity for ID: {}", originalId);
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger
|
||||||
|
.error("Failed to create fallback pig entity for original ID: {}", originalId, e);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
NEIClientConfig.logger.warn("World is null, cannot create fallback entity for ID: {}", originalId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
IDtoNameMap.entrySet()
|
return pig;
|
||||||
.removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class
|
}
|
||||||
&& !e.getValue().equals("Pig"));
|
|
||||||
|
public static void clearEntityReferences() {
|
||||||
|
entityHashMap.clear();
|
||||||
|
NEIClientConfig.logger.debug("Cleared all entity references from cache");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void loadSpawners() {
|
||||||
|
if (loaded) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
synchronized (ItemMobSpawner.class) {
|
||||||
|
try {
|
||||||
|
for (Map.Entry<Class<? extends Entity>, String> entry : EntityList.classToStringMapping.entrySet()) {
|
||||||
|
|
||||||
|
Class<? extends Entity> clazz = entry.getKey();
|
||||||
|
String name = entry.getValue();
|
||||||
|
|
||||||
|
if (shouldRegisterEntity(clazz, name)) {
|
||||||
|
Integer id = (Integer) EntityList.classToIDMapping.get(clazz);
|
||||||
|
if (id != null) {
|
||||||
|
IDtoNameMap.put(id, name);
|
||||||
|
ENTITY_CLASS_TO_NAME_CACHE.put(clazz, name);
|
||||||
|
|
||||||
|
if ("Pig".equals(name)) {
|
||||||
|
idPig = id;
|
||||||
|
NEIClientConfig.logger.debug("Set pig entity ID to: {}", id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
loaded = true;
|
||||||
|
NEIClientConfig.logger.info("Loaded {} spawner entity mappings", IDtoNameMap.size());
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
NEIClientConfig.logger.error("Error loading spawners from entity list", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean shouldRegisterEntity(Class<? extends Entity> clazz, String name) {
|
||||||
|
if (clazz == null || name == null || name.trim().isEmpty()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!EntityLiving.class.isAssignableFrom(clazz)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ("EnderDragon".equals(name) || "Giant".equals(name)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
|
||||||
if (!NEIClientConfig.hasSMPCounterPart()) list.add(new ItemStack(item));
|
if (!NEIClientConfig.hasSMPCounterPart()) {
|
||||||
else for (int i : IDtoNameMap.keySet()) list.add(new ItemStack(item, 1, i));
|
list.add(new ItemStack(item));
|
||||||
|
} else {
|
||||||
|
loadSpawners();
|
||||||
|
for (int id : IDtoNameMap.keySet()) {
|
||||||
|
ItemStack stack = new ItemStack(item, 1, id);
|
||||||
|
list.add(stack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getEntityNameForMeta(int meta) {
|
||||||
|
loadSpawners();
|
||||||
|
return IDtoNameMap.getOrDefault(meta, IDtoNameMap.getOrDefault(idPig, "Pig"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isValidEntityMeta(int meta) {
|
||||||
|
loadSpawners();
|
||||||
|
return IDtoNameMap.containsKey(meta) || meta == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Map<Integer, String> getRegisteredSpawnerEntities() {
|
||||||
|
loadSpawners();
|
||||||
|
return Collections.unmodifiableMap(IDtoNameMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isEntityValidForSpawner(Class<? extends Entity> entityClass) {
|
||||||
|
if (entityClass == null) return false;
|
||||||
|
|
||||||
|
String name = ENTITY_CLASS_TO_NAME_CACHE.get(entityClass);
|
||||||
|
if (name == null) {
|
||||||
|
name = EntityList.classToStringMapping.get(entityClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
return name != null && shouldRegisterEntity(entityClass, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,17 +1,21 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.drawRect;
|
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import javax.annotation.Nullable;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class ItemPanel extends PanelWidget {
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.ItemsPanelGrid.ItemsPanelGridSlot;
|
||||||
|
import codechicken.nei.util.NEIMouseUtils;
|
||||||
|
|
||||||
|
public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Backwards compat :-/
|
* Backwards compat :-/
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@@ -28,59 +32,50 @@ public class ItemPanel extends PanelWidget {
|
|||||||
return super.getStackMouseOver(mousex, mousey);
|
return super.getStackMouseOver(mousex, mousey);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Button more;
|
public ItemHistoryPanel historyPanel = new ItemHistoryPanel();
|
||||||
public Button less;
|
public ItemCraftablesPanel craftablesPanel = new ItemCraftablesPanel();
|
||||||
public ItemQuantityField quantity;
|
protected Button toggleGroups;
|
||||||
|
|
||||||
public static class ItemPanelSlot {
|
@Deprecated
|
||||||
public ItemStack item;
|
public static class ItemPanelSlot extends ItemsPanelGridSlot {
|
||||||
public int slotIndex;
|
|
||||||
|
|
||||||
public ItemPanelSlot(int idx, ItemStack stack) {
|
@Deprecated
|
||||||
slotIndex = idx;
|
public ItemPanelSlot(int idx, ItemStack item) {
|
||||||
item = stack;
|
this(idx, 0, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public ItemPanelSlot(int idx) {
|
public ItemPanelSlot(int idx) {
|
||||||
this(idx, ItemPanels.itemPanel.getGrid().getItem(idx));
|
this(idx, 0, ItemPanels.itemPanel.getGrid().getItem(idx));
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static class ItemPanelGrid extends ItemsGrid {
|
|
||||||
public ArrayList<ItemStack> newItems;
|
|
||||||
|
|
||||||
public void setItems(ArrayList<ItemStack> items) {
|
|
||||||
newItems = items;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void refresh(GuiContainer gui) {
|
private ItemPanelSlot(int slotIndex, int itemIndex, ItemStack item) {
|
||||||
|
super(slotIndex, itemIndex, item);
|
||||||
|
}
|
||||||
|
|
||||||
if (newItems != null) {
|
protected static ItemPanelSlot of(ItemsPanelGridSlot slot) {
|
||||||
realItems = newItems;
|
|
||||||
newItems = null;
|
if (slot != null) {
|
||||||
onGridChanged();
|
ItemPanelSlot customSlot = new ItemPanelSlot(slot.slotIndex, slot.itemIndex, slot.item);
|
||||||
|
customSlot.groupIndex = slot.groupIndex;
|
||||||
|
customSlot.displayName = slot.displayName;
|
||||||
|
customSlot.bgItemStack = slot.bgItemStack;
|
||||||
|
customSlot.groupSize = slot.groupSize;
|
||||||
|
customSlot.extended = slot.extended;
|
||||||
|
customSlot.bgColor = slot.bgColor;
|
||||||
|
return customSlot;
|
||||||
}
|
}
|
||||||
|
|
||||||
super.refresh(gui);
|
return null;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawSlotOutline(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
|
|
||||||
if (PresetsWidget.inEditMode()) {
|
|
||||||
if (!PresetsWidget.isHidden(getItem(slotIdx))) drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);
|
|
||||||
} else {
|
|
||||||
super.drawSlotOutline(focused, slotIdx, rect);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemPanel() {
|
public ItemPanel() {
|
||||||
grid = new ItemPanelGrid();
|
this.grid = new ItemsPanelGrid();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void updateItemList(ArrayList<ItemStack> newItems) {
|
public static void updateItemList(ArrayList<ItemStack> newItems) {
|
||||||
((ItemPanelGrid) ItemPanels.itemPanel.getGrid()).setItems(newItems);
|
ItemPanels.itemPanel.getGrid().setItems(newItems);
|
||||||
ItemPanels.itemPanel.realItems = newItems;
|
ItemPanels.itemPanel.realItems = newItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,113 +83,195 @@ public class ItemPanel extends PanelWidget {
|
|||||||
public void init() {
|
public void init() {
|
||||||
super.init();
|
super.init();
|
||||||
|
|
||||||
more = new Button("+") {
|
toggleGroups = new Button("G") {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public String getRenderLabel() {
|
||||||
if (rightclick) return false;
|
return NEIClientUtils.translate("itempanel.collapsed.button");
|
||||||
|
|
||||||
int modifier = NEIClientUtils.controlKey() ? 64 : NEIClientUtils.shiftKey() ? 10 : 1;
|
|
||||||
int quantity = NEIClientConfig.getItemQuantity() + modifier;
|
|
||||||
|
|
||||||
if (quantity < 0) {
|
|
||||||
quantity = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemPanels.itemPanel.quantity.setText(Integer.toString(quantity));
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
less = new Button("-") {
|
@Override
|
||||||
|
public String getButtonTip() {
|
||||||
|
return NEIClientUtils.translate("itempanel.collapsed.button.tip");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (rightclick) return false;
|
CollapsibleItems.toggleGroups(rightclick ? false : null);
|
||||||
|
ItemList.updateFilter.restart();
|
||||||
int modifier = NEIClientUtils.controlKey() ? -64 : NEIClientUtils.shiftKey() ? -10 : -1;
|
|
||||||
int quantity = NEIClientConfig.getItemQuantity() + modifier;
|
|
||||||
|
|
||||||
if (quantity < 0) {
|
|
||||||
quantity = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemPanels.itemPanel.quantity.setText(Integer.toString(quantity));
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
quantity = new ItemQuantityField("quantity");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Override
|
||||||
public void scroll(int i) {
|
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
|
||||||
grid.shiftPage(i);
|
// use ItemPanelSlot for Backwards compat
|
||||||
|
return ItemPanelSlot.of(this.grid.getSlotMouseOver(mousex, mousey));
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getLabelText() {
|
public String getLabelText() {
|
||||||
return String.format("(%d/%d)", getPage(), Math.max(1, getNumPages()));
|
return String.format("%d/%d", getPage(), Math.max(1, getNumPages()));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String getPositioningSettingName() {
|
@Override
|
||||||
return "world.panels.items";
|
public Rectangle4i calculateBounds(GuiContainer gui) {
|
||||||
|
final int maxWidth = (gui.width - 176) / 2 - PADDING * 2;
|
||||||
|
final int maxHeight = gui.height - PADDING * 2;
|
||||||
|
final int freeSpace = (gui.width - gui.xSize) / 2 - PADDING * 2;
|
||||||
|
|
||||||
|
final int paddingLeft = (int) Math
|
||||||
|
.ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.left").getIntValue() / 100000.0);
|
||||||
|
final int paddingTop = (int) Math
|
||||||
|
.ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.top").getIntValue() / 100000.0);
|
||||||
|
final int paddingRight = (int) Math
|
||||||
|
.ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.right").getIntValue() / 100000.0);
|
||||||
|
final int paddingBottom = (int) Math
|
||||||
|
.ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.bottom").getIntValue() / 100000.0);
|
||||||
|
|
||||||
|
final int width = Math.max(
|
||||||
|
ItemsGrid.SLOT_SIZE,
|
||||||
|
snapDownToMultiple(
|
||||||
|
Math.min(freeSpace - paddingRight, maxWidth - paddingLeft - paddingRight),
|
||||||
|
ItemsGrid.SLOT_SIZE));
|
||||||
|
final int height = Math.max(ItemsGrid.SLOT_SIZE, maxHeight - paddingTop - paddingBottom);
|
||||||
|
|
||||||
|
return new Rectangle4i(gui.width - width - PADDING - paddingRight, paddingTop + PADDING, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getMarginLeft(GuiContainer gui) {
|
@Override
|
||||||
return (gui.width + gui.xSize) / 2 + PADDING;
|
protected int resizeHeader(GuiContainer gui) {
|
||||||
}
|
int marginTop = super.resizeHeader(gui);
|
||||||
|
|
||||||
public int getMarginTop(GuiContainer gui) {
|
toggleGroups.w = pageNext.w;
|
||||||
return PADDING;
|
toggleGroups.h = pageNext.h;
|
||||||
}
|
toggleGroups.y = pageNext.y;
|
||||||
|
toggleGroups.x = pageNext.x - toggleGroups.w - 2;
|
||||||
|
|
||||||
public int getWidth(GuiContainer gui) {
|
return marginTop;
|
||||||
return gui.width - (gui.xSize + gui.width) / 2 - PADDING * 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getHeight(GuiContainer gui) {
|
|
||||||
return gui.height - getMarginTop(gui) - PADDING;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int resizeFooter(GuiContainer gui) {
|
protected int resizeFooter(GuiContainer gui) {
|
||||||
if (!NEIClientConfig.showItemQuantityWidget()) return 0;
|
int footerY = y + h;
|
||||||
|
int footerHeight = 0;
|
||||||
|
|
||||||
final int BUTTON_SIZE = 16;
|
if (grid.getPerPage() == 0) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
more.w = less.w = BUTTON_SIZE;
|
if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
|
||||||
more.h = less.h = quantity.h = BUTTON_SIZE;
|
footerY = LayoutManager.quantity.y;
|
||||||
|
footerHeight = LayoutManager.quantity.h + PanelWidget.PADDING;
|
||||||
|
}
|
||||||
|
|
||||||
less.x = x;
|
if (NEIClientConfig.showHistoryPanelWidget()) {
|
||||||
more.x = x + w - BUTTON_SIZE;
|
historyPanel.x = x;
|
||||||
more.y = less.y = quantity.y = y + h - BUTTON_SIZE;
|
|
||||||
|
|
||||||
quantity.x = x + BUTTON_SIZE + 2;
|
if (historyPanel.setPanelWidth(w) != 0) {
|
||||||
quantity.w = more.x - quantity.x - 2;
|
footerY = historyPanel.y = footerY - historyPanel.h;
|
||||||
|
footerHeight += historyPanel.h;
|
||||||
|
}
|
||||||
|
|
||||||
return BUTTON_SIZE + 2;
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.showCraftablesPanelWidget()) {
|
||||||
|
craftablesPanel.x = x;
|
||||||
|
|
||||||
|
if (craftablesPanel.setPanelWidth(w) != 0) {
|
||||||
|
footerY = craftablesPanel.y = footerY - craftablesPanel.h;
|
||||||
|
footerHeight += craftablesPanel.h;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return footerHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setVisible() {
|
public void setVisible() {
|
||||||
super.setVisible();
|
super.setVisible();
|
||||||
|
|
||||||
if (grid.getPerPage() > 0 && NEIClientConfig.showItemQuantityWidget()) {
|
if (grid.getPerPage() > 0) {
|
||||||
LayoutManager.addWidget(more);
|
|
||||||
LayoutManager.addWidget(less);
|
|
||||||
LayoutManager.addWidget(quantity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected ItemStack getDraggedStackWithQuantity(int mouseDownSlot) {
|
if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
|
||||||
ItemStack stack = grid.getItem(mouseDownSlot);
|
LayoutManager.addWidget(toggleGroups);
|
||||||
|
|
||||||
if (stack != null) {
|
|
||||||
int amount = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
|
|
||||||
|
|
||||||
if (amount == 0) {
|
|
||||||
amount = stack.getMaxStackSize();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NEIServerUtils.copyStack(stack, amount);
|
if (NEIClientConfig.showCraftablesPanelWidget()) {
|
||||||
|
LayoutManager.addWidget(craftablesPanel);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.showHistoryPanelWidget()) {
|
||||||
|
LayoutManager.addWidget(historyPanel);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void resize(GuiContainer gui) {
|
||||||
|
super.resize(gui);
|
||||||
|
this.historyPanel.resize(gui);
|
||||||
|
this.craftablesPanel.resize(gui);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
|
||||||
|
return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> handleItemTooltip(ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
|
||||||
|
|
||||||
|
if (!this.grid.forceExpand && !currenttip.isEmpty()) {
|
||||||
|
final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (hoverSlot != null && hoverSlot.groupIndex >= 0
|
||||||
|
&& NEIClientConfig.getBooleanSetting("inventory.collapsibleItems.customName")
|
||||||
|
&& !hoverSlot.extended
|
||||||
|
&& !"".equals(hoverSlot.displayName)) {
|
||||||
|
currenttip.clear();
|
||||||
|
currenttip.add(hoverSlot.displayName + GuiDraw.TOOLTIP_LINESPACE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return super.handleItemTooltip(itemstack, mousex, mousey, currenttip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean handleClick(int mousex, int mousey, int button) {
|
||||||
|
|
||||||
|
if (button == 0 && !this.grid.forceExpand && NEIClientUtils.altKey()) {
|
||||||
|
final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (hoverSlot != null && hoverSlot.groupIndex >= 0) {
|
||||||
|
CollapsibleItems.setExpanded(hoverSlot.groupIndex, !hoverSlot.extended);
|
||||||
|
this.grid.setItems(this.grid.rawItems);
|
||||||
|
NEIClientUtils.playClickSound();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.handleClick(mousex, mousey, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
|
||||||
|
final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (!this.grid.forceExpand && hoverSlot != null && hoverSlot.groupIndex >= 0 && hoverSlot.groupSize > 1) {
|
||||||
|
final String message = hoverSlot.extended ? "itempanel.collapsed.hint.collapse"
|
||||||
|
: "itempanel.collapsed.hint.expand";
|
||||||
|
hotkeys.put(
|
||||||
|
NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
|
||||||
|
NEIClientUtils.translate(message, hoverSlot.groupSize));
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.handleHotkeys(mousex, mousey, hotkeys);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean containsWithSubpanels(int px, int py) {
|
||||||
|
return contains(px, py) || NEIClientConfig.showHistoryPanelWidget() && this.historyPanel.contains(px, py)
|
||||||
|
|| NEIClientConfig.showCraftablesPanelWidget() && this.craftablesPanel.contains(px, py);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public class ItemPanels {
|
public class ItemPanels {
|
||||||
|
|
||||||
public static final ItemPanel itemPanel = new ItemPanel();
|
public static final ItemPanel itemPanel = new ItemPanel();
|
||||||
public static final BookmarkPanel bookmarkPanel = new BookmarkPanel();
|
public static final BookmarkPanel bookmarkPanel = new BookmarkPanel();
|
||||||
}
|
}
|
||||||
@@ -1,26 +1,94 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
|
||||||
public class ItemQuantityField extends TextField {
|
public class ItemQuantityField extends TextField {
|
||||||
|
|
||||||
public ItemQuantityField(String ident) {
|
public ItemQuantityField(String ident) {
|
||||||
super(ident);
|
super(ident);
|
||||||
centered = true;
|
centered = true;
|
||||||
field.setDisabledTextColour(0xFF303030);
|
field.setDisabledTextColour(0xFF303030);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int intValue() {
|
@Override
|
||||||
return intValue(text());
|
protected void initInternalTextField() {
|
||||||
|
field = new FormattedTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0) {
|
||||||
|
|
||||||
|
{
|
||||||
|
setPlaceholder(NEIClientUtils.translate("itempanel.quantity.default"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getText() {
|
||||||
|
String text = super.getText();
|
||||||
|
return !isFocused() && "0".equals(text) ? "" : text;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean beforeWrite(String text) {
|
||||||
|
if (text == null || text.isEmpty()) return true;
|
||||||
|
try {
|
||||||
|
return Integer.parseInt(text) >= 0;
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean textboxKeyTyped(char keyChar, int keyID) {
|
||||||
|
if (!isFocused()) return false;
|
||||||
|
|
||||||
|
if (super.textboxKeyTyped(keyChar, keyID)) {
|
||||||
|
return true;
|
||||||
|
} else if (keyID == Keyboard.KEY_DOWN) {
|
||||||
|
setText(Integer.toString(Math.max(0, getInteger() - 1)));
|
||||||
|
return true;
|
||||||
|
} else if (keyID == Keyboard.KEY_UP) {
|
||||||
|
setText(Integer.toString(getInteger() + 1));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getInteger() {
|
||||||
|
try {
|
||||||
|
return Math.max(0, Integer.parseInt(text()));
|
||||||
|
} catch (NumberFormatException nfe) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
field.setMaxStringLength(maxSearchLength);
|
||||||
|
field.setCursorPositionZero();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int intValue(String s) {
|
private int getInteger() {
|
||||||
try {
|
try {
|
||||||
return Math.max(0, Integer.parseInt(s));
|
return Math.max(0, Integer.parseInt(text()));
|
||||||
} catch (NumberFormatException nfe) {
|
} catch (NumberFormatException nfe) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static ItemStack prepareStackWithQuantity(ItemStack stack, long amount) {
|
||||||
|
if (stack == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (amount == 0) {
|
||||||
|
amount = NEIClientUtils.getScrollMultiplier(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
return StackInfo.withAmount(stack, amount);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void gainFocus() {
|
public void gainFocus() {
|
||||||
if (text().equals("0")) {
|
if (text().equals("0")) {
|
||||||
@@ -35,20 +103,22 @@ public class ItemQuantityField extends TextField {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onTextChange(String oldText) {
|
public void onTextChange(String oldText) {
|
||||||
NEIClientUtils.setItemQuantity(intValue());
|
NEIClientUtils.setItemQuantity(getInteger());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(int mousex, int mousey) {
|
public boolean onMouseWheel(int i, int mx, int my) {
|
||||||
|
if (!contains(mx, my)) return false;
|
||||||
|
int multiplier = 1;
|
||||||
|
|
||||||
if (!focused() && intValue() == 0) {
|
if (NEIClientUtils.shiftKey()) {
|
||||||
field.setText(translate("itempanel.quantity.default"));
|
multiplier = 10;
|
||||||
field.setEnabled(false);
|
} else if (NEIClientUtils.controlKey()) {
|
||||||
super.draw(mousex, mousey);
|
multiplier = 64;
|
||||||
field.setEnabled(true);
|
|
||||||
field.setText("0");
|
|
||||||
} else {
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setText(Integer.toString(Math.max(0, getInteger() + i * multiplier)));
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,21 +1,25 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.config.ConfigTagParent;
|
|
||||||
import codechicken.nei.ItemList.ItemsLoadedCallback;
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.config.GuiItemSorter;
|
|
||||||
import codechicken.nei.config.OptionOpenGui;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
|
import codechicken.lib.config.ConfigTagParent;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.config.GuiItemSorter;
|
||||||
|
import codechicken.nei.config.OptionOpenGui;
|
||||||
|
|
||||||
|
public class ItemSorter implements Comparator<ItemStack> {
|
||||||
|
|
||||||
public static class SortEntry {
|
public static class SortEntry {
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
public final Comparator<ItemStack> comparator;
|
public final Comparator<ItemStack> comparator;
|
||||||
|
|
||||||
@@ -40,12 +44,10 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
|
|||||||
public static final ItemSorter instance = new ItemSorter();
|
public static final ItemSorter instance = new ItemSorter();
|
||||||
|
|
||||||
// optimisations
|
// optimisations
|
||||||
public HashMap<ItemStack, Integer> ordering = null;
|
public Map<ItemStack, Integer> ordering = new HashMap<>();
|
||||||
|
|
||||||
public static void sort(ArrayList<ItemStack> items) {
|
public static void sort(List<ItemStack> items) {
|
||||||
try {
|
try {
|
||||||
// items = (ArrayList<ItemStack>)
|
|
||||||
// items.parallelStream().sorted(instance).collect(Collectors.toList());
|
|
||||||
items.sort(instance);
|
items.sort(instance);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Exception sorting item list", e);
|
NEIClientConfig.logger.error("Exception sorting item list", e);
|
||||||
@@ -61,14 +63,6 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void itemsLoaded() {
|
|
||||||
HashMap<ItemStack, Integer> newMap = new HashMap<>();
|
|
||||||
int i = 0;
|
|
||||||
for (ItemStack stack : ItemList.items) newMap.put(stack, i++);
|
|
||||||
ordering = newMap;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SortEntry find(String name) {
|
public static SortEntry find(String name) {
|
||||||
for (SortEntry e : entries) if (e.name.equals(name)) return e;
|
for (SortEntry e : entries) if (e.name.equals(name)) return e;
|
||||||
|
|
||||||
@@ -119,19 +113,19 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
|
|||||||
return compareInt(id1, id2);
|
return compareInt(id1, id2);
|
||||||
});
|
});
|
||||||
API.addSortOption("nei.itemsort.name", (o1, o2) -> {
|
API.addSortOption("nei.itemsort.name", (o1, o2) -> {
|
||||||
String name1 = ItemInfo.getSearchName(o1);
|
String name1 = o1.getDisplayName();
|
||||||
String name2 = ItemInfo.getSearchName(o2);
|
String name2 = o2.getDisplayName();
|
||||||
return name1.compareTo(name2);
|
return name1.compareTo(name2);
|
||||||
});
|
});
|
||||||
tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
|
tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
|
||||||
API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class) {
|
API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void useGlobals() {
|
public void useGlobals() {
|
||||||
super.useGlobals();
|
super.useGlobals();
|
||||||
list = fromSaveString(activeTag().getValue());
|
list = fromSaveString(activeTag().getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
ItemList.loadCallbacks.add(instance);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getSaveString(List<SortEntry> list) {
|
public static String getSaveString(List<SortEntry> list) {
|
||||||
|
|||||||
@@ -0,0 +1,143 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
|
||||||
|
public class ItemStackAmount {
|
||||||
|
|
||||||
|
private final Map<NBTTagCompound, Long> itemMap = new LinkedHashMap<>();
|
||||||
|
|
||||||
|
public void putAll(ItemStackAmount amounts) {
|
||||||
|
for (Map.Entry<NBTTagCompound, Long> entry : amounts.itemMap.entrySet()) {
|
||||||
|
this.itemMap.put(entry.getKey(), entry.getValue() + this.itemMap.getOrDefault(entry.getKey(), 0L));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addAll(Iterable<ItemStack> items) {
|
||||||
|
for (ItemStack stack : items) {
|
||||||
|
add(stack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void add(ItemStack item) {
|
||||||
|
add(item, (long) StackInfo.getAmount(item));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void add(ItemStack stack, Long value) {
|
||||||
|
if (stack == null || stack.getItem() == null) return;
|
||||||
|
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
||||||
|
|
||||||
|
if (key != null) {
|
||||||
|
this.itemMap.put(key, value + this.itemMap.getOrDefault(key, 0L));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long get(ItemStack stack) {
|
||||||
|
if (stack == null || stack.getItem() == null) return null;
|
||||||
|
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
||||||
|
|
||||||
|
return this.itemMap.get(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void put(ItemStack stack, long value) {
|
||||||
|
if (stack == null || stack.getItem() == null) return;
|
||||||
|
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
||||||
|
|
||||||
|
if (key != null) {
|
||||||
|
this.itemMap.put(key, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getOrDefault(ItemStack stack, long defaultAmount) {
|
||||||
|
final Long e = get(stack);
|
||||||
|
|
||||||
|
return e == null ? defaultAmount : e;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean contains(ItemStack stack) {
|
||||||
|
return get(stack) != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
this.itemMap.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Long remove(ItemStack stack) {
|
||||||
|
if (stack == null || stack.getItem() == null) return null;
|
||||||
|
final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
|
||||||
|
|
||||||
|
return this.itemMap.remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean removeIf(Predicate<Map.Entry<NBTTagCompound, Long>> predicate) {
|
||||||
|
return this.itemMap.entrySet().removeIf(predicate);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Set<Map.Entry<NBTTagCompound, Long>> entrySet() {
|
||||||
|
return this.itemMap.entrySet();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ItemStack> values() {
|
||||||
|
List<ItemStack> list = new ArrayList<>();
|
||||||
|
|
||||||
|
for (Map.Entry<NBTTagCompound, Long> entry : this.itemMap.entrySet()) {
|
||||||
|
list.add(StackInfo.loadFromNBT(entry.getKey(), Math.max(0, entry.getValue())));
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int size() {
|
||||||
|
return this.itemMap.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return this.itemMap.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
|
||||||
|
if (obj instanceof ItemStackAmount items) {
|
||||||
|
return this.itemMap.equals(items.itemMap);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStackAmount of(ItemStackAmount map) {
|
||||||
|
ItemStackAmount result = new ItemStackAmount();
|
||||||
|
result.itemMap.putAll(map.itemMap);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStackAmount of(ItemStackMap<Long> map) {
|
||||||
|
ItemStackAmount result = new ItemStackAmount();
|
||||||
|
|
||||||
|
for (ItemStackMap.Entry<Long> entry : map.entries()) {
|
||||||
|
result.put(entry.key, entry.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStackAmount of(Iterable<ItemStack> items) {
|
||||||
|
ItemStackAmount result = new ItemStackAmount();
|
||||||
|
|
||||||
|
for (ItemStack stack : items) {
|
||||||
|
result.add(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -4,24 +4,35 @@ import static codechicken.lib.inventory.InventoryUtils.actualDamage;
|
|||||||
import static codechicken.lib.inventory.InventoryUtils.newItemStack;
|
import static codechicken.lib.inventory.InventoryUtils.newItemStack;
|
||||||
import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
|
import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
||||||
|
import com.google.common.base.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
|
* A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
|
||||||
*/
|
*/
|
||||||
public class ItemStackMap<T> {
|
public class ItemStackMap<T> {
|
||||||
|
|
||||||
public static class StackMetaKey {
|
public static class StackMetaKey {
|
||||||
|
|
||||||
public final int damage;
|
public final int damage;
|
||||||
public final NBTTagCompound tag;
|
public final NBTTagCompound tag;
|
||||||
|
private final int hashCode;
|
||||||
|
|
||||||
public StackMetaKey(int damage, NBTTagCompound tag) {
|
public StackMetaKey(int damage, NBTTagCompound tag) {
|
||||||
|
if (tag != null && tag.hasNoTags()) {
|
||||||
|
tag = null;
|
||||||
|
}
|
||||||
|
this.hashCode = Objects.hashCode(damage, tag);
|
||||||
this.damage = damage;
|
this.damage = damage;
|
||||||
this.tag = tag;
|
this.tag = tag;
|
||||||
}
|
}
|
||||||
@@ -31,17 +42,17 @@ public class ItemStackMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
return Objects.hashCode(damage, tag);
|
return this.hashCode;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(Object o) {
|
public boolean equals(Object o) {
|
||||||
if (!(o instanceof StackMetaKey)) return false;
|
if (!(o instanceof StackMetaKey t)) return false;
|
||||||
StackMetaKey t = (StackMetaKey) o;
|
|
||||||
return damage == t.damage && Objects.equal(tag, t.tag);
|
return damage == t.damage && Objects.equal(tag, t.tag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Entry<T> {
|
public static class Entry<T> {
|
||||||
|
|
||||||
public final ItemStack key;
|
public final ItemStack key;
|
||||||
public final T value;
|
public final T value;
|
||||||
|
|
||||||
@@ -52,6 +63,7 @@ public class ItemStackMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public class DetailMap {
|
public class DetailMap {
|
||||||
|
|
||||||
private boolean hasWildcard;
|
private boolean hasWildcard;
|
||||||
private T wildcard;
|
private T wildcard;
|
||||||
private HashMap<Integer, T> damageMap;
|
private HashMap<Integer, T> damageMap;
|
||||||
@@ -121,8 +133,7 @@ public class ItemStackMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void updateSize() {
|
private void updateSize() {
|
||||||
int newSize = (hasWildcard ? 1 : 0)
|
int newSize = (hasWildcard ? 1 : 0) + (metaMap != null ? metaMap.size() : 0)
|
||||||
+ (metaMap != null ? metaMap.size() : 0)
|
|
||||||
+ (tagMap != null ? tagMap.size() : 0)
|
+ (tagMap != null ? tagMap.size() : 0)
|
||||||
+ (damageMap != null ? damageMap.size() : 0);
|
+ (damageMap != null ? damageMap.size() : 0);
|
||||||
|
|
||||||
@@ -151,16 +162,12 @@ public class ItemStackMap<T> {
|
|||||||
|
|
||||||
public void addEntries(Item item, List<Entry<T>> list) {
|
public void addEntries(Item item, List<Entry<T>> list) {
|
||||||
if (wildcard != null) list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
|
if (wildcard != null) list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
|
||||||
if (damageMap != null)
|
if (damageMap != null) for (Map.Entry<Integer, T> entry : damageMap.entrySet())
|
||||||
for (Map.Entry<Integer, T> entry : damageMap.entrySet())
|
list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
|
||||||
list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
|
if (tagMap != null) for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
|
||||||
if (tagMap != null)
|
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
|
||||||
for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
|
if (metaMap != null) for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet()) list.add(
|
||||||
list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
|
new Entry<>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
|
||||||
if (metaMap != null)
|
|
||||||
for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet())
|
|
||||||
list.add(new Entry<>(
|
|
||||||
newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +197,7 @@ public class ItemStackMap<T> {
|
|||||||
WILDCARD_TAG.setBoolean("*", true);
|
WILDCARD_TAG.setBoolean("*", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final HashMap<Item, DetailMap> itemMap = new HashMap<>();
|
private final Map<Item, DetailMap> itemMap = new LinkedHashMap<>();
|
||||||
private int size;
|
private int size;
|
||||||
|
|
||||||
public T get(ItemStack key) {
|
public T get(ItemStack key) {
|
||||||
@@ -202,16 +209,34 @@ public class ItemStackMap<T> {
|
|||||||
return map == null ? null : map.get(key);
|
return map == null ? null : map.get(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public T getOrDefault(ItemStack key, T defaultValue) {
|
||||||
|
T e = get(key);
|
||||||
|
return e == null ? defaultValue : e;
|
||||||
|
}
|
||||||
|
|
||||||
public void put(ItemStack key, T value) {
|
public void put(ItemStack key, T value) {
|
||||||
if (key == null || key.getItem() == null) return;
|
if (key == null || key.getItem() == null) return;
|
||||||
|
|
||||||
DetailMap map = itemMap.get(key.getItem());
|
DetailMap map = itemMap.computeIfAbsent(key.getItem(), k -> new DetailMap());
|
||||||
if (map == null) itemMap.put(key.getItem(), map = new DetailMap());
|
|
||||||
map.put(key, value);
|
map.put(key, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public T computeIfAbsent(ItemStack key, Function<ItemStack, ? extends T> mappingFunction) {
|
||||||
|
T value;
|
||||||
|
if ((value = get(key)) == null) {
|
||||||
|
T newValue;
|
||||||
|
if ((newValue = mappingFunction.apply(key)) != null) {
|
||||||
|
put(key, newValue);
|
||||||
|
return newValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
public void clear() {
|
public void clear() {
|
||||||
itemMap.clear();
|
itemMap.clear();
|
||||||
|
size = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public T remove(ItemStack key) {
|
public T remove(ItemStack key) {
|
||||||
@@ -223,8 +248,7 @@ public class ItemStackMap<T> {
|
|||||||
|
|
||||||
public List<ItemStack> keys() {
|
public List<ItemStack> keys() {
|
||||||
LinkedList<ItemStack> list = new LinkedList<>();
|
LinkedList<ItemStack> list = new LinkedList<>();
|
||||||
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
|
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addKeys(entry.getKey(), list);
|
||||||
entry.getValue().addKeys(entry.getKey(), list);
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,8 +260,7 @@ public class ItemStackMap<T> {
|
|||||||
|
|
||||||
public List<Entry<T>> entries() {
|
public List<Entry<T>> entries() {
|
||||||
LinkedList<Entry<T>> list = new LinkedList<>();
|
LinkedList<Entry<T>> list = new LinkedList<>();
|
||||||
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
|
for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addEntries(entry.getKey(), list);
|
||||||
entry.getValue().addEntries(entry.getKey(), list);
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
|
||||||
public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter {
|
public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter {
|
||||||
|
|
||||||
public ItemStackSet with(ItemStack... items) {
|
public ItemStackSet with(ItemStack... items) {
|
||||||
for (ItemStack item : items) add(item);
|
for (ItemStack item : items) add(item);
|
||||||
return this;
|
return this;
|
||||||
@@ -25,6 +27,16 @@ public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter
|
|||||||
put(item, item);
|
put(item, item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ItemStackSet addAll(Iterable<ItemStack> items) {
|
||||||
|
for (ItemStack item : items) add(item);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStackSet removeAll(Iterable<ItemStack> items) {
|
||||||
|
for (ItemStack item : items) remove(item);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean contains(ItemStack item) {
|
public boolean contains(ItemStack item) {
|
||||||
return get(item) != null;
|
return get(item) != null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,272 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.awt.Point;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
|
||||||
|
public class ItemZoom extends Widget implements IContainerInputHandler {
|
||||||
|
|
||||||
|
public static final int MIN_ZOOM = 0;
|
||||||
|
public static final int MAX_ZOOM = 1000;
|
||||||
|
|
||||||
|
private static final int MIN_SCALE = 2;
|
||||||
|
private static final int SLOT_SIZE = 16;
|
||||||
|
|
||||||
|
private Boolean previousKeyboardRepeatEnabled = null;
|
||||||
|
|
||||||
|
private ItemStack stack = null;
|
||||||
|
private String displayName = "";
|
||||||
|
private int availableAreaWidth = 0;
|
||||||
|
private float xPosition = 0;
|
||||||
|
private float yPosition = 0;
|
||||||
|
private float scale = 1;
|
||||||
|
|
||||||
|
public ItemZoom() {
|
||||||
|
GuiContainerManager.addInputHandler(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int mx, int my) {
|
||||||
|
|
||||||
|
if (this.stack != null && this.availableAreaWidth >= SLOT_SIZE * 2
|
||||||
|
&& (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
|
||||||
|
|| KeyManager.isKeyDown("itemzoom.hold"))
|
||||||
|
&& GuiContainerManager.shouldShowTooltip(NEIClientUtils.getGuiContainer())) {
|
||||||
|
final float inverseScaleFactor = 1.0f / this.scale;
|
||||||
|
final float screenScale = getScreenScale();
|
||||||
|
final float size = SLOT_SIZE * this.scale;
|
||||||
|
int shiftText = 10;
|
||||||
|
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glScaled(screenScale, screenScale, 1);
|
||||||
|
GL11.glScaled(this.scale, this.scale, 2);
|
||||||
|
GL11.glTranslated(this.xPosition * inverseScaleFactor, this.yPosition * inverseScaleFactor, 0);
|
||||||
|
|
||||||
|
GuiContainerManager.drawItem(0, 0, this.stack, false, "");
|
||||||
|
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
|
||||||
|
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
|
||||||
|
GuiContainerManager.enable2DRender();
|
||||||
|
|
||||||
|
if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.showName")) {
|
||||||
|
String dispalyName = NEIClientUtils
|
||||||
|
.cropText(GuiDraw.fontRenderer, this.displayName, this.availableAreaWidth);
|
||||||
|
GuiDraw.drawStringC(
|
||||||
|
dispalyName,
|
||||||
|
(int) ((this.xPosition + size / 2) * screenScale),
|
||||||
|
(int) ((this.yPosition + size) * screenScale) + shiftText,
|
||||||
|
NEIClientConfig.getSetting("inventory.itemzoom.nameColor").getHexValue());
|
||||||
|
shiftText += GuiDraw.fontRenderer.FONT_HEIGHT;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
|
||||||
|
&& NEIClientConfig.getBooleanSetting("inventory.itemzoom.helpText")) {
|
||||||
|
String keyName = KeyManager.getKeyName("itemzoom.toggle", NEIClientUtils.SHIFT_HASH);
|
||||||
|
|
||||||
|
if (keyName != null) {
|
||||||
|
String helpText = NEIClientUtils.translate("itemzoom.toggle", keyName);
|
||||||
|
List<String> lines = GuiDraw.fontRenderer
|
||||||
|
.listFormattedStringToWidth(helpText, this.availableAreaWidth);
|
||||||
|
|
||||||
|
for (String line : lines) {
|
||||||
|
GuiDraw.drawStringC(
|
||||||
|
line,
|
||||||
|
(int) ((this.xPosition + size / 2) * screenScale),
|
||||||
|
(int) ((this.yPosition + size) * screenScale) + 10 + shiftText,
|
||||||
|
0x66555555);
|
||||||
|
shiftText += GuiDraw.fontRenderer.FONT_HEIGHT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GL11.glPopAttrib();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void resize(GuiContainer gui) {
|
||||||
|
final ItemStack stack = getStackMouseOver(gui);
|
||||||
|
|
||||||
|
if (stack != null && (!NEIClientConfig.getBooleanSetting("inventory.itemzoom.onlySolid")
|
||||||
|
|| Block.getBlockFromItem(stack.getItem()).getMaterial().isSolid())) {
|
||||||
|
final float screenScale = 1.0f / getScreenScale();
|
||||||
|
final float availableAreaWidth = (gui.width - gui.xSize) / 2 * screenScale;
|
||||||
|
final float availableAreaHeight = gui.height * screenScale;
|
||||||
|
final Point mouse = GuiDraw.getMousePosition();
|
||||||
|
|
||||||
|
this.scale = Math.round(getZoomAmount(gui) * getPointSize(gui) / SLOT_SIZE);
|
||||||
|
this.yPosition = (availableAreaHeight - this.scale * SLOT_SIZE) / 2;
|
||||||
|
this.xPosition = (availableAreaWidth - this.scale * SLOT_SIZE) / 2;
|
||||||
|
this.availableAreaWidth = (int) (availableAreaWidth / screenScale);
|
||||||
|
|
||||||
|
final float rightSideShift = gui.width * screenScale - availableAreaWidth;
|
||||||
|
final boolean leftSideFree = availableAreaWidth / screenScale < mouse.x;
|
||||||
|
final boolean rightSideFree = mouse.x < gui.width - availableAreaWidth / screenScale;
|
||||||
|
|
||||||
|
final boolean showOnRight = leftSideFree && rightSideFree ? !preferLeftSide() : !leftSideFree;
|
||||||
|
|
||||||
|
if (showOnRight) {
|
||||||
|
this.xPosition += rightSideShift;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
this.displayName = stack.getDisplayName();
|
||||||
|
} catch (Throwable ignored) {
|
||||||
|
this.displayName = "Unnamed";
|
||||||
|
}
|
||||||
|
|
||||||
|
this.stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack), 0);
|
||||||
|
} else {
|
||||||
|
this.stack = null;
|
||||||
|
this.displayName = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean preferLeftSide() {
|
||||||
|
switch (NEIClientConfig.getIntSetting("inventory.itemzoom.preferredSide")) {
|
||||||
|
case 1:
|
||||||
|
return true;
|
||||||
|
case 2:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final int leftCount = NEIClientConfig.isBookmarkPanelHidden()
|
||||||
|
|| ItemPanels.bookmarkPanel.getGrid().getPerPage() == 0 ? 0 : ItemPanels.bookmarkPanel.getGrid().size();
|
||||||
|
final int rightCount = ItemPanels.itemPanel.getGrid().getPerPage() == 0 ? 0
|
||||||
|
: ItemPanels.itemPanel.getGrid().size();
|
||||||
|
|
||||||
|
return leftCount <= rightCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
private float getPointSize(GuiContainer gui) {
|
||||||
|
final float screenScale = 1.0f / getScreenScale();
|
||||||
|
final float availableAreaWidth = (gui.width - (gui.xSize + gui.width) / 2) * screenScale;
|
||||||
|
return availableAreaWidth / MAX_ZOOM;
|
||||||
|
}
|
||||||
|
|
||||||
|
private float getScreenScale() {
|
||||||
|
return Minecraft.getMinecraft().currentScreen.width * 1f / Minecraft.getMinecraft().displayWidth;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int getZoomAmount(GuiContainer gui) {
|
||||||
|
return Math.max(
|
||||||
|
Math.round(SLOT_SIZE * MIN_SCALE / getPointSize(gui)),
|
||||||
|
NEIClientConfig.getIntSetting("inventory.itemzoom.zoom"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void increaseZoom(GuiContainer gui) {
|
||||||
|
final float pointSize = getPointSize(gui);
|
||||||
|
final float scale = Math.round(getZoomAmount(gui) * pointSize / SLOT_SIZE);
|
||||||
|
|
||||||
|
NEIClientConfig.setIntSetting(
|
||||||
|
"inventory.itemzoom.zoom",
|
||||||
|
Math.min(MAX_ZOOM, Math.round((scale + 1) / (pointSize / SLOT_SIZE))));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void decreaseZoom(GuiContainer gui) {
|
||||||
|
final float pointSize = getPointSize(gui);
|
||||||
|
final float scale = Math.round(getZoomAmount(gui) * pointSize / SLOT_SIZE);
|
||||||
|
|
||||||
|
NEIClientConfig.setIntSetting(
|
||||||
|
"inventory.itemzoom.zoom",
|
||||||
|
Math.max(MIN_ZOOM, Math.round(Math.max(MIN_SCALE, scale - 1) / (pointSize / SLOT_SIZE))));
|
||||||
|
}
|
||||||
|
|
||||||
|
private ItemStack getStackMouseOver(GuiContainer gui) {
|
||||||
|
|
||||||
|
if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.neiOnly")) {
|
||||||
|
final Point mouse = GuiDraw.getMousePosition();
|
||||||
|
ItemStack stack = ItemPanels.itemPanel.getStackMouseOver(mouse.x, mouse.y);
|
||||||
|
|
||||||
|
if (stack == null) {
|
||||||
|
stack = ItemPanels.bookmarkPanel.getStackMouseOver(mouse.x, mouse.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (stack == null) {
|
||||||
|
stack = ItemPanels.itemPanel.historyPanel.getStackMouseOver(mouse.x, mouse.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
return stack;
|
||||||
|
}
|
||||||
|
|
||||||
|
return GuiContainerManager.getStackMouseOver(gui);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
|
||||||
|
if (KeyManager.isHashDown("itemzoom.toggle", NEIClientUtils.SHIFT_HASH)) {
|
||||||
|
NEIClientConfig.getSetting("inventory.itemzoom.enabled")
|
||||||
|
.setBooleanValue(!NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled"));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.stack != null && KeyManager.isKeyDown("itemzoom.hold")) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_in")) {
|
||||||
|
increaseZoom(gui);
|
||||||
|
previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
|
||||||
|
Keyboard.enableRepeatEvents(true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_out")) {
|
||||||
|
decreaseZoom(gui);
|
||||||
|
previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
|
||||||
|
Keyboard.enableRepeatEvents(true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (previousKeyboardRepeatEnabled != null) {
|
||||||
|
Keyboard.enableRepeatEvents(previousKeyboardRepeatEnabled);
|
||||||
|
previousKeyboardRepeatEnabled = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,16 +1,11 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.drawRect;
|
import java.awt.Color;
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemPanel.ItemPanelSlot;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.annotation.Nullable;
|
import java.util.Objects;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.gui.ScaledResolution;
|
import net.minecraft.client.gui.ScaledResolution;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
@@ -18,10 +13,256 @@ import net.minecraft.client.renderer.OpenGlHelper;
|
|||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.client.shader.Framebuffer;
|
import net.minecraft.client.shader.Framebuffer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
public class ItemsGrid {
|
import org.lwjgl.opengl.GL11;
|
||||||
public static final int SLOT_SIZE = 18;
|
import org.lwjgl.opengl.GL30;
|
||||||
|
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.Recipe.RecipeId;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
|
||||||
|
public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends ItemsGrid.MouseContext> {
|
||||||
|
|
||||||
|
protected static class ScreenCapture {
|
||||||
|
|
||||||
|
private long nextCacheRefresh = 0;
|
||||||
|
private final Framebuffer framebuffer;
|
||||||
|
|
||||||
|
public ScreenCapture() {
|
||||||
|
this.framebuffer = new Framebuffer(1, 1, true);
|
||||||
|
this.framebuffer.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
|
||||||
|
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int getGridRenderingCacheFPS(int mode) {
|
||||||
|
return mode == 1 ? NEIClientConfig.getIntSetting("inventory.gridRenderingCacheFPS") : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean needRefresh(int mode) {
|
||||||
|
final Minecraft minecraft = Minecraft.getMinecraft();
|
||||||
|
return this.nextCacheRefresh == 0 || this.framebuffer.framebufferWidth != minecraft.displayWidth
|
||||||
|
|| framebuffer.framebufferHeight != minecraft.displayHeight
|
||||||
|
|| getGridRenderingCacheFPS(mode) > 0 && this.nextCacheRefresh < System.currentTimeMillis();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void refreshBuffer() {
|
||||||
|
this.nextCacheRefresh = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void captureScreen(Runnable callback, int mode) {
|
||||||
|
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
|
||||||
|
|
||||||
|
resetFramebuffer();
|
||||||
|
this.framebuffer.bindFramebuffer(false);
|
||||||
|
|
||||||
|
/* Set up some rendering state needed for items to work correctly */
|
||||||
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
GL11.glDepthMask(true);
|
||||||
|
OpenGlHelper.glBlendFunc(
|
||||||
|
GL11.GL_SRC_ALPHA,
|
||||||
|
GL11.GL_ONE_MINUS_SRC_ALPHA,
|
||||||
|
GL11.GL_SRC_ALPHA,
|
||||||
|
GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
|
||||||
|
callback.run();
|
||||||
|
|
||||||
|
GL11.glPopAttrib();
|
||||||
|
|
||||||
|
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
|
||||||
|
this.nextCacheRefresh = System.currentTimeMillis() + (1000 / Math.max(1, getGridRenderingCacheFPS(mode)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void resetFramebuffer() {
|
||||||
|
final Minecraft minecraft = Minecraft.getMinecraft();
|
||||||
|
|
||||||
|
if (this.framebuffer.framebufferWidth != minecraft.displayWidth
|
||||||
|
|| framebuffer.framebufferHeight != minecraft.displayHeight) {
|
||||||
|
this.framebuffer.createBindFramebuffer(minecraft.displayWidth, minecraft.displayHeight);
|
||||||
|
this.framebuffer.setFramebufferFilter(GL11.GL_NEAREST);
|
||||||
|
} else {
|
||||||
|
this.framebuffer.framebufferClear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copy stencil values (required by mui2)
|
||||||
|
OpenGlHelper.func_153171_g(GL30.GL_READ_FRAMEBUFFER, minecraft.getFramebuffer().framebufferObject);
|
||||||
|
OpenGlHelper.func_153171_g(GL30.GL_DRAW_FRAMEBUFFER, this.framebuffer.framebufferObject);
|
||||||
|
GL30.glBlitFramebuffer(
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
minecraft.displayWidth,
|
||||||
|
minecraft.displayHeight,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
minecraft.displayWidth,
|
||||||
|
minecraft.displayHeight,
|
||||||
|
GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_STENCIL_BUFFER_BIT,
|
||||||
|
GL11.GL_NEAREST);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void renderCapturedScreen() {
|
||||||
|
this.framebuffer.bindFramebufferTexture();
|
||||||
|
|
||||||
|
final Tessellator tessellator = Tessellator.instance;
|
||||||
|
final Minecraft minecraft = Minecraft.getMinecraft();
|
||||||
|
final ScaledResolution scaledresolution = new ScaledResolution(
|
||||||
|
minecraft,
|
||||||
|
minecraft.displayWidth,
|
||||||
|
minecraft.displayHeight);
|
||||||
|
|
||||||
|
/* Set up some rendering state needed for items to work correctly */
|
||||||
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
|
OpenGlHelper
|
||||||
|
.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||||
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
|
|
||||||
|
tessellator.startDrawingQuads();
|
||||||
|
|
||||||
|
tessellator.addVertexWithUV(0, scaledresolution.getScaledHeight_double(), 0.0, 0, 0);
|
||||||
|
tessellator.addVertexWithUV(
|
||||||
|
scaledresolution.getScaledWidth_double(),
|
||||||
|
scaledresolution.getScaledHeight_double(),
|
||||||
|
0.0,
|
||||||
|
1,
|
||||||
|
0);
|
||||||
|
tessellator.addVertexWithUV(scaledresolution.getScaledWidth_double(), 0, 0.0, 1, 1);
|
||||||
|
tessellator.addVertexWithUV(0, 0, 0, 0, 1);
|
||||||
|
|
||||||
|
tessellator.draw();
|
||||||
|
|
||||||
|
this.framebuffer.unbindFramebufferTexture();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ItemsGridSlot {
|
||||||
|
|
||||||
|
protected static final float DEFAULT_SLOT_SIZE = 18f;
|
||||||
|
protected static final float LINE_WIDTH = 0.75f;
|
||||||
|
|
||||||
|
public final ItemStack item;
|
||||||
|
public final int slotIndex;
|
||||||
|
public final int itemIndex;
|
||||||
|
|
||||||
|
public Color borderColor = Color.BLACK;
|
||||||
|
|
||||||
|
public boolean borderLeft = false;
|
||||||
|
public boolean borderTop = false;
|
||||||
|
public boolean borderRight = false;
|
||||||
|
public boolean borderBottom = false;
|
||||||
|
|
||||||
|
public ItemsGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
|
||||||
|
this.slotIndex = slotIndex;
|
||||||
|
this.itemIndex = itemIndex;
|
||||||
|
this.item = itemStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStack getItemStack() {
|
||||||
|
return this.item;
|
||||||
|
}
|
||||||
|
|
||||||
|
public <M extends MouseContext> void beforeDraw(Rectangle4i rect, M mouseContext) {
|
||||||
|
if (mouseContext != null && mouseContext.slotIndex == this.slotIndex) {
|
||||||
|
NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, HIGHLIGHT_COLOR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {}
|
||||||
|
|
||||||
|
public RecipeId getRecipeId() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void drawItem(Rectangle4i rect) {
|
||||||
|
drawItem(getItemStack(), rect);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawItem(ItemStack stack, Rectangle4i rect) {
|
||||||
|
|
||||||
|
if (rect.w != DEFAULT_SLOT_SIZE) {
|
||||||
|
final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
|
||||||
|
GL11.glTranslatef(rect.x + 1, rect.y + 1, 0);
|
||||||
|
GL11.glScaled(panelFactor, panelFactor, 1);
|
||||||
|
|
||||||
|
GuiContainerManager.drawItem(0, 0, stack, true, "");
|
||||||
|
|
||||||
|
GL11.glScaled(1f / panelFactor, 1f / panelFactor, 1);
|
||||||
|
GL11.glTranslatef(-1 * (rect.x + 1), -1 * (rect.y + 1), 0);
|
||||||
|
} else {
|
||||||
|
GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void drawBorder(Rectangle4i rect) {
|
||||||
|
float halfLineWidth = LINE_WIDTH / 2f;
|
||||||
|
|
||||||
|
if (this.borderLeft) {
|
||||||
|
NEIClientUtils
|
||||||
|
.drawRect(rect.x - halfLineWidth, rect.y + halfLineWidth, LINE_WIDTH, rect.h, this.borderColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.borderRight) {
|
||||||
|
NEIClientUtils.drawRect(
|
||||||
|
rect.x + rect.w - halfLineWidth,
|
||||||
|
rect.y - halfLineWidth,
|
||||||
|
LINE_WIDTH,
|
||||||
|
rect.h,
|
||||||
|
this.borderColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.borderTop) {
|
||||||
|
NEIClientUtils
|
||||||
|
.drawRect(rect.x - halfLineWidth, rect.y - halfLineWidth, rect.w, LINE_WIDTH, this.borderColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.borderBottom) {
|
||||||
|
NEIClientUtils.drawRect(
|
||||||
|
rect.x + halfLineWidth,
|
||||||
|
rect.y + rect.h - halfLineWidth,
|
||||||
|
rect.w,
|
||||||
|
LINE_WIDTH,
|
||||||
|
this.borderColor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class MouseContext {
|
||||||
|
|
||||||
|
public final int slotIndex;
|
||||||
|
public final int columnIndex;
|
||||||
|
public final int rowIndex;
|
||||||
|
|
||||||
|
public MouseContext(int slotIndex, int rowIndex, int columnIndex) {
|
||||||
|
this.slotIndex = slotIndex;
|
||||||
|
this.rowIndex = rowIndex;
|
||||||
|
this.columnIndex = columnIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(this.rowIndex, this.slotIndex, this.columnIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
|
||||||
|
if (obj instanceof MouseContext context) {
|
||||||
|
return this.columnIndex == context.columnIndex && this.rowIndex == context.rowIndex
|
||||||
|
&& this.slotIndex == context.slotIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int SLOT_SIZE = 18;
|
||||||
|
public static final Color HIGHLIGHT_COLOR = new Color(0xee555555, true);
|
||||||
|
|
||||||
protected int width;
|
protected int width;
|
||||||
protected int height;
|
protected int height;
|
||||||
@@ -41,23 +282,24 @@ public class ItemsGrid {
|
|||||||
|
|
||||||
protected boolean[] invalidSlotMap;
|
protected boolean[] invalidSlotMap;
|
||||||
|
|
||||||
@Nullable
|
protected ScreenCapture screenCapture = null;
|
||||||
private Framebuffer framebuffer = null;
|
|
||||||
|
|
||||||
protected boolean refreshBuffer = true;
|
|
||||||
|
|
||||||
public ArrayList<ItemStack> getItems() {
|
public ArrayList<ItemStack> getItems() {
|
||||||
return realItems;
|
return realItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemStack getItem(int idx) {
|
public ItemStack getItem(int itemIndex) {
|
||||||
return realItems.get(idx);
|
return realItems.get(itemIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int size() {
|
public int size() {
|
||||||
return realItems.size();
|
return realItems.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return realItems.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
public int indexOf(ItemStack stackA, boolean useNBT) {
|
public int indexOf(ItemStack stackA, boolean useNBT) {
|
||||||
|
|
||||||
for (int idx = 0; idx < realItems.size(); idx++) {
|
for (int idx = 0; idx < realItems.size(); idx++) {
|
||||||
@@ -69,6 +311,11 @@ public class ItemsGrid {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setPage(int page) {
|
||||||
|
this.page = Math.max(0, Math.min(page, getNumPages() - 1));
|
||||||
|
onGridChanged();
|
||||||
|
}
|
||||||
|
|
||||||
public int getPage() {
|
public int getPage() {
|
||||||
return page + 1;
|
return page + 1;
|
||||||
}
|
}
|
||||||
@@ -93,17 +340,33 @@ public class ItemsGrid {
|
|||||||
return columns;
|
return columns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getLastRowIndex() {
|
||||||
|
final List<T> mask = getMask();
|
||||||
|
|
||||||
|
return this.columns > 0 && !mask.isEmpty()
|
||||||
|
? (int) Math.ceil((float) (mask.get(mask.size() - 1).slotIndex + 1) / this.columns) - 1
|
||||||
|
: 0;
|
||||||
|
}
|
||||||
|
|
||||||
public void setGridSize(int mleft, int mtop, int w, int h) {
|
public void setGridSize(int mleft, int mtop, int w, int h) {
|
||||||
|
final int newWidth = Math.max(0, w);
|
||||||
|
final int newHeight = Math.max(0, h);
|
||||||
|
final boolean changed = marginLeft != mleft || marginTop != mtop || width != newWidth || height != newHeight;
|
||||||
|
|
||||||
marginLeft = mleft;
|
marginLeft = mleft;
|
||||||
marginTop = mtop;
|
marginTop = mtop;
|
||||||
|
|
||||||
width = Math.max(0, w);
|
width = newWidth;
|
||||||
height = Math.max(0, h);
|
height = newHeight;
|
||||||
|
|
||||||
columns = width / SLOT_SIZE;
|
columns = width / SLOT_SIZE;
|
||||||
rows = height / SLOT_SIZE;
|
rows = height / SLOT_SIZE;
|
||||||
|
|
||||||
paddingLeft = (width % SLOT_SIZE) / 2;
|
paddingLeft = (width % SLOT_SIZE) / 2;
|
||||||
|
|
||||||
|
if (changed) {
|
||||||
|
onGridChanged();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void shiftPage(int shift) {
|
public void shiftPage(int shift) {
|
||||||
@@ -132,11 +395,20 @@ public class ItemsGrid {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void onGridChanged() {
|
protected void onGridChanged() {
|
||||||
refreshBuffer = true;
|
if (this.screenCapture != null) {
|
||||||
|
this.screenCapture.refreshBuffer();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onItemsChanged() {
|
||||||
|
onGridChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void refresh(GuiContainer gui) {
|
public void refresh(GuiContainer gui) {
|
||||||
updateGuiOverlapSlots(gui);
|
final int gridRenderingCacheMode = getGridRenderingCacheMode();
|
||||||
|
if (gridRenderingCacheMode <= 0 || screenCapture == null || screenCapture.needRefresh(gridRenderingCacheMode)) {
|
||||||
|
updateGuiOverlapSlots(gui);
|
||||||
|
}
|
||||||
shiftPage(0);
|
shiftPage(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,26 +420,32 @@ public class ItemsGrid {
|
|||||||
invalidSlotMap = new boolean[rows * columns];
|
invalidSlotMap = new boolean[rows * columns];
|
||||||
perPage = columns * rows;
|
perPage = columns * rows;
|
||||||
|
|
||||||
checkGuiOverlap(gui, 0, columns - 2, 1);
|
if (gui != null) {
|
||||||
checkGuiOverlap(gui, columns - 1, 1, -1);
|
final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
|
||||||
|
if (NEIClientConfig.optimizeGuiOverlapComputation()) {
|
||||||
|
checkGuiOverlap(gui, handlers, 0, columns - 2, 1);
|
||||||
|
checkGuiOverlap(gui, handlers, columns - 1, 1, -1);
|
||||||
|
} else {
|
||||||
|
checkGuiOverlap(gui, handlers, 0, columns, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
|
if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
|
||||||
onGridChanged();
|
onGridChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir) {
|
private void checkGuiOverlap(GuiContainer gui, INEIGuiHandler[] handlers, int start, int end, int dir) {
|
||||||
boolean validColumn = false;
|
boolean validColumn = false;
|
||||||
|
|
||||||
for (int c = start; c != end && !validColumn; c += dir) {
|
for (int c = start; c != end && (!NEIClientConfig.optimizeGuiOverlapComputation() || !validColumn); c += dir) {
|
||||||
validColumn = true;
|
validColumn = true;
|
||||||
|
|
||||||
for (int r = 0; r < rows; r++) {
|
for (int r = 0; r < rows; r++) {
|
||||||
final int idx = columns * r + c;
|
final int idx = columns * r + c;
|
||||||
if (GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c))
|
if (idx >= 0 && idx < invalidSlotMap.length
|
||||||
&& idx >= 0
|
&& !invalidSlotMap[idx]
|
||||||
&& idx < invalidSlotMap.length
|
&& GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c), handlers)) {
|
||||||
&& !invalidSlotMap[idx]) {
|
|
||||||
invalidSlotMap[idx] = true;
|
invalidSlotMap[idx] = true;
|
||||||
validColumn = false;
|
validColumn = false;
|
||||||
perPage--;
|
perPage--;
|
||||||
@@ -176,98 +454,90 @@ public class ItemsGrid {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Rectangle4i getItemRect(int idx) {
|
public T getSlotMouseOver(int mousex, int mousey) {
|
||||||
final List<Integer> mask = getMask();
|
if (!contains(mousex, mousey)) {
|
||||||
|
return null;
|
||||||
for (int i = 0; i < mask.size(); i++) {
|
|
||||||
if (mask.get(i) != null && idx == mask.get(i)) {
|
|
||||||
return getSlotRect(i);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
final int overRow = getRowIndex(mousey);
|
||||||
|
final int overColumn = getColumnIndex(mousex);
|
||||||
|
final int slt = columns * overRow + overColumn;
|
||||||
|
|
||||||
|
if (overRow >= rows || overColumn >= columns) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return getSlotBySlotIndex(slt);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Rectangle4i getSlotRect(int i) {
|
public T getSlotBySlotIndex(int slotIndex) {
|
||||||
return getSlotRect(i / columns, i % columns);
|
return getMask().stream().filter(item -> item.slotIndex == slotIndex).findAny().orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public T getSlotByItemIndex(int itemIndex) {
|
||||||
|
return getMask().stream().filter(item -> item.itemIndex == itemIndex).findAny().orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Rectangle4i getItemRect(int itemIndex) {
|
||||||
|
final T item = getSlotByItemIndex(itemIndex);
|
||||||
|
return item != null ? getSlotRect(item.slotIndex) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Rectangle4i getSlotRect(int slotIndex) {
|
||||||
|
return getSlotRect(slotIndex / columns, slotIndex % columns);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Rectangle4i getSlotRect(int row, int column) {
|
public Rectangle4i getSlotRect(int row, int column) {
|
||||||
return new Rectangle4i(
|
return new Rectangle4i(
|
||||||
marginLeft + paddingLeft + column * SLOT_SIZE, marginTop + row * SLOT_SIZE, SLOT_SIZE, SLOT_SIZE);
|
marginLeft + paddingLeft + column * SLOT_SIZE,
|
||||||
|
marginTop + row * SLOT_SIZE,
|
||||||
|
SLOT_SIZE,
|
||||||
|
SLOT_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getRowIndex(int mousey) {
|
||||||
|
return (mousey - this.marginTop) / SLOT_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getColumnIndex(int mousex) {
|
||||||
|
return (mousex - this.marginLeft - this.paddingLeft) / SLOT_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInvalidSlot(int index) {
|
public boolean isInvalidSlot(int index) {
|
||||||
return invalidSlotMap[index];
|
return invalidSlotMap[index];
|
||||||
}
|
}
|
||||||
|
|
||||||
protected List<Integer> getMask() {
|
public abstract List<T> getMask();
|
||||||
List<Integer> mask = new ArrayList<>();
|
|
||||||
|
|
||||||
int idx = page * perPage;
|
protected abstract M getMouseContext(int mousex, int mousey);
|
||||||
for (int i = 0; i < rows * columns && idx < size(); i++) {
|
|
||||||
mask.add(isInvalidSlot(i) ? null : idx++);
|
protected void beforeDrawItems(int mousex, int mousey, M mouseContext) {
|
||||||
|
for (T item : getMask()) {
|
||||||
|
item.beforeDraw(getSlotRect(item.slotIndex), mouseContext);
|
||||||
}
|
}
|
||||||
|
for (T item : getMask()) {
|
||||||
return mask;
|
item.drawBorder(getSlotRect(item.slotIndex));
|
||||||
}
|
|
||||||
|
|
||||||
private void drawSlotOutlines(int mousex, int mousey) {
|
|
||||||
ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
|
|
||||||
final List<Integer> mask = getMask();
|
|
||||||
|
|
||||||
for (int i = 0; i < mask.size(); i++) {
|
|
||||||
if (mask.get(i) != null) {
|
|
||||||
drawSlotOutline(focused, mask.get(i), getSlotRect(i));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawSlotOutline(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
|
protected void afterDrawItems(int mousex, int mousey, M mouseContext) {
|
||||||
if (focused != null && focused.slotIndex == slotIdx) {
|
for (T item : getMask()) {
|
||||||
drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
|
item.afterDraw(getSlotRect(item.slotIndex), mouseContext);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void blitExistingBuffer() {
|
public void update() {}
|
||||||
Minecraft minecraft = Minecraft.getMinecraft();
|
|
||||||
GL11.glEnable(GL11.GL_BLEND);
|
|
||||||
OpenGlHelper.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
||||||
getFrameBuffer().bindFramebufferTexture();
|
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
|
||||||
ScaledResolution res = new ScaledResolution(minecraft, minecraft.displayWidth, minecraft.displayHeight);
|
|
||||||
Tessellator tessellator = Tessellator.instance;
|
|
||||||
tessellator.startDrawingQuads();
|
|
||||||
tessellator.addVertexWithUV(0, res.getScaledHeight_double(), 0.0, 0, 0);
|
|
||||||
tessellator.addVertexWithUV(res.getScaledWidth_double(), res.getScaledHeight_double(), 0.0, 1, 0);
|
|
||||||
tessellator.addVertexWithUV(res.getScaledWidth_double(), 0, 0.0, 1, 1);
|
|
||||||
tessellator.addVertexWithUV(0, 0, 0, 0, 1);
|
|
||||||
tessellator.draw();
|
|
||||||
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
|
|
||||||
}
|
|
||||||
|
|
||||||
private Framebuffer getFrameBuffer() {
|
protected void drawItems() {
|
||||||
|
|
||||||
if (framebuffer == null) {
|
for (T item : getMask()) {
|
||||||
framebuffer = new Framebuffer(1, 1, true);
|
item.drawItem(getSlotRect(item.slotIndex));
|
||||||
framebuffer.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return framebuffer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void drawItems() {
|
protected int getGridRenderingCacheMode() {
|
||||||
GuiContainerManager.enableMatrixStackLogging();
|
return NEIClientConfig.getGridRenderingCacheMode();
|
||||||
|
|
||||||
final List<Integer> mask = getMask();
|
|
||||||
for (int i = 0; i < mask.size(); i++) {
|
|
||||||
if (mask.get(i) != null) {
|
|
||||||
drawItem(getSlotRect(i), mask.get(i));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
GuiContainerManager.disableMatrixStackLogging();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void draw(int mousex, int mousey) {
|
public void draw(int mousex, int mousey) {
|
||||||
@@ -275,74 +545,47 @@ public class ItemsGrid {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NEIClientConfig.shouldCacheItemRendering()) {
|
final int gridRenderingCacheMode = getGridRenderingCacheMode();
|
||||||
|
final M mouseContext = getMouseContext(mousex, mousey);
|
||||||
|
|
||||||
if (refreshBuffer) {
|
beforeDrawItems(mousex, mousey, mouseContext);
|
||||||
Minecraft minecraft = Minecraft.getMinecraft();
|
|
||||||
Framebuffer framebuffer = getFrameBuffer();
|
|
||||||
framebuffer.createBindFramebuffer(minecraft.displayWidth, minecraft.displayHeight);
|
|
||||||
framebuffer.framebufferClear();
|
|
||||||
framebuffer.bindFramebuffer(false);
|
|
||||||
|
|
||||||
/* Set up some rendering state needed for items to work correctly */
|
if (gridRenderingCacheMode > 0) {
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
|
||||||
GL11.glDepthMask(true);
|
|
||||||
OpenGlHelper.glBlendFunc(
|
|
||||||
GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
|
||||||
|
|
||||||
drawItems();
|
if (this.screenCapture == null) {
|
||||||
|
this.screenCapture = new ScreenCapture();
|
||||||
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
|
|
||||||
refreshBuffer = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
drawSlotOutlines(mousex, mousey);
|
if (this.screenCapture.needRefresh(gridRenderingCacheMode)) {
|
||||||
blitExistingBuffer();
|
this.screenCapture.captureScreen(() -> {
|
||||||
|
GuiContainerManager.enableMatrixStackLogging();
|
||||||
|
drawItems();
|
||||||
|
GuiContainerManager.disableMatrixStackLogging();
|
||||||
|
}, gridRenderingCacheMode);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.screenCapture.renderCapturedScreen();
|
||||||
} else {
|
} else {
|
||||||
drawSlotOutlines(mousex, mousey);
|
GuiContainerManager.enableMatrixStackLogging();
|
||||||
drawItems();
|
drawItems();
|
||||||
}
|
GuiContainerManager.disableMatrixStackLogging();
|
||||||
}
|
|
||||||
|
|
||||||
protected void drawItem(Rectangle4i rect, int idx) {
|
|
||||||
GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, getItem(idx));
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
|
|
||||||
if (!contains(mousex, mousey)) {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
final int overRow = (int) ((mousey - marginTop) / SLOT_SIZE);
|
afterDrawItems(mousex, mousey, mouseContext);
|
||||||
final int overColumn = (int) ((mousex - marginLeft - paddingLeft) / SLOT_SIZE);
|
|
||||||
final int slt = columns * overRow + overColumn;
|
|
||||||
|
|
||||||
if (overRow >= rows || overColumn >= columns) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<Integer> mask = getMask();
|
|
||||||
|
|
||||||
if (mask.size() > slt && mask.get(slt) != null) {
|
|
||||||
final int idx = mask.get(slt);
|
|
||||||
|
|
||||||
return new ItemPanelSlot(idx, getItem(idx));
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean contains(int px, int py) {
|
public boolean contains(int px, int py) {
|
||||||
|
final Rectangle4i rect = new Rectangle4i(
|
||||||
|
marginLeft + paddingLeft,
|
||||||
|
marginTop,
|
||||||
|
columns * SLOT_SIZE,
|
||||||
|
rows * SLOT_SIZE);
|
||||||
|
|
||||||
if (!(new Rectangle4i(marginLeft + paddingLeft, marginTop, columns * SLOT_SIZE, height)).contains(px, py)) {
|
if (!rect.contains(px, py)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
final int r = (int) ((py - marginTop) / SLOT_SIZE);
|
return !isInvalidSlot(columns * getRowIndex(py) + getColumnIndex(px));
|
||||||
final int c = (int) ((px - marginLeft - paddingLeft) / SLOT_SIZE);
|
|
||||||
final int slt = columns * r + c;
|
|
||||||
|
|
||||||
return r >= rows || c >= columns || !isInvalidSlot(slt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,259 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.Recipe.RecipeId;
|
||||||
|
|
||||||
|
public class ItemsPanelGrid extends ItemsGrid<ItemsPanelGrid.ItemsPanelGridSlot, ItemsPanelGrid.MouseContext> {
|
||||||
|
|
||||||
|
public static class ItemsPanelGridSlot extends ItemsGridSlot {
|
||||||
|
|
||||||
|
protected static final float LINE_WIDTH = 0.75f;
|
||||||
|
|
||||||
|
public int groupIndex = -1;
|
||||||
|
public String displayName = "";
|
||||||
|
public ItemStack bgItemStack;
|
||||||
|
public int groupSize = 1;
|
||||||
|
public boolean extended = false;
|
||||||
|
|
||||||
|
public Color bgColor = null;
|
||||||
|
|
||||||
|
public ItemsPanelGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
|
||||||
|
super(slotIndex, itemIndex, itemStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStack getBGItem() {
|
||||||
|
return this.bgItemStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public RecipeId getRecipeId() {
|
||||||
|
return FavoriteRecipes.getFavorite(this.item);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void beforeDraw(Rectangle4i rect, MouseContext mouseContext) {
|
||||||
|
super.beforeDraw(rect, mouseContext);
|
||||||
|
|
||||||
|
if (this.bgColor != null) {
|
||||||
|
NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, this.bgColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void drawItem(Rectangle4i rect) {
|
||||||
|
|
||||||
|
if (!this.extended && getBGItem() != null) {
|
||||||
|
GuiContainerManager.drawItems.zLevel -= 10F;
|
||||||
|
super.drawItem(getBGItem(), rect.offset(1, -1));
|
||||||
|
GuiContainerManager.drawItems.zLevel += 10F;
|
||||||
|
super.drawItem(getItemStack(), rect.offset(-2, 2));
|
||||||
|
} else {
|
||||||
|
super.drawItem(rect);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<ItemStack> newItems;
|
||||||
|
public ArrayList<ItemStack> rawItems = new ArrayList<>();
|
||||||
|
protected List<ItemsPanelGridSlot> gridMask;
|
||||||
|
|
||||||
|
protected final Map<Integer, Integer> itemToGroup = new HashMap<>();
|
||||||
|
protected final Map<Integer, List<ItemStack>> groupItems = new HashMap<>();
|
||||||
|
protected boolean forceExpand = false;
|
||||||
|
|
||||||
|
public void setItems(ArrayList<ItemStack> items) {
|
||||||
|
newItems = items;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void updateScale() {
|
||||||
|
SLOT_SIZE = 2 + (int) Math.ceil(8f * NEIClientConfig.getIntSetting("inventory.itempanelScale") / 100) * 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void refresh(GuiContainer gui) {
|
||||||
|
|
||||||
|
if (this.newItems != null) {
|
||||||
|
if (this.rawItems.size() != this.newItems.size()) {
|
||||||
|
this.page = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.groupItems.clear();
|
||||||
|
this.itemToGroup.clear();
|
||||||
|
this.forceExpand = false;
|
||||||
|
|
||||||
|
if (!CollapsibleItems.isEmpty() && !this.newItems.isEmpty()) {
|
||||||
|
final Set<Integer> groups = new HashSet<>();
|
||||||
|
boolean outsideGroup = false;
|
||||||
|
|
||||||
|
this.realItems = new ArrayList<>();
|
||||||
|
this.rawItems = new ArrayList<>(this.newItems);
|
||||||
|
|
||||||
|
for (ItemStack stack : this.newItems) {
|
||||||
|
final int groupIndex = CollapsibleItems.getGroupIndex(stack);
|
||||||
|
|
||||||
|
if (groupIndex == -1) {
|
||||||
|
this.realItems.add(stack);
|
||||||
|
outsideGroup = true;
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (!groups.contains(groupIndex) || CollapsibleItems.isExpanded(groupIndex)) {
|
||||||
|
this.itemToGroup.put(this.realItems.size(), groupIndex);
|
||||||
|
this.realItems.add(stack);
|
||||||
|
groups.add(groupIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.groupItems.computeIfAbsent(groupIndex, gi -> new ArrayList<>()).add(stack);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// automatically opens if there are elements from only one group
|
||||||
|
if (!outsideGroup && groups.size() == 1) {
|
||||||
|
final int groupIndex = groups.iterator().next();
|
||||||
|
this.realItems = new ArrayList<>(this.newItems);
|
||||||
|
this.itemToGroup.clear();
|
||||||
|
this.forceExpand = true;
|
||||||
|
|
||||||
|
for (int itemIndex = 0; itemIndex < this.realItems.size(); itemIndex++) {
|
||||||
|
this.itemToGroup.put(itemIndex, groupIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.realItems = new ArrayList<>(this.newItems);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.newItems = null;
|
||||||
|
onItemsChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
super.refresh(gui);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onGridChanged() {
|
||||||
|
this.gridMask = null;
|
||||||
|
super.onGridChanged();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<ItemsPanelGridSlot> getMask() {
|
||||||
|
|
||||||
|
if (this.gridMask == null) {
|
||||||
|
this.gridMask = new ArrayList<>();
|
||||||
|
int itemIndex = page * perPage;
|
||||||
|
|
||||||
|
for (int slotIndex = 0; slotIndex < rows * columns && itemIndex < size(); slotIndex++) {
|
||||||
|
if (!isInvalidSlot(slotIndex)) {
|
||||||
|
this.gridMask.add(new ItemsPanelGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
|
||||||
|
itemIndex++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
calculateGroupBorders(this.gridMask);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.gridMask;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected MouseContext getMouseContext(int mousex, int mousey) {
|
||||||
|
final ItemsPanelGridSlot hovered = getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
|
if (hovered != null) {
|
||||||
|
return new MouseContext(
|
||||||
|
hovered.slotIndex,
|
||||||
|
hovered.slotIndex / this.columns,
|
||||||
|
hovered.slotIndex % this.columns);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void calculateGroupBorders(List<ItemsPanelGridSlot> gridMask) {
|
||||||
|
|
||||||
|
if (gridMask.isEmpty() || this.groupItems.isEmpty()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final Color collapsedBGColor = new Color(
|
||||||
|
NEIClientConfig.getSetting("inventory.collapsibleItems.collapsedColor").getHexValue(),
|
||||||
|
true);
|
||||||
|
final Color expandedBGColor = new Color(
|
||||||
|
NEIClientConfig.getSetting("inventory.collapsibleItems.expandedColor").getHexValue(),
|
||||||
|
true);
|
||||||
|
final Color collapsedBorderColor = darkerColor(collapsedBGColor);
|
||||||
|
final Color expandedBorderColor = darkerColor(expandedBGColor);
|
||||||
|
final Map<Integer, Integer> borderGrid = new HashMap<>();
|
||||||
|
|
||||||
|
for (ItemsPanelGridSlot item : gridMask) {
|
||||||
|
borderGrid.put(item.slotIndex, this.itemToGroup.getOrDefault(item.itemIndex, -1));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (ItemsPanelGridSlot item : gridMask) {
|
||||||
|
final int groupIndex = borderGrid.get(item.slotIndex);
|
||||||
|
final List<ItemStack> groupItems = this.groupItems.get(groupIndex);
|
||||||
|
|
||||||
|
if (groupItems == null || groupItems.size() == 1) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int column = item.slotIndex % this.columns;
|
||||||
|
int row = item.slotIndex / this.columns;
|
||||||
|
int prevSlotIndex = (row - 1) * this.columns + column;
|
||||||
|
int nextSlotIndex = (row + 1) * this.columns + column;
|
||||||
|
|
||||||
|
item.groupIndex = groupIndex;
|
||||||
|
item.groupSize = groupItems.size();
|
||||||
|
item.bgItemStack = groupItems.get(groupItems.size() - 1);
|
||||||
|
item.displayName = CollapsibleItems.getDisplayName(groupIndex);
|
||||||
|
item.extended = this.forceExpand || CollapsibleItems.isExpanded(groupIndex);
|
||||||
|
item.bgColor = item.extended ? expandedBGColor : collapsedBGColor;
|
||||||
|
|
||||||
|
item.borderColor = item.extended ? expandedBorderColor : collapsedBorderColor;
|
||||||
|
item.borderLeft = column == 0 || borderGrid.getOrDefault(item.slotIndex - 1, -1) != groupIndex;
|
||||||
|
item.borderRight = column + 1 == this.columns
|
||||||
|
|| borderGrid.getOrDefault(item.slotIndex + 1, -1) != groupIndex;
|
||||||
|
item.borderTop = borderGrid.getOrDefault(prevSlotIndex, -1) != groupIndex;
|
||||||
|
item.borderBottom = borderGrid.getOrDefault(nextSlotIndex, -1) != groupIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Color darkerColor(Color color) {
|
||||||
|
return new Color(
|
||||||
|
color.getRed(),
|
||||||
|
color.getGreen(),
|
||||||
|
color.getBlue(),
|
||||||
|
Math.min((int) (color.getAlpha() + (255f / 5) * 2), 255));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void draw(int mousex, int mousey) {
|
||||||
|
if (ItemList.loadFinished) {
|
||||||
|
super.draw(mousex, mousey);
|
||||||
|
} else {
|
||||||
|
GuiDraw.drawStringC(
|
||||||
|
NEIClientUtils
|
||||||
|
.cropText(GuiDraw.fontRenderer, NEIClientUtils.translate("itempanel.loading"), width - 10),
|
||||||
|
marginLeft + width / 2,
|
||||||
|
marginTop + height / 2,
|
||||||
|
0xffffff,
|
||||||
|
true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,410 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import static codechicken.lib.gui.GuiDraw.fontRenderer;
|
||||||
|
|
||||||
|
import java.awt.Dimension;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.IdentityHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
import org.lwjgl.opengl.GL12;
|
||||||
|
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.NEIClientUtils.Alignment;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.ReadableNumberConverter;
|
||||||
|
|
||||||
|
public class ItemsTooltipLineHandler implements ITooltipLineHandler {
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface AmountRenderer {
|
||||||
|
|
||||||
|
void draw(int x, int y, ItemStack stack, long amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class NoAmountRenderer implements AmountRenderer {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||||
|
GuiContainerManager.drawItem(x, y, stack, true, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static void drawAmountText(String text, Rectangle4i rect, int color, Alignment alignment) {
|
||||||
|
NEIClientUtils.drawNEIOverlayText(text, rect, 1, color, true, alignment);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class TotalAmountRenderer extends NoAmountRenderer {
|
||||||
|
|
||||||
|
private static class AmountText {
|
||||||
|
|
||||||
|
public final String text;
|
||||||
|
public final Alignment alignment;
|
||||||
|
|
||||||
|
public AmountText(String text, Alignment alignment) {
|
||||||
|
this.text = text;
|
||||||
|
this.alignment = alignment;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private final Map<ItemStack, AmountText> cache = new IdentityHashMap<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||||
|
super.draw(x, y, stack, amount);
|
||||||
|
drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
|
||||||
|
final AmountText amountText = this.cache.computeIfAbsent(stack, key -> {
|
||||||
|
final boolean isFluidDisplay = StackInfo.isFluidDisplayItem(key);
|
||||||
|
final String text = formatAmount(key, amount);
|
||||||
|
|
||||||
|
return new AmountText(
|
||||||
|
isFluidDisplay && !text.isEmpty() ? text + "L" : text,
|
||||||
|
isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!amountText.text.isEmpty()) {
|
||||||
|
drawAmountText(amountText.text, rect, 0xFFFFFF, amountText.alignment);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected String formatAmount(ItemStack stack, long amount) {
|
||||||
|
return amount == 0 ? "" : ReadableNumberConverter.INSTANCE.toWideReadableForm(amount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class StacksAmountRenderer extends NoAmountRenderer {
|
||||||
|
|
||||||
|
private static class StacksText {
|
||||||
|
|
||||||
|
public final String stacks;
|
||||||
|
public final String remainder;
|
||||||
|
public final int color;
|
||||||
|
|
||||||
|
public StacksText(String stacks, String remainder, int color) {
|
||||||
|
this.stacks = stacks;
|
||||||
|
this.remainder = remainder;
|
||||||
|
this.color = color;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private final Map<ItemStack, StacksText> cache = new IdentityHashMap<>();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||||
|
super.draw(x, y, stack, amount);
|
||||||
|
drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
|
||||||
|
final StacksText stacksText = this.cache.computeIfAbsent(stack, key -> formatAmount(key, amount));
|
||||||
|
|
||||||
|
if (!stacksText.stacks.isEmpty()) {
|
||||||
|
drawAmountText(stacksText.stacks, rect, stacksText.color, Alignment.TopLeft);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!stacksText.remainder.isEmpty()) {
|
||||||
|
drawAmountText(stacksText.remainder, rect, stacksText.color, Alignment.BottomRight);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private StacksText formatAmount(ItemStack stack, long amount) {
|
||||||
|
final long stackSize = StackInfo.isFluidDisplayItem(stack) ? FLUID_STACK_SIZE
|
||||||
|
: Math.max(1, stack.getMaxStackSize());
|
||||||
|
final long stacks = amount / stackSize;
|
||||||
|
final long remainder = amount % stackSize;
|
||||||
|
final String prefix = getPrefix(stack);
|
||||||
|
|
||||||
|
return new StacksText(
|
||||||
|
stacks > 0 ? prefix + "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(stacks) : "",
|
||||||
|
remainder > 0
|
||||||
|
? (stacks > 0 ? "+" : prefix)
|
||||||
|
+ ReadableNumberConverter.INSTANCE.toWideReadableForm(remainder)
|
||||||
|
: "",
|
||||||
|
getColor(stack));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected String getPrefix(ItemStack stack) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int getColor(ItemStack stack) {
|
||||||
|
return 0xFFFFFF;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static final int SLOT_SIZE = 18;
|
||||||
|
protected static final int ICON_SIZE = 16;
|
||||||
|
protected static final int ICON_OFFSET = 1;
|
||||||
|
protected static final int MAX_COLUMNS = 11;
|
||||||
|
protected static final int MARGIN_TOP = 2;
|
||||||
|
protected static final int LABEL_MARGIN = 15;
|
||||||
|
protected static final int NAME_MARGIN = 2;
|
||||||
|
protected static final int DEFAULT_MAX_ROWS = 5;
|
||||||
|
protected static final int FLUID_STACK_SIZE = 144;
|
||||||
|
|
||||||
|
protected final List<ItemStack> items;
|
||||||
|
protected final List<Long> amounts = new ArrayList<>();
|
||||||
|
protected final List<String> names = new ArrayList<>();
|
||||||
|
|
||||||
|
protected AmountRenderer amountRenderer;
|
||||||
|
|
||||||
|
protected String label;
|
||||||
|
protected EnumChatFormatting labelColor = EnumChatFormatting.GRAY;
|
||||||
|
|
||||||
|
protected int activeStackIndex = -1;
|
||||||
|
protected Dimension size = new Dimension();
|
||||||
|
|
||||||
|
protected int maxNamedRows = Integer.MAX_VALUE;
|
||||||
|
|
||||||
|
protected int length = 0;
|
||||||
|
protected int rows = 0;
|
||||||
|
protected int nameRows = 0;
|
||||||
|
protected int gridColumns = 0;
|
||||||
|
protected int gridCount = 0;
|
||||||
|
|
||||||
|
public static ItemsTooltipLineHandler of(String label, List<ItemStack> items, int maxRows, int maxNamedRows) {
|
||||||
|
return new ItemsTooltipLineHandler(label, items, true, maxRows, maxNamedRows);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemsTooltipLineHandler(String label, List<ItemStack> items) {
|
||||||
|
this(label, items, true, DEFAULT_MAX_ROWS, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows) {
|
||||||
|
this(label, items, saveStackSize, maxRows, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows,
|
||||||
|
int maxNamedRows) {
|
||||||
|
this.label = label;
|
||||||
|
this.items = groupingItemStacks(items);
|
||||||
|
this.amountRenderer = saveStackSize ? new TotalAmountRenderer() : new NoAmountRenderer();
|
||||||
|
this.length = this.items.size();
|
||||||
|
this.maxNamedRows = maxNamedRows;
|
||||||
|
|
||||||
|
setMaxRows(maxRows);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static int headerHeight() {
|
||||||
|
return fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemsTooltipLineHandler setMaxRows(int maxRows) {
|
||||||
|
if (this.length == 0) {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.names.clear();
|
||||||
|
this.nameRows = 0;
|
||||||
|
|
||||||
|
if (!layoutWithNames(maxRows)) {
|
||||||
|
layoutAsGrid(maxRows);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.size.height = this.rows * SLOT_SIZE + headerHeight();
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getRows() {
|
||||||
|
return this.rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected boolean layoutWithNames(int maxRows) {
|
||||||
|
final int maxNames = Math.min(this.maxNamedRows, this.length <= maxRows ? this.length : maxRows - 1);
|
||||||
|
final int[] lineWidth = new int[maxNames + 1];
|
||||||
|
lineWidth[0] = labelWidth();
|
||||||
|
|
||||||
|
for (int index = 0; index < maxNames; index++) {
|
||||||
|
final String name = this.items.get(index).getDisplayName();
|
||||||
|
this.names.add(name);
|
||||||
|
lineWidth[index + 1] = Math
|
||||||
|
.max(lineWidth[index], SLOT_SIZE + NAME_MARGIN + fontRenderer.getStringWidth(name));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int named = maxNames; named >= 0; named--) {
|
||||||
|
final int rest = this.length - named;
|
||||||
|
final int width = Math.max(lineWidth[named], Math.min(rest, MAX_COLUMNS) * SLOT_SIZE);
|
||||||
|
final int columns = Math.max(1, width / SLOT_SIZE);
|
||||||
|
final int restRows = (int) Math.ceil((float) rest / columns);
|
||||||
|
|
||||||
|
if (named + restRows <= maxRows) {
|
||||||
|
this.nameRows = named;
|
||||||
|
this.gridColumns = columns;
|
||||||
|
this.gridCount = rest;
|
||||||
|
this.rows = named + restRows;
|
||||||
|
this.size.width = width;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.names.clear();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void layoutAsGrid(int maxRows) {
|
||||||
|
this.gridColumns = Math.min(MAX_COLUMNS, this.length);
|
||||||
|
this.rows = Math.min(maxRows, (int) Math.ceil((float) this.length / this.gridColumns));
|
||||||
|
this.gridCount = Math.min(this.length, this.gridColumns * this.rows);
|
||||||
|
this.size.width = Math.max(this.gridColumns * SLOT_SIZE, labelWidth());
|
||||||
|
|
||||||
|
if (this.gridCount < this.length) {
|
||||||
|
this.gridCount -= reservedColumns(this.length - this.gridCount);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int labelWidth() {
|
||||||
|
return fontRenderer.getStringWidth(this.label) + LABEL_MARGIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int reservedColumns(int hidden) {
|
||||||
|
return (int) Math.ceil((float) (fontRenderer.getStringWidth("+" + hidden) - 2) / SLOT_SIZE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemsTooltipLineHandler setAmountRenderer(AmountRenderer amountRenderer) {
|
||||||
|
this.amountRenderer = amountRenderer;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setActiveStack(ItemStack activeStack) {
|
||||||
|
final ItemStack realStack = items.stream().filter(stack -> NEIClientUtils.areStacksSameType(stack, activeStack))
|
||||||
|
.findFirst().orElse(null);
|
||||||
|
this.activeStackIndex = items.indexOf(realStack);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStack getActiveStack() {
|
||||||
|
return this.activeStackIndex == -1 ? null : this.items.get(this.activeStackIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ItemStack> getItems() {
|
||||||
|
return this.items;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return this.items.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Dimension getSize() {
|
||||||
|
return this.size;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLabelColor(EnumChatFormatting color) {
|
||||||
|
this.labelColor = color;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLabel(String label) {
|
||||||
|
this.label = label;
|
||||||
|
this.size.width = Math.max(this.size.width, labelWidth());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int x, int y) {
|
||||||
|
if (this.length == 0) return;
|
||||||
|
|
||||||
|
y += MARGIN_TOP;
|
||||||
|
|
||||||
|
fontRenderer.drawStringWithShadow(this.labelColor + this.label + ":", x, y, 0);
|
||||||
|
|
||||||
|
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||||
|
|
||||||
|
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
|
||||||
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
|
final int xTranslation = x;
|
||||||
|
final int yTranslation = y + fontRenderer.FONT_HEIGHT + 2;
|
||||||
|
final int zTranslation = GuiContainerManager.TOOLTIP_Z_OFFSET;
|
||||||
|
GL11.glTranslatef(xTranslation, yTranslation, zTranslation);
|
||||||
|
|
||||||
|
final int gridShift = gridIndexShift();
|
||||||
|
|
||||||
|
for (int index = 0; index < this.nameRows; index++) {
|
||||||
|
drawSlot(0, index * SLOT_SIZE, index);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int index = 0; index < this.gridCount; index++) {
|
||||||
|
drawSlot(
|
||||||
|
(index % this.gridColumns) * SLOT_SIZE,
|
||||||
|
(this.nameRows + index / this.gridColumns) * SLOT_SIZE,
|
||||||
|
this.nameRows + gridShift + index);
|
||||||
|
}
|
||||||
|
|
||||||
|
NEIClientUtils.gl2DRenderContext(() -> {
|
||||||
|
final int textShift = ICON_OFFSET + Math.round((ICON_SIZE - fontRenderer.FONT_HEIGHT) / 2f);
|
||||||
|
|
||||||
|
for (int index = 0; index < this.nameRows; index++) {
|
||||||
|
fontRenderer.drawStringWithShadow(
|
||||||
|
EnumChatFormatting.GRAY + this.names.get(index),
|
||||||
|
SLOT_SIZE + NAME_MARGIN,
|
||||||
|
index * SLOT_SIZE + textShift,
|
||||||
|
0xFFFFFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
final int hidden = this.length - this.nameRows - this.gridCount;
|
||||||
|
|
||||||
|
if (hidden > 0) {
|
||||||
|
final String text = "+" + hidden;
|
||||||
|
fontRenderer.drawStringWithShadow(
|
||||||
|
EnumChatFormatting.GRAY + text,
|
||||||
|
this.size.width - fontRenderer.getStringWidth(text) - 2,
|
||||||
|
(this.rows - 1) * SLOT_SIZE + textShift,
|
||||||
|
0xFFFFFF);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
GL11.glTranslatef(-xTranslation, -yTranslation, -zTranslation);
|
||||||
|
GL11.glPopAttrib();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected int gridIndexShift() {
|
||||||
|
if (this.nameRows > 0 || this.activeStackIndex == -1) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Math.max(0, Math.min(this.length - this.gridCount, this.activeStackIndex - this.gridCount + 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawSlot(int x, int y, int index) {
|
||||||
|
if (this.activeStackIndex == index) {
|
||||||
|
NEIClientUtils.gl2DRenderContext(() -> GuiDraw.drawRect(x, y, SLOT_SIZE, SLOT_SIZE, 0x66555555));
|
||||||
|
}
|
||||||
|
|
||||||
|
drawStackWithAmount(x, y, index);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void drawStackWithAmount(int x, int y, int index) {
|
||||||
|
this.amountRenderer.draw(x + ICON_OFFSET, y + ICON_OFFSET, this.items.get(index), this.amounts.get(index));
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<ItemStack> groupingItemStacks(List<ItemStack> items) {
|
||||||
|
final List<ItemStack> result = new ArrayList<>();
|
||||||
|
|
||||||
|
for (Map.Entry<NBTTagCompound, Long> entry : ItemStackAmount.of(items).entrySet()) {
|
||||||
|
result.add(StackInfo.loadFromNBT(entry.getKey(), 0));
|
||||||
|
this.amounts.add(Math.max(0, entry.getValue()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.isEmpty()) {
|
||||||
|
for (ItemStack stack : items) {
|
||||||
|
result.add(stack);
|
||||||
|
this.amounts.add(0L);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -2,39 +2,155 @@ package codechicken.nei;
|
|||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map;
|
||||||
|
import java.util.StringJoiner;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.settings.KeyBinding;
|
||||||
|
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
import org.lwjgl.input.Mouse;
|
||||||
|
|
||||||
|
import codechicken.nei.util.NEIKeyboardUtils;
|
||||||
|
import codechicken.nei.util.NEIMouseUtils;
|
||||||
|
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Good old down/held/up keystate tracker
|
* Registers NEI key bindings as vanilla {@link KeyBinding}s and exposes their state to the rest of NEI.
|
||||||
*/
|
*/
|
||||||
public class KeyManager {
|
public class KeyManager {
|
||||||
|
|
||||||
public static interface IKeyStateTracker {
|
public static interface IKeyStateTracker {
|
||||||
|
|
||||||
public void tickKeyStates();
|
public void tickKeyStates();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class KeyState {
|
public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
|
||||||
public boolean down;
|
private static final Map<String, KeyBinding> keyBindings = new HashMap<>();
|
||||||
public boolean held;
|
private static final Map<String, String> keyAliases = new HashMap<>();
|
||||||
public boolean up;
|
private static volatile boolean pendingOptionsReload = false;
|
||||||
|
|
||||||
|
static {
|
||||||
|
// Aliases for legacy keybinds
|
||||||
|
keyAliases.put("gui.recipe", "recipe.recipe");
|
||||||
|
keyAliases.put("gui.usage", "recipe.usage");
|
||||||
|
keyAliases.put("gui.hide_bookmarks", "bookmark.hide");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static HashMap<String, KeyState> keyStates = new HashMap<>();
|
public static KeyBinding registerKeyBinding(String ident, int defaultKey) {
|
||||||
public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
|
return keyBindings.computeIfAbsent(ident, id -> {
|
||||||
|
final KeyBinding binding = new KeyBinding(
|
||||||
|
"nei.options.keys." + id,
|
||||||
|
NEIKeyboardUtils.unhash(defaultKey),
|
||||||
|
categoryFor(id));
|
||||||
|
ClientRegistry.registerKeyBinding(binding);
|
||||||
|
return binding;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static KeyBinding getKeyBinding(String ident) {
|
||||||
|
return keyBindings.get(keyAliases.getOrDefault(ident, ident));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isRegistered(String description) {
|
||||||
|
for (KeyBinding binding : keyBindings.values()) {
|
||||||
|
if (binding.getKeyDescription().equals(description)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int getKeyCode(String ident) {
|
||||||
|
final KeyBinding binding = getKeyBinding(ident);
|
||||||
|
return binding == null ? Keyboard.KEY_NONE : binding.getKeyCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isKeyDown(String ident) {
|
||||||
|
final KeyBinding binding = getKeyBinding(ident);
|
||||||
|
|
||||||
|
if (binding != null) {
|
||||||
|
final int keyCode = binding.getKeyCode();
|
||||||
|
|
||||||
|
if (keyCode < 0) {
|
||||||
|
return Mouse.isButtonDown(keyCode + 100);
|
||||||
|
} else if (keyCode > Keyboard.KEY_NONE && keyCode < Keyboard.KEYBOARD_SIZE) {
|
||||||
|
return Keyboard.isKeyDown(keyCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isHashDown(String ident) {
|
||||||
|
return isHashDown(ident, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isHashDown(String ident, int modifierMask) {
|
||||||
|
|
||||||
|
if (!isKeyDown(ident)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIKeyboardUtils.isHashKey(getKeyCode(ident))) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ((modifierMask & NEIKeyboardUtils.CTRL_HASH) != 0) == NEIClientUtils.controlKey()
|
||||||
|
&& ((modifierMask & NEIKeyboardUtils.SHIFT_HASH) != 0) == NEIClientUtils.shiftKey()
|
||||||
|
&& ((modifierMask & NEIKeyboardUtils.ALT_HASH) != 0) == NEIClientUtils.altKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getKeyName(String ident) {
|
||||||
|
return getKeyName(ident, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getKeyName(String ident, int meta) {
|
||||||
|
final int keyCode = getKeyCode(ident);
|
||||||
|
return keyCode == Keyboard.KEY_NONE ? null : NEIKeyboardUtils.getKeyName(keyCode + meta);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getKeyName(String ident, int meta, int mouseBind) {
|
||||||
|
final int keyCode = getKeyCode(ident);
|
||||||
|
return keyCode == Keyboard.KEY_NONE && mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? null
|
||||||
|
: getKeyName(keyCode + meta, mouseBind);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getKeyName(int keyBind, int mouseBind) {
|
||||||
|
StringJoiner keyText = new StringJoiner(" + ");
|
||||||
|
String keyHash = keyBind == Keyboard.KEY_NONE ? "" : NEIKeyboardUtils.getKeyName(keyBind);
|
||||||
|
String mouseHash = mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? "" : NEIMouseUtils.getKeyName(mouseBind);
|
||||||
|
|
||||||
|
if (!keyHash.isEmpty()) {
|
||||||
|
keyText.add(keyHash);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!mouseHash.isEmpty()) {
|
||||||
|
keyText.add(mouseHash);
|
||||||
|
}
|
||||||
|
|
||||||
|
return keyText.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isPressed(String ident) {
|
||||||
|
final KeyBinding binding = getKeyBinding(ident);
|
||||||
|
return binding != null && binding.isPressed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String categoryFor(String ident) {
|
||||||
|
final int dot = ident.indexOf('.');
|
||||||
|
return dot < 0 ? "nei.options.keys" : "nei.options.keys." + ident.substring(0, dot);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void requestOptionsReload() {
|
||||||
|
pendingOptionsReload = true;
|
||||||
|
}
|
||||||
|
|
||||||
public static void tickKeyStates() {
|
public static void tickKeyStates() {
|
||||||
for (Entry<String, KeyState> entry : keyStates.entrySet()) {
|
|
||||||
final boolean down = NEIClientConfig.isKeyHashDown(entry.getKey());
|
|
||||||
final KeyState state = entry.getValue();
|
|
||||||
|
|
||||||
if (down) {
|
if (pendingOptionsReload) {
|
||||||
state.down = !state.held;
|
pendingOptionsReload = false;
|
||||||
state.up = false;
|
Minecraft.getMinecraft().gameSettings.loadOptions();
|
||||||
} else {
|
|
||||||
state.up = state.held;
|
|
||||||
state.down = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
state.held = down;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();
|
for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
// Simple LRUCache
|
||||||
|
public class LRUCache<K, V> extends LinkedHashMap<K, V> {
|
||||||
|
|
||||||
|
private final int capacity;
|
||||||
|
|
||||||
|
public LRUCache(int capacity) {
|
||||||
|
super(capacity, 0.75f, true);
|
||||||
|
this.capacity = capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
|
||||||
|
return size() > capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ import static codechicken.lib.gui.GuiDraw.drawString;
|
|||||||
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
||||||
|
|
||||||
public class Label extends Widget {
|
public class Label extends Widget {
|
||||||
|
|
||||||
final boolean centered;
|
final boolean centered;
|
||||||
final int colour;
|
final int colour;
|
||||||
public String text;
|
public String text;
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import static codechicken.nei.NEIClientConfig.isEnabled;
|
|||||||
import static codechicken.nei.NEIClientConfig.isHidden;
|
import static codechicken.nei.NEIClientConfig.isHidden;
|
||||||
import static codechicken.nei.NEIClientConfig.showIDs;
|
import static codechicken.nei.NEIClientConfig.showIDs;
|
||||||
import static codechicken.nei.NEIClientConfig.toggleBooleanSetting;
|
import static codechicken.nei.NEIClientConfig.toggleBooleanSetting;
|
||||||
import static codechicken.nei.NEIClientConfig.world;
|
|
||||||
import static codechicken.nei.NEIClientUtils.cycleGamemode;
|
import static codechicken.nei.NEIClientUtils.cycleGamemode;
|
||||||
import static codechicken.nei.NEIClientUtils.decreaseSlotStack;
|
import static codechicken.nei.NEIClientUtils.decreaseSlotStack;
|
||||||
import static codechicken.nei.NEIClientUtils.deleteEverything;
|
import static codechicken.nei.NEIClientUtils.deleteEverything;
|
||||||
@@ -32,6 +31,27 @@ import static codechicken.nei.NEIClientUtils.toggleMagnetMode;
|
|||||||
import static codechicken.nei.NEIClientUtils.toggleRaining;
|
import static codechicken.nei.NEIClientUtils.toggleRaining;
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
import static codechicken.nei.NEIClientUtils.translate;
|
||||||
|
|
||||||
|
import java.awt.Point;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.GuiButton;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
||||||
|
import net.minecraft.client.renderer.InventoryEffectRenderer;
|
||||||
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import org.lwjgl.input.Keyboard;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
import codechicken.lib.gui.GuiDraw;
|
||||||
import codechicken.nei.KeyManager.IKeyStateTracker;
|
import codechicken.nei.KeyManager.IKeyStateTracker;
|
||||||
import codechicken.nei.api.API;
|
import codechicken.nei.api.API;
|
||||||
@@ -46,29 +66,14 @@ import codechicken.nei.guihook.IContainerDrawHandler;
|
|||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
import codechicken.nei.guihook.IContainerObjectHandler;
|
import codechicken.nei.guihook.IContainerObjectHandler;
|
||||||
import codechicken.nei.guihook.IContainerTooltipHandler;
|
import codechicken.nei.guihook.IContainerTooltipHandler;
|
||||||
|
import codechicken.nei.recipe.AutoCraftingManager;
|
||||||
import codechicken.nei.recipe.GuiRecipeTab;
|
import codechicken.nei.recipe.GuiRecipeTab;
|
||||||
import codechicken.nei.recipe.RecipeCatalysts;
|
import codechicken.nei.recipe.RecipeCatalysts;
|
||||||
import java.util.HashMap;
|
import codechicken.nei.recipe.debug.DebugHandlerWidget;
|
||||||
import java.util.List;
|
|
||||||
import java.util.TreeSet;
|
public class LayoutManager implements IContainerInputHandler, IContainerTooltipHandler, IContainerDrawHandler,
|
||||||
import net.minecraft.client.Minecraft;
|
IContainerObjectHandler, IKeyStateTracker {
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
|
||||||
import net.minecraft.client.renderer.InventoryEffectRenderer;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
public class LayoutManager
|
|
||||||
implements IContainerInputHandler,
|
|
||||||
IContainerTooltipHandler,
|
|
||||||
IContainerDrawHandler,
|
|
||||||
IContainerObjectHandler,
|
|
||||||
IKeyStateTracker {
|
|
||||||
private static LayoutManager instance;
|
private static LayoutManager instance;
|
||||||
|
|
||||||
/** Note: this variable isn't actually used by this mod, but NEI add-ons might need it. */
|
/** Note: this variable isn't actually used by this mod, but NEI add-ons might need it. */
|
||||||
@@ -77,34 +82,29 @@ public class LayoutManager
|
|||||||
/**
|
/**
|
||||||
* Sorted bottom first
|
* Sorted bottom first
|
||||||
*/
|
*/
|
||||||
private static TreeSet<Widget> drawWidgets = new TreeSet<>(new WidgetZOrder(false));
|
private static Set<Widget> drawWidgets = new TreeSet<>(new WidgetZOrder(false));
|
||||||
/**
|
/**
|
||||||
* Sorted top first
|
* Sorted top first
|
||||||
*/
|
*/
|
||||||
private static TreeSet<Widget> controlWidgets = new TreeSet<>(new WidgetZOrder(true));
|
private static Set<Widget> controlWidgets = new TreeSet<>(new WidgetZOrder(true));
|
||||||
|
|
||||||
public static ItemPanel itemPanel;
|
public static ItemPanel itemPanel;
|
||||||
public static BookmarkPanel bookmarkPanel;
|
public static BookmarkPanel bookmarkPanel;
|
||||||
public static SubsetWidget dropDown;
|
public static SubsetWidget dropDown;
|
||||||
public static PresetsWidget presetsPanel;
|
|
||||||
public static SearchField searchField;
|
public static SearchField searchField;
|
||||||
|
public static ItemZoom itemZoom;
|
||||||
|
|
||||||
public static ButtonCycled options;
|
public static ButtonCycled options;
|
||||||
public static ButtonCycled bookmarksButton;
|
public static ButtonCycled bookmarksButton;
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static Button more;
|
public static Button more;
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static Button less;
|
public static Button less;
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public static ItemQuantityField quantity;
|
public static ItemQuantityField quantity;
|
||||||
|
|
||||||
public static Button delete;
|
public static Button delete;
|
||||||
public static ButtonCycled gamemode;
|
public static ButtonCycled gamemode;
|
||||||
public static Button rain;
|
public static Button rain;
|
||||||
public static Button magnet;
|
public static ButtonCycled magnet;
|
||||||
public static Button[] timeButtons = new Button[4];
|
public static Button[] timeButtons = new Button[4];
|
||||||
public static Button heal;
|
public static Button heal;
|
||||||
|
|
||||||
@@ -112,12 +112,12 @@ public class LayoutManager
|
|||||||
|
|
||||||
public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
|
public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
|
||||||
|
|
||||||
public static boolean itemsLoaded = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Not present, Present
|
* This is set to true immediately after item loading thread is started, to prevent duplicated loading thread from
|
||||||
|
* being executed. If you want to know if item list is actually finished loading, Use {@link ItemList#loadFinished}
|
||||||
|
* instead.
|
||||||
*/
|
*/
|
||||||
public static Image[] itemPresenceOverlays = new Image[2];
|
public static boolean itemsLoaded = false;
|
||||||
|
|
||||||
public static void load() {
|
public static void load() {
|
||||||
API.addLayoutStyle(0, new LayoutStyleMinecraft());
|
API.addLayoutStyle(0, new LayoutStyleMinecraft());
|
||||||
@@ -133,19 +133,14 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onPreDraw(GuiContainer gui) {
|
public void onPreDraw(GuiContainer gui) {
|
||||||
if (!isHidden()
|
// Reset the gui to the center of the screen, for potion effect offsets etc
|
||||||
&& isEnabled()
|
if (isEnabled() && gui instanceof InventoryEffectRenderer) {
|
||||||
&& gui
|
|
||||||
instanceof
|
|
||||||
InventoryEffectRenderer) // Reset the gui to the center of the screen, for potion effect offsets
|
|
||||||
// etc
|
|
||||||
{
|
|
||||||
gui.guiLeft = (gui.width - gui.xSize) / 2;
|
gui.guiLeft = (gui.width - gui.xSize) / 2;
|
||||||
gui.guiTop = (gui.height - gui.ySize) / 2;
|
gui.guiTop = (gui.height - gui.ySize) / 2;
|
||||||
|
|
||||||
if (gui instanceof GuiContainerCreative && gui.buttonList.size() >= 2) {
|
if (gui instanceof GuiContainerCreative && gui.buttonList.size() >= 2) {
|
||||||
GuiButton button1 = (GuiButton) gui.buttonList.get(0);
|
GuiButton button1 = gui.buttonList.get(0);
|
||||||
GuiButton button2 = (GuiButton) gui.buttonList.get(1);
|
GuiButton button2 = gui.buttonList.get(1);
|
||||||
button1.xPosition = gui.guiLeft;
|
button1.xPosition = gui.guiLeft;
|
||||||
button2.xPosition = gui.guiLeft + gui.xSize - 20;
|
button2.xPosition = gui.guiLeft + gui.xSize - 20;
|
||||||
}
|
}
|
||||||
@@ -166,20 +161,24 @@ public class LayoutManager
|
|||||||
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
if (isHidden()) return;
|
if (isHidden()) return;
|
||||||
|
|
||||||
for (Widget widget : controlWidgets) widget.onGuiClick(mousex, mousey);
|
for (Widget widget : controlWidgets) {
|
||||||
|
widget.onGuiClick(mousex, mousey);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||||
if (isHidden()) return false;
|
if (isHidden()) return false;
|
||||||
|
|
||||||
if (!isEnabled()) return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button);
|
if (!isEnabled()) {
|
||||||
|
return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button);
|
||||||
|
}
|
||||||
|
|
||||||
for (Widget widget : controlWidgets) {
|
for (Widget widget : controlWidgets) {
|
||||||
widget.onGuiClick(mousex, mousey);
|
widget.onGuiClick(mousex, mousey);
|
||||||
if (widget.contains(mousex, mousey)
|
if (widget.contains(mousex, mousey) ? widget.handleClick(mousex, mousey, button)
|
||||||
? widget.handleClick(mousex, mousey, button)
|
: widget.handleClickExt(mousex, mousey, button))
|
||||||
: widget.handleClickExt(mousex, mousey, button)) return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -187,10 +186,22 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
||||||
if (!isHidden() && isEnabled())
|
return getWidgetUnderMouse(mousex, mousey) != null;
|
||||||
for (Widget widget : drawWidgets) if (widget.contains(mousex, mousey)) return true;
|
}
|
||||||
|
|
||||||
return false;
|
public Widget getWidgetUnderMouse(int mousex, int mousey) {
|
||||||
|
|
||||||
|
if (isHidden() || !isEnabled()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Widget widget : controlWidgets) {
|
||||||
|
if (widget.contains(mousex, mousey)) {
|
||||||
|
return widget;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) {
|
public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
@@ -209,13 +220,17 @@ public class LayoutManager
|
|||||||
@Override
|
@Override
|
||||||
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
|
||||||
if (NEIClientConfig.isKeyHashDown("gui.hide")) {
|
if (KeyManager.isKeyDown("gui.hide")) {
|
||||||
toggleBooleanSetting("inventory.hidden");
|
toggleBooleanSetting("inventory.hidden");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NEIClientConfig.isKeyHashDown("gui.hide_bookmarks")) {
|
if (KeyManager.isKeyDown("bookmark.hide")) {
|
||||||
toggleBooleanSetting("inventory.bookmarksEnabled");
|
toggleBooleanSetting("inventory.bookmarks.enabled");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (KeyManager.isKeyDown("gui.next_tooltip") && GuiContainerManager.incrementTooltipPage()) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,12 +256,12 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
||||||
if (!isHidden() && isEnabled()) {
|
final Widget focused = getWidgetUnderMouse(mousex, mousey);
|
||||||
for (Widget widget : drawWidgets) {
|
|
||||||
ItemStack stack = widget.getStackMouseOver(mousex, mousey);
|
if (focused != null) {
|
||||||
if (stack != null) return stack;
|
return focused.getStackMouseOver(mousex, mousey);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -275,9 +290,19 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
|
public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
|
||||||
|
|
||||||
if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
|
if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
|
||||||
for (Widget widget : drawWidgets) currenttip = widget.handleTooltip(mousex, mousey, currenttip);
|
final Widget focused = getWidgetUnderMouse(mousex, mousey);
|
||||||
|
|
||||||
|
if (focused != null) {
|
||||||
|
currenttip = focused.handleTooltip(mousex, mousey, currenttip);
|
||||||
|
|
||||||
|
if (focused instanceof IContainerTooltipHandler tip) {
|
||||||
|
currenttip = tip.handleTooltip(gui, mousex, mousey, currenttip);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return currenttip;
|
return currenttip;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -294,29 +319,64 @@ public class LayoutManager
|
|||||||
currenttip.set(0, mainname);
|
currenttip.set(0, mainname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
|
||||||
|
final Point mouse = GuiDraw.getMousePosition();
|
||||||
|
final Widget focused = getWidgetUnderMouse(mouse.x, mouse.y);
|
||||||
|
|
||||||
|
if (focused instanceof IContainerTooltipHandler tip) {
|
||||||
|
currenttip = tip.handleItemDisplayName(gui, stack, currenttip);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return currenttip;
|
return currenttip;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> handleItemTooltip(
|
public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
|
||||||
GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
|
List<String> currenttip) {
|
||||||
|
|
||||||
|
if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
|
||||||
|
final Widget focused = getWidgetUnderMouse(mousex, mousey);
|
||||||
|
|
||||||
|
if (focused != null) {
|
||||||
|
currenttip = focused.handleItemTooltip(itemstack, mousex, mousey, currenttip);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (focused instanceof IContainerTooltipHandler tip) {
|
||||||
|
currenttip = tip.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return currenttip;
|
return currenttip;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, String> handleHotkeys(GuiContainer gui, int mousex, int mousey, Map<String, String> hotkeys) {
|
||||||
|
|
||||||
|
if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
|
||||||
|
final Widget focused = getWidgetUnderMouse(mousex, mousey);
|
||||||
|
|
||||||
|
if (focused != null) {
|
||||||
|
hotkeys = focused.handleHotkeys(mousex, mousey, hotkeys);
|
||||||
|
|
||||||
|
if (focused instanceof IContainerTooltipHandler tip) {
|
||||||
|
hotkeys = tip.handleHotkeys(gui, mousex, mousey, hotkeys);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return hotkeys;
|
||||||
|
}
|
||||||
|
|
||||||
public static void layout(GuiContainer gui) {
|
public static void layout(GuiContainer gui) {
|
||||||
VisiblityData visiblity = new VisiblityData();
|
VisiblityData visiblity = new VisiblityData();
|
||||||
|
visiblity.showNEI = !isHidden();
|
||||||
if (isHidden()) visiblity.showNEI = false;
|
visiblity.showBookmarkPanel = !isBookmarkPanelHidden();
|
||||||
|
visiblity.showSearchSection = !(gui.height - gui.ySize <= 40 && NEIClientConfig.isSearchWidgetCentered());
|
||||||
if (isBookmarkPanelHidden()) visiblity.showBookmarkPanel = false;
|
visiblity.showSubsetDropdown = NEIClientConfig.showSubsetWidget()
|
||||||
|
&& (gui.guiTop > 20 || visiblity.showSearchSection && !NEIClientConfig.subsetWidgetOnTop());
|
||||||
if (gui.height - gui.ySize <= 40) visiblity.showSearchSection = false;
|
visiblity.showWidgets = gui.guiLeft - 4 > 76;
|
||||||
|
|
||||||
if (visiblity.showBookmarkPanel || gui.guiTop <= 20) visiblity.showSubsetDropdown = false;
|
|
||||||
|
|
||||||
if (!visiblity.showBookmarkPanel || gui.guiTop <= 20) visiblity.showPresetsDropdown = false;
|
|
||||||
|
|
||||||
if (gui.guiLeft - 4 < 76) visiblity.showWidgets = false;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
GuiInfo.readLock.lock();
|
GuiInfo.readLock.lock();
|
||||||
@@ -339,11 +399,14 @@ public class LayoutManager
|
|||||||
bookmarkPanel = ItemPanels.bookmarkPanel;
|
bookmarkPanel = ItemPanels.bookmarkPanel;
|
||||||
bookmarkPanel.init();
|
bookmarkPanel.init();
|
||||||
|
|
||||||
|
itemZoom = new ItemZoom();
|
||||||
|
|
||||||
dropDown = new SubsetWidget();
|
dropDown = new SubsetWidget();
|
||||||
presetsPanel = new PresetsWidget();
|
|
||||||
searchField = new SearchField("search");
|
searchField = new SearchField("search");
|
||||||
|
API.addItemFilter(searchField);
|
||||||
|
|
||||||
options = new ButtonCycled(3) {
|
options = new ButtonCycled(3) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 32, 0, 16, 16).build();
|
this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 32, 0, 16, 16).build();
|
||||||
@@ -351,17 +414,23 @@ public class LayoutManager
|
|||||||
this.icons[2] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 64, 0, 16, 16).build();
|
this.icons[2] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 64, 0, 16, 16).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean getIsAccessibleControlEventKey() {
|
||||||
|
if (Minecraft.isRunningOnMac) {
|
||||||
|
return Keyboard.getEventKey() == Keyboard.KEY_LMETA || Keyboard.getEventKey() == Keyboard.KEY_RMETA;
|
||||||
|
}
|
||||||
|
return Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
|
||||||
|
|| Keyboard.getEventKey() == Keyboard.KEY_RCONTROL;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (!rightclick) {
|
if (!rightclick) {
|
||||||
if (Keyboard.getEventKeyState()
|
if (Keyboard.getEventKeyState() && getIsAccessibleControlEventKey()
|
||||||
&& (Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
|
&& NEIClientConfig.canChangeCheatMode()) {
|
||||||
|| Keyboard.getEventKey() == Keyboard.KEY_RCONTROL)) {
|
|
||||||
NEIClientConfig.cycleSetting("inventory.cheatmode", 3);
|
NEIClientConfig.cycleSetting("inventory.cheatmode", 3);
|
||||||
} else {
|
} else {
|
||||||
if (Keyboard.getEventKeyState()
|
if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
|
||||||
&& (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
|
|| Keyboard.getEventKey() == Keyboard.KEY_RSHIFT)) {
|
||||||
|| Keyboard.getEventKey() == Keyboard.KEY_RSHIFT)) {
|
|
||||||
GuiRecipeTab.loadHandlerInfo();
|
GuiRecipeTab.loadHandlerInfo();
|
||||||
RecipeCatalysts.loadCatalystInfo();
|
RecipeCatalysts.loadCatalystInfo();
|
||||||
}
|
}
|
||||||
@@ -381,7 +450,10 @@ public class LayoutManager
|
|||||||
else if (cheatMode == 2) modeColor = EnumChatFormatting.RED.toString();
|
else if (cheatMode == 2) modeColor = EnumChatFormatting.RED.toString();
|
||||||
String controlKeyLocalization = translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl");
|
String controlKeyLocalization = translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl");
|
||||||
tooltip.add(modeColor + translate("inventory.options.tip.cheatmode." + cheatMode));
|
tooltip.add(modeColor + translate("inventory.options.tip.cheatmode." + cheatMode));
|
||||||
tooltip.add(modeColor + translate("inventory.options.tip.cheatmode.disable", controlKeyLocalization));
|
if (NEIClientConfig.canChangeCheatMode()) {
|
||||||
|
tooltip.add(
|
||||||
|
modeColor + translate("inventory.options.tip.cheatmode.disable", controlKeyLocalization));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -391,6 +463,7 @@ public class LayoutManager
|
|||||||
};
|
};
|
||||||
|
|
||||||
bookmarksButton = new ButtonCycled(2) {
|
bookmarksButton = new ButtonCycled(2) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 0, 16, 16).build();
|
this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 0, 16, 16).build();
|
||||||
@@ -399,7 +472,7 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
NEIClientConfig.toggleBooleanSetting("inventory.bookmarksEnabled");
|
NEIClientConfig.toggleBooleanSetting("inventory.bookmarks.enabled");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -413,10 +486,45 @@ public class LayoutManager
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
more = ItemPanels.itemPanel.more;
|
more = new Button("+") {
|
||||||
less = ItemPanels.itemPanel.less;
|
|
||||||
quantity = ItemPanels.itemPanel.quantity;
|
@Override
|
||||||
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
|
if (rightclick) return false;
|
||||||
|
|
||||||
|
int modifier = NEIClientUtils.controlKey() ? 64 : NEIClientUtils.shiftKey() ? 10 : 1;
|
||||||
|
int quantity = NEIClientConfig.getItemQuantity() + modifier;
|
||||||
|
|
||||||
|
if (quantity < 0) {
|
||||||
|
quantity = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
LayoutManager.quantity.setText(Integer.toString(quantity));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
less = new Button("-") {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
|
if (rightclick) return false;
|
||||||
|
|
||||||
|
int modifier = NEIClientUtils.controlKey() ? -64 : NEIClientUtils.shiftKey() ? -10 : -1;
|
||||||
|
int quantity = NEIClientConfig.getItemQuantity() + modifier;
|
||||||
|
|
||||||
|
if (quantity < 0) {
|
||||||
|
quantity = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
LayoutManager.quantity.setText(Integer.toString(quantity));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
quantity = new ItemQuantityField("quantity");
|
||||||
|
|
||||||
delete = new Button() {
|
delete = new Button() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if ((state & 0x3) == 2) return false;
|
if ((state & 0x3) == 2) return false;
|
||||||
@@ -444,16 +552,16 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void postDraw(int mousex, int mousey) {
|
public void postDraw(int mousex, int mousey) {
|
||||||
if (contains(mousex, mousey) && getHeldItem() != null && (state & 0x3) != 2)
|
if (contains(mousex, mousey) && getHeldItem() != null && (state & 0x3) != 2) GuiDraw.drawTip(
|
||||||
GuiDraw.drawTip(
|
mousex + 9,
|
||||||
mousex + 9,
|
mousey,
|
||||||
mousey,
|
translate(
|
||||||
translate(
|
"inventory.delete." + (shiftKey() ? "all" : "one"),
|
||||||
"inventory.delete." + (shiftKey() ? "all" : "one"),
|
GuiContainerManager.itemDisplayNameShort(getHeldItem())));
|
||||||
GuiContainerManager.itemDisplayNameShort(getHeldItem())));
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
gamemode = new ButtonCycled(3) {
|
gamemode = new ButtonCycled(3) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (!rightclick) {
|
if (!rightclick) {
|
||||||
@@ -469,6 +577,7 @@ public class LayoutManager
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
rain = new Button() {
|
rain = new Button() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (handleDisabledButtonPress("rain", rightclick)) return true;
|
if (handleDisabledButtonPress("rain", rightclick)) return true;
|
||||||
@@ -484,7 +593,8 @@ public class LayoutManager
|
|||||||
return getStateTip("rain", state);
|
return getStateTip("rain", state);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
magnet = new Button() {
|
magnet = new ButtonCycled(2) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (!rightclick) {
|
if (!rightclick) {
|
||||||
@@ -501,6 +611,7 @@ public class LayoutManager
|
|||||||
for (int i = 0; i < 4; i++) {
|
for (int i = 0; i < 4; i++) {
|
||||||
final int zone = i;
|
final int zone = i;
|
||||||
timeButtons[i] = new Button() {
|
timeButtons[i] = new Button() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (handleDisabledButtonPress(NEIActions.timeZones[zone], rightclick)) return true;
|
if (handleDisabledButtonPress(NEIActions.timeZones[zone], rightclick)) return true;
|
||||||
@@ -513,12 +624,13 @@ public class LayoutManager
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getButtonTip() {
|
public void addTooltips(List<String> tooltip) {
|
||||||
return getTimeTip(NEIActions.timeZones[zone], state);
|
addTimeTip(NEIActions.timeZones[zone], state, tooltip);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
heal = new Button() {
|
heal = new Button() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (!rightclick) {
|
if (!rightclick) {
|
||||||
@@ -546,9 +658,13 @@ public class LayoutManager
|
|||||||
return translate("inventory." + name + "." + sfx);
|
return translate("inventory." + name + "." + sfx);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getTimeTip(String name, int state) {
|
private static void addTimeTip(String name, int state, List<String> tooltip) {
|
||||||
String sfx = (state & 0x3) == 2 ? "enable" : "set";
|
if ((state & 0x3) == 2) {
|
||||||
return translate("inventory." + name + "." + sfx);
|
tooltip.add(translate("inventory." + name + ".enable"));
|
||||||
|
} else {
|
||||||
|
tooltip.add(translate("inventory." + name + ".set"));
|
||||||
|
tooltip.add(EnumChatFormatting.GRAY + translate("inventory." + name + ".disable"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean handleDisabledButtonPress(String ident, boolean rightclick) {
|
private static boolean handleDisabledButtonPress(String ident, boolean rightclick) {
|
||||||
@@ -582,19 +698,19 @@ public class LayoutManager
|
|||||||
|
|
||||||
if (!itemsLoaded) {
|
if (!itemsLoaded) {
|
||||||
ItemList.loadItems.restart();
|
ItemList.loadItems.restart();
|
||||||
itemsLoaded = true;
|
|
||||||
}
|
}
|
||||||
overlayRenderer = null;
|
|
||||||
|
|
||||||
|
overlayRenderer = null;
|
||||||
getLayoutStyle().init();
|
getLayoutStyle().init();
|
||||||
layout(gui);
|
layout(gui);
|
||||||
|
AutoFocusWidget.instance.load(gui);
|
||||||
}
|
}
|
||||||
|
|
||||||
NEIController.load(gui);
|
NEIController.load(gui);
|
||||||
|
|
||||||
if (checkCreativeInv(gui)
|
if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with
|
||||||
&& gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with creative+
|
// creative+
|
||||||
gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
|
gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -619,14 +735,15 @@ public class LayoutManager
|
|||||||
|
|
||||||
addWidget(options);
|
addWidget(options);
|
||||||
addWidget(bookmarksButton);
|
addWidget(bookmarksButton);
|
||||||
|
|
||||||
|
if (visiblity.showItemPanel && NEIClientConfig.showItemQuantityWidget()) {
|
||||||
|
addWidget(quantity);
|
||||||
|
addWidget(more);
|
||||||
|
addWidget(less);
|
||||||
|
}
|
||||||
|
|
||||||
if (visiblity.showItemPanel) {
|
if (visiblity.showItemPanel) {
|
||||||
|
addWidget(itemPanel);
|
||||||
if (PresetsWidget.inEditMode()) {
|
|
||||||
drawWidgets.add(itemPanel);
|
|
||||||
} else {
|
|
||||||
addWidget(itemPanel);
|
|
||||||
}
|
|
||||||
|
|
||||||
itemPanel.setVisible();
|
itemPanel.setVisible();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -635,13 +752,13 @@ public class LayoutManager
|
|||||||
bookmarkPanel.setVisible();
|
bookmarkPanel.setVisible();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (visiblity.showPresetsDropdown) {
|
if (visiblity.showSearchSection && NEIClientConfig.isSearchWidgetCentered()
|
||||||
addWidget(presetsPanel);
|
|| visiblity.showItemPanel && !NEIClientConfig.isSearchWidgetCentered()) {
|
||||||
}
|
searchField.setVisible(true);
|
||||||
|
|
||||||
searchField.setVisible(visiblity.showSearchSection);
|
|
||||||
if (visiblity.showSearchSection) {
|
|
||||||
addWidget(searchField);
|
addWidget(searchField);
|
||||||
|
} else {
|
||||||
|
searchField.setVisible(false);
|
||||||
|
searchField.setFocus(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (visiblity.showUtilityButtons) {
|
if (visiblity.showUtilityButtons) {
|
||||||
@@ -656,10 +773,13 @@ public class LayoutManager
|
|||||||
if (canPerformAction("delete")) addWidget(delete);
|
if (canPerformAction("delete")) addWidget(delete);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addWidget(itemZoom);
|
||||||
|
|
||||||
if (visiblity.showSubsetDropdown) {
|
if (visiblity.showSubsetDropdown) {
|
||||||
// Bookmarks or Subset/dropdown
|
|
||||||
addWidget(dropDown);
|
addWidget(dropDown);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addWidget(DebugHandlerWidget.instance);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LayoutStyle getLayoutStyle(int id) {
|
public static LayoutStyle getLayoutStyle(int id) {
|
||||||
@@ -683,6 +803,8 @@ public class LayoutManager
|
|||||||
|
|
||||||
if (!isEnabled()) return;
|
if (!isEnabled()) return;
|
||||||
|
|
||||||
|
AutoFocusWidget.instance.guiTick();
|
||||||
|
|
||||||
for (Widget widget : drawWidgets) widget.update();
|
for (Widget widget : drawWidgets) widget.update();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -690,7 +812,9 @@ public class LayoutManager
|
|||||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
if (isHidden() || !isEnabled()) return false;
|
if (isHidden() || !isEnabled()) return false;
|
||||||
|
|
||||||
for (Widget widget : drawWidgets) if (widget.onMouseWheel(scrolled, mousex, mousey)) return true;
|
for (Widget widget : controlWidgets) {
|
||||||
|
if (widget.onMouseWheel(scrolled, mousex, mousey)) return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -700,7 +824,7 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldShowTooltip(GuiContainer gui) {
|
public boolean shouldShowTooltip(GuiContainer gui) {
|
||||||
return itemPanel.draggedStack == null && bookmarkPanel.sortedStackIndex == -1;
|
return itemPanel.draggedStack == null && !bookmarkPanel.inEditingState() && !AutoCraftingManager.processing();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Note: this method isn't actually used by this mod, but NEI add-ons might need it. */
|
/** Note: this method isn't actually used by this mod, but NEI add-ons might need it. */
|
||||||
@@ -723,17 +847,19 @@ public class LayoutManager
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void renderSlotOverlay(GuiContainer window, Slot slot) {
|
public void renderSlotOverlay(GuiContainer window, Slot slot) {
|
||||||
ItemStack item = slot.getStack();
|
|
||||||
if (world.nbt.getBoolean("searchinventories")
|
if (SearchField.searchInventories()) {
|
||||||
&& (item == null
|
ItemStack item = slot.getStack();
|
||||||
? !getSearchExpression().equals("")
|
|
||||||
: !((SearchField) searchField).getFilter().matches(item))) {
|
if (item == null ? !getSearchExpression().equals("") : !searchField.getFilter().matches(item)) {
|
||||||
GL11.glDisable(GL11.GL_LIGHTING);
|
NEIClientUtils.gl2DRenderContext(() -> {
|
||||||
GL11.glTranslatef(0, 0, 150);
|
GL11.glTranslatef(0, 0, 150);
|
||||||
drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
|
drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
|
||||||
GL11.glTranslatef(0, 0, -150);
|
GL11.glTranslatef(0, 0, -150);
|
||||||
GL11.glEnable(GL11.GL_LIGHTING);
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawIcon(int x, int y, Image image) {
|
public static void drawIcon(int x, int y, Image image) {
|
||||||
@@ -745,7 +871,7 @@ public class LayoutManager
|
|||||||
GL11.glEnable(GL11.GL_BLEND);
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||||
if (!isDrawableResource) drawTexturedModalRect(x, y, image.x, image.y, image.width, image.height);
|
if (!isDrawableResource) drawTexturedModalRect(x, y, image.x, image.y, image.width, image.height);
|
||||||
else ((DrawableResource) image).draw(x, y);
|
else((DrawableResource) image).draw(x, y);
|
||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -775,23 +901,39 @@ public class LayoutManager
|
|||||||
final int ty2 = ty + 20 - h2 - te;
|
final int ty2 = ty + 20 - h2 - te;
|
||||||
final int tx2 = 200 - w2 - te;
|
final int tx2 = 200 - w2 - te;
|
||||||
|
|
||||||
|
final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
|
||||||
|
|
||||||
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
changeTexture("textures/gui/widgets.png");
|
changeTexture("textures/gui/widgets.png");
|
||||||
drawTexturedModalRect(x, y, tx1, ty1, w1, h1); // top left
|
final Tessellator tessellator = Tessellator.instance;
|
||||||
drawTexturedModalRect(x, y2, tx1, ty2, w1, h2); // bottom left
|
tessellator.startDrawingQuads();
|
||||||
|
addTexturedModalRect(tessellator, x, y, tx1, ty1, w1, h1); // top left
|
||||||
|
addTexturedModalRect(tessellator, x, y2, tx1, ty2, w1, h2); // bottom left
|
||||||
|
|
||||||
for (int tile = 0; tile < wTiles; tile++) {
|
for (int tile = 0; tile < wTiles; tile++) {
|
||||||
final int tileX = x + w1 + 50 * tile;
|
final int tileX = x + w1 + 50 * tile;
|
||||||
drawTexturedModalRect(tileX, y, tx3, ty1, 50, h1); // top
|
addTexturedModalRect(tessellator, tileX, y, tx3, ty1, 50, h1); // top
|
||||||
drawTexturedModalRect(tileX, y2, tx3, ty2, 50, h2); // bottom
|
addTexturedModalRect(tessellator, tileX, y2, tx3, ty2, 50, h2); // bottom
|
||||||
}
|
}
|
||||||
|
|
||||||
drawTexturedModalRect(x2, y, tx2, ty1, w2, h1); // top right
|
addTexturedModalRect(tessellator, x2, y, tx2, ty1, w2, h1); // top right
|
||||||
drawTexturedModalRect(x2, y2, tx2, ty2, w2, h2); // bottom right
|
addTexturedModalRect(tessellator, x2, y2, tx2, ty2, w2, h2); // bottom right
|
||||||
|
tessellator.draw();
|
||||||
|
|
||||||
|
if (!is2DTexture) GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawItemPresenceOverlay(int slotX, int slotY, boolean isPresent) {
|
private static void addTexturedModalRect(Tessellator tessellator, int x, int y, int textureX, int textureY,
|
||||||
Image icon = itemPresenceOverlays[isPresent ? 1 : 0];
|
int width, int height) {
|
||||||
drawIcon(slotX + 16 - icon.width, slotY + 16 - icon.height, icon);
|
final double z = GuiDraw.gui.getZLevel();
|
||||||
|
final double u = textureX / 256D;
|
||||||
|
final double v = textureY / 256D;
|
||||||
|
final double maxU = (textureX + width) / 256D;
|
||||||
|
final double maxV = (textureY + height) / 256D;
|
||||||
|
tessellator.addVertexWithUV(x, y + height, z, u, maxV);
|
||||||
|
tessellator.addVertexWithUV(x + width, y + height, z, maxU, maxV);
|
||||||
|
tessellator.addVertexWithUV(x + width, y, z, maxU, v);
|
||||||
|
tessellator.addVertexWithUV(x, y, z, u, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LayoutManager instance() {
|
public static LayoutManager instance() {
|
||||||
@@ -802,12 +944,12 @@ public class LayoutManager
|
|||||||
public void tickKeyStates() {
|
public void tickKeyStates() {
|
||||||
if (Minecraft.getMinecraft().currentScreen != null) return;
|
if (Minecraft.getMinecraft().currentScreen != null) return;
|
||||||
|
|
||||||
if (KeyManager.keyStates.get("world.dawn").down) timeButtons[0].onButtonPress(false);
|
if (KeyManager.isPressed("world.dawn")) timeButtons[0].onButtonPress(false);
|
||||||
if (KeyManager.keyStates.get("world.noon").down) timeButtons[1].onButtonPress(false);
|
if (KeyManager.isPressed("world.noon")) timeButtons[1].onButtonPress(false);
|
||||||
if (KeyManager.keyStates.get("world.dusk").down) timeButtons[2].onButtonPress(false);
|
if (KeyManager.isPressed("world.dusk")) timeButtons[2].onButtonPress(false);
|
||||||
if (KeyManager.keyStates.get("world.midnight").down) timeButtons[3].onButtonPress(false);
|
if (KeyManager.isPressed("world.midnight")) timeButtons[3].onButtonPress(false);
|
||||||
if (KeyManager.keyStates.get("world.rain").down) rain.onButtonPress(false);
|
if (KeyManager.isPressed("world.rain")) rain.onButtonPress(false);
|
||||||
if (KeyManager.keyStates.get("world.heal").down) heal.onButtonPress(false);
|
if (KeyManager.isPressed("world.heal")) heal.onButtonPress(false);
|
||||||
if (KeyManager.keyStates.get("world.creative").down) gamemode.onButtonPress(false);
|
if (KeyManager.isPressed("world.creative")) gamemode.onButtonPress(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,31 +1,19 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
import static codechicken.lib.gui.GuiDraw.drawStringC;
|
||||||
import static codechicken.nei.LayoutManager.bookmarkPanel;
|
|
||||||
import static codechicken.nei.LayoutManager.bookmarksButton;
|
|
||||||
import static codechicken.nei.LayoutManager.delete;
|
|
||||||
import static codechicken.nei.LayoutManager.dropDown;
|
|
||||||
import static codechicken.nei.LayoutManager.gamemode;
|
|
||||||
import static codechicken.nei.LayoutManager.heal;
|
|
||||||
import static codechicken.nei.LayoutManager.itemPanel;
|
|
||||||
import static codechicken.nei.LayoutManager.itemPresenceOverlays;
|
|
||||||
import static codechicken.nei.LayoutManager.magnet;
|
|
||||||
import static codechicken.nei.LayoutManager.options;
|
|
||||||
import static codechicken.nei.LayoutManager.presetsPanel;
|
|
||||||
import static codechicken.nei.LayoutManager.rain;
|
|
||||||
import static codechicken.nei.LayoutManager.searchField;
|
|
||||||
import static codechicken.nei.LayoutManager.timeButtons;
|
|
||||||
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
|
||||||
import static codechicken.nei.NEIClientConfig.disabledActions;
|
|
||||||
import static codechicken.nei.NEIClientConfig.getMagnetMode;
|
|
||||||
import static codechicken.nei.NEIClientConfig.isEnabled;
|
|
||||||
|
|
||||||
import codechicken.nei.api.LayoutStyle;
|
|
||||||
import codechicken.nei.drawable.DrawableBuilder;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.api.LayoutStyle;
|
||||||
|
|
||||||
public class LayoutStyleMinecraft extends LayoutStyle {
|
public class LayoutStyleMinecraft extends LayoutStyle {
|
||||||
|
|
||||||
|
protected static final int BUTTON_SIZE = 20;
|
||||||
|
protected static final int MARGIN = 2;
|
||||||
|
|
||||||
public int buttonCount;
|
public int buttonCount;
|
||||||
public int leftSize;
|
public int leftSize;
|
||||||
public int numButtons;
|
public int numButtons;
|
||||||
@@ -37,19 +25,18 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
delete.icon = new Image(144, 12, 12, 12);
|
LayoutManager.delete.icon = new Image(144, 12, 12, 12);
|
||||||
rain.icon = new Image(120, 12, 12, 12);
|
LayoutManager.rain.icon = new Image(120, 12, 12, 12);
|
||||||
gamemode.icons[0] = new Image(132, 12, 12, 12);
|
LayoutManager.gamemode.icons[0] = new Image(132, 12, 12, 12);
|
||||||
gamemode.icons[1] = new Image(156, 12, 12, 12);
|
LayoutManager.gamemode.icons[1] = new Image(156, 12, 12, 12);
|
||||||
gamemode.icons[2] = new Image(168, 12, 12, 12);
|
LayoutManager.gamemode.icons[2] = new Image(168, 12, 12, 12);
|
||||||
magnet.icon = new Image(180, 24, 12, 12);
|
LayoutManager.magnet.icons[0] = new Image(180, 24, 12, 12);
|
||||||
timeButtons[0].icon = new Image(132, 24, 12, 12);
|
LayoutManager.magnet.icons[1] = new Image(180, 36, 12, 12);
|
||||||
timeButtons[1].icon = new Image(120, 24, 12, 12);
|
LayoutManager.timeButtons[0].icon = new Image(132, 24, 12, 12);
|
||||||
timeButtons[2].icon = new Image(144, 24, 12, 12);
|
LayoutManager.timeButtons[1].icon = new Image(120, 24, 12, 12);
|
||||||
timeButtons[3].icon = new Image(156, 24, 12, 12);
|
LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12);
|
||||||
heal.icon = new Image(168, 24, 12, 12);
|
LayoutManager.timeButtons[3].icon = new Image(156, 24, 12, 12);
|
||||||
itemPresenceOverlays[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 40, 8, 8).build();
|
LayoutManager.heal.icon = new Image(168, 24, 12, 12);
|
||||||
itemPresenceOverlays[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 8, 40, 8, 8).build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -61,85 +48,179 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
public void layout(GuiContainer gui, VisiblityData visiblity) {
|
public void layout(GuiContainer gui, VisiblityData visiblity) {
|
||||||
reset();
|
reset();
|
||||||
|
|
||||||
leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
|
leftSize = (gui.width - gui.xSize) / 2 - 4;
|
||||||
numButtons = Math.max(leftSize / 18, 1);
|
numButtons = Math.max(leftSize / 20, 1);
|
||||||
|
|
||||||
delete.state = 0x4;
|
LayoutManager.delete.state = 0x4;
|
||||||
if (NEIController.getDeleteMode()) delete.state |= 1;
|
if (NEIController.getDeleteMode()) {
|
||||||
else if (!visiblity.enableDeleteMode) delete.state |= 2;
|
LayoutManager.delete.state |= 1;
|
||||||
|
} else if (!visiblity.enableDeleteMode) {
|
||||||
rain.state = 0x4;
|
LayoutManager.delete.state |= 2;
|
||||||
if (disabledActions.contains("rain")) rain.state |= 2;
|
|
||||||
else if (NEIClientUtils.isRaining()) rain.state |= 1;
|
|
||||||
|
|
||||||
gamemode.state = 0x4;
|
|
||||||
if (NEIClientUtils.getGamemode() != 0) {
|
|
||||||
gamemode.state |= 0x1;
|
|
||||||
gamemode.index = NEIClientUtils.getGamemode() - 1;
|
|
||||||
} else {
|
|
||||||
if (NEIClientUtils.isValidGamemode("creative")) gamemode.index = 0;
|
|
||||||
else if (NEIClientUtils.isValidGamemode("creative+")) gamemode.index = 1;
|
|
||||||
else if (NEIClientUtils.isValidGamemode("adventure")) gamemode.index = 2;
|
|
||||||
}
|
}
|
||||||
bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
|
|
||||||
options.index = NEIClientConfig.getCheatMode();
|
|
||||||
|
|
||||||
magnet.state = 0x4 | (getMagnetMode() ? 1 : 0);
|
LayoutManager.rain.state = 0x4;
|
||||||
|
if (NEIClientConfig.disabledActions.contains("rain")) {
|
||||||
|
LayoutManager.rain.state |= 2;
|
||||||
|
} else if (NEIClientUtils.isRaining()) {
|
||||||
|
LayoutManager.rain.state |= 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (canPerformAction("delete")) layoutButton(delete);
|
LayoutManager.gamemode.state = 0x4;
|
||||||
if (canPerformAction("rain")) layoutButton(rain);
|
if (NEIClientUtils.getGamemode() != 0) {
|
||||||
if (NEIClientUtils.isValidGamemode("creative")
|
LayoutManager.gamemode.state |= 0x1;
|
||||||
|| NEIClientUtils.isValidGamemode("creative+")
|
LayoutManager.gamemode.index = NEIClientUtils.getGamemode() - 1;
|
||||||
|| NEIClientUtils.isValidGamemode("adventure")) layoutButton(gamemode);
|
} else {
|
||||||
if (canPerformAction("magnet")) layoutButton(magnet);
|
if (NEIClientUtils.isValidGamemode("creative")) {
|
||||||
if (canPerformAction("time")) {
|
LayoutManager.gamemode.index = 0;
|
||||||
for (int i = 0; i < 4; i++) {
|
} else if (NEIClientUtils.isValidGamemode("creative+")) {
|
||||||
timeButtons[i].state = disabledActions.contains(NEIActions.timeZones[i]) ? 2 : 0;
|
LayoutManager.gamemode.index = 1;
|
||||||
layoutButton(timeButtons[i]);
|
} else if (NEIClientUtils.isValidGamemode("adventure")) {
|
||||||
|
LayoutManager.gamemode.index = 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (canPerformAction("heal")) layoutButton(heal);
|
LayoutManager.bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
|
||||||
|
LayoutManager.options.index = NEIClientConfig.getCheatMode();
|
||||||
|
|
||||||
itemPanel.resize(gui);
|
LayoutManager.magnet.state = 0x4 | (NEIClientConfig.getMagnetMode() ? 1 : 0);
|
||||||
bookmarkPanel.resize(gui);
|
LayoutManager.magnet.index = (LayoutManager.magnet.state & 0x1) != 0 ? 1 : 0;
|
||||||
|
|
||||||
options.x = isEnabled() ? 0 : 6;
|
if (NEIClientConfig.canPerformAction("delete")) {
|
||||||
options.y = isEnabled() ? gui.height - 22 : gui.height - 28;
|
layoutButton(LayoutManager.delete);
|
||||||
options.w = 22;
|
|
||||||
options.h = 22;
|
|
||||||
|
|
||||||
bookmarksButton.x = 24 + (isEnabled() ? 0 : 6);
|
|
||||||
bookmarksButton.y = isEnabled() ? gui.height - 22 : gui.height - 28;
|
|
||||||
bookmarksButton.w = 22;
|
|
||||||
bookmarksButton.h = 22;
|
|
||||||
|
|
||||||
dropDown.h = 18;
|
|
||||||
dropDown.w = 150;
|
|
||||||
dropDown.y = 0;
|
|
||||||
dropDown.x = (gui.width - gui.xSize) / 2 + gui.xSize - dropDown.w;
|
|
||||||
|
|
||||||
presetsPanel.h = 16;
|
|
||||||
presetsPanel.w = 150;
|
|
||||||
presetsPanel.y = 2;
|
|
||||||
presetsPanel.x = (gui.width - gui.xSize) / 2 + gui.xSize - presetsPanel.w;
|
|
||||||
|
|
||||||
searchField.h = 20;
|
|
||||||
searchField.w = 150;
|
|
||||||
searchField.x = (gui.width - searchField.w) / 2;
|
|
||||||
searchField.y = gui.height - searchField.h - 2;
|
|
||||||
|
|
||||||
if (!visiblity.showItemSection) {
|
|
||||||
searchField.setFocus(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("rain")) {
|
||||||
|
layoutButton(LayoutManager.rain);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientUtils.isValidGamemode("creative") || NEIClientUtils.isValidGamemode("creative+")
|
||||||
|
|| NEIClientUtils.isValidGamemode("adventure")) {
|
||||||
|
layoutButton(LayoutManager.gamemode);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("magnet")) {
|
||||||
|
layoutButton(LayoutManager.magnet);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("time")) {
|
||||||
|
for (int i = 0; i < 4; i++) {
|
||||||
|
LayoutManager.timeButtons[i].state = NEIClientConfig.disabledActions.contains(NEIActions.timeZones[i])
|
||||||
|
? 2
|
||||||
|
: 0;
|
||||||
|
layoutButton(LayoutManager.timeButtons[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (NEIClientConfig.canPerformAction("heal")) {
|
||||||
|
layoutButton(LayoutManager.heal);
|
||||||
|
}
|
||||||
|
|
||||||
|
layoutFooter(gui, visiblity);
|
||||||
|
|
||||||
|
LayoutManager.itemPanel.resize(gui);
|
||||||
|
LayoutManager.bookmarkPanel.resize(gui);
|
||||||
|
LayoutManager.itemZoom.resize(gui);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void layoutFooter(GuiContainer gui, VisiblityData visiblity) {
|
||||||
|
|
||||||
|
LayoutManager.options.x = MARGIN;
|
||||||
|
LayoutManager.options.y = gui.height - BUTTON_SIZE - MARGIN;
|
||||||
|
LayoutManager.options.w = LayoutManager.options.h = BUTTON_SIZE;
|
||||||
|
|
||||||
|
LayoutManager.bookmarksButton.x = LayoutManager.options.x + LayoutManager.options.w + MARGIN;
|
||||||
|
LayoutManager.bookmarksButton.y = gui.height - BUTTON_SIZE - MARGIN;
|
||||||
|
LayoutManager.bookmarksButton.w = LayoutManager.bookmarksButton.h = BUTTON_SIZE;
|
||||||
|
|
||||||
|
final Rectangle4i searchArea = getSearchFieldArea(gui);
|
||||||
|
final Rectangle4i quantityArea = getQuantityFieldArea(visiblity);
|
||||||
|
|
||||||
|
LayoutManager.searchField.x = searchArea.x;
|
||||||
|
LayoutManager.searchField.y = searchArea.y;
|
||||||
|
LayoutManager.searchField.w = searchArea.w;
|
||||||
|
LayoutManager.searchField.h = searchArea.h;
|
||||||
|
|
||||||
|
if (!NEIClientConfig.subsetWidgetOnTop() && visiblity.showSubsetDropdown) {
|
||||||
|
LayoutManager.dropDown.x = searchArea.x;
|
||||||
|
LayoutManager.dropDown.y = searchArea.y;
|
||||||
|
LayoutManager.dropDown.h = LayoutManager.dropDown.w = BUTTON_SIZE;
|
||||||
|
|
||||||
|
LayoutManager.searchField.x += BUTTON_SIZE;
|
||||||
|
LayoutManager.searchField.w -= BUTTON_SIZE;
|
||||||
|
} else {
|
||||||
|
LayoutManager.dropDown.h = 16;
|
||||||
|
LayoutManager.dropDown.w = 150;
|
||||||
|
LayoutManager.dropDown.y = MARGIN;
|
||||||
|
LayoutManager.dropDown.x = (gui.width - LayoutManager.dropDown.w) / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (quantityArea.w == ItemPanels.itemPanel.w) {
|
||||||
|
LayoutManager.more.w = LayoutManager.less.w = BUTTON_SIZE;
|
||||||
|
LayoutManager.more.h = LayoutManager.less.h = LayoutManager.quantity.h = quantityArea.h;
|
||||||
|
LayoutManager.more.y = LayoutManager.less.y = LayoutManager.quantity.y = quantityArea.y;
|
||||||
|
|
||||||
|
LayoutManager.less.x = quantityArea.x;
|
||||||
|
LayoutManager.more.x = quantityArea.x2() - BUTTON_SIZE;
|
||||||
|
|
||||||
|
LayoutManager.quantity.x = LayoutManager.less.x + LayoutManager.less.w + 1;
|
||||||
|
LayoutManager.quantity.w = LayoutManager.more.x - LayoutManager.quantity.x - 1;
|
||||||
|
} else {
|
||||||
|
LayoutManager.quantity.x = quantityArea.x;
|
||||||
|
LayoutManager.quantity.w = quantityArea.w - 18;
|
||||||
|
LayoutManager.quantity.y = LayoutManager.more.y = quantityArea.y;
|
||||||
|
LayoutManager.quantity.h = quantityArea.h;
|
||||||
|
|
||||||
|
LayoutManager.more.w = LayoutManager.less.w = 18;
|
||||||
|
LayoutManager.more.x = LayoutManager.less.x = LayoutManager.quantity.x + LayoutManager.quantity.w;
|
||||||
|
LayoutManager.more.h = LayoutManager.less.h = LayoutManager.quantity.h / 2;
|
||||||
|
LayoutManager.less.y = LayoutManager.more.y + LayoutManager.more.h;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private Rectangle4i getSearchFieldArea(GuiContainer gui) {
|
||||||
|
final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
|
||||||
|
|
||||||
|
if (NEIClientConfig.isSearchWidgetCentered()) {
|
||||||
|
area.w = Math.min(gui.xSize, 176) - MARGIN * 2;
|
||||||
|
area.x = (gui.width - area.w) / 2;
|
||||||
|
area.y = gui.height - BUTTON_SIZE - MARGIN;
|
||||||
|
} else if (NEIClientConfig.showItemQuantityWidget()) {
|
||||||
|
area.w = ItemPanels.itemPanel.w - (int) Math.max(BUTTON_SIZE * 2.5f, ItemPanels.itemPanel.w * 0.3f) - 1;
|
||||||
|
area.x = ItemPanels.itemPanel.x;
|
||||||
|
area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
|
||||||
|
} else {
|
||||||
|
area.w = ItemPanels.itemPanel.w;
|
||||||
|
area.x = ItemPanels.itemPanel.x;
|
||||||
|
area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return area;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Rectangle4i getQuantityFieldArea(VisiblityData visiblity) {
|
||||||
|
final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
|
||||||
|
|
||||||
|
if (!visiblity.showSearchSection || NEIClientConfig.isSearchWidgetCentered()) {
|
||||||
|
area.w = ItemPanels.itemPanel.w;
|
||||||
|
area.x = ItemPanels.itemPanel.x;
|
||||||
|
} else {
|
||||||
|
area.w = (int) Math.max(BUTTON_SIZE * 2.5f, ItemPanels.itemPanel.w * 0.3f);
|
||||||
|
area.x = ItemPanels.itemPanel.x + ItemPanels.itemPanel.w - area.w;
|
||||||
|
}
|
||||||
|
|
||||||
|
area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
|
||||||
|
|
||||||
|
return area;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void layoutButton(Button button) {
|
public void layoutButton(Button button) {
|
||||||
button.x = 2 + (buttonCount % numButtons) * 19;
|
|
||||||
button.y = 2 + (buttonCount / numButtons) * 18;
|
|
||||||
|
|
||||||
button.h = 17;
|
button.h = 17;
|
||||||
button.w = button.contentWidth() + 6;
|
button.w = button.contentWidth() + 6;
|
||||||
|
|
||||||
|
button.x = MARGIN + (buttonCount % numButtons) * (button.w + MARGIN);
|
||||||
|
button.y = MARGIN + (buttonCount / numButtons) * (button.h + MARGIN);
|
||||||
|
|
||||||
buttonCount++;
|
buttonCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,16 +231,19 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
|
|
||||||
int tex;
|
int tex;
|
||||||
if ((b.state & 0x3) == 2) tex = 0;
|
if ((b.state & 0x3) == 2) tex = 0;
|
||||||
else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey)
|
else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey) || // not a state button and mouseover
|
||||||
|| // not a state button and mouseover
|
|
||||||
(b.state & 0x3) == 1) // state active
|
(b.state & 0x3) == 1) // state active
|
||||||
tex = 2;
|
tex = 2;
|
||||||
else tex = 1;
|
else tex = 1;
|
||||||
LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
|
LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
|
||||||
|
|
||||||
Image icon = b.getRenderIcon();
|
Image icon = b.getRenderIcon();
|
||||||
if (icon == null) {
|
if (icon == null) {
|
||||||
int colour = tex == 2 ? 0xffffa0 : tex == 0 ? 0x601010 : 0xe0e0e0;
|
int labelColor = b.getRenderLabelColor();
|
||||||
|
int colour = labelColor != 0 ? labelColor
|
||||||
|
: tex == 2 ? ColorUtils.buttonLabelHover.getColor()
|
||||||
|
: tex == 0 ? ColorUtils.buttonLabelDisabled.getColor()
|
||||||
|
: ColorUtils.buttonLabelNormal.getColor();
|
||||||
|
|
||||||
drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
|
drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
|
||||||
} else {
|
} else {
|
||||||
@@ -174,9 +258,16 @@ public class LayoutStyleMinecraft extends LayoutStyle {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
|
public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
|
||||||
if (state == 1) GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
|
if (state == 1) {
|
||||||
else GL11.glColor4f(1, 1, 1, 1);
|
GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
|
||||||
|
} else {
|
||||||
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
|
}
|
||||||
|
|
||||||
LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
|
LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
|
||||||
if (text != null) drawStringC(text, x, y, w, h, state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0);
|
|
||||||
|
if (text != null) {
|
||||||
|
drawStringC(text, x, y, w, h, mouseover ? 0xFFFFFFA0 : (state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,7 @@ import java.util.LinkedList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class NEIActions {
|
public class NEIActions {
|
||||||
|
|
||||||
public static final int protocol = 0;
|
public static final int protocol = 0;
|
||||||
|
|
||||||
public static HashMap<String, NEIActions> nameActionMap = new HashMap<>();
|
public static HashMap<String, NEIActions> nameActionMap = new HashMap<>();
|
||||||
@@ -53,6 +54,7 @@ public class NEIActions {
|
|||||||
addAction("magnet", true);
|
addAction("magnet", true);
|
||||||
addAction("enchant", true);
|
addAction("enchant", true);
|
||||||
addAction("potion", true);
|
addAction("potion", true);
|
||||||
|
addAction("autocraft");
|
||||||
|
|
||||||
canDisable.add("dawn");
|
canDisable.add("dawn");
|
||||||
canDisable.add("noon");
|
canDisable.add("noon");
|
||||||
@@ -61,8 +63,8 @@ public class NEIActions {
|
|||||||
canDisable.add("rain");
|
canDisable.add("rain");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final String[] timeZones = new String[] {"dawn", "noon", "dusk", "midnight"};
|
public static final String[] timeZones = new String[] { "dawn", "noon", "dusk", "midnight" };
|
||||||
public static final String[] gameModes = new String[] {"survival", "creative", "creative+", "adventure"};
|
public static final String[] gameModes = new String[] { "survival", "creative", "creative+", "adventure" };
|
||||||
|
|
||||||
public String name;
|
public String name;
|
||||||
public String base;
|
public String base;
|
||||||
|
|||||||
@@ -1,56 +1,78 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import static codechicken.nei.PacketIDs.C2S;
|
||||||
|
import static codechicken.nei.PacketIDs.S2C;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.gui.inventory.GuiInventory;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.network.play.INetHandlerPlayClient;
|
||||||
|
import net.minecraft.util.ChatComponentTranslation;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import codechicken.core.ClientUtils;
|
import codechicken.core.ClientUtils;
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
import codechicken.lib.packet.PacketCustom;
|
import codechicken.lib.packet.PacketCustom;
|
||||||
import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
|
import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
|
||||||
|
import codechicken.nei.commands.CommandBookmarkAdd;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiInventory;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.network.play.INetHandlerPlayClient;
|
|
||||||
import net.minecraft.util.ChatComponentTranslation;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
public class NEICPH implements IClientPacketHandler {
|
public class NEICPH implements IClientPacketHandler {
|
||||||
|
|
||||||
public static final String channel = "NEI";
|
public static final String channel = "NEI";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handlePacket(PacketCustom packet, Minecraft mc, INetHandlerPlayClient netHandler) {
|
public void handlePacket(PacketCustom packet, Minecraft mc, INetHandlerPlayClient netHandler) {
|
||||||
switch (packet.getType()) {
|
switch (packet.getType()) {
|
||||||
case 1:
|
case S2C.SEND_SERVER_SIDE_CHECK:
|
||||||
handleSMPCheck(packet.readUByte(), packet.readString(), mc.theWorld);
|
handleSMPCheck(packet.readUByte(), packet.readString(), mc.theWorld);
|
||||||
break;
|
break;
|
||||||
case 10:
|
case S2C.SEND_LOGIN_STATE:
|
||||||
handleLoginState(packet);
|
handleLoginState(packet);
|
||||||
break;
|
break;
|
||||||
case 11:
|
case S2C.SEND_ACTION_DISABLED:
|
||||||
handleActionDisabled(packet);
|
handleActionDisabled(packet);
|
||||||
break;
|
break;
|
||||||
case 12:
|
case S2C.SEND_ACTION_ENABLED:
|
||||||
handleActionEnabled(packet);
|
handleActionEnabled(packet);
|
||||||
break;
|
break;
|
||||||
case 13:
|
case S2C.SEND_MAGNETIC_ITEM:
|
||||||
ClientHandler.instance().addSMPMagneticItem(packet.readInt(), mc.theWorld);
|
ClientHandler.instance().addSMPMagneticItem(packet.readInt(), mc.theWorld);
|
||||||
break;
|
break;
|
||||||
case 14:
|
case S2C.SEND_GAME_MODE:
|
||||||
handleGamemode(mc, packet.readUByte());
|
handleGamemode(mc, packet.readUByte());
|
||||||
break;
|
break;
|
||||||
case 21:
|
case S2C.OPEN_ENCHANTMENT_GUI:
|
||||||
ClientUtils.openSMPGui(
|
ClientUtils.openSMPGui(
|
||||||
packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
|
packet.readUByte(),
|
||||||
|
new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
|
||||||
break;
|
break;
|
||||||
case 23:
|
case S2C.SET_CREATIVE_PLUS_MODE:
|
||||||
if (packet.readBoolean())
|
if (packet.readBoolean()) ClientUtils.openSMPGui(
|
||||||
ClientUtils.openSMPGui(
|
packet.readUByte(),
|
||||||
packet.readUByte(),
|
new GuiExtendedCreativeInv(
|
||||||
new GuiExtendedCreativeInv(new ContainerCreativeInv(
|
new ContainerCreativeInv(mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
|
||||||
mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
|
|
||||||
else mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
|
else mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
|
||||||
break;
|
break;
|
||||||
case 24:
|
case S2C.OPEN_POTION_GUI:
|
||||||
ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
|
ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
|
||||||
break;
|
break;
|
||||||
|
case S2C.CACHE_BOOKMARK_DATA:
|
||||||
|
handleCacheBookmarkData(packet);
|
||||||
|
break;
|
||||||
|
case S2C.SYNC:
|
||||||
|
ServerSync.onReply(packet.readInt());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleCacheBookmarkData(PacketCustom packet) {
|
||||||
|
final String payloadId = packet.readString();
|
||||||
|
final NBTTagCompound payloadTag = packet.readNBTTagCompound();
|
||||||
|
|
||||||
|
if (payloadTag != null) {
|
||||||
|
CommandBookmarkAdd.cachePayload(payloadId, payloadTag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,7 +122,7 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
try {
|
try {
|
||||||
ClientHandler.instance().loadWorld(world, true);
|
ClientHandler.instance().loadWorld(world, true);
|
||||||
NEIClientConfig.setHasSMPCounterPart(true);
|
NEIClientConfig.setHasSMPCounterPart(true);
|
||||||
NEIClientConfig.loadWorld(getSaveName(worldName));
|
NEIClientConfig.loadWorld(getSaveName());
|
||||||
sendRequestLoginInfo();
|
sendRequestLoginInfo();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
NEIClientConfig.logger.error("Error handling SMP Check", e);
|
NEIClientConfig.logger.error("Error handling SMP Check", e);
|
||||||
@@ -108,14 +130,14 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getSaveName(String worldName) {
|
private static String getSaveName() {
|
||||||
if (Minecraft.getMinecraft().isSingleplayer()) return "local/" + ClientUtils.getWorldSaveName();
|
if (Minecraft.getMinecraft().isSingleplayer()) return "local/" + ClientUtils.getWorldSaveName();
|
||||||
|
|
||||||
return "remote/" + ClientUtils.getServerIP().replace(':', '~') + "/" + worldName;
|
return "remote/" + ClientUtils.getServerIP().replace(':', '~');
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendGiveItem(ItemStack spawnstack, boolean infinite, boolean doSpawn) {
|
public static void sendGiveItem(ItemStack spawnstack, boolean infinite, boolean doSpawn) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 1);
|
PacketCustom packet = new PacketCustom(channel, C2S.GIVE_ITEM);
|
||||||
packet.writeItemStack(spawnstack, true);
|
packet.writeItemStack(spawnstack, true);
|
||||||
packet.writeBoolean(infinite);
|
packet.writeBoolean(infinite);
|
||||||
packet.writeBoolean(doSpawn);
|
packet.writeBoolean(doSpawn);
|
||||||
@@ -123,7 +145,7 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendDeleteAllItems() {
|
public static void sendDeleteAllItems() {
|
||||||
PacketCustom packet = new PacketCustom(channel, 4);
|
PacketCustom packet = new PacketCustom(channel, C2S.DELETE_ALL_ITEMS);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,12 +159,18 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
sendSetSlot(slot, item, false);
|
sendSetSlot(slot, item, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
PacketCustom packet = new PacketCustom(channel, 11);
|
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER_CONTENTS);
|
||||||
|
packet.sendToServer();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void sendRequestContainer() {
|
||||||
|
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER);
|
||||||
|
packet.writeInt(Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size());
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSetSlot(int slot, ItemStack stack, boolean container) {
|
public static void sendSetSlot(int slot, ItemStack stack, boolean container) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 5);
|
PacketCustom packet = new PacketCustom(channel, C2S.SET_SLOT);
|
||||||
packet.writeBoolean(container);
|
packet.writeBoolean(container);
|
||||||
packet.writeShort(slot);
|
packet.writeShort(slot);
|
||||||
packet.writeItemStack(stack);
|
packet.writeItemStack(stack);
|
||||||
@@ -150,38 +178,44 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void sendRequestLoginInfo() {
|
private static void sendRequestLoginInfo() {
|
||||||
PacketCustom packet = new PacketCustom(channel, 10);
|
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_LOGIN_INFO);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendToggleMagnetMode() {
|
public static void sendToggleMagnetMode() {
|
||||||
PacketCustom packet = new PacketCustom(channel, 6);
|
PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_MAGNET);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSetTime(int hour) {
|
public static void sendSetTime(int hour) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 7);
|
PacketCustom packet = new PacketCustom(channel, C2S.SET_TIME);
|
||||||
packet.writeByte(hour);
|
packet.writeByte(hour);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendHeal() {
|
public static void sendHeal() {
|
||||||
PacketCustom packet = new PacketCustom(channel, 8);
|
PacketCustom packet = new PacketCustom(channel, C2S.HEAL);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendToggleRain() {
|
public static void sendToggleRain() {
|
||||||
PacketCustom packet = new PacketCustom(channel, 9);
|
PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_RAIN);
|
||||||
|
packet.sendToServer();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void sendChatLink(NBTTagCompound payloadTag) {
|
||||||
|
PacketCustom packet = new PacketCustom(channel, C2S.SEND_CHAT_ITEM_LINK);
|
||||||
|
packet.writeNBTTagCompound(payloadTag);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendOpenEnchantmentWindow() {
|
public static void sendOpenEnchantmentWindow() {
|
||||||
PacketCustom packet = new PacketCustom(channel, 21);
|
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_ENCHANTMENT_GUI);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendModifyEnchantment(int enchID, int level, boolean add) {
|
public static void sendModifyEnchantment(int enchID, int level, boolean add) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 22);
|
PacketCustom packet = new PacketCustom(channel, C2S.MODIFY_ENCHANTMENT);
|
||||||
packet.writeByte(enchID);
|
packet.writeByte(enchID);
|
||||||
packet.writeByte(level);
|
packet.writeByte(level);
|
||||||
packet.writeBoolean(add);
|
packet.writeBoolean(add);
|
||||||
@@ -189,30 +223,30 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendSetPropertyDisabled(String name, boolean enable) {
|
public static void sendSetPropertyDisabled(String name, boolean enable) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 12);
|
PacketCustom packet = new PacketCustom(channel, C2S.CHANGE_PROPERTY);
|
||||||
packet.writeString(name);
|
packet.writeString(name);
|
||||||
packet.writeBoolean(enable);
|
packet.writeBoolean(enable);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendGamemode(int mode) {
|
public static void sendGamemode(int mode) {
|
||||||
new PacketCustom(channel, 13).writeByte(mode).sendToServer();
|
new PacketCustom(channel, C2S.SET_GAME_MODE).writeByte(mode).sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendCreativeInv(boolean open) {
|
public static void sendCreativeInv(boolean open) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 23);
|
PacketCustom packet = new PacketCustom(channel, C2S.SET_CREATIVE_PLUS_MODE);
|
||||||
packet.writeBoolean(open);
|
packet.writeBoolean(open);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendCreativeScroll(int steps) {
|
public static void sendCreativeScroll(int steps) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 14);
|
PacketCustom packet = new PacketCustom(channel, C2S.CYCLE_CREATIVE_INV);
|
||||||
packet.writeInt(steps);
|
packet.writeInt(steps);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendMobSpawnerID(int x, int y, int z, String mobtype) {
|
public static void sendMobSpawnerID(int x, int y, int z, String mobtype) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 15);
|
PacketCustom packet = new PacketCustom(channel, C2S.SEND_MOB_SPAWNER_ID);
|
||||||
packet.writeCoord(x, y, z);
|
packet.writeCoord(x, y, z);
|
||||||
packet.writeString(mobtype);
|
packet.writeString(mobtype);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
@@ -223,13 +257,13 @@ public class NEICPH implements IClientPacketHandler {
|
|||||||
InventoryUtils.readItemStacksFromTag(
|
InventoryUtils.readItemStacksFromTag(
|
||||||
potionStore,
|
potionStore,
|
||||||
NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
|
NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
|
||||||
PacketCustom packet = new PacketCustom(channel, 24);
|
PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_POTION_GUI);
|
||||||
for (ItemStack stack : potionStore) packet.writeItemStack(stack);
|
for (ItemStack stack : potionStore) packet.writeItemStack(stack);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendDummySlotSet(int slotNumber, ItemStack stack) {
|
public static void sendDummySlotSet(int slotNumber, ItemStack stack) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 25);
|
PacketCustom packet = new PacketCustom(channel, C2S.SET_DUMMY_SLOT);
|
||||||
packet.writeShort(slotNumber);
|
packet.writeShort(slotNumber);
|
||||||
packet.writeItemStack(stack, true);
|
packet.writeItemStack(stack, true);
|
||||||
packet.sendToServer();
|
packet.sendToServer();
|
||||||
|
|||||||
@@ -1,15 +1,18 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
|
||||||
import codechicken.nei.api.TaggedInventoryArea;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiChest;
|
import net.minecraft.client.gui.inventory.GuiChest;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.inventory.ContainerChest;
|
import net.minecraft.inventory.ContainerChest;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
|
import codechicken.nei.api.TaggedInventoryArea;
|
||||||
|
|
||||||
public class NEIChestGuiHandler extends INEIGuiAdapter {
|
public class NEIChestGuiHandler extends INEIGuiAdapter {
|
||||||
|
|
||||||
public int chestSize(GuiContainer gui) {
|
public int chestSize(GuiContainer gui) {
|
||||||
return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
|
return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -8,14 +8,9 @@ import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
|
|||||||
import static codechicken.nei.NEIClientConfig.invCreativeMode;
|
import static codechicken.nei.NEIClientConfig.invCreativeMode;
|
||||||
import static codechicken.nei.NEIClientConfig.world;
|
import static codechicken.nei.NEIClientConfig.world;
|
||||||
|
|
||||||
import codechicken.lib.inventory.InventoryRange;
|
import java.awt.Color;
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
import java.io.PrintWriter;
|
||||||
import codechicken.lib.util.LangProxy;
|
import java.io.StringWriter;
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import com.google.common.collect.Iterables;
|
|
||||||
import java.math.BigInteger;
|
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.text.DecimalFormat;
|
import java.text.DecimalFormat;
|
||||||
import java.text.DecimalFormatSymbols;
|
import java.text.DecimalFormatSymbols;
|
||||||
@@ -25,33 +20,89 @@ import java.util.ArrayList;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.IdentityHashMap;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.audio.PositionedSoundRecord;
|
import net.minecraft.client.audio.PositionedSoundRecord;
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
import net.minecraft.client.gui.FontRenderer;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.client.renderer.OpenGlHelper;
|
||||||
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.util.IChatComponent;
|
import net.minecraft.util.IChatComponent;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
import org.lwjgl.input.Keyboard;
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import com.google.common.collect.Iterables;
|
||||||
|
import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil;
|
||||||
|
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.lib.inventory.InventoryRange;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.util.LangProxy;
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.recipe.GuiOverlayButton.ItemOverlayState;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.NEIKeyboardUtils;
|
||||||
|
|
||||||
public class NEIClientUtils extends NEIServerUtils {
|
public class NEIClientUtils extends NEIServerUtils {
|
||||||
|
|
||||||
|
public static class Alignment {
|
||||||
|
|
||||||
|
public final int x, y;
|
||||||
|
|
||||||
|
public static final Alignment TopLeft = new Alignment(-1, -1);
|
||||||
|
public static final Alignment TopCenter = new Alignment(0, -1);
|
||||||
|
public static final Alignment TopRight = new Alignment(1, -1);
|
||||||
|
public static final Alignment CenterLeft = new Alignment(-1, 0);
|
||||||
|
public static final Alignment Center = new Alignment(0, 0);
|
||||||
|
public static final Alignment CenterRight = new Alignment(1, 0);
|
||||||
|
public static final Alignment BottomLeft = new Alignment(-1, 1);
|
||||||
|
public static final Alignment BottomCenter = new Alignment(0, 1);
|
||||||
|
public static final Alignment BottomRight = new Alignment(1, 1);
|
||||||
|
|
||||||
|
public Alignment(int x, int y) {
|
||||||
|
this.x = x;
|
||||||
|
this.y = y;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getX(float parentWidth, float childWidth) {
|
||||||
|
final float x = (this.x + 1) / 2f;
|
||||||
|
return parentWidth * x - childWidth * x;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float getY(float parentHeight, float childHeight) {
|
||||||
|
final float y = (this.y + 1) / 2f;
|
||||||
|
return parentHeight * y - childHeight * y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static LangProxy lang = new LangProxy("nei");
|
public static LangProxy lang = new LangProxy("nei");
|
||||||
|
|
||||||
/** Formats a number with group separator and at most 2 fraction digits. */
|
/** Formats a number with group separator and at most 2 fraction digits. */
|
||||||
private static final Map<Locale, DecimalFormat> decimalFormatters = new HashMap<>();
|
private static final Map<Locale, DecimalFormat> decimalFormatters = new HashMap<>();
|
||||||
|
private static final DecimalFormat CHANCE_FORMAT = new DecimalFormat("##0.##%");
|
||||||
|
|
||||||
public static final int ALT_HASH = 1 << 27;
|
public static final int ALT_HASH = NEIKeyboardUtils.ALT_HASH;
|
||||||
public static final int SHIFT_HASH = 1 << 26;
|
public static final int SHIFT_HASH = NEIKeyboardUtils.SHIFT_HASH;
|
||||||
public static final int CTRL_HASH = 1 << 25;
|
public static final int CTRL_HASH = NEIKeyboardUtils.CTRL_HASH;
|
||||||
|
|
||||||
public static Minecraft mc() {
|
public static Minecraft mc() {
|
||||||
return Minecraft.getMinecraft();
|
return Minecraft.getMinecraft();
|
||||||
@@ -79,16 +130,26 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String formatNumbers(BigInteger aNumber) {
|
public static String formatNumber(Number aNumber) {
|
||||||
|
|
||||||
|
if (NEIModContainer.isGTNHLibLoaded()) {
|
||||||
|
return NumberFormatUtil.formatNumber(aNumber);
|
||||||
|
}
|
||||||
|
|
||||||
return getDecimalFormat().format(aNumber);
|
return getDecimalFormat().format(aNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String formatNumbers(long aNumber) {
|
public static String formatFluid(Number aNumber) {
|
||||||
return getDecimalFormat().format(aNumber);
|
|
||||||
|
if (NEIModContainer.isGTNHLibLoaded()) {
|
||||||
|
return NumberFormatUtil.formatFluid(aNumber);
|
||||||
|
}
|
||||||
|
|
||||||
|
return getDecimalFormat().format(aNumber) + " L";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String formatNumbers(double aNumber) {
|
public static String formatChance(float chance) {
|
||||||
return getDecimalFormat().format(aNumber);
|
return CHANCE_FORMAT.format(chance);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void deleteHeldItem() {
|
public static void deleteHeldItem() {
|
||||||
@@ -105,8 +166,7 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void decreaseSlotStack(int slotNumber) {
|
public static void decreaseSlotStack(int slotNumber) {
|
||||||
ItemStack stack = slotNumber == -999
|
ItemStack stack = slotNumber == -999 ? getHeldItem()
|
||||||
? getHeldItem()
|
|
||||||
: mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
|
: mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
|
||||||
if (stack == null) return;
|
if (stack == null) return;
|
||||||
|
|
||||||
@@ -147,12 +207,12 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param mode -1 = normal cheats, 0 = no infinites, 1 = replenish stack
|
* @param mode -1 = normal cheats, 0 = no infinites, 1 = replenish stack
|
||||||
*/
|
*/
|
||||||
public static void cheatItem(ItemStack stack, int button, int mode) {
|
public static void cheatItem(ItemStack stack, int button, int mode) {
|
||||||
if (!canCheatItem(stack)) return;
|
if (!canCheatItem(stack)) return;
|
||||||
|
|
||||||
if (mode == -1 && button == 0 && shiftKey() && NEIClientConfig.hasSMPCounterPart()) {
|
if (mode == -1 && button == 0 && controlKey() && NEIClientConfig.hasSMPCounterPart()) {
|
||||||
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
||||||
if (!handler.canHandleItem(stack)) continue;
|
if (!handler.canHandleItem(stack)) continue;
|
||||||
|
|
||||||
@@ -186,16 +246,14 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
ItemStack stack = copyStack(base, i);
|
ItemStack stack = copyStack(base, i);
|
||||||
if (hasSMPCounterPart()) {
|
if (hasSMPCounterPart()) {
|
||||||
ItemStack typestack = copyStack(stack, 1);
|
ItemStack typestack = copyStack(stack, 1);
|
||||||
if (!infinite
|
if (!infinite && !canItemFitInInventory(mc().thePlayer, stack)
|
||||||
&& !canItemFitInInventory(mc().thePlayer, stack)
|
|
||||||
&& (mc().currentScreen instanceof GuiContainer)) {
|
&& (mc().currentScreen instanceof GuiContainer)) {
|
||||||
GuiContainer gui = getGuiContainer();
|
GuiContainer gui = getGuiContainer();
|
||||||
final List<Iterable<Integer>> handlerSlots;
|
final List<Iterable<Integer>> handlerSlots;
|
||||||
try {
|
try {
|
||||||
GuiInfo.readLock.lock();
|
GuiInfo.readLock.lock();
|
||||||
handlerSlots = GuiInfo.guiHandlers.stream()
|
handlerSlots = GuiInfo.guiHandlers.stream()
|
||||||
.map(handler -> handler.getItemSpawnSlots(gui, typestack))
|
.map(handler -> handler.getItemSpawnSlots(gui, typestack)).filter(x -> x != null)
|
||||||
.filter(x -> x != null)
|
|
||||||
.collect(Collectors.toCollection(LinkedList::new));
|
.collect(Collectors.toCollection(LinkedList::new));
|
||||||
} finally {
|
} finally {
|
||||||
GuiInfo.readLock.unlock();
|
GuiInfo.readLock.unlock();
|
||||||
@@ -220,7 +278,7 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
if (given > 0) NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
|
if (given > 0) NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
|
||||||
} else NEICPH.sendGiveItem(stack, infinite, true);
|
} else NEICPH.sendGiveItem(stack, infinite, true);
|
||||||
} else {
|
} else {
|
||||||
for (int given = 0; given < stack.stackSize; ) {
|
for (int given = 0; given < stack.stackSize;) {
|
||||||
int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
|
int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
|
||||||
sendCommand(
|
sendCommand(
|
||||||
getStringSetting("command.item"),
|
getStringSetting("command.item"),
|
||||||
@@ -239,11 +297,91 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
return InventoryUtils.getInsertibleQuantity(new InventoryRange(player.inventory, 0, 36), itemstack) > 0;
|
return InventoryUtils.getInsertibleQuantity(new InventoryRange(player.inventory, 0, 36), itemstack) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<ItemOverlayState> presenceOverlay(List<PositionedStack> ingredients, List<ItemStack> invStacks) {
|
||||||
|
final List<ItemOverlayState> states = new ArrayList<>();
|
||||||
|
final Map<ItemStack, Long> remainingFluid = new IdentityHashMap<>();
|
||||||
|
|
||||||
|
for (PositionedStack stack : ingredients) {
|
||||||
|
boolean found;
|
||||||
|
|
||||||
|
if (StackInfo.isFluidDisplayItem(stack.item)) {
|
||||||
|
final FluidStack requiredFluid = StackInfo.getFluid(stack.item);
|
||||||
|
found = requiredFluid != null && consumeFluid(invStacks, remainingFluid, requiredFluid);
|
||||||
|
} else {
|
||||||
|
found = false;
|
||||||
|
|
||||||
|
for (ItemStack is : invStacks) {
|
||||||
|
if (is.stackSize > 0 && stack.contains(is)) {
|
||||||
|
is.stackSize--;
|
||||||
|
found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
states.add(new ItemOverlayState(stack, found));
|
||||||
|
}
|
||||||
|
|
||||||
|
return states;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean consumeFluid(List<ItemStack> invStacks, Map<ItemStack, Long> remainingFluid,
|
||||||
|
FluidStack requiredFluid) {
|
||||||
|
long need = requiredFluid.amount;
|
||||||
|
final List<ItemStack> matched = new ArrayList<>();
|
||||||
|
|
||||||
|
for (ItemStack is : invStacks) {
|
||||||
|
if (need <= 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is.stackSize <= 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
final FluidStack invFluid = StackInfo.getFluid(is);
|
||||||
|
|
||||||
|
if (invFluid == null || !invFluid.isFluidEqual(requiredFluid)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
final long available = remainingFluid.computeIfAbsent(is, k -> (long) invFluid.amount * is.stackSize);
|
||||||
|
if (available <= 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
matched.add(is);
|
||||||
|
need -= available;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (need > 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
long remainingNeed = requiredFluid.amount;
|
||||||
|
for (ItemStack is : matched) {
|
||||||
|
final long available = remainingFluid.get(is);
|
||||||
|
final long consumed = Math.min(available, remainingNeed);
|
||||||
|
|
||||||
|
remainingFluid.put(is, available - consumed);
|
||||||
|
remainingNeed -= consumed;
|
||||||
|
|
||||||
|
if (remainingNeed <= 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean shiftKey() {
|
public static boolean shiftKey() {
|
||||||
return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
|
return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean controlKey() {
|
public static boolean controlKey() {
|
||||||
|
if (Minecraft.isRunningOnMac) {
|
||||||
|
return Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA);
|
||||||
|
}
|
||||||
return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
|
return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -256,9 +394,7 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
|
|
||||||
public static boolean isValidGamemode(String s) {
|
public static boolean isValidGamemode(String s) {
|
||||||
return s.equals("survival")
|
return s.equals("survival")
|
||||||
|| canPerformAction(s)
|
|| canPerformAction(s) && Arrays.asList(getStringArrSetting("inventory.gamemodes")).contains(s);
|
||||||
&& Arrays.asList(getStringArrSetting("inventory.gamemodes"))
|
|
||||||
.contains(s);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getNextGamemode() {
|
public static int getNextGamemode() {
|
||||||
@@ -277,11 +413,10 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
if (mode == nmode) return;
|
if (mode == nmode) return;
|
||||||
|
|
||||||
if (hasSMPCounterPart()) NEICPH.sendGamemode(nmode);
|
if (hasSMPCounterPart()) NEICPH.sendGamemode(nmode);
|
||||||
else
|
else sendCommand(
|
||||||
sendCommand(
|
getStringSetting("command.creative"),
|
||||||
getStringSetting("command.creative"),
|
getGameType(nmode),
|
||||||
getGameType(nmode),
|
mc().thePlayer.getCommandSenderName());
|
||||||
mc().thePlayer.getCommandSenderName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long getTime() {
|
public static long getTime() {
|
||||||
@@ -301,14 +436,13 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendCommand(String command, Object... args) {
|
public static void sendCommand(String command, Object... args) {
|
||||||
if (command.length() == 0) return;
|
if (command.isEmpty()) return;
|
||||||
|
|
||||||
NumberFormat numberformat = NumberFormat.getIntegerInstance();
|
NumberFormat numberformat = NumberFormat.getIntegerInstance();
|
||||||
numberformat.setGroupingUsed(false);
|
numberformat.setGroupingUsed(false);
|
||||||
MessageFormat messageformat = new MessageFormat(command);
|
MessageFormat messageformat = new MessageFormat(command);
|
||||||
for (int i = 0; i < args.length; i++)
|
for (int i = 0; i < args.length; i++) if (args[i] instanceof Integer || args[i] instanceof Long)
|
||||||
if (args[i] instanceof Integer || args[i] instanceof Long)
|
messageformat.setFormatByArgumentIndex(i, numberformat);
|
||||||
messageformat.setFormatByArgumentIndex(i, numberformat);
|
|
||||||
|
|
||||||
mc().thePlayer.sendChatMessage(messageformat.format(args));
|
mc().thePlayer.sendChatMessage(messageformat.format(args));
|
||||||
}
|
}
|
||||||
@@ -327,6 +461,10 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
|
else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void sendChatItemLink(NBTTagCompound payload) {
|
||||||
|
if (hasSMPCounterPart()) NEICPH.sendChatLink(payload);
|
||||||
|
}
|
||||||
|
|
||||||
public static void toggleMagnetMode() {
|
public static void toggleMagnetMode() {
|
||||||
if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
|
if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
|
||||||
}
|
}
|
||||||
@@ -344,13 +482,13 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (next + 1 != i) {
|
if (next + 1 != i) {
|
||||||
ranges.add(new int[] {start, next});
|
ranges.add(new int[] { start, next });
|
||||||
start = next = i;
|
start = next = i;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
next = i;
|
next = i;
|
||||||
}
|
}
|
||||||
ranges.add(new int[] {start, next});
|
ranges.add(new int[] { start, next });
|
||||||
return ranges;
|
return ranges;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -361,18 +499,16 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static String cropText(FontRenderer fontRenderer, String text, int containerWidth) {
|
public static String cropText(FontRenderer fontRenderer, String text, int containerWidth) {
|
||||||
|
|
||||||
int textWidth = fontRenderer.getStringWidth(text);
|
int textWidth = fontRenderer.getStringWidth(text);
|
||||||
|
|
||||||
if (textWidth > containerWidth) {
|
if (textWidth > containerWidth) {
|
||||||
textWidth += fontRenderer.getStringWidth("...");
|
int dots = fontRenderer.getStringWidth("...");
|
||||||
|
|
||||||
while (textWidth > containerWidth) {
|
if (containerWidth <= dots) {
|
||||||
textWidth -= fontRenderer.getCharWidth(text.charAt(text.length() - 1));
|
return "...";
|
||||||
text = text.substring(0, text.length() - 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return text + "...";
|
return fontRenderer.trimStringToWidth(text, containerWidth - dots) + "...";
|
||||||
}
|
}
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
@@ -388,7 +524,6 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
|
|
||||||
public static void setItemQuantity(int i) {
|
public static void setItemQuantity(int i) {
|
||||||
world.nbt.setInteger("quantity", i);
|
world.nbt.setInteger("quantity", i);
|
||||||
world.saveNBT();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static GuiContainer getGuiContainer() {
|
public static GuiContainer getGuiContainer() {
|
||||||
@@ -401,48 +536,107 @@ public class NEIClientUtils extends NEIServerUtils {
|
|||||||
return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
|
return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMetaHash() {
|
public static String getKeyName(int keyBind, int mouseBind) {
|
||||||
if (Keyboard.getEventKeyState()) {
|
return KeyManager.getKeyName(keyBind, mouseBind);
|
||||||
int hash = 0;
|
|
||||||
|
|
||||||
if (altKey()) {
|
|
||||||
hash = hash | ALT_HASH;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (shiftKey()) {
|
|
||||||
hash = hash | SHIFT_HASH;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (controlKey()) {
|
|
||||||
hash = hash | CTRL_HASH;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hash;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getKeyHash() {
|
|
||||||
|
|
||||||
if (Keyboard.getEventKeyState()) {
|
|
||||||
final int keycode = Keyboard.getEventKey();
|
|
||||||
|
|
||||||
if (keycode != Keyboard.KEY_LSHIFT
|
|
||||||
&& keycode != Keyboard.KEY_RSHIFT
|
|
||||||
&& keycode != Keyboard.KEY_LCONTROL
|
|
||||||
&& keycode != Keyboard.KEY_RCONTROL
|
|
||||||
&& keycode != Keyboard.KEY_LMENU
|
|
||||||
&& keycode != Keyboard.KEY_RMENU) {
|
|
||||||
return getMetaHash() + keycode;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Keyboard.CHAR_NONE;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void playClickSound() {
|
public static void playClickSound() {
|
||||||
mc().getSoundHandler()
|
mc().getSoundHandler()
|
||||||
.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void reportErrorBuffered(Throwable e, Set<String> buffer, String cause) {
|
||||||
|
StringWriter sw = new StringWriter();
|
||||||
|
e.printStackTrace(new PrintWriter(sw));
|
||||||
|
String stackTrace = cause + sw;
|
||||||
|
if (buffer.contains(stackTrace)) return;
|
||||||
|
|
||||||
|
System.err.println("Error while rendering: " + cause + " (" + e.getMessage() + ")");
|
||||||
|
e.printStackTrace();
|
||||||
|
buffer.add(stackTrace);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void reportErrorBuffered(Throwable e, Set<String> buffer, ItemStack cause) {
|
||||||
|
if (cause != null) {
|
||||||
|
reportErrorBuffered(e, buffer, cause.toString());
|
||||||
|
} else {
|
||||||
|
reportErrorBuffered(e, buffer, "null");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static long getScrollMultiplier(ItemStack stack) {
|
||||||
|
final long multiplier = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
|
||||||
|
|
||||||
|
if (multiplier != 0) {
|
||||||
|
return multiplier;
|
||||||
|
}
|
||||||
|
|
||||||
|
return StackInfo.isFluidDisplayItem(stack) ? 144 : stack.getMaxStackSize();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawRect(double left, double top, double width, double height, Color color) {
|
||||||
|
final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
|
||||||
|
final boolean isBlend = GL11.glGetBoolean(GL11.GL_BLEND);
|
||||||
|
final Tessellator tessellator = Tessellator.instance;
|
||||||
|
|
||||||
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
|
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||||
|
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
|
||||||
|
GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
|
||||||
|
tessellator.startDrawingQuads();
|
||||||
|
tessellator.addVertex(left, top + height, 0.0D);
|
||||||
|
tessellator.addVertex(left + width, top + height, 0.0D);
|
||||||
|
tessellator.addVertex(left + width, top, 0.0D);
|
||||||
|
tessellator.addVertex(left, top, 0.0D);
|
||||||
|
tessellator.draw();
|
||||||
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
|
if (is2DTexture) GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
|
if (!isBlend) GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawNEIOverlayText(String text, Rectangle4i rect, float scale, int color, boolean shadow,
|
||||||
|
Alignment alignment) {
|
||||||
|
final float screenScale = mc().currentScreen.width * 1f / mc().displayWidth;
|
||||||
|
final double smallTextScale = Math
|
||||||
|
.max(screenScale, (Math.max(scale, 1f) * (GuiDraw.fontRenderer.getUnicodeFlag() ? 3F / 4F : 1F / 2F)));
|
||||||
|
|
||||||
|
NEIClientUtils.gl2DRenderContext(() -> {
|
||||||
|
final int width = GuiDraw.fontRenderer.getStringWidth(text);
|
||||||
|
final float partW = rect.w / 2f;
|
||||||
|
final float partH = rect.h / 2f;
|
||||||
|
final double offsetX = Math
|
||||||
|
.ceil(rect.x + partW + partW * alignment.x - (width / 2f * (alignment.x + 1)) * smallTextScale);
|
||||||
|
final double offsetY = Math.ceil(
|
||||||
|
rect.y + partH
|
||||||
|
+ partH * alignment.y
|
||||||
|
- (GuiDraw.fontRenderer.FONT_HEIGHT / 2f * (alignment.y + 1)) * smallTextScale);
|
||||||
|
|
||||||
|
GL11.glTranslated(offsetX, offsetY, 0);
|
||||||
|
GL11.glScaled(smallTextScale, smallTextScale, 1);
|
||||||
|
GuiDraw.fontRenderer.drawString(text, 0, 0, color, shadow);
|
||||||
|
GL11.glScaled(1 / smallTextScale, 1 / smallTextScale, 1);
|
||||||
|
GL11.glTranslated(-1 * offsetX, -1 * offsetY, 0);
|
||||||
|
GL11.glColor4f(1, 1, 1, 1);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void drawNEIOverlayText(String text, int x, int y) {
|
||||||
|
drawNEIOverlayText(text, new Rectangle4i(x, y, 16, 16), 0.5f, 0xFDD835, false, Alignment.TopLeft);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void gl2DRenderContext(Runnable callback) {
|
||||||
|
boolean isLighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
|
||||||
|
boolean isDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST);
|
||||||
|
boolean isAlphaTest = GL11.glGetBoolean(GL11.GL_ALPHA_TEST);
|
||||||
|
GL11.glDisable(GL11.GL_LIGHTING);
|
||||||
|
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||||
|
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||||
|
|
||||||
|
callback.run();
|
||||||
|
|
||||||
|
if (isLighting) GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
|
if (isDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||||
|
if (!isAlphaTest) GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public class NEICompatibility {}
|
public class NEICompatibility {
|
||||||
|
}
|
||||||
@@ -1,26 +1,38 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.lib.gui.GuiDraw.getMousePosition;
|
import static codechicken.lib.gui.GuiDraw.getMousePosition;
|
||||||
|
import static codechicken.nei.NEIClientConfig.canCheatItem;
|
||||||
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.IInfiniteItemHandler;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.api.ItemInfo;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
|
||||||
import codechicken.nei.guihook.IContainerSlotClickHandler;
|
|
||||||
import codechicken.nei.recipe.GuiRecipe;
|
|
||||||
import java.awt.Point;
|
import java.awt.Point;
|
||||||
import java.util.LinkedList;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.inventory.SlotCrafting;
|
import net.minecraft.inventory.SlotCrafting;
|
||||||
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraftforge.client.ClientCommandHandler;
|
||||||
|
|
||||||
|
import codechicken.core.CommonUtils;
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.IInfiniteItemHandler;
|
||||||
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.commands.CommandBookmarkAdd;
|
||||||
|
import codechicken.nei.commands.CommandRecipeId;
|
||||||
|
import codechicken.nei.commands.CommandUntranslator;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
|
import codechicken.nei.guihook.IContainerSlotClickHandler;
|
||||||
|
import codechicken.nei.util.EmptyContainer;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
|
public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
|
||||||
|
|
||||||
private static final NEIController instance = new NEIController();
|
private static final NEIController instance = new NEIController();
|
||||||
|
|
||||||
public static GuiContainerManager manager;
|
public static GuiContainerManager manager;
|
||||||
@@ -36,6 +48,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
public static void load() {
|
public static void load() {
|
||||||
GuiContainerManager.addSlotClickHandler(instance);
|
GuiContainerManager.addSlotClickHandler(instance);
|
||||||
GuiContainerManager.addInputHandler(instance);
|
GuiContainerManager.addInputHandler(instance);
|
||||||
|
|
||||||
|
if (CommonUtils.isClient()) registerClientCommands();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void load(GuiContainer gui) {
|
public static void load(GuiContainer gui) {
|
||||||
@@ -53,45 +67,60 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
return gui.field_147007_t && gui.field_147008_s.size() > 1;
|
return gui.field_147007_t && gui.field_147008_s.size() > 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public static void registerClientCommands() {
|
||||||
|
ClientCommandHandler.instance.registerCommand(new CommandBookmarkAdd());
|
||||||
|
ClientCommandHandler.instance.registerCommand(new CommandRecipeId());
|
||||||
|
ClientCommandHandler.instance.registerCommand(new CommandUntranslator());
|
||||||
|
}
|
||||||
|
|
||||||
public static void updateUnlimitedItems(InventoryPlayer inventory) {
|
public static void updateUnlimitedItems(InventoryPlayer inventory) {
|
||||||
if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
|
if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
|
||||||
|
|
||||||
LinkedList<ItemStack> beforeStacks = new LinkedList<>();
|
int size = inventory.getSizeInventory();
|
||||||
for (int i = 0; i < inventory.getSizeInventory(); i++)
|
for (int i = 0; i < size; i++) {
|
||||||
beforeStacks.add(NEIServerUtils.copyStack(inventory.getStackInSlot(i)));
|
|
||||||
|
|
||||||
for (int i = 0; i < inventory.getSizeInventory(); i++) {
|
|
||||||
ItemStack stack = inventory.getStackInSlot(i);
|
ItemStack stack = inventory.getStackInSlot(i);
|
||||||
if (stack == null) continue;
|
if (stack == null) continue;
|
||||||
|
|
||||||
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers)
|
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
|
||||||
if (handler.canHandleItem(stack) && handler.isItemInfinite(stack))
|
if (!handler.canHandleItem(stack) || !handler.isItemInfinite(stack)) continue;
|
||||||
handler.replenishInfiniteStack(inventory, i);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int i = 0; i < inventory.getSizeInventory(); i++) {
|
long beforeSize = packStackSize(stack.stackSize, stack.getItemDamage());
|
||||||
ItemStack newstack = inventory.getStackInSlot(i);
|
handler.replenishInfiniteStack(inventory, i);
|
||||||
|
|
||||||
if (!NEIServerUtils.areStacksIdentical(beforeStacks.get(i), newstack)) {
|
ItemStack newstack = inventory.getStackInSlot(i);
|
||||||
inventory.setInventorySlotContents(i, beforeStacks.get(i)); // restore in case of SMP fail
|
if (!sameStack(stack, beforeSize, newstack)) {
|
||||||
NEIClientUtils.setSlotContents(i, newstack, false); // sends via SMP handler ;)
|
NEIClientUtils.setSlotContents(i, newstack, false); // sends via SMP handler ;)
|
||||||
|
stack.stackSize = (int) (beforeSize >> 32);
|
||||||
|
stack.setItemDamage((int) beforeSize);
|
||||||
|
inventory.setInventorySlotContents(i, stack); // restore in case of SMP fail
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static long packStackSize(int stackSize, int itemDamage) {
|
||||||
|
return ((long) stackSize << 32) | (itemDamage & 0xFFFFFFFFL);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean sameStack(ItemStack before, long beforeSize, ItemStack stack) {
|
||||||
|
if (stack == null) return before == null;
|
||||||
|
return before != null && Item.getIdFromItem(before.getItem()) == Item.getIdFromItem(stack.getItem())
|
||||||
|
&& beforeSize == packStackSize(stack.stackSize, stack.getItemDamage());
|
||||||
|
}
|
||||||
|
|
||||||
public static void processCreativeCycling(InventoryPlayer inventory) {
|
public static void processCreativeCycling(InventoryPlayer inventory) {
|
||||||
if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
|
if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
|
||||||
if (selectedItem != inventory.currentItem) {
|
if (selectedItem != inventory.currentItem) {
|
||||||
if (inventory.currentItem == selectedItem + 1
|
if (inventory.currentItem == selectedItem + 1 || (inventory.currentItem == 0 && selectedItem == 8)) // foward
|
||||||
|| (inventory.currentItem == 0 && selectedItem == 8)) // foward
|
|
||||||
{
|
{
|
||||||
NEICPH.sendCreativeScroll(1);
|
NEICPH.sendCreativeScroll(1);
|
||||||
inventory.currentItem = selectedItem;
|
inventory.currentItem = selectedItem;
|
||||||
} else if (inventory.currentItem == selectedItem - 1
|
} else if (inventory.currentItem == selectedItem - 1
|
||||||
|| (inventory.currentItem == 8 && selectedItem == 0)) {
|
|| (inventory.currentItem == 8 && selectedItem == 0)) {
|
||||||
NEICPH.sendCreativeScroll(-1);
|
NEICPH.sendCreativeScroll(-1);
|
||||||
inventory.currentItem = selectedItem;
|
inventory.currentItem = selectedItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -106,8 +135,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleSlotClick(
|
public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier,
|
||||||
GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) {
|
boolean eventconsumed) {
|
||||||
if (eventconsumed || !NEIClientConfig.isEnabled() || isSpreading(gui)) return eventconsumed;
|
if (eventconsumed || !NEIClientConfig.isEnabled() || isSpreading(gui)) return eventconsumed;
|
||||||
|
|
||||||
if (deleteMode && slotIndex >= 0 && slot != null) {
|
if (deleteMode && slotIndex >= 0 && slot != null) {
|
||||||
@@ -120,39 +149,52 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (button == 1 && slot instanceof SlotCrafting) // right click
|
if (button == 1 && modifier != 2 && slot instanceof SlotCrafting) // right click
|
||||||
{
|
{
|
||||||
for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
|
for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
|
||||||
manager.handleSlotClick(slot.slotNumber, button, 0);
|
manager.handleSlotClick(slot.slotNumber, button, 0);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NEIClientUtils.controlKey()
|
if (NEIClientUtils.controlKey() && modifier != 4 // Drop key pressed:
|
||||||
&& modifier != 4 // Drop key pressed: net.minecraft.client.gui.inventory.GuiContainer.keyTyped
|
// net.minecraft.client.gui.inventory.GuiContainer.keyTyped
|
||||||
&& slot != null
|
&& slot != null
|
||||||
&& slot.getStack() != null
|
&& slot.getStack() != null
|
||||||
&& slot.isItemValid(slot.getStack())) {
|
&& slot.isItemValid(slot.getStack())) {
|
||||||
|
if (!canCheatItem(slot.getStack())) return false;
|
||||||
|
|
||||||
NEIClientUtils.cheatItem(slot.getStack(), button, 1);
|
NEIClientUtils.cheatItem(slot.getStack(), button, 1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GuiInfo.hasCustomSlots(gui)) return false;
|
if (GuiInfo.hasCustomSlots(gui)) return false;
|
||||||
|
|
||||||
if (slotIndex >= 0
|
if (NEIClientUtils.shiftKey() && button != 2) { // MMB is used by other mods when an itemstack is picked.
|
||||||
&& NEIClientUtils.shiftKey()
|
// fix small mouse movement while clicking causing slotIndex to be -999
|
||||||
&& NEIClientUtils.getHeldItem() != null
|
if (slotIndex == -999) {
|
||||||
&& !slot.getHasStack()) {
|
final Point mouse = GuiDraw.getMousePosition();
|
||||||
ItemStack held = NEIClientUtils.getHeldItem();
|
slot = gui.getSlotAtPosition(mouse.x, mouse.y);
|
||||||
manager.handleSlotClick(slot.slotNumber, button, 0);
|
|
||||||
if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass()))
|
|
||||||
fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
|
|
||||||
|
|
||||||
return true;
|
if (slot != null) {
|
||||||
}
|
slotIndex = slot.slotNumber;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (slotIndex == -999 && NEIClientUtils.shiftKey() && button == 0) {
|
if (slotIndex >= 0 && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
|
||||||
fastTransferManager.throwAll(gui, pickedUpFromSlot);
|
final ItemStack held = NEIClientUtils.getHeldItem();
|
||||||
return true;
|
manager.handleSlotClick(slot.slotNumber, button, 0);
|
||||||
|
|
||||||
|
if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass())) {
|
||||||
|
fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (slotIndex == -999 && button == 0) {
|
||||||
|
fastTransferManager.throwAll(gui, pickedUpFromSlot);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -167,8 +209,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
if (firstheld != nowHeld) pickedUpFromSlot = slotIndex;
|
if (firstheld != nowHeld) pickedUpFromSlot = slotIndex;
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("item") && NEIClientConfig.hasSMPCounterPart()) {
|
if (NEIClientConfig.canPerformAction("item") && NEIClientConfig.hasSMPCounterPart()) {
|
||||||
if (heldStackInfinite != null
|
if (heldStackInfinite != null && slot != null
|
||||||
&& slot != null
|
|
||||||
&& slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
|
&& slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
|
||||||
ItemStack stack = slot.getStack();
|
ItemStack stack = slot.getStack();
|
||||||
if (stack != null) {
|
if (stack != null) {
|
||||||
@@ -214,13 +255,13 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||||
if (!NEIClientConfig.isEnabled()
|
if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui)
|
||||||
|| GuiInfo.hasCustomSlots(gui)
|
|| !NEIClientConfig.isMouseScrollTransferEnabled())
|
||||||
|| !NEIClientConfig.isMouseScrollTransferEnabled()) return false;
|
return false;
|
||||||
|
|
||||||
// slot in GuiRecipe does not contain actual stack
|
// slot in GuiRecipe does not contain actual stack
|
||||||
// and scroll should be handled by GuiRecipe, not here
|
// and scroll should be handled by GuiRecipe, not here
|
||||||
if (gui instanceof GuiRecipe) return false;
|
if (gui.inventorySlots instanceof EmptyContainer) return false;
|
||||||
|
|
||||||
Point mousePos = getMousePosition();
|
Point mousePos = getMousePosition();
|
||||||
Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
|
Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
import net.minecraft.client.gui.inventory.GuiContainerCreative;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
|
|
||||||
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
|
|
||||||
public class NEICreativeGuiHandler extends INEIGuiAdapter {
|
public class NEICreativeGuiHandler extends INEIGuiAdapter {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
|
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
|
||||||
if (!(gui instanceof GuiContainerCreative)) return currentVisibility;
|
if (!(gui instanceof GuiContainerCreative)) return currentVisibility;
|
||||||
|
|||||||
@@ -1,18 +1,19 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.inventory.ContainerExtended;
|
|
||||||
import codechicken.lib.inventory.SlotDummy;
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import codechicken.lib.inventory.ContainerExtended;
|
||||||
|
import codechicken.lib.inventory.SlotDummy;
|
||||||
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
|
|
||||||
public class NEIDummySlotHandler extends INEIGuiAdapter {
|
public class NEIDummySlotHandler extends INEIGuiAdapter {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
|
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
|
||||||
Slot slot = gui.getSlotAtPosition(mousex, mousey);
|
Slot slot = gui.getSlotAtPosition(mousex, mousey);
|
||||||
if (slot instanceof SlotDummy
|
if (slot instanceof SlotDummy && slot.isItemValid(draggedStack)
|
||||||
&& slot.isItemValid(draggedStack)
|
|
||||||
&& gui.inventorySlots instanceof ContainerExtended) {
|
&& gui.inventorySlots instanceof ContainerExtended) {
|
||||||
((SlotDummy) slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
|
((SlotDummy) slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
|
||||||
NEICPH.sendDummySlotSet(slot.slotNumber, slot.getStack());
|
NEICPH.sendDummySlotSet(slot.slotNumber, slot.getStack());
|
||||||
|
|||||||
@@ -1,49 +1,66 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
|
import com.google.common.eventbus.EventBus;
|
||||||
|
import com.google.common.eventbus.Subscribe;
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
import codechicken.core.CommonUtils;
|
||||||
import codechicken.core.launch.CodeChickenCorePlugin;
|
import codechicken.core.launch.CodeChickenCorePlugin;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
import codechicken.nei.api.IConfigureNEI;
|
import codechicken.nei.api.IConfigureNEI;
|
||||||
import codechicken.nei.asm.NEICorePlugin;
|
import codechicken.nei.asm.NEICorePlugin;
|
||||||
import codechicken.nei.config.IMCHandler;
|
import codechicken.nei.config.IMCHandler;
|
||||||
|
import codechicken.nei.guihook.HideousLinkedList;
|
||||||
import codechicken.nei.recipe.GuiRecipeTab;
|
import codechicken.nei.recipe.GuiRecipeTab;
|
||||||
import com.google.common.eventbus.EventBus;
|
import codechicken.nei.recipe.stackinfo.MaterialLibStackStringifyHandler;
|
||||||
import com.google.common.eventbus.Subscribe;
|
|
||||||
import cpw.mods.fml.client.FMLFileResourcePack;
|
import cpw.mods.fml.client.FMLFileResourcePack;
|
||||||
import cpw.mods.fml.client.FMLFolderResourcePack;
|
import cpw.mods.fml.client.FMLFolderResourcePack;
|
||||||
import cpw.mods.fml.common.DummyModContainer;
|
import cpw.mods.fml.common.DummyModContainer;
|
||||||
import cpw.mods.fml.common.LoadController;
|
import cpw.mods.fml.common.LoadController;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.ModMetadata;
|
import cpw.mods.fml.common.ModMetadata;
|
||||||
|
import cpw.mods.fml.common.discovery.ASMDataTable;
|
||||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||||
|
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
|
import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
|
||||||
import cpw.mods.fml.common.versioning.ArtifactVersion;
|
import cpw.mods.fml.common.versioning.ArtifactVersion;
|
||||||
import cpw.mods.fml.common.versioning.VersionParser;
|
import cpw.mods.fml.common.versioning.VersionParser;
|
||||||
import cpw.mods.fml.common.versioning.VersionRange;
|
import cpw.mods.fml.common.versioning.VersionRange;
|
||||||
import java.io.File;
|
|
||||||
import java.util.*;
|
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
|
||||||
|
|
||||||
|
@SuppressWarnings("UnstableApiUsage")
|
||||||
public class NEIModContainer extends DummyModContainer {
|
public class NEIModContainer extends DummyModContainer {
|
||||||
public static LinkedList<IConfigureNEI> plugins = new LinkedList<>();
|
|
||||||
|
public static final LinkedList<IConfigureNEI> plugins = new HideousLinkedList<>(new CopyOnWriteArrayList<>());
|
||||||
|
|
||||||
private static boolean gregTech5Loaded;
|
private static boolean gregTech5Loaded;
|
||||||
|
private static boolean gtnhLibLoaded;
|
||||||
|
private static boolean cubicChunksLoaded;
|
||||||
|
|
||||||
|
private static ASMDataTable asmDataTable;
|
||||||
|
|
||||||
public NEIModContainer() {
|
public NEIModContainer() {
|
||||||
super(getModMetadata());
|
super(getModMetadata());
|
||||||
loadMetadata();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ModMetadata getModMetadata() {
|
private static ModMetadata getModMetadata() {
|
||||||
final ModMetadata modMetadata = new ModMetadata();
|
final ModMetadata modMetadata = new ModMetadata();
|
||||||
modMetadata.name = "GRADLETOKEN_MODNAME";
|
modMetadata.name = "NotEnoughItems";
|
||||||
modMetadata.modId = "GRADLETOKEN_MODID";
|
modMetadata.modId = "NotEnoughItems";
|
||||||
modMetadata.version = "GRADLETOKEN_VERSION";
|
modMetadata.version = Tags.VERSION;
|
||||||
modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123");
|
modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123", "SLPrime");
|
||||||
modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems";
|
modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems";
|
||||||
modMetadata.description =
|
modMetadata.description = "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
|
||||||
"Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
|
|
||||||
return modMetadata;
|
return modMetadata;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,44 +68,31 @@ public class NEIModContainer extends DummyModContainer {
|
|||||||
return gregTech5Loaded;
|
return gregTech5Loaded;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean isGTNHLibLoaded() {
|
||||||
|
return gtnhLibLoaded;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isCCLoaded() {
|
||||||
|
return cubicChunksLoaded;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<ArtifactVersion> getRequirements() {
|
public Set<ArtifactVersion> getRequirements() {
|
||||||
Set<ArtifactVersion> deps = new HashSet<>();
|
Set<ArtifactVersion> deps = new HashSet<>();
|
||||||
deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + CodeChickenCorePlugin.version + ",)"));
|
deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
|
||||||
return deps;
|
return deps;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ArtifactVersion> getDependencies() {
|
public List<ArtifactVersion> getDependencies() {
|
||||||
return new LinkedList<>(getRequirements());
|
List<ArtifactVersion> deps = new ArrayList<>();
|
||||||
|
deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
|
||||||
|
deps.add(VersionParser.parseVersionReference("gtnhlib@[0.9.6,)"));
|
||||||
|
return deps;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
private void loadMetadata() {
|
|
||||||
description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ModMetadata getMetadata() {
|
|
||||||
StringBuilder s_plugins = new StringBuilder();
|
|
||||||
if (plugins.size() == 0) {
|
|
||||||
s_plugins.append(EnumChatFormatting.RED).append("No installed plugins.");
|
|
||||||
} else {
|
|
||||||
s_plugins.append(EnumChatFormatting.GREEN).append("Installed plugins: ");
|
|
||||||
for (int i = 0; i < plugins.size(); i++) {
|
|
||||||
if (i > 0) s_plugins.append(", ");
|
|
||||||
IConfigureNEI plugin = plugins.get(i);
|
|
||||||
s_plugins.append(plugin.getName()).append(" ").append(plugin.getVersion());
|
|
||||||
}
|
|
||||||
s_plugins.append(".");
|
|
||||||
}
|
|
||||||
|
|
||||||
ModMetadata meta = super.getMetadata();
|
|
||||||
meta.description = description.replace("<plugins>", s_plugins.toString());
|
|
||||||
return meta;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean registerBus(EventBus bus, LoadController controller) {
|
public boolean registerBus(EventBus bus, LoadController controller) {
|
||||||
bus.register(this);
|
bus.register(this);
|
||||||
@@ -98,24 +102,48 @@ public class NEIModContainer extends DummyModContainer {
|
|||||||
@Subscribe
|
@Subscribe
|
||||||
public void preInit(FMLPreInitializationEvent event) {
|
public void preInit(FMLPreInitializationEvent event) {
|
||||||
gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
|
gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
|
||||||
|
gtnhLibLoaded = Loader.isModLoaded("gtnhlib");
|
||||||
|
cubicChunksLoaded = Loader.isModLoaded("cubicchunks");
|
||||||
|
ServerHandler.preInit();
|
||||||
if (CommonUtils.isClient()) ClientHandler.preInit();
|
if (CommonUtils.isClient()) ClientHandler.preInit();
|
||||||
|
asmDataTable = event.getAsmData();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void init(FMLInitializationEvent event) {
|
public void init(FMLInitializationEvent event) {
|
||||||
if (CommonUtils.isClient()) ClientHandler.load();
|
if (CommonUtils.isClient()) {
|
||||||
|
ClientHandler.load();
|
||||||
|
IMCForNEI.IMCSender();
|
||||||
|
}
|
||||||
ServerHandler.load();
|
ServerHandler.load();
|
||||||
|
|
||||||
|
if (Loader.isModLoaded("materiallib")) {
|
||||||
|
API.registerStackStringifyHandler(new MaterialLibStackStringifyHandler());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void postInit(FMLPostInitializationEvent event) {
|
public void postInit(FMLPostInitializationEvent event) {
|
||||||
if (CommonUtils.isClient()) {
|
if (CommonUtils.isClient()) {
|
||||||
GuiRecipeTab.loadHandlerInfo();
|
|
||||||
ClientHandler.postInit();
|
ClientHandler.postInit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void loadComplete(FMLLoadCompleteEvent event) {
|
||||||
|
if (CommonUtils.isClient()) {
|
||||||
|
GuiRecipeTab.loadHandlerInfo();
|
||||||
|
ClientHandler.loadPluginsList();
|
||||||
|
ClientHandler.loadHandlerOrdering();
|
||||||
|
asmDataTable = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
|
||||||
|
NEIServerConfig.resetFirstLoad();
|
||||||
|
}
|
||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void handleIMCMessages(FMLInterModComms.IMCEvent event) {
|
public void handleIMCMessages(FMLInterModComms.IMCEvent event) {
|
||||||
IMCHandler.processIMC(event.getMessages());
|
IMCHandler.processIMC(event.getMessages());
|
||||||
@@ -135,4 +163,8 @@ public class NEIModContainer extends DummyModContainer {
|
|||||||
public Class<?> getCustomResourcePackClass() {
|
public Class<?> getCustomResourcePackClass() {
|
||||||
return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
|
return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static ASMDataTable getAsmDataTable() {
|
||||||
|
return asmDataTable;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,49 +1,50 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.api.INEIGuiAdapter;
|
|
||||||
import java.util.Collection;
|
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.entity.EntityPlayerSP;
|
import net.minecraft.client.entity.EntityPlayerSP;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.client.renderer.InventoryEffectRenderer;
|
import net.minecraft.client.renderer.InventoryEffectRenderer;
|
||||||
import net.minecraft.potion.PotionEffect;
|
|
||||||
|
import codechicken.nei.api.INEIGuiAdapter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Inspired by InventoryEffectRendererGuiHandler.java in JEI
|
* Inspired by InventoryEffectRendererGuiHandler.java in JEI
|
||||||
*/
|
*/
|
||||||
public class NEIPotionGuiHandler extends INEIGuiAdapter {
|
public class NEIPotionGuiHandler extends INEIGuiAdapter {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
|
public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
|
||||||
if (NEIClientConfig.ignorePotionOverlap()) {
|
if (!(guiContainer instanceof InventoryEffectRenderer)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (guiContainer instanceof InventoryEffectRenderer) {
|
int x = guiContainer.guiLeft - 124;
|
||||||
int x = guiContainer.guiLeft - 124;
|
if (slotX + slotW <= x || slotX >= x + 140) {
|
||||||
int y = guiContainer.guiTop;
|
return false;
|
||||||
Minecraft minecraft = guiContainer.mc;
|
}
|
||||||
if (minecraft == null) {
|
|
||||||
return false;
|
Minecraft minecraft = guiContainer.mc;
|
||||||
}
|
if (minecraft == null) {
|
||||||
EntityPlayerSP player = minecraft.thePlayer;
|
return false;
|
||||||
if (player == null) {
|
}
|
||||||
return false;
|
EntityPlayerSP player = minecraft.thePlayer;
|
||||||
}
|
if (player == null) {
|
||||||
Collection<PotionEffect> activePotionEffects = player.getActivePotionEffects();
|
return false;
|
||||||
if (activePotionEffects.isEmpty()) {
|
}
|
||||||
return false;
|
int potionCount = player.getActivePotionEffects().size();
|
||||||
}
|
if (potionCount == 0 || NEIClientConfig.ignorePotionOverlap()) {
|
||||||
int height = 33;
|
return false;
|
||||||
if (activePotionEffects.size() > 5) {
|
}
|
||||||
height = 132 / (activePotionEffects.size() - 1);
|
int height = 33;
|
||||||
}
|
if (potionCount > 5) {
|
||||||
Rectangle4i slotRect = new Rectangle4i(slotX, slotY, slotW, slotH);
|
height = 132 / (potionCount - 1);
|
||||||
for (PotionEffect potioneffect : activePotionEffects) {
|
}
|
||||||
Rectangle4i box = new Rectangle4i(x, y, 140, 32);
|
return intersectsPotionEffects(slotY, slotH, guiContainer.guiTop, potionCount, height);
|
||||||
if (box.intersects(slotRect)) return true;
|
}
|
||||||
y += height;
|
|
||||||
}
|
static boolean intersectsPotionEffects(int slotY, int slotH, int effectY, int potionCount, int height) {
|
||||||
|
for (int i = 0; i < potionCount; i++, effectY += height) {
|
||||||
|
if (slotY + slotH > effectY && slotY < effectY + 32) return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,22 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import static codechicken.nei.PacketIDs.C2S;
|
||||||
|
import static codechicken.nei.PacketIDs.S2C;
|
||||||
|
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import net.minecraft.entity.item.EntityItem;
|
||||||
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
|
import net.minecraft.inventory.InventoryBasic;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.network.play.INetHandlerPlayServer;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.tileentity.TileEntityMobSpawner;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
import codechicken.core.CommonUtils;
|
||||||
import codechicken.core.ServerUtils;
|
import codechicken.core.ServerUtils;
|
||||||
import codechicken.lib.inventory.SlotDummy;
|
import codechicken.lib.inventory.SlotDummy;
|
||||||
@@ -7,81 +24,90 @@ import codechicken.lib.packet.PacketCustom;
|
|||||||
import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
|
import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
|
||||||
import codechicken.lib.vec.BlockCoord;
|
import codechicken.lib.vec.BlockCoord;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.Set;
|
|
||||||
import net.minecraft.entity.item.EntityItem;
|
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
|
||||||
import net.minecraft.inventory.InventoryBasic;
|
|
||||||
import net.minecraft.inventory.Slot;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.network.play.INetHandlerPlayServer;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.tileentity.TileEntityMobSpawner;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
|
|
||||||
public class NEISPH implements IServerPacketHandler {
|
public class NEISPH implements IServerPacketHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {
|
public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {
|
||||||
if (!NEIServerConfig.authenticatePacket(sender, packet)) return;
|
if (!NEIServerConfig.authenticatePacket(sender, packet)) return;
|
||||||
|
|
||||||
switch (packet.getType()) {
|
switch (packet.getType()) {
|
||||||
case 1:
|
case C2S.GIVE_ITEM:
|
||||||
handleGiveItem(sender, packet);
|
handleGiveItem(sender, packet);
|
||||||
break;
|
break;
|
||||||
case 4:
|
case C2S.DELETE_ALL_ITEMS:
|
||||||
NEIServerUtils.deleteAllItems(sender);
|
NEIServerUtils.deleteAllItems(sender);
|
||||||
break;
|
break;
|
||||||
case 5:
|
case C2S.SET_SLOT:
|
||||||
setInventorySlot(sender, packet);
|
setInventorySlot(sender, packet);
|
||||||
break;
|
break;
|
||||||
case 6:
|
case C2S.TOGGLE_MAGNET:
|
||||||
NEIServerUtils.toggleMagnetMode(sender);
|
NEIServerUtils.toggleMagnetMode(sender);
|
||||||
break;
|
break;
|
||||||
case 7:
|
case C2S.SET_TIME:
|
||||||
NEIServerUtils.setHourForward(sender.worldObj, packet.readUByte(), true);
|
NEIServerUtils.setHourForward(sender.worldObj, packet.readUByte(), true);
|
||||||
break;
|
break;
|
||||||
case 8:
|
case C2S.HEAL:
|
||||||
NEIServerUtils.healPlayer(sender);
|
NEIServerUtils.healPlayer(sender);
|
||||||
break;
|
break;
|
||||||
case 9:
|
case C2S.TOGGLE_RAIN:
|
||||||
NEIServerUtils.toggleRaining(sender.worldObj, true);
|
NEIServerUtils.toggleRaining(sender.worldObj, true);
|
||||||
break;
|
break;
|
||||||
case 10:
|
case C2S.REQUEST_LOGIN_INFO:
|
||||||
sendLoginState(sender);
|
sendLoginState(sender);
|
||||||
break;
|
break;
|
||||||
case 11:
|
case C2S.REQUEST_CONTAINER_CONTENTS:
|
||||||
sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
|
sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
|
||||||
break;
|
break;
|
||||||
case 12:
|
case C2S.CHANGE_PROPERTY:
|
||||||
handlePropertyChange(sender, packet);
|
handlePropertyChange(sender, packet);
|
||||||
break;
|
break;
|
||||||
case 13:
|
case C2S.SET_GAME_MODE:
|
||||||
NEIServerUtils.setGamemode(sender, packet.readUByte());
|
NEIServerUtils.setGamemode(sender, packet.readUByte());
|
||||||
break;
|
break;
|
||||||
case 14:
|
case C2S.CYCLE_CREATIVE_INV:
|
||||||
NEIServerUtils.cycleCreativeInv(sender, packet.readInt());
|
NEIServerUtils.cycleCreativeInv(sender, packet.readInt());
|
||||||
break;
|
break;
|
||||||
case 15:
|
case C2S.SEND_MOB_SPAWNER_ID:
|
||||||
handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString());
|
handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString());
|
||||||
break;
|
break;
|
||||||
case 21:
|
case C2S.REQUEST_CONTAINER:
|
||||||
|
handleRequestContainer(sender, packet.readInt());
|
||||||
|
break;
|
||||||
|
case C2S.REQUEST_ENCHANTMENT_GUI:
|
||||||
openEnchantmentGui(sender);
|
openEnchantmentGui(sender);
|
||||||
break;
|
break;
|
||||||
case 22:
|
case C2S.MODIFY_ENCHANTMENT:
|
||||||
modifyEnchantment(sender, packet.readUByte(), packet.readUByte(), packet.readBoolean());
|
modifyEnchantment(sender, packet.readUByte(), packet.readUByte(), packet.readBoolean());
|
||||||
break;
|
break;
|
||||||
case 23:
|
case C2S.SET_CREATIVE_PLUS_MODE:
|
||||||
processCreativeInv(sender, packet.readBoolean());
|
processCreativeInv(sender, packet.readBoolean());
|
||||||
break;
|
break;
|
||||||
case 24:
|
case C2S.REQUEST_POTION_GUI:
|
||||||
openPotionGui(sender, packet);
|
openPotionGui(sender, packet);
|
||||||
break;
|
break;
|
||||||
case 25:
|
case C2S.SET_DUMMY_SLOT:
|
||||||
handleDummySlotSet(sender, packet);
|
handleDummySlotSet(sender, packet);
|
||||||
break;
|
break;
|
||||||
|
case C2S.SEND_CHAT_ITEM_LINK:
|
||||||
|
handleSendChatItemLink(sender, packet);
|
||||||
|
break;
|
||||||
|
case C2S.SYNC:
|
||||||
|
handleSync(sender, packet.readInt());
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void handleSync(EntityPlayerMP sender, int id) {
|
||||||
|
sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
|
||||||
|
new PacketCustom(channel, S2C.SYNC).writeInt(id).sendToPlayer(sender);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleSendChatItemLink(EntityPlayerMP sender, PacketCustom packet) {
|
||||||
|
final NBTTagCompound payloadTag = packet.readNBTTagCompound();
|
||||||
|
NEIServerUtils.sendChatItemLink(sender, payloadTag);
|
||||||
|
}
|
||||||
|
|
||||||
private void handleDummySlotSet(EntityPlayerMP sender, PacketCustom packet) {
|
private void handleDummySlotSet(EntityPlayerMP sender, PacketCustom packet) {
|
||||||
int slotNumber = packet.readShort();
|
int slotNumber = packet.readShort();
|
||||||
ItemStack stack = packet.readItemStack(true);
|
ItemStack stack = packet.readItemStack(true);
|
||||||
@@ -99,6 +125,11 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void handleRequestContainer(EntityPlayerMP sender, int containerSize) {
|
||||||
|
if (sender.openContainer.getInventory().size() != containerSize) return;
|
||||||
|
sender.sendContainerToPlayer(sender.openContainer);
|
||||||
|
}
|
||||||
|
|
||||||
private void handlePropertyChange(EntityPlayerMP sender, PacketCustom packet) {
|
private void handlePropertyChange(EntityPlayerMP sender, PacketCustom packet) {
|
||||||
String name = packet.readString();
|
String name = packet.readString();
|
||||||
if (NEIServerConfig.canPlayerPerformAction(sender.getCommandSenderName(), name))
|
if (NEIServerConfig.canPlayerPerformAction(sender.getCommandSenderName(), name))
|
||||||
@@ -112,16 +143,17 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
new ContainerCreativeInv(
|
new ContainerCreativeInv(
|
||||||
sender,
|
sender,
|
||||||
new ExtendedCreativeInv(
|
new ExtendedCreativeInv(
|
||||||
NEIServerConfig.forPlayer(sender.getCommandSenderName()), Side.SERVER)),
|
NEIServerConfig.forPlayer(sender.getCommandSenderName()),
|
||||||
|
Side.SERVER)),
|
||||||
(player, windowId) -> {
|
(player, windowId) -> {
|
||||||
PacketCustom packet = new PacketCustom(channel, 23);
|
PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE);
|
||||||
packet.writeBoolean(true);
|
packet.writeBoolean(true);
|
||||||
packet.writeByte(windowId);
|
packet.writeByte(windowId);
|
||||||
packet.sendToPlayer(player);
|
packet.sendToPlayer(player);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
sender.closeContainer();
|
sender.closeContainer();
|
||||||
PacketCustom packet = new PacketCustom(channel, 23);
|
PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE);
|
||||||
packet.writeBoolean(false);
|
packet.writeBoolean(false);
|
||||||
packet.sendToPlayer(sender);
|
packet.sendToPlayer(sender);
|
||||||
}
|
}
|
||||||
@@ -157,7 +189,7 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
player,
|
player,
|
||||||
new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0),
|
new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0),
|
||||||
(player1, windowId) -> {
|
(player1, windowId) -> {
|
||||||
PacketCustom packet = new PacketCustom(channel, 21);
|
PacketCustom packet = new PacketCustom(channel, S2C.OPEN_ENCHANTMENT_GUI);
|
||||||
packet.writeByte(windowId);
|
packet.writeByte(windowId);
|
||||||
packet.sendToPlayer(player1);
|
packet.sendToPlayer(player1);
|
||||||
});
|
});
|
||||||
@@ -167,18 +199,19 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
InventoryBasic b = new InventoryBasic("potionStore", true, 9);
|
InventoryBasic b = new InventoryBasic("potionStore", true, 9);
|
||||||
for (int i = 0; i < b.getSizeInventory(); i++) b.setInventorySlotContents(i, packet.readItemStack());
|
for (int i = 0; i < b.getSizeInventory(); i++) b.setInventorySlotContents(i, packet.readItemStack());
|
||||||
ServerUtils.openSMPContainer(player, new ContainerPotionCreator(player.inventory, b), (player1, windowId) -> {
|
ServerUtils.openSMPContainer(player, new ContainerPotionCreator(player.inventory, b), (player1, windowId) -> {
|
||||||
PacketCustom packet1 = new PacketCustom(channel, 24);
|
PacketCustom packet1 = new PacketCustom(channel, S2C.OPEN_POTION_GUI);
|
||||||
packet1.writeByte(windowId);
|
packet1.writeByte(windowId);
|
||||||
packet1.sendToPlayer(player1);
|
packet1.sendToPlayer(player1);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendActionDisabled(int dim, String name, boolean disable) {
|
public static void sendActionDisabled(int dim, String name, boolean disable) {
|
||||||
new PacketCustom(channel, 11).writeString(name).writeBoolean(disable).sendToDimension(dim);
|
new PacketCustom(channel, S2C.SEND_ACTION_DISABLED).writeString(name).writeBoolean(disable)
|
||||||
|
.sendToDimension(dim);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendActionEnabled(EntityPlayerMP player, String name, boolean enable) {
|
public static void sendActionEnabled(EntityPlayerMP player, String name, boolean enable) {
|
||||||
new PacketCustom(channel, 12).writeString(name).writeBoolean(enable).sendToPlayer(player);
|
new PacketCustom(channel, S2C.SEND_ACTION_ENABLED).writeString(name).writeBoolean(enable).sendToPlayer(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendLoginState(EntityPlayerMP player) {
|
private void sendLoginState(EntityPlayerMP player) {
|
||||||
@@ -197,7 +230,7 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
if (!NEIServerConfig.isPlayerInList(player.getCommandSenderName(), entry.value, true))
|
if (!NEIServerConfig.isPlayerInList(player.getCommandSenderName(), entry.value, true))
|
||||||
bannedItems.add(entry.key);
|
bannedItems.add(entry.key);
|
||||||
|
|
||||||
PacketCustom packet = new PacketCustom(channel, 10);
|
PacketCustom packet = new PacketCustom(channel, S2C.SEND_LOGIN_STATE);
|
||||||
|
|
||||||
packet.writeByte(actions.size());
|
packet.writeByte(actions.size());
|
||||||
for (String s : actions) packet.writeString(s);
|
for (String s : actions) packet.writeString(s);
|
||||||
@@ -216,7 +249,7 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
|
|
||||||
public static void sendHasServerSideTo(EntityPlayerMP player) {
|
public static void sendHasServerSideTo(EntityPlayerMP player) {
|
||||||
NEIServerConfig.logger.debug("Sending serverside check to: " + player.getCommandSenderName());
|
NEIServerConfig.logger.debug("Sending serverside check to: " + player.getCommandSenderName());
|
||||||
PacketCustom packet = new PacketCustom(channel, 1);
|
PacketCustom packet = new PacketCustom(channel, S2C.SEND_SERVER_SIDE_CHECK);
|
||||||
packet.writeByte(NEIActions.protocol);
|
packet.writeByte(NEIActions.protocol);
|
||||||
packet.writeString(CommonUtils.getWorldName(player.worldObj));
|
packet.writeString(CommonUtils.getWorldName(player.worldObj));
|
||||||
|
|
||||||
@@ -224,7 +257,7 @@ public class NEISPH implements IServerPacketHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendAddMagneticItemTo(EntityPlayerMP player, EntityItem item) {
|
public static void sendAddMagneticItemTo(EntityPlayerMP player, EntityItem item) {
|
||||||
PacketCustom packet = new PacketCustom(channel, 13);
|
PacketCustom packet = new PacketCustom(channel, S2C.SEND_MAGNETIC_ITEM);
|
||||||
packet.writeInt(item.getEntityId());
|
packet.writeInt(item.getEntityId());
|
||||||
|
|
||||||
packet.sendToPlayer(player);
|
packet.sendToPlayer(player);
|
||||||
|
|||||||
@@ -1,10 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.core.ServerUtils;
|
|
||||||
import codechicken.lib.config.ConfigFile;
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import codechicken.lib.packet.PacketCustom;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
@@ -16,38 +11,63 @@ import java.util.HashSet;
|
|||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.JsonToNBT;
|
import net.minecraft.nbt.JsonToNBT;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.DimensionManager;
|
import net.minecraftforge.common.DimensionManager;
|
||||||
|
import net.minecraftforge.permission.PermissionLevel;
|
||||||
|
import net.minecraftforge.permission.PermissionManager;
|
||||||
|
|
||||||
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class NEIServerConfig {
|
import codechicken.core.CommonUtils;
|
||||||
private static MinecraftServer server;
|
import codechicken.core.ServerUtils;
|
||||||
|
import codechicken.lib.config.ConfigFile;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.packet.PacketCustom;
|
||||||
|
|
||||||
|
public class NEIServerConfig {
|
||||||
|
|
||||||
|
private static boolean firstLoad;
|
||||||
public static Logger logger = LogManager.getLogger("NotEnoughItems");
|
public static Logger logger = LogManager.getLogger("NotEnoughItems");
|
||||||
public static File saveDir;
|
public static File saveDir;
|
||||||
public static ConfigFile serverConfig;
|
public static ConfigFile serverConfig;
|
||||||
public static Map<Integer, NBTTagCompound> dimTags = new HashMap<>();
|
public static Map<Integer, NBTTagCompound> dimTags = new HashMap<>();
|
||||||
public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
|
public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
|
||||||
public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
|
public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
|
||||||
|
private static boolean doesPermAPIExist = false;
|
||||||
|
|
||||||
|
public static void resetFirstLoad() {
|
||||||
|
firstLoad = true;
|
||||||
|
}
|
||||||
|
|
||||||
public static void load(World world) {
|
public static void load(World world) {
|
||||||
if (MinecraftServer.getServer() != server) {
|
if (firstLoad) {
|
||||||
|
firstLoad = false;
|
||||||
logger.debug("Loading NEI Server");
|
logger.debug("Loading NEI Server");
|
||||||
server = MinecraftServer.getServer();
|
|
||||||
saveDir = new File(DimensionManager.getCurrentSaveRootDirectory(), "NEI");
|
saveDir = new File(DimensionManager.getCurrentSaveRootDirectory(), "NEI");
|
||||||
|
|
||||||
dimTags.clear();
|
dimTags.clear();
|
||||||
loadConfig();
|
loadConfig();
|
||||||
loadBannedItems();
|
loadBannedItems();
|
||||||
|
|
||||||
|
try {
|
||||||
|
Class.forName("net.minecraftforge.permission.PermissionManager");
|
||||||
|
doesPermAPIExist = true;
|
||||||
|
|
||||||
|
NEIActions.baseActions().forEach(
|
||||||
|
action -> {
|
||||||
|
PermissionManager.registerPermission("nei.permissions." + action, PermissionLevel.OP);
|
||||||
|
});
|
||||||
|
} catch (ClassNotFoundException ignored) {}
|
||||||
}
|
}
|
||||||
loadWorld(world);
|
loadWorld(world);
|
||||||
}
|
}
|
||||||
@@ -73,8 +93,7 @@ public class NEIServerConfig {
|
|||||||
|
|
||||||
serverConfig.setNewLineMode(1);
|
serverConfig.setNewLineMode(1);
|
||||||
serverConfig.getTag("permissions").useBraces();
|
serverConfig.getTag("permissions").useBraces();
|
||||||
serverConfig
|
serverConfig.getTag("permissions")
|
||||||
.getTag("permissions")
|
|
||||||
.setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
|
.setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
|
||||||
|
|
||||||
setDefaultFeature("time");
|
setDefaultFeature("time");
|
||||||
@@ -89,11 +108,12 @@ public class NEIServerConfig {
|
|||||||
setDefaultFeature("save-state");
|
setDefaultFeature("save-state");
|
||||||
setDefaultFeature("item");
|
setDefaultFeature("item");
|
||||||
setDefaultFeature("delete");
|
setDefaultFeature("delete");
|
||||||
|
setDefaultFeature("autocraft", "ALL");
|
||||||
setDefaultFeature("notify-item", "CONSOLE, OP");
|
setDefaultFeature("notify-item", "CONSOLE, OP");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void setDefaultFeature(String featurename, String... names) {
|
private static void setDefaultFeature(String featurename, String... names) {
|
||||||
if (names.length == 0) names = new String[] {"OP"};
|
if (names.length == 0) names = new String[] { "OP" };
|
||||||
|
|
||||||
StringBuilder list = new StringBuilder();
|
StringBuilder list = new StringBuilder();
|
||||||
for (int i = 0; i < names.length; i++) {
|
for (int i = 0; i < names.length; i++) {
|
||||||
@@ -105,7 +125,11 @@ public class NEIServerConfig {
|
|||||||
|
|
||||||
private static void saveWorld(int dim) {
|
private static void saveWorld(int dim) {
|
||||||
try {
|
try {
|
||||||
File file = new File(getSaveDir(DimensionManager.getWorld(dim)), "world.dat");
|
final File saveDir = getSaveDir(DimensionManager.getWorld(dim));
|
||||||
|
if (!saveDir.isDirectory()) {
|
||||||
|
FileUtils.forceMkdir(saveDir);
|
||||||
|
}
|
||||||
|
File file = new File(saveDir, "world.dat");
|
||||||
NEIServerUtils.writeNBT(dimTags.get(dim), file);
|
NEIServerUtils.writeNBT(dimTags.get(dim), file);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
@@ -113,7 +137,12 @@ public class NEIServerConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean canPlayerPerformAction(String playername, String name) {
|
public static boolean canPlayerPerformAction(String playername, String name) {
|
||||||
return isPlayerInList(playername, getPlayerList("permissions." + NEIActions.base(name)), true);
|
String node = "permissions." + NEIActions.base(name);
|
||||||
|
boolean hasPerm = doesPermAPIExist
|
||||||
|
? PermissionManager.checkPermission(ServerUtils.getPlayer(playername), "nei." + node)
|
||||||
|
: false;
|
||||||
|
|
||||||
|
return hasPerm || isPlayerInList(playername, getPlayerList(node), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isPlayerInList(String playername, Set<String> list, boolean allowCards) {
|
public static boolean isPlayerInList(String playername, Set<String> list, boolean allowCards) {
|
||||||
@@ -189,7 +218,7 @@ public class NEIServerConfig {
|
|||||||
FileReader r = new FileReader(file);
|
FileReader r = new FileReader(file);
|
||||||
int line = 0;
|
int line = 0;
|
||||||
for (String s : IOUtils.readLines(r)) {
|
for (String s : IOUtils.readLines(r)) {
|
||||||
if (s.charAt(0) == '#' || s.trim().length() == 0) continue;
|
if (s.charAt(0) == '#' || s.trim().isEmpty()) continue;
|
||||||
int delim = s.lastIndexOf('=');
|
int delim = s.lastIndexOf('=');
|
||||||
if (delim < 0) {
|
if (delim < 0) {
|
||||||
logger.error("line " + line + ": Missing =");
|
logger.error("line " + line + ": Missing =");
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.core.ServerUtils;
|
|
||||||
import codechicken.lib.inventory.InventoryRange;
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import codechicken.lib.packet.PacketCustom;
|
|
||||||
import codechicken.nei.util.NBTHelper;
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
@@ -18,12 +10,15 @@ import java.util.AbstractList;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.UUID;
|
||||||
import java.util.zip.ZipException;
|
import java.util.zip.ZipException;
|
||||||
|
|
||||||
import net.minecraft.command.ICommandSender;
|
import net.minecraft.command.ICommandSender;
|
||||||
import net.minecraft.enchantment.Enchantment;
|
import net.minecraft.enchantment.Enchantment;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.event.ClickEvent;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
@@ -34,16 +29,47 @@ import net.minecraft.nbt.NBTException;
|
|||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.util.ChatComponentText;
|
||||||
import net.minecraft.util.ChatComponentTranslation;
|
import net.minecraft.util.ChatComponentTranslation;
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
import net.minecraft.util.IChatComponent;
|
import net.minecraft.util.IChatComponent;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.WorldServer;
|
|
||||||
import net.minecraft.world.WorldSettings.GameType;
|
import net.minecraft.world.WorldSettings.GameType;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
|
||||||
import org.apache.logging.log4j.Level;
|
import org.apache.logging.log4j.Level;
|
||||||
|
|
||||||
|
import codechicken.core.CommonUtils;
|
||||||
|
import codechicken.core.ServerUtils;
|
||||||
|
import codechicken.lib.inventory.InventoryRange;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
import codechicken.lib.packet.PacketCustom;
|
||||||
|
import codechicken.nei.PacketIDs.S2C;
|
||||||
|
import codechicken.nei.item.ItemFluidDisplay;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.NBTHelper;
|
||||||
|
import cpw.mods.fml.common.FMLLog;
|
||||||
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||||
|
|
||||||
public class NEIServerUtils {
|
public class NEIServerUtils {
|
||||||
|
|
||||||
|
private static class GTMetaBaseItemHolder {
|
||||||
|
|
||||||
|
private static final Class<?> gtMetaBaseItem = loadMetaBaseItem();
|
||||||
|
|
||||||
|
private static Class<?> loadMetaBaseItem() {
|
||||||
|
try {
|
||||||
|
final ClassLoader loader = NEIServerUtils.class.getClassLoader();
|
||||||
|
return ReflectionHelper
|
||||||
|
.getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isRaining(World world) {
|
public static boolean isRaining(World world) {
|
||||||
return world.getWorldInfo().isRaining();
|
return world.getWorldInfo().isRaining();
|
||||||
}
|
}
|
||||||
@@ -51,7 +77,7 @@ public class NEIServerUtils {
|
|||||||
public static void toggleRaining(World world, boolean notify) {
|
public static void toggleRaining(World world, boolean notify) {
|
||||||
boolean raining = !world.isRaining();
|
boolean raining = !world.isRaining();
|
||||||
if (!raining) // turn off
|
if (!raining) // turn off
|
||||||
((WorldServer) world).provider.resetRainAndThunder();
|
world.provider.resetRainAndThunder();
|
||||||
else world.getWorldInfo().setRaining(!isRaining(world));
|
else world.getWorldInfo().setRaining(!isRaining(world));
|
||||||
|
|
||||||
if (notify)
|
if (notify)
|
||||||
@@ -64,6 +90,48 @@ public class NEIServerUtils {
|
|||||||
player.extinguish();
|
player.extinguish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void sendChatItemLink(EntityPlayerMP sender, NBTTagCompound payload) {
|
||||||
|
if (payload == null) {
|
||||||
|
sender.addChatMessage(new ChatComponentText("Invalid bookmark payload"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final String linkType = payload.getString("linkType");
|
||||||
|
final String payloadId = UUID.randomUUID().toString().substring(0, 8);
|
||||||
|
final PacketCustom packet = new PacketCustom(NEISPH.channel, S2C.CACHE_BOOKMARK_DATA).writeString(payloadId)
|
||||||
|
.writeNBTTagCompound((NBTTagCompound) payload.copy());
|
||||||
|
|
||||||
|
for (EntityPlayer player : ServerUtils.getPlayers()) {
|
||||||
|
if (player instanceof EntityPlayerMP playerMP) {
|
||||||
|
packet.sendToPlayer(playerMP);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
final IChatComponent clickable;
|
||||||
|
|
||||||
|
if (payload.hasKey("item")) {
|
||||||
|
clickable = StackInfo.loadFromNBT(payload.getCompoundTag("item")).func_151000_E();
|
||||||
|
} else {
|
||||||
|
clickable = new ChatComponentText("[")
|
||||||
|
.appendSibling(new ChatComponentTranslation("nei.chat.item_link." + linkType + ".text"))
|
||||||
|
.appendText("]");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (clickable == null) {
|
||||||
|
throw new Exception("Invalid ItemStack NBT");
|
||||||
|
}
|
||||||
|
|
||||||
|
clickable.getChatStyle()
|
||||||
|
.setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/nei_bookmark " + payloadId));
|
||||||
|
ServerUtils.sendChatToAll(
|
||||||
|
new ChatComponentTranslation("nei.chat.item_link.text", sender.getDisplayName(), clickable));
|
||||||
|
} catch (Exception e) {
|
||||||
|
sender.addChatMessage(new ChatComponentText(e.toString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public static long getTime(World world) {
|
public static long getTime(World world) {
|
||||||
return world.getWorldInfo().getWorldTime();
|
return world.getWorldInfo().getWorldTime();
|
||||||
}
|
}
|
||||||
@@ -84,9 +152,8 @@ public class NEIServerUtils {
|
|||||||
else return player.inventory.getStackInSlot(slot);
|
else return player.inventory.getStackInSlot(slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public static void deleteAllItems(EntityPlayerMP player) {
|
public static void deleteAllItems(EntityPlayerMP player) {
|
||||||
for (Slot slot : (List<Slot>) player.openContainer.inventorySlots) slot.putStack(null);
|
for (Slot slot : player.openContainer.inventorySlots) slot.putStack(null);
|
||||||
|
|
||||||
player.sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory());
|
player.sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory());
|
||||||
}
|
}
|
||||||
@@ -114,17 +181,18 @@ public class NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void sendNotice(ICommandSender sender, IChatComponent msg, String permission) {
|
public static void sendNotice(ICommandSender sender, IChatComponent msg, String permission) {
|
||||||
ChatComponentTranslation notice =
|
ChatComponentTranslation notice = new ChatComponentTranslation(
|
||||||
new ChatComponentTranslation("chat.type.admin", sender.getCommandSenderName(), msg.createCopy());
|
"chat.type.admin",
|
||||||
|
sender.getCommandSenderName(),
|
||||||
|
msg.createCopy());
|
||||||
notice.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(true);
|
notice.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(true);
|
||||||
|
|
||||||
if (NEIServerConfig.canPlayerPerformAction("CONSOLE", permission))
|
if (NEIServerConfig.canPlayerPerformAction("CONSOLE", permission))
|
||||||
MinecraftServer.getServer().addChatMessage(notice);
|
MinecraftServer.getServer().addChatMessage(notice);
|
||||||
|
|
||||||
for (EntityPlayer p : ServerUtils.getPlayers())
|
for (EntityPlayer p : ServerUtils.getPlayers()) if (p == sender) p.addChatComponentMessage(msg);
|
||||||
if (p == sender) p.addChatComponentMessage(msg);
|
else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
|
||||||
else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
|
p.addChatComponentMessage(notice);
|
||||||
p.addChatComponentMessage(notice);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -133,8 +201,7 @@ public class NEIServerUtils {
|
|||||||
* @return whether the two items are the same in terms of damage and itemID.
|
* @return whether the two items are the same in terms of damage and itemID.
|
||||||
*/
|
*/
|
||||||
public static boolean areStacksSameType(ItemStack stack1, ItemStack stack2) {
|
public static boolean areStacksSameType(ItemStack stack1, ItemStack stack2) {
|
||||||
return stack1 != null
|
return stack1 != null && stack2 != null
|
||||||
&& stack2 != null
|
|
||||||
&& (stack1.getItem() == stack2.getItem()
|
&& (stack1.getItem() == stack2.getItem()
|
||||||
&& (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
|
&& (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
|
||||||
&& ItemStack.areItemStackTagsEqual(stack2, stack1));
|
&& ItemStack.areItemStackTagsEqual(stack2, stack1));
|
||||||
@@ -142,28 +209,28 @@ public class NEIServerUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
|
* NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
|
||||||
|
*
|
||||||
* @param stack1 The {@link ItemStack} being compared.
|
* @param stack1 The {@link ItemStack} being compared.
|
||||||
* @param stack2 The {@link ItemStack} to compare to.
|
* @param stack2 The {@link ItemStack} to compare to.
|
||||||
* @return whether the two items are the same in terms of itemID, damage and NBT.
|
* @return whether the two items are the same in terms of itemID, damage and NBT.
|
||||||
*/
|
*/
|
||||||
public static boolean areStacksSameTypeWithNBT(ItemStack stack1, ItemStack stack2) {
|
public static boolean areStacksSameTypeWithNBT(ItemStack stack1, ItemStack stack2) {
|
||||||
return stack1 != null
|
return stack1 != null && stack2 != null
|
||||||
&& stack2 != null
|
|
||||||
&& stack1.getItem() == stack2.getItem()
|
&& stack1.getItem() == stack2.getItem()
|
||||||
&& (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
|
&& (stack2.isItemStackDamageable() || stack2.getItemDamage() == stack1.getItemDamage())
|
||||||
&& NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
|
&& NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to create Beds.
|
* {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to
|
||||||
|
* create Beds.
|
||||||
*
|
*
|
||||||
* @param stack1 The {@link ItemStack} being compared.
|
* @param stack1 The {@link ItemStack} being compared.
|
||||||
* @param stack2 The {@link ItemStack} to compare to.
|
* @param stack2 The {@link ItemStack} to compare to.
|
||||||
* @return whether the two items are the same from the perspective of a crafting inventory.
|
* @return whether the two items are the same from the perspective of a crafting inventory.
|
||||||
*/
|
*/
|
||||||
public static boolean areStacksSameTypeCrafting(ItemStack stack1, ItemStack stack2) {
|
public static boolean areStacksSameTypeCrafting(ItemStack stack1, ItemStack stack2) {
|
||||||
return stack1 != null
|
return stack1 != null && stack2 != null
|
||||||
&& stack2 != null
|
|
||||||
&& stack1.getItem() == stack2.getItem()
|
&& stack1.getItem() == stack2.getItem()
|
||||||
&& (stack1.getItemDamage() == stack2.getItemDamage()
|
&& (stack1.getItemDamage() == stack2.getItemDamage()
|
||||||
|| stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
|| stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
||||||
@@ -173,19 +240,33 @@ public class NEIServerUtils {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
|
* NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
|
||||||
|
*
|
||||||
* @param stack1 The {@link ItemStack} being compared.
|
* @param stack1 The {@link ItemStack} being compared.
|
||||||
* @param stack2 The {@link ItemStack} to compare to.
|
* @param stack2 The {@link ItemStack} to compare to.
|
||||||
* @return whether the two items are the same from the perspective of a crafting inventory.
|
* @return whether the two items are the same from the perspective of a crafting inventory.
|
||||||
*/
|
*/
|
||||||
public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
|
public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
|
||||||
return stack1 != null
|
|
||||||
&& stack2 != null
|
if (NEIServerUtils.areStacksSameTypeCrafting(stack2, stack1)) {
|
||||||
&& stack1.getItem() == stack2.getItem()
|
if (NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound())) return true;
|
||||||
&& (stack1.getItemDamage() == stack2.getItemDamage()
|
if (isItemTool(stack1)
|
||||||
|| stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
&& (stack1.stackTagCompound == null || stack1.stackTagCompound.hasKey("GT.ToolStats"))
|
||||||
|| stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
&& (stack2.stackTagCompound == null || stack2.stackTagCompound.hasKey("GT.ToolStats")))
|
||||||
|| stack1.getItem().isDamageable())
|
return true;
|
||||||
&& NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
|
return stack1.getMaxStackSize() == 1 && stack2.getMaxStackSize() == 1
|
||||||
|
&& (stack1.stackTagCompound == null ^ stack2.stackTagCompound == null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GT Items don't have any NBT set for the recipe, so if either of the stacks has a NULL nbt, and the other doesn't,
|
||||||
|
* pretend they stack
|
||||||
|
*/
|
||||||
|
public static boolean isItemTool(ItemStack stack) {
|
||||||
|
return GTMetaBaseItemHolder.gtMetaBaseItem != null
|
||||||
|
&& GTMetaBaseItemHolder.gtMetaBaseItem.isInstance(stack.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -276,24 +357,22 @@ public class NEIServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void setGamemode(EntityPlayerMP player, int mode) {
|
public static void setGamemode(EntityPlayerMP player, int mode) {
|
||||||
if (mode < 0
|
if (mode < 0 || mode >= NEIActions.gameModes.length
|
||||||
|| mode >= NEIActions.gameModes.length
|
|| NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode]) && !NEIServerConfig
|
||||||
|| NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode])
|
.canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
|
||||||
&& !NEIServerConfig.canPlayerPerformAction(
|
return;
|
||||||
player.getCommandSenderName(), NEIActions.gameModes[mode])) return;
|
|
||||||
|
|
||||||
// creative+
|
// creative+
|
||||||
NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
|
NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
|
||||||
if (mode == 2
|
if (mode == 2 && !(player.openContainer instanceof ContainerCreativeInv)) // open the container immediately for
|
||||||
&& !(player.openContainer
|
// the client
|
||||||
instanceof ContainerCreativeInv)) // open the container immediately for the client
|
NEISPH.processCreativeInv(player, true);
|
||||||
NEISPH.processCreativeInv(player, true);
|
|
||||||
|
|
||||||
// change it on the server
|
// change it on the server
|
||||||
player.theItemInWorldManager.setGameType(getGameType(mode));
|
player.theItemInWorldManager.setGameType(getGameType(mode));
|
||||||
|
|
||||||
// tell the client to change it
|
// tell the client to change it
|
||||||
new PacketCustom(NEISPH.channel, 14).writeByte(mode).sendToPlayer(player);
|
new PacketCustom(NEISPH.channel, S2C.SEND_GAME_MODE).writeByte(mode).sendToPlayer(player);
|
||||||
player.addChatMessage(new ChatComponentTranslation("nei.chat.gamemode." + mode));
|
player.addChatMessage(new ChatComponentTranslation("nei.chat.gamemode." + mode));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -331,11 +410,10 @@ public class NEIServerUtils {
|
|||||||
ArrayList<int[]> arraylist = new ArrayList<>();
|
ArrayList<int[]> arraylist = new ArrayList<>();
|
||||||
if (itemstack != null) {
|
if (itemstack != null) {
|
||||||
NBTTagList nbttaglist = itemstack.getEnchantmentTagList();
|
NBTTagList nbttaglist = itemstack.getEnchantmentTagList();
|
||||||
if (nbttaglist != null)
|
if (nbttaglist != null) for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
||||||
for (int i = 0; i < nbttaglist.tagCount(); i++) {
|
NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
|
||||||
NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
|
arraylist.add(new int[] { tag.getShort("id"), tag.getShort("lvl") });
|
||||||
arraylist.add(new int[] {tag.getShort("id"), tag.getShort("lvl")});
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return arraylist;
|
return arraylist;
|
||||||
}
|
}
|
||||||
@@ -366,17 +444,54 @@ public class NEIServerUtils {
|
|||||||
throw new RuntimeException(msg);
|
throw new RuntimeException(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public static ItemStack[] extractRecipeItems(Object obj) {
|
public static ItemStack[] extractRecipeItems(Object obj) {
|
||||||
if (obj instanceof ItemStack) return new ItemStack[] {(ItemStack) obj};
|
|
||||||
if (obj instanceof ItemStack[]) return (ItemStack[]) obj;
|
|
||||||
if (obj instanceof List) return ((List<ItemStack>) obj).toArray(new ItemStack[0]);
|
|
||||||
|
|
||||||
throw new ClassCastException(obj + " not an ItemStack, ItemStack[] or List<ItemStack?");
|
if (obj instanceof ItemStack item) {
|
||||||
|
return new ItemStack[] { item };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (obj instanceof ItemStack[]arr) {
|
||||||
|
return arr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (obj instanceof FluidStack fluid) {
|
||||||
|
return new ItemStack[] { ItemFluidDisplay.createStack(fluid) };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (obj instanceof FluidStack[]arr) {
|
||||||
|
final ItemStack[] items = new ItemStack[arr.length];
|
||||||
|
|
||||||
|
for (int i = 0; i < items.length; i++) {
|
||||||
|
items[i] = ItemFluidDisplay.createStack(arr[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (obj instanceof List list) {
|
||||||
|
final ItemStack[] items = new ItemStack[list.size()];
|
||||||
|
|
||||||
|
for (int i = 0; i < items.length; i++) {
|
||||||
|
items[i] = extractRecipeItem(list.get(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ClassCastException(
|
||||||
|
obj + " not an ItemStack, ItemStack[], FluidStack, FluidStack[] or a List of them");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ItemStack extractRecipeItem(Object obj) {
|
||||||
|
if (obj == null) return null;
|
||||||
|
if (obj instanceof ItemStack item) return item;
|
||||||
|
if (obj instanceof FluidStack fluid) return ItemFluidDisplay.createStack(fluid);
|
||||||
|
throw new ClassCastException(obj + " not an ItemStack or FluidStack");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<Integer> getRange(final int start, final int end) {
|
public static List<Integer> getRange(final int start, final int end) {
|
||||||
return new AbstractList<Integer>() {
|
return new AbstractList<>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Integer get(int index) {
|
public Integer get(int index) {
|
||||||
return start + index;
|
return start + index;
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.nei.api.IStackPositioner;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
import codechicken.nei.api.IStackPositioner;
|
||||||
|
|
||||||
public class OffsetPositioner implements IStackPositioner {
|
public class OffsetPositioner implements IStackPositioner {
|
||||||
|
|
||||||
public OffsetPositioner(int x, int y) {
|
public OffsetPositioner(int x, int y) {
|
||||||
offsetx = x;
|
offsetx = x;
|
||||||
offsety = y;
|
offsety = y;
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
public final class PacketIDs {
|
||||||
|
|
||||||
|
public static final class C2S {
|
||||||
|
|
||||||
|
public static final int GIVE_ITEM = 1;
|
||||||
|
public static final int DELETE_ALL_ITEMS = 4;
|
||||||
|
public static final int SET_SLOT = 5;
|
||||||
|
public static final int TOGGLE_MAGNET = 6;
|
||||||
|
public static final int SET_TIME = 7;
|
||||||
|
public static final int HEAL = 8;
|
||||||
|
public static final int TOGGLE_RAIN = 9;
|
||||||
|
public static final int REQUEST_LOGIN_INFO = 10;
|
||||||
|
public static final int REQUEST_CONTAINER_CONTENTS = 11;
|
||||||
|
public static final int CHANGE_PROPERTY = 12;
|
||||||
|
public static final int SET_GAME_MODE = 13;
|
||||||
|
public static final int CYCLE_CREATIVE_INV = 14;
|
||||||
|
public static final int SEND_MOB_SPAWNER_ID = 15;
|
||||||
|
public static final int REQUEST_CONTAINER = 16;
|
||||||
|
public static final int REQUEST_ENCHANTMENT_GUI = 21;
|
||||||
|
public static final int MODIFY_ENCHANTMENT = 22;
|
||||||
|
public static final int SET_CREATIVE_PLUS_MODE = 23;
|
||||||
|
public static final int REQUEST_POTION_GUI = 24;
|
||||||
|
public static final int SET_DUMMY_SLOT = 25;
|
||||||
|
public static final int SEND_CHAT_ITEM_LINK = 26;
|
||||||
|
public static final int SYNC = 27;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final class S2C {
|
||||||
|
|
||||||
|
public static final int SEND_SERVER_SIDE_CHECK = 1;
|
||||||
|
public static final int SEND_LOGIN_STATE = 10;
|
||||||
|
public static final int SEND_ACTION_DISABLED = 11;
|
||||||
|
public static final int SEND_ACTION_ENABLED = 12;
|
||||||
|
public static final int SEND_MAGNETIC_ITEM = 13;
|
||||||
|
public static final int SEND_GAME_MODE = 14;
|
||||||
|
public static final int OPEN_ENCHANTMENT_GUI = 21;
|
||||||
|
public static final int SET_CREATIVE_PLUS_MODE = 23;
|
||||||
|
public static final int OPEN_POTION_GUI = 24;
|
||||||
|
public static final int CACHE_BOOKMARK_DATA = 25;
|
||||||
|
public static final int SYNC = 26;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,18 +1,23 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
import java.awt.Point;
|
||||||
import codechicken.nei.ItemPanel.ItemPanelSlot;
|
|
||||||
import codechicken.nei.api.GuiInfo;
|
|
||||||
import codechicken.nei.api.INEIGuiHandler;
|
|
||||||
import codechicken.nei.guihook.GuiContainerManager;
|
|
||||||
import codechicken.nei.recipe.GuiCraftingRecipe;
|
|
||||||
import codechicken.nei.recipe.GuiRecipe;
|
|
||||||
import codechicken.nei.recipe.GuiUsageRecipe;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public abstract class PanelWidget extends Widget {
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.lib.vec.Rectangle4i;
|
||||||
|
import codechicken.nei.ItemsGrid.ItemsGridSlot;
|
||||||
|
import codechicken.nei.api.GuiInfo;
|
||||||
|
import codechicken.nei.api.INEIGuiHandler;
|
||||||
|
import codechicken.nei.api.ShortcutInputHandler;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.recipe.GuiRecipe;
|
||||||
|
|
||||||
|
public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
|
||||||
|
extends Widget {
|
||||||
|
|
||||||
protected static final int PADDING = 2;
|
protected static final int PADDING = 2;
|
||||||
|
|
||||||
public ItemStack draggedStack;
|
public ItemStack draggedStack;
|
||||||
@@ -22,95 +27,80 @@ public abstract class PanelWidget extends Widget {
|
|||||||
public Button pageNext;
|
public Button pageNext;
|
||||||
public Label pageLabel;
|
public Label pageLabel;
|
||||||
|
|
||||||
protected ItemsGrid grid;
|
protected T grid;
|
||||||
|
|
||||||
public ArrayList<ItemStack> getItems() {
|
public ArrayList<ItemStack> getItems() {
|
||||||
return grid.getItems();
|
return this.grid.getItems();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemsGrid getGrid() {
|
public T getGrid() {
|
||||||
return grid;
|
return this.grid;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void init() {
|
public void init() {
|
||||||
pageLabel = new Label("0/0", true);
|
pageLabel = new Label("0/0", true);
|
||||||
|
|
||||||
pagePrev = new Button("Prev") {
|
pagePrev = new Button("<") {
|
||||||
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (!rightclick) {
|
|
||||||
|
if (rightclick) {
|
||||||
|
grid.setPage(0);
|
||||||
|
} else {
|
||||||
grid.shiftPage(-1);
|
grid.shiftPage(-1);
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRenderLabel() {
|
public void draw(int mousex, int mousey) {
|
||||||
return "<";
|
this.state = grid.getNumPages() <= 1 ? 2 : 0;
|
||||||
|
super.draw(mousex, mousey);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
pageNext = new Button("Next") {
|
pageNext = new Button(">") {
|
||||||
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
public boolean onButtonPress(boolean rightclick) {
|
||||||
if (!rightclick) {
|
|
||||||
|
if (rightclick) {
|
||||||
|
grid.setPage(grid.getNumPages() - 1);
|
||||||
|
} else {
|
||||||
grid.shiftPage(1);
|
grid.shiftPage(1);
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getRenderLabel() {
|
public void draw(int mousex, int mousey) {
|
||||||
return ">";
|
this.state = grid.getNumPages() <= 1 ? 2 : 0;
|
||||||
|
super.draw(mousex, mousey);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract String getLabelText();
|
public abstract String getLabelText();
|
||||||
|
|
||||||
protected abstract String getPositioningSettingName();
|
public abstract Rectangle4i calculateBounds(GuiContainer gui);
|
||||||
|
|
||||||
public abstract int getMarginLeft(GuiContainer gui);
|
protected static int snapDownToMultiple(int value, int multiple) {
|
||||||
|
return (value / multiple) * multiple;
|
||||||
public abstract int getMarginTop(GuiContainer gui);
|
}
|
||||||
|
|
||||||
public abstract int getWidth(GuiContainer gui);
|
|
||||||
|
|
||||||
public abstract int getHeight(GuiContainer gui);
|
|
||||||
|
|
||||||
public void resize(GuiContainer gui) {
|
public void resize(GuiContainer gui) {
|
||||||
final Rectangle4i margin =
|
final Rectangle4i bounds = calculateBounds(gui);
|
||||||
new Rectangle4i(getMarginLeft(gui), getMarginTop(gui), getWidth(gui), getHeight(gui));
|
|
||||||
|
|
||||||
final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
|
x = bounds.x;
|
||||||
final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
|
y = bounds.y;
|
||||||
|
w = bounds.w;
|
||||||
final String settingName = getPositioningSettingName();
|
h = bounds.h;
|
||||||
int paddingLeft = (int) Math.ceil(
|
|
||||||
margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
|
|
||||||
int paddingTop = (int) Math.ceil(
|
|
||||||
margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
|
|
||||||
int paddingRight = (int) Math.ceil(
|
|
||||||
margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
|
|
||||||
int paddingBottom = (int) Math.ceil(
|
|
||||||
margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
|
|
||||||
|
|
||||||
int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - minHeight) / 2;
|
|
||||||
|
|
||||||
paddingLeft = Math.min(paddingLeft, Math.max(0, margin.w - paddingRight - minWidth));
|
|
||||||
paddingRight = Math.min(paddingRight, Math.max(0, margin.w - paddingLeft - minWidth));
|
|
||||||
paddingTop = Math.min(margin.h - minHeight, Math.max(0, paddingTop + deltaHeight));
|
|
||||||
paddingBottom = Math.min(margin.h - paddingTop - minHeight, Math.max(0, paddingBottom - deltaHeight));
|
|
||||||
|
|
||||||
x = margin.x + paddingLeft;
|
|
||||||
y = margin.y + paddingTop;
|
|
||||||
w = margin.w - paddingLeft - paddingRight;
|
|
||||||
h = margin.h - paddingTop - paddingBottom;
|
|
||||||
|
|
||||||
final int header = resizeHeader(gui);
|
final int header = resizeHeader(gui);
|
||||||
final int footer = resizeFooter(gui);
|
final int footer = resizeFooter(gui);
|
||||||
|
|
||||||
grid.setGridSize(x, y + header, w, h - header - footer);
|
this.grid.setGridSize(x, y + header, w, h - header - footer);
|
||||||
grid.refresh(gui);
|
this.grid.refresh(gui);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected int resizeHeader(GuiContainer gui) {
|
protected int resizeHeader(GuiContainer gui) {
|
||||||
@@ -118,20 +108,19 @@ public abstract class PanelWidget extends Widget {
|
|||||||
int paddingLeft = 0;
|
int paddingLeft = 0;
|
||||||
int paddingRight = 0;
|
int paddingRight = 0;
|
||||||
|
|
||||||
while (paddingLeft < w
|
while (paddingLeft < w && GuiInfo.hideItemPanelSlot(
|
||||||
&& GuiInfo.hideItemPanelSlot(
|
gui,
|
||||||
gui, new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
|
new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
|
||||||
paddingLeft += ItemsGrid.SLOT_SIZE;
|
paddingLeft += ItemsGrid.SLOT_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (paddingRight < w
|
while (paddingRight < w && GuiInfo.hideItemPanelSlot(
|
||||||
&& GuiInfo.hideItemPanelSlot(
|
gui,
|
||||||
gui,
|
new Rectangle4i(
|
||||||
new Rectangle4i(
|
x + w - paddingRight - ItemsGrid.SLOT_SIZE,
|
||||||
x + w - paddingRight - ItemsGrid.SLOT_SIZE,
|
y,
|
||||||
y,
|
ItemsGrid.SLOT_SIZE,
|
||||||
ItemsGrid.SLOT_SIZE,
|
ItemsGrid.SLOT_SIZE))) {
|
||||||
ItemsGrid.SLOT_SIZE))) {
|
|
||||||
paddingRight += ItemsGrid.SLOT_SIZE;
|
paddingRight += ItemsGrid.SLOT_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,16 +145,21 @@ public abstract class PanelWidget extends Widget {
|
|||||||
protected abstract int resizeFooter(GuiContainer gui);
|
protected abstract int resizeFooter(GuiContainer gui);
|
||||||
|
|
||||||
public void setVisible() {
|
public void setVisible() {
|
||||||
if (grid.getPerPage() > 0) {
|
if (this.grid.getPerPage() > 0 && !this.grid.isEmpty()) {
|
||||||
LayoutManager.addWidget(pagePrev);
|
LayoutManager.addWidget(pagePrev);
|
||||||
LayoutManager.addWidget(pageNext);
|
LayoutManager.addWidget(pageNext);
|
||||||
LayoutManager.addWidget(pageLabel);
|
LayoutManager.addWidget(pageLabel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update() {
|
||||||
|
this.grid.update();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(int mousex, int mousey) {
|
public void draw(int mousex, int mousey) {
|
||||||
grid.draw(mousex, mousey);
|
this.grid.draw(mousex, mousey);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -179,55 +173,33 @@ public abstract class PanelWidget extends Widget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
|
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
|
||||||
if (mouseDownSlot >= 0
|
if (this.grid.getSlotBySlotIndex(mouseDownSlot) == null) {
|
||||||
&& draggedStack == null
|
mouseDownSlot = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mouseDownSlot >= 0 && draggedStack == null
|
||||||
&& NEIClientUtils.getHeldItem() == null
|
&& NEIClientUtils.getHeldItem() == null
|
||||||
&& NEIClientConfig.hasSMPCounterPart()
|
&& NEIClientConfig.hasSMPCounterPart()) {
|
||||||
&& !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
|
ItemsGridSlot mouseOverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
|
|
||||||
|
|
||||||
if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
|
if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
|
||||||
draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
|
draggedStack = getDraggedStackWithQuantity(this.grid.getSlotBySlotIndex(mouseDownSlot).getItemStack());
|
||||||
mouseDownSlot = -1;
|
mouseDownSlot = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract ItemStack getDraggedStackWithQuantity(int mouseDownSlot);
|
protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleClick(int mousex, int mousey, int button) {
|
public boolean handleClick(int mousex, int mousey, int button) {
|
||||||
|
|
||||||
if (handleClickExt(mousex, mousey, button)) return true;
|
if (handleClickExt(mousex, mousey, button)) return true;
|
||||||
|
|
||||||
if (NEIClientUtils.getHeldItem() != null) {
|
ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
if (!grid.contains(mousex, mousey)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")) {
|
|
||||||
if (button == 1) {
|
|
||||||
NEIClientUtils.decreaseSlotStack(-999);
|
|
||||||
} else {
|
|
||||||
NEIClientUtils.deleteHeldItem();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
NEIClientUtils.dropHeldItem();
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
|
|
||||||
if (hoverSlot != null) {
|
if (hoverSlot != null) {
|
||||||
|
|
||||||
if (button == 2) {
|
if (button == 2) {
|
||||||
|
draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
|
||||||
if (hoverSlot.item != null) {
|
|
||||||
draggedStack = getDraggedStackWithQuantity(hoverSlot.slotIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
mouseDownSlot = hoverSlot.slotIndex;
|
mouseDownSlot = hoverSlot.slotIndex;
|
||||||
}
|
}
|
||||||
@@ -240,6 +212,13 @@ public abstract class PanelWidget extends Widget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleClickExt(int mouseX, int mouseY, int button) {
|
public boolean handleClickExt(int mouseX, int mouseY, int button) {
|
||||||
|
|
||||||
|
if (ItemPanels.itemPanel.draggedStack != null && ItemPanels.bookmarkPanel.contains(mouseX, mouseY)) {
|
||||||
|
ItemPanels.bookmarkPanel.addItem(ItemPanels.itemPanel.draggedStack);
|
||||||
|
ItemPanels.itemPanel.draggedStack = null;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if (ItemPanels.itemPanel.draggedStack != null) {
|
if (ItemPanels.itemPanel.draggedStack != null) {
|
||||||
return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
|
return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
|
||||||
}
|
}
|
||||||
@@ -271,8 +250,7 @@ public abstract class PanelWidget extends Widget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final GuiContainer gui = NEIClientUtils.getGuiContainer();
|
final GuiContainer gui = NEIClientUtils.getGuiContainer();
|
||||||
if (mouseX < gui.guiLeft
|
if (mouseX < gui.guiLeft || mouseY < gui.guiTop
|
||||||
|| mouseY < gui.guiTop
|
|
||||||
|| mouseX >= gui.guiLeft + gui.xSize
|
|| mouseX >= gui.guiLeft + gui.xSize
|
||||||
|| mouseY >= gui.guiTop + gui.ySize) {
|
|| mouseY >= gui.guiTop + gui.ySize) {
|
||||||
draggedStack = null;
|
draggedStack = null;
|
||||||
@@ -289,9 +267,6 @@ public abstract class PanelWidget extends Widget {
|
|||||||
GuiInfo.readLock.lock();
|
GuiInfo.readLock.lock();
|
||||||
for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
|
for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
|
||||||
if (handler.handleDragNDrop(gui, mouseX, mouseY, draggedStack, button)) {
|
if (handler.handleDragNDrop(gui, mouseX, mouseY, draggedStack, button)) {
|
||||||
|
|
||||||
NEIClientConfig.logger.info(handler);
|
|
||||||
|
|
||||||
handled = true;
|
handled = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -305,24 +280,17 @@ public abstract class PanelWidget extends Widget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void mouseUp(int mousex, int mousey, int button) {
|
public void mouseUp(int mousex, int mousey, int button) {
|
||||||
ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
|
final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
|
|
||||||
if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
|
if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
|
||||||
ItemStack item = hoverSlot.item;
|
|
||||||
|
|
||||||
if (NEIController.manager.window instanceof GuiRecipe || !NEIClientConfig.canCheatItem(item)) {
|
if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
|
||||||
|
|| !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
|
||||||
if (button == 0) {
|
ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack());
|
||||||
GuiCraftingRecipe.openRecipeGui("item", item);
|
} else {
|
||||||
} else if (button == 1) {
|
NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
|
||||||
GuiUsageRecipe.openRecipeGui("item", item);
|
|
||||||
}
|
|
||||||
|
|
||||||
mouseDownSlot = -1;
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.slotIndex), button, -1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mouseDownSlot = -1;
|
mouseDownSlot = -1;
|
||||||
@@ -332,20 +300,22 @@ public abstract class PanelWidget extends Widget {
|
|||||||
public boolean onMouseWheel(int i, int mousex, int mousey) {
|
public boolean onMouseWheel(int i, int mousex, int mousey) {
|
||||||
if (!contains(mousex, mousey)) return false;
|
if (!contains(mousex, mousey)) return false;
|
||||||
|
|
||||||
grid.shiftPage(-i);
|
this.grid.shiftPage(-i);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean handleKeyPress(int keyID, char keyChar) {
|
public boolean handleKeyPress(int keyID, char keyChar) {
|
||||||
|
final Point mouse = GuiDraw.getMousePosition();
|
||||||
|
if (!contains(mouse.x, mouse.y)) return false;
|
||||||
|
|
||||||
if (NEIClientConfig.isKeyHashDown("gui.next")) {
|
if (KeyManager.isKeyDown("gui.next")) {
|
||||||
grid.shiftPage(1);
|
this.grid.shiftPage(1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NEIClientConfig.isKeyHashDown("gui.prev")) {
|
if (KeyManager.isKeyDown("gui.prev")) {
|
||||||
grid.shiftPage(-1);
|
this.grid.shiftPage(-1);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -354,24 +324,28 @@ public abstract class PanelWidget extends Widget {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
public ItemStack getStackMouseOver(int mousex, int mousey) {
|
||||||
ItemPanelSlot slot = getSlotMouseOver(mousex, mousey);
|
final ItemsGridSlot slot = this.grid.getSlotMouseOver(mousex, mousey);
|
||||||
return slot == null ? null : slot.item;
|
return slot == null ? null : slot.getItemStack();
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
|
public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
|
||||||
return grid.getSlotMouseOver(mousex, mousey);
|
final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
|
||||||
|
return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract ItemsGridSlot getSlotMouseOver(int mousex, int mousey);
|
||||||
|
|
||||||
public int getPage() {
|
public int getPage() {
|
||||||
return grid.getPage();
|
return this.grid.getPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getNumPages() {
|
public int getNumPages() {
|
||||||
return grid.getNumPages();
|
return this.grid.getNumPages();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean contains(int px, int py) {
|
public boolean contains(int px, int py) {
|
||||||
return grid.contains(px, py);
|
return this.grid.contains(px, py);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,14 +1,17 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import codechicken.core.ServerUtils;
|
|
||||||
import codechicken.lib.inventory.InventoryUtils;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayerMP;
|
import net.minecraft.entity.player.EntityPlayerMP;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.nbt.NBTTagList;
|
import net.minecraft.nbt.NBTTagList;
|
||||||
|
|
||||||
|
import codechicken.core.ServerUtils;
|
||||||
|
import codechicken.lib.inventory.InventoryUtils;
|
||||||
|
|
||||||
public class PlayerSave {
|
public class PlayerSave {
|
||||||
|
|
||||||
public String username;
|
public String username;
|
||||||
|
|
||||||
private File saveFile;
|
private File saveFile;
|
||||||
|
|||||||
@@ -2,10 +2,12 @@ package codechicken.nei;
|
|||||||
|
|
||||||
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
import static codechicken.nei.NEIClientConfig.canPerformAction;
|
||||||
|
|
||||||
import codechicken.nei.guihook.IContainerInputHandler;
|
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
|
||||||
|
import codechicken.nei.guihook.IContainerInputHandler;
|
||||||
|
|
||||||
public class PopupInputHandler implements IContainerInputHandler {
|
public class PopupInputHandler implements IContainerInputHandler {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
||||||
return false;
|
return false;
|
||||||
@@ -22,12 +24,12 @@ public class PopupInputHandler implements IContainerInputHandler {
|
|||||||
@Override
|
@Override
|
||||||
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
|
||||||
|
|
||||||
if (NEIClientConfig.isKeyHashDown("gui.enchant") && canPerformAction("enchant")) {
|
if (KeyManager.isHashDown("gui.enchant") && canPerformAction("enchant")) {
|
||||||
NEICPH.sendOpenEnchantmentWindow();
|
NEICPH.sendOpenEnchantmentWindow();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NEIClientConfig.isKeyHashDown("gui.potion") && canPerformAction("potion")) {
|
if (KeyManager.isHashDown("gui.potion") && canPerformAction("potion")) {
|
||||||
NEICPH.sendOpenPotionWindow();
|
NEICPH.sendOpenPotionWindow();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,32 +1,66 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.api.ItemInfo;
|
||||||
|
import codechicken.nei.drawable.DrawableBuilder;
|
||||||
|
import codechicken.nei.drawable.DrawableResource;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import codechicken.nei.item.FluidDrawer;
|
||||||
|
import codechicken.nei.item.FluidDrawer.FillDirection;
|
||||||
|
import codechicken.nei.recipe.Badge;
|
||||||
|
import codechicken.nei.recipe.GuiRecipe;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Simply an {@link ItemStack} with position.
|
* Simply an {@link ItemStack} with position. Mainly used in the recipe handlers.
|
||||||
* Mainly used in the recipe handlers.
|
|
||||||
*/
|
*/
|
||||||
public class PositionedStack {
|
public class PositionedStack implements Cloneable {
|
||||||
|
|
||||||
|
/** Maximum chance value representing 100% probability (1 unit = 0.01%). */
|
||||||
|
public static final int CHANCE_FULL = 10_000;
|
||||||
|
|
||||||
public int relx;
|
public int relx;
|
||||||
public int rely;
|
public int rely;
|
||||||
|
public int width = 16;
|
||||||
|
public int height = 16;
|
||||||
public ItemStack[] items;
|
public ItemStack[] items;
|
||||||
// compatibility dummy
|
// compatibility dummy
|
||||||
public ItemStack item;
|
public ItemStack item;
|
||||||
|
|
||||||
private boolean permutated = false;
|
protected int chance = CHANCE_FULL;
|
||||||
|
protected boolean permutated = false;
|
||||||
|
|
||||||
|
protected String acceptsLabel;
|
||||||
|
|
||||||
|
protected Function<ItemStack, List<String>> tooltip;
|
||||||
|
protected List<Badge> badges;
|
||||||
|
|
||||||
public PositionedStack(Object object, int x, int y, boolean genPerms) {
|
public PositionedStack(Object object, int x, int y, boolean genPerms) {
|
||||||
items = NEIServerUtils.extractRecipeItems(object);
|
items = NEIServerUtils.extractRecipeItems(object);
|
||||||
relx = x;
|
relx = x;
|
||||||
rely = y;
|
rely = y;
|
||||||
|
|
||||||
if (genPerms) generatePermutations();
|
if (genPerms) {
|
||||||
else setPermutationToRender(0);
|
generatePermutations();
|
||||||
|
} else {
|
||||||
|
setPermutationToRender(0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public PositionedStack(Object object, int x, int y) {
|
public PositionedStack(Object object, int x, int y) {
|
||||||
@@ -36,14 +70,18 @@ public class PositionedStack {
|
|||||||
public void generatePermutations() {
|
public void generatePermutations() {
|
||||||
if (permutated) return;
|
if (permutated) return;
|
||||||
|
|
||||||
ArrayList<ItemStack> stacks = new ArrayList<>();
|
List<ItemStack> stacks = new ArrayList<>();
|
||||||
for (ItemStack item : items) {
|
for (ItemStack item : items) {
|
||||||
if (item == null || item.getItem() == null) continue;
|
if (item == null || item.getItem() == null) continue;
|
||||||
|
|
||||||
if (item.getItemDamage() == Short.MAX_VALUE) {
|
if (item.getItemDamage() == Short.MAX_VALUE) {
|
||||||
List<ItemStack> permutations = ItemList.itemMap.get(item.getItem());
|
List<ItemStack> permutations = ItemList.itemMap.get(item.getItem());
|
||||||
if (!permutations.isEmpty()) {
|
if (!permutations.isEmpty()) {
|
||||||
for (ItemStack stack : permutations) stacks.add(stack.copy());
|
for (ItemStack stack : permutations) {
|
||||||
|
ItemStack toAdd = stack.copy();
|
||||||
|
toAdd.stackSize = item.stackSize;
|
||||||
|
stacks.add(toAdd);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
ItemStack base = new ItemStack(item.getItem(), item.stackSize);
|
ItemStack base = new ItemStack(item.getItem(), item.stackSize);
|
||||||
base.stackTagCompound = item.stackTagCompound;
|
base.stackTagCompound = item.stackTagCompound;
|
||||||
@@ -56,7 +94,7 @@ public class PositionedStack {
|
|||||||
}
|
}
|
||||||
items = stacks.toArray(new ItemStack[0]);
|
items = stacks.toArray(new ItemStack[0]);
|
||||||
|
|
||||||
if (items.length == 0) items = new ItemStack[] {new ItemStack(Blocks.fire)};
|
if (items.length == 0) items = new ItemStack[] { new ItemStack(Blocks.fire) };
|
||||||
|
|
||||||
permutated = true;
|
permutated = true;
|
||||||
setPermutationToRender(0);
|
setPermutationToRender(0);
|
||||||
@@ -66,16 +104,117 @@ public class PositionedStack {
|
|||||||
for (ItemStack item : items) if (item.stackSize > i) item.stackSize = i;
|
for (ItemStack item : items) if (item.stackSize > i) item.stackSize = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setAcceptsLabel(String acceptsLabel) {
|
||||||
|
this.acceptsLabel = acceptsLabel;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAcceptsLabel() {
|
||||||
|
return this.acceptsLabel;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBadges(List<Badge> badges) {
|
||||||
|
this.badges = badges;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Badge> getBadges() {
|
||||||
|
return this.badges;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTooltip(List<String> tooltip) {
|
||||||
|
this.tooltip = tooltip == null ? null : item -> tooltip;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTooltipProvider(Function<ItemStack, List<String>> provider) {
|
||||||
|
this.tooltip = provider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String> getTooltip() {
|
||||||
|
return this.tooltip == null ? null : this.tooltip.apply(this.item);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getChance() {
|
||||||
|
return this.chance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setChance(int chance) {
|
||||||
|
this.chance = chance;
|
||||||
|
}
|
||||||
|
|
||||||
public PositionedStack copy() {
|
public PositionedStack copy() {
|
||||||
return new PositionedStack(items, relx, rely);
|
try {
|
||||||
|
PositionedStack pStack = (PositionedStack) super.clone();
|
||||||
|
pStack.items = Arrays.stream(this.items).map(ItemStack::copy).toArray(ItemStack[]::new);
|
||||||
|
pStack.item = this.item == null ? null : this.item.copy();
|
||||||
|
pStack.badges = this.badges == null ? null : new ArrayList<>(this.badges);
|
||||||
|
return pStack;
|
||||||
|
} catch (CloneNotSupportedException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void draw(int mousex, int mousey) {
|
||||||
|
final int x = this.relx + (this.width - 16) / 2;
|
||||||
|
final int y = this.rely + (this.height - 16) / 2;
|
||||||
|
GuiContainerManager.drawItem(x, y, this.item);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ItemStack> getFilteredPermutations() {
|
||||||
|
return getFilteredPermutations(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ItemStack> getFilteredPermutations(ItemFilter additionalFilter) {
|
||||||
|
List<ItemStack> items = new ArrayList<>(Arrays.asList(this.items));
|
||||||
|
|
||||||
|
items = filteringPermutations(items, item -> !ItemInfo.isHidden(item));
|
||||||
|
items = filteringPermutations(items, PresetsList.getItemFilter());
|
||||||
|
items = filteringPermutations(items, GuiRecipe.getSearchItemFilter());
|
||||||
|
items = filteringPermutations(items, additionalFilter);
|
||||||
|
|
||||||
|
items.sort(Comparator.comparing(FavoriteRecipes::containsManual).reversed());
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
private List<ItemStack> filteringPermutations(List<ItemStack> items, ItemFilter filter) {
|
||||||
|
if (filter == null) return items;
|
||||||
|
final List<ItemStack> filteredItems = items.stream().filter(filter::matches).collect(Collectors.toList());
|
||||||
|
return filteredItems.isEmpty() ? items : filteredItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getPermutationIndex(ItemStack stack) {
|
||||||
|
|
||||||
|
for (int index = 0; index < this.items.length; index++) {
|
||||||
|
if (NEIServerUtils.areStacksSameType(items[index], stack)) {
|
||||||
|
return index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean setPermutationToRender(ItemStack ingredient) {
|
||||||
|
final int stackIndex = getPermutationIndex(ingredient);
|
||||||
|
|
||||||
|
if (stackIndex >= 0) {
|
||||||
|
setPermutationToRender(stackIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return stackIndex >= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setPermutationToRender(int index) {
|
public void setPermutationToRender(int index) {
|
||||||
item = items[index].copy();
|
this.item = this.items[index].copy();
|
||||||
if (item.getItem() == null) item = new ItemStack(Blocks.fire);
|
|
||||||
else if (item.getItemDamage() == OreDictionary.WILDCARD_VALUE
|
if (this.item.getItem() == null) {
|
||||||
&& item.getItem() != null
|
this.item = new ItemStack(Blocks.fire);
|
||||||
&& item.getItem().isRepairable()) item.setItemDamage(0);
|
} else if (this.item.getItemDamage() == OreDictionary.WILDCARD_VALUE && this.item.getItem().isRepairable()) {
|
||||||
|
this.item.setItemDamage(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean contains(int mx, int my) {
|
||||||
|
return mx >= this.relx - 1 && mx < this.relx + this.width + 1
|
||||||
|
&& my >= this.rely - 1
|
||||||
|
&& my < this.rely + this.height + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean contains(ItemStack ingredient) {
|
public boolean contains(ItemStack ingredient) {
|
||||||
@@ -88,7 +227,7 @@ public class PositionedStack {
|
|||||||
* NBT-friendly version of {@link #contains(ItemStack)}
|
* NBT-friendly version of {@link #contains(ItemStack)}
|
||||||
*/
|
*/
|
||||||
public boolean containsWithNBT(ItemStack ingredient) {
|
public boolean containsWithNBT(ItemStack ingredient) {
|
||||||
for (ItemStack item : items) if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(item, ingredient)) return true;
|
for (ItemStack item : items) if (StackInfo.equalItemAndNBT(item, ingredient, true)) return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -103,4 +242,143 @@ public class PositionedStack {
|
|||||||
public String toString() {
|
public String toString() {
|
||||||
return "PositionedStack(output='" + item.toString() + "')";
|
return "PositionedStack(output='" + item.toString() + "')";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class Placeholder extends PositionedStack {
|
||||||
|
|
||||||
|
public Placeholder(Object object, int x, int y, boolean genPerms) {
|
||||||
|
super(object, x, y, genPerms);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Placeholder(Object object, int x, int y) {
|
||||||
|
this(object, x, y, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int mousex, int mousey) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Tank extends PositionedStack {
|
||||||
|
|
||||||
|
/** The tank size the fill level is measured against, in mB. 0 means "always render full". */
|
||||||
|
protected int capacity = 0;
|
||||||
|
protected boolean flowingTexture = false;
|
||||||
|
protected FillDirection fillDirection = FillDirection.AUTO;
|
||||||
|
protected DrawableResource overlay;
|
||||||
|
|
||||||
|
private ItemStack cachedFluidItem;
|
||||||
|
private FluidStack cachedFluidStack;
|
||||||
|
|
||||||
|
public Tank(Object object, int x, int y, boolean genPerms) {
|
||||||
|
super(object, x, y, genPerms);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank(Object object, int x, int y) {
|
||||||
|
this(object, x, y, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank(Object object, int x, int y, int width, int height, int capacity) {
|
||||||
|
super(object, x, y, false);
|
||||||
|
this.width = width;
|
||||||
|
this.height = height;
|
||||||
|
setCapacity(capacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCapacity() {
|
||||||
|
return this.capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank setCapacity(int capacity) {
|
||||||
|
this.capacity = Math.max(capacity, 0);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasFlowingTexture() {
|
||||||
|
return this.flowingTexture;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank setFlowingTexture(boolean flowingTexture) {
|
||||||
|
this.flowingTexture = flowingTexture;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FillDirection getFillDirection() {
|
||||||
|
return this.fillDirection;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank setFillDirection(FillDirection fillDirection) {
|
||||||
|
this.fillDirection = fillDirection == null ? FillDirection.AUTO : fillDirection;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public DrawableResource getOverlay() {
|
||||||
|
return this.overlay;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank setOverlay(String resourceLocation, int u, int v, int width, int height) {
|
||||||
|
return setOverlay(new DrawableBuilder(resourceLocation, u, v, width, height).build());
|
||||||
|
}
|
||||||
|
|
||||||
|
public Tank setOverlay(DrawableResource overlay) {
|
||||||
|
this.overlay = overlay;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected FluidStack getFluidStack() {
|
||||||
|
|
||||||
|
if (this.item != this.cachedFluidItem) {
|
||||||
|
this.cachedFluidItem = this.item;
|
||||||
|
this.cachedFluidStack = StackInfo.isFluidDisplayItem(this.item) ? StackInfo.getFluid(this.item) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.cachedFluidStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getTooltip() {
|
||||||
|
final List<String> tooltip = new ArrayList<>();
|
||||||
|
final List<String> customTooltip = super.getTooltip();
|
||||||
|
final FluidStack fluidStack = getFluidStack();
|
||||||
|
|
||||||
|
if (fluidStack != null) {
|
||||||
|
tooltip.add(
|
||||||
|
EnumChatFormatting.GRAY + NEIClientUtils
|
||||||
|
.translate("recipe.fluid.tank.amount", NEIClientUtils.formatFluid(fluidStack.amount)));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (customTooltip != null) {
|
||||||
|
tooltip.addAll(customTooltip);
|
||||||
|
}
|
||||||
|
|
||||||
|
return tooltip;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void draw(int mousex, int mousey) {
|
||||||
|
final FluidStack fluidStack = getFluidStack();
|
||||||
|
|
||||||
|
if (fluidStack == null) {
|
||||||
|
super.draw(mousex, mousey);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
FluidDrawer.drawTank(
|
||||||
|
this.relx,
|
||||||
|
this.rely,
|
||||||
|
this.width,
|
||||||
|
this.height,
|
||||||
|
this.capacity,
|
||||||
|
fluidStack,
|
||||||
|
this.flowingTexture,
|
||||||
|
this.fillDirection);
|
||||||
|
|
||||||
|
if (this.overlay != null) {
|
||||||
|
GL11.glEnable(GL11.GL_BLEND);
|
||||||
|
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
GL11.glDisable(GL11.GL_LIGHTING);
|
||||||
|
this.overlay.draw(this.relx, this.rely);
|
||||||
|
GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,269 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import org.apache.commons.io.IOUtils;
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
|
import com.google.gson.JsonParser;
|
||||||
|
import com.google.gson.JsonPrimitive;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
|
||||||
|
import codechicken.core.CommonUtils;
|
||||||
|
import codechicken.nei.SubsetWidget.SubsetTag;
|
||||||
|
import codechicken.nei.api.API;
|
||||||
|
import codechicken.nei.api.IRecipeFilter;
|
||||||
|
import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
||||||
|
import codechicken.nei.recipe.IRecipeHandler;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.NBTJson;
|
||||||
|
|
||||||
|
public class PresetsList {
|
||||||
|
|
||||||
|
public enum PresetMode {
|
||||||
|
SUBSET,
|
||||||
|
HIDE,
|
||||||
|
REMOVE,
|
||||||
|
GROUP;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Preset implements ItemFilter {
|
||||||
|
|
||||||
|
public String name = "";
|
||||||
|
public boolean enabled = true;
|
||||||
|
public PresetMode mode = PresetMode.HIDE;
|
||||||
|
public Set<String> items = new HashSet<>();
|
||||||
|
|
||||||
|
public static String getIdentifier(ItemStack stack) {
|
||||||
|
return StackInfo.getItemStackGUID(stack);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean matches(ItemStack item) {
|
||||||
|
return items.contains(Preset.getIdentifier(item));
|
||||||
|
}
|
||||||
|
|
||||||
|
public Preset copy() {
|
||||||
|
Preset preset = new Preset();
|
||||||
|
|
||||||
|
preset.name = name;
|
||||||
|
preset.enabled = enabled;
|
||||||
|
preset.mode = mode;
|
||||||
|
preset.items = new HashSet<>(items);
|
||||||
|
|
||||||
|
return preset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static class PresetRecipeFilter implements IRecipeFilterProvider, IRecipeFilter {
|
||||||
|
|
||||||
|
public Set<String> cache;
|
||||||
|
|
||||||
|
public IRecipeFilter getRecipeFilter() {
|
||||||
|
|
||||||
|
if (cache == null) {
|
||||||
|
cache = PresetsList.presets.stream().filter(p -> p.enabled && p.mode == PresetMode.REMOVE)
|
||||||
|
.flatMap(p -> p.items.stream()).collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
|
||||||
|
return cache.isEmpty() ? null : this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean matches(IRecipeHandler handler, int recipeIndex) {
|
||||||
|
|
||||||
|
if (matchPositionedStack(handler.getIngredientStacks(recipeIndex), false)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final PositionedStack result = handler.getResultStack(recipeIndex);
|
||||||
|
|
||||||
|
if (result != null && matchPositionedStack(result)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<PositionedStack> others = handler.getOtherStacks(recipeIndex);
|
||||||
|
|
||||||
|
if (!others.isEmpty() && matchPositionedStack(others, true)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result == null && others.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean matchPositionedStack(List<PositionedStack> items, boolean dir) {
|
||||||
|
for (PositionedStack pStack : items) {
|
||||||
|
if (matchPositionedStack(pStack) == dir) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean matchPositionedStack(PositionedStack pStack) {
|
||||||
|
for (ItemStack stack : pStack.items) {
|
||||||
|
if (!cache.contains(Preset.getIdentifier(stack))) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
protected static class ItemPanelFilter implements ItemFilterProvider, ItemFilter {
|
||||||
|
|
||||||
|
public Set<String> cache;
|
||||||
|
|
||||||
|
public ItemFilter getFilter() {
|
||||||
|
|
||||||
|
if (cache == null) {
|
||||||
|
cache = PresetsList.presets.stream()
|
||||||
|
.filter(p -> p.enabled && (p.mode == PresetMode.HIDE || p.mode == PresetMode.REMOVE))
|
||||||
|
.flatMap(p -> p.items.stream()).collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
|
||||||
|
return cache.isEmpty() ? null : this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean matches(ItemStack stack) {
|
||||||
|
return !cache.contains(Preset.getIdentifier(stack));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final List<Preset> presets = new ArrayList<>();
|
||||||
|
protected static PresetRecipeFilter recipeFilter = new PresetRecipeFilter();
|
||||||
|
protected static ItemPanelFilter itemFilter = new ItemPanelFilter();
|
||||||
|
|
||||||
|
static {
|
||||||
|
API.addItemFilter(itemFilter);
|
||||||
|
API.addRecipeFilter(recipeFilter);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemFilter getItemFilter() {
|
||||||
|
return itemFilter.getFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void load() {
|
||||||
|
final File presetsFile = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/presets.ini");
|
||||||
|
|
||||||
|
if (!presetsFile.exists()) return;
|
||||||
|
|
||||||
|
List<String> itemStrings;
|
||||||
|
try (FileInputStream reader = new FileInputStream(presetsFile)) {
|
||||||
|
NEIClientConfig.logger.info("Loading presets from file {}", presetsFile);
|
||||||
|
itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load presets from file {}", presetsFile, e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
JsonParser parser = new JsonParser();
|
||||||
|
Preset preset = new Preset();
|
||||||
|
presets.clear();
|
||||||
|
|
||||||
|
for (String itemStr : itemStrings) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
|
||||||
|
if (itemStr.isEmpty()) {
|
||||||
|
itemStr = "; {}";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemStr.startsWith("; ")) {
|
||||||
|
JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
|
||||||
|
|
||||||
|
if (!preset.items.isEmpty()) {
|
||||||
|
// do not create empty namespaces
|
||||||
|
presets.add(preset);
|
||||||
|
preset = new Preset();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.has("name")) {
|
||||||
|
preset.name = settings.get("name").getAsString();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.has("enabled")) {
|
||||||
|
preset.enabled = settings.get("enabled").getAsBoolean();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (settings.has("mode")) {
|
||||||
|
preset.mode = PresetMode.valueOf(settings.get("mode").getAsString());
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
preset.items.add(itemStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to load presets ItemStack from json string:\n{}", itemStr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!preset.items.isEmpty()) {
|
||||||
|
presets.add(preset);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateSubsets();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void savePresets() {
|
||||||
|
final File presetsFile = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/presets.ini");
|
||||||
|
final List<String> strings = new ArrayList<>();
|
||||||
|
|
||||||
|
for (Preset preset : presets) {
|
||||||
|
JsonObject settings = new JsonObject();
|
||||||
|
|
||||||
|
settings.add("name", new JsonPrimitive(preset.name));
|
||||||
|
settings.add("enabled", new JsonPrimitive(preset.enabled));
|
||||||
|
settings.add("mode", new JsonPrimitive(preset.mode.toString()));
|
||||||
|
|
||||||
|
strings.add("; " + NBTJson.toJson(settings));
|
||||||
|
strings.addAll(preset.items);
|
||||||
|
}
|
||||||
|
|
||||||
|
try (FileOutputStream output = new FileOutputStream(presetsFile)) {
|
||||||
|
IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
|
||||||
|
} catch (IOException e) {
|
||||||
|
NEIClientConfig.logger.error("Failed to save presets list to file {}", presetsFile, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
recipeFilter.cache = null;
|
||||||
|
itemFilter.cache = null;
|
||||||
|
updateSubsets();
|
||||||
|
CollapsibleItems.saveStates();
|
||||||
|
CollapsibleItems.load();
|
||||||
|
ItemList.refreshItems.restart();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void updateSubsets() {
|
||||||
|
SubsetWidget.removeTag("Presets");
|
||||||
|
|
||||||
|
for (Preset preset : PresetsList.presets) {
|
||||||
|
if (preset.enabled && preset.mode == PresetMode.SUBSET) {
|
||||||
|
SubsetWidget.addTag(
|
||||||
|
new SubsetTag(
|
||||||
|
"Presets." + preset.name,
|
||||||
|
stack -> preset.items.contains(Preset.getIdentifier(stack))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,920 +0,0 @@
|
|||||||
package codechicken.nei;
|
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientUtils.translate;
|
|
||||||
|
|
||||||
import codechicken.core.CommonUtils;
|
|
||||||
import codechicken.core.gui.GuiScrollSlot;
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.lib.vec.Rectangle4i;
|
|
||||||
import codechicken.nei.ItemPanel.ItemPanelSlot;
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
|
||||||
import codechicken.nei.recipe.GuiRecipe;
|
|
||||||
import codechicken.nei.recipe.StackInfo;
|
|
||||||
import codechicken.nei.util.NBTJson;
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
import com.google.gson.JsonParser;
|
|
||||||
import com.google.gson.JsonPrimitive;
|
|
||||||
import com.google.gson.JsonSyntaxException;
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.ExecutionException;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import org.apache.commons.io.IOUtils;
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
|
|
||||||
public class PresetsWidget extends Widget {
|
|
||||||
|
|
||||||
public static class PresetTag implements ItemFilter {
|
|
||||||
public String filename = null;
|
|
||||||
public String displayName = "";
|
|
||||||
public boolean whitelist = true;
|
|
||||||
public HashSet<String> items;
|
|
||||||
|
|
||||||
public PresetTag(String displayName) {
|
|
||||||
this(displayName, new HashSet<>(), false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public PresetTag(String displayName, HashSet<String> items) {
|
|
||||||
this(displayName, items, true, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public PresetTag(String displayName, HashSet<String> items, boolean whitelist, String filename) {
|
|
||||||
this.displayName = displayName;
|
|
||||||
this.items = items != null ? items : new HashSet<>();
|
|
||||||
this.whitelist = whitelist;
|
|
||||||
this.filename = filename;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean matches(final ItemStack stack) {
|
|
||||||
return items.contains(StackInfo.getItemStackGUID(stack)) == whitelist;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PresetTag loadFromFile(File file) {
|
|
||||||
if (!file.isFile() || !file.exists() || file.getName().equals("selected.ini")) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
List<String> itemStrings;
|
|
||||||
try (FileInputStream input = new FileInputStream(file)) {
|
|
||||||
NEIClientConfig.logger.info("Loading presets from file {}", file);
|
|
||||||
itemStrings = IOUtils.readLines(input, "UTF-8");
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load presets from file {}", file, e);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final JsonParser parser = new JsonParser();
|
|
||||||
final JsonObject metaObject =
|
|
||||||
parser.parse(itemStrings.remove(0)).getAsJsonObject();
|
|
||||||
final String displayName = metaObject.get("displayName").getAsString();
|
|
||||||
final boolean whitelist = metaObject.get("whitelist").getAsBoolean();
|
|
||||||
final HashSet<String> items = new HashSet<>();
|
|
||||||
|
|
||||||
for (String itemStr : itemStrings) {
|
|
||||||
items.add(itemStr);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new PresetTag(displayName, items, whitelist, file.getName());
|
|
||||||
} catch (Throwable th) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load presets ItemStack from file", file);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void deleteFile() {
|
|
||||||
if (presetsDir == null || filename == null) return;
|
|
||||||
final File tagFile = new File(presetsDir, filename);
|
|
||||||
|
|
||||||
if (tagFile.exists()) {
|
|
||||||
tagFile.delete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void saveToFile() {
|
|
||||||
if (presetsDir == null) return;
|
|
||||||
|
|
||||||
if (filename == null) {
|
|
||||||
final String sanitized = displayName.replaceAll("[^_\\-.0-9a-zA-Z]", "_");
|
|
||||||
int index = 1;
|
|
||||||
|
|
||||||
filename = sanitized + ".ini";
|
|
||||||
|
|
||||||
while ((new File(presetsDir, filename)).exists() || filename.equals("selected.ini")) {
|
|
||||||
filename = sanitized + " (" + index + ").ini";
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<String> strings = new ArrayList<>();
|
|
||||||
final JsonObject row = new JsonObject();
|
|
||||||
|
|
||||||
row.add("displayName", new JsonPrimitive(displayName));
|
|
||||||
row.add("whitelist", new JsonPrimitive(whitelist));
|
|
||||||
|
|
||||||
strings.add(NBTJson.toJson(row));
|
|
||||||
|
|
||||||
try {
|
|
||||||
strings.addAll(items);
|
|
||||||
} catch (JsonSyntaxException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to stringify presets ItemStack to json string");
|
|
||||||
}
|
|
||||||
|
|
||||||
final File tagFile = new File(presetsDir, filename);
|
|
||||||
|
|
||||||
try (FileOutputStream output = new FileOutputStream(tagFile)) {
|
|
||||||
IOUtils.writeLines(strings, "\n", output, "UTF-8");
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Filed to save presets list to file {}", tagFile, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public PresetTag copy() {
|
|
||||||
return new PresetTag(displayName, (HashSet) items.clone(), whitelist, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static class SubsetListBox extends GuiScrollSlot {
|
|
||||||
protected final List<PresetTag> presets = new ArrayList<>();
|
|
||||||
protected final List<PresetTag> selected = new ArrayList<>();
|
|
||||||
protected int lastSelectedIndex = 0;
|
|
||||||
|
|
||||||
public SubsetListBox(File presetsDir) {
|
|
||||||
super(0, 0, 0, 0);
|
|
||||||
setSmoothScroll(false);
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
presets.addAll(ItemList.forkJoinPool
|
|
||||||
.submit(() -> Arrays.asList(presetsDir.listFiles()).parallelStream()
|
|
||||||
.map(f -> PresetTag.loadFromFile(f))
|
|
||||||
.filter(p -> p != null)
|
|
||||||
.collect(Collectors.toCollection(ArrayList::new)))
|
|
||||||
.get());
|
|
||||||
|
|
||||||
} catch (InterruptedException | ExecutionException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
selected.addAll(loadSelFromFile(presetsDir, presets));
|
|
||||||
sort();
|
|
||||||
}
|
|
||||||
|
|
||||||
public SubsetListBox() {
|
|
||||||
super(0, 0, 0, 0);
|
|
||||||
setSmoothScroll(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addTag(final PresetTag tag, boolean sel) {
|
|
||||||
presets.add(tag);
|
|
||||||
|
|
||||||
if (sel) {
|
|
||||||
selected.add(tag);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected List<PresetTag> getPresets() {
|
|
||||||
return presets;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected List<PresetTag> getSelected() {
|
|
||||||
return selected;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void replaceSeleted(final PresetTag tag) {
|
|
||||||
|
|
||||||
if (selected.size() == 1) {
|
|
||||||
selected.get(0).deleteFile();
|
|
||||||
presets.set(presets.indexOf(selected.get(0)), tag);
|
|
||||||
selected.set(0, tag);
|
|
||||||
} else {
|
|
||||||
presets.add(tag);
|
|
||||||
selected.add(tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
tag.saveToFile();
|
|
||||||
saveSelToFile();
|
|
||||||
sort();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void sort() {
|
|
||||||
presets.sort((o1, o2) -> o1.displayName.compareTo(o2.displayName));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clear() {
|
|
||||||
presets.clear();
|
|
||||||
selected.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getSlotHeight(int slot) {
|
|
||||||
return 18;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected int getNumSlots() {
|
|
||||||
return presets.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void slotClicked(int slot, int button, int mx, int my, int count) {
|
|
||||||
|
|
||||||
if (slot >= presets.size()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final PresetTag tag = presets.get(slot);
|
|
||||||
final int width = windowBounds().width;
|
|
||||||
|
|
||||||
final Rectangle4i direction = new Rectangle4i(0, 0, 18, 18);
|
|
||||||
final Rectangle4i delete = new Rectangle4i(width - 18, 0, 18, 18);
|
|
||||||
final Rectangle4i option = new Rectangle4i(18, 0, width - 18 - 18, 18);
|
|
||||||
|
|
||||||
if (option.contains(mx, my)) {
|
|
||||||
final boolean sel = selected.contains(tag);
|
|
||||||
|
|
||||||
if (NEIClientUtils.controlKey()) {
|
|
||||||
|
|
||||||
if (sel) {
|
|
||||||
selected.remove(tag);
|
|
||||||
} else {
|
|
||||||
selected.add(tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (NEIClientUtils.shiftKey()) {
|
|
||||||
selected.clear();
|
|
||||||
|
|
||||||
for (int i = Math.min(lastSelectedIndex, slot); i <= Math.max(lastSelectedIndex, slot); i++) {
|
|
||||||
if (!selected.contains(presets.get(i))) {
|
|
||||||
selected.add(presets.get(i));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
final int size = selected.size();
|
|
||||||
selected.clear();
|
|
||||||
|
|
||||||
if (!sel || size > 1) {
|
|
||||||
selected.add(tag);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selected.isEmpty()) {
|
|
||||||
lastSelectedIndex = 0;
|
|
||||||
} else if (!NEIClientUtils.shiftKey()) {
|
|
||||||
lastSelectedIndex = slot;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (delete.contains(mx, my)) {
|
|
||||||
presets.remove(tag);
|
|
||||||
selected.remove(tag);
|
|
||||||
tag.deleteFile();
|
|
||||||
} else if (direction.contains(mx, my)) {
|
|
||||||
tag.whitelist = !tag.whitelist;
|
|
||||||
tag.saveToFile();
|
|
||||||
}
|
|
||||||
|
|
||||||
saveSelToFile();
|
|
||||||
PresetsWidget.edit = null;
|
|
||||||
PresetsWidget.openListBox = !presets.isEmpty()
|
|
||||||
&& (NEIClientUtils.controlKey() || NEIClientUtils.shiftKey() || !option.contains(mx, my));
|
|
||||||
ItemList.updateFilter.restart();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void drawSlot(int slot, int x, int y, int mx, int my, float frame) {
|
|
||||||
if (slot >= presets.size()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int width = windowBounds().width;
|
|
||||||
final Rectangle4i direction = new Rectangle4i(x, y, 18, 18);
|
|
||||||
final Rectangle4i delete = new Rectangle4i(x + width - 18, y, 18, 18);
|
|
||||||
final Rectangle4i option = new Rectangle4i(x + 18, y, width - 18 - 18, 18);
|
|
||||||
final PresetTag tag = presets.get(slot);
|
|
||||||
|
|
||||||
final int optionState = selected.contains(tag) ? 0 : option.contains(x + mx, y + my) ? 1 : 2;
|
|
||||||
final int directionState = direction.contains(x + mx, y + my) ? 1 : 2;
|
|
||||||
final int deleteState = delete.contains(x + mx, y + my) ? 1 : 2;
|
|
||||||
|
|
||||||
final String displayName = NEIClientUtils.cropText(fontRenderer, tag.displayName, option.w - 6);
|
|
||||||
final String dirName =
|
|
||||||
tag.whitelist ? translate("presets.whitelist.label") : translate("presets.blacklist.label");
|
|
||||||
|
|
||||||
// blacklist or whitelist
|
|
||||||
LayoutManager.getLayoutStyle()
|
|
||||||
.drawSubsetTag(null, direction.x, direction.y, direction.w, direction.h, directionState, false);
|
|
||||||
GuiDraw.drawString(dirName, direction.x + 6, direction.y + 5, directionState == 2 ? 0xFFE0E0E0 : 0xFFFFA0);
|
|
||||||
|
|
||||||
// option name
|
|
||||||
LayoutManager.getLayoutStyle()
|
|
||||||
.drawSubsetTag(null, option.x, option.y, option.w, option.h, optionState, false);
|
|
||||||
GuiDraw.drawString(displayName, option.x + 3, option.y + 5, optionState == 2 ? 0xFFE0E0E0 : 0xFFFFA0);
|
|
||||||
|
|
||||||
// remove icon
|
|
||||||
LayoutManager.getLayoutStyle()
|
|
||||||
.drawSubsetTag(null, delete.x, delete.y, delete.w, delete.h, deleteState, false);
|
|
||||||
GuiDraw.drawString("✕", delete.x + 6, delete.y + 5, deleteState == 2 ? 0xFFE0E0E0 : 0x601010);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawOverlay(float frame) {}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawBackground(float frame) {
|
|
||||||
drawRect(x, y, x + width, y + height, 0xFF202020);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawScrollbar(float frame) {
|
|
||||||
if (hasScrollbar()) {
|
|
||||||
super.drawScrollbar(frame);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int scrollbarGuideAlignment() {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected List<PresetTag> loadSelFromFile(File presetsDir, List<PresetTag> presets) {
|
|
||||||
final File file = new File(presetsDir, "selected.ini");
|
|
||||||
List<PresetTag> selected = new ArrayList<>();
|
|
||||||
|
|
||||||
if (file.exists()) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
|
|
||||||
List<String> itemStrings;
|
|
||||||
try (FileInputStream input = new FileInputStream(file)) {
|
|
||||||
NEIClientConfig.logger.info("Loading presets selected from file {}", file);
|
|
||||||
itemStrings = IOUtils.readLines(input, "UTF-8");
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load presets selected from file {}", file, e);
|
|
||||||
return selected;
|
|
||||||
}
|
|
||||||
|
|
||||||
final HashMap<String, PresetTag> map = new HashMap<>();
|
|
||||||
|
|
||||||
for (PresetTag tag : presets) {
|
|
||||||
map.put(tag.filename, tag);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (String filename : itemStrings) {
|
|
||||||
if (map.containsKey(filename)) {
|
|
||||||
selected.add(map.get(filename));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Throwable th) {
|
|
||||||
NEIClientConfig.logger.error("Failed to load presets selected from file", file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return selected;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void saveSelToFile() {
|
|
||||||
|
|
||||||
final File file = new File(presetsDir, "selected.ini");
|
|
||||||
final List<String> list = new ArrayList<>();
|
|
||||||
|
|
||||||
for (final PresetTag tag : selected) {
|
|
||||||
list.add(tag.filename);
|
|
||||||
}
|
|
||||||
|
|
||||||
try (FileOutputStream output = new FileOutputStream(file)) {
|
|
||||||
IOUtils.writeLines(list, "\n", output, "UTF-8");
|
|
||||||
} catch (IOException e) {
|
|
||||||
NEIClientConfig.logger.error("Filed to save presets selected list to file {}", file, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static class MouseSelection {
|
|
||||||
public int startX = -1;
|
|
||||||
public int startY = -1;
|
|
||||||
public int startIndex = -1;
|
|
||||||
public int endIndex = -1;
|
|
||||||
public HashSet<ItemStack> items = new HashSet<>();
|
|
||||||
public boolean append = true;
|
|
||||||
|
|
||||||
public MouseSelection(int slotIndex, boolean append) {
|
|
||||||
final ItemsGrid grid = ItemPanels.itemPanel.getGrid();
|
|
||||||
final Rectangle4i rec = grid.getItemRect(slotIndex);
|
|
||||||
|
|
||||||
this.append = append;
|
|
||||||
endIndex = slotIndex;
|
|
||||||
startIndex = slotIndex;
|
|
||||||
startX = rec.x;
|
|
||||||
startY = rec.y;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static final FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
|
|
||||||
protected static SubsetListBox listbox = new SubsetListBox();
|
|
||||||
protected static File presetsDir;
|
|
||||||
|
|
||||||
protected static boolean openListBox = false;
|
|
||||||
protected static PresetTag edit;
|
|
||||||
protected long lastclicktime;
|
|
||||||
protected static MouseSelection mouseSelection;
|
|
||||||
|
|
||||||
protected static final Button dropdown = new Button() {
|
|
||||||
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
|
||||||
if (!rightclick) {
|
|
||||||
openListBox = !openListBox;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getRenderLabel() {
|
|
||||||
return "...";
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
protected static final Label selectedValue = new Label("", false) {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
final String text = NEIClientUtils.cropText(fontRenderer, this.text, w);
|
|
||||||
|
|
||||||
if (text.equals(this.text)) {
|
|
||||||
GuiDraw.drawString(text, x + w - fontRenderer.getStringWidth(text), y + (h - 8) / 2, colour);
|
|
||||||
} else {
|
|
||||||
GuiDraw.drawString(text, x, y + (h - 8) / 2, colour);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
|
|
||||||
if (contains(mx, my) && listbox.getSelected().size() <= 1) {
|
|
||||||
tooltip.add(translate("presets.label.tooltip"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return tooltip;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
protected static final TextField selectedDisplayName = new TextField("") {
|
|
||||||
|
|
||||||
public void onTextChange(String oldText) {
|
|
||||||
if (edit != null) {
|
|
||||||
edit.displayName = text();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mousex, int mousey) {
|
|
||||||
super.draw(mousex, mousey);
|
|
||||||
|
|
||||||
if (text().isEmpty()) {
|
|
||||||
GuiDraw.drawGradientRect(x - 1, y - 1, 1, h + 2, 0xFFcc3300, 0xFFcc3300); // Left
|
|
||||||
GuiDraw.drawGradientRect(x - 1, y - 1, w + 2, 1, 0xFFcc3300, 0xFFcc3300); // Top
|
|
||||||
GuiDraw.drawGradientRect(x + w, y - 1, 1, h + 2, 0xFFcc3300, 0xFFcc3300); // Left
|
|
||||||
GuiDraw.drawGradientRect(x - 1, y + h, w + 2, 1, 0xFFcc3300, 0xFFcc3300); // Bottom
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
|
|
||||||
if (contains(mx, my) && listbox.getSelected().size() <= 1) {
|
|
||||||
tooltip.add(translate("presets.textfield.tooltip.1"));
|
|
||||||
tooltip.add(translate("presets.textfield.tooltip.2"));
|
|
||||||
}
|
|
||||||
|
|
||||||
return tooltip;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
protected static final Button selectedState = new Button("B") {
|
|
||||||
|
|
||||||
public boolean onButtonPress(boolean rightclick) {
|
|
||||||
if (!rightclick && edit != null) {
|
|
||||||
edit.whitelist = !edit.whitelist;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getRenderLabel() {
|
|
||||||
return edit != null && edit.whitelist
|
|
||||||
? translate("presets.whitelist.label")
|
|
||||||
: translate("presets.blacklist.label");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addTooltips(List<String> tooltip) {
|
|
||||||
if (edit != null) {
|
|
||||||
tooltip.add(
|
|
||||||
edit.whitelist
|
|
||||||
? translate("presets.whitelist.tooltip")
|
|
||||||
: translate("presets.blacklist.tooltip"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
protected static void setEditedTag(final PresetTag tag) {
|
|
||||||
edit = tag;
|
|
||||||
openListBox = false;
|
|
||||||
selectedDisplayName.setText(tag != null ? tag.displayName : "");
|
|
||||||
ItemList.updateFilter.restart();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void addTag(final PresetTag tag) {
|
|
||||||
addTag(tag, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void addTag(final PresetTag tag, boolean sel) {
|
|
||||||
listbox.addTag(tag, sel);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean inEditMode() {
|
|
||||||
return edit != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isHidden(final ItemStack item) {
|
|
||||||
|
|
||||||
if (edit != null) {
|
|
||||||
|
|
||||||
if (mouseSelection != null && mouseSelection.items.contains(item)) {
|
|
||||||
return mouseSelection.append != edit.whitelist;
|
|
||||||
}
|
|
||||||
|
|
||||||
return !edit.matches(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!listbox.getSelected().isEmpty()) {
|
|
||||||
final List<PresetTag> selected = listbox.getSelected();
|
|
||||||
|
|
||||||
for (int idx = 0; idx < selected.size(); idx++) {
|
|
||||||
if (!selected.get(idx).matches(item)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setHidden(final ItemStack stack, final boolean append) {
|
|
||||||
if (edit == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NEIClientUtils.shiftKey()) {
|
|
||||||
final ArrayList<ItemStack> items = ItemPanels.itemPanel.getItems();
|
|
||||||
|
|
||||||
for (int i = 0; i < items.size(); i++) {
|
|
||||||
if (stack.getItem().equals(items.get(i).getItem())) {
|
|
||||||
hideItem(items.get(i), append);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if (NEIClientUtils.controlKey()) {
|
|
||||||
final String modId = getModId(stack);
|
|
||||||
|
|
||||||
if (modId == null) {
|
|
||||||
hideItem(stack, append);
|
|
||||||
} else {
|
|
||||||
final ArrayList<ItemStack> items = ItemPanels.itemPanel.getItems();
|
|
||||||
|
|
||||||
for (int i = 0; i < items.size(); i++) {
|
|
||||||
final String mod = getModId(items.get(i));
|
|
||||||
if (mod != null && mod.equals(modId)) {
|
|
||||||
hideItem(items.get(i), append);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
hideItem(stack, append);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static void hideItem(final ItemStack stack, boolean append) {
|
|
||||||
final String guid = StackInfo.getItemStackGUID(stack);
|
|
||||||
|
|
||||||
if (append) {
|
|
||||||
edit.items.add(guid);
|
|
||||||
} else {
|
|
||||||
edit.items.remove(guid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static String getModId(final ItemStack stack) {
|
|
||||||
try {
|
|
||||||
return GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId;
|
|
||||||
} catch (Exception ignored) {
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void loadPresets(final String worldPath) {
|
|
||||||
final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
|
|
||||||
presetsDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath + "/presets");
|
|
||||||
|
|
||||||
if (!dir.exists()) {
|
|
||||||
dir.mkdirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!presetsDir.exists()) {
|
|
||||||
presetsDir.mkdirs();
|
|
||||||
}
|
|
||||||
|
|
||||||
listbox = new SubsetListBox(presetsDir);
|
|
||||||
|
|
||||||
edit = null;
|
|
||||||
openListBox = false;
|
|
||||||
selectedDisplayName.setText("");
|
|
||||||
|
|
||||||
ItemList.updateFilter.restart();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void draw(int mx, int my) {
|
|
||||||
|
|
||||||
if (edit != null) {
|
|
||||||
|
|
||||||
selectedState.x = x;
|
|
||||||
selectedState.y = y;
|
|
||||||
selectedState.w = selectedState.h = h;
|
|
||||||
selectedState.draw(mx, my);
|
|
||||||
|
|
||||||
selectedDisplayName.y = y;
|
|
||||||
selectedDisplayName.h = h;
|
|
||||||
selectedDisplayName.x = selectedState.x + selectedState.w + 1;
|
|
||||||
selectedDisplayName.w = w - h * 2 - 5;
|
|
||||||
selectedDisplayName.draw(mx, my);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
final List<PresetTag> selected = listbox.getSelected();
|
|
||||||
final int size = selected.size();
|
|
||||||
|
|
||||||
selectedValue.text = size > 1
|
|
||||||
? translate("presets.label.selected", size)
|
|
||||||
: (size == 1 ? selected.get(0).displayName : "");
|
|
||||||
selectedValue.y = y;
|
|
||||||
selectedValue.h = h;
|
|
||||||
selectedValue.w = w - h - 4;
|
|
||||||
selectedValue.x = x;
|
|
||||||
|
|
||||||
selectedValue.draw(mx, my);
|
|
||||||
}
|
|
||||||
|
|
||||||
dropdown.y = y;
|
|
||||||
dropdown.w = dropdown.h = h;
|
|
||||||
dropdown.x = x + w - dropdown.w;
|
|
||||||
dropdown.state = edit != null || listbox.getNumSlots() == 0 ? 2 : 0;
|
|
||||||
dropdown.draw(mx, my);
|
|
||||||
|
|
||||||
if (openListBox) {
|
|
||||||
final int scrollbarWidth = listbox.hasScrollbar() ? listbox.scrollbarDim().width : 0;
|
|
||||||
|
|
||||||
listbox.setSize(
|
|
||||||
x,
|
|
||||||
y + h + 1,
|
|
||||||
w,
|
|
||||||
Math.min(((LayoutManager.searchField.y - h - y) / 18) * 18, listbox.contentHeight()));
|
|
||||||
|
|
||||||
listbox.setMargins(0, 0, scrollbarWidth, 0);
|
|
||||||
listbox.draw(mx, my, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean contains(int px, int py) {
|
|
||||||
return super.contains(px, py) || openListBox && listbox.contains(px, py);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleClick(int mx, int my, int button) {
|
|
||||||
|
|
||||||
if (openListBox && listbox.contains(mx, my)) {
|
|
||||||
listbox.mouseClicked(mx, my, button);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (edit != null) {
|
|
||||||
|
|
||||||
if (selectedState.contains(mx, my)) {
|
|
||||||
selectedState.handleClick(mx, my, button);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selectedDisplayName.contains(mx, my)) {
|
|
||||||
selectedDisplayName.handleClick(mx, my, button);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if (button == 0 && dropdown.contains(mx, my)) {
|
|
||||||
openListBox = !openListBox;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
openListBox = false;
|
|
||||||
|
|
||||||
if (button == 0 && selectedValue.contains(mx, my)) {
|
|
||||||
|
|
||||||
if (System.currentTimeMillis() - lastclicktime < 400) { // double click
|
|
||||||
final List<PresetTag> selected = listbox.getSelected();
|
|
||||||
final int size = selected.size();
|
|
||||||
|
|
||||||
if (size <= 1) {
|
|
||||||
setEditedTag(size == 1 ? selected.get(0).copy() : new PresetTag(""));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lastclicktime = System.currentTimeMillis();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return contains(mx, my);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleClickExt(int mx, int my, int button) {
|
|
||||||
|
|
||||||
if (edit != null && mouseSelection == null) {
|
|
||||||
ItemPanelSlot slot = ItemPanels.itemPanel.getSlotMouseOver(mx, my);
|
|
||||||
|
|
||||||
if (slot != null && button != 2) {
|
|
||||||
mouseSelection = new MouseSelection(slot.slotIndex, button == 0);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean handleKeyPress(int keyID, char keyChar) {
|
|
||||||
if (keyID == Keyboard.KEY_ESCAPE) {
|
|
||||||
openListBox = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (edit == null) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selectedDisplayName.focused()
|
|
||||||
&& (keyID == Keyboard.KEY_RETURN || keyID == Keyboard.KEY_NUMPADENTER)
|
|
||||||
&& !selectedDisplayName.text().isEmpty()) {
|
|
||||||
selectedDisplayName.handleKeyPress(keyID, keyChar);
|
|
||||||
selectedDisplayName.setFocus(false);
|
|
||||||
listbox.replaceSeleted(edit);
|
|
||||||
setEditedTag(null);
|
|
||||||
return true;
|
|
||||||
} else if (selectedDisplayName.focused()) {
|
|
||||||
return selectedDisplayName.handleKeyPress(keyID, keyChar);
|
|
||||||
} else if (keyID == Keyboard.KEY_ESCAPE && !(NEIClientUtils.mc().currentScreen instanceof GuiRecipe)) {
|
|
||||||
setEditedTag(null);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseDragged(int mx, int my, int button, long heldTime) {
|
|
||||||
|
|
||||||
if (openListBox) {
|
|
||||||
listbox.mouseDragged(mx, my, button, heldTime);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (edit != null && button != 2 && mouseSelection != null) {
|
|
||||||
final ItemPanelSlot slot = ItemPanels.itemPanel.getSlotMouseOver(mx, my);
|
|
||||||
|
|
||||||
if (slot != null && slot.slotIndex != mouseSelection.endIndex) {
|
|
||||||
final ItemsGrid grid = ItemPanels.itemPanel.getGrid();
|
|
||||||
mouseSelection.endIndex = slot.slotIndex;
|
|
||||||
mouseSelection.items.clear();
|
|
||||||
|
|
||||||
final Rectangle4i rec = grid.getItemRect(slot.slotIndex);
|
|
||||||
final Rectangle4i sel = new Rectangle4i(
|
|
||||||
Math.min(rec.x, mouseSelection.startX),
|
|
||||||
Math.min(rec.y, mouseSelection.startY),
|
|
||||||
Math.max(rec.x, mouseSelection.startX) - Math.min(rec.x, mouseSelection.startX),
|
|
||||||
Math.max(rec.y, mouseSelection.startY) - Math.min(rec.y, mouseSelection.startY));
|
|
||||||
|
|
||||||
for (int x = sel.x; x <= sel.x + sel.w; x += ItemsGrid.SLOT_SIZE) {
|
|
||||||
for (int y = sel.y; y <= sel.y + sel.h; y += ItemsGrid.SLOT_SIZE) {
|
|
||||||
ItemStack stack = ItemPanels.itemPanel.getStackMouseOver(x, y);
|
|
||||||
|
|
||||||
if (stack != null) {
|
|
||||||
mouseSelection.items.add(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void mouseUp(int mx, int my, int button) {
|
|
||||||
|
|
||||||
if (openListBox) {
|
|
||||||
listbox.mouseMovedOrUp(mx, my, button);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (edit != null && mouseSelection != null) {
|
|
||||||
ItemPanelSlot hoverSlot = ItemPanels.itemPanel.getSlotMouseOver(mx, my);
|
|
||||||
|
|
||||||
if (hoverSlot != null && hoverSlot.slotIndex == mouseSelection.startIndex) {
|
|
||||||
setHidden(hoverSlot.item, button == 0);
|
|
||||||
} else if (!mouseSelection.items.isEmpty()) {
|
|
||||||
|
|
||||||
for (ItemStack stack : mouseSelection.items) {
|
|
||||||
hideItem(stack, mouseSelection.append);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mouseSelection = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onMouseWheel(int i, int mx, int my) {
|
|
||||||
|
|
||||||
if (openListBox && listbox.hasScrollbar() && listbox.contains(mx, my)) {
|
|
||||||
listbox.scroll(-i);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onGuiClick(int mx, int my) {
|
|
||||||
|
|
||||||
if (!contains(mx, my)) {
|
|
||||||
openListBox = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
selectedDisplayName.onGuiClick(mx, my);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
|
|
||||||
|
|
||||||
if (edit != null) {
|
|
||||||
|
|
||||||
if (selectedState.contains(mx, my)) {
|
|
||||||
return selectedState.handleTooltip(mx, my, tooltip);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (selectedDisplayName.contains(mx, my)) {
|
|
||||||
return selectedDisplayName.handleTooltip(mx, my, tooltip);
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
if (selectedValue.contains(mx, my)) {
|
|
||||||
return selectedValue.handleTooltip(mx, my, tooltip);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return tooltip;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean matches(ItemStack stack) {
|
|
||||||
|
|
||||||
if (edit != null) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
final List<PresetTag> selected = listbox.getSelected();
|
|
||||||
|
|
||||||
for (int idx = 0; idx < selected.size(); idx++) {
|
|
||||||
if (!selected.get(idx).matches(stack)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import codechicken.nei.SearchField.GuiSearchField;
|
||||||
|
import codechicken.nei.api.IRecipeFilter;
|
||||||
|
import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
||||||
|
import codechicken.nei.util.TextHistory;
|
||||||
|
|
||||||
|
public abstract class RecipeSearchField extends TextField implements ItemFilterProvider, IRecipeFilterProvider {
|
||||||
|
|
||||||
|
private static final TextHistory history = new TextHistory();
|
||||||
|
|
||||||
|
public RecipeSearchField(String ident) {
|
||||||
|
super(ident);
|
||||||
|
this.field.setVisible(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void initInternalTextField() {
|
||||||
|
final GuiSearchField field = new GuiSearchField();
|
||||||
|
field.setMaxStringLength(maxSearchLength);
|
||||||
|
field.setCursorPositionZero();
|
||||||
|
field.setSkipRecipeTokens(true);
|
||||||
|
((SearchTextFormatter) field.getFormatter()).setContextToken("<>");
|
||||||
|
this.field = field;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isVisible() {
|
||||||
|
return this.field.getVisible();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVisible(boolean visible) {
|
||||||
|
this.field.setVisible(visible);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract boolean noResults();
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getTextColour() {
|
||||||
|
if (!text().isEmpty() && !noResults()) {
|
||||||
|
return focused() ? 0xFFcc3300 : 0xFF993300;
|
||||||
|
} else {
|
||||||
|
return focused() ? 0xFFE0E0E0 : 0xFF909090;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void lastKeyTyped(int keyID, char keyChar) {
|
||||||
|
|
||||||
|
if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
|
||||||
|
handleNavigateHistory(TextHistory.Direction.PREVIOUS);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
|
||||||
|
handleNavigateHistory(TextHistory.Direction.NEXT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String filterText(String s) {
|
||||||
|
return EnumChatFormatting.getTextWithoutFormattingCodes(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemFilter getFilter() {
|
||||||
|
return ((GuiSearchField) field).getFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IRecipeFilter getRecipeFilter() {
|
||||||
|
return ((GuiSearchField) field).getRecipeFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setFocus(boolean focus) {
|
||||||
|
final boolean previousFocus = field.isFocused();
|
||||||
|
|
||||||
|
if (previousFocus != focus) {
|
||||||
|
history.add(text());
|
||||||
|
}
|
||||||
|
|
||||||
|
super.setFocus(focus);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean handleNavigateHistory(TextHistory.Direction direction) {
|
||||||
|
if (focused()) {
|
||||||
|
return history.get(direction, text()).map(newText -> {
|
||||||
|
setText(newText);
|
||||||
|
return true;
|
||||||
|
}).orElse(false);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
public abstract class RestartableTask {
|
public abstract class RestartableTask {
|
||||||
|
|
||||||
public final String name;
|
public final String name;
|
||||||
private Thread thread;
|
private Thread thread;
|
||||||
private volatile boolean restart;
|
private volatile boolean restart;
|
||||||
@@ -14,14 +15,13 @@ public abstract class RestartableTask {
|
|||||||
|
|
||||||
private void start() {
|
private void start() {
|
||||||
thread = new Thread(name) {
|
thread = new Thread(name) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
do {
|
do {
|
||||||
while (stopped)
|
while (stopped) try {
|
||||||
try {
|
Thread.sleep(1);
|
||||||
Thread.sleep(1);
|
} catch (InterruptedException ignored) {}
|
||||||
} catch (InterruptedException ignored) {
|
|
||||||
}
|
|
||||||
if (!restart) execute();
|
if (!restart) execute();
|
||||||
} while (!finish());
|
} while (!finish());
|
||||||
}
|
}
|
||||||
@@ -52,7 +52,8 @@ public abstract class RestartableTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stops execution until restart is called. If a thread is running, the restart flag will be set, and the thread will be paused once the execute method exits.
|
* Stops execution until restart is called. If a thread is running, the restart flag will be set, and the thread
|
||||||
|
* will be paused once the execute method exits.
|
||||||
*/
|
*/
|
||||||
public synchronized void stop() {
|
public synchronized void stop() {
|
||||||
if (thread != null) {
|
if (thread != null) {
|
||||||
|
|||||||
@@ -1,25 +1,35 @@
|
|||||||
package codechicken.nei;
|
package codechicken.nei;
|
||||||
|
|
||||||
import static codechicken.nei.NEIClientConfig.world;
|
|
||||||
|
|
||||||
import codechicken.lib.gui.GuiDraw;
|
|
||||||
import codechicken.nei.ItemList.AnyMultiItemFilter;
|
|
||||||
import codechicken.nei.ItemList.EverythingItemFilter;
|
|
||||||
import codechicken.nei.ItemList.PatternItemFilter;
|
|
||||||
import codechicken.nei.api.API;
|
|
||||||
import codechicken.nei.api.ItemFilter;
|
|
||||||
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import java.util.regex.PatternSyntaxException;
|
import java.util.regex.PatternSyntaxException;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.EnumChatFormatting;
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
|
|
||||||
|
import codechicken.lib.gui.GuiDraw;
|
||||||
|
import codechicken.nei.ItemList.NothingItemFilter;
|
||||||
|
import codechicken.nei.SearchTokenParser.ISearchParserProvider;
|
||||||
|
import codechicken.nei.api.IRecipeFilter;
|
||||||
|
import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.api.ItemFilter.ItemFilterProvider;
|
||||||
|
import codechicken.nei.recipe.StackInfo;
|
||||||
|
import codechicken.nei.util.TextHistory;
|
||||||
|
|
||||||
public class SearchField extends TextField implements ItemFilterProvider {
|
public class SearchField extends TextField implements ItemFilterProvider {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface for returning a custom filter based on search field text
|
* Interface for returning a custom filter based on search field text
|
||||||
*/
|
*/
|
||||||
|
@Deprecated
|
||||||
public static interface ISearchProvider {
|
public static interface ISearchProvider {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return false if this filter should only be used if no other non-default filters match the search string
|
* @return false if this filter should only be used if no other non-default filters match the search string
|
||||||
*/
|
*/
|
||||||
@@ -31,32 +41,115 @@ public class SearchField extends TextField implements ItemFilterProvider {
|
|||||||
public ItemFilter getFilter(String searchText);
|
public ItemFilter getFilter(String searchText);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class DefaultSearchProvider implements ISearchProvider {
|
public static class SearchParserProvider implements ISearchParserProvider {
|
||||||
@Override
|
|
||||||
public boolean isPrimary() {
|
protected final Function<Pattern, ItemFilter> createFilter;
|
||||||
return false;
|
protected final String name;
|
||||||
|
protected final char prefix;
|
||||||
|
protected final EnumChatFormatting highlightedColor;
|
||||||
|
|
||||||
|
public SearchParserProvider(char prefix, String name, EnumChatFormatting highlightedColor,
|
||||||
|
Function<Pattern, ItemFilter> createFilter) {
|
||||||
|
this.prefix = prefix;
|
||||||
|
this.name = name;
|
||||||
|
this.highlightedColor = highlightedColor;
|
||||||
|
this.createFilter = createFilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemFilter getFilter(String searchText) {
|
public ItemFilter getFilter(String searchText) {
|
||||||
Pattern pattern = getPattern(searchText);
|
Pattern pattern = SearchField.getPattern(searchText);
|
||||||
return pattern == null ? null : new PatternItemFilter(pattern);
|
|
||||||
|
if (pattern != null) {
|
||||||
|
return this.createFilter(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new NothingItemFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected ItemFilter createFilter(Pattern pattern) {
|
||||||
|
final ItemFilter filter = this.createFilter.apply(pattern);
|
||||||
|
|
||||||
|
return filter == null ? new NothingItemFilter() : filter;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public char getPrefix() {
|
||||||
|
return this.prefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public EnumChatFormatting getHighlightedColor() {
|
||||||
|
return this.highlightedColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getName() {
|
||||||
|
return this.name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<ISearchProvider> searchProviders = new LinkedList<>();
|
public static class GuiSearchField extends FormattedTextField implements ItemFilterProvider, IRecipeFilterProvider {
|
||||||
private boolean isVisible = true;
|
|
||||||
|
|
||||||
long lastclicktime;
|
protected final SearchTokenParser searchParser;
|
||||||
|
protected boolean skipRecipeTokens = false;
|
||||||
|
|
||||||
|
public GuiSearchField() {
|
||||||
|
this(SearchField.searchParser);
|
||||||
|
}
|
||||||
|
|
||||||
|
public GuiSearchField(SearchTokenParser searchParser) {
|
||||||
|
super(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
|
||||||
|
this.searchParser = searchParser;
|
||||||
|
setFormatter(new SearchTextFormatter(searchParser));
|
||||||
|
setDisabledTextColour(0xFF303030);
|
||||||
|
setPlaceholder(NEIClientUtils.translate("inventory.search.placeholder"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSkipRecipeTokens(boolean skipRecipeTokens) {
|
||||||
|
this.skipRecipeTokens = skipRecipeTokens;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemFilter getFilter() {
|
||||||
|
return getFilter(getText());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public IRecipeFilter getRecipeFilter() {
|
||||||
|
return getRecipeFilter(getText());
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemFilter getFilter(String filterText) {
|
||||||
|
return this.searchParser.getFilter(filterText, this.skipRecipeTokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
public IRecipeFilter getRecipeFilter(String filterText) {
|
||||||
|
return this.searchParser.getRecipeFilter(filterText);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public static List<ISearchProvider> searchProviders = new LinkedList<>();
|
||||||
|
public static final SearchTokenParser searchParser = new SearchTokenParser();
|
||||||
|
private static final TextHistory history = new TextHistory();
|
||||||
|
private boolean isVisible = true;
|
||||||
|
private long lastclicktime;
|
||||||
|
|
||||||
public SearchField(String ident) {
|
public SearchField(String ident) {
|
||||||
super(ident);
|
super(ident);
|
||||||
API.addItemFilter(this);
|
}
|
||||||
API.addSearchProvider(new DefaultSearchProvider());
|
|
||||||
|
@Override
|
||||||
|
protected void initInternalTextField() {
|
||||||
|
field = new GuiSearchField();
|
||||||
|
field.setMaxStringLength(maxSearchLength);
|
||||||
|
field.setCursorPositionZero();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean searchInventories() {
|
public static boolean searchInventories() {
|
||||||
return world.nbt.getBoolean("searchinventories");
|
return NEIClientConfig.world.nbt.getBoolean("searchinventories");
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isVisible() {
|
public boolean isVisible() {
|
||||||
@@ -69,7 +162,8 @@ public class SearchField extends TextField implements ItemFilterProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTextColour() {
|
public int getTextColour() {
|
||||||
if (ItemPanels.itemPanel.getItems().isEmpty()) {
|
if (ItemPanels.itemPanel.getItems().isEmpty()
|
||||||
|
&& (!this.field.getText().isEmpty() || !NEIClientConfig.hideItemsUntilSearching())) {
|
||||||
return focused() ? 0xFFcc3300 : 0xFF993300;
|
return focused() ? 0xFFcc3300 : 0xFF993300;
|
||||||
} else {
|
} else {
|
||||||
return focused() ? 0xFFE0E0E0 : 0xFF909090;
|
return focused() ? 0xFFE0E0E0 : 0xFF909090;
|
||||||
@@ -78,14 +172,37 @@ public class SearchField extends TextField implements ItemFilterProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(int mousex, int mousey) {
|
public void draw(int mousex, int mousey) {
|
||||||
|
|
||||||
super.draw(mousex, mousey);
|
super.draw(mousex, mousey);
|
||||||
|
|
||||||
if (searchInventories()) {
|
if (searchInventories()) {
|
||||||
GuiDraw.drawGradientRect(x - 1, y - 1, 1, h + 2, 0xFFFFFF00, 0xFFC0B000); // Left
|
GuiDraw.drawGradientRect(
|
||||||
GuiDraw.drawGradientRect(x - 1, y - 1, w + 2, 1, 0xFFFFFF00, 0xFFC0B000); // Top
|
field.xPosition - 1,
|
||||||
GuiDraw.drawGradientRect(x + w, y - 1, 1, h + 2, 0xFFFFFF00, 0xFFC0B000); // Left
|
field.yPosition - 1,
|
||||||
GuiDraw.drawGradientRect(x - 1, y + h, w + 2, 1, 0xFFFFFF00, 0xFFC0B000); // Bottom
|
1,
|
||||||
|
field.height + 2,
|
||||||
|
0xFFFFFF00,
|
||||||
|
0xFFC0B000); // Left
|
||||||
|
GuiDraw.drawGradientRect(
|
||||||
|
field.xPosition - 1,
|
||||||
|
field.yPosition - 1,
|
||||||
|
field.width + 2,
|
||||||
|
1,
|
||||||
|
0xFFFFFF00,
|
||||||
|
0xFFC0B000); // Top
|
||||||
|
GuiDraw.drawGradientRect(
|
||||||
|
field.xPosition + field.width,
|
||||||
|
field.yPosition - 1,
|
||||||
|
1,
|
||||||
|
field.height + 2,
|
||||||
|
0xFFFFFF00,
|
||||||
|
0xFFC0B000); // Left
|
||||||
|
GuiDraw.drawGradientRect(
|
||||||
|
field.xPosition - 1,
|
||||||
|
field.yPosition + field.height,
|
||||||
|
field.width + 2,
|
||||||
|
1,
|
||||||
|
0xFFFFFF00,
|
||||||
|
0xFFC0B000); // Bottom
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,7 +211,6 @@ public class SearchField extends TextField implements ItemFilterProvider {
|
|||||||
if (button == 0) {
|
if (button == 0) {
|
||||||
if (focused() && (System.currentTimeMillis() - lastclicktime < 400)) { // double click
|
if (focused() && (System.currentTimeMillis() - lastclicktime < 400)) { // double click
|
||||||
NEIClientConfig.world.nbt.setBoolean("searchinventories", !searchInventories());
|
NEIClientConfig.world.nbt.setBoolean("searchinventories", !searchInventories());
|
||||||
NEIClientConfig.world.saveNBT();
|
|
||||||
}
|
}
|
||||||
lastclicktime = System.currentTimeMillis();
|
lastclicktime = System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
@@ -104,18 +220,25 @@ public class SearchField extends TextField implements ItemFilterProvider {
|
|||||||
@Override
|
@Override
|
||||||
public void onTextChange(String oldText) {
|
public void onTextChange(String oldText) {
|
||||||
final String newText = text();
|
final String newText = text();
|
||||||
if (newText.length() > 0) NEIClientConfig.logger.debug("Searching for " + text());
|
if (!newText.equals(oldText)) {
|
||||||
|
NEIClientConfig.setSearchExpression(newText);
|
||||||
NEIClientConfig.setSearchExpression(newText);
|
ItemList.updateFilter.restart();
|
||||||
ItemList.updateFilter.restart();
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void lastKeyTyped(int keyID, char keyChar) {
|
public void lastKeyTyped(int keyID, char keyChar) {
|
||||||
|
|
||||||
if (isVisible() && NEIClientConfig.isKeyHashDown("gui.search")) {
|
if (isVisible() && KeyManager.isHashDown("gui.search")) {
|
||||||
setFocus(true);
|
setFocus(true);
|
||||||
}
|
}
|
||||||
|
if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
|
||||||
|
handleNavigateHistory(TextHistory.Direction.PREVIOUS);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
|
||||||
|
handleNavigateHistory(TextHistory.Direction.NEXT);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -124,36 +247,133 @@ public class SearchField extends TextField implements ItemFilterProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Pattern getPattern(String search) {
|
public static Pattern getPattern(String search) {
|
||||||
switch (NEIClientConfig.getIntSetting("inventory.searchmode")) {
|
return getPattern(search, NEIClientConfig.getIntSetting("inventory.search.patternMode"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Pattern getPattern(String search, int patternMode) {
|
||||||
|
switch (patternMode) {
|
||||||
case 0: // plain
|
case 0: // plain
|
||||||
search = "\\Q" + search + "\\E";
|
search = Pattern.quote(search);
|
||||||
break;
|
break;
|
||||||
|
case 1: // extended
|
||||||
|
|
||||||
|
if (search.length() >= 3 && search.startsWith("r/") && search.endsWith("/")) {
|
||||||
|
search = search.substring(2, search.length() - 1);
|
||||||
|
} else {
|
||||||
|
final Matcher matcher = Pattern.compile("(\\?|\\*)").matcher(search);
|
||||||
|
final StringBuilder cleanedString = new StringBuilder();
|
||||||
|
int lastEndIndex = 0;
|
||||||
|
|
||||||
|
while (matcher.find()) {
|
||||||
|
cleanedString.append(Pattern.quote(search.substring(lastEndIndex, matcher.start())));
|
||||||
|
|
||||||
|
switch (matcher.group(0).charAt(0)) {
|
||||||
|
case '?':
|
||||||
|
cleanedString.append(".");
|
||||||
|
break;
|
||||||
|
case '*':
|
||||||
|
cleanedString.append(".+?");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastEndIndex = matcher.end();
|
||||||
|
}
|
||||||
|
|
||||||
|
search = cleanedString + Pattern.quote(search.substring(lastEndIndex, search.length()));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// regex and extended+
|
||||||
|
if (!search.isEmpty()) {
|
||||||
|
try {
|
||||||
|
return Pattern.compile(search, Pattern.MULTILINE | Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
|
||||||
|
} catch (PatternSyntaxException ignored) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getEscapedSearchText(ItemStack stack) {
|
||||||
|
final FluidStack fluidStack = StackInfo.getFluid(stack);
|
||||||
|
String displayName;
|
||||||
|
|
||||||
|
if (fluidStack != null) {
|
||||||
|
displayName = fluidStack.getLocalizedName();
|
||||||
|
} else {
|
||||||
|
displayName = stack.getDisplayName();
|
||||||
|
}
|
||||||
|
|
||||||
|
return getEscapedSearchText(displayName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getEscapedSearchText(String text) {
|
||||||
|
text = EnumChatFormatting.getTextWithoutFormattingCodes(text);
|
||||||
|
|
||||||
|
boolean addQuotes = text.contains(" ")
|
||||||
|
&& NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName");
|
||||||
|
|
||||||
|
switch (NEIClientConfig.getIntSetting("inventory.search.patternMode")) {
|
||||||
case 1:
|
case 1:
|
||||||
search = search.replace(".", "").replace("?", ".").replace("*", ".+?");
|
text = text.replaceAll("[\\?|\\*]", "\\\\$0");
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
text = text.replaceAll("[{}()\\[\\].+*?^$\\\\|]", "\\\\$0");
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
// In extended+ quotes require only quotes to be escaped
|
||||||
|
if (addQuotes) {
|
||||||
|
text = text.replaceAll("\"", "\\\\$0");
|
||||||
|
} else {
|
||||||
|
String prefixes = searchParser.getPrefixes();
|
||||||
|
text = text.replaceAll("[-<>^{}|/\\\\\"" + Pattern.quote(prefixes) + "]", "\\\\$0");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Pattern pattern = null;
|
if (addQuotes) {
|
||||||
try {
|
text = "\"" + text + "\"";
|
||||||
pattern = Pattern.compile(search);
|
|
||||||
} catch (PatternSyntaxException ignored) {
|
|
||||||
}
|
}
|
||||||
return pattern == null || pattern.toString().length() == 0 ? null : pattern;
|
|
||||||
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemFilter getFilter() {
|
public ItemFilter getFilter() {
|
||||||
String s_filter = text().toLowerCase();
|
|
||||||
|
|
||||||
List<ItemFilter> primary = new LinkedList<>();
|
if (field.getText().isEmpty() && NEIClientConfig.hideItemsUntilSearching()) {
|
||||||
List<ItemFilter> secondary = new LinkedList<>();
|
return new NothingItemFilter();
|
||||||
for (ISearchProvider p : searchProviders) {
|
|
||||||
ItemFilter filter = p.getFilter(s_filter);
|
|
||||||
if (filter != null) (p.isPrimary() ? primary : secondary).add(filter);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!primary.isEmpty()) return new AnyMultiItemFilter(primary);
|
return ((GuiSearchField) field).getFilter();
|
||||||
if (!secondary.isEmpty()) return new AnyMultiItemFilter(secondary);
|
}
|
||||||
return new EverythingItemFilter();
|
|
||||||
|
public static ItemFilter getFilter(String filterText) {
|
||||||
|
return SearchField.searchParser.getFilter(filterText);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setFocus(boolean focus) {
|
||||||
|
final boolean previousFocus = field.isFocused();
|
||||||
|
|
||||||
|
if (previousFocus != focus) {
|
||||||
|
history.add(text());
|
||||||
|
}
|
||||||
|
super.setFocus(focus);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean handleNavigateHistory(TextHistory.Direction direction) {
|
||||||
|
if (focused()) {
|
||||||
|
return history.get(direction, text()).map(newText -> {
|
||||||
|
setText(newText);
|
||||||
|
return true;
|
||||||
|
}).orElse(false);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import codechicken.nei.FormattedTextField.TextFormatter;
|
||||||
|
import codechicken.nei.search.SearchExpressionFormatVisitor;
|
||||||
|
import codechicken.nei.search.SearchExpressionUtils;
|
||||||
|
import codechicken.nei.search.SearchToken;
|
||||||
|
|
||||||
|
public class SearchTextFormatter implements TextFormatter {
|
||||||
|
|
||||||
|
protected final SearchTokenParser searchParser;
|
||||||
|
protected String contextToken = "";
|
||||||
|
|
||||||
|
public SearchTextFormatter(SearchTokenParser searchParser) {
|
||||||
|
this.searchParser = searchParser;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setContextToken(String contextToken) {
|
||||||
|
this.contextToken = contextToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String format(String text) {
|
||||||
|
final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
|
||||||
|
if (patternMode == 3) {
|
||||||
|
final int spaceModeEnabled = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
|
||||||
|
if (spaceModeEnabled == 1) {
|
||||||
|
text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
|
||||||
|
}
|
||||||
|
final SearchExpressionFormatVisitor visitor = new SearchExpressionFormatVisitor(searchParser);
|
||||||
|
return SearchExpressionUtils.visitRecipeSearchExpression(text, visitor);
|
||||||
|
} else {
|
||||||
|
final StringBuilder formattedText = new StringBuilder();
|
||||||
|
|
||||||
|
for (String[] orQuery : searchParser.splitByDelimiters(text, "|", false)) {
|
||||||
|
final String filterText = orQuery[1];
|
||||||
|
|
||||||
|
formattedText.append(SearchExpressionUtils.HIGHLIGHTS.OR + orQuery[0]);
|
||||||
|
|
||||||
|
for (String[] contextPart : searchParser.splitByDelimiters(filterText, this.contextToken, false)) {
|
||||||
|
|
||||||
|
if (!contextPart[0].isEmpty()) {
|
||||||
|
formattedText.append(
|
||||||
|
SearchExpressionUtils.HIGHLIGHTS.RECIPE + contextPart[0].substring(0, 1)
|
||||||
|
+ EnumChatFormatting.RESET);
|
||||||
|
contextPart[1] = contextPart[0].substring(1) + contextPart[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (contextPart[1].isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int startIndex = 0;
|
||||||
|
|
||||||
|
for (SearchToken token : searchParser.splitSearchText(contextPart[1])) {
|
||||||
|
formattedText.append(contextPart[1].substring(startIndex, token.start));
|
||||||
|
EnumChatFormatting tokenColor = EnumChatFormatting.RESET;
|
||||||
|
|
||||||
|
if (token.firstChar != null) {
|
||||||
|
tokenColor = searchParser.getProvider(token.firstChar).getHighlightedColor();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token.ignore != null) {
|
||||||
|
formattedText
|
||||||
|
.append(SearchExpressionUtils.HIGHLIGHTS.NEGATE + String.valueOf(token.ignore));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token.firstChar != null) {
|
||||||
|
formattedText.append(tokenColor + String.valueOf(token.firstChar));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token.quotes) {
|
||||||
|
formattedText.append(SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!token.rawText.isEmpty()) {
|
||||||
|
formattedText.append(tokenColor + token.rawText);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (token.quotes) {
|
||||||
|
formattedText.append(SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
startIndex = token.end;
|
||||||
|
}
|
||||||
|
|
||||||
|
formattedText.append(contextPart[1].substring(startIndex, contextPart[1].length()));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return formattedText.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,497 @@
|
|||||||
|
package codechicken.nei;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
import net.minecraft.client.resources.Language;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.util.EnumChatFormatting;
|
||||||
|
|
||||||
|
import codechicken.nei.ItemList.AllMultiItemFilter;
|
||||||
|
import codechicken.nei.ItemList.AnyMultiItemFilter;
|
||||||
|
import codechicken.nei.ItemList.EverythingItemFilter;
|
||||||
|
import codechicken.nei.api.IRecipeFilter;
|
||||||
|
import codechicken.nei.api.ItemFilter;
|
||||||
|
import codechicken.nei.filter.AllMultiRecipeFilter;
|
||||||
|
import codechicken.nei.filter.AnyMultiRecipeFilter;
|
||||||
|
import codechicken.nei.filter.RecipeFilter;
|
||||||
|
import codechicken.nei.filter.RecipeFilter.FilterContext;
|
||||||
|
import codechicken.nei.search.ItemFilterVisitor;
|
||||||
|
import codechicken.nei.search.RecipeFilterVisitor;
|
||||||
|
import codechicken.nei.search.SearchExpressionUtils;
|
||||||
|
import codechicken.nei.search.SearchToken;
|
||||||
|
|
||||||
|
public class SearchTokenParser {
|
||||||
|
|
||||||
|
public enum SearchMode {
|
||||||
|
|
||||||
|
ALWAYS,
|
||||||
|
PREFIX,
|
||||||
|
NEVER;
|
||||||
|
|
||||||
|
public static SearchMode fromInt(int value) {
|
||||||
|
return switch (value) {
|
||||||
|
case 0 -> ALWAYS;
|
||||||
|
case 1 -> PREFIX;
|
||||||
|
default -> NEVER;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static interface ISearchParserProvider {
|
||||||
|
|
||||||
|
public ItemFilter getFilter(String searchText);
|
||||||
|
|
||||||
|
public static List<Language> getAllLanguages() {
|
||||||
|
return new ArrayList<>(Minecraft.getMinecraft().getLanguageManager().getLanguages());
|
||||||
|
}
|
||||||
|
|
||||||
|
default List<Language> getMatchingLanguages() {
|
||||||
|
return getAllLanguages();
|
||||||
|
}
|
||||||
|
|
||||||
|
public char getPrefix();
|
||||||
|
|
||||||
|
public EnumChatFormatting getHighlightedColor();
|
||||||
|
|
||||||
|
default SearchMode getSearchMode() {
|
||||||
|
return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search." + getName() + "SearchMode"));
|
||||||
|
}
|
||||||
|
|
||||||
|
default String getName() {
|
||||||
|
return String.valueOf(getPrefix());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class ProvidersCache {
|
||||||
|
|
||||||
|
public String languageCode = null;
|
||||||
|
public List<ISearchParserProvider> providers = new ArrayList<>();
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
this.languageCode = null;
|
||||||
|
this.providers.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class IsRegisteredItemFilter implements ItemFilter {
|
||||||
|
|
||||||
|
public ItemFilter filter;
|
||||||
|
|
||||||
|
public IsRegisteredItemFilter(ItemFilter filter) {
|
||||||
|
this.filter = filter;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean matches(ItemStack item) {
|
||||||
|
return item != null && item.getItem() != null
|
||||||
|
&& item.getItem().delegate.name() != null
|
||||||
|
&& this.filter.matches(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final Pattern SPACE_PATTERN = Pattern.compile(" ");
|
||||||
|
|
||||||
|
protected final LRUCache<String, ItemFilter> filtersCache = new LRUCache<>(20);
|
||||||
|
protected final LRUCache<String, IRecipeFilter> recipesCache = new LRUCache<>(20);
|
||||||
|
protected final List<ISearchParserProvider> searchProviders;
|
||||||
|
protected final ProvidersCache providersCache = new ProvidersCache();
|
||||||
|
protected final Map<Character, Character> prefixRedefinitions = new HashMap<>();
|
||||||
|
protected String prefixes = null;
|
||||||
|
|
||||||
|
public SearchTokenParser(List<ISearchParserProvider> searchProviders) {
|
||||||
|
this.searchProviders = searchProviders;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SearchTokenParser() {
|
||||||
|
this(new ArrayList<>());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addProvider(ISearchParserProvider provider) {
|
||||||
|
this.searchProviders.add(provider);
|
||||||
|
clearCache();
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized void clearCache() {
|
||||||
|
this.providersCache.clear();
|
||||||
|
this.filtersCache.clear();
|
||||||
|
this.recipesCache.clear();
|
||||||
|
this.prefixes = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ISearchParserProvider> getProviders() {
|
||||||
|
Language currentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage();
|
||||||
|
|
||||||
|
if (!currentLanguage.getLanguageCode().equals(providersCache.languageCode)) {
|
||||||
|
final List<ISearchParserProvider> providersList = new ArrayList<>();
|
||||||
|
final Map<Character, ISearchParserProvider> providers = new HashMap<>();
|
||||||
|
|
||||||
|
for (int index = this.searchProviders.size() - 1; index >= 0; index--) {
|
||||||
|
ISearchParserProvider provider = this.searchProviders.get(index);
|
||||||
|
|
||||||
|
if (provider.getMatchingLanguages().contains(currentLanguage)) {
|
||||||
|
if (provider.getSearchMode() == SearchMode.PREFIX && !providers.containsKey(provider.getPrefix())) {
|
||||||
|
providers.put(provider.getPrefix(), provider);
|
||||||
|
} else if (provider.getSearchMode() == SearchMode.ALWAYS) {
|
||||||
|
providersList.add(provider);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
providersList.addAll(providers.values());
|
||||||
|
providersCache.languageCode = currentLanguage.getLanguageCode();
|
||||||
|
providersCache.providers = providersList;
|
||||||
|
}
|
||||||
|
|
||||||
|
return providersCache.providers;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasRedefinedPrefix(char ch) {
|
||||||
|
return getPrefixes().indexOf(ch) >= 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ISearchParserProvider getProvider(char ch) {
|
||||||
|
if (!hasRedefinedPrefix(ch)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
for (ISearchParserProvider provider : getProviders()) {
|
||||||
|
if (provider.getSearchMode() == SearchMode.PREFIX && getRedefinedPrefix(provider.getPrefix()) == ch) {
|
||||||
|
return provider;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<ItemFilter> getAlwaysProvidersFilters(String searchText) {
|
||||||
|
final List<ItemFilter> filters = new ArrayList<>();
|
||||||
|
for (ISearchParserProvider provider : getProviders()) {
|
||||||
|
if (provider.getSearchMode() == SearchMode.ALWAYS) {
|
||||||
|
filters.add(provider.getFilter(searchText));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return filters;
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized ItemFilter getFilter(String filterText) {
|
||||||
|
return getFilter(filterText, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized ItemFilter getFilter(String rawText, boolean skipRecipeTokens) {
|
||||||
|
final String filterText = EnumChatFormatting.getTextWithoutFormattingCodes(rawText).toLowerCase();
|
||||||
|
|
||||||
|
if (filterText.isEmpty()) {
|
||||||
|
return new EverythingItemFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
|
||||||
|
|
||||||
|
if (patternMode != 3) {
|
||||||
|
return this.filtersCache.computeIfAbsent(skipRecipeTokens + ":" + filterText, _t -> {
|
||||||
|
final List<ItemFilter> searchTokens = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String[] subQuery : splitByDelimiters(filterText, "|", false)) {
|
||||||
|
|
||||||
|
if (subQuery[1].isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<ItemFilter> tokens = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String[] contextQuery : splitByDelimiters(subQuery[1], skipRecipeTokens ? "<>" : "", false)) {
|
||||||
|
|
||||||
|
if (contextQuery[1].isEmpty() || contextQuery[0].startsWith(">")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!contextQuery[0].isEmpty()) {
|
||||||
|
contextQuery[0] = contextQuery[0].substring(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) {
|
||||||
|
final ItemFilter result = token.getFilter(this);
|
||||||
|
|
||||||
|
if (result != null) {
|
||||||
|
tokens.add(result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokens.size() == 1) {
|
||||||
|
searchTokens.add(tokens.get(0));
|
||||||
|
} else if (!tokens.isEmpty()) {
|
||||||
|
searchTokens.add(new AllMultiItemFilter(tokens));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchTokens.isEmpty()) {
|
||||||
|
return new EverythingItemFilter();
|
||||||
|
} else if (searchTokens.size() == 1) {
|
||||||
|
return new IsRegisteredItemFilter(searchTokens.get(0));
|
||||||
|
} else {
|
||||||
|
return new IsRegisteredItemFilter(new AnyMultiItemFilter(searchTokens));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
return this.filtersCache.computeIfAbsent(filterText, text -> {
|
||||||
|
final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
|
||||||
|
|
||||||
|
if (spaceMode == 1) {
|
||||||
|
text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
|
||||||
|
}
|
||||||
|
if (skipRecipeTokens) {
|
||||||
|
return new IsRegisteredItemFilter(
|
||||||
|
SearchExpressionUtils.visitRecipeSearchExpression(text, new ItemFilterVisitor(this)));
|
||||||
|
} else {
|
||||||
|
return new IsRegisteredItemFilter(
|
||||||
|
SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this)));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public synchronized IRecipeFilter getRecipeFilter(String filterText) {
|
||||||
|
filterText = EnumChatFormatting.getTextWithoutFormattingCodes(filterText).toLowerCase();
|
||||||
|
|
||||||
|
if (filterText.isEmpty()) {
|
||||||
|
return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
|
||||||
|
}
|
||||||
|
|
||||||
|
final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
|
||||||
|
|
||||||
|
if (patternMode != 3) {
|
||||||
|
return this.recipesCache.computeIfAbsent(filterText, input -> {
|
||||||
|
final List<IRecipeFilter> searchTokens = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String[] orQueryPart : splitByDelimiters(input, "|", false)) {
|
||||||
|
|
||||||
|
if (orQueryPart[1].isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<IRecipeFilter> contextList = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String[] contextQuery : splitByDelimiters(orQueryPart[1], "<>", false)) {
|
||||||
|
|
||||||
|
if (contextQuery[1].isEmpty()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<IRecipeFilter> tokens = new ArrayList<>();
|
||||||
|
FilterContext context = FilterContext.ANY;
|
||||||
|
|
||||||
|
if (!contextQuery[0].isEmpty()) {
|
||||||
|
context = FilterContext.fromChar(contextQuery[0].charAt(0));
|
||||||
|
contextQuery[0] = contextQuery[0].substring(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) {
|
||||||
|
final ItemFilter result = token.getFilter(this);
|
||||||
|
if (result != null) {
|
||||||
|
tokens.add(
|
||||||
|
new RecipeFilter(context, token.ignore == null || token.ignore != '!', result));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tokens.size() == 1) {
|
||||||
|
contextList.add(tokens.get(0));
|
||||||
|
} else if (!tokens.isEmpty()) {
|
||||||
|
contextList.add(new AllMultiRecipeFilter(tokens));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (contextList.size() == 1) {
|
||||||
|
searchTokens.add(contextList.get(0));
|
||||||
|
} else if (!contextList.isEmpty()) {
|
||||||
|
searchTokens.add(new AllMultiRecipeFilter(contextList));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (searchTokens.isEmpty()) {
|
||||||
|
return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
|
||||||
|
} else if (searchTokens.size() == 1) {
|
||||||
|
return searchTokens.get(0);
|
||||||
|
} else {
|
||||||
|
return new AnyMultiRecipeFilter(searchTokens);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} else {
|
||||||
|
return this.recipesCache.computeIfAbsent(filterText, text -> {
|
||||||
|
final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
|
||||||
|
|
||||||
|
if (spaceMode == 1) {
|
||||||
|
text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
|
||||||
|
}
|
||||||
|
|
||||||
|
return SearchExpressionUtils.visitRecipeSearchExpression(text, new RecipeFilterVisitor(this));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<SearchToken> splitSearchText(String filterText) {
|
||||||
|
if (filterText.isEmpty()) {
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<SearchToken> tokens = new ArrayList<>();
|
||||||
|
final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
|
||||||
|
final String prefixes = getPrefixes();
|
||||||
|
SearchToken lastToken = null;
|
||||||
|
int lastEnd = 0;
|
||||||
|
|
||||||
|
for (String[] part : splitByDelimiters(filterText, "-!" + prefixes, true)) {
|
||||||
|
final SearchToken token = createToken(lastEnd, part, prefixes);
|
||||||
|
final int length = part[0].length() + part[1].length();
|
||||||
|
|
||||||
|
if (token.isSimpleFilter() && token.rawText.isEmpty()) {
|
||||||
|
lastEnd += length;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spaceMode == 0) { // and
|
||||||
|
tokens.add(lastToken = token);
|
||||||
|
} else if (spaceMode == 1) { // space
|
||||||
|
|
||||||
|
if (lastToken != null && lastToken.isSimpleFilter() && token.isSimpleFilter()) {
|
||||||
|
lastToken.rawText = filterText.substring(lastToken.start, token.end).trim();
|
||||||
|
lastToken.words[0] = lastToken.rawText;
|
||||||
|
lastToken.end = token.end;
|
||||||
|
} else {
|
||||||
|
tokens.add(lastToken = token);
|
||||||
|
}
|
||||||
|
|
||||||
|
} else if (spaceMode == 2) { // and-x
|
||||||
|
|
||||||
|
if (lastToken != null && lastToken.isSimpleFilter() && token.isSimpleFilter()) {
|
||||||
|
final String[] newWords = new String[lastToken.words.length + token.words.length];
|
||||||
|
|
||||||
|
System.arraycopy(lastToken.words, 0, newWords, 0, lastToken.words.length);
|
||||||
|
System.arraycopy(token.words, 0, newWords, lastToken.words.length, token.words.length);
|
||||||
|
|
||||||
|
lastToken.words = newWords;
|
||||||
|
lastToken.rawText = filterText.substring(lastToken.start, token.end).trim();
|
||||||
|
lastToken.end = token.end;
|
||||||
|
} else {
|
||||||
|
tokens.add(lastToken = token);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
lastEnd += length;
|
||||||
|
}
|
||||||
|
|
||||||
|
return tokens;
|
||||||
|
}
|
||||||
|
|
||||||
|
private SearchToken createToken(int lastEnd, String[] part, String prefixes) {
|
||||||
|
final SearchToken token = new SearchToken();
|
||||||
|
String pref = part[0];
|
||||||
|
String query = part[1].trim();
|
||||||
|
|
||||||
|
token.start = lastEnd;
|
||||||
|
token.end = lastEnd + pref.length() + query.length();
|
||||||
|
|
||||||
|
if (pref.startsWith("-")) {
|
||||||
|
token.ignore = '-';
|
||||||
|
pref = pref.substring(1);
|
||||||
|
} else if (pref.startsWith("!")) {
|
||||||
|
token.ignore = '!';
|
||||||
|
pref = pref.substring(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!pref.isEmpty()) {
|
||||||
|
char firstChar = pref.charAt(0);
|
||||||
|
|
||||||
|
if (prefixes.indexOf(firstChar) >= 0) {
|
||||||
|
token.firstChar = firstChar;
|
||||||
|
pref = pref.substring(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String text = pref + query;
|
||||||
|
token.quotes = text.length() > 1 && text.startsWith("\"") && text.endsWith("\"");
|
||||||
|
|
||||||
|
if (token.quotes) {
|
||||||
|
text = text.substring(1, text.length() - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
token.rawText = text;
|
||||||
|
token.words = new String[] { token.quotes ? text.replaceAll("\\\\\"", "\"") : text };
|
||||||
|
return token;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<String[]> splitByDelimiters(String input, String delimiters, boolean space) {
|
||||||
|
|
||||||
|
if (delimiters == null || delimiters.isEmpty()) {
|
||||||
|
return Collections.singletonList(new String[] { "", input });
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<String[]> tokens = new ArrayList<>();
|
||||||
|
final int length = input.length();
|
||||||
|
boolean insideQuotes = false;
|
||||||
|
String token = "";
|
||||||
|
int lastEnd = 0;
|
||||||
|
int index = 0;
|
||||||
|
|
||||||
|
while (index < length) {
|
||||||
|
final char ch = input.charAt(index);
|
||||||
|
|
||||||
|
if (!insideQuotes && delimiters.indexOf(ch) >= 0
|
||||||
|
&& (!space || index == 0 || input.charAt(index - 1) == ' ' || lastEnd == index)) {
|
||||||
|
|
||||||
|
if (lastEnd == index) {
|
||||||
|
token += String.valueOf(ch);
|
||||||
|
} else {
|
||||||
|
tokens.add(new String[] { token, input.substring(lastEnd, index) });
|
||||||
|
token = String.valueOf(ch);
|
||||||
|
}
|
||||||
|
|
||||||
|
lastEnd = index + 1;
|
||||||
|
} else if (!insideQuotes && space && ch != ' ' && (index > 0 && input.charAt(index - 1) == ' ')) {
|
||||||
|
tokens.add(new String[] { token, input.substring(lastEnd, index) });
|
||||||
|
token = "";
|
||||||
|
|
||||||
|
lastEnd = index;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ch == '"' && (index == 0 || input.charAt(index - 1) != '\\')) {
|
||||||
|
insideQuotes = !insideQuotes;
|
||||||
|
}
|
||||||
|
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
|
||||||
|
tokens.add(new String[] { token, input.substring(lastEnd) });
|
||||||
|
|
||||||
|
return tokens;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPrefixes() {
|
||||||
|
if (this.prefixes == null) {
|
||||||
|
final StringBuilder builder = new StringBuilder();
|
||||||
|
|
||||||
|
for (ISearchParserProvider provider : getProviders()) {
|
||||||
|
if (provider.getSearchMode() == SearchTokenParser.SearchMode.PREFIX) {
|
||||||
|
builder.append(getRedefinedPrefix(provider.getPrefix()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.prefixes = builder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.prefixes;
|
||||||
|
}
|
||||||
|
|
||||||
|
public char getRedefinedPrefix(char prefix) {
|
||||||
|
return this.prefixRedefinitions.getOrDefault(prefix, prefix);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loaded 100 of 365 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user