mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5af053edb | ||
|
|
43e3ee1af1 | ||
|
|
70570a863f | ||
|
|
503da3a257 | ||
|
|
42713c66e5 | ||
|
|
8dbd1ae0a1 | ||
|
|
a8cbef2321 | ||
|
|
5275cea844 | ||
|
|
d8b6adb259 | ||
|
|
0c36868f92 | ||
|
|
f2fe80dc36 | ||
|
|
cd43eacbb2 | ||
|
|
de546bdf6c | ||
|
|
b0eb1ef7c6 | ||
|
|
738ce1d7cd | ||
|
|
b9de9ebc96 | ||
|
|
362ec8dee7 | ||
|
|
ddc2cfbe86 | ||
|
|
542e9acec1 | ||
|
|
1436ac2f14 | ||
|
|
c73a2076e3 | ||
|
|
3612ad0c25 | ||
|
|
1d5fc60f82 | ||
|
|
8555344eb3 | ||
|
|
251af1d09d | ||
|
|
b84d0760ae | ||
|
|
76d8d0e870 | ||
|
|
fff86ee9d3 | ||
|
|
810b1f3075 | ||
|
|
d0f8073fa5 | ||
|
|
2c56c32c5a | ||
|
|
a70308ef41 | ||
|
|
78248da399 | ||
|
|
7ba167c500 | ||
|
|
9b1cbab03b | ||
|
|
d88b2aa0c5 | ||
|
|
59a5adfdb3 | ||
|
|
ddee7eb117 | ||
|
|
2b8d0f6680 | ||
|
|
7f01cf549b | ||
|
|
77c254a6d9 | ||
|
|
3b42b33b6e | ||
|
|
294c93212c | ||
|
|
8e44006f43 | ||
|
|
c8a0b72eba | ||
|
|
c8a245a985 | ||
|
|
c7adb42199 | ||
|
|
f77632df35 | ||
|
|
c47fc3b382 | ||
|
|
fd6d55afcc | ||
|
|
9be92dcfcb | ||
|
|
49c623f59c | ||
|
|
038fa17ad3 | ||
|
|
58a4095f56 | ||
|
|
6fd3c12a4a | ||
|
|
eb29d651eb | ||
|
|
7325aa5033 | ||
|
|
89cda92561 | ||
|
|
385beb504d | ||
|
|
2b46906ac5 | ||
|
|
5eebd4df71 | ||
|
|
fd9389015f | ||
|
|
a82195772e | ||
|
|
e58562d3ed | ||
|
|
c3912836dc | ||
|
|
40270c881a | ||
|
|
c2143dbeb1 | ||
|
|
f08b485852 | ||
|
|
ef07de4f65 | ||
|
|
b7ad532ab5 | ||
|
|
399770e572 | ||
|
|
e8b60441cc | ||
|
|
d0dd05a15c | ||
|
|
572d32358a | ||
|
|
33100d6bab | ||
|
|
45409bfa0c | ||
|
|
fa5f4c8842 | ||
|
|
995c204338 | ||
|
|
c890206268 | ||
|
|
2aa73afa15 | ||
|
|
064b66af3d | ||
|
|
8c9e8b5270 | ||
|
|
b7b3450dcd | ||
|
|
6bb9b8b953 | ||
|
|
03fb1879d7 | ||
|
|
cee0f0b811 | ||
|
|
359ac3ca2a | ||
|
|
d87822ad85 | ||
|
|
8633d780c9 | ||
|
|
ab199c5811 | ||
|
|
544320b8d2 | ||
|
|
741e172ffe | ||
|
|
a7ca131a33 | ||
|
|
8692ca17d1 | ||
|
|
b6d95d704b | ||
|
|
458b0620b4 | ||
|
|
675b5a0778 | ||
|
|
1c793abe0e | ||
|
|
a355eecb2c | ||
|
|
9a8d16b66e | ||
|
|
5719b9ec53 | ||
|
|
16d33d2989 | ||
|
|
32bb7315cc | ||
|
|
3dfb54e066 | ||
|
|
79b04898d4 | ||
|
|
9d2e089df6 | ||
|
|
35a38d7840 | ||
|
|
6a695c4348 | ||
|
|
a62374d4ac | ||
|
|
3d26f28bcf | ||
|
|
5adacc3b33 | ||
|
|
7ac5bddbc3 | ||
|
|
7907e16e96 | ||
|
|
79d42fca8d | ||
|
|
dfc0899ec6 | ||
|
|
2524045728 | ||
|
|
3557fe31c9 | ||
|
|
449ac98b77 | ||
|
|
f23eba4352 | ||
|
|
f0132a6f3b | ||
|
|
444a7d7fa1 | ||
|
|
2a5a8d0cd0 | ||
|
|
275ccac6f1 | ||
|
|
ff7b5845e7 | ||
|
|
7c5d62704a | ||
|
|
53557dcd05 | ||
|
|
9c96ca4402 | ||
|
|
a429e106dd | ||
|
|
9cab2ab36e | ||
|
|
30882b0c1d | ||
|
|
c013870b1d | ||
|
|
dd17979a2f | ||
|
|
e14efe786f | ||
|
|
a4686b1261 | ||
|
|
e344303ec7 | ||
|
|
b362e8a273 | ||
|
|
5da6dcc7e3 | ||
|
|
10d056a494 | ||
|
|
fc69bcf280 | ||
|
|
80b00dc796 | ||
|
|
28293b29ea | ||
|
|
584c0f368b | ||
|
|
fc025a7b73 | ||
|
|
4aa2416ce5 | ||
|
|
717a8d6945 | ||
|
|
a89939e57e | ||
|
|
43068eb986 | ||
|
|
dd098854b0 | ||
|
|
d5bfd69e35 | ||
|
|
96c19b3580 | ||
|
|
acf74a3403 | ||
|
|
1db3daa0e8 | ||
|
|
0d810c01fa | ||
|
|
9de9a15530 | ||
|
|
5317672631 | ||
|
|
6f1da6550e | ||
|
|
b51fb91355 | ||
|
|
779cd05aa1 | ||
|
|
7bf119e1e5 | ||
|
|
fa4f3015a0 | ||
|
|
fbc1f8f6f9 | ||
|
|
c5e29b574a | ||
|
|
3113138bd1 | ||
|
|
ab5eb3ccff | ||
|
|
cdd9d92a4f | ||
|
|
b3f98d1ee0 | ||
|
|
21b13d6351 | ||
|
|
22ba6fda5e | ||
|
|
f36152398d | ||
|
|
5d069629cf | ||
|
|
061288909d | ||
|
|
6a5f9e135f | ||
|
|
53a1f98414 | ||
|
|
34819c9303 | ||
|
|
ec316f113f | ||
|
|
f8d6213829 | ||
|
|
268bbabee6 | ||
|
|
c180d9b157 | ||
|
|
7d3b1250e8 | ||
|
|
156a9ae03a | ||
|
|
58132ccda3 | ||
|
|
f860c8ad3b | ||
|
|
3e76dfba34 | ||
|
|
31ea100b29 | ||
|
|
ef3856f9a3 | ||
|
|
e4b63a1801 | ||
|
|
85516d9588 | ||
|
|
a17489172c | ||
|
|
32561265fc | ||
|
|
0b419ac79c | ||
|
|
4071ff38af | ||
|
|
a2b324beb2 | ||
|
|
557357fe17 | ||
|
|
3b2994a3de | ||
|
|
0098c57f94 | ||
|
|
55aa337f95 | ||
|
|
df870c1a33 | ||
|
|
b852e30285 | ||
|
|
7ea571f593 | ||
|
|
7a4ceebf5e | ||
|
|
31efcfc3b2 | ||
|
|
49cb893d12 | ||
|
|
009d4dee23 | ||
|
|
3e278acb71 | ||
|
|
d0d31d9575 | ||
|
|
ef492407ef | ||
|
|
cd417c6786 | ||
|
|
89e4e483c2 | ||
|
|
fd36f50d82 | ||
|
|
1d71c017f4 | ||
|
|
99c681ad87 | ||
|
|
57f7f1d7ab | ||
|
|
b2550b8a69 | ||
|
|
a30f173627 | ||
|
|
2aaaeba15e | ||
|
|
9c96a0a10a | ||
|
|
f5c38e2359 | ||
|
|
e544adba5c | ||
|
|
58f7487cfa | ||
|
|
9f928963f2 | ||
|
|
38cec7a11f | ||
|
|
7ab3c3a37c | ||
|
|
53127eec30 | ||
|
|
30d532f4fc | ||
|
|
01fb451b69 | ||
|
|
3714426e19 | ||
|
|
c2b919d339 | ||
|
|
c4b8a393f9 | ||
|
|
30894f7afa | ||
|
|
e9a7660cb8 | ||
|
|
4d46abf761 | ||
|
|
23baf3a8ce | ||
|
|
c6a21d0d62 | ||
|
|
da72640c7e | ||
|
|
b7f34629c3 | ||
|
|
5500d69b77 | ||
|
|
6af42bc656 | ||
|
|
e19fcb8844 | ||
|
|
0a62333890 | ||
|
|
e7512f13e4 | ||
|
|
4708d77c98 | ||
|
|
9b1d2bdd13 | ||
|
|
a6dc03aa7e | ||
|
|
6cd8349542 | ||
|
|
976c589c78 | ||
|
|
24ec338a51 | ||
|
|
4f634855ac | ||
|
|
9f01e3407e | ||
|
|
adeaeb74aa | ||
|
|
e13c3966e0 | ||
|
|
02c3b4e74b | ||
|
|
89a07d3668 | ||
|
|
b52eb6d699 | ||
|
|
3281faf2be | ||
|
|
3d25b4e793 | ||
|
|
f4532410ec | ||
|
|
8f87021b0f | ||
|
|
bc57ff9e83 | ||
|
|
de8ab934d8 | ||
|
|
81fe1c9682 | ||
|
|
58a299aabc | ||
|
|
243a21a353 | ||
|
|
f0dc530b28 | ||
|
|
dac7f590ea | ||
|
|
bf54d4d667 | ||
|
|
da4337efbf | ||
|
|
f92962bbbb | ||
|
|
2714da1022 | ||
|
|
96be82343c | ||
|
|
58577775d2 | ||
|
|
fc3e7647d2 | ||
|
|
a381874bb9 | ||
|
|
55525f6d2e | ||
|
|
bc64ceabef | ||
|
|
63ba3aa009 | ||
|
|
5265e34a35 | ||
|
|
35ab9f52b0 | ||
|
|
9b55f1f48f | ||
|
|
e356f4d713 | ||
|
|
bfc25bc5da | ||
|
|
9f0f9e7288 | ||
|
|
ce6404fd5b | ||
|
|
8f18a3de9a | ||
|
|
9815d8c379 | ||
|
|
1d902df581 | ||
|
|
8e26c99de3 | ||
|
|
fc8c3bef03 | ||
|
|
a4de22c1ad | ||
|
|
70cffe6982 | ||
|
|
39620f1e41 | ||
|
|
0e80fcb8f7 | ||
|
|
4a94c2c71b | ||
|
|
79c39f8b7c | ||
|
|
f6190e8752 | ||
|
|
0950b9fc84 | ||
|
|
25981706ef | ||
|
|
82d896a35e | ||
|
|
e7dd728f95 | ||
|
|
8f2e675581 | ||
|
|
ff75416a32 | ||
|
|
95afc95b24 | ||
|
|
34493b0d99 | ||
|
|
e77d2547ad | ||
|
|
40a34af431 | ||
|
|
352117fd78 | ||
|
|
81328b6684 | ||
|
|
b5af446d71 | ||
|
|
d0c6e92900 | ||
|
|
2a9c485edc | ||
|
|
a13598b17e | ||
|
|
40b54013b4 | ||
|
|
1c9a853868 | ||
|
|
da70cdd35a | ||
|
|
b993cf4a98 | ||
|
|
ac065ff5f7 | ||
|
|
913f6f6d36 | ||
|
|
9468e41bbf | ||
|
|
ffdd056a18 | ||
|
|
f157e7a6ec | ||
|
|
4a9d0f9bd5 | ||
|
|
0398916666 | ||
|
|
dec9a3924d | ||
|
|
2470120680 | ||
|
|
ba90b61607 | ||
|
|
9a5e24e338 | ||
|
|
29ef3d5ab4 | ||
|
|
f46a538b41 | ||
|
|
182aa9c0cb | ||
|
|
1857064afa | ||
|
|
cb05c8c4aa | ||
|
|
f275a24b43 | ||
|
|
1d84e8063e | ||
|
|
57befa89bb | ||
|
|
10b16d32da | ||
|
|
3f21a2c1b4 | ||
|
|
b2958c9066 | ||
|
|
9520978b81 | ||
|
|
4981aa3421 | ||
|
|
c48b48ee15 | ||
|
|
9947ba8503 | ||
|
|
a3f48734ff | ||
|
|
0378355c37 | ||
|
|
c625ef3009 | ||
|
|
d4b30422b6 | ||
|
|
6de36d78f5 | ||
|
|
7348929819 | ||
|
|
b9f4b02cb0 | ||
|
|
20e93a412e | ||
|
|
e44e8b3112 | ||
|
|
bab4d87ce7 | ||
|
|
bc9d1fe657 | ||
|
|
d4d522c597 | ||
|
|
97269a5e3d | ||
|
|
c913258ca3 | ||
|
|
c7ab872c85 | ||
|
|
e91431fb70 | ||
|
|
dfa3a2665d | ||
|
|
4fa375683f | ||
|
|
0db4624b27 | ||
|
|
c997f2adbc | ||
|
|
26e5f4b4ff | ||
|
|
2336002f20 | ||
|
|
e88a0cd13f | ||
|
|
dbf5fe38ce | ||
|
|
c47d08c89d | ||
|
|
7af5c21d74 | ||
|
|
6f96d89e2b | ||
|
|
111b0216fd | ||
|
|
1d0384f8f6 | ||
|
|
adc8972277 | ||
|
|
5990e29af7 | ||
|
|
2676c8999c | ||
|
|
3a200e901e | ||
|
|
c97ac284a5 | ||
|
|
54e06e841d | ||
|
|
7ce84491d1 | ||
|
|
532bee7ce1 | ||
|
|
e24f949517 | ||
|
|
4545beb49d | ||
|
|
3f4bf61ae6 | ||
|
|
155e846818 | ||
|
|
ba3707af22 | ||
|
|
ad79b9ed86 | ||
|
|
5f7df5e742 | ||
|
|
7aa7221756 | ||
|
|
8844554da6 | ||
|
|
6f0eedc9a6 | ||
|
|
f21cd286ca | ||
|
|
f1b533ad87 | ||
|
|
5a97d183df | ||
|
|
fbd57b3264 | ||
|
|
efc369ee83 | ||
|
|
91ecf71109 | ||
|
|
9b6525e805 | ||
|
|
dc7d02ebf6 | ||
|
|
7037184a4e | ||
|
|
bf38d94756 | ||
|
|
3d17434510 | ||
|
|
29d6c875d0 | ||
|
|
902772ed0c | ||
|
|
1229c4c4ea | ||
|
|
7fecf2ad6b | ||
|
|
c418da353f | ||
|
|
110cf372eb | ||
|
|
7a004087f7 | ||
|
|
70cfe24e67 | ||
|
|
8960f6869f | ||
|
|
71a92de5d9 | ||
|
|
3f15cd54c2 | ||
|
|
12c928c538 | ||
|
|
7406b38d8a | ||
|
|
ef646d3146 | ||
|
|
18371bd8c9 | ||
|
|
e35e4b16ff | ||
|
|
3711da9c45 | ||
|
|
6a318ddb78 | ||
|
|
2766f9a293 | ||
|
|
2e3f2461fa | ||
|
|
95f7345ff7 | ||
|
|
bc02f3e67b | ||
|
|
8db42c44bf | ||
|
|
404e6f1cc0 | ||
|
|
5741f669d5 | ||
|
|
6a67149b16 | ||
|
|
c8d934bafd | ||
|
|
075e240303 | ||
|
|
d00665ee65 | ||
|
|
ebb74a5f30 | ||
|
|
5b0117ec76 | ||
|
|
e06d9d0fbc | ||
|
|
ab91647546 | ||
|
|
b236a4a4db | ||
|
|
a480a83a98 | ||
|
|
3a9f123a16 | ||
|
|
8d27fb0692 | ||
|
|
d369fe1c25 | ||
|
|
98b71f2dd4 | ||
|
|
fef0f6422d | ||
|
|
2eb81ac88b | ||
|
|
e02a91f008 | ||
|
|
ced1b95155 | ||
|
|
8f910dfa5d | ||
|
|
05a854cd2a | ||
|
|
22738de028 | ||
|
|
cd0466395a | ||
|
|
24c4056651 | ||
|
|
59fe905695 | ||
|
|
6f3da97365 | ||
|
|
edc1fb24e2 | ||
|
|
f1d68ed4c8 | ||
|
|
ac97370f94 | ||
|
|
82e9de8641 | ||
|
|
843a13c1ab | ||
|
|
3bf50c4bbe | ||
|
|
4922e90d81 | ||
|
|
a3a920437f | ||
|
|
787c0c4a6a | ||
|
|
8517a824e5 | ||
|
|
2cca7aa759 | ||
|
|
23b070c7d0 | ||
|
|
49111e9c5c | ||
|
|
c0cca7f41d | ||
|
|
99bb50d8f8 | ||
|
|
00f00b17bf | ||
|
|
62fdbad74c | ||
|
|
f0bba74a47 | ||
|
|
cf9b5b445b | ||
|
|
aa200923f0 | ||
|
|
ddadf93ca1 | ||
|
|
781c681216 | ||
|
|
cfda7fc738 | ||
|
|
58ba24add2 | ||
|
|
dcf069ca52 | ||
|
|
c3fda11d10 | ||
|
|
11ac46daeb | ||
|
|
2dcabe0123 | ||
|
|
42f1d87955 | ||
|
|
334a76de75 | ||
|
|
677a6e578e | ||
|
|
a3b5eaacfd | ||
|
|
b3d4ea05ec | ||
|
|
8f35adca7a | ||
|
|
394f424185 | ||
|
|
ada52078c7 | ||
|
|
0daf1a6df4 | ||
|
|
edffd04ed2 | ||
|
|
7aea09f4ca | ||
|
|
5673c1dd29 | ||
|
|
1774e2bf30 | ||
|
|
4836b3272a | ||
|
|
a31607ae7d | ||
|
|
57ad221cc6 | ||
|
|
00c7883088 | ||
|
|
1de89525cc | ||
|
|
704a70902f | ||
|
|
570faeb790 | ||
|
|
8b8837c9ff | ||
|
|
eff464cf0e | ||
|
|
26ccb9106e | ||
|
|
0d84487412 | ||
|
|
2bc6a0666f | ||
|
|
82bc9f1b35 | ||
|
|
d73ac867df | ||
|
|
ede93d438f | ||
|
|
5e1949eb0e | ||
|
|
2d368c4c2e | ||
|
|
d9db27275e | ||
|
|
591a25722b | ||
|
|
d1ff1967b5 | ||
|
|
012a755bb9 | ||
|
|
748eece456 | ||
|
|
f709ce7579 | ||
|
|
33efc35b60 | ||
|
|
687d3c059d | ||
|
|
aaf02ea2ac | ||
|
|
625da6492d | ||
|
|
a573faf92d | ||
|
|
9565529baf | ||
|
|
3c346247e1 | ||
|
|
ce949e6099 | ||
|
|
5e3af8ac0e | ||
|
|
5cc90f060c | ||
|
|
577b19c1cf | ||
|
|
8905237306 | ||
|
|
c5d5f4e516 | ||
|
|
24022ab6ba | ||
|
|
6370c242f0 | ||
|
|
4762d4d8ef | ||
|
|
8f2dbf7046 | ||
|
|
23ea835fa7 | ||
|
|
d88db6c0cf | ||
|
|
c6dab815f4 | ||
|
|
7b722bfcd6 | ||
|
|
a90504315e | ||
|
|
3765ceb02d | ||
|
|
dab22f5b74 | ||
|
|
b301e8e4c1 | ||
|
|
f647929993 | ||
|
|
984291cee9 | ||
|
|
ac16845fc4 | ||
|
|
29edd242cd | ||
|
|
ca2d8bd834 | ||
|
|
2a779ec328 | ||
|
|
591e65fa1a | ||
|
|
485db6be2e | ||
|
|
25f3fcad46 | ||
|
|
6bf7c9878c | ||
|
|
95d0ff18cd | ||
|
|
1642bad402 | ||
|
|
450dd8313c | ||
|
|
ebdb166ec8 | ||
|
|
1eba1dfdc0 | ||
|
|
368a2245ef | ||
|
|
58ee06ea8e | ||
|
|
62f5adf8e2 | ||
|
|
fe1623a36a | ||
|
|
889efc1c0a | ||
|
|
0419b9d975 | ||
|
|
f1c6bdd57d | ||
|
|
b3e854a15d | ||
|
|
80a40c03e6 | ||
|
|
5bfaf7c170 | ||
|
|
2d98835db8 | ||
|
|
81c6421f84 | ||
|
|
6eeae8c49f | ||
|
|
c42a210140 | ||
|
|
a723aa6860 | ||
|
|
e9ff699c2d | ||
|
|
abe4f73a9a | ||
|
|
74fffc6fdc | ||
|
|
debbdc00be | ||
|
|
aed2cc446a | ||
|
|
e74087ee43 | ||
|
|
f329084f1f | ||
|
|
33cd9ad0fe | ||
|
|
ce819ac143 | ||
|
|
f0495a8abc | ||
|
|
a696db5a21 | ||
|
|
fcdbb4f5b3 | ||
|
|
e105337ff4 | ||
|
|
f52e2112dd | ||
|
|
945d927fa0 | ||
|
|
2ee6946824 | ||
|
|
e08c43366a | ||
|
|
c508004429 | ||
|
|
21af85323a | ||
|
|
3410242f03 | ||
|
|
9b9c46d93b | ||
|
|
de8e76c7fd | ||
|
|
47b5e99b6f | ||
|
|
1a465b33f5 | ||
|
|
8e7956397d | ||
|
|
86a9c7d359 | ||
|
|
6a581803a9 | ||
|
|
b4e0c709c5 | ||
|
|
f3458456a2 | ||
|
|
dcb15a587c | ||
|
|
937e9a0169 | ||
|
|
decd230ac1 | ||
|
|
5347caa1c4 | ||
|
|
52f6a674ea | ||
|
|
a16c61f7ba | ||
|
|
67f12d6dec | ||
|
|
bad55cacfa | ||
|
|
a6e979b311 | ||
|
|
ce68456f97 | ||
|
|
29e59438c5 | ||
|
|
10d4acfad2 | ||
|
|
1c3dc132cb | ||
|
|
cd96718339 | ||
|
|
22dbe411d9 | ||
|
|
a99d110fff | ||
|
|
f21929b7d1 | ||
|
|
5d78b310da | ||
|
|
549b6fd535 | ||
|
|
9fafdc1695 | ||
|
|
f169f7c92f | ||
|
|
b9ccadb2f1 | ||
|
|
f00650481b | ||
|
|
5d4c2fed88 | ||
|
|
66a81e7dbe | ||
|
|
6b5a433f65 | ||
|
|
b5d5c95b33 | ||
|
|
3ac891fa5a | ||
|
|
2dc0189179 | ||
|
|
dd98784262 | ||
|
|
1c9a51098b | ||
|
|
d075daf00e | ||
|
|
1bd6847bc8 | ||
|
|
dd832f2a88 | ||
|
|
aebf6eb168 | ||
|
|
8921cfe061 | ||
|
|
cd67596d57 | ||
|
|
e1c6630569 | ||
|
|
5ce4e31855 | ||
|
|
a99c488d49 | ||
|
|
94282c5575 | ||
|
|
7ad8529390 | ||
|
|
15534edce4 | ||
|
|
aa822e32af | ||
|
|
a14ab913a9 | ||
|
|
0165742a30 | ||
|
|
26a5b316de | ||
|
|
2140cd8cb6 | ||
|
|
4a6245a215 | ||
|
|
48544db690 | ||
|
|
2c89b3def3 | ||
|
|
5689182088 | ||
|
|
4a1f4b90fd | ||
|
|
f2d42d1134 | ||
|
|
51e7606e74 | ||
|
|
723c2d98eb | ||
|
|
7dee072e1a | ||
|
|
3e18c4160f | ||
|
|
513ad19187 | ||
|
|
eabede2203 | ||
|
|
b22dbc12a2 | ||
|
|
708e86adfb | ||
|
|
6f1b762c9d | ||
|
|
d9bfb29d6c | ||
|
|
6fc7bc4941 | ||
|
|
fb701cdc5e | ||
|
|
f7cc50b521 | ||
|
|
1a232cf766 | ||
|
|
853f54bcc2 | ||
|
|
127be2237d | ||
|
|
7e6456d7cd | ||
|
|
664ebda599 | ||
|
|
9b4a225ad2 | ||
|
|
6c59fa2d2c | ||
|
|
5736d850f0 | ||
|
|
127d6ee8ac | ||
|
|
2055543042 | ||
|
|
40e57a26a9 | ||
|
|
d604e44195 | ||
|
|
8b7778ccb6 | ||
|
|
7e30814ecb | ||
|
|
e5b1dfb74c | ||
|
|
27bc77363e | ||
|
|
506b73d0a0 | ||
|
|
20337b6e8a | ||
|
|
33ff87d8d9 | ||
|
|
af06bbd373 | ||
|
|
92a47ace8b | ||
|
|
f285ac369a | ||
|
|
68e76c273a | ||
|
|
e98c311a2c | ||
|
|
293edb316e | ||
|
|
2d4465eaf7 | ||
|
|
9266ff394a | ||
|
|
bbfd85ed1e | ||
|
|
6ecc2303f4 | ||
|
|
d35cfda798 | ||
|
|
cffa2a92a6 | ||
|
|
179c504746 | ||
|
|
31695d5ec1 | ||
|
|
bfb3020505 | ||
|
|
22a88ea2e4 | ||
|
|
0423fa5885 | ||
|
|
d17fbb527f | ||
|
|
d40bb0fe32 | ||
|
|
a513060a81 | ||
|
|
8e594a347c | ||
|
|
9af365edcc | ||
|
|
70554d6a2b | ||
|
|
eb84f52493 | ||
|
|
d074830d95 | ||
|
|
f7fe9ebeb2 | ||
|
|
b2c8f37aec | ||
|
|
a5bcccab59 | ||
|
|
a11f368b62 | ||
|
|
59656b004b | ||
|
|
ff8cb67a99 | ||
|
|
fa5256c8a7 | ||
|
|
4b19987ee6 | ||
|
|
9f43303073 | ||
|
|
a20958fb56 | ||
|
|
8c71098081 | ||
|
|
a3a5b44acb | ||
|
|
0473273709 | ||
|
|
bf492f32f9 | ||
|
|
4744677646 | ||
|
|
f0af2e4ef5 | ||
|
|
c7f763d6f0 | ||
|
|
563b8d1215 | ||
|
|
221493453f | ||
|
|
86c928430a | ||
|
|
cd0a0e51d5 | ||
|
|
66ff95f9d7 | ||
|
|
8ad172295f | ||
|
|
26a2ef5995 | ||
|
|
b4e3490fa1 | ||
|
|
828341f987 | ||
|
|
bc03fbb3be | ||
|
|
7a8dae5e35 | ||
|
|
d3c0e1f589 | ||
|
|
9c77d3f25b | ||
|
|
6371e9b71e | ||
|
|
578ef5cfeb | ||
|
|
516954e6f9 | ||
|
|
1151d5c3e3 | ||
|
|
25f1ddac30 | ||
|
|
39a146f8e6 | ||
|
|
037dcaefea | ||
|
|
01d6da3a90 | ||
|
|
8b2665980d | ||
|
|
42b3e6ad56 | ||
|
|
e709ab8a70 | ||
|
|
501409d1fb | ||
|
|
0fb3a34235 | ||
|
|
e4ba1f863e | ||
|
|
1f5c58b723 | ||
|
|
61e4db2c3b | ||
|
|
5efc1eb34c | ||
|
|
96c6f91201 | ||
|
|
62e69a2804 | ||
|
|
e9352d2675 | ||
|
|
ee6abdf28d | ||
|
|
968ee7ab09 | ||
|
|
3b3600d44f | ||
|
|
edcc5ca554 | ||
|
|
ca79dfe298 | ||
|
|
5945279b8b | ||
|
|
57bf64318b | ||
|
|
d9d0a46809 | ||
|
|
2fac644914 | ||
|
|
570592b24b | ||
|
|
fde94144ec | ||
|
|
f348496c10 | ||
|
|
a5c31b5365 | ||
|
|
2dc3f0ddef | ||
|
|
fa567014a5 | ||
|
|
96935bb122 | ||
|
|
43d3042dff | ||
|
|
fec221f8a6 | ||
|
|
b0f0635eb3 | ||
|
|
23a25131b0 | ||
|
|
a6eaa2bebc | ||
|
|
c6a0741379 | ||
|
|
5a1930e2d6 | ||
|
|
418deba5bf | ||
|
|
4ff2cff3c0 | ||
|
|
bd2123cf9d | ||
|
|
c2a603c910 | ||
|
|
db12af48fa | ||
|
|
a0f574a0ac | ||
|
|
8356fe9a7b | ||
|
|
6edce8b5f4 | ||
|
|
ca2bbe0b5f | ||
|
|
c8941a7faa | ||
|
|
5e20c03736 | ||
|
|
b19e882aab | ||
|
|
9d7d32a1b5 | ||
|
|
d512539554 | ||
|
|
a3a93f3387 | ||
|
|
a7eb5dc773 | ||
|
|
b23081df78 | ||
|
|
66db4ec46e | ||
|
|
8bd98c3a2d | ||
|
|
34cc42d3cb | ||
|
|
09eade4623 | ||
|
|
9bfe7df373 | ||
|
|
8006b774bf | ||
|
|
7cc91cfb0c | ||
|
|
24d72852e7 | ||
|
|
cedf3d55d5 | ||
|
|
d915f39996 | ||
|
|
346691c298 | ||
|
|
6dadc1d889 | ||
|
|
8a55f68a18 | ||
|
|
5645fa5847 | ||
|
|
ff0f00f64f | ||
|
|
7a34246dc9 | ||
|
|
62a6b52487 | ||
|
|
b845cde73d | ||
|
|
2c36dfbb34 | ||
|
|
acd880dd2a | ||
|
|
e6f57e5d94 | ||
|
|
b1de0fc17c | ||
|
|
ad4461932f | ||
|
|
3a94211377 | ||
|
|
9386e23b1f | ||
|
|
10b318c71d | ||
|
|
995d5b7b3a | ||
|
|
bbb12c84fd | ||
|
|
b50058ee47 | ||
|
|
4a0bfa937a | ||
|
|
4d1ec666dd | ||
|
|
b52e3d0e7d | ||
|
|
a1011c99a9 | ||
|
|
0ebd4f3d94 | ||
|
|
89c68c46a2 | ||
|
|
e4702cb09d | ||
|
|
6e64fd7a11 | ||
|
|
014b3f4ad5 | ||
|
|
7628c67883 | ||
|
|
54a322c09f | ||
|
|
aadf396244 | ||
|
|
81e18552e3 | ||
|
|
5686fd40a4 | ||
|
|
989ab3e96b | ||
|
|
88f1dc97b6 | ||
|
|
470a18522c | ||
|
|
002951804a | ||
|
|
fe7a832fad | ||
|
|
a2bc30b356 | ||
|
|
bae1f74681 | ||
|
|
887aa277a4 | ||
|
|
e17f2677c7 | ||
|
|
3b9972af39 | ||
|
|
5c96afec70 | ||
|
|
1bca393ecb | ||
|
|
27cf731552 | ||
|
|
94c84cd994 | ||
|
|
c2d3195e76 | ||
|
|
d0e7c9e2ea | ||
|
|
f3e1cac5a1 | ||
|
|
51fb513213 | ||
|
|
65c9fdd8d7 | ||
|
|
c1d4458acc | ||
|
|
ca1ca4f944 | ||
|
|
15ee8bf5a1 | ||
|
|
a08b5b19d5 | ||
|
|
8dac58ffc1 | ||
|
|
f0837070d6 | ||
|
|
dd7502a051 | ||
|
|
b36d4471e6 | ||
|
|
efb1066a88 | ||
|
|
dd39ae540b | ||
|
|
b39f808618 | ||
|
|
a2c059e562 | ||
|
|
19316a0d38 | ||
|
|
fbc7a5c063 | ||
|
|
e9cfd10e39 | ||
|
|
1424883773 | ||
|
|
6c746ec6d9 | ||
|
|
aacbfeb66e | ||
|
|
1513b369d3 | ||
|
|
35852a69fb | ||
|
|
96537dc091 | ||
|
|
e88ddc56ca | ||
|
|
f24ff07b30 | ||
|
|
3420ea7a2d | ||
|
|
87104f0e2d | ||
|
|
640446b868 | ||
|
|
2cf4917ded | ||
|
|
6394ee8714 | ||
|
|
7299e05fe1 | ||
|
|
c4bd0405fd | ||
|
|
89b8236a9c | ||
|
|
70f55c59c0 | ||
|
|
1c1716d833 | ||
|
|
d567f79652 | ||
|
|
ecd4e46a45 | ||
|
|
16fe495d18 | ||
|
|
4f70d23d0e | ||
|
|
290a3c94b7 | ||
|
|
9485dc5a96 | ||
|
|
e6abb69b0e | ||
|
|
e862052bb4 | ||
|
|
4071ad1278 | ||
|
|
60619643e6 | ||
|
|
b818769c1f | ||
|
|
12bc4bab0c | ||
|
|
8fccfa21df | ||
|
|
a697d043fc | ||
|
|
9d812f12cc | ||
|
|
869cf78e98 | ||
|
|
186680cd8c | ||
|
|
5aed6d995d | ||
|
|
3d7a665987 | ||
|
|
10a716969b | ||
|
|
0eb7180fc1 | ||
|
|
b1b4c61b80 | ||
|
|
359cfb5c98 | ||
|
|
8656fd50ce | ||
|
|
25a4dcb653 | ||
|
|
c90a853377 | ||
|
|
18069d8fd2 | ||
|
|
a40f4a75a9 | ||
|
|
5b6460b68c | ||
|
|
c0d1348e65 | ||
|
|
482c163344 | ||
|
|
221d1131b4 | ||
|
|
f19f426449 | ||
|
|
9dd9b6eb71 | ||
|
|
acb0b21d6d | ||
|
|
b17dd3c695 | ||
|
|
fa66ffaf3f | ||
|
|
b106420774 | ||
|
|
c971adb59b | ||
|
|
d6326deeb0 | ||
|
|
483667c919 | ||
|
|
8bef512803 | ||
|
|
501009c11f | ||
|
|
d3d430827f | ||
|
|
2d9b88bd52 | ||
|
|
93d5934ea7 | ||
|
|
180a279558 | ||
|
|
cf38461911 | ||
|
|
2c85539517 | ||
|
|
d651189581 | ||
|
|
f6a8cd556e | ||
|
|
3bde961dc7 | ||
|
|
6396beaef7 | ||
|
|
6bc6defb07 | ||
|
|
732861092f | ||
|
|
9fcc452ed3 | ||
|
|
26302a6ff2 | ||
|
|
62dbfb3837 | ||
|
|
b91cbe9794 | ||
|
|
93b8ba9576 | ||
|
|
23fdbbd03d | ||
|
|
d7a74d84ea | ||
|
|
58e6dd9794 | ||
|
|
907cf2d925 | ||
|
|
ee48a3673d | ||
|
|
c6f362b77f | ||
|
|
6e01c59635 | ||
|
|
d411f66903 | ||
|
|
0768dc1610 | ||
|
|
4c3db16842 | ||
|
|
805fd1dd90 | ||
|
|
c59996b24b | ||
|
|
e0a1e8293b | ||
|
|
e8af9c0233 | ||
|
|
a955d30d64 | ||
|
|
dbab3bb259 | ||
|
|
bd9c4ee99a | ||
|
|
a0cbd3755d | ||
|
|
12323e233f | ||
|
|
8a308db3d4 | ||
|
|
0583dc8b74 | ||
|
|
789a4a3659 | ||
|
|
a87d0451c8 | ||
|
|
82e9309d27 | ||
|
|
8deaa378c9 | ||
|
|
b5363e3552 | ||
|
|
28a10ac340 | ||
|
|
c349d51923 | ||
|
|
ef01745e09 | ||
|
|
c97d6a65d0 | ||
|
|
2062273504 | ||
|
|
6e6436ee41 | ||
|
|
38f4a22bc4 | ||
|
|
3a8b047e3c | ||
|
|
52483ee6bd | ||
|
|
dce1cbc096 | ||
|
|
46c563a9a8 | ||
|
|
1380c2ecce | ||
|
|
71a3818bdd | ||
|
|
e3a343c797 | ||
|
|
195b1a043e | ||
|
|
69e66c327f | ||
|
|
885637cc7d | ||
|
|
90a7c8f787 | ||
|
|
2171c0caa4 | ||
|
|
924a6f9254 | ||
|
|
ad4cffb0c6 | ||
|
|
cf77ffb89d | ||
|
|
b2fdcd7f1c | ||
|
|
094ce2ae18 | ||
|
|
e8cb2c1bfe | ||
|
|
9c6c56c49d | ||
|
|
0d5affede3 | ||
|
|
13f210f403 | ||
|
|
c61ad51883 | ||
|
|
c0842b0797 | ||
|
|
2851079ff0 | ||
|
|
5197524d1c | ||
|
|
78efd1acc6 | ||
|
|
eee0a99b88 | ||
|
|
10c96c394d | ||
|
|
07cc3fb2d9 | ||
|
|
e31f1433bf | ||
|
|
af06c97efd | ||
|
|
400de1d66e | ||
|
|
2a9285eee8 | ||
|
|
785bdde6bd | ||
|
|
071e2dc524 | ||
|
|
fc08d072a4 | ||
|
|
0019485aba | ||
|
|
e76f145b65 | ||
|
|
27d5937f4c | ||
|
|
868c4c5977 | ||
|
|
5a37929ceb | ||
|
|
b1dc2dbf8a | ||
|
|
ecfbef95c7 | ||
|
|
bfd8fbefee | ||
|
|
f8c36104ad | ||
|
|
e26230fb2d | ||
|
|
6417ad0a3c | ||
|
|
0f988d087c | ||
|
|
7c01b64aed | ||
|
|
03130c78a7 | ||
|
|
30ab326d2b | ||
|
|
8d1cba57f8 | ||
|
|
cbfd6c1a66 | ||
|
|
81cb3c82f4 | ||
|
|
e64296e109 | ||
|
|
5872b31781 | ||
|
|
51b801b1c6 | ||
|
|
9ef153c0b6 | ||
|
|
2e236faec7 | ||
|
|
129c356ecf | ||
|
|
d8316b0bdc | ||
|
|
1d3a92f3f1 | ||
|
|
81c858c719 | ||
|
|
341041aedb | ||
|
|
25256b2295 | ||
|
|
13874ba547 | ||
|
|
bde58add62 | ||
|
|
9112c63347 | ||
|
|
78fa2b8d78 | ||
|
|
6922c369f3 | ||
|
|
b0fd438a1d | ||
|
|
99f4f0c7d3 | ||
|
|
b09c1cd242 | ||
|
|
5ca3bf9362 | ||
|
|
c6a9884bde | ||
|
|
43825ca78e | ||
|
|
44eeadb211 | ||
|
|
7011da5fa9 | ||
|
|
c61ddfa9d1 | ||
|
|
e64b6dcb13 | ||
|
|
183dc236e4 | ||
|
|
ef5349dec2 | ||
|
|
b39afc0711 | ||
|
|
a8579b43ac | ||
|
|
fa92eca328 | ||
|
|
42165df29f | ||
|
|
9860569536 | ||
|
|
7aa48a167f | ||
|
|
6e3764da48 | ||
|
|
4d503d6925 | ||
|
|
8e04d40034 | ||
|
|
cb57cd02e0 | ||
|
|
22fe48e477 | ||
|
|
204f73cb05 | ||
|
|
28096abea5 | ||
|
|
2d7eb5cb7f | ||
|
|
e6d6932e21 | ||
|
|
406e5d64c0 | ||
|
|
13756aad9f | ||
|
|
c1a8b16f30 | ||
|
|
e3671285c3 | ||
|
|
b33cff3613 | ||
|
|
afc2a4a75c | ||
|
|
7c4583c87a | ||
|
|
f563815961 | ||
|
|
0ce38f747c | ||
|
|
efce8e916b | ||
|
|
44728c9f93 | ||
|
|
d96a81e4f2 | ||
|
|
f11844374e | ||
|
|
8c63203bb4 | ||
|
|
751299d5f1 | ||
|
|
7d479bf854 | ||
|
|
c812a4ede5 | ||
|
|
a826283111 | ||
|
|
f61f30c1e6 | ||
|
|
8f76e8ba8b | ||
|
|
537d89b9e0 | ||
|
|
0927aaa0f1 | ||
|
|
d17aad797d | ||
|
|
53e611a03a | ||
|
|
7ac1be8a9a | ||
|
|
dd7d70d619 | ||
|
|
b9d1d1e2f4 | ||
|
|
2dc00adec8 | ||
|
|
b97e937f28 | ||
|
|
c54c4e73e6 | ||
|
|
93528597f4 | ||
|
|
a85bb7bfdb | ||
|
|
0f2d00abf3 | ||
|
|
0e4c716177 | ||
|
|
85b77c3d12 | ||
|
|
03884b1aaa | ||
|
|
dbdc76e6ea | ||
|
|
b8aaed368b | ||
|
|
6ec3379153 | ||
|
|
b177aad1ee | ||
|
|
e050c7807d | ||
|
|
f3f7398a8b | ||
|
|
da4311dc74 | ||
|
|
59471f6cac | ||
|
|
d8b92064d7 | ||
|
|
8e96e60179 | ||
|
|
54877176a6 | ||
|
|
a3ad32a3e5 | ||
|
|
602a4f219c | ||
|
|
f24977dc3d | ||
|
|
4607f9ebb0 | ||
|
|
672f4a03f2 | ||
|
|
f0736ade3d | ||
|
|
4da48cea7a | ||
|
|
1b02ea0677 | ||
|
|
0d1bd4c5d0 | ||
|
|
3f08f1a94c | ||
|
|
1069366219 | ||
|
|
0002bd2875 | ||
|
|
823077dd7d | ||
|
|
34971ff3e0 | ||
|
|
965069ba3a | ||
|
|
43766751a4 | ||
|
|
a92da71c6b | ||
|
|
da47985361 | ||
|
|
68ae32c48c | ||
|
|
3373e33d4b | ||
|
|
2839e79ab0 | ||
|
|
5bffbfbe0d | ||
|
|
4080338c1b | ||
|
|
e06e9393c1 | ||
|
|
4bb9fd7226 | ||
|
|
7edc7d74d4 | ||
|
|
9a5dac605c | ||
|
|
c0a781c0bd | ||
|
|
719bea515e | ||
|
|
153eafdcb0 | ||
|
|
2f588cf6ef | ||
|
|
3ad3c474b5 | ||
|
|
73ba4b68be | ||
|
|
b786d8909a | ||
|
|
ab45ec9fa4 | ||
|
|
fcbe56b504 | ||
|
|
693ec7ddf6 | ||
|
|
61b83ab992 | ||
|
|
6ce9b1ab05 | ||
|
|
a5d58d79fc | ||
|
|
dac3249dc4 | ||
|
|
99eddbfa13 | ||
|
|
ea1fc8f358 | ||
|
|
bbb5a0e891 | ||
|
|
3f491fa7cb | ||
|
|
ae007fcebc | ||
|
|
8580a99728 | ||
|
|
3257d2595d | ||
|
|
5434b3ca24 | ||
|
|
1ea6ba273b | ||
|
|
039d9252c6 | ||
|
|
ca67d6eb6d | ||
|
|
7179edfba7 | ||
|
|
baec9785a2 | ||
|
|
ae2039c65d | ||
|
|
3f803653c4 | ||
|
|
6ff67693b9 | ||
|
|
5501d644b9 | ||
|
|
276fccb170 | ||
|
|
e2fac06f64 | ||
|
|
25def1ceaf | ||
|
|
c0f70309dd | ||
|
|
899c1f519c | ||
|
|
5c1363150e | ||
|
|
4153584392 | ||
|
|
2858731063 | ||
|
|
874a0c32e0 | ||
|
|
4f845befaa | ||
|
|
95194f1c5b | ||
|
|
df6bbaa7c5 | ||
|
|
b1ca21a161 | ||
|
|
bc42a54a51 | ||
|
|
1555bd8c53 | ||
|
|
649e3e7bc5 | ||
|
|
ead4e5255e | ||
|
|
5eafb71083 | ||
|
|
8ed36f583d | ||
|
|
3e311fd4c1 | ||
|
|
a4ce90a918 | ||
|
|
ba46389a87 | ||
|
|
f7e07ca7d8 | ||
|
|
3e80a9ee7d | ||
|
|
dfc6f7b1c1 | ||
|
|
753f5f7bc8 | ||
|
|
982271e8ec | ||
|
|
802ec3d86a | ||
|
|
f1b0e33694 | ||
|
|
1d64fb01bd | ||
|
|
086f575a41 | ||
|
|
3cda115cd5 | ||
|
|
d491502750 | ||
|
|
1d4c33d161 | ||
|
|
47a879a961 | ||
|
|
b59184424b | ||
|
|
a7803d1785 | ||
|
|
5415bf87ce | ||
|
|
a33f2dde77 | ||
|
|
bb7ef791de | ||
|
|
aa1a5d3c19 | ||
|
|
a53d8c926e | ||
|
|
714cd8d8df | ||
|
|
c9f7444d06 | ||
|
|
ea05777032 | ||
|
|
14fea4a3a3 | ||
|
|
0613858855 | ||
|
|
6687ed360b | ||
|
|
409506d2b2 | ||
|
|
b96d6e00c3 | ||
|
|
b6ae926fd3 | ||
|
|
508c986166 | ||
|
|
725201040e | ||
|
|
70d7c8fc68 | ||
|
|
05f9861da4 | ||
|
|
c588750c96 | ||
|
|
d00e229198 | ||
|
|
be1a80ebbd | ||
|
|
44706ae343 | ||
|
|
2af41e7c8c | ||
|
|
e5c29a75de | ||
|
|
2a36dc64bd | ||
|
|
dd128c8502 | ||
|
|
3812dc4464 | ||
|
|
851038679a | ||
|
|
146ee9b3c7 | ||
|
|
6c42a77411 | ||
|
|
7e24034fcc | ||
|
|
e6eb550bfd | ||
|
|
2dbb374869 | ||
|
|
e5efbea2ab | ||
|
|
bc74a16149 | ||
|
|
4cd6c58159 | ||
|
|
9e6fbea698 | ||
|
|
e796630120 | ||
|
|
cad5ce54dc | ||
|
|
3c3e4ca2ff | ||
|
|
b9b90c6eef | ||
|
|
747c6131bf | ||
|
|
5c65939330 | ||
|
|
cddcd9ffb3 | ||
|
|
1295c3863e | ||
|
|
99ce6e2dee | ||
|
|
a9d4a15a4f | ||
|
|
2fbf60a846 | ||
|
|
1838344b07 | ||
|
|
fd6aacd0fe | ||
|
|
4b142cbdcc | ||
|
|
802425b4d5 | ||
|
|
745d388cb0 | ||
|
|
1f52ee1dea | ||
|
|
1af7d7970a | ||
|
|
201edc0249 | ||
|
|
2f4a572a23 | ||
|
|
0cf8cca248 | ||
|
|
af4a2589a6 | ||
|
|
2d55491692 | ||
|
|
1007720589 | ||
|
|
b2f470464a | ||
|
|
683c99c8b6 | ||
|
|
428cf691f1 | ||
|
|
bfe54ef7e7 | ||
|
|
40dff18025 | ||
|
|
4d620d91e4 | ||
|
|
a502e1fc56 | ||
|
|
4f0c220d99 | ||
|
|
08a4b21460 | ||
|
|
9fd6f89fc3 | ||
|
|
11652d597f | ||
|
|
f943cd9b4b | ||
|
|
1e392e0bb3 | ||
|
|
e536c58f81 | ||
|
|
63c02cbe35 | ||
|
|
d9a8392723 | ||
|
|
ae52b91d13 | ||
|
|
370062cc55 | ||
|
|
43eae28f55 | ||
|
|
c2c27044b5 | ||
|
|
09722f3ffc | ||
|
|
2cf960b64d | ||
|
|
05b31bdd6e | ||
|
|
e115807351 | ||
|
|
f5b29d2726 | ||
|
|
dfac296402 | ||
|
|
9e2117c955 | ||
|
|
4fdf2ea290 | ||
|
|
10fb465525 | ||
|
|
d44822b7d0 | ||
|
|
18a35c1ab7 | ||
|
|
26cf077cfa | ||
|
|
c3379b44dd | ||
|
|
3ad305aa06 | ||
|
|
89d74da576 | ||
|
|
9ad4177bfa | ||
|
|
20c830c848 | ||
|
|
877bb029f9 | ||
|
|
cfb5cb1a2f | ||
|
|
245f562e1c | ||
|
|
68dc92f0e1 | ||
|
|
ee4089304a | ||
|
|
f3dfa1a955 | ||
|
|
2320e42163 | ||
|
|
bcc35775f4 | ||
|
|
3239536832 | ||
|
|
9c1c414ca7 | ||
|
|
20e5963059 | ||
|
|
70c57e2ad6 | ||
|
|
4639786521 | ||
|
|
71e873ed1f | ||
|
|
c416a82e64 | ||
|
|
539252053f | ||
|
|
da791ef721 | ||
|
|
49bca8998a | ||
|
|
6e14c67e82 | ||
|
|
7fddb9d59e | ||
|
|
006112f3d3 | ||
|
|
e075a430e2 | ||
|
|
134299b413 | ||
|
|
03059c5cd2 | ||
|
|
918d9d8687 | ||
|
|
5017f8b038 | ||
|
|
78052d2ce2 | ||
|
|
8a6b10607d | ||
|
|
034117e253 | ||
|
|
a3ddd6140b | ||
|
|
ac292296fe | ||
|
|
d50a66c8ba | ||
|
|
fb4d3b2ca9 | ||
|
|
fcdd2a9176 | ||
|
|
fa921f0aa9 | ||
|
|
ac221275d9 | ||
|
|
33f8b158a9 | ||
|
|
b9b33ebe79 | ||
|
|
a23816134b | ||
|
|
4e8e84244b | ||
|
|
a94316cc9e | ||
|
|
01a1bc9e6a | ||
|
|
d2b69b2b08 | ||
|
|
91fbba3873 | ||
|
|
a4f3bc853a | ||
|
|
b7ece58caa | ||
|
|
fe354c867d | ||
|
|
326d52f534 | ||
|
|
fbd9ac7d95 | ||
|
|
96018996fc | ||
|
|
9b205b1355 | ||
|
|
56f915eb66 | ||
|
|
46f8868961 | ||
|
|
15089f9d87 | ||
|
|
4783bfe01d | ||
|
|
7b894946bf | ||
|
|
a01e513822 | ||
|
|
3061fd3d8f | ||
|
|
9b281f0a3c | ||
|
|
e433708056 | ||
|
|
43eae51bb3 | ||
|
|
72edbe596e | ||
|
|
53b5533936 | ||
|
|
84c86fd475 | ||
|
|
a9d644e1e8 | ||
|
|
7ed6c7bd7f | ||
|
|
3fd23cee0f | ||
|
|
0665c93c2b | ||
|
|
cd741d961e | ||
|
|
ea855f82b4 | ||
|
|
d775f42703 | ||
|
|
0981d3106d | ||
|
|
a20c7f6f76 | ||
|
|
cf9b57d9fa | ||
|
|
7deedb26f5 | ||
|
|
4c2c7cb2f3 | ||
|
|
7ec180ee7c | ||
|
|
b1ee6c3c95 | ||
|
|
a36fccc9b0 | ||
|
|
36b05d9378 | ||
|
|
2b8ac71253 | ||
|
|
1ffb096508 | ||
|
|
7a66d88e9f | ||
|
|
42c5b9534a | ||
|
|
0b1f3b51e3 | ||
|
|
6646b573e8 | ||
|
|
201762ee50 | ||
|
|
99ee905038 | ||
|
|
d2afbd9216 | ||
|
|
5f49c5f646 | ||
|
|
d91c22ea24 | ||
|
|
4c9745f73c | ||
|
|
edb0ba811f | ||
|
|
a1ca27b997 | ||
|
|
285d187884 | ||
|
|
351c193b98 | ||
|
|
8586d8ae85 | ||
|
|
1a40f433a5 | ||
|
|
6c6f792c6b | ||
|
|
149fa8a577 | ||
|
|
f279476684 | ||
|
|
0ca8ace988 | ||
|
|
80f87ef569 | ||
|
|
904efdd4d8 | ||
|
|
874d3f0b17 | ||
|
|
603005ba18 | ||
|
|
6b286543d4 | ||
|
|
28992c6f13 | ||
|
|
174e208369 | ||
|
|
c632d5145e | ||
|
|
f3bee8c070 | ||
|
|
8bfeb5ac21 | ||
|
|
05dc6f8e4b | ||
|
|
2eb77acf73 | ||
|
|
f7cec9be38 | ||
|
|
8f8ee60eb1 | ||
|
|
8f14c7321b | ||
|
|
aedb80c251 | ||
|
|
e7224c7bda | ||
|
|
cceeb88c6d | ||
|
|
65f39a50c1 | ||
|
|
0a52ed381d | ||
|
|
78f2e8f38a | ||
|
|
9fdc403396 | ||
|
|
9c3a2f052d | ||
|
|
5f26a86bf7 | ||
|
|
b1d9f3d833 | ||
|
|
05ff62d85f | ||
|
|
b0774b89c7 | ||
|
|
1ec797cddb | ||
|
|
2ff2a78694 | ||
|
|
93664d10e6 | ||
|
|
10e5d42522 | ||
|
|
d531d70f1f | ||
|
|
95596bc198 | ||
|
|
b32a92df5b | ||
|
|
ac6c35d7c4 | ||
|
|
2ed8a8b807 | ||
|
|
759e92cc2a | ||
|
|
feede96d6d | ||
|
|
fc33249d32 | ||
|
|
ff48f13746 | ||
|
|
47e61610ca | ||
|
|
4f97aedbb2 | ||
|
|
51203e49f9 | ||
|
|
1906a085ad | ||
|
|
5a3ac6b96e | ||
|
|
1146660fc6 | ||
|
|
2888e1680e | ||
|
|
7bf22659e7 | ||
|
|
86f8bbd47d | ||
|
|
5bc8929795 | ||
|
|
b2853aa811 | ||
|
|
c06fc00f24 | ||
|
|
1e6eec768c | ||
|
|
33d7d77775 | ||
|
|
83b060b573 | ||
|
|
df656cb98d | ||
|
|
cb21ddc438 | ||
|
|
7b45203461 | ||
|
|
ecb07e2abb | ||
|
|
647c40ba5e | ||
|
|
9210fe1a57 | ||
|
|
9efb9741d1 | ||
|
|
87b5c870d5 | ||
|
|
bd34b97e9b | ||
|
|
c74e119993 | ||
|
|
96e23dda6b | ||
|
|
c6a0bc2487 | ||
|
|
d1efbce945 | ||
|
|
381b2b8aa1 | ||
|
|
72478fac83 | ||
|
|
c4fd53d628 | ||
|
|
ec4750f422 | ||
|
|
bc0caee371 | ||
|
|
8087bd82bf | ||
|
|
ec3fb620dc | ||
|
|
d6e5df9092 | ||
|
|
160399cee7 | ||
|
|
4b4e4b30a9 | ||
|
|
67ed21052f | ||
|
|
532f8cfce9 | ||
|
|
a45af9ac39 | ||
|
|
3b487511d7 | ||
|
|
a1cbb799be | ||
|
|
8b9545d622 | ||
|
|
cd325dc3fd | ||
|
|
9768774896 | ||
|
|
e1781bf2ae | ||
|
|
b566a7b692 | ||
|
|
e7aa295b47 | ||
|
|
2d44b44372 | ||
|
|
17e19b8cc6 | ||
|
|
e88b897635 | ||
|
|
7a0bd95113 | ||
|
|
be52c01b9f | ||
|
|
c02319cec1 | ||
|
|
f7507d3f79 | ||
|
|
31d2c84541 | ||
|
|
84d4f7765c | ||
|
|
aed6bcc737 | ||
|
|
73e2229fb4 | ||
|
|
a0633ae5e3 | ||
|
|
bdce70e891 | ||
|
|
3197817a76 | ||
|
|
0a7e8a8c3e | ||
|
|
b23bdc628b | ||
|
|
d727aed293 |
No files matched your search
+4
-6
@@ -9,15 +9,13 @@
|
|||||||
|
|
||||||
#gradle
|
#gradle
|
||||||
/build
|
/build
|
||||||
|
/buildSrc
|
||||||
/.gradle
|
/.gradle
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/eclipse/
|
/eclipse/
|
||||||
/repo/
|
/repo/
|
||||||
/buildSrc
|
|
||||||
|
|
||||||
#Patch rejects
|
|
||||||
*.rej
|
#Patch reject
|
||||||
/patches-/
|
*.rej
|
||||||
# FML changelog
|
|
||||||
changelog.txt
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
Contributing to Forge
|
|
||||||
=====================
|
|
||||||
|
|
||||||
1) Keep patches to Minecraft classes minimal. If you need a lot of things done, you may either add to relevant forge classes or make a new class.
|
|
||||||
|
|
||||||
2) An example mod must be provided for all PRs adding events/hooks to Forge. Whether it's a full mod using your proposed hooks, or just a pastebin containing a simple example, an example mod is required. Please also explain in detail what your new hook does.
|
|
||||||
|
|
||||||
3) Follow Forge coding guidelines (braces on newlines, spaces instead of tabs, etc)
|
|
||||||
|
|
||||||
For more information, refer to [the wiki](https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge)
|
|
||||||
File renamed without changes.
File renamed without changes.
@@ -1,26 +0,0 @@
|
|||||||
* Eloraam *
|
|
||||||
|
|
||||||
* FlowerChild *
|
|
||||||
|
|
||||||
* Hawkye *
|
|
||||||
|
|
||||||
* MALfunction84 *
|
|
||||||
|
|
||||||
Submitted the sleep handler code for his mod (Somnia) and others to use.
|
|
||||||
|
|
||||||
* Scokeev9 *
|
|
||||||
|
|
||||||
Gave permission for ScotTools API to be integrated into MCF, and also supported the Forge by converting his mods to use it.
|
|
||||||
|
|
||||||
ScotTools Background: ScotTools was an API that enabled modders to add blocks to harvesting levels (and many other ease-of-use features to create new tools), and the first tool API that used block material for block breaking efficiency which allowed blocks from mods that didn't use ScotTools API to break with the correct speed.
|
|
||||||
|
|
||||||
* SpaceToad *
|
|
||||||
|
|
||||||
* LexManos *
|
|
||||||
|
|
||||||
* cpw *
|
|
||||||
|
|
||||||
* Minecraft Coder Pack (MCP) *
|
|
||||||
Forge Mod Loader and Minecraft Forge have permission to distribute and automatically download components of MCP and distribute MCP data files.
|
|
||||||
This permission is not transitive and others wishing to redistribute the Minecraft Forge source independently should seek permission of MCP or
|
|
||||||
remove the MCP data files and request their users to download MCP separately.
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
Minecraft Forge Public Licence
|
|
||||||
==============================
|
|
||||||
|
|
||||||
Version 1.0
|
|
||||||
|
|
||||||
0. Definitions
|
|
||||||
--------------
|
|
||||||
|
|
||||||
Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
|
|
||||||
|
|
||||||
User: Anybody that interract with the software in one of the following ways:
|
|
||||||
- play
|
|
||||||
- decompile
|
|
||||||
- recompile or compile
|
|
||||||
- modify
|
|
||||||
|
|
||||||
Minecraft Forge: The Minecraft Forge code, in source form, class file form, as
|
|
||||||
obtained in a standalone fashion or as part of a wider distribution.
|
|
||||||
|
|
||||||
Dependency: Code required to have Minecraft Forge working properly. That can
|
|
||||||
include dependencies required to compile the code as well as modifications in
|
|
||||||
the Minecraft sources that are required to have Minecraft Forge working.
|
|
||||||
|
|
||||||
1. Scope
|
|
||||||
--------
|
|
||||||
|
|
||||||
The present license is granted to any user of Minecraft Forge, for all files included
|
|
||||||
unless stated otherwise in the file itself. As a prerequisite, a user of Minecraft
|
|
||||||
Forge must own a legally aquired copy of Minecraft.
|
|
||||||
|
|
||||||
2. Play rights
|
|
||||||
--------------
|
|
||||||
|
|
||||||
The user of Minecraft Forge is allowed to install the software on a client or
|
|
||||||
a server and to play it without restriction.
|
|
||||||
|
|
||||||
3. Modification rights
|
|
||||||
----------------------
|
|
||||||
|
|
||||||
The user has the right to decompile the source code, look at either the
|
|
||||||
decompiled version or the original source code, and to modify it.
|
|
||||||
|
|
||||||
4. Derivation rights
|
|
||||||
--------------------
|
|
||||||
|
|
||||||
The user has the rights to derive code from Minecraft Forge, that is to say to
|
|
||||||
write code that either extends Minecraft Forge class and interfaces,
|
|
||||||
instantiate the objects declared or calls the functions. This code is known as
|
|
||||||
"derived" code, and can be licensed with conditions different from Minecraft
|
|
||||||
Forge.
|
|
||||||
|
|
||||||
|
|
||||||
5. Distribution rights
|
|
||||||
----------------------
|
|
||||||
|
|
||||||
The user of Minecraft Forge is allowed to redistribute Minecraft Forge in
|
|
||||||
partially, in totallity, or included in a distribution. When distributing
|
|
||||||
binaries or class files, the user must provide means to obtain the sources of
|
|
||||||
the distributed version of Minecraft Forge at no costs. This includes the
|
|
||||||
files as well as any dependency that the code may rely on, including patches to
|
|
||||||
minecraft original sources.
|
|
||||||
|
|
||||||
Modification of Minecraft Forge as well as dependencies, including patches to
|
|
||||||
minecraft original sources, has to remain under the terms of the present
|
|
||||||
license.
|
|
||||||
|
|
||||||
The right to distribute Minecraft Forge does not extend to the right to distribute
|
|
||||||
MCP data files included within Minecraft Forge. These are the property of the MCP
|
|
||||||
project and should be removed from any customized distribution of Minecraft Forge
|
|
||||||
or permission sought separately from the MCP team.
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
SoundSystem CodecIBXM Class License:
|
|
||||||
|
|
||||||
You are free to use this class for any purpose, commercial or otherwise.
|
|
||||||
You may modify this class or source code, and distribute it any way you
|
|
||||||
like, provided the following conditions are met:
|
|
||||||
|
|
||||||
1) You may not falsely claim to be the author of this class or any
|
|
||||||
unmodified portion of it.
|
|
||||||
2) You may not copyright this class or a modified version of it and then
|
|
||||||
sue me for copyright infringement.
|
|
||||||
3) If you modify the source code, you must clearly document the changes
|
|
||||||
made before redistributing the modified source code, so other users know
|
|
||||||
it is not the original code.
|
|
||||||
4) You are not required to give me credit for this class in any derived
|
|
||||||
work, but if you do, you must also mention my website:
|
|
||||||
http://www.paulscode.com
|
|
||||||
5) I the author will not be responsible for any damages (physical,
|
|
||||||
financial, or otherwise) caused by the use if this class or any
|
|
||||||
portion of it.
|
|
||||||
6) I the author do not guarantee, warrant, or make any representations,
|
|
||||||
either expressed or implied, regarding the use of this class or any
|
|
||||||
portion of it.
|
|
||||||
|
|
||||||
Author: Paul Lamb
|
|
||||||
http://www.paulscode.com
|
|
||||||
|
|
||||||
|
|
||||||
This software is based on or using the IBXM library available from
|
|
||||||
http://www.geocities.com/sunet2000/
|
|
||||||
|
|
||||||
|
|
||||||
IBXM is copyright (c) 2007, Martin Cameron, and is licensed under the BSD License.
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
Neither the name of mumart nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
+83
-25
@@ -1,36 +1,94 @@
|
|||||||
*** HOW TO INSTALL ***
|
This is Forge Mod Loader, or FML for short, by cpw.
|
||||||
For Mod Users:
|
|
||||||
|
|
||||||
Download the latest installer from http://files.minecraftforge.net and follow instructions given by the installer.
|
More information can be found at https://github.com/MinecraftForge/FML/wiki
|
||||||
|
|
||||||
|
It is a clean reimplementation of a mod loading system for client and server.
|
||||||
|
|
||||||
For Mod Devs:
|
It can be installed on its own, or as part of Minecraft Forge.
|
||||||
|
|
||||||
Download the latest Forge source distribution from http://files.minecraftforge.net and unzip it to a folder.
|
----------------------
|
||||||
Open a command prompt, navigate to the directory where you unzipped the Forge sources, and run:
|
About Forge Mod Loader
|
||||||
If you have Gradle: gradle setupDevWorkspace
|
----------------------
|
||||||
If you DO NOT have Gradle installed:
|
|
||||||
Windows: ./gradlew.bat setupDevWorkspace
|
|
||||||
MacOS/Linux: ./gradlew setupDevWorkspace
|
|
||||||
|
|
||||||
If you wish to use the Eclipse IDE, run gradle eclipse instead of gradle setupDevWorkspace, or install the Gradle plugin for Eclipse and import the Forge source folder as a Gradle project.
|
Environments and compatibility
|
||||||
|
==============================
|
||||||
|
FML covers two main environments: client and server. All environments share
|
||||||
|
the main mod loading code base, with additional varying hooks based on the
|
||||||
|
specific environment.
|
||||||
|
|
||||||
To get the decompiled classes:
|
There are some very visible changes to the client when FML is installed.
|
||||||
If you have Gradle: gradle setupDecompWorkspace
|
|
||||||
If you DO NOT have Gradle installed:
|
|
||||||
Windows: ./gradlew.bat setupDecompWorkspace
|
|
||||||
MacOS/Linux: ./gradlew setupDecompWorkspace
|
|
||||||
|
|
||||||
For Contributors: (Note: This assumes you have Gradle installed. If you don't, use ./gradlew(.bat) instead of gradle.
|
There are some bukkit compatibility hooks available, consult MCPC+ for more
|
||||||
|
information.
|
||||||
|
|
||||||
Clone this repository to a folder.
|
Minecraft Forge in all cases bundles FML as it's modloading technology of choice
|
||||||
Open a command prompt and navigate to the folder where you cloned this repo.
|
because FML is open source, freely distributable, and can be easily updated by
|
||||||
Run gradle setupForge to setup your development environment.
|
contributors through github.
|
||||||
|
|
||||||
To use Eclipse, point your Eclipse workspace at the eclipse folder inside the repo.
|
Notable integrations
|
||||||
|
====================
|
||||||
|
Optifine has FML compatibility. It varies from Optifine release to release, however
|
||||||
|
in general it will work well alongside an FML or
|
||||||
|
Minecraft Forge installation. FML will detect and ensure the good operation of
|
||||||
|
Optifine (you can see it in your client as an additional data line on the
|
||||||
|
bottom left).
|
||||||
|
|
||||||
|
Mod information
|
||||||
|
===============
|
||||||
|
FML exposes the mod information through a mod list visible on the main screen as
|
||||||
|
well as some small branding enhancements. For full data mods need to provide an
|
||||||
|
information file. This file is a standard format so hopefully tools providing
|
||||||
|
launch capabilities can also leverage this content.
|
||||||
|
|
||||||
Requirements (for both mod devs and contributors):
|
-------------------------------
|
||||||
You must have a JDK installed and accessible.
|
Binary installation information
|
||||||
If you do not wish to use the gradle wrapper, you can install Gradle from http://www.gradle.org/ .
|
-------------------------------
|
||||||
|
If you have downloaded a binary zip file you can install it as follows (client
|
||||||
|
or server):
|
||||||
|
|
||||||
|
Installation
|
||||||
|
============
|
||||||
|
To install on a server, simply execute the FML or Forge jar file, with a copy of
|
||||||
|
minecraft_server-@[email protected] placed in the same directory. FML will launch
|
||||||
|
it's patched copy.
|
||||||
|
|
||||||
|
To install on a client, run the installer by executing java -jar <installer>.jar.
|
||||||
|
It will identify the location of you minecraft installation (this can be customized)
|
||||||
|
and create a new profile "FML" there.
|
||||||
|
|
||||||
|
Forge Installation
|
||||||
|
==================
|
||||||
|
This code also ships as a part of Minecraft Forge. You do not need to install it
|
||||||
|
separately from your Minecraft Forge installation. Minecraft Forge contains the
|
||||||
|
exact same code as this. You should not install FML if you are also installing
|
||||||
|
Minecraft Forge.
|
||||||
|
|
||||||
|
-------------------------------------------
|
||||||
|
Source installation information for modders
|
||||||
|
-------------------------------------------
|
||||||
|
This code follows the Minecraft Forge installation methodology. It will apply
|
||||||
|
some small patches to the vanilla MCP source code, giving you and it access
|
||||||
|
to some of the data and functions you need to build a successful mod.
|
||||||
|
|
||||||
|
Note also that the patches are built against "unrenamed" MCP source code (aka
|
||||||
|
srgnames) - this means that you will not be able to read them directly against
|
||||||
|
normal code.
|
||||||
|
|
||||||
|
Source pack installation information:
|
||||||
|
|
||||||
|
Standalone source installation
|
||||||
|
==============================
|
||||||
|
|
||||||
|
To install this source code for development purposes, extract this zip file.
|
||||||
|
It ships with a demonstration mod. Run "gradle setupDevWorkspace" to create
|
||||||
|
a gradle environment primed with FML. Run gradle eclipse or gradle idea to
|
||||||
|
create an IDE workspace of your choice.
|
||||||
|
Refer to ForgeGradle for more information about the gradle environment
|
||||||
|
|
||||||
|
Forge source installation
|
||||||
|
=========================
|
||||||
|
MinecraftForge ships with this code and installs it as part of the forge
|
||||||
|
installation process, no further action is required on your part.
|
||||||
|
|
||||||
|
For reference this is version @MAJOR@.@MINOR@.@REV@.@BUILD@ of FML
|
||||||
|
for Minecraft version @MCVERSION@.
|
||||||
+62
-78
@@ -16,17 +16,12 @@ buildscript {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
configurations {
|
import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
|
||||||
deployJars
|
|
||||||
}
|
|
||||||
|
|
||||||
import static net.minecraftforge.gradle.dev.ForgeDevPlugin.*
|
|
||||||
|
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
apply plugin: 'forgedev'
|
apply plugin: 'fmldev'
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
|
||||||
flatDir {
|
flatDir {
|
||||||
name "fileRepo"
|
name "fileRepo"
|
||||||
dirs "repo"
|
dirs "repo"
|
||||||
@@ -34,93 +29,82 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = '1.7.10'
|
version = '1.7.9'
|
||||||
mcpVersion = '9.05'
|
mcpVersion = '9.04'
|
||||||
fmlDir = projectDir.getAbsolutePath() + "/fml";
|
fmlDir = projectDir.getAbsolutePath();
|
||||||
mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
|
mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
|
||||||
tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
|
tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
|
||||||
installerVersion = "1.4"
|
installerVersion = "1.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = 'net.minecraftforge'
|
group = 'cpw.mods'
|
||||||
version = getVersionFromJava(getProject(), 'src/main/java/net/minecraftforge/common/ForgeVersion.java')
|
version = getVersionFromGit(getProject())
|
||||||
|
|
||||||
jenkins {
|
jenkins {
|
||||||
job = 'minecraftforge'
|
job = 'fml'
|
||||||
}
|
|
||||||
|
|
||||||
// crowdin stuff
|
|
||||||
if (project.hasProperty("crowdinKey"))
|
|
||||||
tasks.getLocalizations.apiKey = project.crowdinKey
|
|
||||||
|
|
||||||
|
|
||||||
launch4j {
|
|
||||||
jreMinVersion = '1.6.0'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadArchives {
|
uploadArchives {
|
||||||
repositories {
|
repositories {
|
||||||
add getProject().repositories.mavenLocal()
|
|
||||||
}
|
|
||||||
repositories.mavenDeployer {
|
|
||||||
configuration = configurations.deployJars
|
|
||||||
|
|
||||||
if (project.hasProperty("filesmaven")) {
|
if (project.hasProperty("filesmaven")) {
|
||||||
logger.info('Publishing to files server')
|
logger.info('Publishing to files server')
|
||||||
repository(url: project.filesmaven.url) {
|
|
||||||
authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
|
mavenDeployer {
|
||||||
|
configuration = configurations.deployJars
|
||||||
|
|
||||||
|
repository(url: project.filesmaven.url) {
|
||||||
|
authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
|
||||||
|
}
|
||||||
|
|
||||||
|
pom {
|
||||||
|
groupId = project.group
|
||||||
|
version = project.version
|
||||||
|
artifactId = project.archivesBaseName
|
||||||
|
project {
|
||||||
|
name project.archivesBaseName
|
||||||
|
packaging 'jar'
|
||||||
|
description 'ForgeModLoader'
|
||||||
|
url 'https://github.com/MinecraftForge/FML'
|
||||||
|
|
||||||
|
scm {
|
||||||
|
url 'https://github.com/MinecraftForge/FML'
|
||||||
|
connection 'scm:git:git://github.com/MinecraftForge/FML.git'
|
||||||
|
developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
|
||||||
|
}
|
||||||
|
|
||||||
|
issueManagement {
|
||||||
|
system 'github'
|
||||||
|
url 'https://github.com/MinecraftForge/FML/issues'
|
||||||
|
}
|
||||||
|
|
||||||
|
licenses {
|
||||||
|
license {
|
||||||
|
name 'GNU Lesser Public License (LGPL), Version 2.1'
|
||||||
|
url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
|
||||||
|
distribution 'repo'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
developers {
|
||||||
|
developer {
|
||||||
|
id 'cpw'
|
||||||
|
name 'cpw'
|
||||||
|
roles { role 'developer' }
|
||||||
|
}
|
||||||
|
developer {
|
||||||
|
id 'LexManos'
|
||||||
|
name 'Lex Manos'
|
||||||
|
roles { role 'developer' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.info('Publishing to repo folder')
|
logger.info('Publishing to repo folder')
|
||||||
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
|
|
||||||
}
|
mavenDeployer {
|
||||||
|
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
|
||||||
pom {
|
|
||||||
groupId = project.group
|
|
||||||
version = project.version
|
|
||||||
artifactId = project.archivesBaseName
|
|
||||||
}
|
|
||||||
pom.project {
|
|
||||||
name project.archivesBaseName
|
|
||||||
packaging 'jar'
|
|
||||||
description 'Minecraft Forge API'
|
|
||||||
url 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
|
|
||||||
scm {
|
|
||||||
url 'https://github.com/MinecraftForge/MinecraftForge'
|
|
||||||
connection 'scm:git:git://github.com/MinecraftForge/MinecraftForge.git'
|
|
||||||
developerConnection 'scm:git:[email protected]:MinecraftForge/MinecraftForge.git'
|
|
||||||
}
|
|
||||||
|
|
||||||
issueManagement {
|
|
||||||
system 'github'
|
|
||||||
url 'https://github.com/MinecraftForge/MinecraftForge/issues'
|
|
||||||
}
|
|
||||||
|
|
||||||
licenses {
|
|
||||||
license {
|
|
||||||
name 'Forge Public License'
|
|
||||||
url 'https://raw.github.com/MinecraftForge/MinecraftForge/master/MinecraftForge-License.txt'
|
|
||||||
distribution 'repo'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
developers {
|
|
||||||
developer {
|
|
||||||
id 'cpw'
|
|
||||||
name 'cpw'
|
|
||||||
roles { role 'developer' }
|
|
||||||
}
|
|
||||||
developer {
|
|
||||||
id 'LexManos'
|
|
||||||
name 'Lex Manos'
|
|
||||||
roles { role 'developer' }
|
|
||||||
}
|
|
||||||
developer {
|
|
||||||
id 'AbrarSyed'
|
|
||||||
name 'Abrar Syed'
|
|
||||||
roles { role 'contributor' }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File renamed without changes.
File diff suppressed because it is too large.
Load diff
File renamed without changes.
+17378
File diff suppressed because it is too large.
Load diff
+22664
File diff suppressed because it is too large.
Load diff
@@ -38,8 +38,8 @@ DirNatives = %(DirJars)s/bin/natives
|
|||||||
Client = %(DirJars)s/bin/minecraft.jar
|
Client = %(DirJars)s/bin/minecraft.jar
|
||||||
Server = %(DirJars)s/minecraft_server.jar
|
Server = %(DirJars)s/minecraft_server.jar
|
||||||
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
||||||
MD5Client = 595007b790548806f66762507203b896
|
MD5Client = 7a304554fdea879a799efe6eaedd8c95
|
||||||
MD5Server = a1de2db50b0d8bfac45be3e01e54bddf
|
MD5Server = c48168f463e935262ea65b702f175153
|
||||||
|
|
||||||
[RETROGUARD]
|
[RETROGUARD]
|
||||||
Location = %(DirRuntime)s/bin/retroguard.jar
|
Location = %(DirRuntime)s/bin/retroguard.jar
|
||||||
@@ -129,7 +129,7 @@ LogFile = %(DirLogs)s/mcp.log
|
|||||||
LogFileErr = %(DirLogs)s/mcperr.log
|
LogFileErr = %(DirLogs)s/mcperr.log
|
||||||
UpdateUrl = http://mcp.ocean-labs.de/files/mcprolling_{version}/
|
UpdateUrl = http://mcp.ocean-labs.de/files/mcprolling_{version}/
|
||||||
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
|
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
|
||||||
RGIndex = 154000
|
RGIndex = 145000
|
||||||
ParamIndex = 45000
|
ParamIndex = 45000
|
||||||
|
|
||||||
[ASTYLE]
|
[ASTYLE]
|
||||||
File renamed without changes.
+1570
File diff suppressed because it is too large.
Load diff
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,13 @@
|
|||||||
|
diff -r -U 3 minecraft_server\net\minecraft\server\dedicated\DedicatedServer.java minecraft_server_patched\net\minecraft\server\dedicated\DedicatedServer.java
|
||||||
|
--- minecraft_server\net\minecraft\server\dedicated\DedicatedServer.java
|
||||||
|
+++ minecraft_server_patched\net\minecraft\server\dedicated\DedicatedServer.java
|
||||||
|
@@ -261,7 +261,7 @@
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
- protected void func_71190_q() {
|
||||||
|
+ public void func_71190_q() {
|
||||||
|
super.func_71190_q();
|
||||||
|
this.func_71333_ah();
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
diff -r -U 3 minecraft\net\minecraft\server\integrated\IntegratedServer.java minecraft_patched\net\minecraft\server\integrated\IntegratedServer.java
|
||||||
|
--- minecraft\net\minecraft\server\integrated\IntegratedServer.java
|
||||||
|
+++ minecraft_patched\net\minecraft\server\integrated\IntegratedServer.java
|
||||||
|
@@ -95,7 +95,7 @@
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
- protected void func_71217_p() {
|
||||||
|
+ public void func_71217_p() {
|
||||||
|
boolean var1 = this.field_71348_o;
|
||||||
|
this.field_71348_o = Minecraft.func_71410_x().func_147114_u() != null && Minecraft.func_71410_x().func_147113_T();
|
||||||
|
if(!var1 && this.field_71348_o) {
|
||||||
File renamed without changes.
@@ -0,0 +1,4 @@
|
|||||||
|
[VERSION]
|
||||||
|
MCPVersion = 9.04
|
||||||
|
ClientVersion = 1.7.9
|
||||||
|
ServerVersion = 1.7.9
|
||||||
Binary file not shown.
@@ -1,14 +0,0 @@
|
|||||||
* text eol=lf
|
|
||||||
*.bat text eol=crlf
|
|
||||||
*.patch text eol=lf
|
|
||||||
*.java text eol=lf
|
|
||||||
*.gradle text eol=crlf
|
|
||||||
*.png binary
|
|
||||||
*.exe binary
|
|
||||||
*.dll binary
|
|
||||||
*.jar binary
|
|
||||||
*.lzma binary
|
|
||||||
*.zip binary
|
|
||||||
*.pyd binary
|
|
||||||
*.cfg text eol=lf
|
|
||||||
*.py text eol=lf
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
#eclipse
|
|
||||||
/bin
|
|
||||||
/.settings
|
|
||||||
/.classpath
|
|
||||||
|
|
||||||
#idea
|
|
||||||
/.idea
|
|
||||||
*.iml
|
|
||||||
|
|
||||||
#gradle
|
|
||||||
/build
|
|
||||||
/buildSrc
|
|
||||||
/.gradle
|
|
||||||
|
|
||||||
#occupational hazards
|
|
||||||
/eclipse/
|
|
||||||
/repo/
|
|
||||||
|
|
||||||
|
|
||||||
#Patch reject
|
|
||||||
*.rej
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
This is Forge Mod Loader, or FML for short, by cpw.
|
|
||||||
|
|
||||||
More information can be found at https://github.com/MinecraftForge/FML/wiki
|
|
||||||
|
|
||||||
It is a clean reimplementation of a mod loading system for client and server.
|
|
||||||
|
|
||||||
It can be installed on its own, or as part of Minecraft Forge.
|
|
||||||
|
|
||||||
----------------------
|
|
||||||
About Forge Mod Loader
|
|
||||||
----------------------
|
|
||||||
|
|
||||||
Environments and compatibility
|
|
||||||
==============================
|
|
||||||
FML covers two main environments: client and server. All environments share
|
|
||||||
the main mod loading code base, with additional varying hooks based on the
|
|
||||||
specific environment.
|
|
||||||
|
|
||||||
There are some very visible changes to the client when FML is installed.
|
|
||||||
|
|
||||||
There are some bukkit compatibility hooks available, consult MCPC+, now known as Cauldron
|
|
||||||
for more information.
|
|
||||||
|
|
||||||
Minecraft Forge in all cases bundles FML as it's modloading technology of choice
|
|
||||||
because FML is open source, freely distributable, and can be easily updated by
|
|
||||||
contributors through github.
|
|
||||||
|
|
||||||
Notable integrations
|
|
||||||
====================
|
|
||||||
Optifine has FML compatibility. It varies from Optifine release to release, however
|
|
||||||
in general it will work well alongside an FML or
|
|
||||||
Minecraft Forge installation. FML will detect and ensure the good operation of
|
|
||||||
Optifine (you can see it in your client as an additional data line on the
|
|
||||||
bottom left).
|
|
||||||
|
|
||||||
Mod information
|
|
||||||
===============
|
|
||||||
FML exposes the mod information through a mod list visible on the main screen as
|
|
||||||
well as some small branding enhancements. For full data mods need to provide an
|
|
||||||
information file. This file is a standard format so hopefully tools providing
|
|
||||||
launch capabilities can also leverage this content.
|
|
||||||
|
|
||||||
-------------------------------
|
|
||||||
Binary installation information
|
|
||||||
-------------------------------
|
|
||||||
If you have downloaded a binary zip file you can install it as follows (client
|
|
||||||
or server):
|
|
||||||
|
|
||||||
Installation
|
|
||||||
============
|
|
||||||
To install on a server, simply execute the FML or Forge jar file, with a copy of
|
|
||||||
minecraft_server-@[email protected] placed in the same directory. FML will launch
|
|
||||||
it's patched copy.
|
|
||||||
|
|
||||||
To install on a client, run the installer by executing java -jar <installer>.jar.
|
|
||||||
It will identify the location of you minecraft installation (this can be customized)
|
|
||||||
and create a new profile "FML" there.
|
|
||||||
|
|
||||||
Forge Installation
|
|
||||||
==================
|
|
||||||
This code also ships as a part of Minecraft Forge. You do not need to install it
|
|
||||||
separately from your Minecraft Forge installation. Minecraft Forge contains the
|
|
||||||
exact same code as this. You should not install FML if you are also installing
|
|
||||||
Minecraft Forge.
|
|
||||||
|
|
||||||
-------------------------------------------
|
|
||||||
Source installation information for modders
|
|
||||||
-------------------------------------------
|
|
||||||
This code follows the Minecraft Forge installation methodology. It will apply
|
|
||||||
some small patches to the vanilla MCP source code, giving you and it access
|
|
||||||
to some of the data and functions you need to build a successful mod.
|
|
||||||
|
|
||||||
Note also that the patches are built against "unrenamed" MCP source code (aka
|
|
||||||
srgnames) - this means that you will not be able to read them directly against
|
|
||||||
normal code.
|
|
||||||
|
|
||||||
Source pack installation information:
|
|
||||||
|
|
||||||
Standalone source installation
|
|
||||||
==============================
|
|
||||||
|
|
||||||
To install this source code for development purposes, extract this zip file.
|
|
||||||
It ships with a demonstration mod. Run "gradle setupDevWorkspace" to create
|
|
||||||
a gradle environment primed with FML. Run gradle eclipse or gradle idea to
|
|
||||||
create an IDE workspace of your choice.
|
|
||||||
Refer to ForgeGradle for more information about the gradle environment
|
|
||||||
|
|
||||||
Forge source installation
|
|
||||||
=========================
|
|
||||||
MinecraftForge ships with this code and installs it as part of the forge
|
|
||||||
installation process, no further action is required on your part.
|
|
||||||
|
|
||||||
For reference this is version @MAJOR@.@MINOR@.@REV@.@BUILD@ of FML
|
|
||||||
for Minecraft version @MCVERSION@.
|
|
||||||
@@ -1,111 +0,0 @@
|
|||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
mavenLocal()
|
|
||||||
maven {
|
|
||||||
name = "forge"
|
|
||||||
url = "http://files.minecraftforge.net/maven"
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name = "sonatype"
|
|
||||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
import static net.minecraftforge.gradle.dev.FmlDevPlugin.*
|
|
||||||
|
|
||||||
apply plugin: 'maven'
|
|
||||||
apply plugin: 'fmldev'
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
flatDir {
|
|
||||||
name "fileRepo"
|
|
||||||
dirs "repo"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
minecraft {
|
|
||||||
version = '1.7.10'
|
|
||||||
mcpVersion = '9.05'
|
|
||||||
fmlDir = projectDir.getAbsolutePath();
|
|
||||||
mainClass = 'cpw.mods.fml.relauncher.ServerLaunchWrapper'
|
|
||||||
tweakClass = 'cpw.mods.fml.common.launcher.FMLTweaker'
|
|
||||||
installerVersion = "1.4"
|
|
||||||
}
|
|
||||||
|
|
||||||
group = 'net.minecraftforge'
|
|
||||||
version = getVersionFromGit(getProject())
|
|
||||||
|
|
||||||
jenkins {
|
|
||||||
job = 'fml'
|
|
||||||
}
|
|
||||||
|
|
||||||
uploadArchives {
|
|
||||||
repositories {
|
|
||||||
if (project.hasProperty("filesmaven")) {
|
|
||||||
logger.info('Publishing to files server')
|
|
||||||
|
|
||||||
mavenDeployer {
|
|
||||||
configuration = configurations.deployJars
|
|
||||||
|
|
||||||
repository(url: project.filesmaven.url) {
|
|
||||||
authentication(userName: project.filesmaven.username, privateKey: project.filesmaven.key)
|
|
||||||
}
|
|
||||||
|
|
||||||
pom {
|
|
||||||
groupId = project.group
|
|
||||||
version = project.version
|
|
||||||
artifactId = project.archivesBaseName
|
|
||||||
project {
|
|
||||||
name project.archivesBaseName
|
|
||||||
packaging 'jar'
|
|
||||||
description 'ForgeModLoader'
|
|
||||||
url 'https://github.com/MinecraftForge/FML'
|
|
||||||
|
|
||||||
scm {
|
|
||||||
url 'https://github.com/MinecraftForge/FML'
|
|
||||||
connection 'scm:git:git://github.com/MinecraftForge/FML.git'
|
|
||||||
developerConnection 'scm:git:[email protected]:MinecraftForge/FML.git'
|
|
||||||
}
|
|
||||||
|
|
||||||
issueManagement {
|
|
||||||
system 'github'
|
|
||||||
url 'https://github.com/MinecraftForge/FML/issues'
|
|
||||||
}
|
|
||||||
|
|
||||||
licenses {
|
|
||||||
license {
|
|
||||||
name 'GNU Lesser Public License (LGPL), Version 2.1'
|
|
||||||
url 'http://www.gnu.org/licenses/lgpl-2.1.txt'
|
|
||||||
distribution 'repo'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
developers {
|
|
||||||
developer {
|
|
||||||
id 'cpw'
|
|
||||||
name 'cpw'
|
|
||||||
roles { role 'developer' }
|
|
||||||
}
|
|
||||||
developer {
|
|
||||||
id 'LexManos'
|
|
||||||
name 'Lex Manos'
|
|
||||||
roles { role 'developer' }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logger.info('Publishing to repo folder')
|
|
||||||
|
|
||||||
mavenDeployer {
|
|
||||||
repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-3543
File diff suppressed because it is too large.
Load diff
-22006
File diff suppressed because it is too large.
Load diff
@@ -1,4 +0,0 @@
|
|||||||
[VERSION]
|
|
||||||
MCPVersion = 9.05
|
|
||||||
ClientVersion = 1.7.10
|
|
||||||
ServerVersion = 1.7.10
|
|
||||||
Binary file not shown.
Vendored
-164
@@ -1,164 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
##
|
|
||||||
## Gradle start up script for UN*X
|
|
||||||
##
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS=""
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=`basename "$0"`
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD="maximum"
|
|
||||||
|
|
||||||
warn ( ) {
|
|
||||||
echo "$*"
|
|
||||||
}
|
|
||||||
|
|
||||||
die ( ) {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
case "`uname`" in
|
|
||||||
CYGWIN* )
|
|
||||||
cygwin=true
|
|
||||||
;;
|
|
||||||
Darwin* )
|
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# For Cygwin, ensure paths are in UNIX format before anything is touched.
|
|
||||||
if $cygwin ; then
|
|
||||||
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
PRG="$0"
|
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
|
||||||
ls=`ls -ld "$PRG"`
|
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
|
||||||
PRG="$link"
|
|
||||||
else
|
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >&-
|
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >&-
|
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
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.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
|
||||||
if [ $? -eq 0 ] ; then
|
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
ulimit -n $MAX_FD
|
|
||||||
if [ $? -ne 0 ] ; then
|
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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, switch paths to Windows format before running java
|
|
||||||
if $cygwin ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
# 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
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
|
||||||
function splitJvmOpts() {
|
|
||||||
JVM_OPTS=("$@")
|
|
||||||
}
|
|
||||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
|
||||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
|
||||||
|
|
||||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
|
||||||
Vendored
-90
@@ -1,90 +0,0 @@
|
|||||||
@if "%DEBUG%" == "" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
@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=
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if "%ERRORLEVEL%" == "0" goto init
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto init
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:init
|
|
||||||
@rem Get command-line arguments, handling Windowz variants
|
|
||||||
|
|
||||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
|
||||||
if "%@eval[2+2]" == "4" goto 4NT_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=%*
|
|
||||||
goto execute
|
|
||||||
|
|
||||||
:4NT_args
|
|
||||||
@rem Get arguments from the 4NT Shell from JP Software
|
|
||||||
set CMD_LINE_ARGS=%$
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@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 End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "@minecraft_version@-@project@@version@",
|
|
||||||
"time": "@timestamp@",
|
|
||||||
"releaseTime": "1960-01-01T00:00:00-0700",
|
|
||||||
"type": "release",
|
|
||||||
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.10",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "net.minecraft:launchwrapper:1.11"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.findbugs:jsr305:1.3.9",
|
|
||||||
"children": ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.ow2.asm:asm-debug-all:5.0.3",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.typesafe:config:1.2.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-compiler:2.11.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-library:2.11.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-reflect:2.11.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "lzma:lzma:0.0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.3.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:17.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.launchwrapper.Launch"
|
|
||||||
}
|
|
||||||
@@ -1,195 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "@minecraft_version@-@project@@version@",
|
|
||||||
"time": "@timestamp@",
|
|
||||||
"releaseTime": "1960-01-01T00:00:00-0700",
|
|
||||||
"type": "release",
|
|
||||||
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "net.minecraft:launchwrapper:1.9",
|
|
||||||
"comment" : "Important for FML, we add this"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.ow2.asm:asm-debug-all:4.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2",
|
|
||||||
"comment" : "Important for FML, we add this"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-library:2.10.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2",
|
|
||||||
"comment" : "Important for FML, we add this"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-compiler:2.10.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2",
|
|
||||||
"comment" : "Important for FML, we add this"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "lzma:lzma:0.0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:15.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.13"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.launchwrapper.Launch",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.4"
|
|
||||||
}
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "1.7.10-pre3",
|
|
||||||
"time": "2014-05-14T17:29:23+02:00",
|
|
||||||
"releaseTime": "2014-05-14T17:29:23+02:00",
|
|
||||||
"type": "snapshot",
|
|
||||||
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.4",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.2.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:15.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.13"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.client.main.Main"
|
|
||||||
}
|
|
||||||
@@ -1,188 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "@minecraft_version@-@project@@version@",
|
|
||||||
"time": "@timestamp@",
|
|
||||||
"releaseTime": "1960-01-01T00:00:00-0700",
|
|
||||||
"type": "release",
|
|
||||||
"minecraftArguments": "--version FML_DEV --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.10",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "net.minecraft:launchwrapper:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.ow2.asm:asm-debug-all:4.1",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-library:2.10.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-compiler:2.10.2",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
|
||||||
"children" : ["sources"],
|
|
||||||
"url" : "http://repo.maven.apache.org/maven2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "lzma:lzma:0.0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.2.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:16.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.2.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.13"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.launchwrapper.Launch"
|
|
||||||
}
|
|
||||||
@@ -1,209 +0,0 @@
|
|||||||
{
|
|
||||||
"install": {
|
|
||||||
"profileName": "@project@",
|
|
||||||
"target":"@minecraft_version@-@project@@version@",
|
|
||||||
"path":"@artifact@",
|
|
||||||
"version":"@project@ @version@",
|
|
||||||
"filePath":"@universal_jar@",
|
|
||||||
"welcome":"Welcome to the simple @project@ installer.",
|
|
||||||
"minecraft":"@minecraft_version@",
|
|
||||||
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
|
|
||||||
"logo":"/big_logo.png"
|
|
||||||
},
|
|
||||||
"versionInfo": {
|
|
||||||
"id": "@minecraft_version@-@project@@version@",
|
|
||||||
"time": "@timestamp@",
|
|
||||||
"releaseTime": "1960-01-01T00:00:00-0700",
|
|
||||||
"type": "release",
|
|
||||||
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.10",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "@artifact@",
|
|
||||||
"url": "http://files.minecraftforge.net/maven/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.minecraft:launchwrapper:1.9",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.ow2.asm:asm-all:4.1",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-library:2.10.2",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "6ba65d12cd09d441083262d6f73d2257fec7c663", "65de4339eaed1c3675485fb03a3532fecfd8e8cd" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-compiler:2.10.2",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "64c8b1380cc53d6850823d6e4e7ae984aa44ef9c", "99fd0ffb66f3088b0cd1071315fd5eb2b2b070ff" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "lzma:lzma:0.0.1",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:16.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.2.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.13"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.launchwrapper.Launch"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "1.7.10-pre4",
|
|
||||||
"time": "2014-05-14T18:29:23+02:00",
|
|
||||||
"releaseTime": "2014-05-14T18:29:23+02:00",
|
|
||||||
"type": "snapshot",
|
|
||||||
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.10",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:15.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.13"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.client.main.Main"
|
|
||||||
}
|
|
||||||
@@ -1,132 +0,0 @@
|
|||||||
{
|
|
||||||
"install": {
|
|
||||||
"profileName": "@project@",
|
|
||||||
"target":"@minecraft_version@-@project@@version@",
|
|
||||||
"path":"@artifact@",
|
|
||||||
"version":"@project@ @version@",
|
|
||||||
"filePath":"@universal_jar@",
|
|
||||||
"welcome":"Welcome to the simple @project@ installer.",
|
|
||||||
"minecraft":"@minecraft_version@",
|
|
||||||
"mirrorList" : "http://files.minecraftforge.net/mirror-brand.list",
|
|
||||||
"logo":"/big_logo.png"
|
|
||||||
},
|
|
||||||
"versionInfo": {
|
|
||||||
"id": "@minecraft_version@-@project@@version@",
|
|
||||||
"time": "@timestamp@",
|
|
||||||
"releaseTime": "1960-01-01T00:00:00-0700",
|
|
||||||
"type": "release",
|
|
||||||
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker",
|
|
||||||
"mainClass": "net.minecraft.launchwrapper.Launch",
|
|
||||||
"minimumLauncherVersion": 14,
|
|
||||||
"assets": "@minecraft_version@",
|
|
||||||
"inheritsFrom": "@minecraft_version@",
|
|
||||||
"jar": "@minecraft_version@",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "@artifact@",
|
|
||||||
"url": "http://files.minecraftforge.net/maven/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.minecraft:launchwrapper:1.11",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.ow2.asm:asm-all:5.0.3",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.typesafe.akka:akka-actor_2.11:2.3.3",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "ed62e9fc709ca0f2ff1a3220daa8b70a2870078e", "25a86ccfdb6f6dfe08971f4825d0a01be83a6f2e" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.typesafe:config:1.2.1",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "f771f71fdae3df231bcd54d5ca2d57f0bf93f467", "7d7bc36df0989d72f2d5d057309675777acc528b" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-actors-migration_2.11:1.1.0",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f", "8c9aaeeb68487ca519411a14068e1b4d69739207" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-compiler:2.11.1",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "56ea2e6c025e0821f28d73ca271218b8dd04926a", "1444992390544ba3780867a13ff696a89d7d1639" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "87213338cd5a153a7712cb574c0ddd2edfee0386", "0b4c1bf8d48993f138d6e10c0c144e50acfff581" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "1f7371605d4ba42aa26d3443440c0083c587b4e9", "1ea655dda4504ae0a367327e2340cd3beaee6c73" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-library:2.11.1",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "0e11da23da3eabab9f4777b9220e60d44c1aab6a", "1e4df76e835201c6eabd43adca89ab11f225f134" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-parser-combinators_2.11:1.0.1",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "f05d7345bf5a58924f2837c6c1f4d73a938e1ff0", "a1cbbcbde1dcc614f4253ed1aa0b320bc78d8f1d" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-reflect:2.11.1",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "6580347e61cc7f8e802941e7fde40fa83b8badeb", "91ce0f0be20f4a536321724b4b3bbc6530ddcd88" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-swing_2.11:1.0.1",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "b1cdd92bd47b1e1837139c1c53020e86bb9112ae", "d77152691dcf5bbdb00529af37aa7d3d887b3e63" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.scala-lang:scala-xml_2.11:1.0.2",
|
|
||||||
"url" : "http://files.minecraftforge.net/maven/",
|
|
||||||
"checksums" : [ "7a80ec00aec122fba7cd4e0d4cdd87ff7e4cb6d0", "62736b01689d56b6d09a0164b7ef9da2b0b9633d" ],
|
|
||||||
"serverreq":true,
|
|
||||||
"clientreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "lzma:lzma:0.0.1",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:17.0",
|
|
||||||
"serverreq":true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.3.2",
|
|
||||||
"serverreq":true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
{
|
|
||||||
"id": "1.7.10",
|
|
||||||
"time": "2014-05-14T19:29:23+02:00",
|
|
||||||
"releaseTime": "2014-05-14T19:29:23+02:00",
|
|
||||||
"type": "release",
|
|
||||||
"minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}",
|
|
||||||
"minimumLauncherVersion": 13,
|
|
||||||
"assets": "1.7.10",
|
|
||||||
"libraries": [
|
|
||||||
{
|
|
||||||
"name": "com.mojang:realms:1.3.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-compress:1.8.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpclient:4.3.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-logging:commons-logging:1.1.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.httpcomponents:httpcore:4.3.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "java3d:vecmath:1.3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.trove4j:trove4j:3.0.3"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.ibm.icu:icu4j-core-mojang:51.2"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.sf.jopt-simple:jopt-simple:4.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecjorbis:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:codecwav:20101023"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:libraryjavasound:20101123"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:librarylwjglopenal:20100824"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.paulscode:soundsystem:20120107"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "io.netty:netty-all:4.0.10.Final"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.guava:guava:15.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.commons:commons-lang3:3.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-io:commons-io:2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "commons-codec:commons-codec:1.9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput:2.0.5"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jutils:jutils:1.0.0"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.google.code.gson:gson:2.2.4"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "com.mojang:authlib:1.5.21"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-api:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.apache.logging.log4j:log4j-core:2.0-beta9"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "net.java.jinput:jinput-platform:2.0.5",
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch:5.16"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-platform:5.16",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"action": "disallow",
|
|
||||||
"os": {
|
|
||||||
"name": "linux"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"linux": "natives-linux",
|
|
||||||
"windows": "natives-windows-${arch}",
|
|
||||||
"osx": "natives-osx"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "tv.twitch:twitch-external-platform:4.5",
|
|
||||||
"rules": [
|
|
||||||
{
|
|
||||||
"action": "allow",
|
|
||||||
"os": {
|
|
||||||
"name": "windows"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"natives": {
|
|
||||||
"windows": "natives-windows-${arch}"
|
|
||||||
},
|
|
||||||
"extract": {
|
|
||||||
"exclude": [
|
|
||||||
"META-INF/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"mainClass": "net.minecraft.client.main.Main"
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/block/Block.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/block/Block.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.block;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.registry.GameData;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.util.Iterator;
|
|
||||||
@@ -32,7 +33,7 @@
|
|
||||||
|
|
||||||
public class Block
|
|
||||||
{
|
|
||||||
- public static final RegistryNamespaced field_149771_c = new RegistryNamespacedDefaultedByKey("air");
|
|
||||||
+ public static final RegistryNamespaced field_149771_c = GameData.getBlockRegistry();
|
|
||||||
private CreativeTabs field_149772_a;
|
|
||||||
protected String field_149768_d;
|
|
||||||
public static final Block.SoundType field_149769_e = new Block.SoundType("stone", 1.0F, 1.0F);
|
|
||||||
@@ -102,6 +103,8 @@
|
|
||||||
protected IIcon field_149761_L;
|
|
||||||
private static final String __OBFID = "CL_00000199";
|
|
||||||
|
|
||||||
+ public final cpw.mods.fml.common.registry.RegistryDelegate<Block> delegate =
|
|
||||||
+ ((cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry)field_149771_c).getDelegate(this, Block.class);
|
|
||||||
public static int func_149682_b(Block p_149682_0_)
|
|
||||||
{
|
|
||||||
return field_149771_c.func_148757_b(p_149682_0_);
|
|
||||||
@@ -1,201 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/Minecraft.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/Minecraft.java
|
|
||||||
@@ -9,6 +9,9 @@
|
|
||||||
import com.google.common.util.concurrent.ListenableFutureTask;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
||||||
+import cpw.mods.fml.client.FMLClientHandler;
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
+import cpw.mods.fml.common.StartupQuery;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import io.netty.util.concurrent.GenericFutureListener;
|
|
||||||
@@ -169,6 +172,8 @@
|
|
||||||
import org.lwjgl.opengl.PixelFormat;
|
|
||||||
import org.lwjgl.util.glu.GLU;
|
|
||||||
|
|
||||||
+import com.google.common.collect.MapDifference;
|
|
||||||
+
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public class Minecraft implements IPlayerUsage
|
|
||||||
{
|
|
||||||
@@ -344,21 +349,23 @@
|
|
||||||
File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt");
|
|
||||||
System.out.println(p_71377_1_.func_71502_e());
|
|
||||||
|
|
||||||
+ int retVal;
|
|
||||||
if (p_71377_1_.func_71497_f() != null)
|
|
||||||
{
|
|
||||||
System.out.println("#@!@# Game crashed! Crash report saved to: #@!@# " + p_71377_1_.func_71497_f());
|
|
||||||
- System.exit(-1);
|
|
||||||
+ retVal = -1;
|
|
||||||
}
|
|
||||||
else if (p_71377_1_.func_147149_a(file2))
|
|
||||||
{
|
|
||||||
System.out.println("#@!@# Game crashed! Crash report saved to: #@!@# " + file2.getAbsolutePath());
|
|
||||||
- System.exit(-1);
|
|
||||||
+ retVal = -1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
System.out.println("#@?@# Game crashed! Crash report could not be saved. #@?@#");
|
|
||||||
- System.exit(-2);
|
|
||||||
+ retVal = -2;
|
|
||||||
}
|
|
||||||
+ FMLCommonHandler.instance().handleExit(retVal);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_71367_a(String p_71367_1_, int p_71367_2_)
|
|
||||||
@@ -471,11 +478,11 @@
|
|
||||||
this.field_110451_am = new SimpleReloadableResourceManager(this.field_110452_an);
|
|
||||||
this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab);
|
|
||||||
this.field_110451_am.func_110542_a(this.field_135017_as);
|
|
||||||
- this.func_110436_a();
|
|
||||||
+ FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am);
|
|
||||||
this.field_71446_o = new TextureManager(this.field_110451_am);
|
|
||||||
this.field_110451_am.func_110542_a(this.field_71446_o);
|
|
||||||
this.field_152350_aA = new SkinManager(this.field_71446_o, new File(this.field_110446_Y, "skins"), this.field_152355_az);
|
|
||||||
- this.func_71357_I();
|
|
||||||
+ cpw.mods.fml.client.SplashProgress.drawVanillaScreen();
|
|
||||||
this.field_147127_av = new SoundHandler(this.field_110451_am, this.field_71474_y);
|
|
||||||
this.field_110451_am.func_110542_a(this.field_147127_av);
|
|
||||||
this.field_147126_aw = new MusicTicker(this);
|
|
||||||
@@ -492,7 +499,10 @@
|
|
||||||
this.field_110451_am.func_110542_a(this.field_71464_q);
|
|
||||||
this.field_110451_am.func_110542_a(new GrassColorReloadListener());
|
|
||||||
this.field_110451_am.func_110542_a(new FoliageColorReloadListener());
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.ProgressBar bar= cpw.mods.fml.common.ProgressManager.push("Rendering Setup", 9);
|
|
||||||
+ bar.step("Loading Render Manager");
|
|
||||||
RenderManager.field_78727_a.field_78721_f = new ItemRenderer(this);
|
|
||||||
+ bar.step("Loading Entity Renderer");
|
|
||||||
this.field_71460_t = new EntityRenderer(this, this.field_110451_am);
|
|
||||||
this.field_110451_am.func_110542_a(this.field_71460_t);
|
|
||||||
AchievementList.field_76004_f.func_75988_a(new IStatStringFormat()
|
|
||||||
@@ -510,6 +520,7 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
+ bar.step("Loading GL properties");
|
|
||||||
this.field_71417_B = new MouseHelper();
|
|
||||||
this.func_71361_d("Pre startup");
|
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
|
||||||
@@ -524,27 +535,35 @@
|
|
||||||
GL11.glLoadIdentity();
|
|
||||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
|
||||||
this.func_71361_d("Startup");
|
|
||||||
+ bar.step("Render Global instance");
|
|
||||||
this.field_71438_f = new RenderGlobal(this);
|
|
||||||
+ bar.step("Building Blocks Texture");
|
|
||||||
this.field_147128_au = new TextureMap(0, "textures/blocks");
|
|
||||||
+ bar.step("Anisotropy and Mipmaps");
|
|
||||||
this.field_147128_au.func_147632_b(this.field_71474_y.field_151443_J);
|
|
||||||
this.field_147128_au.func_147633_a(this.field_71474_y.field_151442_I);
|
|
||||||
+ bar.step("Loading Blocks Texture");
|
|
||||||
this.field_71446_o.func_130088_a(TextureMap.field_110575_b, this.field_147128_au);
|
|
||||||
+ bar.step("Loading Items Texture");
|
|
||||||
this.field_71446_o.func_130088_a(TextureMap.field_110576_c, new TextureMap(1, "textures/items"));
|
|
||||||
+ bar.step("Viewport");
|
|
||||||
GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
|
|
||||||
this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(bar);
|
|
||||||
+ FMLClientHandler.instance().finishMinecraftLoading();
|
|
||||||
this.func_71361_d("Post startup");
|
|
||||||
this.field_71456_v = new GuiIngame(this);
|
|
||||||
|
|
||||||
if (this.field_71475_ae != null)
|
|
||||||
{
|
|
||||||
- this.func_147108_a(new GuiConnecting(new GuiMainMenu(), this, this.field_71475_ae, this.field_71477_af));
|
|
||||||
+ FMLClientHandler.instance().connectToServerAtStartup(this.field_71475_ae, this.field_71477_af);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this.func_147108_a(new GuiMainMenu());
|
|
||||||
}
|
|
||||||
|
|
||||||
- this.field_71446_o.func_147645_c(this.field_152354_ay);
|
|
||||||
+ cpw.mods.fml.client.SplashProgress.clearVanillaResources(field_71446_o, field_152354_ay);
|
|
||||||
this.field_152354_ay = null;
|
|
||||||
this.field_71461_s = new LoadingScreenRenderer(this);
|
|
||||||
|
|
||||||
@@ -553,6 +572,7 @@
|
|
||||||
this.func_71352_k();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLClientHandler.instance().onInitializationComplete();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
|
|
||||||
@@ -970,9 +990,11 @@
|
|
||||||
|
|
||||||
if (!this.field_71454_w)
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().onRenderTickStart(this.field_71428_T.field_74281_c);
|
|
||||||
this.field_71424_I.func_76318_c("gameRenderer");
|
|
||||||
this.field_71460_t.func_78480_b(this.field_71428_T.field_74281_c);
|
|
||||||
this.field_71424_I.func_76319_b();
|
|
||||||
+ FMLCommonHandler.instance().onRenderTickEnd(this.field_71428_T.field_74281_c);
|
|
||||||
}
|
|
||||||
|
|
||||||
GL11.glFlush();
|
|
||||||
@@ -1554,6 +1576,8 @@
|
|
||||||
--this.field_71467_ac;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().onPreClientTick();
|
|
||||||
+
|
|
||||||
this.field_71424_I.func_76320_a("gui");
|
|
||||||
|
|
||||||
if (!this.field_71445_n)
|
|
||||||
@@ -1698,6 +1722,7 @@
|
|
||||||
this.field_71462_r.func_146274_d();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ FMLCommonHandler.instance().fireMouseInput();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.field_71429_W > 0)
|
|
||||||
@@ -1835,6 +1860,7 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ FMLCommonHandler.instance().fireKeyInput();
|
|
||||||
}
|
|
||||||
|
|
||||||
for (j = 0; j < 9; ++j)
|
|
||||||
@@ -2025,12 +2051,15 @@
|
|
||||||
this.field_71453_ak.func_74428_b();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().onPostClientTick();
|
|
||||||
+
|
|
||||||
this.field_71424_I.func_76319_b();
|
|
||||||
this.field_71423_H = func_71386_F();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_71371_a(String p_71371_1_, String p_71371_2_, WorldSettings p_71371_3_)
|
|
||||||
{
|
|
||||||
+ FMLClientHandler.instance().startIntegratedServer(p_71371_1_, p_71371_2_, p_71371_3_);
|
|
||||||
this.func_71403_a((WorldClient)null);
|
|
||||||
System.gc();
|
|
||||||
ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false);
|
|
||||||
@@ -2066,6 +2095,12 @@
|
|
||||||
|
|
||||||
while (!this.field_71437_Z.func_71200_ad())
|
|
||||||
{
|
|
||||||
+ if (!StartupQuery.check())
|
|
||||||
+ {
|
|
||||||
+ func_71403_a(null);
|
|
||||||
+ func_147108_a(null);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
String s2 = this.field_71437_Z.func_71195_b_();
|
|
||||||
|
|
||||||
if (s2 != null)
|
|
||||||
@@ -2141,6 +2176,7 @@
|
|
||||||
this.field_110448_aq.func_148529_f();
|
|
||||||
this.func_71351_a((ServerData)null);
|
|
||||||
this.field_71455_al = false;
|
|
||||||
+ FMLClientHandler.instance().handleClientWorldClosing(this.field_71441_e);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.field_147127_av.func_147690_c();
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/FontRenderer.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/FontRenderer.java
|
|
||||||
@@ -54,7 +54,7 @@
|
|
||||||
this.field_111273_g = p_i1035_2_;
|
|
||||||
this.field_78298_i = p_i1035_3_;
|
|
||||||
this.field_78293_l = p_i1035_4_;
|
|
||||||
- p_i1035_3_.func_110577_a(this.field_111273_g);
|
|
||||||
+ bindTexture(this.field_111273_g);
|
|
||||||
|
|
||||||
for (int i = 0; i < 32; ++i)
|
|
||||||
{
|
|
||||||
@@ -102,7 +102,7 @@
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
- bufferedimage = ImageIO.read(Minecraft.func_71410_x().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b());
|
|
||||||
+ bufferedimage = ImageIO.read(getResourceInputStream(this.field_111273_g));
|
|
||||||
}
|
|
||||||
catch (IOException ioexception)
|
|
||||||
{
|
|
||||||
@@ -167,7 +167,7 @@
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
- InputStream inputstream = Minecraft.func_71410_x().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b();
|
|
||||||
+ InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"));
|
|
||||||
inputstream.read(this.field_78287_e);
|
|
||||||
}
|
|
||||||
catch (IOException ioexception)
|
|
||||||
@@ -186,7 +186,7 @@
|
|
||||||
float f = (float)(p_78266_1_ % 16 * 8);
|
|
||||||
float f1 = (float)(p_78266_1_ / 16 * 8);
|
|
||||||
float f2 = p_78266_2_ ? 1.0F : 0.0F;
|
|
||||||
- this.field_78298_i.func_110577_a(this.field_111273_g);
|
|
||||||
+ bindTexture(this.field_111273_g);
|
|
||||||
float f3 = (float)this.field_78286_d[p_78266_1_] - 0.01F;
|
|
||||||
GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
|
|
||||||
GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F);
|
|
||||||
@@ -213,7 +213,7 @@
|
|
||||||
|
|
||||||
private void func_78257_a(int p_78257_1_)
|
|
||||||
{
|
|
||||||
- this.field_78298_i.func_110577_a(this.func_111271_a(p_78257_1_));
|
|
||||||
+ bindTexture(this.func_111271_a(p_78257_1_));
|
|
||||||
}
|
|
||||||
|
|
||||||
protected float func_78277_a(char p_78277_1_, boolean p_78277_2_)
|
|
||||||
@@ -260,7 +260,7 @@
|
|
||||||
|
|
||||||
public int func_85187_a(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_, boolean p_85187_5_)
|
|
||||||
{
|
|
||||||
- GL11.glEnable(GL11.GL_ALPHA_TEST);
|
|
||||||
+ enableAlpha();
|
|
||||||
this.func_78265_b();
|
|
||||||
int l;
|
|
||||||
|
|
||||||
@@ -332,7 +332,7 @@
|
|
||||||
|
|
||||||
k = this.field_78285_g[j];
|
|
||||||
this.field_78304_r = k;
|
|
||||||
- GL11.glColor4f((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
|
|
||||||
+ setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.field_78305_q);
|
|
||||||
}
|
|
||||||
else if (j == 16)
|
|
||||||
{
|
|
||||||
@@ -361,7 +361,7 @@
|
|
||||||
this.field_78299_w = false;
|
|
||||||
this.field_78300_v = false;
|
|
||||||
this.field_78301_u = false;
|
|
||||||
- GL11.glColor4f(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
|
|
||||||
+ setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
|
|
||||||
}
|
|
||||||
|
|
||||||
++i;
|
|
||||||
@@ -420,6 +420,15 @@
|
|
||||||
++f;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ doDraw(f);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ protected void doDraw(float f)
|
|
||||||
+ {
|
|
||||||
+ {
|
|
||||||
+ {
|
|
||||||
Tessellator tessellator;
|
|
||||||
|
|
||||||
if (this.field_78299_w)
|
|
||||||
@@ -492,7 +501,7 @@
|
|
||||||
this.field_78292_o = (float)(p_78258_4_ >> 8 & 255) / 255.0F;
|
|
||||||
this.field_78306_p = (float)(p_78258_4_ & 255) / 255.0F;
|
|
||||||
this.field_78305_q = (float)(p_78258_4_ >> 24 & 255) / 255.0F;
|
|
||||||
- GL11.glColor4f(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
|
|
||||||
+ setColor(this.field_78291_n, this.field_78292_o, this.field_78306_p, this.field_78305_q);
|
|
||||||
this.field_78295_j = (float)p_78258_2_;
|
|
||||||
this.field_78296_k = (float)p_78258_3_;
|
|
||||||
this.func_78255_a(p_78258_1_, p_78258_5_);
|
|
||||||
@@ -829,4 +838,24 @@
|
|
||||||
{
|
|
||||||
return this.field_78294_m;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ protected void setColor(float r, float g, float b, float a)
|
|
||||||
+ {
|
|
||||||
+ GL11.glColor4f(r, g, b, a);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ protected void enableAlpha()
|
|
||||||
+ {
|
|
||||||
+ GL11.glEnable(GL11.GL_ALPHA_TEST);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ protected void bindTexture(ResourceLocation location)
|
|
||||||
+ {
|
|
||||||
+ field_78298_i.func_110577_a(location);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ protected InputStream getResourceInputStream(ResourceLocation location) throws IOException
|
|
||||||
+ {
|
|
||||||
+ return Minecraft.func_71410_x().func_110442_L().func_110536_a(location).func_110527_b();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiCreateWorld.java
|
|
||||||
@@ -211,6 +211,8 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ WorldType.field_77139_a[this.field_146331_K].onGUICreateWorldPress();
|
|
||||||
+
|
|
||||||
WorldSettings.GameType gametype = WorldSettings.GameType.func_77142_a(this.field_146342_r);
|
|
||||||
WorldSettings worldsettings = new WorldSettings(i, gametype, this.field_146341_s, this.field_146337_w, WorldType.field_77139_a[this.field_146331_K]);
|
|
||||||
worldsettings.func_82750_a(this.field_146334_a);
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiIngameMenu.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.client.gui;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.client.FMLClientHandler;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import net.minecraft.client.gui.achievement.GuiAchievements;
|
|
||||||
@@ -29,8 +30,9 @@
|
|
||||||
|
|
||||||
this.field_146292_n.add(new GuiButton(4, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 24 + b0, I18n.func_135052_a("menu.returnToGame", new Object[0])));
|
|
||||||
this.field_146292_n.add(new GuiButton(0, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.options", new Object[0])));
|
|
||||||
+ this.field_146292_n.add(new GuiButton(12, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, "Mod Options..."));
|
|
||||||
GuiButton guibutton;
|
|
||||||
- this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 96 + b0, 98, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
|
|
||||||
+ this.field_146292_n.add(guibutton = new GuiButton(7, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 72 + b0, 200, 20, I18n.func_135052_a("menu.shareToLan", new Object[0])));
|
|
||||||
this.field_146292_n.add(new GuiButton(5, this.field_146294_l / 2 - 100, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.achievements", new Object[0])));
|
|
||||||
this.field_146292_n.add(new GuiButton(6, this.field_146294_l / 2 + 2, this.field_146295_m / 4 + 48 + b0, 98, 20, I18n.func_135052_a("gui.stats", new Object[0])));
|
|
||||||
guibutton.field_146124_l = this.field_146297_k.func_71356_B() && !this.field_146297_k.func_71401_C().func_71344_c();
|
|
||||||
@@ -64,6 +66,10 @@
|
|
||||||
break;
|
|
||||||
case 7:
|
|
||||||
this.field_146297_k.func_147108_a(new GuiShareToLan(this));
|
|
||||||
+ break;
|
|
||||||
+ case 12:
|
|
||||||
+ FMLClientHandler.instance().showInGameModOptions(this);
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiMainMenu.java
|
|
||||||
@@ -1,5 +1,7 @@
|
|
||||||
package net.minecraft.client.gui;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.client.GuiModList;
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
@@ -9,6 +11,7 @@
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Calendar;
|
|
||||||
import java.util.Date;
|
|
||||||
+import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.renderer.OpenGlHelper;
|
|
||||||
@@ -29,6 +32,9 @@
|
|
||||||
import org.lwjgl.opengl.GLContext;
|
|
||||||
import org.lwjgl.util.glu.Project;
|
|
||||||
|
|
||||||
+import com.google.common.base.Strings;
|
|
||||||
+import com.google.common.collect.Lists;
|
|
||||||
+
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public class GuiMainMenu extends GuiScreen implements GuiYesNoCallback
|
|
||||||
{
|
|
||||||
@@ -190,7 +196,13 @@
|
|
||||||
{
|
|
||||||
this.field_146292_n.add(new GuiButton(1, this.field_146294_l / 2 - 100, p_73969_1_, I18n.func_135052_a("menu.singleplayer", new Object[0])));
|
|
||||||
this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 1, I18n.func_135052_a("menu.multiplayer", new Object[0])));
|
|
||||||
- this.field_146292_n.add(new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0])));
|
|
||||||
+ GuiButton realmsButton = new GuiButton(14, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, I18n.func_135052_a("menu.online", new Object[0]));
|
|
||||||
+ GuiButton fmlModButton = new GuiButton(6, this.field_146294_l / 2 - 100, p_73969_1_ + p_73969_2_ * 2, "Mods");
|
|
||||||
+ fmlModButton.field_146128_h = this.field_146294_l / 2 + 2;
|
|
||||||
+ realmsButton.field_146120_f = 98;
|
|
||||||
+ fmlModButton.field_146120_f = 98;
|
|
||||||
+ this.field_146292_n.add(realmsButton);
|
|
||||||
+ this.field_146292_n.add(fmlModButton);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void func_73972_b(int p_73972_1_, int p_73972_2_)
|
|
||||||
@@ -238,6 +250,11 @@
|
|
||||||
this.field_146297_k.func_71400_g();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if (p_146284_1_.field_146127_k == 6)
|
|
||||||
+ {
|
|
||||||
+ this.field_146297_k.func_147108_a(new GuiModList(this));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (p_146284_1_.field_146127_k == 11)
|
|
||||||
{
|
|
||||||
this.field_146297_k.func_71371_a("Demo_World", "Demo_World", DemoWorldServer.field_73071_a);
|
|
||||||
@@ -481,7 +498,15 @@
|
|
||||||
s = s + " Demo";
|
|
||||||
}
|
|
||||||
|
|
||||||
- this.func_73731_b(this.field_146289_q, s, 2, this.field_146295_m - 10, -1);
|
|
||||||
+ List<String> brandings = Lists.reverse(FMLCommonHandler.instance().getBrandings(true));
|
|
||||||
+ for (int i = 0; i < brandings.size(); i++)
|
|
||||||
+ {
|
|
||||||
+ String brd = brandings.get(i);
|
|
||||||
+ if (!Strings.isNullOrEmpty(brd))
|
|
||||||
+ {
|
|
||||||
+ this.func_73731_b(this.field_146289_q, brd, 2, this.field_146295_m - ( 10 + i * (this.field_146289_q.field_78288_b + 1)), 16777215);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
String s1 = "Copyright Mojang AB. Do not distribute!";
|
|
||||||
this.func_73731_b(this.field_146289_q, s1, this.field_146294_l - this.field_146289_q.func_78256_a(s1) - 2, this.field_146295_m - 10, -1);
|
|
||||||
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
+import cpw.mods.fml.common.network.handshake.NetworkDispatcher;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
@@ -232,7 +233,7 @@
|
|
||||||
public void func_147282_a(S01PacketJoinGame p_147282_1_)
|
|
||||||
{
|
|
||||||
this.field_147299_f.field_71442_b = new PlayerControllerMP(this.field_147299_f, this);
|
|
||||||
- this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), p_147282_1_.func_149194_f(), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
|
|
||||||
+ this.field_147300_g = new WorldClient(this, new WorldSettings(0L, p_147282_1_.func_149198_e(), false, p_147282_1_.func_149195_d(), p_147282_1_.func_149196_i()), NetworkDispatcher.get(func_147298_b()).getOverrideDimension(p_147282_1_), p_147282_1_.func_149192_g(), this.field_147299_f.field_71424_I);
|
|
||||||
this.field_147300_g.field_72995_K = true;
|
|
||||||
this.field_147299_f.func_71403_a(this.field_147300_g);
|
|
||||||
this.field_147299_f.field_71439_g.field_71093_bK = p_147282_1_.func_149194_f();
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/renderer/RenderBlocks.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderBlocks.java
|
|
||||||
@@ -40,6 +40,7 @@
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemBlock;
|
|
||||||
+import net.minecraft.src.FMLRenderAccessLibrary;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.tileentity.TileEntityFlowerPot;
|
|
||||||
import net.minecraft.util.Direction;
|
|
||||||
@@ -245,7 +246,53 @@
|
|
||||||
{
|
|
||||||
p_147805_1_.func_149719_a(this.field_147845_a, p_147805_2_, p_147805_3_, p_147805_4_);
|
|
||||||
this.func_147775_a(p_147805_1_);
|
|
||||||
- return l == 0 ? this.func_147784_q(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 4 ? this.func_147721_p(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 31 ? this.func_147742_r(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 1 ? this.func_147746_l(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 40 ? this.func_147774_a((BlockDoublePlant)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 2 ? this.func_147791_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 20 ? this.func_147726_j(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 11 ? this.func_147735_a((BlockFence)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 39 ? this.func_147779_s(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 5 ? this.func_147788_h(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 13 ? this.func_147755_t(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 9 ? this.func_147766_a((BlockRailBase)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 19 ? this.func_147724_m(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 23 ? this.func_147783_o(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 6 ? this.func_147796_n(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 3 ? this.func_147801_a((BlockFire)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 8 ? this.func_147794_i(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 7 ? this.func_147760_u(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 10 ? this.func_147722_a((BlockStairs)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 27 ? this.func_147802_a((BlockDragonEgg)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 32 ? this.func_147807_a((BlockWall)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 12 ? this.func_147790_e(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 29 ? this.func_147723_f(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 30 ? this.func_147756_g(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 14 ? this.func_147773_v(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 15 ? this.func_147759_a((BlockRedstoneRepeater)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 36 ? this.func_147748_a((BlockRedstoneDiode)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 37 ? this.func_147781_a((BlockRedstoneComparator)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 16 ? this.func_147731_b(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, false) : (l == 17 ? this.func_147809_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, true) : (l == 18 ? this.func_147767_a((BlockPane)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 41 ? this.func_147733_k(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 21 ? this.func_147776_a((BlockFenceGate)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 24 ? this.func_147785_a((BlockCauldron)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 33 ? this.func_147752_a((BlockFlowerPot)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 35 ? this.func_147725_a((BlockAnvil)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 25 ? this.func_147741_a((BlockBrewingStand)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 26 ? this.func_147743_a((BlockEndPortalFrame)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 28 ? this.func_147772_a((BlockCocoa)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 34 ? this.func_147797_a((BlockBeacon)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : (l == 38 ? this.func_147803_a((BlockHopper)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) : false))))))))))))))))))))))))))))))))))))))));
|
|
||||||
+
|
|
||||||
+ switch (l)
|
|
||||||
+ {
|
|
||||||
+ //regex: ' : \(l == ([\d]+) \?' replace: ';\ncase \1: return' ::: IMPORTANT: REMEMBER THIS ON FIRST line!
|
|
||||||
+ case 0 : return this.func_147784_q(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 4: return this.func_147721_p(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 31: return this.func_147742_r(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 1: return this.func_147746_l(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 40: return this.func_147774_a((BlockDoublePlant)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 2: return this.func_147791_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 20: return this.func_147726_j(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 11: return this.func_147735_a((BlockFence)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 39: return this.func_147779_s(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 5: return this.func_147788_h(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 13: return this.func_147755_t(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 9: return this.func_147766_a((BlockRailBase)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 19: return this.func_147724_m(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 23: return this.func_147783_o(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 6: return this.func_147796_n(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 3: return this.func_147801_a((BlockFire)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 8: return this.func_147794_i(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 7: return this.func_147760_u(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 10: return this.func_147722_a((BlockStairs)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 27: return this.func_147802_a((BlockDragonEgg)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 32: return this.func_147807_a((BlockWall)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 12: return this.func_147790_e(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 29: return this.func_147723_f(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 30: return this.func_147756_g(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 14: return this.func_147773_v(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 15: return this.func_147759_a((BlockRedstoneRepeater)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 36: return this.func_147748_a((BlockRedstoneDiode)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 37: return this.func_147781_a((BlockRedstoneComparator)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 16: return this.func_147731_b(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, false) ;
|
|
||||||
+ case 17: return this.func_147809_c(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_, true) ;
|
|
||||||
+ case 18: return this.func_147767_a((BlockPane)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 41: return this.func_147733_k(p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 21: return this.func_147776_a((BlockFenceGate)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 24: return this.func_147785_a((BlockCauldron)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 33: return this.func_147752_a((BlockFlowerPot)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 35: return this.func_147725_a((BlockAnvil)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 25: return this.func_147741_a((BlockBrewingStand)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 26: return this.func_147743_a((BlockEndPortalFrame)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 28: return this.func_147772_a((BlockCocoa)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 34: return this.func_147797_a((BlockBeacon)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_) ;
|
|
||||||
+ case 38: return this.func_147803_a((BlockHopper)p_147805_1_, p_147805_2_, p_147805_3_, p_147805_4_);
|
|
||||||
+ default: return FMLRenderAccessLibrary.renderWorldBlock(this, field_147845_a, p_147805_2_, p_147805_3_, p_147805_4_, p_147805_1_, l);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -8089,6 +8136,10 @@
|
|
||||||
this.func_147799_a((BlockHopper)p_147800_1_, 0, 0, 0, 0, true);
|
|
||||||
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
|
||||||
}
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ FMLRenderAccessLibrary.renderInventoryBlock(this, p_147800_1_, p_147800_2_, j);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@@ -8147,7 +8198,24 @@
|
|
||||||
|
|
||||||
public static boolean func_147739_a(int p_147739_0_)
|
|
||||||
{
|
|
||||||
- return p_147739_0_ == 0 ? true : (p_147739_0_ == 31 ? true : (p_147739_0_ == 39 ? true : (p_147739_0_ == 13 ? true : (p_147739_0_ == 10 ? true : (p_147739_0_ == 11 ? true : (p_147739_0_ == 27 ? true : (p_147739_0_ == 22 ? true : (p_147739_0_ == 21 ? true : (p_147739_0_ == 16 ? true : (p_147739_0_ == 26 ? true : (p_147739_0_ == 32 ? true : (p_147739_0_ == 34 ? true : (p_147739_0_ == 35 ? true : (p_147739_0_ == -1 ? false : false))))))))))))));
|
|
||||||
+ switch (p_147739_0_)
|
|
||||||
+ {
|
|
||||||
+ case 0 : return true ;
|
|
||||||
+ case 31: return true ;
|
|
||||||
+ case 39: return true ;
|
|
||||||
+ case 13: return true ;
|
|
||||||
+ case 10: return true ;
|
|
||||||
+ case 11: return true ;
|
|
||||||
+ case 27: return true ;
|
|
||||||
+ case 22: return true ;
|
|
||||||
+ case 21: return true ;
|
|
||||||
+ case 16: return true ;
|
|
||||||
+ case 26: return true ;
|
|
||||||
+ case 32: return true ;
|
|
||||||
+ case 34: return true ;
|
|
||||||
+ case 35: return true ;
|
|
||||||
+ default: return FMLRenderAccessLibrary.renderItemAsFull3DBlock(p_147739_0_);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
public IIcon func_147793_a(Block p_147793_1_, IBlockAccess p_147793_2_, int p_147793_3_, int p_147793_4_, int p_147793_5_, int p_147793_6_)
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureMap.java
|
|
||||||
@@ -96,6 +96,7 @@
|
|
||||||
this.field_94252_e.clear();
|
|
||||||
this.field_94258_i.clear();
|
|
||||||
int j = Integer.MAX_VALUE;
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.ProgressBar bar = cpw.mods.fml.common.ProgressManager.push("Texture stitching", this.field_110574_e.size());
|
|
||||||
Iterator iterator = this.field_110574_e.entrySet().iterator();
|
|
||||||
TextureAtlasSprite textureatlassprite;
|
|
||||||
|
|
||||||
@@ -105,6 +106,7 @@
|
|
||||||
ResourceLocation resourcelocation = new ResourceLocation((String)entry.getKey());
|
|
||||||
textureatlassprite = (TextureAtlasSprite)entry.getValue();
|
|
||||||
ResourceLocation resourcelocation1 = this.func_147634_a(resourcelocation, 0);
|
|
||||||
+ bar.step(resourcelocation1.func_110623_a());
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
@@ -156,12 +158,14 @@
|
|
||||||
}
|
|
||||||
catch (RuntimeException runtimeexception)
|
|
||||||
{
|
|
||||||
- field_147635_d.error("Unable to parse metadata from " + resourcelocation1, runtimeexception);
|
|
||||||
+ //logger.error("Unable to parse metadata from " + resourcelocation1, runtimeexception);
|
|
||||||
+ cpw.mods.fml.client.FMLClientHandler.instance().trackBrokenTexture(resourcelocation1, runtimeexception.getMessage());
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
catch (IOException ioexception1)
|
|
||||||
{
|
|
||||||
- field_147635_d.error("Using missing texture, unable to load " + resourcelocation1, ioexception1);
|
|
||||||
+ //logger.error("Using missing texture, unable to load " + resourcelocation1, ioexception1);
|
|
||||||
+ cpw.mods.fml.client.FMLClientHandler.instance().trackMissingTexture(resourcelocation1);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -169,6 +173,7 @@
|
|
||||||
stitcher.func_110934_a(textureatlassprite);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(bar);
|
|
||||||
int i1 = MathHelper.func_151239_c(j);
|
|
||||||
|
|
||||||
if (i1 < this.field_147636_j)
|
|
||||||
@@ -178,10 +183,12 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
Iterator iterator1 = this.field_110574_e.values().iterator();
|
|
||||||
+ bar = cpw.mods.fml.common.ProgressManager.push("Mipmap generation", this.field_110574_e.size());
|
|
||||||
|
|
||||||
while (iterator1.hasNext())
|
|
||||||
{
|
|
||||||
final TextureAtlasSprite textureatlassprite1 = (TextureAtlasSprite)iterator1.next();
|
|
||||||
+ bar.step(textureatlassprite1.func_94215_i());
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
@@ -222,9 +229,12 @@
|
|
||||||
|
|
||||||
this.field_94249_f.func_147963_d(this.field_147636_j);
|
|
||||||
stitcher.func_110934_a(this.field_94249_f);
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(bar);
|
|
||||||
+ bar = cpw.mods.fml.common.ProgressManager.push("Texture creation", 3);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
+ bar.step("Stitching");
|
|
||||||
stitcher.func_94305_f();
|
|
||||||
}
|
|
||||||
catch (StitcherException stitcherexception)
|
|
||||||
@@ -233,10 +243,12 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
field_147635_d.info("Created: {}x{} {}-atlas", new Object[] {Integer.valueOf(stitcher.func_110935_a()), Integer.valueOf(stitcher.func_110936_b()), this.field_94254_c});
|
|
||||||
+ bar.step("Allocating GL texture");
|
|
||||||
TextureUtil.func_147946_a(this.func_110552_b(), this.field_147636_j, stitcher.func_110935_a(), stitcher.func_110936_b(), (float)this.field_147637_k);
|
|
||||||
HashMap hashmap = Maps.newHashMap(this.field_110574_e);
|
|
||||||
Iterator iterator2 = stitcher.func_94309_g().iterator();
|
|
||||||
|
|
||||||
+ bar.step("Uploading GL texture");
|
|
||||||
while (iterator2.hasNext())
|
|
||||||
{
|
|
||||||
textureatlassprite = (TextureAtlasSprite)iterator2.next();
|
|
||||||
@@ -274,6 +286,7 @@
|
|
||||||
textureatlassprite = (TextureAtlasSprite)iterator2.next();
|
|
||||||
textureatlassprite.func_94217_a(this.field_94249_f);
|
|
||||||
}
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(bar);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_)
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/TextureUtil.java
|
|
||||||
@@ -201,8 +201,11 @@
|
|
||||||
|
|
||||||
public static void func_147946_a(int p_147946_0_, int p_147946_1_, int p_147946_2_, int p_147946_3_, float p_147946_4_)
|
|
||||||
{
|
|
||||||
+ synchronized(cpw.mods.fml.client.SplashProgress.class)
|
|
||||||
+ {
|
|
||||||
func_147942_a(p_147946_0_);
|
|
||||||
func_94277_a(p_147946_0_);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (OpenGlHelper.field_148825_d)
|
|
||||||
{
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/resources/AbstractResourcePack.java
|
|
||||||
@@ -58,7 +58,7 @@
|
|
||||||
|
|
||||||
protected void func_110594_c(String p_110594_1_)
|
|
||||||
{
|
|
||||||
- field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: %s in %s", new Object[] {p_110594_1_, this.field_110597_b});
|
|
||||||
+ field_110598_a.warn("ResourcePack: ignored non-lowercase namespace: {} in {}", new Object[] {p_110594_1_, this.field_110597_b});
|
|
||||||
}
|
|
||||||
|
|
||||||
public IMetadataSection func_135058_a(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException
|
|
||||||
-46
@@ -1,46 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
|
|
||||||
@@ -95,6 +95,7 @@
|
|
||||||
public void func_110541_a(List p_110541_1_)
|
|
||||||
{
|
|
||||||
this.func_110543_a();
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.ProgressBar resReload = cpw.mods.fml.common.ProgressManager.push("Loading Resources", p_110541_1_.size()+1);
|
|
||||||
field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function()
|
|
||||||
{
|
|
||||||
private static final String __OBFID = "CL_00001092";
|
|
||||||
@@ -112,26 +113,35 @@
|
|
||||||
while (iterator.hasNext())
|
|
||||||
{
|
|
||||||
IResourcePack iresourcepack = (IResourcePack)iterator.next();
|
|
||||||
+ resReload.step(iresourcepack.func_130077_b());
|
|
||||||
this.func_110545_a(iresourcepack);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ resReload.step("Reloading listeners");
|
|
||||||
this.func_110544_b();
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(resReload);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_110542_a(IResourceManagerReloadListener p_110542_1_)
|
|
||||||
{
|
|
||||||
this.field_110546_b.add(p_110542_1_);
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.ProgressBar resReload = cpw.mods.fml.common.ProgressManager.push("Loading Resource", 1);
|
|
||||||
+ resReload.step(p_110542_1_.getClass());
|
|
||||||
p_110542_1_.func_110549_a(this);
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(resReload);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void func_110544_b()
|
|
||||||
{
|
|
||||||
Iterator iterator = this.field_110546_b.iterator();
|
|
||||||
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.ProgressBar resReload = cpw.mods.fml.common.ProgressManager.push("Reloading", this.field_110546_b.size());
|
|
||||||
while (iterator.hasNext())
|
|
||||||
{
|
|
||||||
IResourceManagerReloadListener iresourcemanagerreloadlistener = (IResourceManagerReloadListener)iterator.next();
|
|
||||||
+ resReload.step(iresourcemanagerreloadlistener.getClass());
|
|
||||||
iresourcemanagerreloadlistener.func_110549_a(this);
|
|
||||||
}
|
|
||||||
+ cpw.mods.fml.common.ProgressManager.pop(resReload);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/entity/EntityTracker.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/entity/EntityTracker.java
|
|
||||||
@@ -39,6 +39,8 @@
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.registry.EntityRegistry;
|
|
||||||
+
|
|
||||||
public class EntityTracker
|
|
||||||
{
|
|
||||||
private static final Logger field_151249_a = LogManager.getLogger();
|
|
||||||
@@ -56,6 +58,11 @@
|
|
||||||
|
|
||||||
public void func_72786_a(Entity p_72786_1_)
|
|
||||||
{
|
|
||||||
+ if (EntityRegistry.instance().tryTrackingEntity(this, p_72786_1_))
|
|
||||||
+ {
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (p_72786_1_ instanceof EntityPlayerMP)
|
|
||||||
{
|
|
||||||
this.func_72791_a(p_72786_1_, 512, 2);
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/entity/EntityTrackerEntry.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/entity/EntityTrackerEntry.java
|
|
||||||
@@ -57,6 +57,8 @@
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
|
|
||||||
+
|
|
||||||
public class EntityTrackerEntry
|
|
||||||
{
|
|
||||||
private static final Logger field_151262_p = LogManager.getLogger();
|
|
||||||
@@ -377,6 +379,14 @@
|
|
||||||
this.field_73138_k = this.field_73132_a.field_70181_x;
|
|
||||||
this.field_73135_l = this.field_73132_a.field_70179_y;
|
|
||||||
|
|
||||||
+ int posX = MathHelper.func_76128_c(this.field_73132_a.field_70165_t * 32.0D);
|
|
||||||
+ int posY = MathHelper.func_76128_c(this.field_73132_a.field_70163_u * 32.0D);
|
|
||||||
+ int posZ = MathHelper.func_76128_c(this.field_73132_a.field_70161_v * 32.0D);
|
|
||||||
+ if (posX != this.field_73128_d || posY != this.field_73129_e || posZ != this.field_73126_f)
|
|
||||||
+ {
|
|
||||||
+ FMLNetworkHandler.makeEntitySpawnAdjustment(this.field_73132_a, p_73117_1_, this.field_73128_d, this.field_73129_e, this.field_73126_f);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (this.field_73143_t && !(packet instanceof S0FPacketSpawnMob))
|
|
||||||
{
|
|
||||||
p_73117_1_.field_71135_a.func_147359_a(new S12PacketEntityVelocity(this.field_73132_a.func_145782_y(), this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y));
|
|
||||||
@@ -456,6 +466,12 @@
|
|
||||||
field_151262_p.warn("Fetching addPacket for removed entity");
|
|
||||||
}
|
|
||||||
|
|
||||||
+ Packet pkt = FMLNetworkHandler.getEntitySpawningPacket(this.field_73132_a);
|
|
||||||
+
|
|
||||||
+ if (pkt != null)
|
|
||||||
+ {
|
|
||||||
+ return pkt;
|
|
||||||
+ }
|
|
||||||
if (this.field_73132_a instanceof EntityItem)
|
|
||||||
{
|
|
||||||
return new S0EPacketSpawnObject(this.field_73132_a, 2, 1);
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/entity/item/EntityItem.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/entity/item/EntityItem.java
|
|
||||||
@@ -17,6 +17,8 @@
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
+
|
|
||||||
public class EntityItem extends Entity
|
|
||||||
{
|
|
||||||
private static final Logger field_145803_d = LogManager.getLogger();
|
|
||||||
@@ -325,6 +327,8 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().firePlayerItemPickupEvent(p_70100_1_, this);
|
|
||||||
+
|
|
||||||
this.field_70170_p.func_72956_a(p_70100_1_, "random.pop", 0.2F, ((this.field_70146_Z.nextFloat() - this.field_70146_Z.nextFloat()) * 0.7F + 1.0F) * 2.0F);
|
|
||||||
p_70100_1_.func_71001_a(this, i);
|
|
||||||
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/entity/passive/EntityVillager.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/entity/passive/EntityVillager.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.entity.passive;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.registry.VillagerRegistry;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.util.Collections;
|
|
||||||
@@ -422,6 +423,7 @@
|
|
||||||
|
|
||||||
MerchantRecipeList merchantrecipelist;
|
|
||||||
merchantrecipelist = new MerchantRecipeList();
|
|
||||||
+ VillagerRegistry.manageVillagerTrades(merchantrecipelist, this, this.func_70946_n(), this.field_70146_Z);
|
|
||||||
int k;
|
|
||||||
label50:
|
|
||||||
|
|
||||||
@@ -626,7 +628,7 @@
|
|
||||||
public IEntityLivingData func_110161_a(IEntityLivingData p_110161_1_)
|
|
||||||
{
|
|
||||||
p_110161_1_ = super.func_110161_a(p_110161_1_);
|
|
||||||
- this.func_70938_b(this.field_70170_p.field_73012_v.nextInt(5));
|
|
||||||
+ VillagerRegistry.applyRandomTrade(this, field_70170_p.field_73012_v);
|
|
||||||
return p_110161_1_;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayer.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayer.java
|
|
||||||
@@ -2,6 +2,9 @@
|
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.util.Collection;
|
|
||||||
@@ -193,6 +196,7 @@
|
|
||||||
|
|
||||||
public void func_70071_h_()
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().onPlayerPreTick(this);
|
|
||||||
if (this.field_71074_e != null)
|
|
||||||
{
|
|
||||||
ItemStack itemstack = this.field_71071_by.func_70448_g();
|
|
||||||
@@ -316,6 +320,7 @@
|
|
||||||
this.field_71100_bB.func_75118_a(this);
|
|
||||||
this.func_71064_a(StatList.field_75948_k, 1);
|
|
||||||
}
|
|
||||||
+ FMLCommonHandler.instance().onPlayerPostTick(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int func_82145_z()
|
|
||||||
@@ -2031,6 +2036,11 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ public void openGui(Object mod, int modGuiId, World world, int x, int y, int z)
|
|
||||||
+ {
|
|
||||||
+ FMLNetworkHandler.openGui(this, mod, modGuiId, world, x, y, z);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
public static enum EnumStatus
|
|
||||||
{
|
|
||||||
OK,
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/inventory/SlotCrafting.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/inventory/SlotCrafting.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.inventory;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.init.Items;
|
|
||||||
@@ -103,6 +104,7 @@
|
|
||||||
|
|
||||||
public void func_82870_a(EntityPlayer p_82870_1_, ItemStack p_82870_2_)
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().firePlayerCraftingEvent(p_82870_1_, p_82870_2_, field_75239_a);
|
|
||||||
this.func_75208_c(p_82870_2_);
|
|
||||||
|
|
||||||
for (int i = 0; i < this.field_75239_a.func_70302_i_(); ++i)
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/item/Item.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/item/Item.java
|
|
||||||
@@ -3,6 +3,8 @@
|
|
||||||
import com.google.common.collect.HashMultimap;
|
|
||||||
import com.google.common.collect.Multimap;
|
|
||||||
import com.google.common.collect.Sets;
|
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.registry.GameData;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.util.HashSet;
|
|
||||||
@@ -46,7 +48,7 @@
|
|
||||||
|
|
||||||
public class Item
|
|
||||||
{
|
|
||||||
- public static final RegistryNamespaced field_150901_e = new RegistryNamespaced();
|
|
||||||
+ public static final RegistryNamespaced field_150901_e = GameData.getItemRegistry();
|
|
||||||
protected static final UUID field_111210_e = UUID.fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
|
|
||||||
private CreativeTabs field_77701_a;
|
|
||||||
protected static Random field_77697_d = new Random();
|
|
||||||
@@ -62,6 +64,8 @@
|
|
||||||
protected String field_111218_cA;
|
|
||||||
private static final String __OBFID = "CL_00000041";
|
|
||||||
|
|
||||||
+ public final cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate =
|
|
||||||
+ ((cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry)field_150901_e).getDelegate(this, Item.class);
|
|
||||||
public static int func_150891_b(Item p_150891_0_)
|
|
||||||
{
|
|
||||||
return p_150891_0_ == null ? 0 : field_150901_e.func_148757_b(p_150891_0_);
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/item/ItemStack.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/item/ItemStack.java
|
|
||||||
@@ -45,6 +45,7 @@
|
|
||||||
private EntityItemFrame field_82843_f;
|
|
||||||
private static final String __OBFID = "CL_00000043";
|
|
||||||
|
|
||||||
+ private cpw.mods.fml.common.registry.RegistryDelegate<Item> delegate;
|
|
||||||
public ItemStack(Block p_i1876_1_)
|
|
||||||
{
|
|
||||||
this(p_i1876_1_, 1);
|
|
||||||
@@ -72,7 +73,7 @@
|
|
||||||
|
|
||||||
public ItemStack(Item p_i1881_1_, int p_i1881_2_, int p_i1881_3_)
|
|
||||||
{
|
|
||||||
- this.field_151002_e = p_i1881_1_;
|
|
||||||
+ func_150996_a(p_i1881_1_);
|
|
||||||
this.field_77994_a = p_i1881_2_;
|
|
||||||
this.field_77991_e = p_i1881_3_;
|
|
||||||
|
|
||||||
@@ -106,7 +107,7 @@
|
|
||||||
|
|
||||||
public Item func_77973_b()
|
|
||||||
{
|
|
||||||
- return this.field_151002_e;
|
|
||||||
+ return this.delegate != null ? this.delegate.get() : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
@@ -164,7 +165,7 @@
|
|
||||||
|
|
||||||
public void func_77963_c(NBTTagCompound p_77963_1_)
|
|
||||||
{
|
|
||||||
- this.field_151002_e = Item.func_150899_d(p_77963_1_.func_74765_d("id"));
|
|
||||||
+ func_150996_a(Item.func_150899_d(p_77963_1_.func_74765_d("id")));
|
|
||||||
this.field_77994_a = p_77963_1_.func_74771_c("Count");
|
|
||||||
this.field_77991_e = p_77963_1_.func_74765_d("Damage");
|
|
||||||
|
|
||||||
@@ -744,6 +745,7 @@
|
|
||||||
|
|
||||||
public void func_150996_a(Item p_150996_1_)
|
|
||||||
{
|
|
||||||
+ this.delegate = p_150996_1_ != null ? p_150996_1_.delegate : null;
|
|
||||||
this.field_151002_e = p_150996_1_;
|
|
||||||
}
|
|
||||||
|
|
||||||
-31
@@ -1,31 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/network/play/server/S3FPacketCustomPayload.java
|
|
||||||
@@ -27,23 +27,24 @@
|
|
||||||
this.field_149172_a = p_i45190_1_;
|
|
||||||
this.field_149171_b = p_i45190_2_;
|
|
||||||
|
|
||||||
- if (p_i45190_2_.length >= 1048576)
|
|
||||||
+ //TODO: Remove this when FML protocol is re-written. To restore vanilla compatibility.
|
|
||||||
+ if (p_i45190_2_.length > 0x1FFF9A) // Max size of ANY MC packet is 0x1FFFFF minus max size of this packet (101)
|
|
||||||
{
|
|
||||||
- throw new IllegalArgumentException("Payload may not be larger than 1048576 bytes");
|
|
||||||
+ throw new IllegalArgumentException("Payload may not be larger than 2097050 bytes");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_148837_a(PacketBuffer p_148837_1_) throws IOException
|
|
||||||
{
|
|
||||||
this.field_149172_a = p_148837_1_.func_150789_c(20);
|
|
||||||
- this.field_149171_b = new byte[p_148837_1_.readUnsignedShort()];
|
|
||||||
+ this.field_149171_b = new byte[cpw.mods.fml.common.network.ByteBufUtils.readVarShort(p_148837_1_)];
|
|
||||||
p_148837_1_.readBytes(this.field_149171_b);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_148840_b(PacketBuffer p_148840_1_) throws IOException
|
|
||||||
{
|
|
||||||
p_148840_1_.func_150785_a(this.field_149172_a);
|
|
||||||
- p_148840_1_.writeShort(this.field_149171_b.length);
|
|
||||||
+ cpw.mods.fml.common.network.ByteBufUtils.writeVarShort(p_148840_1_, this.field_149171_b.length);
|
|
||||||
p_148840_1_.writeBytes(this.field_149171_b);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/realms/RealmsConnect.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/realms/RealmsConnect.java
|
|
||||||
@@ -40,6 +40,7 @@
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
+ cpw.mods.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_);
|
|
||||||
inetaddress = InetAddress.getByName(p_connect_1_);
|
|
||||||
|
|
||||||
if (RealmsConnect.this.aborted)
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/server/MinecraftServer.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/MinecraftServer.java
|
|
||||||
@@ -5,6 +5,11 @@
|
|
||||||
import com.mojang.authlib.GameProfileRepository;
|
|
||||||
import com.mojang.authlib.minecraft.MinecraftSessionService;
|
|
||||||
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
|
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
+import cpw.mods.fml.common.Loader;
|
|
||||||
+import cpw.mods.fml.common.LoaderState;
|
|
||||||
+import cpw.mods.fml.common.StartupQuery;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
@@ -343,7 +348,7 @@
|
|
||||||
|
|
||||||
public void func_71260_j()
|
|
||||||
{
|
|
||||||
- if (!this.field_71290_O)
|
|
||||||
+ if (!this.field_71290_O && Loader.instance().hasReachedState(LoaderState.SERVER_STARTED) && !field_71316_v) // make sure the save is valid and we don't save twice
|
|
||||||
{
|
|
||||||
field_147145_h.info("Stopping server");
|
|
||||||
|
|
||||||
@@ -394,6 +399,7 @@
|
|
||||||
{
|
|
||||||
if (this.func_71197_b())
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().handleServerStarted();
|
|
||||||
long i = func_130071_aq();
|
|
||||||
long l = 0L;
|
|
||||||
this.field_147147_p.func_151315_a(new ChatComponentText(this.field_71286_C));
|
|
||||||
@@ -438,12 +444,20 @@
|
|
||||||
Thread.sleep(Math.max(1L, 50L - l));
|
|
||||||
this.field_71296_Q = true;
|
|
||||||
}
|
|
||||||
+ FMLCommonHandler.instance().handleServerStopping();
|
|
||||||
+ FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
||||||
this.func_71228_a((CrashReport)null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ catch (StartupQuery.AbortedException e)
|
|
||||||
+ {
|
|
||||||
+ // ignore silently
|
|
||||||
+ FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
||||||
+ }
|
|
||||||
catch (Throwable throwable1)
|
|
||||||
{
|
|
||||||
field_147145_h.error("Encountered an unexpected exception", throwable1);
|
|
||||||
@@ -469,6 +483,7 @@
|
|
||||||
field_147145_h.error("We were unable to save this crash report to disk.");
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().expectServerStopped(); // has to come before finalTick to avoid race conditions
|
|
||||||
this.func_71228_a(crashreport);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
@@ -484,6 +499,8 @@
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().handleServerStopped();
|
|
||||||
+ this.field_71316_v = true;
|
|
||||||
this.func_71240_o();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -529,6 +546,7 @@
|
|
||||||
public void func_71217_p()
|
|
||||||
{
|
|
||||||
long i = System.nanoTime();
|
|
||||||
+ FMLCommonHandler.instance().onPreServerTick();
|
|
||||||
++this.field_71315_w;
|
|
||||||
|
|
||||||
if (this.field_71295_T)
|
|
||||||
@@ -582,6 +600,7 @@
|
|
||||||
|
|
||||||
this.field_71304_b.func_76319_b();
|
|
||||||
this.field_71304_b.func_76319_b();
|
|
||||||
+ FMLCommonHandler.instance().onPostServerTick();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_71190_q()
|
|
||||||
@@ -608,6 +627,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
this.field_71304_b.func_76320_a("tick");
|
|
||||||
+ FMLCommonHandler.instance().onPreWorldTick(worldserver);
|
|
||||||
CrashReport crashreport;
|
|
||||||
|
|
||||||
try
|
|
||||||
@@ -632,6 +652,7 @@
|
|
||||||
throw new ReportedException(crashreport);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().onPostWorldTick(worldserver);
|
|
||||||
this.field_71304_b.func_76319_b();
|
|
||||||
this.field_71304_b.func_76320_a("tracker");
|
|
||||||
worldserver.func_73039_n().func_72788_a();
|
|
||||||
@@ -663,6 +684,7 @@
|
|
||||||
|
|
||||||
public void func_71256_s()
|
|
||||||
{
|
|
||||||
+ StartupQuery.reset();
|
|
||||||
(new Thread("Server thread")
|
|
||||||
{
|
|
||||||
private static final String __OBFID = "CL_00001418";
|
|
||||||
@@ -715,7 +737,7 @@
|
|
||||||
|
|
||||||
public String getServerModName()
|
|
||||||
{
|
|
||||||
- return "vanilla";
|
|
||||||
+ return FMLCommonHandler.instance().getModName();
|
|
||||||
}
|
|
||||||
|
|
||||||
public CrashReport func_71230_b(CrashReport p_71230_1_)
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/server/dedicated/DedicatedServer.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/dedicated/DedicatedServer.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.server.dedicated;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
@@ -48,6 +49,7 @@
|
|
||||||
private boolean field_71338_p;
|
|
||||||
private WorldSettings.GameType field_71337_q;
|
|
||||||
private boolean field_71335_s;
|
|
||||||
+ public static boolean allowPlayerLogins = false;
|
|
||||||
private static final String __OBFID = "CL_00001784";
|
|
||||||
|
|
||||||
public DedicatedServer(File p_i1508_1_)
|
|
||||||
@@ -112,6 +114,8 @@
|
|
||||||
field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\"");
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().onServerStart(this);
|
|
||||||
+
|
|
||||||
field_155771_h.info("Loading properties");
|
|
||||||
this.field_71340_o = new PropertyManager(new File("server.properties"));
|
|
||||||
this.field_154332_n = new ServerEula(new File("eula.txt"));
|
|
||||||
@@ -203,6 +207,7 @@
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().onServerStarted();
|
|
||||||
this.func_152361_a(new DedicatedPlayerList(this));
|
|
||||||
long j = System.nanoTime();
|
|
||||||
|
|
||||||
@@ -248,6 +253,7 @@
|
|
||||||
this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16);
|
|
||||||
this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256));
|
|
||||||
this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z()));
|
|
||||||
+ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; }
|
|
||||||
field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
|
|
||||||
this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
|
|
||||||
long i1 = System.nanoTime() - j;
|
|
||||||
@@ -268,7 +274,7 @@
|
|
||||||
this.field_71339_n.func_72602_a();
|
|
||||||
}
|
|
||||||
|
|
||||||
- return true;
|
|
||||||
+ return FMLCommonHandler.instance().handleServerStarting(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServer.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServer.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.server.integrated;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.io.File;
|
|
||||||
@@ -105,9 +106,10 @@
|
|
||||||
this.func_71245_h(true);
|
|
||||||
field_147148_h.info("Generating keypair");
|
|
||||||
this.func_71253_a(CryptManager.func_75891_b());
|
|
||||||
+ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; }
|
|
||||||
this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j());
|
|
||||||
this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j());
|
|
||||||
- return true;
|
|
||||||
+ return FMLCommonHandler.instance().handleServerStarting(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_71217_p()
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/server/management/PlayerProfileCache.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/management/PlayerProfileCache.java
|
|
||||||
@@ -224,26 +224,12 @@
|
|
||||||
{
|
|
||||||
List list = null;
|
|
||||||
BufferedReader bufferedreader = null;
|
|
||||||
- label81:
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
bufferedreader = Files.newReader(this.field_152665_g, Charsets.UTF_8);
|
|
||||||
list = (List)this.field_152660_b.fromJson(bufferedreader, field_152666_h);
|
|
||||||
- break label81;
|
|
||||||
- }
|
|
||||||
- catch (FileNotFoundException filenotfoundexception)
|
|
||||||
- {
|
|
||||||
- ;
|
|
||||||
- }
|
|
||||||
- finally
|
|
||||||
- {
|
|
||||||
- IOUtils.closeQuietly(bufferedreader);
|
|
||||||
- }
|
|
||||||
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
if (list != null)
|
|
||||||
{
|
|
||||||
this.field_152661_c.clear();
|
|
||||||
@@ -268,6 +254,20 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ }
|
|
||||||
+ catch (FileNotFoundException filenotfoundexception)
|
|
||||||
+ {
|
|
||||||
+ ;
|
|
||||||
+ }
|
|
||||||
+ catch (com.google.gson.JsonParseException parsefail)
|
|
||||||
+ {
|
|
||||||
+ // No op - the cache can quietly rebuild if it's junk
|
|
||||||
+ }
|
|
||||||
+ finally
|
|
||||||
+ {
|
|
||||||
+ IOUtils.closeQuietly(bufferedreader);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_152658_c()
|
|
||||||
-93
@@ -1,93 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/server/management/ServerConfigurationManager.java
|
|
||||||
@@ -4,6 +4,8 @@
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.io.File;
|
|
||||||
@@ -58,6 +60,7 @@
|
|
||||||
import net.minecraft.world.WorldSettings;
|
|
||||||
import net.minecraft.world.demo.DemoWorldManager;
|
|
||||||
import net.minecraft.world.storage.IPlayerFileData;
|
|
||||||
+import net.minecraft.world.storage.SaveHandler;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
@@ -98,7 +101,7 @@
|
|
||||||
this.field_72405_c = 8;
|
|
||||||
}
|
|
||||||
|
|
||||||
- public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_)
|
|
||||||
+ public void func_72355_a(NetworkManager p_72355_1_, EntityPlayerMP p_72355_2_, NetHandlerPlayServer nethandlerplayserver)
|
|
||||||
{
|
|
||||||
GameProfile gameprofile = p_72355_2_.func_146103_bH();
|
|
||||||
PlayerProfileCache playerprofilecache = this.field_72400_f.func_152358_ax();
|
|
||||||
@@ -119,7 +122,7 @@
|
|
||||||
WorldServer worldserver = this.field_72400_f.func_71218_a(p_72355_2_.field_71093_bK);
|
|
||||||
ChunkCoordinates chunkcoordinates = worldserver.func_72861_E();
|
|
||||||
this.func_72381_a(p_72355_2_, (EntityPlayerMP)null, worldserver);
|
|
||||||
- NetHandlerPlayServer nethandlerplayserver = new NetHandlerPlayServer(this.field_72400_f, p_72355_1_, p_72355_2_);
|
|
||||||
+ p_72355_2_.field_71135_a = nethandlerplayserver;
|
|
||||||
nethandlerplayserver.func_147359_a(new S01PacketJoinGame(p_72355_2_.func_145782_y(), p_72355_2_.field_71134_c.func_73081_b(), worldserver.func_72912_H().func_76093_s(), worldserver.field_73011_w.field_76574_g, worldserver.field_73013_u, this.func_72352_l(), worldserver.func_72912_H().func_76067_t()));
|
|
||||||
nethandlerplayserver.func_147359_a(new S3FPacketCustomPayload("MC|Brand", this.func_72365_p().getServerModName().getBytes(Charsets.UTF_8)));
|
|
||||||
nethandlerplayserver.func_147359_a(new S05PacketSpawnPosition(chunkcoordinates.field_71574_a, chunkcoordinates.field_71572_b, chunkcoordinates.field_71573_c));
|
|
||||||
@@ -161,6 +164,7 @@
|
|
||||||
|
|
||||||
p_72355_2_.func_71116_b();
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().firePlayerLoggedIn(p_72355_2_);
|
|
||||||
if (nbttagcompound != null && nbttagcompound.func_150297_b("Riding", 10))
|
|
||||||
{
|
|
||||||
Entity entity = EntityList.func_75615_a(nbttagcompound.func_74775_l("Riding"), worldserver);
|
|
||||||
@@ -248,8 +252,23 @@
|
|
||||||
return nbttagcompound1;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ public NBTTagCompound getPlayerNBT(EntityPlayerMP player)
|
|
||||||
+ {
|
|
||||||
+ // Hacky method to allow loading the NBT for a player prior to login
|
|
||||||
+ NBTTagCompound nbttagcompound = this.field_72400_f.field_71305_c[0].func_72912_H().func_76072_h();
|
|
||||||
+ if (player.func_70005_c_().equals(this.field_72400_f.func_71214_G()) && nbttagcompound != null)
|
|
||||||
+ {
|
|
||||||
+ return nbttagcompound;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ return ((SaveHandler)this.field_72412_k).getPlayerNBT(player);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
protected void func_72391_b(EntityPlayerMP p_72391_1_)
|
|
||||||
{
|
|
||||||
+ if (p_72391_1_.field_71135_a == null) return;
|
|
||||||
+
|
|
||||||
this.field_72412_k.func_75753_a(p_72391_1_);
|
|
||||||
StatisticsFile statisticsfile = (StatisticsFile)this.field_148547_k.get(p_72391_1_.func_110124_au());
|
|
||||||
|
|
||||||
@@ -281,6 +300,7 @@
|
|
||||||
|
|
||||||
public void func_72367_e(EntityPlayerMP p_72367_1_)
|
|
||||||
{
|
|
||||||
+ FMLCommonHandler.instance().firePlayerLoggedOut(p_72367_1_);
|
|
||||||
p_72367_1_.func_71029_a(StatList.field_75947_j);
|
|
||||||
this.func_72391_b(p_72367_1_);
|
|
||||||
WorldServer worldserver = p_72367_1_.func_71121_q();
|
|
||||||
@@ -436,6 +456,7 @@
|
|
||||||
this.field_72404_b.add(entityplayermp1);
|
|
||||||
entityplayermp1.func_71116_b();
|
|
||||||
entityplayermp1.func_70606_j(entityplayermp1.func_110143_aJ());
|
|
||||||
+ FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1);
|
|
||||||
return entityplayermp1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -461,6 +482,7 @@
|
|
||||||
PotionEffect potioneffect = (PotionEffect)iterator.next();
|
|
||||||
p_72356_1_.field_71135_a.func_147359_a(new S1DPacketEntityEffect(p_72356_1_.func_145782_y(), potioneffect));
|
|
||||||
}
|
|
||||||
+ FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_72356_1_, j, p_72356_2_);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_)
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/tileentity/TileEntity.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntity.java
|
|
||||||
@@ -1,10 +1,12 @@
|
|
||||||
package net.minecraft.tileentity;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.FMLLog;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.Callable;
|
|
||||||
+
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.block.BlockJukebox;
|
|
||||||
import net.minecraft.crash.CrashReportCategory;
|
|
||||||
@@ -12,6 +14,8 @@
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.network.Packet;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
+
|
|
||||||
+import org.apache.logging.log4j.Level;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
@@ -87,9 +91,10 @@
|
|
||||||
{
|
|
||||||
TileEntity tileentity = null;
|
|
||||||
|
|
||||||
+ Class oclass = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
- Class oclass = (Class)field_145855_i.get(p_145827_0_.func_74779_i("id"));
|
|
||||||
+ oclass = (Class)field_145855_i.get(p_145827_0_.func_74779_i("id"));
|
|
||||||
|
|
||||||
if (oclass != null)
|
|
||||||
{
|
|
||||||
@@ -103,7 +108,17 @@
|
|
||||||
|
|
||||||
if (tileentity != null)
|
|
||||||
{
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
tileentity.func_145839_a(p_145827_0_);
|
|
||||||
+ }
|
|
||||||
+ catch (Exception ex)
|
|
||||||
+ {
|
|
||||||
+ FMLLog.log(Level.ERROR, ex,
|
|
||||||
+ "A TileEntity %s(%s) has thrown an exception during loading, its state cannot be restored. Report this to the mod author",
|
|
||||||
+ p_145827_0_.func_74779_i("id"), oclass.getName());
|
|
||||||
+ tileentity = null;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@@ -137,7 +152,6 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- @SideOnly(Side.CLIENT)
|
|
||||||
public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_)
|
|
||||||
{
|
|
||||||
double d3 = (double)this.field_145851_c + 0.5D - p_145835_1_;
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
|
|
||||||
@@ -1,5 +1,6 @@
|
|
||||||
package net.minecraft.tileentity;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.registry.GameRegistry;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
@@ -322,7 +323,15 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- return item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD") ? 200 : (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD") ? 200 : (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD") ? 200 : (item == Items.field_151055_y ? 100 : (item == Items.field_151044_h ? 1600 : (item == Items.field_151129_at ? 20000 : (item == Item.func_150898_a(Blocks.field_150345_g) ? 100 : (item == Items.field_151072_bj ? 2400 : 0)))))));
|
|
||||||
+ if (item instanceof ItemTool && ((ItemTool)item).func_77861_e().equals("WOOD")) return 200;
|
|
||||||
+ if (item instanceof ItemSword && ((ItemSword)item).func_150932_j().equals("WOOD")) return 200;
|
|
||||||
+ if (item instanceof ItemHoe && ((ItemHoe)item).func_77842_f().equals("WOOD")) return 200;
|
|
||||||
+ if (item == Items.field_151055_y) return 100;
|
|
||||||
+ if (item == Items.field_151044_h) return 1600;
|
|
||||||
+ if (item == Items.field_151129_at) return 20000;
|
|
||||||
+ if (item == Item.func_150898_a(Blocks.field_150345_g)) return 100;
|
|
||||||
+ if (item == Items.field_151072_bj) return 2400;
|
|
||||||
+ return GameRegistry.getFuelValue(p_145952_0_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/World.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/World.java
|
|
||||||
@@ -1800,14 +1800,14 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- this.field_147481_N = false;
|
|
||||||
-
|
|
||||||
if (!this.field_147483_b.isEmpty())
|
|
||||||
{
|
|
||||||
this.field_147482_g.removeAll(this.field_147483_b);
|
|
||||||
this.field_147483_b.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
+ this.field_147481_N = false;
|
|
||||||
+
|
|
||||||
this.field_72984_F.func_76318_c("pendingBlockEntities");
|
|
||||||
|
|
||||||
if (!this.field_147484_a.isEmpty())
|
|
||||||
@@ -3598,7 +3598,7 @@
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public double func_72919_O()
|
|
||||||
{
|
|
||||||
- return this.field_72986_A.func_76067_t() == WorldType.field_77138_c ? 0.0D : 63.0D;
|
|
||||||
+ return this.field_72986_A.func_76067_t().getHorizon(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public CrashReportCategory func_72914_a(CrashReport p_72914_1_)
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/WorldProvider.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/WorldProvider.java
|
|
||||||
@@ -50,20 +50,12 @@
|
|
||||||
|
|
||||||
protected void func_76572_b()
|
|
||||||
{
|
|
||||||
- if (this.field_76579_a.func_72912_H().func_76067_t() == WorldType.field_77138_c)
|
|
||||||
- {
|
|
||||||
- FlatGeneratorInfo flatgeneratorinfo = FlatGeneratorInfo.func_82651_a(this.field_76579_a.func_72912_H().func_82571_y());
|
|
||||||
- this.field_76578_c = new WorldChunkManagerHell(BiomeGenBase.func_150568_d(flatgeneratorinfo.func_82648_a()), 0.5F);
|
|
||||||
- }
|
|
||||||
- else
|
|
||||||
- {
|
|
||||||
- this.field_76578_c = new WorldChunkManager(this.field_76579_a);
|
|
||||||
- }
|
|
||||||
+ this.field_76578_c = field_76577_b.getChunkManager(field_76579_a);
|
|
||||||
}
|
|
||||||
|
|
||||||
public IChunkProvider func_76555_c()
|
|
||||||
{
|
|
||||||
- return (IChunkProvider)(this.field_76577_b == WorldType.field_77138_c ? new ChunkProviderFlat(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r(), this.field_82913_c) : new ChunkProviderGenerate(this.field_76579_a, this.field_76579_a.func_72905_C(), this.field_76579_a.func_72912_H().func_76089_r()));
|
|
||||||
+ return field_76577_b.getChunkGenerator(field_76579_a, field_82913_c);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean func_76566_a(int p_76566_1_, int p_76566_2_)
|
|
||||||
@@ -179,19 +171,19 @@
|
|
||||||
|
|
||||||
public int func_76557_i()
|
|
||||||
{
|
|
||||||
- return this.field_76577_b == WorldType.field_77138_c ? 4 : 64;
|
|
||||||
+ return this.field_76577_b.getMinimumSpawnHeight(this.field_76579_a);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public boolean func_76564_j()
|
|
||||||
{
|
|
||||||
- return this.field_76577_b != WorldType.field_77138_c && !this.field_76576_e;
|
|
||||||
+ return this.field_76577_b.hasVoidParticles(this.field_76576_e);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
public double func_76565_k()
|
|
||||||
{
|
|
||||||
- return this.field_76577_b == WorldType.field_77138_c ? 1.0D : 0.03125D;
|
|
||||||
+ return this.field_76577_b.voidFadeMagnitude();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SideOnly(Side.CLIENT)
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/WorldType.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/WorldType.java
|
|
||||||
@@ -1,5 +1,14 @@
|
|
||||||
package net.minecraft.world;
|
|
||||||
|
|
||||||
+import java.util.Random;
|
|
||||||
+
|
|
||||||
+import net.minecraft.world.biome.BiomeGenBase;
|
|
||||||
+import net.minecraft.world.biome.WorldChunkManager;
|
|
||||||
+import net.minecraft.world.biome.WorldChunkManagerHell;
|
|
||||||
+import net.minecraft.world.chunk.IChunkProvider;
|
|
||||||
+import net.minecraft.world.gen.ChunkProviderFlat;
|
|
||||||
+import net.minecraft.world.gen.ChunkProviderGenerate;
|
|
||||||
+import net.minecraft.world.gen.FlatGeneratorInfo;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
|
||||||
|
|
||||||
@@ -112,4 +121,70 @@
|
|
||||||
this.field_151361_l = true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ public WorldChunkManager getChunkManager(World world)
|
|
||||||
+ {
|
|
||||||
+ if (this == field_77138_c)
|
|
||||||
+ {
|
|
||||||
+ FlatGeneratorInfo flatgeneratorinfo = FlatGeneratorInfo.func_82651_a(world.func_72912_H().func_82571_y());
|
|
||||||
+ return new WorldChunkManagerHell(BiomeGenBase.func_150568_d(flatgeneratorinfo.func_82648_a()), 0.5F);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ return new WorldChunkManager(world);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public IChunkProvider getChunkGenerator(World world, String generatorOptions)
|
|
||||||
+ {
|
|
||||||
+ return (this == field_77138_c ? new ChunkProviderFlat(world, world.func_72905_C(), world.func_72912_H().func_76089_r(), generatorOptions) : new ChunkProviderGenerate(world, world.func_72905_C(), world.func_72912_H().func_76089_r()));
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public int getMinimumSpawnHeight(World world)
|
|
||||||
+ {
|
|
||||||
+ return this == field_77138_c ? 4 : 64;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public double getHorizon(World world)
|
|
||||||
+ {
|
|
||||||
+ return this == field_77138_c ? 0.0D : 63.0D;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public boolean hasVoidParticles(boolean flag)
|
|
||||||
+ {
|
|
||||||
+ return this != field_77138_c && !flag;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public double voidFadeMagnitude()
|
|
||||||
+ {
|
|
||||||
+ return this == field_77138_c ? 1.0D : 0.03125D;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+/* public BiomeGenBase[] getBiomesForWorldType() {
|
|
||||||
+ return biomesForWorldType;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public void addNewBiome(BiomeGenBase biome)
|
|
||||||
+ {
|
|
||||||
+ Set<BiomeGenBase> newBiomesForWorld = Sets.newLinkedHashSet(Arrays.asList(biomesForWorldType));
|
|
||||||
+ newBiomesForWorld.add(biome);
|
|
||||||
+ biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public void removeBiome(BiomeGenBase biome)
|
|
||||||
+ {
|
|
||||||
+ Set<BiomeGenBase> newBiomesForWorld = Sets.newLinkedHashSet(Arrays.asList(biomesForWorldType));
|
|
||||||
+ newBiomesForWorld.remove(biome);
|
|
||||||
+ biomesForWorldType = newBiomesForWorld.toArray(new BiomeGenBase[0]);
|
|
||||||
+ }
|
|
||||||
+*/
|
|
||||||
+ public boolean handleSlimeSpawnReduction(Random random, World world)
|
|
||||||
+ {
|
|
||||||
+ return this == field_77138_c ? random.nextInt(4) != 1 : false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /**
|
|
||||||
+ * Called when 'Create New World' button is pressed before starting game
|
|
||||||
+ */
|
|
||||||
+ public void onGUICreateWorldPress() { }
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.java
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
+
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.entity.Entity;
|
|
||||||
import net.minecraft.entity.EntityList;
|
|
||||||
@@ -24,9 +25,13 @@
|
|
||||||
import net.minecraft.world.chunk.NibbleArray;
|
|
||||||
import net.minecraft.world.storage.IThreadedFileIO;
|
|
||||||
import net.minecraft.world.storage.ThreadedFileIOBase;
|
|
||||||
+
|
|
||||||
+import org.apache.logging.log4j.Level;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
+import cpw.mods.fml.common.FMLLog;
|
|
||||||
+
|
|
||||||
public class AnvilChunkLoader implements IChunkLoader, IThreadedFileIO
|
|
||||||
{
|
|
||||||
private static final Logger field_151505_a = LogManager.getLogger();
|
|
||||||
@@ -260,11 +265,20 @@
|
|
||||||
Entity entity = (Entity)iterator1.next();
|
|
||||||
nbttagcompound1 = new NBTTagCompound();
|
|
||||||
|
|
||||||
- if (entity.func_70039_c(nbttagcompound1))
|
|
||||||
+ try
|
|
||||||
{
|
|
||||||
- p_75820_1_.field_76644_m = true;
|
|
||||||
- nbttaglist2.func_74742_a(nbttagcompound1);
|
|
||||||
+ if (entity.func_70039_c(nbttagcompound1))
|
|
||||||
+ {
|
|
||||||
+ p_75820_1_.field_76644_m = true;
|
|
||||||
+ nbttaglist2.func_74742_a(nbttagcompound1);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
+ catch (Exception e)
|
|
||||||
+ {
|
|
||||||
+ FMLLog.log(Level.ERROR, e,
|
|
||||||
+ "An Entity type %s has thrown an exception trying to write state. It will not persist. Report this to the mod author",
|
|
||||||
+ entity.getClass().getName());
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -276,8 +290,16 @@
|
|
||||||
{
|
|
||||||
TileEntity tileentity = (TileEntity)iterator1.next();
|
|
||||||
nbttagcompound1 = new NBTTagCompound();
|
|
||||||
+ try {
|
|
||||||
tileentity.func_145841_b(nbttagcompound1);
|
|
||||||
nbttaglist3.func_74742_a(nbttagcompound1);
|
|
||||||
+ }
|
|
||||||
+ catch (Exception e)
|
|
||||||
+ {
|
|
||||||
+ FMLLog.log(Level.ERROR, e,
|
|
||||||
+ "A TileEntity type %s has throw an exception trying to write state. It will not persist. Report this to the mod author",
|
|
||||||
+ tileentity.getClass().getName());
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
p_75820_3_.func_74782_a("TileEntities", nbttaglist3);
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/gen/ChunkProviderServer.java
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
package net.minecraft.world.gen;
|
|
||||||
|
|
||||||
import com.google.common.collect.Lists;
|
|
||||||
+import cpw.mods.fml.common.registry.GameRegistry;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Collections;
|
|
||||||
@@ -216,6 +217,7 @@
|
|
||||||
if (this.field_73246_d != null)
|
|
||||||
{
|
|
||||||
this.field_73246_d.func_73153_a(p_73153_1_, p_73153_2_, p_73153_3_);
|
|
||||||
+ GameRegistry.generateWorld(p_73153_2_, p_73153_3_, field_73251_h, field_73246_d, p_73153_1_);
|
|
||||||
chunk.func_76630_e();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-31
@@ -1,31 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.java
|
|
||||||
@@ -4,6 +4,8 @@
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Random;
|
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.registry.VillagerRegistry;
|
|
||||||
import net.minecraft.block.Block;
|
|
||||||
import net.minecraft.block.material.Material;
|
|
||||||
import net.minecraft.entity.passive.EntityVillager;
|
|
||||||
@@ -50,6 +52,8 @@
|
|
||||||
arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.Field2.class, 3, MathHelper.func_76136_a(p_75084_0_, 2 + p_75084_1_, 4 + p_75084_1_ * 2)));
|
|
||||||
arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House2.class, 15, MathHelper.func_76136_a(p_75084_0_, 0, 1 + p_75084_1_)));
|
|
||||||
arraylist.add(new StructureVillagePieces.PieceWeight(StructureVillagePieces.House3.class, 8, MathHelper.func_76136_a(p_75084_0_, 0 + p_75084_1_, 3 + p_75084_1_ * 2)));
|
|
||||||
+ VillagerRegistry.addExtraVillageComponents(arraylist, p_75084_0_, p_75084_1_);
|
|
||||||
+
|
|
||||||
Iterator iterator = arraylist.iterator();
|
|
||||||
|
|
||||||
while (iterator.hasNext())
|
|
||||||
@@ -123,6 +127,10 @@
|
|
||||||
{
|
|
||||||
object = StructureVillagePieces.House3.func_74921_a(p_75083_0_, p_75083_2_, p_75083_3_, p_75083_4_, p_75083_5_, p_75083_6_, p_75083_7_, p_75083_8_);
|
|
||||||
}
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ object = VillagerRegistry.getVillageComponent(p_75083_1_, p_75083_0_ , p_75083_2_, p_75083_3_, p_75083_4_, p_75083_5_, p_75083_6_, p_75083_7_, p_75083_8_);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
return (StructureVillagePieces.Village)object;
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/storage/MapData.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/storage/MapData.java
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
import java.util.Map;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
-import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
+import net.minecraft.nbt.*;
|
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraft.world.WorldSavedData;
|
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
{
|
|
||||||
public int field_76201_a;
|
|
||||||
public int field_76199_b;
|
|
||||||
- public byte field_76200_c;
|
|
||||||
+ public int field_76200_c;
|
|
||||||
public byte field_76197_d;
|
|
||||||
public byte[] field_76198_e = new byte[16384];
|
|
||||||
public List field_76196_g = new ArrayList();
|
|
||||||
@@ -33,7 +33,17 @@
|
|
||||||
|
|
||||||
public void func_76184_a(NBTTagCompound p_76184_1_)
|
|
||||||
{
|
|
||||||
- this.field_76200_c = p_76184_1_.func_74771_c("dimension");
|
|
||||||
+ NBTBase dimension = p_76184_1_.func_74781_a("dimension");
|
|
||||||
+
|
|
||||||
+ if (dimension instanceof NBTTagByte)
|
|
||||||
+ {
|
|
||||||
+ this.field_76200_c = ((NBTTagByte)dimension).func_150290_f();
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ {
|
|
||||||
+ this.field_76200_c = ((NBTTagInt)dimension).func_150287_d();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
this.field_76201_a = p_76184_1_.func_74762_e("xCenter");
|
|
||||||
this.field_76199_b = p_76184_1_.func_74762_e("zCenter");
|
|
||||||
this.field_76197_d = p_76184_1_.func_74771_c("scale");
|
|
||||||
@@ -84,7 +94,7 @@
|
|
||||||
|
|
||||||
public void func_76187_b(NBTTagCompound p_76187_1_)
|
|
||||||
{
|
|
||||||
- p_76187_1_.func_74774_a("dimension", this.field_76200_c);
|
|
||||||
+ p_76187_1_.func_74768_a("dimension", this.field_76200_c);
|
|
||||||
p_76187_1_.func_74768_a("xCenter", this.field_76201_a);
|
|
||||||
p_76187_1_.func_74768_a("zCenter", this.field_76199_b);
|
|
||||||
p_76187_1_.func_74774_a("scale", this.field_76197_d);
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
--- ../src-base/minecraft/net/minecraft/world/storage/SaveHandler.java
|
|
||||||
+++ ../src-work/minecraft/net/minecraft/world/storage/SaveHandler.java
|
|
||||||
@@ -6,13 +6,18 @@
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
+
|
|
||||||
+import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
+import cpw.mods.fml.common.StartupQuery;
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
+import net.minecraft.entity.player.EntityPlayerMP;
|
|
||||||
import net.minecraft.nbt.CompressedStreamTools;
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
|
||||||
import net.minecraft.world.MinecraftException;
|
|
||||||
import net.minecraft.world.WorldProvider;
|
|
||||||
import net.minecraft.world.chunk.storage.IChunkLoader;
|
|
||||||
+
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
@@ -107,20 +112,29 @@
|
|
||||||
NBTTagCompound nbttagcompound;
|
|
||||||
NBTTagCompound nbttagcompound1;
|
|
||||||
|
|
||||||
+ WorldInfo worldInfo = null;
|
|
||||||
+
|
|
||||||
if (file1.exists())
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1));
|
|
||||||
nbttagcompound1 = nbttagcompound.func_74775_l("Data");
|
|
||||||
- return new WorldInfo(nbttagcompound1);
|
|
||||||
+ worldInfo = new WorldInfo(nbttagcompound1);
|
|
||||||
+ FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
|
|
||||||
+ return worldInfo;
|
|
||||||
}
|
|
||||||
+ catch (StartupQuery.AbortedException e)
|
|
||||||
+ {
|
|
||||||
+ throw e;
|
|
||||||
+ }
|
|
||||||
catch (Exception exception1)
|
|
||||||
{
|
|
||||||
exception1.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().confirmBackupLevelDatUse(this);
|
|
||||||
file1 = new File(this.field_75770_b, "level.dat_old");
|
|
||||||
|
|
||||||
if (file1.exists())
|
|
||||||
@@ -129,8 +143,14 @@
|
|
||||||
{
|
|
||||||
nbttagcompound = CompressedStreamTools.func_74796_a(new FileInputStream(file1));
|
|
||||||
nbttagcompound1 = nbttagcompound.func_74775_l("Data");
|
|
||||||
- return new WorldInfo(nbttagcompound1);
|
|
||||||
+ worldInfo = new WorldInfo(nbttagcompound1);
|
|
||||||
+ FMLCommonHandler.instance().handleWorldDataLoad(this, worldInfo, nbttagcompound);
|
|
||||||
+ return worldInfo;
|
|
||||||
}
|
|
||||||
+ catch (StartupQuery.AbortedException e)
|
|
||||||
+ {
|
|
||||||
+ throw e;
|
|
||||||
+ }
|
|
||||||
catch (Exception exception)
|
|
||||||
{
|
|
||||||
exception.printStackTrace();
|
|
||||||
@@ -146,6 +166,8 @@
|
|
||||||
NBTTagCompound nbttagcompound2 = new NBTTagCompound();
|
|
||||||
nbttagcompound2.func_74782_a("Data", nbttagcompound1);
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().handleWorldDataSave(this, p_75755_1_, nbttagcompound2);
|
|
||||||
+
|
|
||||||
try
|
|
||||||
{
|
|
||||||
File file1 = new File(this.field_75770_b, "level.dat_new");
|
|
||||||
@@ -184,6 +206,8 @@
|
|
||||||
NBTTagCompound nbttagcompound1 = new NBTTagCompound();
|
|
||||||
nbttagcompound1.func_74782_a("Data", nbttagcompound);
|
|
||||||
|
|
||||||
+ FMLCommonHandler.instance().handleWorldDataSave(this, p_75761_1_, nbttagcompound1);
|
|
||||||
+
|
|
||||||
try
|
|
||||||
{
|
|
||||||
File file1 = new File(this.field_75770_b, "level.dat_new");
|
|
||||||
@@ -296,4 +320,22 @@
|
|
||||||
{
|
|
||||||
return this.field_75767_f;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ public NBTTagCompound getPlayerNBT(EntityPlayerMP player)
|
|
||||||
+ {
|
|
||||||
+ try
|
|
||||||
+ {
|
|
||||||
+ File file1 = new File(this.field_75771_c, player.func_110124_au().toString() + ".dat");
|
|
||||||
+
|
|
||||||
+ if (file1.exists() && file1.isFile())
|
|
||||||
+ {
|
|
||||||
+ return CompressedStreamTools.func_74796_a(new FileInputStream(file1));
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ catch (Exception exception)
|
|
||||||
+ {
|
|
||||||
+ field_151478_a.warn("Failed to load player data for " + player.func_70005_c_());
|
|
||||||
+ }
|
|
||||||
+ return null;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
rootProject.name = 'fml'
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
package cpw.mods.fml.client;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableSet;
|
|
||||||
|
|
||||||
import cpw.mods.fml.client.config.ConfigGuiType;
|
|
||||||
import cpw.mods.fml.client.config.DummyConfigElement;
|
|
||||||
import cpw.mods.fml.client.config.GuiConfig;
|
|
||||||
import cpw.mods.fml.client.config.GuiConfigEntries.NumberSliderEntry;
|
|
||||||
import cpw.mods.fml.client.config.IConfigElement;
|
|
||||||
import cpw.mods.fml.client.config.DummyConfigElement.DummyCategoryElement;
|
|
||||||
import cpw.mods.fml.client.config.DummyConfigElement.DummyListElement;
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.Gui;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
|
||||||
import net.minecraft.client.resources.I18n;
|
|
||||||
|
|
||||||
public class FMLConfigGuiFactory implements IModGuiFactory
|
|
||||||
{
|
|
||||||
public static class FMLConfigGuiScreen extends GuiConfig
|
|
||||||
{
|
|
||||||
|
|
||||||
public FMLConfigGuiScreen(GuiScreen parent)
|
|
||||||
{
|
|
||||||
super(parent, getConfigElements(), "FML", false, false, I18n.format("fml.config.sample.title"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
|
||||||
private static List<IConfigElement> getConfigElements()
|
|
||||||
{
|
|
||||||
List<IConfigElement> list = new ArrayList<IConfigElement>();
|
|
||||||
List<IConfigElement> listsList = new ArrayList<IConfigElement>();
|
|
||||||
List<IConfigElement> stringsList = new ArrayList<IConfigElement>();
|
|
||||||
List<IConfigElement> numbersList = new ArrayList<IConfigElement>();
|
|
||||||
Pattern commaDelimitedPattern = Pattern.compile("([A-Za-z]+((,){1}( )*|$))+?");
|
|
||||||
|
|
||||||
// Top Level Settings
|
|
||||||
list.add(new DummyConfigElement<Boolean>("imABoolean", true, ConfigGuiType.BOOLEAN, "fml.config.sample.imABoolean").setRequiresMcRestart(true));
|
|
||||||
list.add(new DummyConfigElement<Integer>("imAnInteger", 42, ConfigGuiType.INTEGER, "fml.config.sample.imAnInteger", -1, 256).setRequiresMcRestart(true));
|
|
||||||
list.add(new DummyConfigElement<Double>("imADouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.imADouble", -1.0D, 256.256D).setRequiresMcRestart(true));
|
|
||||||
list.add(new DummyConfigElement<String>("imAString", "http://www.montypython.net/scripts/string.php", ConfigGuiType.STRING, "fml.config.sample.imAString").setRequiresMcRestart(true));
|
|
||||||
|
|
||||||
// Lists category
|
|
||||||
listsList.add(new DummyListElement<Boolean>("booleanList", new Boolean[] {true, false, true, false, true, false, true, false}, ConfigGuiType.BOOLEAN, "fml.config.sample.booleanList"));
|
|
||||||
listsList.add(new DummyListElement<Boolean>("booleanListFixed", new Boolean[] {true, false, true, false, true, false, true, false}, ConfigGuiType.BOOLEAN, "fml.config.sample.booleanListFixed", true));
|
|
||||||
listsList.add(new DummyListElement<Boolean>("booleanListMax", new Boolean[] {true, false, true, false, true, false, true, false}, ConfigGuiType.BOOLEAN, "fml.config.sample.booleanListMax", 10));
|
|
||||||
listsList.add(new DummyListElement<Double>("doubleList", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleList"));
|
|
||||||
listsList.add(new DummyListElement<Double>("doubleListFixed", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleListFixed", true));
|
|
||||||
listsList.add(new DummyListElement<Double>("doubleListMax", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleListMax", 15));
|
|
||||||
listsList.add(new DummyListElement<Double>("doubleListBounded", new Double[] {0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, 6.6D, 7.7D, 8.8D, 9.9D}, ConfigGuiType.DOUBLE, "fml.config.sample.doubleListBounded", -1.0D, 10.0D));
|
|
||||||
listsList.add(new DummyListElement<Integer>("integerList", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerList"));
|
|
||||||
listsList.add(new DummyListElement<Integer>("integerListFixed", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerListFixed", true));
|
|
||||||
listsList.add(new DummyListElement<Integer>("integerListMax", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerListMax", 15));
|
|
||||||
listsList.add(new DummyListElement<Integer>("integerListBounded", new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, ConfigGuiType.INTEGER, "fml.config.sample.integerListBounded", -1, 10));
|
|
||||||
listsList.add(new DummyListElement<String>("stringList", new String[] {"An", "array", "of", "string", "values"}, ConfigGuiType.STRING, "fml.config.sample.stringList"));
|
|
||||||
listsList.add(new DummyListElement<String>("stringListFixed", new String[] {"A", "fixed", "length", "array", "of", "string", "values"}, ConfigGuiType.STRING, "fml.config.sample.stringListFixed", true));
|
|
||||||
listsList.add(new DummyListElement<String>("stringListMax", new String[] {"An", "array", "of", "string", "values", "with", "a", "max", "length", "of", "15"}, ConfigGuiType.STRING, "fml.config.sample.stringListMax", 15));
|
|
||||||
listsList.add(new DummyListElement<String>("stringListPattern", new String[] {"Valid", "Not Valid", "Is, Valid", "Comma, Separated, Value"}, ConfigGuiType.STRING, "fml.config.sample.stringListPattern", commaDelimitedPattern));
|
|
||||||
|
|
||||||
list.add(new DummyCategoryElement("lists", "fml.config.sample.ctgy.lists", listsList));
|
|
||||||
|
|
||||||
// Strings category
|
|
||||||
stringsList.add(new DummyConfigElement<String>("basicString", "Just a regular String value, anything goes.", ConfigGuiType.STRING, "fml.config.sample.basicString"));
|
|
||||||
stringsList.add(new DummyConfigElement<String>("cycleString", "this", ConfigGuiType.STRING, "fml.config.sample.cycleString", new String[] {"this", "property", "cycles", "through", "a", "list", "of", "valid", "choices"}));
|
|
||||||
stringsList.add(new DummyConfigElement<String>("patternString", "only, comma, separated, words, can, be, entered, in, this, box", ConfigGuiType.STRING, "fml.config.sample.patternString", commaDelimitedPattern));
|
|
||||||
stringsList.add(new DummyConfigElement<String>("chatColorPicker", "c", ConfigGuiType.COLOR, "fml.config.sample.chatColorPicker", new String[] {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"}));
|
|
||||||
stringsList.add(new DummyConfigElement<String>("modIDSelector", "FML", ConfigGuiType.MOD_ID, "fml.config.sample.modIDSelector"));
|
|
||||||
|
|
||||||
list.add(new DummyCategoryElement("strings", "fml.config.sample.ctgy.strings", stringsList));
|
|
||||||
|
|
||||||
// Numbers category
|
|
||||||
numbersList.add((new DummyConfigElement<Integer>("basicInteger", 42, ConfigGuiType.INTEGER, "fml.config.sample.basicInteger")));
|
|
||||||
numbersList.add((new DummyConfigElement<Integer>("boundedInteger", 42, ConfigGuiType.INTEGER, "fml.config.sample.boundedInteger", -1, 256)));
|
|
||||||
numbersList.add((new DummyConfigElement<Integer>("sliderInteger", 2000, ConfigGuiType.INTEGER, "fml.config.sample.sliderInteger", 100, 10000)).setCustomListEntryClass(NumberSliderEntry.class));
|
|
||||||
numbersList.add(new DummyConfigElement<Double>("basicDouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.basicDouble"));
|
|
||||||
numbersList.add(new DummyConfigElement<Double>("boundedDouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.boundedDouble", -1.0D, 256.256D));
|
|
||||||
numbersList.add(new DummyConfigElement<Double>("sliderDouble", 42.4242D, ConfigGuiType.DOUBLE, "fml.config.sample.sliderDouble", -1.0D, 256.256D).setCustomListEntryClass(NumberSliderEntry.class));
|
|
||||||
|
|
||||||
list.add(new DummyCategoryElement("numbers", "fml.config.sample.ctgy.numbers", numbersList));
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void initialize(Minecraft minecraftInstance)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Class<? extends GuiScreen> mainConfigGuiClass()
|
|
||||||
{
|
|
||||||
return FMLConfigGuiScreen.class;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Set<RuntimeOptionCategoryElement> fmlCategories = ImmutableSet.of(new RuntimeOptionCategoryElement("HELP", "FML"));
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories()
|
|
||||||
{
|
|
||||||
return fmlCategories;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element)
|
|
||||||
{
|
|
||||||
return new RuntimeOptionGuiHandler() {
|
|
||||||
@Override
|
|
||||||
public void paint(int x, int y, int w, int h)
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void close()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addWidgets(List<Gui> widgets, int x, int y, int w, int h)
|
|
||||||
{
|
|
||||||
widgets.add(new GuiButton(100, x+10, y+10, "HELLO"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void actionCallback(int actionId)
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,694 +0,0 @@
|
|||||||
package cpw.mods.fml.client;
|
|
||||||
|
|
||||||
import static org.lwjgl.opengl.GL11.*;
|
|
||||||
import static org.lwjgl.opengl.GL12.*;
|
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileReader;
|
|
||||||
import java.io.FileWriter;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.lang.Thread.UncaughtExceptionHandler;
|
|
||||||
import java.nio.IntBuffer;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.concurrent.locks.Lock;
|
|
||||||
import java.util.concurrent.locks.ReentrantLock;
|
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
|
||||||
import javax.imageio.ImageReader;
|
|
||||||
import javax.imageio.stream.ImageInputStream;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.FontRenderer;
|
|
||||||
import net.minecraft.client.renderer.texture.TextureManager;
|
|
||||||
import net.minecraft.client.resources.FileResourcePack;
|
|
||||||
import net.minecraft.client.resources.FolderResourcePack;
|
|
||||||
import net.minecraft.client.resources.IResourcePack;
|
|
||||||
import net.minecraft.crash.CrashReport;
|
|
||||||
import net.minecraft.launchwrapper.Launch;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
|
||||||
import org.apache.logging.log4j.Level;
|
|
||||||
import org.lwjgl.BufferUtils;
|
|
||||||
import org.lwjgl.LWJGLException;
|
|
||||||
import org.lwjgl.opengl.Display;
|
|
||||||
import org.lwjgl.opengl.Drawable;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
import org.lwjgl.opengl.SharedDrawable;
|
|
||||||
import org.lwjgl.util.glu.GLU;
|
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
|
||||||
import cpw.mods.fml.common.ICrashCallable;
|
|
||||||
import cpw.mods.fml.common.Loader;
|
|
||||||
import cpw.mods.fml.common.ProgressManager;
|
|
||||||
import cpw.mods.fml.common.ProgressManager.ProgressBar;
|
|
||||||
import cpw.mods.fml.common.asm.FMLSanityChecker;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated not a stable API, will break, don't use this yet
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public class SplashProgress
|
|
||||||
{
|
|
||||||
private static Drawable d;
|
|
||||||
private static volatile boolean pause = false;
|
|
||||||
private static volatile boolean done = false;
|
|
||||||
private static Thread thread;
|
|
||||||
private static volatile Throwable threadError;
|
|
||||||
private static int angle = 0;
|
|
||||||
private static final Lock lock = new ReentrantLock(true);
|
|
||||||
private static SplashFontRenderer fontRenderer;
|
|
||||||
|
|
||||||
private static final IResourcePack mcPack = Minecraft.getMinecraft().mcDefaultResourcePack;
|
|
||||||
private static final IResourcePack fmlPack = createResourcePack(FMLSanityChecker.fmlLocation);
|
|
||||||
private static IResourcePack miscPack;
|
|
||||||
|
|
||||||
private static Texture fontTexture;
|
|
||||||
private static Texture logoTexture;
|
|
||||||
private static Texture forgeTexture;
|
|
||||||
|
|
||||||
private static Properties config;
|
|
||||||
|
|
||||||
private static boolean enabled;
|
|
||||||
private static boolean rotate;
|
|
||||||
private static int logoOffset;
|
|
||||||
private static int backgroundColor;
|
|
||||||
private static int fontColor;
|
|
||||||
private static int barBorderColor;
|
|
||||||
private static int barColor;
|
|
||||||
private static int barBackgroundColor;
|
|
||||||
|
|
||||||
private static String getString(String name, String def)
|
|
||||||
{
|
|
||||||
String value = config.getProperty(name, def);
|
|
||||||
config.setProperty(name, value);
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean getBool(String name, boolean def)
|
|
||||||
{
|
|
||||||
return Boolean.parseBoolean(getString(name, Boolean.toString(def)));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int getInt(String name, int def)
|
|
||||||
{
|
|
||||||
return Integer.decode(getString(name, Integer.toString(def)));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static int getHex(String name, int def)
|
|
||||||
{
|
|
||||||
return Integer.decode(getString(name, "0x" + Integer.toString(def, 16).toUpperCase()));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void start()
|
|
||||||
{
|
|
||||||
File configFile = new File(Minecraft.getMinecraft().mcDataDir, "config/splash.properties");
|
|
||||||
FileReader r = null;
|
|
||||||
config = new Properties();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
r = new FileReader(configFile);
|
|
||||||
config.load(r);
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
FMLLog.info("Could not load splash.properties, will create a default one");
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IOUtils.closeQuietly(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enable if we have the flag, and there's either no optifine, or optifine has added a key to the blackboard ("optifine.ForgeSplashCompatible")
|
|
||||||
// Optifine authors - add this key to the blackboard if you feel your modifications are now compatible with this code.
|
|
||||||
enabled = getBool("enabled", true) && ( (!FMLClientHandler.instance().hasOptifine()) || Launch.blackboard.containsKey("optifine.ForgeSplashCompatible"));
|
|
||||||
rotate = getBool("rotate", false);
|
|
||||||
logoOffset = getInt("logoOffset", 0);
|
|
||||||
backgroundColor = getHex("background", 0xFFFFFF);
|
|
||||||
fontColor = getHex("font", 0x000000);
|
|
||||||
barBorderColor = getHex("barBorder", 0xC0C0C0);
|
|
||||||
barColor = getHex("bar", 0xCB3D35);
|
|
||||||
barBackgroundColor = getHex("barBackground", 0xFFFFFF);
|
|
||||||
|
|
||||||
final ResourceLocation fontLoc = new ResourceLocation(getString("fontTexture", "textures/font/ascii.png"));
|
|
||||||
final ResourceLocation logoLoc = new ResourceLocation(getString("logoTexture", "textures/gui/title/mojang.png"));
|
|
||||||
final ResourceLocation forgeLoc = new ResourceLocation(getString("forgeTexture", "fml:textures/gui/forge.gif"));
|
|
||||||
|
|
||||||
File miscPackFile = new File(Minecraft.getMinecraft().mcDataDir, getString("resourcePackPath", "resources"));
|
|
||||||
|
|
||||||
FileWriter w = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
w = new FileWriter(configFile);
|
|
||||||
config.store(w, "Splash screen properties");
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
FMLLog.log(Level.ERROR, e, "Could not save the splash.properties file");
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IOUtils.closeQuietly(w);
|
|
||||||
}
|
|
||||||
|
|
||||||
miscPack = createResourcePack(miscPackFile);
|
|
||||||
|
|
||||||
if(!enabled) return;
|
|
||||||
// getting debug info out of the way, while we still can
|
|
||||||
FMLCommonHandler.instance().registerCrashCallable(new ICrashCallable()
|
|
||||||
{
|
|
||||||
public String call() throws Exception
|
|
||||||
{
|
|
||||||
return "' Vendor: '" + glGetString(GL_VENDOR) +
|
|
||||||
"' Version: '" + glGetString(GL_VERSION) +
|
|
||||||
"' Renderer: '" + glGetString(GL_RENDERER) +
|
|
||||||
"'";
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getLabel()
|
|
||||||
{
|
|
||||||
return "GL info";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
CrashReport report = CrashReport.makeCrashReport(new Throwable(), "Loading screen debug info");
|
|
||||||
System.out.println(report.getCompleteReport());
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
d = new SharedDrawable(Display.getDrawable());
|
|
||||||
Display.getDrawable().releaseContext();
|
|
||||||
d.makeCurrent();
|
|
||||||
}
|
|
||||||
catch (LWJGLException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
Thread mainThread = Thread.currentThread();
|
|
||||||
thread = new Thread(new Runnable()
|
|
||||||
{
|
|
||||||
private final int barWidth = 400;
|
|
||||||
private final int barHeight = 20;
|
|
||||||
private final int textHeight2 = 20;
|
|
||||||
private final int barOffset = 55;
|
|
||||||
|
|
||||||
public void run()
|
|
||||||
{
|
|
||||||
setGL();
|
|
||||||
fontTexture = new Texture(fontLoc);
|
|
||||||
logoTexture = new Texture(logoLoc);
|
|
||||||
forgeTexture = new Texture(forgeLoc);
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
|
||||||
fontRenderer = new SplashFontRenderer();
|
|
||||||
glDisable(GL_TEXTURE_2D);
|
|
||||||
while(!done)
|
|
||||||
{
|
|
||||||
ProgressBar first = null, penult = null, last = null;
|
|
||||||
Iterator<ProgressBar> i = ProgressManager.barIterator();
|
|
||||||
while(i.hasNext())
|
|
||||||
{
|
|
||||||
if(first == null) first = i.next();
|
|
||||||
else
|
|
||||||
{
|
|
||||||
penult = last;
|
|
||||||
last = i.next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
glClear(GL_COLOR_BUFFER_BIT);
|
|
||||||
|
|
||||||
// matrix setup
|
|
||||||
int w = Display.getWidth();
|
|
||||||
int h = Display.getHeight();
|
|
||||||
glViewport(0, 0, w, h);
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
|
||||||
glLoadIdentity();
|
|
||||||
glOrtho(320 - w/2, 320 + w/2, 240 + h/2, 240 - h/2, -1, 1);
|
|
||||||
glMatrixMode(GL_MODELVIEW);
|
|
||||||
glLoadIdentity();
|
|
||||||
|
|
||||||
// mojang logo
|
|
||||||
setColor(backgroundColor);
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
|
||||||
logoTexture.bind();
|
|
||||||
glBegin(GL_QUADS);
|
|
||||||
logoTexture.texCoord(0, 0, 0);
|
|
||||||
glVertex2f(320 - 256, 240 - 256);
|
|
||||||
logoTexture.texCoord(0, 0, 1);
|
|
||||||
glVertex2f(320 - 256, 240 + 256);
|
|
||||||
logoTexture.texCoord(0, 1, 1);
|
|
||||||
glVertex2f(320 + 256, 240 + 256);
|
|
||||||
logoTexture.texCoord(0, 1, 0);
|
|
||||||
glVertex2f(320 + 256, 240 - 256);
|
|
||||||
glEnd();
|
|
||||||
glDisable(GL_TEXTURE_2D);
|
|
||||||
|
|
||||||
// bars
|
|
||||||
if(first != null)
|
|
||||||
{
|
|
||||||
glPushMatrix();
|
|
||||||
glTranslatef(320 - (float)barWidth / 2, 310, 0);
|
|
||||||
drawBar(first);
|
|
||||||
if(penult != null)
|
|
||||||
{
|
|
||||||
glTranslatef(0, barOffset, 0);
|
|
||||||
drawBar(penult);
|
|
||||||
}
|
|
||||||
if(last != null)
|
|
||||||
{
|
|
||||||
glTranslatef(0, barOffset, 0);
|
|
||||||
drawBar(last);
|
|
||||||
}
|
|
||||||
glPopMatrix();
|
|
||||||
}
|
|
||||||
|
|
||||||
angle += 1;
|
|
||||||
|
|
||||||
// forge logo
|
|
||||||
setColor(backgroundColor);
|
|
||||||
float fw = (float)forgeTexture.getWidth() / 2;
|
|
||||||
float fh = (float)forgeTexture.getHeight() / 2;
|
|
||||||
if(rotate)
|
|
||||||
{
|
|
||||||
float sh = Math.max(fw, fh);
|
|
||||||
glTranslatef(320 + w/2 - sh - logoOffset, 240 + h/2 - sh - logoOffset, 0);
|
|
||||||
glRotatef(angle, 0, 0, 1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
glTranslatef(320 + w/2 - fw - logoOffset, 240 + h/2 - fh - logoOffset, 0);
|
|
||||||
}
|
|
||||||
int f = (angle / 10) % forgeTexture.getFrames();
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
|
||||||
forgeTexture.bind();
|
|
||||||
glBegin(GL_QUADS);
|
|
||||||
forgeTexture.texCoord(f, 0, 0);
|
|
||||||
glVertex2f(-fw, -fh);
|
|
||||||
forgeTexture.texCoord(f, 0, 1);
|
|
||||||
glVertex2f(-fw, fh);
|
|
||||||
forgeTexture.texCoord(f, 1, 1);
|
|
||||||
glVertex2f(fw, fh);
|
|
||||||
forgeTexture.texCoord(f, 1, 0);
|
|
||||||
glVertex2f(fw, -fh);
|
|
||||||
glEnd();
|
|
||||||
glDisable(GL_TEXTURE_2D);
|
|
||||||
|
|
||||||
Display.update();
|
|
||||||
if(pause)
|
|
||||||
{
|
|
||||||
clearGL();
|
|
||||||
setGL();
|
|
||||||
}
|
|
||||||
Display.sync(100);
|
|
||||||
}
|
|
||||||
clearGL();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setColor(int color)
|
|
||||||
{
|
|
||||||
glColor3ub((byte)((color >> 16) & 0xFF), (byte)((color >> 8) & 0xFF), (byte)(color & 0xFF));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void drawBox(int w, int h)
|
|
||||||
{
|
|
||||||
glBegin(GL_QUADS);
|
|
||||||
glVertex2f(0, 0);
|
|
||||||
glVertex2f(0, h);
|
|
||||||
glVertex2f(w, h);
|
|
||||||
glVertex2f(w, 0);
|
|
||||||
glEnd();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void drawBar(ProgressBar b)
|
|
||||||
{
|
|
||||||
glPushMatrix();
|
|
||||||
// title - message
|
|
||||||
setColor(fontColor);
|
|
||||||
glScalef(2, 2, 1);
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
|
||||||
fontRenderer.drawString(b.getTitle() + " - " + b.getMessage(), 0, 0, 0x000000);
|
|
||||||
glDisable(GL_TEXTURE_2D);
|
|
||||||
glPopMatrix();
|
|
||||||
// border
|
|
||||||
glPushMatrix();
|
|
||||||
glTranslatef(0, textHeight2, 0);
|
|
||||||
setColor(barBorderColor);
|
|
||||||
drawBox(barWidth, barHeight);
|
|
||||||
// interior
|
|
||||||
setColor(barBackgroundColor);
|
|
||||||
glTranslatef(1, 1, 0);
|
|
||||||
drawBox(barWidth - 2, barHeight - 2);
|
|
||||||
// slidy part
|
|
||||||
setColor(barColor);
|
|
||||||
drawBox((barWidth - 2) * b.getStep() / b.getSteps(), barHeight - 2);
|
|
||||||
// progress text
|
|
||||||
String progress = "" + b.getStep() + "/" + b.getSteps();
|
|
||||||
glTranslatef(((float)barWidth - 2) / 2 - fontRenderer.getStringWidth(progress), 2, 0);
|
|
||||||
setColor(fontColor);
|
|
||||||
glScalef(2, 2, 1);
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
|
||||||
fontRenderer.drawString(progress, 0, 0, 0x000000);
|
|
||||||
glPopMatrix();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setGL()
|
|
||||||
{
|
|
||||||
lock.lock();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Display.getDrawable().makeCurrent();
|
|
||||||
}
|
|
||||||
catch (LWJGLException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
glClearColor((float)((backgroundColor >> 16) & 0xFF) / 0xFF, (float)((backgroundColor >> 8) & 0xFF) / 0xFF, (float)(backgroundColor & 0xFF) / 0xFF, 1);
|
|
||||||
glDisable(GL_LIGHTING);
|
|
||||||
glDisable(GL_DEPTH_TEST);
|
|
||||||
glEnable(GL_BLEND);
|
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void clearGL()
|
|
||||||
{
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
|
||||||
mc.displayWidth = Display.getWidth();
|
|
||||||
mc.displayHeight = Display.getHeight();
|
|
||||||
mc.resize(mc.displayWidth, mc.displayHeight);
|
|
||||||
glClearColor(1, 1, 1, 1);
|
|
||||||
glEnable(GL_DEPTH_TEST);
|
|
||||||
glDepthFunc(GL_LEQUAL);
|
|
||||||
glEnable(GL_ALPHA_TEST);
|
|
||||||
glAlphaFunc(GL_GREATER, .1f);
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Display.getDrawable().releaseContext();
|
|
||||||
}
|
|
||||||
catch (LWJGLException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
lock.unlock();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
thread.setUncaughtExceptionHandler(new UncaughtExceptionHandler()
|
|
||||||
{
|
|
||||||
public void uncaughtException(Thread t, Throwable e)
|
|
||||||
{
|
|
||||||
FMLLog.log(Level.ERROR, e, "Splash thread Exception");
|
|
||||||
threadError = e;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
thread.start();
|
|
||||||
checkThreadState();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void checkThreadState()
|
|
||||||
{
|
|
||||||
if(thread.getState() == Thread.State.TERMINATED || threadError != null)
|
|
||||||
{
|
|
||||||
throw new IllegalStateException("Splash thread", threadError);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Call before you need to explicitly modify GL context state during loading.
|
|
||||||
* Resource loading doesn't usually require this call.
|
|
||||||
* Call {@link #resume()} when you're done.
|
|
||||||
* @deprecated not a stable API, will break, don't use this yet
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static void pause()
|
|
||||||
{
|
|
||||||
if(!enabled) return;
|
|
||||||
checkThreadState();
|
|
||||||
pause = true;
|
|
||||||
lock.lock();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
d.releaseContext();
|
|
||||||
Display.getDrawable().makeCurrent();
|
|
||||||
}
|
|
||||||
catch (LWJGLException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated not a stable API, will break, don't use this yet
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public static void resume()
|
|
||||||
{
|
|
||||||
if(!enabled) return;
|
|
||||||
checkThreadState();
|
|
||||||
pause = false;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Display.getDrawable().releaseContext();
|
|
||||||
d.makeCurrent();
|
|
||||||
}
|
|
||||||
catch (LWJGLException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
lock.unlock();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void finish()
|
|
||||||
{
|
|
||||||
if(!enabled) return;
|
|
||||||
checkThreadState();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
done = true;
|
|
||||||
thread.join();
|
|
||||||
d.releaseContext();
|
|
||||||
Display.getDrawable().makeCurrent();
|
|
||||||
fontTexture.delete();
|
|
||||||
logoTexture.delete();
|
|
||||||
forgeTexture.delete();
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static IResourcePack createResourcePack(File file)
|
|
||||||
{
|
|
||||||
if(file.isDirectory())
|
|
||||||
{
|
|
||||||
return new FolderResourcePack(file);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return new FileResourcePack(file);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final IntBuffer buf = BufferUtils.createIntBuffer(4 * 1024 * 1024);
|
|
||||||
|
|
||||||
private static class Texture
|
|
||||||
{
|
|
||||||
private final ResourceLocation location;
|
|
||||||
private final int name;
|
|
||||||
private final int width;
|
|
||||||
private final int height;
|
|
||||||
private final int frames;
|
|
||||||
private final int size;
|
|
||||||
|
|
||||||
public Texture(ResourceLocation location)
|
|
||||||
{
|
|
||||||
InputStream s = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
this.location = location;
|
|
||||||
s = open(location);
|
|
||||||
ImageInputStream stream = ImageIO.createImageInputStream(s);
|
|
||||||
Iterator<ImageReader> readers = ImageIO.getImageReaders(stream);
|
|
||||||
if(!readers.hasNext()) throw new IOException("No suitable reader found for image" + location);
|
|
||||||
ImageReader reader = readers.next();
|
|
||||||
reader.setInput(stream);
|
|
||||||
frames = reader.getNumImages(true);
|
|
||||||
BufferedImage[] images = new BufferedImage[frames];
|
|
||||||
for(int i = 0; i < frames; i++)
|
|
||||||
{
|
|
||||||
images[i] = reader.read(i);
|
|
||||||
}
|
|
||||||
reader.dispose();
|
|
||||||
int size = 1;
|
|
||||||
width = images[0].getWidth();
|
|
||||||
height = images[0].getHeight();
|
|
||||||
while((size / width) * (size / height) < frames) size *= 2;
|
|
||||||
this.size = size;
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
|
||||||
synchronized(SplashProgress.class)
|
|
||||||
{
|
|
||||||
name = glGenTextures();
|
|
||||||
glBindTexture(GL_TEXTURE_2D, name);
|
|
||||||
}
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null);
|
|
||||||
checkGLError("Texture creation");
|
|
||||||
for(int i = 0; i * (size / width) < frames; i++)
|
|
||||||
{
|
|
||||||
for(int j = 0; i * (size / width) + j < frames && j < size / width; j++)
|
|
||||||
{
|
|
||||||
buf.clear();
|
|
||||||
BufferedImage image = images[i * (size / width) + j];
|
|
||||||
for(int k = 0; k < height; k++)
|
|
||||||
{
|
|
||||||
for(int l = 0; l < width; l++)
|
|
||||||
{
|
|
||||||
buf.put(image.getRGB(l, k));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
buf.position(0).limit(width * height);
|
|
||||||
glTexSubImage2D(GL_TEXTURE_2D, 0, j * width, i * height, width, height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, buf);
|
|
||||||
checkGLError("Texture uploading");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
glBindTexture(GL_TEXTURE_2D, 0);
|
|
||||||
glDisable(GL_TEXTURE_2D);
|
|
||||||
}
|
|
||||||
catch(IOException e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
IOUtils.closeQuietly(s);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ResourceLocation getLocation()
|
|
||||||
{
|
|
||||||
return location;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getName()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getWidth()
|
|
||||||
{
|
|
||||||
return width;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getHeight()
|
|
||||||
{
|
|
||||||
return height;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getFrames()
|
|
||||||
{
|
|
||||||
return frames;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getSize()
|
|
||||||
{
|
|
||||||
return size;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void bind()
|
|
||||||
{
|
|
||||||
glBindTexture(GL_TEXTURE_2D, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void delete()
|
|
||||||
{
|
|
||||||
glDeleteTextures(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
public float getU(int frame, float u)
|
|
||||||
{
|
|
||||||
return width * (frame % (size / width) + u) / size;
|
|
||||||
}
|
|
||||||
|
|
||||||
public float getV(int frame, float v)
|
|
||||||
{
|
|
||||||
return height * (frame / (size / width) + v) / size;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void texCoord(int frame, float u, float v)
|
|
||||||
{
|
|
||||||
glTexCoord2f(getU(frame, u), getV(frame, v));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static class SplashFontRenderer extends FontRenderer
|
|
||||||
{
|
|
||||||
public SplashFontRenderer()
|
|
||||||
{
|
|
||||||
super(Minecraft.getMinecraft().gameSettings, fontTexture.getLocation(), null, false);
|
|
||||||
super.onResourceManagerReload(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void bindTexture(ResourceLocation location)
|
|
||||||
{
|
|
||||||
if(location != locationFontTexture) throw new IllegalArgumentException();
|
|
||||||
fontTexture.bind();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected InputStream getResourceInputStream(ResourceLocation location) throws IOException
|
|
||||||
{
|
|
||||||
return Minecraft.getMinecraft().mcDefaultResourcePack.getInputStream(location);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void drawVanillaScreen() throws LWJGLException
|
|
||||||
{
|
|
||||||
if(!enabled)
|
|
||||||
{
|
|
||||||
Minecraft.getMinecraft().loadScreen();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void clearVanillaResources(TextureManager renderEngine, ResourceLocation mojangLogo)
|
|
||||||
{
|
|
||||||
if(!enabled)
|
|
||||||
{
|
|
||||||
renderEngine.deleteTexture(mojangLogo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void checkGLError(String where)
|
|
||||||
{
|
|
||||||
int err = GL11.glGetError();
|
|
||||||
if (err != 0)
|
|
||||||
{
|
|
||||||
throw new IllegalStateException(where + ": " + GLU.gluErrorString(err));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static InputStream open(ResourceLocation loc) throws IOException
|
|
||||||
{
|
|
||||||
if(miscPack.resourceExists(loc))
|
|
||||||
{
|
|
||||||
return miscPack.getInputStream(loc);
|
|
||||||
}
|
|
||||||
else if(fmlPack.resourceExists(loc))
|
|
||||||
{
|
|
||||||
return fmlPack.getInputStream(loc);
|
|
||||||
}
|
|
||||||
return mcPack.getInputStream(loc);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* Forge Mod Loader
|
|
||||||
* Copyright (c) 2012-2014 cpw.
|
|
||||||
* All rights reserved. This program and the accompanying materials
|
|
||||||
* are made available under the terms of the GNU Lesser Public License v2.1
|
|
||||||
* which accompanies this distribution, and is available at
|
|
||||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
||||||
*
|
|
||||||
* Contributors (this class):
|
|
||||||
* bspkrs - implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cpw.mods.fml.client.config;
|
|
||||||
|
|
||||||
public enum ConfigGuiType
|
|
||||||
{
|
|
||||||
STRING,
|
|
||||||
INTEGER,
|
|
||||||
BOOLEAN,
|
|
||||||
DOUBLE,
|
|
||||||
COLOR,
|
|
||||||
MOD_ID,
|
|
||||||
CONFIG_CATEGORY;
|
|
||||||
}
|
|
||||||
@@ -1,430 +0,0 @@
|
|||||||
/*
|
|
||||||
* Forge Mod Loader
|
|
||||||
* Copyright (c) 2012-2014 cpw.
|
|
||||||
* All rights reserved. This program and the accompanying materials
|
|
||||||
* are made available under the terms of the GNU Lesser Public License v2.1
|
|
||||||
* which accompanies this distribution, and is available at
|
|
||||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
||||||
*
|
|
||||||
* Contributors (this class):
|
|
||||||
* bspkrs - implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cpw.mods.fml.client.config;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry;
|
|
||||||
import cpw.mods.fml.client.config.GuiEditArrayEntries.IArrayEntry;
|
|
||||||
|
|
||||||
import net.minecraft.client.resources.I18n;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class's main purpose is to provide the necessary objects for a sample Config GUI for FML, although
|
|
||||||
* there may be practical uses for the objects defined here such as using the DummyCategoryElement object as a
|
|
||||||
* wrapper for a custom IGuiConfigListEntry object that opens a special screen.
|
|
||||||
*
|
|
||||||
* @author bspkrs
|
|
||||||
*/
|
|
||||||
public class DummyConfigElement<T> implements IConfigElement<T>
|
|
||||||
{
|
|
||||||
protected boolean isProperty = true;
|
|
||||||
protected boolean isList = false;
|
|
||||||
protected ConfigGuiType type;
|
|
||||||
protected String name;
|
|
||||||
protected String langKey;
|
|
||||||
protected Object value;
|
|
||||||
protected Object defaultValue;
|
|
||||||
protected T[] values;
|
|
||||||
protected T[] defaultValues;
|
|
||||||
protected String[] validValues;
|
|
||||||
protected Pattern validStringPattern;
|
|
||||||
protected T minValue;
|
|
||||||
protected T maxValue;
|
|
||||||
protected boolean requiresWorldRestart = false;
|
|
||||||
protected boolean requiresMcRestart = false;
|
|
||||||
protected boolean isListFixedLength = false;
|
|
||||||
protected int maxListLength = -1;
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
protected List<IConfigElement> childElements;
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
protected Class<? extends IConfigEntry> configEntryClass;
|
|
||||||
protected Class<? extends IArrayEntry> arrayEntryClass;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class provides a Dummy Category IConfigElement. It can be used to define a custom list of GUI entries that will
|
|
||||||
* appear on the child screen or to specify a custom IGuiConfigListEntryfor a special category.
|
|
||||||
*/
|
|
||||||
public static class DummyCategoryElement<T> extends DummyConfigElement<T>
|
|
||||||
{
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public DummyCategoryElement(String name, String langKey, List<IConfigElement> childElements)
|
|
||||||
{
|
|
||||||
this(name, langKey, childElements, (Class<? extends IConfigEntry>) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public DummyCategoryElement(String name, String langKey, Class<? extends IConfigEntry> customListEntryClass)
|
|
||||||
{
|
|
||||||
this(name, langKey, new ArrayList<IConfigElement>(), customListEntryClass);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public DummyCategoryElement(String name, String langKey, List<IConfigElement> childElements, Class<? extends IConfigEntry> customListEntryClass)
|
|
||||||
{
|
|
||||||
super(name, (T) null, ConfigGuiType.CONFIG_CATEGORY, langKey);
|
|
||||||
this.childElements = childElements;
|
|
||||||
this.configEntryClass = customListEntryClass;
|
|
||||||
isProperty = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class provides a dummy array-type IConfigElement.
|
|
||||||
*/
|
|
||||||
public static class DummyListElement<T> extends DummyConfigElement<T>
|
|
||||||
{
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, boolean isListFixedLength, int maxListLength, Pattern validStringPattern, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
super(name, (T) null, type, langKey, minValue, maxValue);
|
|
||||||
this.defaultValues = defaultValues;
|
|
||||||
this.values = defaultValues;
|
|
||||||
this.isListFixedLength = isListFixedLength;
|
|
||||||
this.maxListLength = maxListLength;
|
|
||||||
this.validStringPattern = validStringPattern;
|
|
||||||
isList = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, false, -1, (Pattern) null, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, boolean isListFixedLength)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, isListFixedLength, -1, (Pattern) null, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, int maxListLength)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, false, maxListLength, (Pattern) null, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, false, -1, (Pattern) null, minValue, maxValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, boolean isListFixedLength, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, isListFixedLength, -1, (Pattern) null, minValue, maxValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, int maxListLength, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, false, maxListLength, (Pattern) null, minValue, maxValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, boolean isListFixedLength, int maxListLength, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, isListFixedLength, maxListLength, (Pattern) null, minValue, maxValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, Pattern validStringPattern)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, false, -1, validStringPattern, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, boolean isListFixedLength, Pattern validStringPattern)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, isListFixedLength, -1, validStringPattern, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyListElement(String name, T[] defaultValues, ConfigGuiType type, String langKey, int maxListLength, Pattern validStringPattern)
|
|
||||||
{
|
|
||||||
this(name, defaultValues, type, langKey, false, maxListLength, validStringPattern, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public DummyListElement setCustomEditListEntryClass(Class<? extends IArrayEntry> clazz)
|
|
||||||
{
|
|
||||||
this.arrayEntryClass = clazz;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getDefault()
|
|
||||||
{
|
|
||||||
return Arrays.toString(this.defaultValues);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
public DummyConfigElement(String name, T defaultValue, ConfigGuiType type, String langKey, String[] validValues, Pattern validStringPattern, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
this.name = name;
|
|
||||||
this.defaultValue = defaultValue;
|
|
||||||
this.value = defaultValue;
|
|
||||||
this.type = type;
|
|
||||||
this.langKey = langKey;
|
|
||||||
this.validValues = validValues;
|
|
||||||
this.validStringPattern = validStringPattern;
|
|
||||||
if (minValue == null)
|
|
||||||
{
|
|
||||||
if (type == ConfigGuiType.INTEGER)
|
|
||||||
this.minValue = (T) (Integer) Integer.MIN_VALUE;
|
|
||||||
else if (type == ConfigGuiType.DOUBLE)
|
|
||||||
this.minValue = (T) (Double) (-Double.MAX_VALUE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
this.minValue = minValue;
|
|
||||||
if (maxValue == null)
|
|
||||||
{
|
|
||||||
if (type == ConfigGuiType.INTEGER)
|
|
||||||
this.maxValue = (T) (Integer) Integer.MAX_VALUE;
|
|
||||||
else if (type == ConfigGuiType.DOUBLE)
|
|
||||||
this.maxValue = (T) (Double) Double.MAX_VALUE;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
this.maxValue = maxValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyConfigElement(String name, T defaultValue, ConfigGuiType type, String langKey, Pattern validStringPattern)
|
|
||||||
{
|
|
||||||
this(name, defaultValue, type, langKey, (String[]) null, validStringPattern, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyConfigElement(String name, T defaultValue, ConfigGuiType type, String langKey, String[] validValues)
|
|
||||||
{
|
|
||||||
this(name, defaultValue, type, langKey, validValues, (Pattern) null, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyConfigElement(String name, T defaultValue, ConfigGuiType type, String langKey)
|
|
||||||
{
|
|
||||||
this(name, defaultValue, type, langKey, (String[]) null, (Pattern) null, (T) null, (T) null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public DummyConfigElement(String name, T defaultValue, ConfigGuiType type, String langKey, T minValue, T maxValue)
|
|
||||||
{
|
|
||||||
this(name, defaultValue, type, langKey, (String[]) null, (Pattern) null, minValue, maxValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public DummyConfigElement setCustomListEntryClass(Class<? extends IConfigEntry> clazz)
|
|
||||||
{
|
|
||||||
this.configEntryClass = clazz;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isProperty()
|
|
||||||
{
|
|
||||||
return isProperty;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public IConfigElement setConfigEntryClass(Class<? extends IConfigEntry> clazz)
|
|
||||||
{
|
|
||||||
this.configEntryClass = clazz;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
@Override
|
|
||||||
public Class<? extends IConfigEntry> getConfigEntryClass()
|
|
||||||
{
|
|
||||||
return configEntryClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public IConfigElement setArrayEntryClass(Class<? extends IArrayEntry> clazz)
|
|
||||||
{
|
|
||||||
this.arrayEntryClass = clazz;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Class<? extends IArrayEntry> getArrayEntryClass()
|
|
||||||
{
|
|
||||||
return arrayEntryClass;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getName()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getQualifiedName()
|
|
||||||
{
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getLanguageKey()
|
|
||||||
{
|
|
||||||
return langKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getComment()
|
|
||||||
{
|
|
||||||
return I18n.format(langKey + ".tooltip");
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
@Override
|
|
||||||
public List<IConfigElement> getChildElements()
|
|
||||||
{
|
|
||||||
return childElements;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ConfigGuiType getType()
|
|
||||||
{
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isList()
|
|
||||||
{
|
|
||||||
return isList;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isListLengthFixed()
|
|
||||||
{
|
|
||||||
return this.isListFixedLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMaxListLength()
|
|
||||||
{
|
|
||||||
return this.maxListLength;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isDefault()
|
|
||||||
{
|
|
||||||
if (isProperty)
|
|
||||||
{
|
|
||||||
if (!isList)
|
|
||||||
{
|
|
||||||
if (value != null)
|
|
||||||
return value.equals(defaultValue);
|
|
||||||
else
|
|
||||||
return defaultValue == null;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return Arrays.deepEquals(values, defaultValues);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object getDefault()
|
|
||||||
{
|
|
||||||
return defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public T[] getDefaults()
|
|
||||||
{
|
|
||||||
return defaultValues;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setToDefault()
|
|
||||||
{
|
|
||||||
if (isList)
|
|
||||||
this.values = Arrays.copyOf(this.defaultValues, this.defaultValues.length);
|
|
||||||
else
|
|
||||||
this.value = defaultValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public IConfigElement<T> setRequiresWorldRestart(boolean requiresWorldRestart)
|
|
||||||
{
|
|
||||||
this.requiresWorldRestart = requiresWorldRestart;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean requiresWorldRestart()
|
|
||||||
{
|
|
||||||
return requiresWorldRestart;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean showInGui()
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public IConfigElement<T> setRequiresMcRestart(boolean requiresMcRestart)
|
|
||||||
{
|
|
||||||
this.requiresMcRestart = this.requiresWorldRestart = requiresMcRestart;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean requiresMcRestart()
|
|
||||||
{
|
|
||||||
return requiresMcRestart;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getValidValues()
|
|
||||||
{
|
|
||||||
return validValues;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Pattern getValidationPattern()
|
|
||||||
{
|
|
||||||
return validStringPattern;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Object get()
|
|
||||||
{
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public T[] getList()
|
|
||||||
{
|
|
||||||
return values;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void set(T value)
|
|
||||||
{
|
|
||||||
defaultValue = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void set(T[] aVal)
|
|
||||||
{
|
|
||||||
defaultValues = aVal;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public T getMinValue()
|
|
||||||
{
|
|
||||||
return minValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public T getMaxValue()
|
|
||||||
{
|
|
||||||
return maxValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* Forge Mod Loader
|
|
||||||
* Copyright (c) 2012-2014 cpw.
|
|
||||||
* All rights reserved. This program and the accompanying materials
|
|
||||||
* are made available under the terms of the GNU Lesser Public License v2.1
|
|
||||||
* which accompanies this distribution, and is available at
|
|
||||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
||||||
*
|
|
||||||
* Contributors (this class):
|
|
||||||
* bspkrs - implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cpw.mods.fml.client.config;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class provides a button that fixes several bugs present in the vanilla GuiButton drawing code.
|
|
||||||
* The gist of it is that it allows buttons of any size without gaps in the graphics and with the
|
|
||||||
* borders drawn properly. It also prevents button text from extending out of the sides of the button by
|
|
||||||
* trimming the end of the string and adding an ellipsis.<br/><br/>
|
|
||||||
*
|
|
||||||
* The code that handles drawing the button is in GuiUtils.
|
|
||||||
*
|
|
||||||
* @author bspkrs
|
|
||||||
*/
|
|
||||||
public class GuiButtonExt extends GuiButton
|
|
||||||
{
|
|
||||||
public GuiButtonExt(int id, int xPos, int yPos, String displayString)
|
|
||||||
{
|
|
||||||
super(id, xPos, yPos, displayString);
|
|
||||||
}
|
|
||||||
|
|
||||||
public GuiButtonExt(int id, int xPos, int yPos, int width, int height, String displayString)
|
|
||||||
{
|
|
||||||
super(id, xPos, yPos, width, height, displayString);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Draws this button to the screen.
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void drawButton(Minecraft mc, int mouseX, int mouseY)
|
|
||||||
{
|
|
||||||
if (this.visible)
|
|
||||||
{
|
|
||||||
this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
|
|
||||||
int k = this.getHoverState(this.field_146123_n);
|
|
||||||
GuiUtils.drawContinuousTexturedBox(buttonTextures, this.xPosition, this.yPosition, 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.zLevel);
|
|
||||||
this.mouseDragged(mc, mouseX, mouseY);
|
|
||||||
int color = 14737632;
|
|
||||||
|
|
||||||
if (packedFGColour != 0)
|
|
||||||
{
|
|
||||||
color = packedFGColour;
|
|
||||||
}
|
|
||||||
else if (!this.enabled)
|
|
||||||
{
|
|
||||||
color = 10526880;
|
|
||||||
}
|
|
||||||
else if (this.field_146123_n)
|
|
||||||
{
|
|
||||||
color = 16777120;
|
|
||||||
}
|
|
||||||
|
|
||||||
String buttonText = this.displayString;
|
|
||||||
int strWidth = mc.fontRenderer.getStringWidth(buttonText);
|
|
||||||
int ellipsisWidth = mc.fontRenderer.getStringWidth("...");
|
|
||||||
|
|
||||||
if (strWidth > width - 6 && strWidth > ellipsisWidth)
|
|
||||||
buttonText = mc.fontRenderer.trimStringToWidth(buttonText, width - 6 - ellipsisWidth).trim() + "...";
|
|
||||||
|
|
||||||
this.drawCenteredString(mc.fontRenderer, buttonText, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
/*
|
|
||||||
* Forge Mod Loader
|
|
||||||
* Copyright (c) 2012-2014 cpw.
|
|
||||||
* All rights reserved. This program and the accompanying materials
|
|
||||||
* are made available under the terms of the GNU Lesser Public License v2.1
|
|
||||||
* which accompanies this distribution, and is available at
|
|
||||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
||||||
*
|
|
||||||
* Contributors (this class):
|
|
||||||
* bspkrs - implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cpw.mods.fml.client.config;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class provides a checkbox style control.
|
|
||||||
*
|
|
||||||
* @author bspkrs
|
|
||||||
*/
|
|
||||||
public class GuiCheckBox extends GuiButton
|
|
||||||
{
|
|
||||||
private boolean isChecked;
|
|
||||||
private int boxWidth;
|
|
||||||
|
|
||||||
public GuiCheckBox(int id, int xPos, int yPos, String displayString, boolean isChecked)
|
|
||||||
{
|
|
||||||
super(id, xPos, yPos, displayString);
|
|
||||||
this.isChecked = isChecked;
|
|
||||||
this.boxWidth = 11;
|
|
||||||
this.height = 11;
|
|
||||||
this.width = this.boxWidth + 2 + Minecraft.getMinecraft().fontRenderer.getStringWidth(displayString);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawButton(Minecraft mc, int mouseX, int mouseY)
|
|
||||||
{
|
|
||||||
if (this.visible)
|
|
||||||
{
|
|
||||||
this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.boxWidth && mouseY < this.yPosition + this.height;
|
|
||||||
GuiUtils.drawContinuousTexturedBox(buttonTextures, this.xPosition, this.yPosition, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.zLevel);
|
|
||||||
this.mouseDragged(mc, mouseX, mouseY);
|
|
||||||
int color = 14737632;
|
|
||||||
|
|
||||||
if (packedFGColour != 0)
|
|
||||||
{
|
|
||||||
color = packedFGColour;
|
|
||||||
}
|
|
||||||
else if (!this.enabled)
|
|
||||||
{
|
|
||||||
color = 10526880;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.isChecked)
|
|
||||||
this.drawCenteredString(mc.fontRenderer, "x", this.xPosition + this.boxWidth / 2 + 1, this.yPosition + 1, 14737632);
|
|
||||||
|
|
||||||
this.drawString(mc.fontRenderer, displayString, xPosition + this.boxWidth + 2, yPosition + 2, color);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean mousePressed(Minecraft p_146116_1_, int p_146116_2_, int p_146116_3_)
|
|
||||||
{
|
|
||||||
if (this.enabled && this.visible && p_146116_2_ >= this.xPosition && p_146116_3_ >= this.yPosition && p_146116_2_ < this.xPosition + this.width && p_146116_3_ < this.yPosition + this.height)
|
|
||||||
{
|
|
||||||
this.isChecked = !this.isChecked;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isChecked()
|
|
||||||
{
|
|
||||||
return this.isChecked;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setIsChecked(boolean isChecked)
|
|
||||||
{
|
|
||||||
this.isChecked = isChecked;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,352 +0,0 @@
|
|||||||
/*
|
|
||||||
* Forge Mod Loader
|
|
||||||
* Copyright (c) 2012-2014 cpw.
|
|
||||||
* All rights reserved. This program and the accompanying materials
|
|
||||||
* are made available under the terms of the GNU Lesser Public License v2.1
|
|
||||||
* which accompanies this distribution, and is available at
|
|
||||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
||||||
*
|
|
||||||
* Contributors (this class):
|
|
||||||
* bspkrs - implementation
|
|
||||||
*/
|
|
||||||
|
|
||||||
package cpw.mods.fml.client.config;
|
|
||||||
|
|
||||||
import static cpw.mods.fml.client.config.GuiUtils.RESET_CHAR;
|
|
||||||
import static cpw.mods.fml.client.config.GuiUtils.UNDO_CHAR;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import net.minecraft.client.Minecraft;
|
|
||||||
import net.minecraft.client.gui.GuiButton;
|
|
||||||
import net.minecraft.client.gui.GuiScreen;
|
|
||||||
import net.minecraft.client.resources.I18n;
|
|
||||||
import net.minecraft.util.ChatComponentText;
|
|
||||||
|
|
||||||
import org.lwjgl.input.Keyboard;
|
|
||||||
|
|
||||||
import cpw.mods.fml.client.config.GuiConfigEntries.IConfigEntry;
|
|
||||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
|
||||||
import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
|
|
||||||
import cpw.mods.fml.client.event.ConfigChangedEvent.PostConfigChangedEvent;
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
|
||||||
import cpw.mods.fml.common.Loader;
|
|
||||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class is the base GuiScreen for all config GUI screens. It can be extended by mods to provide the top-level config screen
|
|
||||||
* that will be called when the Config button is clicked from the Main Menu Mods list.
|
|
||||||
*
|
|
||||||
* @author bspkrs
|
|
||||||
*/
|
|
||||||
public class GuiConfig extends GuiScreen
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* A reference to the screen object that created this. Used for navigating between screens.
|
|
||||||
*/
|
|
||||||
public final GuiScreen parentScreen;
|
|
||||||
public String title = "Config GUI";
|
|
||||||
public String titleLine2;
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public final List<IConfigElement> configElements;
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public final List<IConfigEntry> initEntries;
|
|
||||||
public GuiConfigEntries entryList;
|
|
||||||
private GuiButtonExt btnDefaultAll;
|
|
||||||
private GuiButtonExt btnUndoAll;
|
|
||||||
private GuiCheckBox chkApplyGlobally;
|
|
||||||
public final String modID;
|
|
||||||
/**
|
|
||||||
* When set to a non-null value the OnConfigChanged and PostConfigChanged events will be posted when the Done button is pressed
|
|
||||||
* if any configElements were changed (includes child screens). If not defined, the events will be posted if the parent gui is null
|
|
||||||
* or if the parent gui is not an instance of GuiConfig.
|
|
||||||
*/
|
|
||||||
public final String configID;
|
|
||||||
public final boolean isWorldRunning;
|
|
||||||
public final boolean allRequireWorldRestart;
|
|
||||||
public final boolean allRequireMcRestart;
|
|
||||||
public boolean needsRefresh = true;
|
|
||||||
private HoverChecker undoHoverChecker;
|
|
||||||
private HoverChecker resetHoverChecker;
|
|
||||||
private HoverChecker checkBoxHoverChecker;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GuiConfig constructor that will use ConfigChangedEvent when editing is concluded. If a non-null value is passed for configID,
|
|
||||||
* the OnConfigChanged and PostConfigChanged events will be posted when the Done button is pressed if any configElements were changed
|
|
||||||
* (includes child screens). If configID is not defined, the events will be posted if the parent gui is null or if the parent gui
|
|
||||||
* is not an instance of GuiConfig.
|
|
||||||
*
|
|
||||||
* @param parentScreen the parent GuiScreen object
|
|
||||||
* @param configElements a List of IConfigProperty objects
|
|
||||||
* @param modID the mod ID for the mod whose config settings will be edited
|
|
||||||
* @param configID an identifier that will be passed to the OnConfigChanged and PostConfigChanged events. Setting this value will force
|
|
||||||
* the save action to be called when the Done button is pressed on this screen if any configElements were changed.
|
|
||||||
* @param allRequireWorldRestart send true if all configElements on this screen require a world restart
|
|
||||||
* @param allRequireMcRestart send true if all configElements on this screen require MC to be restarted
|
|
||||||
* @param title the desired title for this screen. For consistency it is recommended that you pass the path of the config file being
|
|
||||||
* edited.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public GuiConfig(GuiScreen parentScreen, List<IConfigElement> configElements, String modID, String configID,
|
|
||||||
boolean allRequireWorldRestart, boolean allRequireMcRestart, String title)
|
|
||||||
{
|
|
||||||
this(parentScreen, configElements, modID, configID, allRequireWorldRestart, allRequireMcRestart, title, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GuiConfig constructor that will use ConfigChangedEvent when editing is concluded. This constructor passes null for configID.
|
|
||||||
* If configID is not defined, the events will be posted if the parent gui is null or if the parent gui is not an instance of GuiConfig.
|
|
||||||
*
|
|
||||||
* @param parentScreen the parent GuiScreen object
|
|
||||||
* @param configElements a List of IConfigProperty objects
|
|
||||||
* @param modID the mod ID for the mod whose config settings will be edited
|
|
||||||
* @param allRequireWorldRestart send true if all configElements on this screen require a world restart
|
|
||||||
* @param allRequireMcRestart send true if all configElements on this screen require MC to be restarted
|
|
||||||
* @param title the desired title for this screen. For consistency it is recommended that you pass the path of the config file being
|
|
||||||
* edited.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public GuiConfig(GuiScreen parentScreen, List<IConfigElement> configElements, String modID,
|
|
||||||
boolean allRequireWorldRestart, boolean allRequireMcRestart, String title)
|
|
||||||
{
|
|
||||||
this(parentScreen, configElements, modID, null, allRequireWorldRestart, allRequireMcRestart, title, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GuiConfig constructor that will use ConfigChangedEvent when editing is concluded. This constructor passes null for configID.
|
|
||||||
* If configID is not defined, the events will be posted if the parent gui is null or if the parent gui is not an instance of GuiConfig.
|
|
||||||
*
|
|
||||||
* @param parentScreen the parent GuiScreen object
|
|
||||||
* @param configElements a List of IConfigProperty objects
|
|
||||||
* @param modID the mod ID for the mod whose config settings will be edited
|
|
||||||
* @param allRequireWorldRestart send true if all configElements on this screen require a world restart
|
|
||||||
* @param allRequireMcRestart send true if all configElements on this screen require MC to be restarted
|
|
||||||
* @param title the desired title for this screen. For consistency it is recommended that you pass the path of the config file being
|
|
||||||
* edited.
|
|
||||||
* @param titleLine2 the desired title second line for this screen. Typically this is used to send the category name of the category
|
|
||||||
* currently being edited.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public GuiConfig(GuiScreen parentScreen, List<IConfigElement> configElements, String modID,
|
|
||||||
boolean allRequireWorldRestart, boolean allRequireMcRestart, String title, String titleLine2)
|
|
||||||
{
|
|
||||||
this(parentScreen, configElements, modID, null, allRequireWorldRestart, allRequireMcRestart, title, titleLine2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* GuiConfig constructor that will use ConfigChangedEvent when editing is concluded. titleLine2 is specified in this constructor.
|
|
||||||
* If a non-null value is passed for configID, the OnConfigChanged and PostConfigChanged events will be posted when the Done button is
|
|
||||||
* pressed if any configElements were changed (includes child screens). If configID is not defined, the events will be posted if the parent
|
|
||||||
* gui is null or if the parent gui is not an instance of GuiConfig.
|
|
||||||
*
|
|
||||||
* @param parentScreen the parent GuiScreen object
|
|
||||||
* @param configElements a List of IConfigProperty objects
|
|
||||||
* @param modID the mod ID for the mod whose config settings will be edited
|
|
||||||
* @param configID an identifier that will be passed to the OnConfigChanged and PostConfigChanged events
|
|
||||||
* @param allRequireWorldRestart send true if all configElements on this screen require a world restart
|
|
||||||
* @param allRequireMcRestart send true if all configElements on this screen require MC to be restarted
|
|
||||||
* @param title the desired title for this screen. For consistency it is recommended that you pass the path of the config file being
|
|
||||||
* edited.
|
|
||||||
* @param titleLine2 the desired title second line for this screen. Typically this is used to send the category name of the category
|
|
||||||
* currently being edited.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public GuiConfig(GuiScreen parentScreen, List<IConfigElement> configElements, String modID, String configID,
|
|
||||||
boolean allRequireWorldRestart, boolean allRequireMcRestart, String title, String titleLine2)
|
|
||||||
{
|
|
||||||
this.mc = Minecraft.getMinecraft();
|
|
||||||
this.parentScreen = parentScreen;
|
|
||||||
this.configElements = configElements;
|
|
||||||
this.entryList = new GuiConfigEntries(this, mc);
|
|
||||||
this.initEntries = new ArrayList<IConfigEntry>(entryList.listEntries);
|
|
||||||
this.allRequireWorldRestart = allRequireWorldRestart;
|
|
||||||
this.allRequireMcRestart = allRequireMcRestart;
|
|
||||||
this.modID = modID;
|
|
||||||
this.configID = configID;
|
|
||||||
this.isWorldRunning = mc.theWorld != null;
|
|
||||||
if (title != null)
|
|
||||||
this.title = title;
|
|
||||||
this.titleLine2 = titleLine2;
|
|
||||||
if (this.titleLine2 != null && this.titleLine2.startsWith(" > "))
|
|
||||||
this.titleLine2 = this.titleLine2.replaceFirst(" > ", "");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getAbridgedConfigPath(String path)
|
|
||||||
{
|
|
||||||
Minecraft mc = Minecraft.getMinecraft();
|
|
||||||
if (mc.mcDataDir.getAbsolutePath().endsWith("."))
|
|
||||||
return path.replace("\\", "/").replace(mc.mcDataDir.getAbsolutePath().replace("\\", "/").substring(0, mc.mcDataDir.getAbsolutePath().length() - 1), "/.minecraft/");
|
|
||||||
else
|
|
||||||
return path.replace("\\", "/").replace(mc.mcDataDir.getAbsolutePath().replace("\\", "/"), "/.minecraft");
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
|
||||||
@Override
|
|
||||||
public void initGui()
|
|
||||||
{
|
|
||||||
Keyboard.enableRepeatEvents(true);
|
|
||||||
|
|
||||||
if (this.entryList == null || this.needsRefresh)
|
|
||||||
{
|
|
||||||
this.entryList = new GuiConfigEntries(this, mc);
|
|
||||||
this.needsRefresh = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
int undoGlyphWidth = mc.fontRenderer.getStringWidth(UNDO_CHAR) * 2;
|
|
||||||
int resetGlyphWidth = mc.fontRenderer.getStringWidth(RESET_CHAR) * 2;
|
|
||||||
int doneWidth = Math.max(mc.fontRenderer.getStringWidth(I18n.format("gui.done")) + 20, 100);
|
|
||||||
int undoWidth = mc.fontRenderer.getStringWidth(" " + I18n.format("fml.configgui.tooltip.undoChanges")) + undoGlyphWidth + 20;
|
|
||||||
int resetWidth = mc.fontRenderer.getStringWidth(" " + I18n.format("fml.configgui.tooltip.resetToDefault")) + resetGlyphWidth + 20;
|
|
||||||
int checkWidth = mc.fontRenderer.getStringWidth(I18n.format("fml.configgui.applyGlobally")) + 13;
|
|
||||||
int buttonWidthHalf = (doneWidth + 5 + undoWidth + 5 + resetWidth + 5 + checkWidth) / 2;
|
|
||||||
this.buttonList.add(new GuiButtonExt(2000, this.width / 2 - buttonWidthHalf, this.height - 29, doneWidth, 20, I18n.format("gui.done")));
|
|
||||||
this.buttonList.add(this.btnDefaultAll = new GuiUnicodeGlyphButton(2001, this.width / 2 - buttonWidthHalf + doneWidth + 5 + undoWidth + 5,
|
|
||||||
this.height - 29, resetWidth, 20, " " + I18n.format("fml.configgui.tooltip.resetToDefault"), RESET_CHAR, 2.0F));
|
|
||||||
this.buttonList.add(btnUndoAll = new GuiUnicodeGlyphButton(2002, this.width / 2 - buttonWidthHalf + doneWidth + 5,
|
|
||||||
this.height - 29, undoWidth, 20, " " + I18n.format("fml.configgui.tooltip.undoChanges"), UNDO_CHAR, 2.0F));
|
|
||||||
this.buttonList.add(chkApplyGlobally = new GuiCheckBox(2003, this.width / 2 - buttonWidthHalf + doneWidth + 5 + undoWidth + 5 + resetWidth + 5,
|
|
||||||
this.height - 24, I18n.format("fml.configgui.applyGlobally"), false));
|
|
||||||
|
|
||||||
this.undoHoverChecker = new HoverChecker(this.btnUndoAll, 800);
|
|
||||||
this.resetHoverChecker = new HoverChecker(this.btnDefaultAll, 800);
|
|
||||||
this.checkBoxHoverChecker = new HoverChecker(chkApplyGlobally, 800);
|
|
||||||
this.entryList.initGui();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onGuiClosed()
|
|
||||||
{
|
|
||||||
this.entryList.onGuiClosed();
|
|
||||||
|
|
||||||
if (this.configID != null && this.parentScreen instanceof GuiConfig)
|
|
||||||
{
|
|
||||||
GuiConfig parentGuiConfig = (GuiConfig) this.parentScreen;
|
|
||||||
parentGuiConfig.needsRefresh = true;
|
|
||||||
parentGuiConfig.initGui();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(this.parentScreen instanceof GuiConfig))
|
|
||||||
Keyboard.enableRepeatEvents(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void actionPerformed(GuiButton button)
|
|
||||||
{
|
|
||||||
if (button.id == 2000)
|
|
||||||
{
|
|
||||||
boolean flag = true;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if ((configID != null || this.parentScreen == null || !(this.parentScreen instanceof GuiConfig))
|
|
||||||
&& (this.entryList.hasChangedEntry(true)))
|
|
||||||
{
|
|
||||||
boolean requiresMcRestart = this.entryList.saveConfigElements();
|
|
||||||
|
|
||||||
if (Loader.isModLoaded(modID))
|
|
||||||
{
|
|
||||||
ConfigChangedEvent event = new OnConfigChangedEvent(modID, configID, isWorldRunning, requiresMcRestart);
|
|
||||||
FMLCommonHandler.instance().bus().post(event);
|
|
||||||
if (!event.getResult().equals(Result.DENY))
|
|
||||||
FMLCommonHandler.instance().bus().post(new PostConfigChangedEvent(modID, configID, isWorldRunning, requiresMcRestart));
|
|
||||||
|
|
||||||
if (requiresMcRestart)
|
|
||||||
{
|
|
||||||
flag = false;
|
|
||||||
mc.displayGuiScreen(new GuiMessageDialog(parentScreen, "fml.configgui.gameRestartTitle",
|
|
||||||
new ChatComponentText(I18n.format("fml.configgui.gameRestartRequired")), "fml.configgui.confirmRestartMessage"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.parentScreen instanceof GuiConfig)
|
|
||||||
((GuiConfig) this.parentScreen).needsRefresh = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Throwable e)
|
|
||||||
{
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flag)
|
|
||||||
this.mc.displayGuiScreen(this.parentScreen);
|
|
||||||
}
|
|
||||||
else if (button.id == 2001)
|
|
||||||
{
|
|
||||||
this.entryList.setAllToDefault(this.chkApplyGlobally.isChecked());
|
|
||||||
}
|
|
||||||
else if (button.id == 2002)
|
|
||||||
{
|
|
||||||
this.entryList.undoAllChanges(this.chkApplyGlobally.isChecked());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void mouseClicked(int x, int y, int mouseEvent)
|
|
||||||
{
|
|
||||||
if (mouseEvent != 0 || !this.entryList.func_148179_a(x, y, mouseEvent))
|
|
||||||
{
|
|
||||||
this.entryList.mouseClicked(x, y, mouseEvent);
|
|
||||||
super.mouseClicked(x, y, mouseEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void mouseMovedOrUp(int x, int y, int mouseEvent)
|
|
||||||
{
|
|
||||||
if (mouseEvent != 0 || !this.entryList.func_148181_b(x, y, mouseEvent))
|
|
||||||
{
|
|
||||||
super.mouseMovedOrUp(x, y, mouseEvent);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void keyTyped(char eventChar, int eventKey)
|
|
||||||
{
|
|
||||||
if (eventKey == Keyboard.KEY_ESCAPE)
|
|
||||||
this.mc.displayGuiScreen(parentScreen);
|
|
||||||
else
|
|
||||||
this.entryList.keyTyped(eventChar, eventKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void updateScreen()
|
|
||||||
{
|
|
||||||
super.updateScreen();
|
|
||||||
this.entryList.updateScreen();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void drawScreen(int mouseX, int mouseY, float partialTicks)
|
|
||||||
{
|
|
||||||
this.drawDefaultBackground();
|
|
||||||
this.entryList.drawScreen(mouseX, mouseY, partialTicks);
|
|
||||||
this.drawCenteredString(this.fontRendererObj, this.title, this.width / 2, 8, 16777215);
|
|
||||||
String title2 = this.titleLine2;
|
|
||||||
|
|
||||||
if (title2 != null)
|
|
||||||
{
|
|
||||||
int strWidth = mc.fontRenderer.getStringWidth(title2);
|
|
||||||
int elipsisWidth = mc.fontRenderer.getStringWidth("...");
|
|
||||||
if (strWidth > width - 6 && strWidth > elipsisWidth)
|
|
||||||
title2 = mc.fontRenderer.trimStringToWidth(title2, width - 6 - elipsisWidth).trim() + "...";
|
|
||||||
this.drawCenteredString(this.fontRendererObj, title2, this.width / 2, 18, 16777215);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.btnUndoAll.enabled = this.entryList.areAnyEntriesEnabled(this.chkApplyGlobally.isChecked()) && this.entryList.hasChangedEntry(this.chkApplyGlobally.isChecked());
|
|
||||||
this.btnDefaultAll.enabled = this.entryList.areAnyEntriesEnabled(this.chkApplyGlobally.isChecked()) && !this.entryList.areAllEntriesDefault(this.chkApplyGlobally.isChecked());
|
|
||||||
super.drawScreen(mouseX, mouseY, partialTicks);
|
|
||||||
this.entryList.drawScreenPost(mouseX, mouseY, partialTicks);
|
|
||||||
if (this.undoHoverChecker.checkHover(mouseX, mouseY))
|
|
||||||
this.drawToolTip(this.mc.fontRenderer.listFormattedStringToWidth(I18n.format("fml.configgui.tooltip.undoAll"), 300), mouseX, mouseY);
|
|
||||||
if (this.resetHoverChecker.checkHover(mouseX, mouseY))
|
|
||||||
this.drawToolTip(this.mc.fontRenderer.listFormattedStringToWidth(I18n.format("fml.configgui.tooltip.resetAll"), 300), mouseX, mouseY);
|
|
||||||
if (this.checkBoxHoverChecker.checkHover(mouseX, mouseY))
|
|
||||||
this.drawToolTip(this.mc.fontRenderer.listFormattedStringToWidth(I18n.format("fml.configgui.tooltip.applyGlobally"), 300), mouseX, mouseY);
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("rawtypes")
|
|
||||||
public void drawToolTip(List stringList, int x, int y)
|
|
||||||
{
|
|
||||||
this.func_146283_a(stringList, x, y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
Loaded 100 of 881 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user