Compare commits
999 Commits
revert_che
...
master
Author | SHA1 | Date |
---|---|---|
|
d83c6fe906 | |
|
e7c6043f06 | |
|
65b1fd163b | |
|
eff0a546e5 | |
|
61ee14b1a6 | |
|
968f6ae963 | |
|
2e2bbf0b17 | |
|
8060b02cbd | |
|
693d40b6c4 | |
|
ecfbb1ae07 | |
|
14e630a1e2 | |
|
62afbb4509 | |
|
f02764bc08 | |
|
aa1a928898 | |
|
45952a6fd6 | |
|
33bbeb1a4d | |
|
d3253ecf4f | |
|
0abda8ff20 | |
|
9bb3d8311b | |
|
686bb38546 | |
|
c4f6944a03 | |
|
c1647a5cce | |
|
624c853cb3 | |
|
e8641c3c20 | |
|
f39cec2442 | |
|
e99a46b52d | |
|
cd1c8bd92e | |
|
3830171347 | |
|
48b16a23b6 | |
|
0a9be4b79c | |
|
540319d948 | |
|
fbb2923a0b | |
|
b2e0b9b08b | |
|
4d61e32021 | |
|
7c602ce82c | |
|
ae92c51155 | |
|
db7f4699eb | |
|
b23fc6d23d | |
|
68e6965dd0 | |
|
7d642c9929 | |
|
406b27852b | |
|
d00f183456 | |
|
b121d0f804 | |
|
8f8385e4a1 | |
|
17fc7a3256 | |
|
c08153fa7f | |
|
ba708010a2 | |
|
6601ecf788 | |
|
660c85dddc | |
|
2d0b4dd8f7 | |
|
10d9eb2980 | |
|
3d9df5c797 | |
|
8cc90b6714 | |
|
db4ff13aeb | |
|
f919f73c24 | |
|
319beb91ce | |
|
bea9bbe212 | |
|
8fd40eaf46 | |
|
fcaa2c4ce1 | |
|
55478f6953 | |
|
57882ae56a | |
|
fee4ccf096 | |
|
f653f47f26 | |
|
7b7e213925 | |
|
cf829b6481 | |
|
f62546a54f | |
|
7b6d946d7b | |
|
1da272a941 | |
|
e3f14a3a99 | |
|
a9a61a034c | |
|
6f98ba5118 | |
|
f6f812257e | |
|
f05e976d18 | |
|
5533ec7bac | |
|
b66e2a117f | |
|
09ef5fd96b | |
|
1e61fc3069 | |
|
ef30646788 | |
|
70e4aaa3a7 | |
|
8bfa55fa7a | |
|
2ba6a60e55 | |
|
aeddb7675f | |
|
2ccfd89379 | |
|
3a24903a01 | |
|
abdd5e11c0 | |
|
e17fab385b | |
|
17cae6896e | |
|
1c84bc6572 | |
|
4d29fab932 | |
|
a2087b19a5 | |
|
84119d8f34 | |
|
5da6c25ccf | |
|
b79f74c390 | |
|
06f47a0756 | |
|
ff79af26e4 | |
|
de56c72e15 | |
|
e3c8d995b5 | |
|
b8b45210e9 | |
|
a1f10205f6 | |
|
6f7505b6c6 | |
|
e323ab6e88 | |
|
c88f0047c1 | |
|
0400d9a2a5 | |
|
3590ff6dfb | |
|
d1ceacf7ba | |
|
a70a6ef13d | |
|
b4e84dadb0 | |
|
194ff53400 | |
|
e7e0b082c4 | |
|
18b888da8b | |
|
15a15158b8 | |
|
9445e10834 | |
|
35a75491f4 | |
|
81dbdaab94 | |
|
2fd7f8c69f | |
|
6a34a30941 | |
|
d4c2802afb | |
|
b2dbf48e92 | |
|
bf50a17f2e | |
|
b817c079ba | |
|
cfa276f722 | |
|
86b1d8bc3e | |
|
9c2f43a242 | |
|
044a91e831 | |
|
106979e64a | |
|
4482068211 | |
|
1dc7cab6be | |
|
634379dfe9 | |
|
c2ac33ac61 | |
|
b5c0830060 | |
|
c43c723e08 | |
|
bd3a4ff0df | |
|
0267ad2f31 | |
|
a2f9ea81cc | |
|
7c7f4b930c | |
|
60529d3d5d | |
|
6ea4b43249 | |
|
1fb300ef18 | |
|
b789845f62 | |
|
f368fb3e43 | |
|
d63ecac7cb | |
|
7fbc84971e | |
|
953044cc4b | |
|
6744967d02 | |
|
fdb2333493 | |
|
1defd03408 | |
|
d163faeb42 | |
|
197d3ae00b | |
|
6b8226dae3 | |
|
f6b77aa458 | |
|
1558c852d8 | |
|
6c0525f00e | |
|
3c13ce1d6b | |
|
c1d5d4280e | |
|
70fb4f8a0d | |
|
620a0af483 | |
|
428b1b2c12 | |
|
4ddab8bdf1 | |
|
bfe4b2fd31 | |
|
cc8675602a | |
|
aff1d5f667 | |
|
169019096e | |
|
049db13b28 | |
|
dfbee5cb93 | |
|
378af531a9 | |
|
088cda4f1c | |
|
71671f8b5f | |
|
c4d60e50cc | |
|
9421c7ca6b | |
|
d9982e20d2 | |
|
30bb1ab075 | |
|
b834e790a7 | |
|
39d4434df1 | |
|
4b9482cb09 | |
|
4757e62968 | |
|
b95ebb3fca | |
|
07f332f0cd | |
|
f4e8088e60 | |
|
198375a18e | |
|
c26cddeafc | |
|
714d159072 | |
|
bdc82b76b5 | |
|
6f67f0e095 | |
|
d5687716a0 | |
|
5f0d91cf26 | |
|
e2de5908c7 | |
|
439c879508 | |
|
67977b0d26 | |
|
ed8c3e7d26 | |
|
7add59992f | |
|
d72a674097 | |
|
ef4e4b1b7b | |
|
0e000e6491 | |
|
ec7a97ba3e | |
|
290680fb3d | |
|
48eb934d64 | |
|
88cf3a5900 | |
|
1401652015 | |
|
cac6e15736 | |
|
156d096a78 | |
|
db3483a6cb | |
|
ace6f8db43 | |
|
9aeafe6053 | |
|
de00b7228e | |
|
d454697953 | |
|
ce2011218c | |
|
ccef2d1147 | |
|
5fbec2f6b5 | |
|
4d922d9edf | |
|
46ca650ea4 | |
|
c4e4a8e4d2 | |
|
08610296fc | |
|
7d46fa3362 | |
|
58a08ea697 | |
|
50effaa807 | |
|
08df1fe02f | |
|
bc4d9211cb | |
|
cf05771e30 | |
|
16a6dcb66c | |
|
89eb458df7 | |
|
eae1ee7cee | |
|
27f5a94c6a | |
|
b4719599b5 | |
|
659f11bf6f | |
|
88a7a8afab | |
|
cdc922d4ac | |
|
060732cd66 | |
|
ad43fbd237 | |
|
618313f0af | |
|
31fb7faf16 | |
|
a3bc3fd9b9 | |
|
c370f1884b | |
|
b771f314fe | |
|
f6a5004eab | |
|
7daa79a3f8 | |
|
4b0b3217e2 | |
|
e363435134 | |
|
5b1c7f2d3a | |
|
63ace64cae | |
|
0c0845c1bd | |
|
24b1078b61 | |
|
3546d04aaa | |
|
1abd226e07 | |
|
f4b1116e21 | |
|
cbb3260471 | |
|
855659a2a1 | |
|
8793ed211e | |
|
01f814267e | |
|
8f4c69084d | |
|
425cf53194 | |
|
d04f162d8f | |
|
7f84922403 | |
|
025f97187a | |
|
06effcd786 | |
|
6265148727 | |
|
2ad60b06ea | |
|
245ce99223 | |
|
1f107ec0c7 | |
|
c209537cfe | |
|
d583ccb986 | |
|
7d803e174c | |
|
319602508d | |
|
8c703f1352 | |
|
95b1429922 | |
|
32b5b435c5 | |
|
a3fe41128f | |
|
1a495dd63a | |
|
29597af738 | |
|
f3e840a0ff | |
|
7dd0293616 | |
|
63360bcab2 | |
|
0b1881d1d4 | |
|
8cf6269dda | |
|
1f09c0a128 | |
|
fb8060c366 | |
|
da7320b14c | |
|
66ff8ab8a9 | |
|
a1cc24f8d3 | |
|
6f22d7daa4 | |
|
dc3eedac5f | |
|
f3bed9f599 | |
|
f84bdbd777 | |
|
7712c45c4e | |
|
02ee8b757d | |
|
39b6e41a62 | |
|
ef1f7b8e20 | |
|
5c32d1c106 | |
|
70b56d7126 | |
|
c4ea504123 | |
|
6d60fb4160 | |
|
e4f26a4688 | |
|
af86e73280 | |
|
32be8f9602 | |
|
15560d969c | |
|
6bbf3af97b | |
|
84317afc93 | |
|
2cd6629ae1 | |
|
f971283798 | |
|
9afdd09d9d | |
|
62bb7a85eb | |
|
42eb541eaa | |
|
9e8ed7efc3 | |
|
36231241ba | |
|
9a276489d1 | |
|
e2cbd4267c | |
|
4ec506b534 | |
|
06435e0f4c | |
|
a1d98c080f | |
|
96cd2657db | |
|
cd63f32cdd | |
|
2d81d153bd | |
|
dc7a46df4e | |
|
ad25b0bc4b | |
|
b77260253a | |
|
ad9beebc70 | |
|
b6951d00b9 | |
|
86e480aad0 | |
|
ce7d493890 | |
|
995679d7ae | |
|
c57f797226 | |
|
78f32d2dd4 | |
|
a1ad84370c | |
|
f6a3fe2128 | |
|
1c65e0ad68 | |
|
6900748429 | |
|
f09b723885 | |
|
efd3420d52 | |
|
62be5a06f6 | |
|
683799aea5 | |
|
383cbf96a6 | |
|
a7632e767d | |
|
99d09c76ae | |
|
c7ebe1b8cd | |
|
5c464f1c1d | |
|
87e6842c00 | |
|
b258ccffdc | |
|
83b0807218 | |
|
a00ef4500d | |
|
c49aef3251 | |
|
f3ba32d739 | |
|
ed03cb470d | |
|
9746dbc376 | |
|
d89a7e0326 | |
|
5fd5cc9f1c | |
|
c75ec6916c | |
|
4b6b4d8398 | |
|
513d148eaf | |
|
26e032687a | |
|
b99487b6ab | |
|
8adc1d48b2 | |
|
ac30e25065 | |
|
0931af21c8 | |
|
77a8ca689f | |
|
30d3b7ee23 | |
|
55bb9800f4 | |
|
b805ae9926 | |
|
90c74f4a6a | |
|
6e6c11cde2 | |
|
d48b3dcaee | |
|
88493091b6 | |
|
d68667beb9 | |
|
181628e539 | |
|
c57a757510 | |
|
26f3275b7c | |
|
45b4b4a458 | |
|
5424ca8c2b | |
|
8feefcdd7b | |
|
9b28baaad6 | |
|
60a1a364dc | |
|
f9b021e4c6 | |
|
65fb911e5f | |
|
38732e801d | |
|
5ad2a990d4 | |
|
8f6c932e88 | |
|
e9c202ae45 | |
|
d6ee21d192 | |
|
876fc2fb50 | |
|
0c61035df0 | |
|
a7fac7c550 | |
|
93c9fdfaae | |
|
3027965314 | |
|
e9c9f151de | |
|
fb8262bf57 | |
|
726358da4b | |
|
515204d296 | |
|
eb5f5678d6 | |
|
33e2b79b2b | |
|
7c497d9604 | |
|
7c20896d5e | |
|
cd70dd5b88 | |
|
302970d220 | |
|
79876635af | |
|
b9238b4069 | |
|
bf25fca47d | |
|
92261e5fb5 | |
|
1e31e383d4 | |
|
4457432d32 | |
|
fa96f9d593 | |
|
fbb4cf084f | |
|
60b19b31ab | |
|
871c4f24c2 | |
|
18c0e1f050 | |
|
fb8e41047d | |
|
2bd5e6a84f | |
|
23a13f14e0 | |
|
5412206743 | |
|
30521a8b2f | |
|
1536338199 | |
|
3697ef8069 | |
|
dd15092052 | |
|
ce485e89cd | |
|
09a7348256 | |
|
a500528613 | |
|
292e7129f2 | |
|
3091e85b1c | |
|
da277f9dc7 | |
|
27a487195a | |
|
2fdc8cbdd4 | |
|
0079cf807e | |
|
899cfd5157 | |
|
64a7f76d5b | |
|
b0d9eed3e1 | |
|
685a7ff256 | |
|
949a2b787e | |
|
8849b2e98f | |
|
9e76cd963d | |
|
522a7577de | |
|
7912239562 | |
|
396fedd8e7 | |
|
f81eec6fff | |
|
d2625d3ace | |
|
a04d946879 | |
|
482a6071f5 | |
|
6993559330 | |
|
b572363b8e | |
|
00408b998c | |
|
e7c238c17e | |
|
1de806f6f8 | |
|
b07e6fccdc | |
|
04efa74115 | |
|
2e8f56d098 | |
|
ff7299a444 | |
|
aad2d114f9 | |
|
2ed3c1c480 | |
|
111c885417 | |
|
8e1f00d428 | |
|
4fd4425aae | |
|
ac4cd2c325 | |
|
01c8009c6a | |
|
ef90820f67 | |
|
d6d11b9526 | |
|
b0264b2736 | |
|
c12f2cc565 | |
|
9f94f12127 | |
|
784f3ec226 | |
|
44a769397d | |
|
b3da85be64 | |
|
3ed32abc4e | |
|
9db6050638 | |
|
7ceb953a56 | |
|
1894d8c5f0 | |
|
419d61edde | |
|
9820309762 | |
|
726eba7ed8 | |
|
f46581905a | |
|
4f6de581dd | |
|
eb8f7360a2 | |
|
db62631540 | |
|
fb30564827 | |
|
8c355db3ce | |
|
eae08f3010 | |
|
4701c4d6e7 | |
|
8df0b2a48e | |
|
66f368531d | |
|
7cb5c55d68 | |
|
34faca3f2c | |
|
d5dda679eb | |
|
c65bbcd5a5 | |
|
533f59bf27 | |
|
3074c15d14 | |
|
132178b8c7 | |
|
ede21a8627 | |
|
82fae13b47 | |
|
f92ea77849 | |
|
7ebf9b7ab8 | |
|
07a56165ed | |
|
ee0b355f51 | |
|
6fd799ac42 | |
|
01bb753549 | |
|
59694ebc7c | |
|
cc24144bc6 | |
|
e1cd16c971 | |
|
00c4ecf643 | |
|
e4db91d35c | |
|
2527479401 | |
|
85f7bbdb80 | |
|
465a919f6b | |
|
325a666c62 | |
|
e9b54e85c2 | |
|
4324fe2489 | |
|
d6804bf4b7 | |
|
87f04bdd9f | |
|
e3307d647b | |
|
29cd73cb84 | |
|
5c0a763b83 | |
|
9b1ceebf0d | |
|
ed64e7f733 | |
|
856a60bcc2 | |
|
08f9c0074a | |
|
09db6017c3 | |
|
c4969c13cd | |
|
f70176da34 | |
|
e314addeb3 | |
|
df8fc65e1e | |
|
687887fe27 | |
|
65aa956d9c | |
|
ddd004c0f0 | |
|
609ef220ad | |
|
32a7eb4087 | |
|
5e969ba928 | |
|
17e02aec3c | |
|
fb28e192e6 | |
|
0f569fdbaa | |
|
8a7fcfde82 | |
|
fb51067c78 | |
|
8dd4a2611e | |
|
f86ee99abf | |
|
6cf1fa7b81 | |
|
7ea41a2f21 | |
|
39bcf2f961 | |
|
0b1916b807 | |
|
d1a017f6b2 | |
|
50e50e2904 | |
|
966c914a8e | |
|
9351f72c15 | |
|
ef7fb0d2e3 | |
|
5ef7d9f7a0 | |
|
0fca1ce469 | |
|
388632cd46 | |
|
dd4a0a4172 | |
|
df6d1c026a | |
|
d586b3fecc | |
|
a7a0c4791a | |
|
23b62c296a | |
|
f8ae702ce4 | |
|
5faf060122 | |
|
8c648d1fc3 | |
|
46052e5b7e | |
|
6430fcf103 | |
|
7376b08c61 | |
|
2e28a3386b | |
|
98dac6dcd7 | |
|
3026808a71 | |
|
7c7521ff15 | |
|
50d8e95c16 | |
|
fc74bd5cfe | |
|
2a37d38f6c | |
|
89821a8329 | |
|
3249c13752 | |
|
2ea72ccda8 | |
|
5237eca31e | |
|
c2ba70a601 | |
|
723fe9c532 | |
|
661afed46c | |
|
3d2955c394 | |
|
e7ace0c87c | |
|
9605e2ae0d | |
|
80bb954814 | |
|
10dc83b2a6 | |
|
b95c623a74 | |
|
0ab4553648 | |
|
65557152fb | |
|
1357193a78 | |
|
aacbaddfe0 | |
|
e246bf7ddf | |
|
11bd29ed44 | |
|
de574729a2 | |
|
95e269a61f | |
|
5bdc145872 | |
|
20e178d5d1 | |
|
bdbc484c48 | |
|
56c62e9fba | |
|
3b1acc60db | |
|
6026687e93 | |
|
e813c48ed5 | |
|
75716d97e3 | |
|
6fe5bf8674 | |
|
9574ba7f09 | |
|
0df4f9518a | |
|
3ee4a62107 | |
|
e6e898671a | |
|
87327abfb9 | |
|
34263c2ef3 | |
|
38c6969292 | |
|
54548ecfdf | |
|
5ec7b8ed89 | |
|
137179ac8e | |
|
3afb42b2f7 | |
|
ab1cfde34d | |
|
d5f8129ea7 | |
|
1d0968f4f5 | |
|
0f9d263e02 | |
|
26c1be3722 | |
|
1295b2dc12 | |
|
44f724f677 | |
|
92ee402971 | |
|
7d8fdc6ec3 | |
|
d2edc75407 | |
|
7311071303 | |
|
437842134e | |
|
60b0cfe89a | |
|
d8a883e81f | |
|
15f5c3c30a | |
|
4af8148850 | |
|
ea6201d32f | |
|
da17ff8ea0 | |
|
6756ee340c | |
|
0c454a34c9 | |
|
8279dcb3dd | |
|
ea19f02e14 | |
|
95cbac78a8 | |
|
acc2be7253 | |
|
3015bfb8c4 | |
|
28cb06421d | |
|
731468cf5a | |
|
ff7693937a | |
|
c1cde073c8 | |
|
76669e1f3c | |
|
ef15477e37 | |
|
a0c5a04d26 | |
|
18e932997d | |
|
1f601c68c5 | |
|
9cf6c9ed5e | |
|
81daec14a2 | |
|
9f9cc3a629 | |
|
ac90350257 | |
|
a6841fe38b | |
|
5e129985f2 | |
|
6f05992c8b | |
|
0dc31611ac | |
|
b0070a3b83 | |
|
5964f25fa7 | |
|
2db9ea6459 | |
|
e0a9aca469 | |
|
fb8f59e918 | |
|
9eb86f011b | |
|
d3e8e24f42 | |
|
770dd0ec47 | |
|
00b2afecad | |
|
c55332bf42 | |
|
cbf090485c | |
|
42f8fbf9b8 | |
|
bd38827f60 | |
|
b0978d275d | |
|
522bbbbe26 | |
|
e1f26ea70d | |
|
9ef4a850b1 | |
|
4c23601d03 | |
|
8d51e16b8e | |
|
2b11b5c17a | |
|
9445b02dcc | |
|
1b980849db | |
|
14adcbbecb | |
|
e0d48400a7 | |
|
7312c30f8e | |
|
742a625c42 | |
|
95d3f9be07 | |
|
16d94a88db | |
|
a50908e1eb | |
|
afbb8e2288 | |
|
79b1db4b1a | |
|
1c752019f0 | |
|
1977dbf9a1 | |
|
91836f3a1d | |
|
35b2f3b638 | |
|
4fcbe05be5 | |
|
8f80c6e6a6 | |
|
b14f055154 | |
|
3faa930bdc | |
|
a6e0da0e07 | |
|
41ab80183e | |
|
1c24adb714 | |
|
7003459b8d | |
|
8d440f8464 | |
|
658a08181c | |
|
605e4de455 | |
|
8522b87444 | |
|
e4abbbf112 | |
|
718cdb553d | |
|
e2ec660f25 | |
|
1b4bcda9da | |
|
39714fb096 | |
|
258a1534d2 | |
|
c995c8418c | |
|
00121d9d97 | |
|
4f90fbcedd | |
|
c7104a6f72 | |
|
223f6640d2 | |
|
feea815604 | |
|
b1b2e06dc7 | |
|
1a56a32fa8 | |
|
0a4243a0f3 | |
|
66a7c5757e | |
|
083a57a4a1 | |
|
c512d28f02 | |
|
1056b6ca14 | |
|
c8ec57bdbd | |
|
2dffe11cdd | |
|
f29622dd59 | |
|
d9bd3e2601 | |
|
e53d7576c3 | |
|
2b61231f82 | |
|
40f7215368 | |
|
620cc97bad | |
|
64c8afc8f0 | |
|
f737df79e5 | |
|
7a3f373425 | |
|
63ea851e63 | |
|
fe26f117da | |
|
5191326fc7 | |
|
45c85841e8 | |
|
4b8493f1a4 | |
|
0a2f57476e | |
|
256655df83 | |
|
b3a8ba57e7 | |
|
20ca34233c | |
|
93814880d0 | |
|
1861d7d30d | |
|
49fb36bac2 | |
|
c09ed02801 | |
|
da4e359df0 | |
|
4da20f5e73 | |
|
4ba3af5c73 | |
|
3a619ba8e4 | |
|
1859f44bd6 | |
|
4e282df905 | |
|
1b0b2b8b04 | |
|
c33d7d0106 | |
|
cec5b1668a | |
|
adcf03e0c6 | |
|
a4ef367708 | |
|
20e78099d7 | |
|
94a37790aa | |
|
89f5d41366 | |
|
b33b87b9dd | |
|
295970fbac | |
|
639825a8da | |
|
0f8cfbf106 | |
|
39e9158c01 | |
|
773c760727 | |
|
254caaff37 | |
|
1ac6c45c7f | |
|
5b68007902 | |
|
35967caf71 | |
|
29bc74dde9 | |
|
ca1a46efa7 | |
|
997b6875a2 | |
|
38e49a4b80 | |
|
9b94a752bd | |
|
ab3530c356 | |
|
fbed60bd2d | |
|
bf34ca5f50 | |
|
055432c1f7 | |
|
7a371dc846 | |
|
7deec7ae03 | |
|
47eda5b69e | |
|
8d921c0671 | |
|
804aa388b5 | |
|
fcf9c35324 | |
|
9cc63ed716 | |
|
c49f000894 | |
|
f7f2b97b13 | |
|
f7f0a2be8b | |
|
e408dd45e5 | |
|
adead97905 | |
|
ef33891b3f | |
|
1c5170d36f | |
|
cf3e65e34e | |
|
0593a63626 | |
|
2b46dd60c5 | |
|
9d87dcf611 | |
|
0f99373779 | |
|
bbf21762a6 | |
|
34a7cf3e9f | |
|
3153c41f3a | |
|
489d3b7da6 | |
|
2d05f9bc89 | |
|
8256fe6f04 | |
|
bceb9cd855 | |
|
1c1ae53cec | |
|
0bc88b55e5 | |
|
d80dd41cb4 | |
|
43a69c445f | |
|
dbe0437201 | |
|
51372da2b9 | |
|
283b7c7410 | |
|
bfa75dbcd2 | |
|
7c87ed2d6c | |
|
d8c16b1f31 | |
|
ba292aeb5d | |
|
055a93843f | |
|
a3cded0133 | |
|
2b52eaa6ef | |
|
71a03bff6f | |
|
a0a0c69213 | |
|
e57551f764 | |
|
18cfb88ae5 | |
|
826b9fcc45 | |
|
7dacfe2cba | |
|
7d57e73ae4 | |
|
7f59611914 | |
|
927fd60786 | |
|
ab031daa5a | |
|
588425df73 | |
|
25d0f2b0c4 | |
|
85e7de6c14 | |
|
d395c82183 | |
|
34a558ced9 | |
|
17f789550d | |
|
9508cd4c25 | |
|
c4808beef4 | |
|
69c64a2c24 | |
|
318da7e3c9 | |
|
5e022ef083 | |
|
c45e4d292a | |
|
a542503b72 | |
|
4b570b1aa9 | |
|
cc190eeb62 | |
|
7e31ece325 | |
|
b783e616df | |
|
f1ae86ede5 | |
|
c63533c753 | |
|
81fa7cf74c | |
|
5378aae09e | |
|
aec16ee62e | |
|
0cdf84ab47 | |
|
31395a8830 | |
|
8e74a5a56a | |
|
2149ca1147 | |
|
de7696ce69 | |
|
4b777b1d9c | |
|
dadb8f9287 | |
|
83b40f8cff | |
|
ce95f034b4 | |
|
2b3ec8d944 | |
|
972e9ea0f8 | |
|
df62a3aac1 | |
|
7cc25c4670 | |
|
ebf214c043 | |
|
7bd0b5a9b1 | |
|
bc496a8682 | |
|
a3415647d4 | |
|
4909ef6ff7 | |
|
3c6d79ecb3 | |
|
6948b77226 | |
|
90321ee578 | |
|
2b691dea07 | |
|
c25287e493 | |
|
762f64a4d1 | |
|
db63f1c453 | |
|
faa38ffab8 | |
|
19d6d43b39 | |
|
28b6fcf289 | |
|
80490b4c11 | |
|
5e177c61f6 | |
|
c9c2b874be | |
|
18c415f6a0 | |
|
49670d1d28 | |
|
a25cd921f2 | |
|
91b5b6266c | |
|
148b30694f | |
|
f4374d9efd | |
|
b41d6a1cae | |
|
6548b7fe47 | |
|
c7681af53e | |
|
cc77e109f5 | |
|
e7d9ded9ab | |
|
96d697c5cd | |
|
01abfea16d | |
|
bbba7cee41 | |
|
e82c318f0c | |
|
70834d0f5d | |
|
d62dbcb852 | |
|
67fd8c8b40 | |
|
90639ef99d | |
|
31ef791cfd | |
|
4d5104ff8f | |
|
b7962b067f | |
|
19dc86c951 | |
|
e3ee224532 | |
|
c209bff157 | |
|
59a7608dfc | |
|
8b08707e3f | |
|
dd8f64e039 | |
|
56519c881e | |
|
944d53111a | |
|
33c3007709 | |
|
8d5aea9743 | |
|
fa2a2bb8ac | |
|
ee808e8f84 | |
|
53d11ec71b | |
|
f1aca79f9c | |
|
fb8b3d5f55 | |
|
8184d4938c | |
|
da64a10403 | |
|
2a54ea6e74 | |
|
8b7b2f02e9 | |
|
927eff691c | |
|
efdd22d69f | |
|
f14bfdc0cd | |
|
66322a873b | |
|
e134cc5e65 | |
|
1fcedd1375 | |
|
bb73e5f1cd | |
|
d4c2501d62 | |
|
708fcfb368 | |
|
ebf4678e54 | |
|
b4971b298d | |
|
d3349396b4 | |
|
665e8a06a2 | |
|
67e8f13a96 | |
|
99db678a44 | |
|
dd58bed5d1 | |
|
9cf910c47f | |
|
69f5bad0bb | |
|
ac7038e7a5 | |
|
3b368fdd5a | |
|
624092ddd3 | |
|
dabc09adb2 | |
|
d0ea7c4059 | |
|
87d5cdc439 | |
|
c6fc388597 | |
|
93e5034317 | |
|
8564a12398 | |
|
e5515ed119 | |
|
94057aa7e5 | |
|
db4f9ec5a3 | |
|
057a78ed30 | |
|
22fa5096c9 | |
|
2147790b44 | |
|
a1e21b44c8 | |
|
358250012f | |
|
608da950e4 | |
|
c3455de604 | |
|
6251c623dd | |
|
62fe08de59 | |
|
af0c718538 | |
|
3600bc8066 | |
|
d1788b5643 | |
|
c7cc9ccb3e | |
|
097ee8b4d4 | |
|
59d384020e | |
|
1d18482103 | |
|
b82912f30d | |
|
48a8511052 | |
|
160d7ca6fa | |
|
ae90cbe3ef | |
|
9893dee1aa | |
|
232f57c247 | |
|
dc017864fd | |
|
2159edba05 | |
|
37144f8787 | |
|
7ab2c5fecd | |
|
99fce095ef | |
|
390aec5d7a | |
|
052e76bfcc | |
|
f17a9220bb | |
|
627ce0dc3b | |
|
f06d5a1ee3 | |
|
5dc1a3d456 | |
|
1b6d778dd1 | |
|
96ac31bec3 | |
|
8b6409b7f1 | |
|
6e6f163b71 | |
|
ba7da6a885 | |
|
3066d966a1 | |
|
626f61c2c1 | |
|
f71759f184 | |
|
dec2c2bade | |
|
9b392fcefc | |
|
d091d634bb | |
|
16746f962f | |
|
00c596c126 | |
|
993d7b6873 | |
|
ceff91e2c3 | |
|
6bfcd9b1ea | |
|
6b826b45e1 | |
|
3de1f9e4d6 | |
|
348434adf1 | |
|
6946573e65 | |
|
862d6a9e3e | |
|
78d45d23c2 | |
|
b11d65cc82 | |
|
f4f57a9fe6 | |
|
96e83e866c | |
|
3bb86fd436 | |
|
4acee8e64e | |
|
bacec2c7e6 | |
|
a3d459f020 |
|
@ -0,0 +1,12 @@
|
||||||
|
root = true
|
||||||
|
|
||||||
|
[*]
|
||||||
|
end_of_line = lf
|
||||||
|
|
||||||
|
[*.lua]
|
||||||
|
charset = utf8
|
||||||
|
indent_style = tab
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
keep_one_space_between_table_and_bracket = false
|
||||||
|
spaces_around_operators = true
|
|
@ -0,0 +1,36 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
name: "Bug report"
|
||||||
|
about: "File a bug report"
|
||||||
|
labels:
|
||||||
|
|
||||||
|
- unconfirmed
|
||||||
|
- bug
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Thanks for taking the time to fill out this bug report!
|
||||||
|
|
||||||
|
Please follow our contributing guidelines first:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
|
||||||
|
|
||||||
|
By submitting this issue, you agree to follow our Code of Conduct:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
|
||||||
|
-->
|
||||||
|
|
||||||
|
<!--
|
||||||
|
What version of MineClone2 are you using? We do not provide support for outdated versions of MineClone2.
|
||||||
|
Current latest version is listed here, at the top:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/tags
|
||||||
|
-->
|
||||||
|
MineClone2 version:
|
||||||
|
|
||||||
|
### What happened?
|
||||||
|
Report about the bug! Please send large log snippets as an attachement file.
|
||||||
|
|
||||||
|
### What should happen:
|
||||||
|
Tell us what should happen!
|
||||||
|
|
||||||
|
### Steps to reproduce
|
||||||
|
Tell us how we can reproduce the bug!
|
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
name: "Feature request"
|
||||||
|
about: "File a feature request not in Minecraft"
|
||||||
|
labels:
|
||||||
|
|
||||||
|
- "non-Minecraft feature"
|
||||||
|
- "needs discussion"
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Got a new non-Minecraft feature request? Explain to us why we should consider your idea.
|
||||||
|
|
||||||
|
Please follow our contributing guidelines first:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
|
||||||
|
|
||||||
|
By submitting this issue, you agree to follow our Code of Conduct:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Feature
|
||||||
|
Tell us about your requested feature not in Minecraft!
|
||||||
|
|
||||||
|
### Why
|
||||||
|
Tell us why should we implement it!
|
|
@ -0,0 +1,25 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
name: "Missing Feature request"
|
||||||
|
about: "File a missing feature request in Minecraft but not in MineClone2"
|
||||||
|
labels:
|
||||||
|
|
||||||
|
- "missing feature"
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Thanks for taking the time to fill out this missing feature request!
|
||||||
|
|
||||||
|
Please follow our contributing guidelines first:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#rules-about-both-bugs-and-feature-requests
|
||||||
|
|
||||||
|
By submitting this issue, you agree to follow our Code of Conduct:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
|
||||||
|
-->
|
||||||
|
|
||||||
|
### Current feature in Minecraft
|
||||||
|
Tell us about the feature currently in Minecraft! What is it like on Minecraft?
|
||||||
|
|
||||||
|
### Current feature in MineClone2
|
||||||
|
Tell us about the feature currently in MineClone2! What is different?
|
|
@ -0,0 +1,20 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
name: "Pull request"
|
||||||
|
about: "Submit a pull request"
|
||||||
|
labels:
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
<!--
|
||||||
|
Please follow our contributing guidelines first:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CONTRIBUTING.md#how-you-can-help-as-a-programmer
|
||||||
|
|
||||||
|
By submitting this pull request, you agree to follow our Code of Conduct:
|
||||||
|
https://git.minetest.land/MineClone2/MineClone2/src/branch/master/CODE_OF_CONDUCT.md
|
||||||
|
-->
|
||||||
|
|
||||||
|
Tell us about your pull request! Reference related issues, if necessary
|
||||||
|
|
||||||
|
### Testing
|
||||||
|
Tell us how to test your changes!
|
|
@ -4,3 +4,4 @@
|
||||||
*.blend2
|
*.blend2
|
||||||
*.blend3
|
*.blend3
|
||||||
/.idea/
|
/.idea/
|
||||||
|
*.xcf
|
1
API.md
|
@ -41,6 +41,7 @@ A lot of things are possible by using one of the APIs in the mods. Note that not
|
||||||
* Beds: `ITEMS/mcl_beds`
|
* Beds: `ITEMS/mcl_beds`
|
||||||
* Buckets: `ITEMS/mcl_buckets`
|
* Buckets: `ITEMS/mcl_buckets`
|
||||||
* Dispenser support: `ITEMS/REDSTONE/mcl_dispensers`
|
* Dispenser support: `ITEMS/REDSTONE/mcl_dispensers`
|
||||||
|
* Campfires: `ITEMS/mcl_campfires`
|
||||||
|
|
||||||
### Mobs
|
### Mobs
|
||||||
* Mobs: `ENTITIES/mcl_mobs`
|
* Mobs: `ENTITIES/mcl_mobs`
|
||||||
|
|
|
@ -60,7 +60,7 @@ representative at an online or offline event.
|
||||||
|
|
||||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
Instances of abusive, harassing, or otherwise unacceptable behavior may be
|
||||||
reported to the community leaders responsible for enforcement at
|
reported to the community leaders responsible for enforcement at
|
||||||
eliasfleckenstein@web.de.
|
ancientmariner_dev@proton.me.
|
||||||
All complaints will be reviewed and investigated promptly and fairly.
|
All complaints will be reviewed and investigated promptly and fairly.
|
||||||
|
|
||||||
All community leaders are obligated to respect the privacy and security of the
|
All community leaders are obligated to respect the privacy and security of the
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
So you want to contribute to MineClone2?
|
So you want to contribute to MineClone2?
|
||||||
Wow, thank you! :-)
|
Wow, thank you! :-)
|
||||||
|
|
||||||
MineClone2 is maintained by Nicu and Cora. If you have any
|
MineClone2 is maintained by AncientMariner and Nicu. If you have any
|
||||||
problems or questions, contact us (See Links section below).
|
problems or questions, contact us on Discord/Matrix (See Links section below).
|
||||||
|
|
||||||
You can help with MineClone2's development in many different ways,
|
You can help with MineClone2's development in many different ways,
|
||||||
whether you're a programmer or not.
|
whether you're a programmer or not.
|
||||||
|
@ -240,7 +240,7 @@ work causes problems, we ask you fix the issues as soon as possible.
|
||||||
|
|
||||||
### Changing Gameplay
|
### Changing Gameplay
|
||||||
Pull Requests that change gameplay have to be properly researched and
|
Pull Requests that change gameplay have to be properly researched and
|
||||||
need to state their sources. These PRs also need Fleckenstein's approval
|
need to state their sources. These PRs also need the maintainer's approval
|
||||||
before they are merged.
|
before they are merged.
|
||||||
You can use these sources:
|
You can use these sources:
|
||||||
|
|
||||||
|
@ -375,7 +375,7 @@ merged.
|
||||||
- Resolving conflicts and problems within the community
|
- Resolving conflicts and problems within the community
|
||||||
|
|
||||||
#### Current maintainers
|
#### Current maintainers
|
||||||
* Cora - responsible for gameplay review, publishing releases,
|
* AncientMariner - responsible for gameplay review, publishing releases,
|
||||||
technical guidelines
|
technical guidelines
|
||||||
* Nicu - responsible for community related issues
|
* Nicu - responsible for community related issues
|
||||||
|
|
||||||
|
|
25
CREDITS.md
|
@ -8,12 +8,13 @@
|
||||||
|
|
||||||
|
|
||||||
## Maintainers
|
## Maintainers
|
||||||
|
* AncientMariner
|
||||||
* Nicu
|
* Nicu
|
||||||
* cora
|
|
||||||
|
|
||||||
## Previous Maintainers
|
## Previous Maintainers
|
||||||
* Fleckenstein
|
* Fleckenstein
|
||||||
* jordan4ibanez
|
* jordan4ibanez
|
||||||
|
* cora
|
||||||
|
|
||||||
## Developers
|
## Developers
|
||||||
* bzoss
|
* bzoss
|
||||||
|
@ -34,6 +35,8 @@
|
||||||
* SumianVoice
|
* SumianVoice
|
||||||
* MrRar
|
* MrRar
|
||||||
* talamh
|
* talamh
|
||||||
|
* Faerraven / Michieal
|
||||||
|
* FossFanatic
|
||||||
|
|
||||||
## Contributors
|
## Contributors
|
||||||
* Laurent Rocher
|
* Laurent Rocher
|
||||||
|
@ -89,6 +92,17 @@
|
||||||
* FossFanatic
|
* FossFanatic
|
||||||
* Herbert West
|
* Herbert West
|
||||||
* GuyLiner
|
* GuyLiner
|
||||||
|
* 3raven
|
||||||
|
* anarquimico
|
||||||
|
* TheOnlyJoeEnderman
|
||||||
|
* Ranko Saotome
|
||||||
|
* Gregor Parzefall
|
||||||
|
* Wbjitscool
|
||||||
|
* b3nderman
|
||||||
|
* CyberMango
|
||||||
|
* gldrk
|
||||||
|
* SmokeyDope
|
||||||
|
* atomdmac
|
||||||
|
|
||||||
## MineClone5
|
## MineClone5
|
||||||
* kay27
|
* kay27
|
||||||
|
@ -140,11 +154,13 @@
|
||||||
* jordan4ibanez
|
* jordan4ibanez
|
||||||
* paramat
|
* paramat
|
||||||
* cora
|
* cora
|
||||||
|
* Faerraven / Michieal
|
||||||
|
|
||||||
## 3D Models
|
## 3D Models
|
||||||
* 22i
|
* 22i
|
||||||
* tobyplowy
|
* tobyplowy
|
||||||
* epCode
|
* epCode
|
||||||
|
* Faerraven / Michieal
|
||||||
|
|
||||||
## Textures
|
## Textures
|
||||||
* XSSheep
|
* XSSheep
|
||||||
|
@ -158,6 +174,8 @@
|
||||||
* MysticTempest
|
* MysticTempest
|
||||||
* RandomLegoBrick
|
* RandomLegoBrick
|
||||||
* cora
|
* cora
|
||||||
|
* Faerraven / Michieal
|
||||||
|
* Nicu
|
||||||
|
|
||||||
## Translations
|
## Translations
|
||||||
* Wuzzy
|
* Wuzzy
|
||||||
|
@ -171,9 +189,13 @@
|
||||||
* Emojigit
|
* Emojigit
|
||||||
* snowyu
|
* snowyu
|
||||||
* 3raven
|
* 3raven
|
||||||
|
* SakuraRiu
|
||||||
|
* anarquimico
|
||||||
|
|
||||||
## Funders
|
## Funders
|
||||||
* 40W
|
* 40W
|
||||||
|
* bauknecht
|
||||||
|
* Cora
|
||||||
|
|
||||||
## Special thanks
|
## Special thanks
|
||||||
* celeron55 for creating Minetest
|
* celeron55 for creating Minetest
|
||||||
|
@ -181,3 +203,4 @@
|
||||||
* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
|
* wsor for working tirelessly in the shadows for the good of all of us, particularly helping with solving contentDB and copyright issues.
|
||||||
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
|
* The workaholics who spent way too much time writing for the Minecraft Wiki. It's an invaluable resource for creating this game
|
||||||
* Notch and Jeb for being the major forces behind Minecraft
|
* Notch and Jeb for being the major forces behind Minecraft
|
||||||
|
* Dark Reaven Music (https://soundcloud.com/dark-reaven-music) for the main menu theme (Calmed Cube), which is licensed under https://creativecommons.org/licenses/by-sa/3.0/
|
||||||
|
|
|
@ -74,6 +74,8 @@ Please read <http://minecraft.gamepedia.com/Breaking> to learn how digging times
|
||||||
* `coral_species=X`: Specifies the species of a coral; equal X means equal species
|
* `coral_species=X`: Specifies the species of a coral; equal X means equal species
|
||||||
* `set_on_fire=X`: Sets any (not fire-resistant) mob or player on fire for X seconds when touching
|
* `set_on_fire=X`: Sets any (not fire-resistant) mob or player on fire for X seconds when touching
|
||||||
* `compostability=X`: Item can be used on a composter block; X (1-100) is the % chance of adding a level of compost
|
* `compostability=X`: Item can be used on a composter block; X (1-100) is the % chance of adding a level of compost
|
||||||
|
* `leaves=X`: Node will spotaneously decay if no tree trunk nodes remain within 6 blocks distance.
|
||||||
|
* `leaves_orphan`: See above, these nodes are in the process of decayed.
|
||||||
|
|
||||||
#### Footnotes
|
#### Footnotes
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
Survive, farm, build, explore, play with friends, and do much more. Inspired by a well known block game, pushing beyond.
|
||||||
|
|
||||||
|
How to play:
|
||||||
|
|
||||||
|
#### Download Minetest
|
||||||
|
- Navigate to https://www.minetest.net/ to download the client.
|
||||||
|
- Once installed, open and select the "Content" tab
|
||||||
|
|
||||||
|
#### Install MineClone2 from ContentDB
|
||||||
|
- Click "Browse Online Content" and filter by Games (select "Games" from the dropdown box)
|
||||||
|
- Find "MineClone2" (should be first on the list or on the first page)
|
||||||
|
- Click the [+] button next to MineClone2 and wait for download to finish
|
||||||
|
- Click "Back to Main Menu"
|
||||||
|
|
||||||
|
#### Create new world and play
|
||||||
|
- Click "Start Game" tab
|
||||||
|
- At the bottom click the MineClone2 icon (the 2 dirt with grass blocks)
|
||||||
|
- Click "New", give your world a name
|
||||||
|
- You can leave seed blank or put in a word of your choice
|
||||||
|
- Select your new world
|
||||||
|
- Click "Play Game" and enjoy!
|
|
@ -2,8 +2,6 @@
|
||||||
An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
|
An unofficial Minecraft-like game for Minetest. Forked from MineClone by davedevils.
|
||||||
Developed by many people. Not developed or endorsed by Mojang AB.
|
Developed by many people. Not developed or endorsed by Mojang AB.
|
||||||
|
|
||||||
Version: 0.81 (in development)
|
|
||||||
|
|
||||||
### Gameplay
|
### Gameplay
|
||||||
You start in a randomly-generated world made entirely of cubes. You can explore
|
You start in a randomly-generated world made entirely of cubes. You can explore
|
||||||
the world and dig and build almost every block in the world to create new
|
the world and dig and build almost every block in the world to create new
|
||||||
|
@ -158,7 +156,7 @@ The following features are incomplete:
|
||||||
|
|
||||||
* Some monsters and animals
|
* Some monsters and animals
|
||||||
* Redstone-related things
|
* Redstone-related things
|
||||||
* Special minecarts
|
* Some special minecarts (hopper and chest minecarts work)
|
||||||
* A couple of non-trivial blocks and items
|
* A couple of non-trivial blocks and items
|
||||||
|
|
||||||
Bonus features (not found in Minecraft):
|
Bonus features (not found in Minecraft):
|
||||||
|
|
|
@ -0,0 +1,75 @@
|
||||||
|
### Standard Release
|
||||||
|
|
||||||
|
#File to document release steps with a view to evolving into a script
|
||||||
|
|
||||||
|
#Update CREDITS.md
|
||||||
|
#Update version in game.conf
|
||||||
|
|
||||||
|
lua tools/generate_ingame_credits.lua
|
||||||
|
|
||||||
|
git add CREDITS.md
|
||||||
|
git add mods/HUD/mcl_credits/people.lua
|
||||||
|
git add game.conf
|
||||||
|
|
||||||
|
#git add RELEASE.md
|
||||||
|
|
||||||
|
git commit -m "Pre-release update credits and set version 0.82.0"
|
||||||
|
|
||||||
|
git tag 0.82.0
|
||||||
|
|
||||||
|
git push origin 0.82.0
|
||||||
|
|
||||||
|
#Update version in game.conf to -SNAPSHOT
|
||||||
|
|
||||||
|
git commit -m "Post-release set version 0.82.0-SNAPSHOT"
|
||||||
|
|
||||||
|
### Hotfix Release
|
||||||
|
|
||||||
|
##### Prepare release branch
|
||||||
|
|
||||||
|
When hotfixing, you should never release new features. Any new code increases risk of new bugs which has additional testing/release concerns.
|
||||||
|
To mitigate this, you just release the last release, and the relevant bug fix. For this, we do the following:
|
||||||
|
|
||||||
|
* Create release branch from the last release tag, push it:
|
||||||
|
|
||||||
|
git checkout -b release/0.82.1 0.82.0
|
||||||
|
|
||||||
|
git push origin release/0.82.1
|
||||||
|
|
||||||
|
##### Prepare feature branch and fix
|
||||||
|
|
||||||
|
* Create feature branch from that release branch (can review it to check only fix is there, nothing else, and use to also merge into master separately)
|
||||||
|
|
||||||
|
git checkout -b hotfix_bug_1_branch
|
||||||
|
|
||||||
|
* Fix crash/serious bug and commit
|
||||||
|
* Push branch and create pr to the release and also the master branch (Do not rebase, to reduce merge conflict risk. Do not delete after first merge or it needs to be repushed)
|
||||||
|
|
||||||
|
##### Update version and tag the release
|
||||||
|
|
||||||
|
* After all fixes are in release branch, pull it locally (best to avoid a merge conflict as feature branch will need to be merged into master also, which already changed version):
|
||||||
|
|
||||||
|
* Update version in game.conf to hotfix version and commit it. Example: version=0.82.1
|
||||||
|
|
||||||
|
* Tag it, push tag and branch:
|
||||||
|
|
||||||
|
git tag 0.82.1
|
||||||
|
|
||||||
|
git push origin 0.82.1
|
||||||
|
|
||||||
|
git push origin release/0.82.1
|
||||||
|
|
||||||
|
Note: If you have to do more than 1 hotfix release, can do it on the same release branch.
|
||||||
|
|
||||||
|
### Release via ContentDB
|
||||||
|
|
||||||
|
* Go to MineClone2 page (https://content.minetest.net/packages/Wuzzy/mineclone2/)
|
||||||
|
* Click +Release
|
||||||
|
* Enter the release tag number in the title and Git reference box. For example (without quotes): "0.82.1"
|
||||||
|
* In the minimum minetest version, put the oldest supported version (as of 14/02/2023 it is 5.5), leave the Maximum minetest version blank
|
||||||
|
* Click save. Release is now live.
|
||||||
|
|
||||||
|
##### Inform people
|
||||||
|
|
||||||
|
* Add a comment to the forum post with the release number and what is involved, and maintainer will update main post.
|
||||||
|
* Add a comment in Discord announcement
|
|
@ -1,2 +1,4 @@
|
||||||
title = MineClone 2
|
title = MineClone 2
|
||||||
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
|
description = A survival sandbox game. Survive, gather, hunt, build, explore, and do much more.
|
||||||
|
disallowed_mapgens = v6
|
||||||
|
version=0.82.0-SNAPSHOT
|
After Width: | Height: | Size: 83 KiB |
After Width: | Height: | Size: 1.1 MiB |
After Width: | Height: | Size: 990 KiB |
After Width: | Height: | Size: 1.3 MiB |
After Width: | Height: | Size: 1.1 MiB |
After Width: | Height: | Size: 1.7 MiB |
After Width: | Height: | Size: 1.3 MiB |
After Width: | Height: | Size: 1.6 MiB |
After Width: | Height: | Size: 2.0 MiB |
After Width: | Height: | Size: 865 KiB |
After Width: | Height: | Size: 916 KiB |
After Width: | Height: | Size: 606 KiB |
BIN
menu/footer.png
Before Width: | Height: | Size: 628 B After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 82 KiB |
After Width: | Height: | Size: 81 KiB |
After Width: | Height: | Size: 82 KiB |
BIN
menu/header.png
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 82 KiB |
Before Width: | Height: | Size: 68 KiB |
Before Width: | Height: | Size: 119 KiB |
Before Width: | Height: | Size: 121 KiB |
Before Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 122 KiB |
BIN
menu/overlay.png
Before Width: | Height: | Size: 91 KiB |
|
@ -204,7 +204,7 @@ end
|
||||||
|
|
||||||
-- Checks if the given node would drop its useful drop if dug by a given tool.
|
-- Checks if the given node would drop its useful drop if dug by a given tool.
|
||||||
-- Returns true if it will yield its useful drop, false otherwise.
|
-- Returns true if it will yield its useful drop, false otherwise.
|
||||||
function mcl_autogroup.can_harvest(nodename, toolname)
|
function mcl_autogroup.can_harvest(nodename, toolname, player)
|
||||||
local ndef = minetest.registered_nodes[nodename]
|
local ndef = minetest.registered_nodes[nodename]
|
||||||
|
|
||||||
if not ndef then
|
if not ndef then
|
||||||
|
@ -228,7 +228,9 @@ function mcl_autogroup.can_harvest(nodename, toolname)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check if it can be dug by hand
|
-- Check if it can be dug by hand
|
||||||
local tdef = minetest.registered_tools[""]
|
if not player or not player:is_player() then return false end
|
||||||
|
local name = player:get_inventory():get_stack("hand", 1):get_name()
|
||||||
|
local tdef = minetest.registered_items[name]
|
||||||
if tdef then
|
if tdef then
|
||||||
for g, gdef in pairs(tdef._mcl_diggroups) do
|
for g, gdef in pairs(tdef._mcl_diggroups) do
|
||||||
if ndef.groups[g] then
|
if ndef.groups[g] then
|
||||||
|
@ -260,7 +262,7 @@ local function get_tool_capabilities(tdef)
|
||||||
|
|
||||||
-- If the damage group and punch interval from hand is not included,
|
-- If the damage group and punch interval from hand is not included,
|
||||||
-- then the user will not be able to attack with the tool.
|
-- then the user will not be able to attack with the tool.
|
||||||
local hand_toolcaps = minetest.registered_tools[""].tool_capabilities
|
local hand_toolcaps = mcl_meshhand.survival_hand_tool_caps
|
||||||
return {
|
return {
|
||||||
full_punch_interval = hand_toolcaps.full_punch_interval,
|
full_punch_interval = hand_toolcaps.full_punch_interval,
|
||||||
damage_groups = hand_toolcaps.damage_groups
|
damage_groups = hand_toolcaps.damage_groups
|
||||||
|
@ -280,7 +282,7 @@ end
|
||||||
-- would have to add _mcl_autogroup as a dependency which would break the mod
|
-- would have to add _mcl_autogroup as a dependency which would break the mod
|
||||||
-- loading order.
|
-- loading order.
|
||||||
function mcl_autogroup.get_groupcaps(toolname, efficiency)
|
function mcl_autogroup.get_groupcaps(toolname, efficiency)
|
||||||
local tdef = minetest.registered_tools[toolname]
|
local tdef = minetest.registered_items[toolname]
|
||||||
local groupcaps = table.copy(get_tool_capabilities(tdef).groupcaps or {})
|
local groupcaps = table.copy(get_tool_capabilities(tdef).groupcaps or {})
|
||||||
add_groupcaps(toolname, groupcaps, tdef._mcl_diggroups, efficiency)
|
add_groupcaps(toolname, groupcaps, tdef._mcl_diggroups, efficiency)
|
||||||
return groupcaps
|
return groupcaps
|
||||||
|
@ -350,7 +352,7 @@ local function overwrite()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
for tname, tdef in pairs(minetest.registered_tools) do
|
for tname, tdef in pairs(minetest.registered_items) do
|
||||||
-- Assign groupcaps for digging the registered digging groups
|
-- Assign groupcaps for digging the registered digging groups
|
||||||
-- depending on the _mcl_diggroups in the tool definition
|
-- depending on the _mcl_diggroups in the tool definition
|
||||||
if tdef._mcl_diggroups then
|
if tdef._mcl_diggroups then
|
||||||
|
@ -360,6 +362,12 @@ local function overwrite()
|
||||||
minetest.override_item(tname, {
|
minetest.override_item(tname, {
|
||||||
tool_capabilities = toolcaps
|
tool_capabilities = toolcaps
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
-- This is needed to deal damage when punching mobs
|
||||||
|
-- with random items in hand in survival mode
|
||||||
|
minetest.override_item(tname, {
|
||||||
|
tool_capabilities = mcl_meshhand.survival_hand_tool_caps
|
||||||
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
# mcl_autogroup
|
# mcl_autogroup
|
||||||
This mod emulate digging times from mc.
|
This mod emulate digging times from mc.
|
||||||
|
|
||||||
## mcl_autogroup.can_harvest(nodename, toolname)
|
## mcl_autogroup.can_harvest(nodename, toolname, player)
|
||||||
Return true if <nodename> can be dig with <toolname>.
|
Return true if <nodename> can be dig with <toolname> by <player>.
|
||||||
* nodename: string, valid nodename
|
* nodename: string, valid nodename
|
||||||
* toolname: (optional) string, valid toolname
|
* toolname: (optional) string, valid toolname
|
||||||
|
* player: (optinal) ObjectRef, valid player
|
||||||
|
|
||||||
## mcl_autogroup.get_groupcaps(toolname, efficiency)
|
## mcl_autogroup.get_groupcaps(toolname, efficiency)
|
||||||
This function is used to calculate diggroups for tools.
|
This function is used to calculate diggroups for tools.
|
||||||
|
|
|
@ -155,7 +155,6 @@ end, true)
|
||||||
minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
|
minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
|
||||||
if not damage_enabled then return 0 end
|
if not damage_enabled then return 0 end
|
||||||
if player:get_hp() > 0 then
|
if player:get_hp() > 0 then
|
||||||
mt_reason.approved = true
|
|
||||||
if hp_change < 0 then
|
if hp_change < 0 then
|
||||||
mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason))
|
mcl_damage.run_damage_callbacks(player, -hp_change, mcl_damage.from_mt(mt_reason))
|
||||||
end
|
end
|
||||||
|
@ -163,9 +162,7 @@ minetest.register_on_player_hpchange(function(player, hp_change, mt_reason)
|
||||||
end, false)
|
end, false)
|
||||||
|
|
||||||
minetest.register_on_dieplayer(function(player, mt_reason)
|
minetest.register_on_dieplayer(function(player, mt_reason)
|
||||||
if mt_reason.approved then
|
mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
|
||||||
mcl_damage.run_death_callbacks(player, mcl_damage.from_mt(mt_reason))
|
|
||||||
end
|
|
||||||
minetest.log("action","Player "..player:get_player_name().." died at "..minetest.pos_to_string(vector.round(player:get_pos())))
|
minetest.log("action","Player "..player:get_player_name().." died at "..minetest.pos_to_string(vector.round(player:get_pos())))
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
## mcl_events
|
||||||
|
### Registering Events
|
||||||
|
`mlc_events.register_event("name",def)`
|
||||||
|
|
||||||
|
#### Event Definition
|
||||||
|
{
|
||||||
|
stage = 0,
|
||||||
|
max_stage = 1,
|
||||||
|
percent = 100,
|
||||||
|
bars = {},
|
||||||
|
completed = false,
|
||||||
|
cond_start = function() end,
|
||||||
|
--return table of paramtables e.g. { { player = playername, pos = position, ... } }, custom parameters will be passed to the event object/table
|
||||||
|
on_step = function(event) end,
|
||||||
|
--this function is run every game step when the event is active
|
||||||
|
on_start = function(event) end,
|
||||||
|
-- this function is run when the event starts
|
||||||
|
on_stage_begin = function(event) end,
|
||||||
|
-- this function runs when a new stage of the event starts
|
||||||
|
cond_progress = function(event) end, --return false or next stage id
|
||||||
|
--this function checks if the event should progress to the next (or any other) stage
|
||||||
|
cond_complete = function(event) end,
|
||||||
|
--return true if event finished successfully
|
||||||
|
}
|
||||||
|
|
||||||
|
### Debugging
|
||||||
|
* /event_start <event> -- starts the given event at the current player coordinates
|
|
@ -0,0 +1,155 @@
|
||||||
|
mcl_events = {}
|
||||||
|
mcl_events.registered_events = {}
|
||||||
|
local disabled_events = minetest.settings:get("mcl_disabled_events")
|
||||||
|
if disabled_events then disabled_events = disabled_events:split(",")
|
||||||
|
else disabled_events = {} end
|
||||||
|
local DBG = minetest.settings:get_bool("mcl_logging_event_api",false)
|
||||||
|
local active_events = {}
|
||||||
|
|
||||||
|
local event_tpl = {
|
||||||
|
stage = 0,
|
||||||
|
max_stage = 1,
|
||||||
|
percent = 100,
|
||||||
|
bars = {},
|
||||||
|
completed = false,
|
||||||
|
cond_start = function(event) end, --return table of positions
|
||||||
|
on_step = function(event) end,
|
||||||
|
on_start = function(event) end,
|
||||||
|
on_stage_begin = function(event) end,
|
||||||
|
cond_progress = function(event) end, --return next stage
|
||||||
|
cond_complete = function(event) end, --return success
|
||||||
|
}
|
||||||
|
|
||||||
|
local function mcl_log(m,l)
|
||||||
|
if DBG then
|
||||||
|
if not l then l = "action" end
|
||||||
|
minetest.log(l,"[mcl_events] "..m)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
function mcl_events.register_event(name,def)
|
||||||
|
if table.indexof(disabled_events,name) ~= -1 then return end
|
||||||
|
mcl_events.registered_events[name] = def
|
||||||
|
mcl_events.registered_events[name].name = name
|
||||||
|
end
|
||||||
|
|
||||||
|
local function addbars(self)
|
||||||
|
if not self.enable_bossbar then return end
|
||||||
|
for _,player in pairs(minetest.get_connected_players()) do
|
||||||
|
if vector.distance(self.pos,player:get_pos()) < 64 then
|
||||||
|
local bar = mcl_bossbars.add_bar(player, {color = "red", text = self.readable_name .. ": Wave "..self.stage.." / "..self.max_stage, percentage = self.percent }, true,1)
|
||||||
|
table.insert(self.bars,bar)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function start_event(p,e)
|
||||||
|
mcl_log("[mcl_events] Event started: "..e.readable_name.." at "..minetest.pos_to_string(vector.round(p.pos)))
|
||||||
|
local idx = #active_events + 1
|
||||||
|
active_events[idx] = table.copy(e)
|
||||||
|
setmetatable(active_events[idx],{__index = event_tpl})
|
||||||
|
for k,v in pairs(p) do active_events[idx][k] = v end
|
||||||
|
active_events[idx].stage = 0
|
||||||
|
active_events[idx].percent = 100
|
||||||
|
active_events[idx].bars = {}
|
||||||
|
active_events[idx].time_start = os.time()
|
||||||
|
if active_events[idx].on_start then
|
||||||
|
active_events[idx]:on_start(p.pos)
|
||||||
|
end
|
||||||
|
addbars(active_events[idx])
|
||||||
|
end
|
||||||
|
|
||||||
|
local function finish_event(self,idx)
|
||||||
|
mcl_log("[mcl_events] Finished: "..self.readable_name.." at "..minetest.pos_to_string(vector.round(self.pos)))
|
||||||
|
if self.on_complete then self:on_complete() end
|
||||||
|
for _,b in pairs(self.bars) do
|
||||||
|
mcl_bossbars.remove_bar(b)
|
||||||
|
end
|
||||||
|
table.remove(active_events,idx)
|
||||||
|
end
|
||||||
|
|
||||||
|
local etime = 0
|
||||||
|
function check_events(dtime)
|
||||||
|
--process active events
|
||||||
|
for idx,ae in pairs(active_events) do
|
||||||
|
if ae.cond_complete and ae:cond_complete() then
|
||||||
|
ae.finished = true
|
||||||
|
finish_event(ae,idx)
|
||||||
|
elseif not ae.cond_complete and ae.max_stage and ae.max_stage <= ae.stage then
|
||||||
|
ae.finished = true
|
||||||
|
finish_event(ae,idx)
|
||||||
|
elseif not ae.finished and ae.cond_progress then
|
||||||
|
local p = ae:cond_progress()
|
||||||
|
if p == true then
|
||||||
|
ae.stage = ae.stage + 1
|
||||||
|
if ae:on_stage_begin() == true then
|
||||||
|
mcl_log("[mcl_events] Event "..ae.readable_name.." at "..minetest.pos_to_string(vector.round(ae.pos)).." failed at stage_begin of stage "..ae.stage )
|
||||||
|
active_events[idx] = nil
|
||||||
|
end
|
||||||
|
elseif tonumber(p) then
|
||||||
|
ae.stage = tonumber(p) or ae.stage + 1
|
||||||
|
ae:on_stage_begin()
|
||||||
|
end
|
||||||
|
elseif not ae.finished and ae.on_step then
|
||||||
|
ae:on_step(dtime)
|
||||||
|
end
|
||||||
|
addbars(ae)
|
||||||
|
end
|
||||||
|
-- check if a new event should be started
|
||||||
|
etime = etime - dtime
|
||||||
|
if etime > 0 then return end
|
||||||
|
etime = 10
|
||||||
|
for _,e in pairs(mcl_events.registered_events) do
|
||||||
|
local pp = e.cond_start()
|
||||||
|
if pp then
|
||||||
|
--minetest.log("It's gonna start the raid maybe")
|
||||||
|
for _,p in pairs(pp) do
|
||||||
|
local start = true
|
||||||
|
if e.exclusive_to_area then
|
||||||
|
for _,ae in pairs(active_events) do
|
||||||
|
if e.name == ae.name and vector.distance(p.pos,ae.pos) < e.exclusive_to_area then start = false end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if start then
|
||||||
|
--minetest.log("It's gonna start the raid definitely")
|
||||||
|
start_event(p,e)
|
||||||
|
elseif DBG then
|
||||||
|
mcl_log("[mcl_events] Event "..e.readable_name.." already active at "..minetest.pos_to_string(vector.round(p.pos)))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
else
|
||||||
|
--minetest.log("Do not start this raid")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
for idx,ae in pairs(active_events) do
|
||||||
|
local player_near = false
|
||||||
|
for _,pl in pairs(minetest.get_connected_players()) do
|
||||||
|
if ae.pos and vector.distance(pl:get_pos(),ae.pos) < 64 then player_near = true end
|
||||||
|
end
|
||||||
|
if ae.pos and not player_near then
|
||||||
|
mcl_log("[mcl_events] Event "..ae.readable_name.." at "..minetest.pos_to_string(vector.round(ae.pos)).." aborted - no players near." )
|
||||||
|
active_events[idx] = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.register_globalstep(check_events)
|
||||||
|
|
||||||
|
mcl_info.register_debug_field("Active Events",{
|
||||||
|
level = 4,
|
||||||
|
func = function(pl,pos)
|
||||||
|
return tostring(#active_events)
|
||||||
|
end
|
||||||
|
})
|
||||||
|
|
||||||
|
minetest.register_chatcommand("event_start",{
|
||||||
|
privs = {debug = true},
|
||||||
|
description = "Debug command to start events",
|
||||||
|
func = function(pname,param)
|
||||||
|
local p = minetest.get_player_by_name(pname)
|
||||||
|
local evdef = mcl_events.registered_events[param]
|
||||||
|
if not evdef then return false,"Event "..param.." doesn't exist.'" end
|
||||||
|
start_event({pos=p:get_pos(),player=pname,factor=1},evdef)
|
||||||
|
return true,"Started event "..param
|
||||||
|
end,
|
||||||
|
})
|
|
@ -0,0 +1,3 @@
|
||||||
|
name = mcl_events
|
||||||
|
author = cora
|
||||||
|
depends = mcl_mobs,mcl_bossbars, mcl_info
|
|
@ -0,0 +1,2 @@
|
||||||
|
# textdomain:mcl_explosions
|
||||||
|
@1 was caught in an explosion.=@1は爆発に巻き込まれた。
|
|
@ -3,26 +3,26 @@ mcl_vars = {}
|
||||||
|
|
||||||
mcl_vars.redstone_tick = 0.1
|
mcl_vars.redstone_tick = 0.1
|
||||||
|
|
||||||
--- GUI / inventory menu settings
|
-- GUI / inventory menu settings
|
||||||
mcl_vars.gui_slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]"
|
mcl_vars.gui_slots = "listcolors[#9990;#FFF7;#FFF0;#000;#FFF]"
|
||||||
|
|
||||||
-- nonbg is added as formspec prepend in mcl_formspec_prepend
|
-- nonbg is added as formspec prepend in mcl_formspec_prepend
|
||||||
mcl_vars.gui_nonbg = mcl_vars.gui_slots ..
|
mcl_vars.gui_nonbg = table.concat({
|
||||||
"style_type[image_button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]"..
|
mcl_vars.gui_slots,
|
||||||
"style_type[button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]"..
|
"style_type[image_button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]",
|
||||||
"style_type[field;textcolor=#323232]"..
|
"style_type[button;border=false;bgimg=mcl_inventory_button9.png;bgimg_pressed=mcl_inventory_button9_pressed.png;bgimg_middle=2,2]",
|
||||||
"style_type[label;textcolor=#323232]"..
|
"style_type[field;textcolor=#323232]",
|
||||||
"style_type[textarea;textcolor=#323232]"..
|
"style_type[label;textcolor=#323232]",
|
||||||
"style_type[checkbox;textcolor=#323232]"
|
"style_type[textarea;textcolor=#323232]",
|
||||||
|
"style_type[checkbox;textcolor=#323232]",
|
||||||
|
})
|
||||||
|
|
||||||
-- Background stuff must be manually added by mods (no formspec prepend)
|
-- Background stuff must be manually added by mods (no formspec prepend)
|
||||||
mcl_vars.gui_bg_color = "bgcolor[#00000000]"
|
mcl_vars.gui_bg_color = "bgcolor[#00000000]"
|
||||||
mcl_vars.gui_bg_img = "background9[1,1;1,1;mcl_base_textures_background9.png;true;7]"
|
mcl_vars.gui_bg_img = "background9[1,1;1,1;mcl_base_textures_background9.png;true;7]"
|
||||||
|
|
||||||
-- Legacy
|
|
||||||
mcl_vars.inventory_header = ""
|
|
||||||
|
|
||||||
-- Tool wield size
|
-- Tool wield size
|
||||||
mcl_vars.tool_wield_scale = { x = 1.8, y = 1.8, z = 1 }
|
mcl_vars.tool_wield_scale = vector.new(1.8, 1.8, 1)
|
||||||
|
|
||||||
-- Mapgen variables
|
-- Mapgen variables
|
||||||
local mg_name = minetest.get_mapgen_setting("mg_name")
|
local mg_name = minetest.get_mapgen_setting("mg_name")
|
||||||
|
@ -35,55 +35,69 @@ mcl_vars.chunksize = math.max(1, tonumber(minetest.get_mapgen_setting("chunksize
|
||||||
mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
|
mcl_vars.MAP_BLOCKSIZE = math.max(1, minetest.MAP_BLOCKSIZE or 16)
|
||||||
mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
|
mcl_vars.mapgen_limit = math.max(1, tonumber(minetest.get_mapgen_setting("mapgen_limit")) or 31000)
|
||||||
mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
|
mcl_vars.MAX_MAP_GENERATION_LIMIT = math.max(1, minetest.MAX_MAP_GENERATION_LIMIT or 31000)
|
||||||
|
|
||||||
local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
|
local central_chunk_offset = -math.floor(mcl_vars.chunksize / 2)
|
||||||
|
|
||||||
mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
|
mcl_vars.central_chunk_offset_in_nodes = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
|
||||||
mcl_vars.chunk_size_in_nodes = mcl_vars.chunksize * mcl_vars.MAP_BLOCKSIZE
|
mcl_vars.chunk_size_in_nodes = mcl_vars.chunksize * mcl_vars.MAP_BLOCKSIZE
|
||||||
|
|
||||||
local central_chunk_min_pos = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
|
local central_chunk_min_pos = central_chunk_offset * mcl_vars.MAP_BLOCKSIZE
|
||||||
local central_chunk_max_pos = central_chunk_min_pos + mcl_vars.chunk_size_in_nodes - 1
|
local central_chunk_max_pos = central_chunk_min_pos + mcl_vars.chunk_size_in_nodes - 1
|
||||||
local ccfmin = central_chunk_min_pos - mcl_vars.MAP_BLOCKSIZE -- Fullminp/fullmaxp of central chunk, in nodes
|
local ccfmin = central_chunk_min_pos - mcl_vars.MAP_BLOCKSIZE -- Fullminp/fullmaxp of central chunk, in nodes
|
||||||
local ccfmax = central_chunk_max_pos + mcl_vars.MAP_BLOCKSIZE
|
local ccfmax = central_chunk_max_pos + mcl_vars.MAP_BLOCKSIZE
|
||||||
local mapgen_limit_b = math.floor(math.min(mcl_vars.mapgen_limit, mcl_vars.MAX_MAP_GENERATION_LIMIT) / mcl_vars.MAP_BLOCKSIZE)
|
local mapgen_limit_b = math.floor(math.min(mcl_vars.mapgen_limit, mcl_vars.MAX_MAP_GENERATION_LIMIT) /
|
||||||
|
mcl_vars.MAP_BLOCKSIZE)
|
||||||
local mapgen_limit_min = -mapgen_limit_b * mcl_vars.MAP_BLOCKSIZE
|
local mapgen_limit_min = -mapgen_limit_b * mcl_vars.MAP_BLOCKSIZE
|
||||||
local mapgen_limit_max = (mapgen_limit_b + 1) * mcl_vars.MAP_BLOCKSIZE - 1
|
local mapgen_limit_max = (mapgen_limit_b + 1) * mcl_vars.MAP_BLOCKSIZE - 1
|
||||||
local numcmin = math.max(math.floor((ccfmin - mapgen_limit_min) / mcl_vars.chunk_size_in_nodes), 0) -- Number of complete chunks from central chunk
|
local numcmin = math.max(math.floor((ccfmin - mapgen_limit_min) / mcl_vars.chunk_size_in_nodes), 0) -- Number of complete chunks from central chunk
|
||||||
local numcmax = math.max(math.floor((mapgen_limit_max - ccfmax) / mcl_vars.chunk_size_in_nodes), 0) -- fullminp/fullmaxp to effective mapgen limits.
|
local numcmax = math.max(math.floor((mapgen_limit_max - ccfmax) / mcl_vars.chunk_size_in_nodes), 0) -- fullminp/fullmaxp to effective mapgen limits.
|
||||||
|
|
||||||
mcl_vars.mapgen_edge_min = central_chunk_min_pos - numcmin * mcl_vars.chunk_size_in_nodes
|
mcl_vars.mapgen_edge_min = central_chunk_min_pos - numcmin * mcl_vars.chunk_size_in_nodes
|
||||||
mcl_vars.mapgen_edge_max = central_chunk_max_pos + numcmax * mcl_vars.chunk_size_in_nodes
|
mcl_vars.mapgen_edge_max = central_chunk_max_pos + numcmax * mcl_vars.chunk_size_in_nodes
|
||||||
|
|
||||||
|
---@param x integer
|
||||||
|
---@return integer
|
||||||
local function coordinate_to_block(x)
|
local function coordinate_to_block(x)
|
||||||
return math.floor(x / mcl_vars.MAP_BLOCKSIZE)
|
return math.floor(x / mcl_vars.MAP_BLOCKSIZE)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param x integer
|
||||||
|
---@return integer
|
||||||
local function coordinate_to_chunk(x)
|
local function coordinate_to_chunk(x)
|
||||||
return math.floor((coordinate_to_block(x) - central_chunk_offset) / mcl_vars.chunksize)
|
return math.floor((coordinate_to_block(x) - central_chunk_offset) / mcl_vars.chunksize)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param pos Vector
|
||||||
|
---@return Vector
|
||||||
function mcl_vars.pos_to_block(pos)
|
function mcl_vars.pos_to_block(pos)
|
||||||
return {
|
return vector.new(
|
||||||
x = coordinate_to_block(pos.x),
|
coordinate_to_block(pos.x),
|
||||||
y = coordinate_to_block(pos.y),
|
coordinate_to_block(pos.y),
|
||||||
z = coordinate_to_block(pos.z)
|
coordinate_to_block(pos.z)
|
||||||
}
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param pos Vector
|
||||||
|
---@return Vector
|
||||||
function mcl_vars.pos_to_chunk(pos)
|
function mcl_vars.pos_to_chunk(pos)
|
||||||
return {
|
return vector.new(
|
||||||
x = coordinate_to_chunk(pos.x),
|
coordinate_to_chunk(pos.x),
|
||||||
y = coordinate_to_chunk(pos.y),
|
coordinate_to_chunk(pos.y),
|
||||||
z = coordinate_to_chunk(pos.z)
|
coordinate_to_chunk(pos.z)
|
||||||
}
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
local k_positive = math.ceil(mcl_vars.MAX_MAP_GENERATION_LIMIT / mcl_vars.chunk_size_in_nodes)
|
local k_positive = math.ceil(mcl_vars.MAX_MAP_GENERATION_LIMIT / mcl_vars.chunk_size_in_nodes)
|
||||||
local k_positive_z = k_positive * 2
|
local k_positive_z = k_positive * 2
|
||||||
local k_positive_y = k_positive_z * k_positive_z
|
local k_positive_y = k_positive_z * k_positive_z
|
||||||
|
|
||||||
|
---@param pos Vector
|
||||||
|
---@return integer
|
||||||
function mcl_vars.get_chunk_number(pos) -- unsigned int
|
function mcl_vars.get_chunk_number(pos) -- unsigned int
|
||||||
local c = mcl_vars.pos_to_chunk(pos)
|
local c = mcl_vars.pos_to_chunk(pos)
|
||||||
return
|
return (c.y + k_positive) * k_positive_y +
|
||||||
(c.y + k_positive) * k_positive_y +
|
|
||||||
(c.z + k_positive) * k_positive_z +
|
(c.z + k_positive) * k_positive_z +
|
||||||
c.x + k_positive
|
c.x + k_positive
|
||||||
end
|
end
|
||||||
|
|
||||||
if not superflat and not singlenode then
|
if not superflat and not singlenode then
|
||||||
|
@ -117,11 +131,8 @@ elseif singlenode then
|
||||||
mcl_vars.mg_bedrock_is_rough = false
|
mcl_vars.mg_bedrock_is_rough = false
|
||||||
else
|
else
|
||||||
-- Classic superflat
|
-- Classic superflat
|
||||||
local ground = minetest.get_mapgen_setting("mgflat_ground_level")
|
local ground = tonumber(minetest.get_mapgen_setting("mgflat_ground_level")) or 8
|
||||||
ground = tonumber(ground)
|
|
||||||
if not ground then
|
|
||||||
ground = 8
|
|
||||||
end
|
|
||||||
mcl_vars.mg_overworld_min = ground - 3
|
mcl_vars.mg_overworld_min = ground - 3
|
||||||
mcl_vars.mg_overworld_max_official = mcl_vars.mg_overworld_min + minecraft_height_limit
|
mcl_vars.mg_overworld_max_official = mcl_vars.mg_overworld_min + minecraft_height_limit
|
||||||
mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
|
mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
|
||||||
|
@ -181,14 +192,16 @@ minetest.craftitemdef_default.stack_max = 64
|
||||||
math.randomseed(os.time())
|
math.randomseed(os.time())
|
||||||
|
|
||||||
local chunks = {} -- intervals of chunks generated
|
local chunks = {} -- intervals of chunks generated
|
||||||
|
|
||||||
|
---@param pos Vector
|
||||||
function mcl_vars.add_chunk(pos)
|
function mcl_vars.add_chunk(pos)
|
||||||
local n = mcl_vars.get_chunk_number(pos) -- unsigned int
|
local n = mcl_vars.get_chunk_number(pos) -- unsigned int
|
||||||
local prev
|
local prev
|
||||||
for i, d in pairs(chunks) do
|
for i, d in pairs(chunks) do
|
||||||
if n <= d[2] then -- we've found it
|
if n <= d[2] then -- we've found it
|
||||||
if (n == d[2]) or (n >= d[1]) then return end -- already here
|
if (n == d[2]) or (n >= d[1]) then return end -- already here
|
||||||
if n == d[1]-1 then -- right before:
|
if n == d[1] - 1 then -- right before:
|
||||||
if prev and (prev[2] == n-1) then
|
if prev and (prev[2] == n - 1) then
|
||||||
prev[2] = d[2]
|
prev[2] = d[2]
|
||||||
table.remove(chunks, i)
|
table.remove(chunks, i)
|
||||||
return
|
return
|
||||||
|
@ -196,17 +209,20 @@ function mcl_vars.add_chunk(pos)
|
||||||
d[1] = n
|
d[1] = n
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if prev and (prev[2] == n-1) then --join to previous
|
if prev and (prev[2] == n - 1) then --join to previous
|
||||||
prev[2] = n
|
prev[2] = n
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
table.insert(chunks, i, {n, n}) -- insert new interval before i
|
table.insert(chunks, i, { n, n }) -- insert new interval before i
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
prev = d
|
prev = d
|
||||||
end
|
end
|
||||||
chunks[#chunks+1] = {n, n}
|
chunks[#chunks + 1] = { n, n }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param pos Vector
|
||||||
|
---@return boolean
|
||||||
function mcl_vars.is_generated(pos)
|
function mcl_vars.is_generated(pos)
|
||||||
local n = mcl_vars.get_chunk_number(pos) -- unsigned int
|
local n = mcl_vars.get_chunk_number(pos) -- unsigned int
|
||||||
for i, d in pairs(chunks) do
|
for i, d in pairs(chunks) do
|
||||||
|
@ -217,47 +233,46 @@ function mcl_vars.is_generated(pos)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
-- "Trivial" (actually NOT) function to just read the node and some stuff to not just return "ignore", like mt 5.4 does.
|
---"Trivial" (actually NOT) function to just read the node and some stuff to not just return "ignore", like mt 5.4 does.
|
||||||
-- p: Position, if it's wrong, {name="error"} node will return.
|
---@param pos Vector Position, if it's wrong, `{name="error"}` node will return.
|
||||||
-- force: optional (default: false) - Do the maximum to still read the node within us_timeout.
|
---@param force? boolean Optional (default: `false`), Do the maximum to still read the node within us_timeout.
|
||||||
-- us_timeout: optional (default: 244 = 0.000244 s = 1/80/80/80), set it at least to 3000000 to let mapgen to finish its job.
|
---@param us_timeout? number Optional (default: `244 = 0.000244 s = 1/80/80/80`), set it at least to `3000000` to let mapgen to finish its job
|
||||||
--
|
---@return node # Node definition, eg. `{name="air"}`. Unfortunately still can return `{name="ignore"}`.
|
||||||
-- returns node definition, eg. {name="air"}. Unfortunately still can return {name="ignore"}.
|
---@nodiscard
|
||||||
function mcl_vars.get_node(p, force, us_timeout)
|
function mcl_vars.get_node(pos, force, us_timeout)
|
||||||
-- check initial circumstances
|
-- check initial circumstances
|
||||||
if not p or not p.x or not p.y or not p.z then return {name="error"} end
|
if not pos or not pos.x or not pos.y or not pos.z then return { name = "error" } end
|
||||||
|
|
||||||
-- try common way
|
-- try common way
|
||||||
local node = minetest.get_node(p)
|
local node = minetest.get_node(pos)
|
||||||
if node.name ~= "ignore" then
|
if node.name ~= "ignore" then
|
||||||
return node
|
return node
|
||||||
end
|
end
|
||||||
|
|
||||||
-- copy table to get sure it won't changed by other threads
|
-- copy vector to get sure it won't changed by other threads
|
||||||
local pos = {x=p.x,y=p.y,z=p.z}
|
local pos_copy = vector.copy(pos)
|
||||||
|
|
||||||
-- try LVM
|
-- try LVM
|
||||||
minetest.get_voxel_manip():read_from_map(pos, pos)
|
minetest.get_voxel_manip():read_from_map(pos_copy, pos_copy)
|
||||||
node = minetest.get_node(pos)
|
node = minetest.get_node(pos_copy)
|
||||||
if node.name ~= "ignore" or not force then
|
if node.name ~= "ignore" or not force then
|
||||||
return node
|
return node
|
||||||
end
|
end
|
||||||
|
|
||||||
-- all ways failed - need to emerge (or forceload if generated)
|
-- all ways failed - need to emerge (or forceload if generated)
|
||||||
local us_timeout = us_timeout or 244
|
if mcl_vars.is_generated(pos_copy) then
|
||||||
if mcl_vars.is_generated(pos) then
|
|
||||||
minetest.chat_send_all("IMPOSSIBLE! Please report this to MCL2 issue tracker!")
|
minetest.chat_send_all("IMPOSSIBLE! Please report this to MCL2 issue tracker!")
|
||||||
minetest.forceload_block(pos)
|
minetest.forceload_block(pos_copy)
|
||||||
else
|
else
|
||||||
minetest.emerge_area(pos, pos)
|
minetest.emerge_area(pos_copy, pos_copy)
|
||||||
end
|
end
|
||||||
|
|
||||||
local t = minetest.get_us_time()
|
local t = minetest.get_us_time()
|
||||||
|
|
||||||
node = minetest.get_node(pos)
|
node = minetest.get_node(pos_copy)
|
||||||
|
|
||||||
while (not node or node.name == "ignore") and (minetest.get_us_time() - t < us_timeout) do
|
while (not node or node.name == "ignore") and (minetest.get_us_time() - t < (us_timeout or 244)) do
|
||||||
node = minetest.get_node(pos)
|
node = minetest.get_node(pos_copy)
|
||||||
end
|
end
|
||||||
|
|
||||||
return node
|
return node
|
||||||
|
|
Before Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 126 B |
Before Width: | Height: | Size: 216 B |
Before Width: | Height: | Size: 1.1 KiB |
|
@ -11,42 +11,22 @@ Creative Commons Attribution 3.0 Unported (CC BY-SA 3.0)
|
||||||
http://creativecommons.org/licenses/by/3.0/
|
http://creativecommons.org/licenses/by/3.0/
|
||||||
|
|
||||||
Glass breaking sounds (CC BY 3.0):
|
Glass breaking sounds (CC BY 3.0):
|
||||||
1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
|
1: http://www.freesound.org/people/cmusounddesign/sounds/71947/
|
||||||
2: http://www.freesound.org/people/Tomlija/sounds/97669/
|
2: http://www.freesound.org/people/Tomlija/sounds/97669/
|
||||||
3: http://www.freesound.org/people/lsprice/sounds/88808/
|
3: http://www.freesound.org/people/lsprice/sounds/88808/
|
||||||
|
|
||||||
default_tool_breaks.ogg by EdgardEdition (CC BY 3.0), http://www.freesound.org/people/EdgardEdition
|
default_tool_breaks.ogg by EdgardEdition (CC BY 3.0), http://www.freesound.org/people/EdgardEdition
|
||||||
|
|
||||||
Mito551 (sounds) (CC BY-SA 3.0):
|
Mito551 (sounds) (CC BY-SA 3.0):
|
||||||
default_dig_choppy.ogg
|
default_dig_crumbly.ogg
|
||||||
default_dig_cracky.ogg
|
|
||||||
default_dig_crumbly.1.ogg
|
|
||||||
default_dig_crumbly.2.ogg
|
|
||||||
default_dig_oddly_breakable_by_hand.ogg
|
default_dig_oddly_breakable_by_hand.ogg
|
||||||
default_dug_node.1.ogg
|
default_dug_node.*.ogg
|
||||||
default_dug_node.2.ogg
|
default_grass_footstep.*.ogg
|
||||||
default_grass_footstep.1.ogg
|
default_gravel_footstep.*.ogg
|
||||||
default_grass_footstep.2.ogg
|
default_place_node.*.ogg
|
||||||
default_grass_footstep.3.ogg
|
default_place_node_hard.*.ogg
|
||||||
default_gravel_footstep.1.ogg
|
default_wood_footstep.*.ogg
|
||||||
default_gravel_footstep.2.ogg
|
default_dirt_footstep.*.ogg
|
||||||
default_gravel_footstep.3.ogg
|
|
||||||
default_gravel_footstep.4.ogg
|
|
||||||
default_grass_footstep.1.ogg
|
|
||||||
default_place_node.1.ogg
|
|
||||||
default_place_node.2.ogg
|
|
||||||
default_place_node.3.ogg
|
|
||||||
default_place_node_hard.1.ogg
|
|
||||||
default_place_node_hard.2.ogg
|
|
||||||
default_hard_footstep.1.ogg
|
|
||||||
default_hard_footstep.2.ogg
|
|
||||||
default_hard_footstep.3.ogg
|
|
||||||
default_sand_footstep.1.ogg
|
|
||||||
default_sand_footstep.2.ogg
|
|
||||||
default_wood_footstep.1.ogg
|
|
||||||
default_wood_footstep.2.ogg
|
|
||||||
default_dirt_footstep.1.ogg
|
|
||||||
default_dirt_footstep.2.ogg
|
|
||||||
default_glass_footstep.ogg
|
default_glass_footstep.ogg
|
||||||
|
|
||||||
Metal sounds:
|
Metal sounds:
|
||||||
|
@ -54,35 +34,64 @@ Metal sounds:
|
||||||
- https://www.freesound.org/people/yadronoff/sounds/320397/
|
- https://www.freesound.org/people/yadronoff/sounds/320397/
|
||||||
default_dug_metal.*.ogg - Iwan Gabovitch - qubodup - CC0
|
default_dug_metal.*.ogg - Iwan Gabovitch - qubodup - CC0
|
||||||
- http://opengameart.org/users/qubodup
|
- http://opengameart.org/users/qubodup
|
||||||
default_metal_footstep.*.ogg - Ottomaani138 - CC0
|
default_metal_footstep.*.ogg - (CC0 1.0) - CC0 1.0
|
||||||
- https://www.freesound.org/people/Ottomaani138/sounds/232692/
|
- https://freesound.org/people/mypantsfelldown/sounds/398937/
|
||||||
default_place_node_metal.*.ogg - Ogrebane - CC0
|
default_place_node_metal.*.ogg - Ogrebane - CC0
|
||||||
- http://opengameart.org/content/wood-and-metal-sound-effects-volume-2
|
- http://opengameart.org/content/wood-and-metal-sound-effects-volume-2
|
||||||
|
|
||||||
AGFX (CC BY 3.0)
|
AGFX (CC BY 3.0):
|
||||||
https://www.freesound.org/people/AGFX/packs/1253/
|
https://www.freesound.org/people/AGFX/packs/1253/
|
||||||
default_water_footstep.1.ogg
|
default_water_footstep.*.ogg
|
||||||
default_water_footstep.2.ogg
|
|
||||||
default_water_footstep.3.ogg
|
|
||||||
(default_water_footstep.4.ogg is silent)
|
|
||||||
|
|
||||||
blukotek (CC0 1.0)
|
blukotek (CC0 1.0):
|
||||||
https://www.freesound.org/people/blukotek/sounds/251660/
|
https://www.freesound.org/people/blukotek/sounds/251660/
|
||||||
default_dig_snappy.ogg
|
default_dig_snappy.ogg
|
||||||
|
|
||||||
sonictechtonic (CC BY 3.0)
|
sonictechtonic (CC BY 3.0):
|
||||||
https://www.freesound.org/people/sonictechtonic/sounds/241872/
|
https://www.freesound.org/people/sonictechtonic/sounds/241872/
|
||||||
player_damage.ogg
|
player_damage.ogg
|
||||||
|
|
||||||
Voxelands project <http://www.voxelands.com/> (CC BY-SA 3.0)
|
Sheyvan (CC0 1.0):
|
||||||
|
https://freesound.org/people/Sheyvan/sounds/476113/
|
||||||
|
default_dig_choppy.*.ogg
|
||||||
|
|
||||||
|
lolamadeus (CC0 1.0):
|
||||||
|
https://freesound.org/people/lolamadeus/sounds/179341/
|
||||||
|
default_gravel_dig.*.ogg
|
||||||
|
default_gravel_dug.*.ogg
|
||||||
|
|
||||||
|
Benboncan (CC BY 3.0):
|
||||||
|
https://freesound.org/people/Benboncan/sounds/71823/
|
||||||
|
default_dig_cracky.*.ogg
|
||||||
|
|
||||||
|
Erdie (CC BY 3.0):
|
||||||
|
https://freesound.org/people/Erdie/sounds/41579/
|
||||||
|
default_hard_footstep.*.ogg
|
||||||
|
|
||||||
|
worthahep88 (CC0 1.0):
|
||||||
|
https://freesound.org/people/worthahep88/sounds/319224/
|
||||||
|
default_sand_footstep.*.ogg
|
||||||
|
|
||||||
|
dheming (CC BY 3.0):
|
||||||
|
https://freesound.org/people/dheming/sounds/268023/
|
||||||
|
default_ice_dig.*.ogg
|
||||||
|
|
||||||
|
InspectorJ (CC BY 3.0):
|
||||||
|
https://freesound.org/people/InspectorJ/sounds/416967/
|
||||||
|
default_ice_footstep.*.ogg
|
||||||
|
|
||||||
|
Angel_Perez_Grandi (CC BY 3.0):
|
||||||
|
https://freesound.org/people/Angel_Perez_Grandi/sounds/49190/
|
||||||
|
default_ice_dug.ogg
|
||||||
|
|
||||||
|
Voxelands project <http://www.voxelands.com/> (CC BY-SA 3.0):
|
||||||
mcl_sounds_place_node_water.ogg
|
mcl_sounds_place_node_water.ogg
|
||||||
mcl_sounds_dug_water.ogg
|
mcl_sounds_dug_water.ogg
|
||||||
|
|
||||||
(Note: Artists from the Voxelands project include: sdzen, darkrose, sapier,
|
(Note: Artists from the Voxelands project include: sdzen, darkrose, sapier,
|
||||||
Tom Peter, Telaron, juskiddink)
|
Tom Peter, Telaron, juskiddink)
|
||||||
|
|
||||||
Michel Baradari <https://opengameart.org/content/lava-splash> (CC BY 3.0)
|
Michel Baradari <https://opengameart.org/content/lava-splash> (CC BY 3.0):
|
||||||
|
|
||||||
default_place_node_lava.ogg
|
default_place_node_lava.ogg
|
||||||
|
|
||||||
Adam_N (CC0 1.0):
|
Adam_N (CC0 1.0):
|
||||||
|
@ -90,7 +99,7 @@ Adam_N (CC0 1.0):
|
||||||
Source: <https://www.freesound.org/people/Adam_N/sounds/346692/>
|
Source: <https://www.freesound.org/people/Adam_N/sounds/346692/>
|
||||||
|
|
||||||
Alecia Shepherd (CC BY-SA 4.0):
|
Alecia Shepherd (CC BY-SA 4.0):
|
||||||
mcl_sounds_cloth.ogg
|
mcl_sounds_cloth.*.ogg
|
||||||
Source: SnowSong sound and music pack <https://opengameart.org/content/snowsong-sound-and-music-pack>
|
Source: SnowSong sound and music pack <https://opengameart.org/content/snowsong-sound-and-music-pack>
|
||||||
|
|
||||||
Unknown authors (WTFPL):
|
Unknown authors (WTFPL):
|
||||||
|
|
|
@ -11,7 +11,7 @@ function mcl_sounds.node_sound_defaults(table)
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_dug_node", gain=0.25}
|
{name="default_dug_node", gain=0.25}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_oddly_breakable_by_hand", gain=1.0}
|
{name="default_dig_oddly_breakable_by_hand", gain=0.5}
|
||||||
table.place = table.place or
|
table.place = table.place or
|
||||||
{name="default_place_node_hard", gain=1.0}
|
{name="default_place_node_hard", gain=1.0}
|
||||||
return table
|
return table
|
||||||
|
@ -20,11 +20,11 @@ end
|
||||||
function mcl_sounds.node_sound_stone_defaults(table)
|
function mcl_sounds.node_sound_stone_defaults(table)
|
||||||
table = table or {}
|
table = table or {}
|
||||||
table.footstep = table.footstep or
|
table.footstep = table.footstep or
|
||||||
{name="default_hard_footstep", gain=0.5}
|
{name="default_hard_footstep", gain=0.2}
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_hard_footstep", gain=1.0}
|
{name="default_hard_footstep", gain=1.0}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_cracky", gain=1.0}
|
{name="default_dig_cracky", gain=0.5}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
return table
|
return table
|
||||||
end
|
end
|
||||||
|
@ -32,13 +32,13 @@ end
|
||||||
function mcl_sounds.node_sound_metal_defaults(table)
|
function mcl_sounds.node_sound_metal_defaults(table)
|
||||||
table = table or {}
|
table = table or {}
|
||||||
table.footstep = table.footstep or
|
table.footstep = table.footstep or
|
||||||
{name="default_metal_footstep", gain=0.5}
|
{name="default_metal_footstep", gain=0.2}
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_dug_metal", gain=1.0}
|
{name="default_dug_metal", gain=0.5}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_metal", gain=1.0}
|
{name="default_dig_metal", gain=0.5}
|
||||||
table.place = table.place or
|
table.place = table.place or
|
||||||
{name="default_place_node_metal", gain=1.0}
|
{name="default_place_node_metal", gain=0.5}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
return table
|
return table
|
||||||
end
|
end
|
||||||
|
@ -46,11 +46,11 @@ end
|
||||||
function mcl_sounds.node_sound_dirt_defaults(table)
|
function mcl_sounds.node_sound_dirt_defaults(table)
|
||||||
table = table or {}
|
table = table or {}
|
||||||
table.footstep = table.footstep or
|
table.footstep = table.footstep or
|
||||||
{name="default_dirt_footstep", gain=1.0}
|
{name="default_dirt_footstep", gain=0.25}
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_dirt_footstep", gain=1.5}
|
{name="default_dirt_footstep", gain=1.0}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_crumbly", gain=1.0}
|
{name="default_dig_crumbly", gain=0.4}
|
||||||
table.place = table.place or
|
table.place = table.place or
|
||||||
{name="default_place_node", gain=1.0}
|
{name="default_place_node", gain=1.0}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
|
@ -60,11 +60,25 @@ end
|
||||||
function mcl_sounds.node_sound_sand_defaults(table)
|
function mcl_sounds.node_sound_sand_defaults(table)
|
||||||
table = table or {}
|
table = table or {}
|
||||||
table.footstep = table.footstep or
|
table.footstep = table.footstep or
|
||||||
{name="default_sand_footstep", gain=0.5}
|
{name="default_sand_footstep", gain=0.05}
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_sand_footstep", gain=1.0}
|
{name="default_sand_footstep", gain=0.15}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_crumbly", gain=1.0}
|
{name="default_dig_crumbly", gain=0.4}
|
||||||
|
table.place = table.place or
|
||||||
|
{name="default_place_node", gain=1.0}
|
||||||
|
mcl_sounds.node_sound_defaults(table)
|
||||||
|
return table
|
||||||
|
end
|
||||||
|
|
||||||
|
function mcl_sounds.node_sound_gravel_defaults(table)
|
||||||
|
table = table or {}
|
||||||
|
table.footstep = table.footstep or
|
||||||
|
{name="default_gravel_footstep", gain=0.25}
|
||||||
|
table.dug = table.dug or
|
||||||
|
{name="default_gravel_dug", gain=1.0}
|
||||||
|
table.dig = table.dig or
|
||||||
|
{name="default_gravel_dig", gain=0.35}
|
||||||
table.place = table.place or
|
table.place = table.place or
|
||||||
{name="default_place_node", gain=1.0}
|
{name="default_place_node", gain=1.0}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
|
@ -78,21 +92,33 @@ function mcl_sounds.node_sound_snow_defaults(table)
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="pedology_snow_soft_footstep", gain=1.0}
|
{name="pedology_snow_soft_footstep", gain=1.0}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_crumbly", gain=1.0}
|
{name="pedology_snow_soft_footstep", gain=1.0}
|
||||||
table.place = table.place or
|
table.place = table.place or
|
||||||
{name="default_place_node", gain=1.0}
|
{name="default_place_node", gain=1.0}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
return table
|
return table
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function mcl_sounds.node_sound_ice_defaults(table)
|
||||||
|
table = table or {}
|
||||||
|
table.footstep = table.footstep or
|
||||||
|
{name="default_ice_footstep", gain=0.15}
|
||||||
|
table.dug = table.dug or
|
||||||
|
{name="default_ice_dug", gain=0.5}
|
||||||
|
table.dig = table.dig or
|
||||||
|
{name="default_ice_dig", gain=0.5}
|
||||||
|
mcl_sounds.node_sound_defaults(table)
|
||||||
|
return table
|
||||||
|
end
|
||||||
|
|
||||||
function mcl_sounds.node_sound_wood_defaults(table)
|
function mcl_sounds.node_sound_wood_defaults(table)
|
||||||
table = table or {}
|
table = table or {}
|
||||||
table.footstep = table.footstep or
|
table.footstep = table.footstep or
|
||||||
{name="default_wood_footstep", gain=0.5}
|
{name="default_wood_footstep", gain=0.15}
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_wood_footstep", gain=1.0}
|
{name="default_wood_footstep", gain=1.0}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_choppy", gain=1.0}
|
{name="default_dig_choppy", gain=0.4}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
return table
|
return table
|
||||||
end
|
end
|
||||||
|
@ -128,11 +154,11 @@ end
|
||||||
function mcl_sounds.node_sound_glass_defaults(table)
|
function mcl_sounds.node_sound_glass_defaults(table)
|
||||||
table = table or {}
|
table = table or {}
|
||||||
table.footstep = table.footstep or
|
table.footstep = table.footstep or
|
||||||
{name="default_glass_footstep", gain=0.5}
|
{name="default_glass_footstep", gain=0.3}
|
||||||
table.dug = table.dug or
|
table.dug = table.dug or
|
||||||
{name="default_break_glass", gain=1.0}
|
{name="default_break_glass", gain=1.0}
|
||||||
table.dig = table.dig or
|
table.dig = table.dig or
|
||||||
{name="default_dig_cracky", gain=1.0}
|
{name="default_dig_cracky", gain=0.5}
|
||||||
mcl_sounds.node_sound_defaults(table)
|
mcl_sounds.node_sound_defaults(table)
|
||||||
return table
|
return table
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,8 +2,8 @@ mcl_util = {}
|
||||||
|
|
||||||
-- Updates all values in t using values from to*.
|
-- Updates all values in t using values from to*.
|
||||||
function table.update(t, ...)
|
function table.update(t, ...)
|
||||||
for _, to in ipairs{...} do
|
for _, to in ipairs {...} do
|
||||||
for k,v in pairs(to) do
|
for k, v in pairs(to) do
|
||||||
t[k] = v
|
t[k] = v
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -12,8 +12,8 @@ end
|
||||||
|
|
||||||
-- Updates nil values in t using values from to*.
|
-- Updates nil values in t using values from to*.
|
||||||
function table.update_nil(t, ...)
|
function table.update_nil(t, ...)
|
||||||
for _, to in ipairs{...} do
|
for _, to in ipairs {...} do
|
||||||
for k,v in pairs(to) do
|
for k, v in pairs(to) do
|
||||||
if t[k] == nil then
|
if t[k] == nil then
|
||||||
t[k] = v
|
t[k] = v
|
||||||
end
|
end
|
||||||
|
@ -22,9 +22,9 @@ function table.update_nil(t, ...)
|
||||||
return t
|
return t
|
||||||
end
|
end
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_default",false)
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_default", false)
|
||||||
local LOG_MODULE = "[MCL2]"
|
local LOG_MODULE = "[MCL2]"
|
||||||
function mcl_util.mcl_log (message, module, bypass_default_logger)
|
function mcl_util.mcl_log(message, module, bypass_default_logger)
|
||||||
local selected_module = LOG_MODULE
|
local selected_module = LOG_MODULE
|
||||||
if module then
|
if module then
|
||||||
selected_module = module
|
selected_module = module
|
||||||
|
@ -34,7 +34,6 @@ function mcl_util.mcl_log (message, module, bypass_default_logger)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
function mcl_util.file_exists(name)
|
function mcl_util.file_exists(name)
|
||||||
if type(name) ~= "string" then return end
|
if type(name) ~= "string" then return end
|
||||||
local f = io.open(name)
|
local f = io.open(name)
|
||||||
|
@ -69,7 +68,7 @@ function mcl_util.rotate_axis_and_place(itemstack, placer, pointed_thing, infini
|
||||||
local undef = minetest.registered_nodes[unode.name]
|
local undef = minetest.registered_nodes[unode.name]
|
||||||
if undef and undef.on_rightclick then
|
if undef and undef.on_rightclick then
|
||||||
undef.on_rightclick(pointed_thing.under, unode, placer,
|
undef.on_rightclick(pointed_thing.under, unode, placer,
|
||||||
itemstack, pointed_thing)
|
itemstack, pointed_thing)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
||||||
|
@ -151,23 +150,23 @@ end
|
||||||
function mcl_util.get_double_container_neighbor_pos(pos, param2, side)
|
function mcl_util.get_double_container_neighbor_pos(pos, param2, side)
|
||||||
if side == "right" then
|
if side == "right" then
|
||||||
if param2 == 0 then
|
if param2 == 0 then
|
||||||
return {x=pos.x-1, y=pos.y, z=pos.z}
|
return {x = pos.x - 1, y = pos.y, z = pos.z}
|
||||||
elseif param2 == 1 then
|
elseif param2 == 1 then
|
||||||
return {x=pos.x, y=pos.y, z=pos.z+1}
|
return {x = pos.x, y = pos.y, z = pos.z + 1}
|
||||||
elseif param2 == 2 then
|
elseif param2 == 2 then
|
||||||
return {x=pos.x+1, y=pos.y, z=pos.z}
|
return {x = pos.x + 1, y = pos.y, z = pos.z}
|
||||||
elseif param2 == 3 then
|
elseif param2 == 3 then
|
||||||
return {x=pos.x, y=pos.y, z=pos.z-1}
|
return {x = pos.x, y = pos.y, z = pos.z - 1}
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if param2 == 0 then
|
if param2 == 0 then
|
||||||
return {x=pos.x+1, y=pos.y, z=pos.z}
|
return {x = pos.x + 1, y = pos.y, z = pos.z}
|
||||||
elseif param2 == 1 then
|
elseif param2 == 1 then
|
||||||
return {x=pos.x, y=pos.y, z=pos.z-1}
|
return {x = pos.x, y = pos.y, z = pos.z - 1}
|
||||||
elseif param2 == 2 then
|
elseif param2 == 2 then
|
||||||
return {x=pos.x-1, y=pos.y, z=pos.z}
|
return {x = pos.x - 1, y = pos.y, z = pos.z}
|
||||||
elseif param2 == 3 then
|
elseif param2 == 3 then
|
||||||
return {x=pos.x, y=pos.y, z=pos.z+1}
|
return {x = pos.x, y = pos.y, z = pos.z + 1}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -185,7 +184,7 @@ end
|
||||||
function mcl_util.get_eligible_transfer_item_slot(src_inventory, src_list, dst_inventory, dst_list, condition)
|
function mcl_util.get_eligible_transfer_item_slot(src_inventory, src_list, dst_inventory, dst_list, condition)
|
||||||
local size = src_inventory:get_size(src_list)
|
local size = src_inventory:get_size(src_list)
|
||||||
local stack
|
local stack
|
||||||
for i=1, size do
|
for i = 1, size do
|
||||||
stack = src_inventory:get_stack(src_list, i)
|
stack = src_inventory:get_stack(src_list, i)
|
||||||
if not stack:is_empty() and (condition == nil or condition(stack, src_inventory, src_list, dst_inventory, dst_list)) then
|
if not stack:is_empty() and (condition == nil or condition(stack, src_inventory, src_list, dst_inventory, dst_list)) then
|
||||||
return i
|
return i
|
||||||
|
@ -288,10 +287,10 @@ function mcl_util.move_item_container(source_pos, destination_pos, source_list,
|
||||||
-- Main inventory for most container types
|
-- Main inventory for most container types
|
||||||
if sctype == 2 or sctype == 3 or sctype == 5 or sctype == 6 or sctype == 7 then
|
if sctype == 2 or sctype == 3 or sctype == 5 or sctype == 6 or sctype == 7 then
|
||||||
source_list = "main"
|
source_list = "main"
|
||||||
-- Furnace: output
|
-- Furnace: output
|
||||||
elseif sctype == 4 then
|
elseif sctype == 4 then
|
||||||
source_list = "dst"
|
source_list = "dst"
|
||||||
-- Unknown source container type. Bail out
|
-- Unknown source container type. Bail out
|
||||||
else
|
else
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
@ -344,7 +343,7 @@ function mcl_util.move_item_container(source_pos, destination_pos, source_list,
|
||||||
-- Main inventory for most container types
|
-- Main inventory for most container types
|
||||||
if dctype == 2 or dctype == 3 or dctype == 5 or dctype == 6 or dctype == 7 then
|
if dctype == 2 or dctype == 3 or dctype == 5 or dctype == 6 or dctype == 7 then
|
||||||
destination_list = "main"
|
destination_list = "main"
|
||||||
-- Furnace source slot
|
-- Furnace source slot
|
||||||
elseif dctype == 4 then
|
elseif dctype == 4 then
|
||||||
destination_list = "src"
|
destination_list = "src"
|
||||||
end
|
end
|
||||||
|
@ -409,7 +408,7 @@ end
|
||||||
-- Returns true if item (itemstring or ItemStack) can be used as a furnace fuel.
|
-- Returns true if item (itemstring or ItemStack) can be used as a furnace fuel.
|
||||||
-- Returns false otherwise
|
-- Returns false otherwise
|
||||||
function mcl_util.is_fuel(item)
|
function mcl_util.is_fuel(item)
|
||||||
return minetest.get_craft_result({method="fuel", width=1, items={item}}).time ~= 0
|
return minetest.get_craft_result({method = "fuel", width = 1, items = {item}}).time ~= 0
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Returns a on_place function for plants
|
-- Returns a on_place function for plants
|
||||||
|
@ -456,7 +455,7 @@ function mcl_util.generate_on_place_plant_function(condition)
|
||||||
|
|
||||||
if success then
|
if success then
|
||||||
if idef.sounds and idef.sounds.place then
|
if idef.sounds and idef.sounds.place then
|
||||||
minetest.sound_play(idef.sounds.place, {pos=pointed_thing.above, gain=1}, true)
|
minetest.sound_play(idef.sounds.place, {pos = pointed_thing.above, gain = 1}, true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
itemstack = new_itemstack
|
itemstack = new_itemstack
|
||||||
|
@ -557,6 +556,11 @@ function mcl_util.deal_damage(target, damage, mcl_reason)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local is_immortal = target:get_armor_groups().immortal or 0
|
||||||
|
if is_immortal>0 then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local hp = target:get_hp()
|
local hp = target:get_hp()
|
||||||
|
|
||||||
if hp > 0 then
|
if hp > 0 then
|
||||||
|
@ -643,78 +647,80 @@ end
|
||||||
|
|
||||||
local function roundN(n, d)
|
local function roundN(n, d)
|
||||||
if type(n) ~= "number" then return n end
|
if type(n) ~= "number" then return n end
|
||||||
local m = 10^d
|
local m = 10 ^ d
|
||||||
return math.floor(n * m + 0.5) / m
|
return math.floor(n * m + 0.5) / m
|
||||||
end
|
end
|
||||||
|
|
||||||
local function close_enough(a,b)
|
local function close_enough(a, b)
|
||||||
local rt=true
|
local rt = true
|
||||||
if type(a) == "table" and type(b) == "table" then
|
if type(a) == "table" and type(b) == "table" then
|
||||||
for k,v in pairs(a) do
|
for k, v in pairs(a) do
|
||||||
if roundN(v,2) ~= roundN(b[k],2) then
|
if roundN(v, 2) ~= roundN(b[k], 2) then
|
||||||
rt=false
|
rt = false
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
rt = roundN(a,2) == roundN(b,2)
|
rt = roundN(a, 2) == roundN(b, 2)
|
||||||
end
|
end
|
||||||
return rt
|
return rt
|
||||||
end
|
end
|
||||||
|
|
||||||
local function props_changed(props,oldprops)
|
local function props_changed(props, oldprops)
|
||||||
local changed=false
|
local changed = false
|
||||||
local p={}
|
local p = {}
|
||||||
for k,v in pairs(props) do
|
for k, v in pairs(props) do
|
||||||
if not close_enough(v,oldprops[k]) then
|
if not close_enough(v, oldprops[k]) then
|
||||||
p[k]=v
|
p[k] = v
|
||||||
changed=true
|
changed = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return changed,p
|
return changed, p
|
||||||
end
|
end
|
||||||
|
|
||||||
--tests for roundN
|
--tests for roundN
|
||||||
local test_round1=15
|
local test_round1 = 15
|
||||||
local test_round2=15.00199999999
|
local test_round2 = 15.00199999999
|
||||||
local test_round3=15.00111111
|
local test_round3 = 15.00111111
|
||||||
local test_round4=15.00999999
|
local test_round4 = 15.00999999
|
||||||
|
|
||||||
assert(roundN(test_round1,2)==roundN(test_round1,2))
|
assert(roundN(test_round1, 2) == roundN(test_round1, 2))
|
||||||
assert(roundN(test_round1,2)==roundN(test_round2,2))
|
assert(roundN(test_round1, 2) == roundN(test_round2, 2))
|
||||||
assert(roundN(test_round1,2)==roundN(test_round3,2))
|
assert(roundN(test_round1, 2) == roundN(test_round3, 2))
|
||||||
assert(roundN(test_round1,2)~=roundN(test_round4,2))
|
assert(roundN(test_round1, 2) ~= roundN(test_round4, 2))
|
||||||
|
|
||||||
-- tests for close_enough
|
-- tests for close_enough
|
||||||
local test_cb = {-0.35,0,-0.35,0.35,0.8,0.35} --collisionboxes
|
local test_cb = {-0.35, 0, -0.35, 0.35, 0.8, 0.35} --collisionboxes
|
||||||
local test_cb_close = {-0.351213,0,-0.35,0.35,0.8,0.351212}
|
local test_cb_close = {-0.351213, 0, -0.35, 0.35, 0.8, 0.351212}
|
||||||
local test_cb_diff = {-0.35,0,-1.35,0.35,0.8,0.35}
|
local test_cb_diff = {-0.35, 0, -1.35, 0.35, 0.8, 0.35}
|
||||||
|
|
||||||
local test_eh = 1.65 --eye height
|
local test_eh = 1.65 --eye height
|
||||||
local test_eh_close = 1.65123123
|
local test_eh_close = 1.65123123
|
||||||
local test_eh_diff = 1.35
|
local test_eh_diff = 1.35
|
||||||
|
|
||||||
local test_nt = { r = 225, b = 225, a = 225, g = 225 } --nametag
|
local test_nt = {r = 225, b = 225, a = 225, g = 225} --nametag
|
||||||
local test_nt_diff = { r = 225, b = 225, a = 0, g = 225 }
|
local test_nt_diff = {r = 225, b = 225, a = 0, g = 225}
|
||||||
|
|
||||||
assert(close_enough(test_cb,test_cb_close))
|
assert(close_enough(test_cb, test_cb_close))
|
||||||
assert(not close_enough(test_cb,test_cb_diff))
|
assert(not close_enough(test_cb, test_cb_diff))
|
||||||
assert(close_enough(test_eh,test_eh_close))
|
assert(close_enough(test_eh, test_eh_close))
|
||||||
assert(not close_enough(test_eh,test_eh_diff))
|
assert(not close_enough(test_eh, test_eh_diff))
|
||||||
assert(not close_enough(test_nt,test_nt_diff)) --no floats involved here
|
assert(not close_enough(test_nt, test_nt_diff)) --no floats involved here
|
||||||
|
|
||||||
--tests for properties_changed
|
--tests for properties_changed
|
||||||
local test_properties_set1={collisionbox = {-0.35,0,-0.35,0.35,0.8,0.35}, eye_height = 0.65, nametag_color = { r = 225, b = 225, a = 225, g = 225 }}
|
local test_properties_set1 = {collisionbox = {-0.35, 0, -0.35, 0.35, 0.8, 0.35}, eye_height = 0.65,
|
||||||
local test_properties_set2={collisionbox = {-0.35,0,-0.35,0.35,0.8,0.35}, eye_height = 1.35, nametag_color = { r = 225, b = 225, a = 225, g = 225 }}
|
nametag_color = {r = 225, b = 225, a = 225, g = 225}}
|
||||||
|
local test_properties_set2 = {collisionbox = {-0.35, 0, -0.35, 0.35, 0.8, 0.35}, eye_height = 1.35,
|
||||||
|
nametag_color = {r = 225, b = 225, a = 225, g = 225}}
|
||||||
|
|
||||||
local test_p1,_=props_changed(test_properties_set1,test_properties_set1)
|
local test_p1, _ = props_changed(test_properties_set1, test_properties_set1)
|
||||||
local test_p2,_=props_changed(test_properties_set1,test_properties_set2)
|
local test_p2, _ = props_changed(test_properties_set1, test_properties_set2)
|
||||||
|
|
||||||
assert(not test_p1)
|
assert(not test_p1)
|
||||||
assert(test_p2)
|
assert(test_p2)
|
||||||
|
|
||||||
function mcl_util.set_properties(obj,props)
|
function mcl_util.set_properties(obj, props)
|
||||||
local changed,p=props_changed(props,obj:get_properties())
|
local changed, p = props_changed(props, obj:get_properties())
|
||||||
if changed then
|
if changed then
|
||||||
obj:set_properties(p)
|
obj:set_properties(p)
|
||||||
end
|
end
|
||||||
|
@ -728,3 +734,302 @@ function mcl_util.set_bone_position(obj, bone, pos, rot)
|
||||||
obj:set_bone_position(bone, pos or current_pos, rot or current_rot)
|
obj:set_bone_position(bone, pos or current_pos, rot or current_rot)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---Return a function to use in `on_place`.
|
||||||
|
---
|
||||||
|
---Allow to bypass the `buildable_to` node field in a `on_place` callback.
|
||||||
|
---
|
||||||
|
---You have to make sure that the nodes you return true for have `buildable_to = true`.
|
||||||
|
---@param func fun(node_name: string): boolean Return `true` if node must not replace the buildable_to node which have `node_name`
|
||||||
|
---@return fun(itemstack: ItemStack, placer: ObjectRef, pointed_thing: pointed_thing, param2: integer): ItemStack?
|
||||||
|
function mcl_util.bypass_buildable_to(func)
|
||||||
|
--------------------------
|
||||||
|
-- MINETEST CODE: UTILS --
|
||||||
|
--------------------------
|
||||||
|
|
||||||
|
local function copy_pointed_thing(pointed_thing)
|
||||||
|
return {
|
||||||
|
type = pointed_thing.type,
|
||||||
|
above = pointed_thing.above and vector.copy(pointed_thing.above),
|
||||||
|
under = pointed_thing.under and vector.copy(pointed_thing.under),
|
||||||
|
ref = pointed_thing.ref,
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
local function user_name(user)
|
||||||
|
return user and user:get_player_name() or ""
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Returns a logging function. For empty names, does not log.
|
||||||
|
local function make_log(name)
|
||||||
|
return name ~= "" and minetest.log or function() end
|
||||||
|
end
|
||||||
|
|
||||||
|
local function check_attached_node(p, n, group_rating)
|
||||||
|
local def = core.registered_nodes[n.name]
|
||||||
|
local d = vector.zero()
|
||||||
|
if group_rating == 3 then
|
||||||
|
-- always attach to floor
|
||||||
|
d.y = -1
|
||||||
|
elseif group_rating == 4 then
|
||||||
|
-- always attach to ceiling
|
||||||
|
d.y = 1
|
||||||
|
elseif group_rating == 2 then
|
||||||
|
-- attach to facedir or 4dir direction
|
||||||
|
if (def.paramtype2 == "facedir" or
|
||||||
|
def.paramtype2 == "colorfacedir") then
|
||||||
|
-- Attach to whatever facedir is "mounted to".
|
||||||
|
-- For facedir, this is where tile no. 5 point at.
|
||||||
|
|
||||||
|
-- The fallback vector here is in case 'facedir to dir' is nil due
|
||||||
|
-- to voxelmanip placing a wallmounted node without resetting a
|
||||||
|
-- pre-existing param2 value that is out-of-range for facedir.
|
||||||
|
-- The fallback vector corresponds to param2 = 0.
|
||||||
|
d = core.facedir_to_dir(n.param2) or vector.new(0, 0, 1)
|
||||||
|
elseif (def.paramtype2 == "4dir" or
|
||||||
|
def.paramtype2 == "color4dir") then
|
||||||
|
-- Similar to facedir handling
|
||||||
|
d = core.fourdir_to_dir(n.param2) or vector.new(0, 0, 1)
|
||||||
|
end
|
||||||
|
elseif def.paramtype2 == "wallmounted" or
|
||||||
|
def.paramtype2 == "colorwallmounted" then
|
||||||
|
-- Attach to whatever this node is "mounted to".
|
||||||
|
-- This where tile no. 2 points at.
|
||||||
|
|
||||||
|
-- The fallback vector here is used for the same reason as
|
||||||
|
-- for facedir nodes.
|
||||||
|
d = core.wallmounted_to_dir(n.param2) or vector.new(0, 1, 0)
|
||||||
|
else
|
||||||
|
d.y = -1
|
||||||
|
end
|
||||||
|
local p2 = vector.add(p, d)
|
||||||
|
local nn = core.get_node(p2).name
|
||||||
|
local def2 = core.registered_nodes[nn]
|
||||||
|
if def2 and not def2.walkable then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
return function(itemstack, placer, pointed_thing, param2)
|
||||||
|
-------------------
|
||||||
|
-- MINETEST CODE --
|
||||||
|
-------------------
|
||||||
|
local def = itemstack:get_definition()
|
||||||
|
if def.type ~= "node" or pointed_thing.type ~= "node" then
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
local under = pointed_thing.under
|
||||||
|
local oldnode_under = minetest.get_node_or_nil(under)
|
||||||
|
local above = pointed_thing.above
|
||||||
|
local oldnode_above = minetest.get_node_or_nil(above)
|
||||||
|
local playername = user_name(placer)
|
||||||
|
local log = make_log(playername)
|
||||||
|
|
||||||
|
if not oldnode_under or not oldnode_above then
|
||||||
|
log("info", playername .. " tried to place"
|
||||||
|
.. " node in unloaded position " .. minetest.pos_to_string(above))
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
local olddef_under = minetest.registered_nodes[oldnode_under.name]
|
||||||
|
olddef_under = olddef_under or minetest.nodedef_default
|
||||||
|
local olddef_above = minetest.registered_nodes[oldnode_above.name]
|
||||||
|
olddef_above = olddef_above or minetest.nodedef_default
|
||||||
|
|
||||||
|
if not olddef_above.buildable_to and not olddef_under.buildable_to then
|
||||||
|
log("info", playername .. " tried to place"
|
||||||
|
.. " node in invalid position " .. minetest.pos_to_string(above)
|
||||||
|
.. ", replacing " .. oldnode_above.name)
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
---------------------
|
||||||
|
-- CUSTOMIZED CODE --
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
-- Place above pointed node
|
||||||
|
local place_to = vector.copy(above)
|
||||||
|
|
||||||
|
-- If node under is buildable_to, check for callback result and place into it instead
|
||||||
|
if olddef_under.buildable_to and not func(oldnode_under.name) then
|
||||||
|
log("info", "node under is buildable to")
|
||||||
|
place_to = vector.copy(under)
|
||||||
|
end
|
||||||
|
|
||||||
|
-------------------
|
||||||
|
-- MINETEST CODE --
|
||||||
|
-------------------
|
||||||
|
|
||||||
|
if minetest.is_protected(place_to, playername) then
|
||||||
|
log("action", playername
|
||||||
|
.. " tried to place " .. def.name
|
||||||
|
.. " at protected position "
|
||||||
|
.. minetest.pos_to_string(place_to))
|
||||||
|
minetest.record_protection_violation(place_to, playername)
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
local oldnode = minetest.get_node(place_to)
|
||||||
|
local newnode = {name = def.name, param1 = 0, param2 = param2 or 0}
|
||||||
|
|
||||||
|
-- Calculate direction for wall mounted stuff like torches and signs
|
||||||
|
if def.place_param2 ~= nil then
|
||||||
|
newnode.param2 = def.place_param2
|
||||||
|
elseif (def.paramtype2 == "wallmounted" or
|
||||||
|
def.paramtype2 == "colorwallmounted") and not param2 then
|
||||||
|
local dir = vector.subtract(under, above)
|
||||||
|
newnode.param2 = minetest.dir_to_wallmounted(dir)
|
||||||
|
-- Calculate the direction for furnaces and chests and stuff
|
||||||
|
elseif (def.paramtype2 == "facedir" or
|
||||||
|
def.paramtype2 == "colorfacedir" or
|
||||||
|
def.paramtype2 == "4dir" or
|
||||||
|
def.paramtype2 == "color4dir") and not param2 then
|
||||||
|
local placer_pos = placer and placer:get_pos()
|
||||||
|
if placer_pos then
|
||||||
|
local dir = vector.subtract(above, placer_pos)
|
||||||
|
newnode.param2 = minetest.dir_to_facedir(dir)
|
||||||
|
log("info", "facedir: " .. newnode.param2)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local metatable = itemstack:get_meta():to_table().fields
|
||||||
|
|
||||||
|
-- Transfer color information
|
||||||
|
if metatable.palette_index and not def.place_param2 then
|
||||||
|
local color_divisor = nil
|
||||||
|
if def.paramtype2 == "color" then
|
||||||
|
color_divisor = 1
|
||||||
|
elseif def.paramtype2 == "colorwallmounted" then
|
||||||
|
color_divisor = 8
|
||||||
|
elseif def.paramtype2 == "colorfacedir" then
|
||||||
|
color_divisor = 32
|
||||||
|
elseif def.paramtype2 == "color4dir" then
|
||||||
|
color_divisor = 4
|
||||||
|
elseif def.paramtype2 == "colordegrotate" then
|
||||||
|
color_divisor = 32
|
||||||
|
end
|
||||||
|
if color_divisor then
|
||||||
|
local color = math.floor(metatable.palette_index / color_divisor)
|
||||||
|
local other = newnode.param2 % color_divisor
|
||||||
|
newnode.param2 = color * color_divisor + other
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Check if the node is attached and if it can be placed there
|
||||||
|
local an = minetest.get_item_group(def.name, "attached_node")
|
||||||
|
if an ~= 0 and
|
||||||
|
not check_attached_node(place_to, newnode, an) then
|
||||||
|
log("action", "attached node " .. def.name ..
|
||||||
|
" cannot be placed at " .. minetest.pos_to_string(place_to))
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
log("action", playername .. " places node "
|
||||||
|
.. def.name .. " at " .. minetest.pos_to_string(place_to))
|
||||||
|
|
||||||
|
-- Add node and update
|
||||||
|
minetest.add_node(place_to, newnode)
|
||||||
|
|
||||||
|
-- Play sound if it was done by a player
|
||||||
|
if playername ~= "" and def.sounds and def.sounds.place then
|
||||||
|
minetest.sound_play(def.sounds.place, {
|
||||||
|
pos = place_to,
|
||||||
|
exclude_player = playername,
|
||||||
|
}, true)
|
||||||
|
end
|
||||||
|
|
||||||
|
local take_item = true
|
||||||
|
|
||||||
|
-- Run callback
|
||||||
|
if def.after_place_node then
|
||||||
|
-- Deepcopy place_to and pointed_thing because callback can modify it
|
||||||
|
local place_to_copy = vector.copy(place_to)
|
||||||
|
local pointed_thing_copy = copy_pointed_thing(pointed_thing)
|
||||||
|
if def.after_place_node(place_to_copy, placer, itemstack,
|
||||||
|
pointed_thing_copy) then
|
||||||
|
take_item = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Run script hook
|
||||||
|
for _, callback in ipairs(minetest.registered_on_placenodes) do
|
||||||
|
-- Deepcopy pos, node and pointed_thing because callback can modify them
|
||||||
|
local place_to_copy = vector.copy(place_to)
|
||||||
|
local newnode_copy = {name = newnode.name, param1 = newnode.param1, param2 = newnode.param2}
|
||||||
|
local oldnode_copy = {name = oldnode.name, param1 = oldnode.param1, param2 = oldnode.param2}
|
||||||
|
local pointed_thing_copy = copy_pointed_thing(pointed_thing)
|
||||||
|
if callback(place_to_copy, newnode_copy, placer, oldnode_copy, itemstack, pointed_thing_copy) then
|
||||||
|
take_item = false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if take_item then
|
||||||
|
itemstack:take_item()
|
||||||
|
end
|
||||||
|
return itemstack
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--[[Check for a protection violation in a given area.
|
||||||
|
--
|
||||||
|
-- Applies is_protected() to a 3D lattice of points in the defined volume. The points are spaced
|
||||||
|
-- evenly throughout the volume and have a spacing similar to, but no larger than, "interval".
|
||||||
|
--
|
||||||
|
-- @param pos1 A position table of the area volume's first edge.
|
||||||
|
-- @param pos2 A position table of the area volume's second edge.
|
||||||
|
-- @param player The player performing the action.
|
||||||
|
-- @param interval Optional. Max spacing between checked points at the volume.
|
||||||
|
-- Default: Same as minetest.is_area_protected.
|
||||||
|
--
|
||||||
|
-- @return true on protection violation detection. false otherwise.
|
||||||
|
--
|
||||||
|
-- @notes *All corners and edges of the defined volume are checked.
|
||||||
|
]]
|
||||||
|
function mcl_util.check_area_protection(pos1, pos2, player, interval)
|
||||||
|
local name = player and player:get_player_name() or ""
|
||||||
|
|
||||||
|
local protected_pos = minetest.is_area_protected(pos1, pos2, name, interval)
|
||||||
|
if protected_pos then
|
||||||
|
minetest.record_protection_violation(protected_pos, name)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
--[[Check for a protection violation on a single position.
|
||||||
|
--
|
||||||
|
-- @param position A position table to check for protection violation.
|
||||||
|
-- @param player The player performing the action.
|
||||||
|
--
|
||||||
|
-- @return true on protection violation detection. false otherwise.
|
||||||
|
]]
|
||||||
|
function mcl_util.check_position_protection(position, player)
|
||||||
|
local name = player and player:get_player_name() or ""
|
||||||
|
|
||||||
|
if minetest.is_protected(position, name) then
|
||||||
|
minetest.record_protection_violation(position, name)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
local palette_indexes = {grass_palette_index = 0, foliage_palette_index = 0, water_palette_index = 0}
|
||||||
|
function mcl_util.get_palette_indexes_from_pos(pos)
|
||||||
|
local biome_data = minetest.get_biome_data(pos)
|
||||||
|
local biome = biome_data.biome
|
||||||
|
local biome_name = minetest.get_biome_name(biome)
|
||||||
|
local reg_biome = minetest.registered_biomes[biome_name]
|
||||||
|
if reg_biome and reg_biome._mcl_grass_palette_index and reg_biome._mcl_foliage_palette_index and reg_biome._mcl_water_palette_index then
|
||||||
|
local gpi = reg_biome._mcl_grass_palette_index
|
||||||
|
local fpi = reg_biome._mcl_foliage_palette_index
|
||||||
|
local wpi = reg_biome._mcl_water_palette_index
|
||||||
|
local palette_indexes = {grass_palette_index = gpi, foliage_palette_index = fpi, water_palette_index = wpi}
|
||||||
|
return palette_indexes
|
||||||
|
else
|
||||||
|
return palette_indexes
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
# textdomain: mcl_boats
|
||||||
|
Acacia Boat=アカシアのボート
|
||||||
|
Birch Boat=シラカバのボート
|
||||||
|
Boat=ボート
|
||||||
|
Boats are used to travel on the surface of water.=ボートは、水面を移動するために使われます。
|
||||||
|
Dark Oak Boat=ダークオークのボート
|
||||||
|
Jungle Boat=ジャングルのボート
|
||||||
|
Oak Boat=オークのボート
|
||||||
|
Rightclick on a water source to place the boat. Rightclick the boat to enter it. Use [Left] and [Right] to steer, [Forwards] to speed up and [Backwards] to slow down or move backwards. Use [Sneak] to leave the boat, punch the boat to make it drop as an item.=水源を右クリックすると、ボートが配置されます。ボートを右クリックすると、乗り込みます。[左][右]で舵取り、[前]で加速、[後]で減速または後退します。[スニーク]でボートから離れ、ボートをパンチするとアイテムとしてドロップします。
|
||||||
|
Spruce Boat=トウヒのボート
|
||||||
|
Water vehicle=水上用の乗物
|
||||||
|
Sneak to dismount=スニークで降りる
|
||||||
|
Obsidian Boat=黒曜石のボート
|
Before Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 267 B |
|
@ -7,31 +7,24 @@ local pool = {}
|
||||||
local tick = false
|
local tick = false
|
||||||
|
|
||||||
|
|
||||||
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_item_entities",false)
|
local LOGGING_ON = minetest.settings:get_bool("mcl_logging_item_entities", false)
|
||||||
local function mcl_log (message)
|
local function mcl_log(message)
|
||||||
if LOGGING_ON then
|
if LOGGING_ON then
|
||||||
mcl_util.mcl_log (message, "[Item Entities]", true)
|
mcl_util.mcl_log(message, "[Item Entities]", true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
minetest.register_on_joinplayer(function(player)
|
minetest.register_on_joinplayer(function(player)
|
||||||
local name
|
pool[player:get_player_name()] = 0
|
||||||
name = player:get_player_name()
|
|
||||||
pool[name] = 0
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
minetest.register_on_leaveplayer(function(player)
|
minetest.register_on_leaveplayer(function(player)
|
||||||
local name
|
pool[player:get_player_name()] = nil
|
||||||
name = player:get_player_name()
|
|
||||||
pool[name] = nil
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
||||||
local has_awards = minetest.get_modpath("awards")
|
local has_awards = minetest.get_modpath("awards")
|
||||||
|
|
||||||
local mcl_item_entity = {}
|
mcl_item_entity = {}
|
||||||
|
|
||||||
--basic settings
|
--basic settings
|
||||||
local item_drop_settings = {} --settings table
|
local item_drop_settings = {} --settings table
|
||||||
|
@ -46,22 +39,29 @@ item_drop_settings.random_item_velocity = true --this sets random item velocity
|
||||||
item_drop_settings.drop_single_item = false --if true, the drop control drops 1 item instead of the entire stack, and sneak+drop drops the stack
|
item_drop_settings.drop_single_item = false --if true, the drop control drops 1 item instead of the entire stack, and sneak+drop drops the stack
|
||||||
-- drop_single_item is disabled by default because it is annoying to throw away items from the intentory screen
|
-- drop_single_item is disabled by default because it is annoying to throw away items from the intentory screen
|
||||||
|
|
||||||
item_drop_settings.magnet_time = 0.75 -- how many seconds an item follows the player before giving up
|
item_drop_settings.magnet_time = 0.75 -- how many seconds an item follows the player before giving up
|
||||||
|
|
||||||
local function get_gravity()
|
local function get_gravity()
|
||||||
return tonumber(minetest.settings:get("movement_gravity")) or 9.81
|
return tonumber(minetest.settings:get("movement_gravity")) or 9.81
|
||||||
end
|
end
|
||||||
|
|
||||||
local registered_pickup_achievement = {}
|
mcl_item_entity.registered_pickup_achievement = {}
|
||||||
|
|
||||||
--TODO: remove limitation of 1 award per itemname
|
---Register an achievement that will be unlocked on pickup.
|
||||||
|
---
|
||||||
|
---TODO: remove limitation of 1 award per itemname
|
||||||
|
---@param itemname string
|
||||||
|
---@param award string
|
||||||
function mcl_item_entity.register_pickup_achievement(itemname, award)
|
function mcl_item_entity.register_pickup_achievement(itemname, award)
|
||||||
if not has_awards then
|
if not has_awards then
|
||||||
minetest.log("warning", "[mcl_item_entity] Trying to register pickup achievement ["..award.."] for ["..itemname.."] while awards missing")
|
minetest.log("warning",
|
||||||
elseif registered_pickup_achievement[itemname] then
|
"[mcl_item_entity] Trying to register pickup achievement [" .. award .. "] for [" ..
|
||||||
minetest.log("error", "[mcl_item_entity] Trying to register already existing pickup achievement ["..award.."] for ["..itemname.."]")
|
itemname .. "] while awards missing")
|
||||||
|
elseif mcl_item_entity.registered_pickup_achievement[itemname] then
|
||||||
|
minetest.log("error",
|
||||||
|
"[mcl_item_entity] Trying to register already existing pickup achievement [" .. award .. "] for [" .. itemname .. "]")
|
||||||
else
|
else
|
||||||
registered_pickup_achievement[itemname] = award
|
mcl_item_entity.registered_pickup_achievement[itemname] = award
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -74,11 +74,13 @@ mcl_item_entity.register_pickup_achievement("mcl_nether:ancient_debris", "mcl:hi
|
||||||
mcl_item_entity.register_pickup_achievement("mcl_end:dragon_egg", "mcl:PickUpDragonEgg")
|
mcl_item_entity.register_pickup_achievement("mcl_end:dragon_egg", "mcl:PickUpDragonEgg")
|
||||||
mcl_item_entity.register_pickup_achievement("mcl_armor:elytra", "mcl:skysTheLimit")
|
mcl_item_entity.register_pickup_achievement("mcl_armor:elytra", "mcl:skysTheLimit")
|
||||||
|
|
||||||
|
---@param object ObjectRef
|
||||||
|
---@param player ObjectRef
|
||||||
local function check_pickup_achievements(object, player)
|
local function check_pickup_achievements(object, player)
|
||||||
if has_awards then
|
if has_awards then
|
||||||
local itemname = ItemStack(object:get_luaentity().itemstring):get_name()
|
local itemname = ItemStack(object:get_luaentity().itemstring):get_name()
|
||||||
local playername = player:get_player_name()
|
local playername = player:get_player_name()
|
||||||
for name,award in pairs(registered_pickup_achievement) do
|
for name, award in pairs(mcl_item_entity.registered_pickup_achievement) do
|
||||||
if itemname == name or minetest.get_item_group(itemname, name) ~= 0 then
|
if itemname == name or minetest.get_item_group(itemname, name) ~= 0 then
|
||||||
awards.unlock(playername, award)
|
awards.unlock(playername, award)
|
||||||
end
|
end
|
||||||
|
@ -86,16 +88,23 @@ local function check_pickup_achievements(object, player)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param object ObjectRef
|
||||||
|
---@param luaentity Luaentity
|
||||||
|
---@param ignore_check? boolean
|
||||||
local function enable_physics(object, luaentity, ignore_check)
|
local function enable_physics(object, luaentity, ignore_check)
|
||||||
if luaentity.physical_state == false or ignore_check == true then
|
if luaentity.physical_state == false or ignore_check == true then
|
||||||
luaentity.physical_state = true
|
luaentity.physical_state = true
|
||||||
object:set_properties({
|
object:set_properties({
|
||||||
physical = true
|
physical = true
|
||||||
})
|
})
|
||||||
object:set_acceleration({x=0,y=-get_gravity(),z=0})
|
object:set_acceleration(vector.new(0, -get_gravity(), 0))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
---@param object ObjectRef
|
||||||
|
---@param luaentity Luaentity
|
||||||
|
---@param ignore_check? boolean
|
||||||
|
---@param reset_movement? boolean
|
||||||
local function disable_physics(object, luaentity, ignore_check, reset_movement)
|
local function disable_physics(object, luaentity, ignore_check, reset_movement)
|
||||||
if luaentity.physical_state == true or ignore_check == true then
|
if luaentity.physical_state == true or ignore_check == true then
|
||||||
luaentity.physical_state = false
|
luaentity.physical_state = false
|
||||||
|
@ -103,17 +112,16 @@ local function disable_physics(object, luaentity, ignore_check, reset_movement)
|
||||||
physical = false
|
physical = false
|
||||||
})
|
})
|
||||||
if reset_movement ~= false then
|
if reset_movement ~= false then
|
||||||
object:set_velocity({x=0,y=0,z=0})
|
object:set_velocity(vector.zero())
|
||||||
object:set_acceleration({x=0,y=0,z=0})
|
object:set_acceleration(vector.zero())
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
minetest.register_globalstep(function(_)
|
||||||
minetest.register_globalstep(function(dtime)
|
|
||||||
tick = not tick
|
tick = not tick
|
||||||
|
|
||||||
for _,player in pairs(minetest.get_connected_players()) do
|
for _, player in pairs(minetest.get_connected_players()) do
|
||||||
if player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage") then
|
if player:get_hp() > 0 or not minetest.settings:get_bool("enable_damage") then
|
||||||
|
|
||||||
local name = player:get_player_name()
|
local name = player:get_player_name()
|
||||||
|
@ -125,7 +133,7 @@ minetest.register_globalstep(function(dtime)
|
||||||
pos = pos,
|
pos = pos,
|
||||||
gain = 0.3,
|
gain = 0.3,
|
||||||
max_hear_distance = 16,
|
max_hear_distance = 16,
|
||||||
pitch = math.random(70,110)/100
|
pitch = math.random(70, 110) / 100
|
||||||
})
|
})
|
||||||
if pool[name] > 6 then
|
if pool[name] > 6 then
|
||||||
pool[name] = 6
|
pool[name] = 6
|
||||||
|
@ -135,15 +143,18 @@ minetest.register_globalstep(function(dtime)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local inv = player:get_inventory()
|
local inv = player:get_inventory()
|
||||||
local checkpos = {x=pos.x,y=pos.y + item_drop_settings.player_collect_height,z=pos.z}
|
local checkpos = vector.offset(pos, 0, item_drop_settings.player_collect_height, 0)
|
||||||
|
|
||||||
--magnet and collection
|
--magnet and collection
|
||||||
for _,object in pairs(minetest.get_objects_inside_radius(checkpos, item_drop_settings.xp_radius_magnet)) do
|
for _, object in pairs(minetest.get_objects_inside_radius(checkpos, item_drop_settings.xp_radius_magnet)) do
|
||||||
if not object:is_player() and vector.distance(checkpos, object:get_pos()) < item_drop_settings.radius_magnet and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and object:get_luaentity()._magnet_timer and (object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age)) then
|
if not object:is_player() and vector.distance(checkpos, object:get_pos()) < item_drop_settings.radius_magnet and
|
||||||
|
object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and object:get_luaentity()._magnet_timer
|
||||||
|
and (object:get_luaentity()._insta_collect or (object:get_luaentity().age > item_drop_settings.age)) then
|
||||||
|
|
||||||
if object:get_luaentity()._magnet_timer >= 0 and object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time and inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
if object:get_luaentity()._magnet_timer >= 0 and
|
||||||
|
object:get_luaentity()._magnet_timer < item_drop_settings.magnet_time and inv and
|
||||||
|
inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
||||||
|
|
||||||
-- Collection
|
-- Collection
|
||||||
if not object:get_luaentity()._removed then
|
if not object:get_luaentity()._removed then
|
||||||
|
@ -158,8 +169,8 @@ minetest.register_globalstep(function(dtime)
|
||||||
object:get_luaentity().target = checkpos
|
object:get_luaentity().target = checkpos
|
||||||
object:get_luaentity()._removed = true
|
object:get_luaentity()._removed = true
|
||||||
|
|
||||||
object:set_velocity({x=0,y=0,z=0})
|
object:set_velocity(vector.zero())
|
||||||
object:set_acceleration({x=0,y=0,z=0})
|
object:set_acceleration(vector.zero())
|
||||||
|
|
||||||
object:move_to(checkpos)
|
object:move_to(checkpos)
|
||||||
|
|
||||||
|
@ -179,7 +190,6 @@ minetest.register_globalstep(function(dtime)
|
||||||
local entity = object:get_luaentity()
|
local entity = object:get_luaentity()
|
||||||
entity.collector = player:get_player_name()
|
entity.collector = player:get_player_name()
|
||||||
entity.collected = true
|
entity.collected = true
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -194,6 +204,11 @@ end)
|
||||||
|
|
||||||
local tmp_id = 0
|
local tmp_id = 0
|
||||||
|
|
||||||
|
---@param drop string|drop_definition
|
||||||
|
---@param toolname string
|
||||||
|
---@param param2 integer
|
||||||
|
---@param paramtype2 paramtype2
|
||||||
|
---@return string[]
|
||||||
local function get_drops(drop, toolname, param2, paramtype2)
|
local function get_drops(drop, toolname, param2, paramtype2)
|
||||||
tmp_id = tmp_id + 1
|
tmp_id = tmp_id + 1
|
||||||
local tmp_node_name = "mcl_item_entity:" .. tmp_id
|
local tmp_node_name = "mcl_item_entity:" .. tmp_id
|
||||||
|
@ -202,7 +217,7 @@ local function get_drops(drop, toolname, param2, paramtype2)
|
||||||
drop = drop,
|
drop = drop,
|
||||||
paramtype2 = paramtype2
|
paramtype2 = paramtype2
|
||||||
}
|
}
|
||||||
local drops = minetest.get_node_drops({name = tmp_node_name, param2 = param2}, toolname)
|
local drops = minetest.get_node_drops({ name = tmp_node_name, param2 = param2 }, toolname)
|
||||||
minetest.registered_nodes[tmp_node_name] = nil
|
minetest.registered_nodes[tmp_node_name] = nil
|
||||||
return drops
|
return drops
|
||||||
end
|
end
|
||||||
|
@ -237,10 +252,17 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
-- NOTE: This function override allows digger to be nil.
|
-- NOTE: This function override allows digger to be nil.
|
||||||
-- This means there is no digger. This is a special case which allows this function to be called
|
-- This means there is no digger. This is a special case which allows this function to be called
|
||||||
-- by hand. Creative Mode is intentionally ignored in this case.
|
-- by hand. Creative Mode is intentionally ignored in this case.
|
||||||
|
if digger and digger:is_player() and minetest.is_creative_enabled(digger:get_player_name()) then
|
||||||
if (digger and digger:is_player() and minetest.is_creative_enabled(digger:get_player_name())) or doTileDrops == false then
|
local inv = digger:get_inventory()
|
||||||
|
if inv then
|
||||||
|
for _, item in ipairs(drops) do
|
||||||
|
if not inv:contains_item("main", item, true) then
|
||||||
|
inv:add_item("main", item)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
return
|
return
|
||||||
end
|
elseif not doTileDrops then return end
|
||||||
|
|
||||||
-- Check if node will yield its useful drop by the digger's tool
|
-- Check if node will yield its useful drop by the digger's tool
|
||||||
local dug_node = minetest.get_node(pos)
|
local dug_node = minetest.get_node(pos)
|
||||||
|
@ -248,9 +270,9 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
local tool
|
local tool
|
||||||
if digger then
|
if digger then
|
||||||
tool = digger:get_wielded_item()
|
tool = digger:get_wielded_item()
|
||||||
tooldef = minetest.registered_tools[tool:get_name()]
|
tooldef = minetest.registered_items[tool:get_name()]
|
||||||
|
|
||||||
if not mcl_autogroup.can_harvest(dug_node.name, tool:get_name()) then
|
if not mcl_autogroup.can_harvest(dug_node.name, tool:get_name(), digger) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -265,7 +287,7 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
* table: Drop every itemstring in this table when dug by shears _mcl_silk_touch_drop
|
* table: Drop every itemstring in this table when dug by shears _mcl_silk_touch_drop
|
||||||
]]
|
]]
|
||||||
|
|
||||||
local enchantments = tool and mcl_enchanting.get_enchantments(tool, "silk_touch")
|
local enchantments = tool and mcl_enchanting.get_enchantments(tool)
|
||||||
|
|
||||||
local silk_touch_drop = false
|
local silk_touch_drop = false
|
||||||
local nodedef = minetest.registered_nodes[dug_node.name]
|
local nodedef = minetest.registered_nodes[dug_node.name]
|
||||||
|
@ -294,7 +316,8 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
local max_count = fortune_drop.max_count + fortune_level * (fortune_drop.factor or 1)
|
local max_count = fortune_drop.max_count + fortune_level * (fortune_drop.factor or 1)
|
||||||
local chance = fortune_drop.chance or fortune_drop.get_chance and fortune_drop.get_chance(fortune_level)
|
local chance = fortune_drop.chance or fortune_drop.get_chance and fortune_drop.get_chance(fortune_level)
|
||||||
if not chance or math.random() < chance then
|
if not chance or math.random() < chance then
|
||||||
drops = discrete_uniform_distribution(fortune_drop.multiply and drops or fortune_drop.items, min_count, max_count, fortune_drop.cap)
|
drops = discrete_uniform_distribution(fortune_drop.multiply and drops or fortune_drop.items, min_count, max_count,
|
||||||
|
fortune_drop.cap)
|
||||||
elseif fortune_drop.override then
|
elseif fortune_drop.override then
|
||||||
drops = {}
|
drops = {}
|
||||||
end
|
end
|
||||||
|
@ -306,13 +329,13 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
end
|
end
|
||||||
|
|
||||||
if digger and mcl_experience.throw_xp and not silk_touch_drop then
|
if digger and mcl_experience.throw_xp and not silk_touch_drop then
|
||||||
local experience_amount = minetest.get_item_group(dug_node.name,"xp")
|
local experience_amount = minetest.get_item_group(dug_node.name, "xp")
|
||||||
if experience_amount > 0 then
|
if experience_amount > 0 then
|
||||||
mcl_experience.throw_xp(pos, experience_amount)
|
mcl_experience.throw_xp(pos, experience_amount)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
for _,item in ipairs(drops) do
|
for _, item in ipairs(drops) do
|
||||||
local count
|
local count
|
||||||
if type(item) == "string" then
|
if type(item) == "string" then
|
||||||
count = ItemStack(item):get_count()
|
count = ItemStack(item):get_count()
|
||||||
|
@ -321,7 +344,7 @@ function minetest.handle_node_drops(pos, drops, digger)
|
||||||
end
|
end
|
||||||
local drop_item = ItemStack(item)
|
local drop_item = ItemStack(item)
|
||||||
drop_item:set_count(1)
|
drop_item:set_count(1)
|
||||||
for i=1,count do
|
for i = 1, count do
|
||||||
local dpos = table.copy(pos)
|
local dpos = table.copy(pos)
|
||||||
-- Apply offset for plantlike_rooted nodes because of their special shape
|
-- Apply offset for plantlike_rooted nodes because of their special shape
|
||||||
if nodedef and nodedef.drawtype == "plantlike_rooted" and nodedef.walkable then
|
if nodedef and nodedef.drawtype == "plantlike_rooted" and nodedef.walkable then
|
||||||
|
@ -348,7 +371,7 @@ end
|
||||||
function minetest.item_drop(itemstack, dropper, pos)
|
function minetest.item_drop(itemstack, dropper, pos)
|
||||||
if dropper and dropper:is_player() then
|
if dropper and dropper:is_player() then
|
||||||
local v = dropper:get_look_dir()
|
local v = dropper:get_look_dir()
|
||||||
local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
|
local p = vector.offset(pos, 0, 1.2, 0)
|
||||||
local cs = itemstack:get_count()
|
local cs = itemstack:get_count()
|
||||||
if dropper:get_player_control().sneak then
|
if dropper:get_player_control().sneak then
|
||||||
cs = 1
|
cs = 1
|
||||||
|
@ -356,9 +379,9 @@ function minetest.item_drop(itemstack, dropper, pos)
|
||||||
local item = itemstack:take_item(cs)
|
local item = itemstack:take_item(cs)
|
||||||
local obj = minetest.add_item(p, item)
|
local obj = minetest.add_item(p, item)
|
||||||
if obj then
|
if obj then
|
||||||
v.x = v.x*4
|
v.x = v.x * 4
|
||||||
v.y = v.y*4 + 2
|
v.y = v.y * 4 + 2
|
||||||
v.z = v.z*4
|
v.z = v.z * 4
|
||||||
obj:set_velocity(v)
|
obj:set_velocity(v)
|
||||||
-- Force collection delay
|
-- Force collection delay
|
||||||
obj:get_luaentity()._insta_collect = false
|
obj:get_luaentity()._insta_collect = false
|
||||||
|
@ -376,16 +399,16 @@ end
|
||||||
|
|
||||||
local function cxcz(o, cw, one, zero)
|
local function cxcz(o, cw, one, zero)
|
||||||
if cw < 0 then
|
if cw < 0 then
|
||||||
table.insert(o, { [one]=1, y=0, [zero]=0 })
|
table.insert(o, { [one] = 1, y = 0, [zero] = 0 })
|
||||||
table.insert(o, { [one]=-1, y=0, [zero]=0 })
|
table.insert(o, { [one] = -1, y = 0, [zero] = 0 })
|
||||||
else
|
else
|
||||||
table.insert(o, { [one]=-1, y=0, [zero]=0 })
|
table.insert(o, { [one] = -1, y = 0, [zero] = 0 })
|
||||||
table.insert(o, { [one]=1, y=0, [zero]=0 })
|
table.insert(o, { [one] = 1, y = 0, [zero] = 0 })
|
||||||
end
|
end
|
||||||
return o
|
return o
|
||||||
end
|
end
|
||||||
|
|
||||||
local function hopper_take_item (self, pos)
|
local function hopper_take_item(self, pos)
|
||||||
--mcl_log("self.itemstring: ".. self.itemstring)
|
--mcl_log("self.itemstring: ".. self.itemstring)
|
||||||
--mcl_log("self.itemstring: ".. minetest.pos_to_string(pos))
|
--mcl_log("self.itemstring: ".. minetest.pos_to_string(pos))
|
||||||
|
|
||||||
|
@ -394,17 +417,17 @@ local function hopper_take_item (self, pos)
|
||||||
if objs and self.itemstring then
|
if objs and self.itemstring then
|
||||||
--mcl_log("there is an itemstring. Number of objs: ".. #objs)
|
--mcl_log("there is an itemstring. Number of objs: ".. #objs)
|
||||||
|
|
||||||
for k,v in pairs(objs) do
|
for k, v in pairs(objs) do
|
||||||
local ent = v:get_luaentity()
|
local ent = v:get_luaentity()
|
||||||
|
|
||||||
-- Don't forget actual hoppers
|
-- Don't forget actual hoppers
|
||||||
if ent and ent.name == "mcl_minecarts:hopper_minecart" then
|
if ent and ent.name == "mcl_minecarts:hopper_minecart" then
|
||||||
local taken_items = false
|
local taken_items = false
|
||||||
|
|
||||||
mcl_log("ent.name: ".. tostring(ent.name))
|
mcl_log("ent.name: " .. tostring(ent.name))
|
||||||
mcl_log("ent pos: ".. tostring(ent.object:get_pos()))
|
mcl_log("ent pos: " .. tostring(ent.object:get_pos()))
|
||||||
|
|
||||||
local inv = mcl_entity_invs.load_inv(ent,5)
|
local inv = mcl_entity_invs.load_inv(ent, 5)
|
||||||
|
|
||||||
if not inv then
|
if not inv then
|
||||||
mcl_log("No inv")
|
mcl_log("No inv")
|
||||||
|
@ -428,7 +451,7 @@ local function hopper_take_item (self, pos)
|
||||||
local items_remaining = current_itemstack:get_count()
|
local items_remaining = current_itemstack:get_count()
|
||||||
|
|
||||||
-- This will take part of a floating item stack if no slot can hold the full amount
|
-- This will take part of a floating item stack if no slot can hold the full amount
|
||||||
for i = 1, ent._inv_size,1 do
|
for i = 1, ent._inv_size, 1 do
|
||||||
local stack = inv:get_stack("main", i)
|
local stack = inv:get_stack("main", i)
|
||||||
|
|
||||||
mcl_log("i: " .. tostring(i))
|
mcl_log("i: " .. tostring(i))
|
||||||
|
@ -500,13 +523,13 @@ minetest.register_entity(":__builtin:item", {
|
||||||
hp_max = 1,
|
hp_max = 1,
|
||||||
physical = true,
|
physical = true,
|
||||||
collide_with_objects = false,
|
collide_with_objects = false,
|
||||||
collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
|
collisionbox = { -0.3, -0.3, -0.3, 0.3, 0.3, 0.3 },
|
||||||
pointable = false,
|
pointable = false,
|
||||||
visual = "wielditem",
|
visual = "wielditem",
|
||||||
visual_size = {x = 0.4, y = 0.4},
|
visual_size = { x = 0.4, y = 0.4 },
|
||||||
textures = {""},
|
textures = { "" },
|
||||||
spritediv = {x = 1, y = 1},
|
spritediv = { x = 1, y = 1 },
|
||||||
initial_sprite_basepos = {x = 0, y = 0},
|
initial_sprite_basepos = { x = 0, y = 0 },
|
||||||
is_visible = false,
|
is_visible = false,
|
||||||
infotext = "",
|
infotext = "",
|
||||||
},
|
},
|
||||||
|
@ -544,11 +567,11 @@ minetest.register_entity(":__builtin:item", {
|
||||||
if vel and vel.x == 0 and vel.z == 0 and self.random_velocity > 0 then
|
if vel and vel.x == 0 and vel.z == 0 and self.random_velocity > 0 then
|
||||||
local v = self.random_velocity
|
local v = self.random_velocity
|
||||||
local x = math.random(5, 10) / 10 * v
|
local x = math.random(5, 10) / 10 * v
|
||||||
if math.random(0,10) < 5 then x = -x end
|
if math.random(0, 10) < 5 then x = -x end
|
||||||
local z = math.random(5, 10) / 10 * v
|
local z = math.random(5, 10) / 10 * v
|
||||||
if math.random(0,10) < 5 then z = -z end
|
if math.random(0, 10) < 5 then z = -z end
|
||||||
local y = math.random(2,4)
|
local y = math.random(2, 4)
|
||||||
self.object:set_velocity({x=x, y=y, z=z})
|
self.object:set_velocity(vector.new(x, y, z))
|
||||||
end
|
end
|
||||||
self.random_velocity = 0
|
self.random_velocity = 0
|
||||||
end,
|
end,
|
||||||
|
@ -576,7 +599,7 @@ minetest.register_entity(":__builtin:item", {
|
||||||
local max_count = stack:get_stack_max()
|
local max_count = stack:get_stack_max()
|
||||||
if count > max_count then
|
if count > max_count then
|
||||||
count = max_count
|
count = max_count
|
||||||
self.itemstring = stack:get_name().." "..max_count
|
self.itemstring = stack:get_name() .. " " .. max_count
|
||||||
end
|
end
|
||||||
local itemtable = stack:to_table()
|
local itemtable = stack:to_table()
|
||||||
local itemname = nil
|
local itemname = nil
|
||||||
|
@ -597,9 +620,9 @@ minetest.register_entity(":__builtin:item", {
|
||||||
local prop = {
|
local prop = {
|
||||||
is_visible = true,
|
is_visible = true,
|
||||||
visual = "wielditem",
|
visual = "wielditem",
|
||||||
textures = {itemname},
|
textures = { itemname },
|
||||||
visual_size = {x = s, y = s},
|
visual_size = { x = s, y = s },
|
||||||
collisionbox = {-c, -c, -c, c, c, c},
|
collisionbox = { -c, -c, -c, c, c, c },
|
||||||
automatic_rotate = math.pi * 0.5,
|
automatic_rotate = math.pi * 0.5,
|
||||||
infotext = description,
|
infotext = description,
|
||||||
glow = glow,
|
glow = glow,
|
||||||
|
@ -695,9 +718,9 @@ minetest.register_entity(":__builtin:item", {
|
||||||
self._forcestart = nil
|
self._forcestart = nil
|
||||||
self._forcetimer = 0
|
self._forcetimer = 0
|
||||||
|
|
||||||
self.object:set_armor_groups({immortal = 1})
|
self.object:set_armor_groups({ immortal = 1 })
|
||||||
-- self.object:set_velocity({x = 0, y = 2, z = 0})
|
-- self.object:set_velocity(vector.new(0, 2, 0))
|
||||||
self.object:set_acceleration({x = 0, y = -get_gravity(), z = 0})
|
self.object:set_acceleration(vector.new(0, -get_gravity(), 0))
|
||||||
self:set_item(self.itemstring)
|
self:set_item(self.itemstring)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
@ -710,9 +733,9 @@ minetest.register_entity(":__builtin:item", {
|
||||||
local stack = ItemStack(entity.itemstring)
|
local stack = ItemStack(entity.itemstring)
|
||||||
local name = stack:get_name()
|
local name = stack:get_name()
|
||||||
if own_stack:get_name() ~= name or
|
if own_stack:get_name() ~= name or
|
||||||
own_stack:get_meta() ~= stack:get_meta() or
|
own_stack:get_meta() ~= stack:get_meta() or
|
||||||
own_stack:get_wear() ~= stack:get_wear() or
|
own_stack:get_wear() ~= stack:get_wear() or
|
||||||
own_stack:get_free_space() == 0 then
|
own_stack:get_free_space() == 0 then
|
||||||
-- Can not merge different or full stack
|
-- Can not merge different or full stack
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
@ -745,8 +768,8 @@ minetest.register_entity(":__builtin:item", {
|
||||||
self.object:set_properties({
|
self.object:set_properties({
|
||||||
physical = false
|
physical = false
|
||||||
})
|
})
|
||||||
self.object:set_velocity({x=0,y=0,z=0})
|
self.object:set_velocity(vector.zero())
|
||||||
self.object:set_acceleration({x=0,y=0,z=0})
|
self.object:set_acceleration(vector.zero())
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
self.age = self.age + dtime
|
self.age = self.age + dtime
|
||||||
|
@ -761,21 +784,22 @@ minetest.register_entity(":__builtin:item", {
|
||||||
-- Delete corrupted item entities. The itemstring MUST be non-empty on its first step,
|
-- Delete corrupted item entities. The itemstring MUST be non-empty on its first step,
|
||||||
-- otherwise there might have some data corruption.
|
-- otherwise there might have some data corruption.
|
||||||
if self.itemstring == "" then
|
if self.itemstring == "" then
|
||||||
minetest.log("warning", "Item entity with empty itemstring found at "..minetest.pos_to_string(self.object:get_pos()).. "! Deleting it now.")
|
minetest.log("warning",
|
||||||
|
"Item entity with empty itemstring found at " .. minetest.pos_to_string(self.object:get_pos()) ..
|
||||||
|
"! Deleting it now.")
|
||||||
self._removed = true
|
self._removed = true
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local p = self.object:get_pos()
|
local p = self.object:get_pos()
|
||||||
|
|
||||||
-- If hopper has taken item, it has gone, and no operations should be conducted on this item
|
-- If hopper has taken item, it has gone, and no operations should be conducted on this item
|
||||||
if hopper_take_item(self, p) then
|
if hopper_take_item(self, p) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local node = minetest.get_node_or_nil(p)
|
local node = minetest.get_node(p)
|
||||||
local in_unloaded = (node == nil)
|
local in_unloaded = node.name == "ignore"
|
||||||
|
|
||||||
if in_unloaded then
|
if in_unloaded then
|
||||||
-- Don't infinetly fall into unloaded map
|
-- Don't infinetly fall into unloaded map
|
||||||
|
@ -785,27 +809,27 @@ minetest.register_entity(":__builtin:item", {
|
||||||
|
|
||||||
if self.is_clock then
|
if self.is_clock then
|
||||||
self.object:set_properties({
|
self.object:set_properties({
|
||||||
textures = {"mcl_clock:clock_" .. (mcl_worlds.clock_works(p) and mcl_clock.old_time or mcl_clock.random_frame)}
|
textures = { "mcl_clock:clock_" .. (mcl_worlds.clock_works(p) and mcl_clock.old_time or mcl_clock.random_frame) }
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
local nn = node.name
|
local nn = node.name
|
||||||
local is_in_water = (minetest.get_item_group(nn, "liquid") ~= 0)
|
local is_in_water = (minetest.get_item_group(nn, "liquid") ~= 0)
|
||||||
local nn_above = minetest.get_node({x=p.x, y=p.y+0.1, z=p.z}).name
|
local nn_above = minetest.get_node(vector.offset(p, 0, 0.1, 0)).name
|
||||||
-- make sure it's more or less stationary and is at water level
|
-- make sure it's more or less stationary and is at water level
|
||||||
local sleep_threshold = 0.3
|
local sleep_threshold = 0.3
|
||||||
local is_floating = false
|
local is_floating = false
|
||||||
local is_stationary = math.abs(self.object:get_velocity().x) < sleep_threshold
|
local is_stationary = math.abs(self.object:get_velocity().x) < sleep_threshold
|
||||||
and math.abs(self.object:get_velocity().y) < sleep_threshold
|
and math.abs(self.object:get_velocity().y) < sleep_threshold
|
||||||
and math.abs(self.object:get_velocity().z) < sleep_threshold
|
and math.abs(self.object:get_velocity().z) < sleep_threshold
|
||||||
if is_in_water and is_stationary then
|
if is_in_water and is_stationary then
|
||||||
is_floating = (is_in_water
|
is_floating = (is_in_water
|
||||||
and (minetest.get_item_group(nn_above, "liquid") == 0))
|
and (minetest.get_item_group(nn_above, "liquid") == 0))
|
||||||
end
|
end
|
||||||
|
|
||||||
if is_floating and self.physical_state == true then
|
if is_floating and self.physical_state == true then
|
||||||
self.object:set_velocity({x = 0, y = 0, z = 0})
|
self.object:set_velocity(vector.zero())
|
||||||
self.object:set_acceleration({x = 0, y = 0, z = 0})
|
self.object:set_acceleration(vector.zero())
|
||||||
disable_physics(self.object, self)
|
disable_physics(self.object, self)
|
||||||
end
|
end
|
||||||
-- If no collector was found for a long enough time, declare the magnet as disabled
|
-- If no collector was found for a long enough time, declare the magnet as disabled
|
||||||
|
@ -825,7 +849,7 @@ minetest.register_entity(":__builtin:item", {
|
||||||
--Wait 2 seconds to allow mob drops to be cooked, & picked up instead of instantly destroyed.
|
--Wait 2 seconds to allow mob drops to be cooked, & picked up instead of instantly destroyed.
|
||||||
if self.age > 2 and minetest.get_item_group(self.itemstring, "fire_immune") == 0 then
|
if self.age > 2 and minetest.get_item_group(self.itemstring, "fire_immune") == 0 then
|
||||||
if dg ~= 2 then
|
if dg ~= 2 then
|
||||||
minetest.sound_play("builtin_item_lava", {pos = self.object:get_pos(), gain = 0.5})
|
minetest.sound_play("builtin_item_lava", { pos = self.object:get_pos(), gain = 0.5 })
|
||||||
end
|
end
|
||||||
self._removed = true
|
self._removed = true
|
||||||
self.object:remove()
|
self.object:remove()
|
||||||
|
@ -865,7 +889,7 @@ minetest.register_entity(":__builtin:item", {
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check which one of the 4 sides is free
|
-- Check which one of the 4 sides is free
|
||||||
for o=1, #order do
|
for o = 1, #order do
|
||||||
local nn = minetest.get_node(vector.add(p, order[o])).name
|
local nn = minetest.get_node(vector.add(p, order[o])).name
|
||||||
local def = minetest.registered_nodes[nn]
|
local def = minetest.registered_nodes[nn]
|
||||||
if def and def.walkable == false and nn ~= "ignore" then
|
if def and def.walkable == false and nn ~= "ignore" then
|
||||||
|
@ -875,7 +899,7 @@ minetest.register_entity(":__builtin:item", {
|
||||||
end
|
end
|
||||||
-- If none of the 4 sides is free, shoot upwards
|
-- If none of the 4 sides is free, shoot upwards
|
||||||
if shootdir == nil then
|
if shootdir == nil then
|
||||||
shootdir = { x=0, y=1, z=0 }
|
shootdir = vector.new(0, 1, 0)
|
||||||
local nn = minetest.get_node(vector.add(p, shootdir)).name
|
local nn = minetest.get_node(vector.add(p, shootdir)).name
|
||||||
if nn == "ignore" then
|
if nn == "ignore" then
|
||||||
-- Do not push into ignore
|
-- Do not push into ignore
|
||||||
|
@ -885,7 +909,7 @@ minetest.register_entity(":__builtin:item", {
|
||||||
|
|
||||||
-- Set new item moving speed accordingly
|
-- Set new item moving speed accordingly
|
||||||
local newv = vector.multiply(shootdir, 3)
|
local newv = vector.multiply(shootdir, 3)
|
||||||
self.object:set_acceleration({x = 0, y = 0, z = 0})
|
self.object:set_acceleration(vector.zero())
|
||||||
self.object:set_velocity(newv)
|
self.object:set_velocity(newv)
|
||||||
disable_physics(self.object, self, false, false)
|
disable_physics(self.object, self, false, false)
|
||||||
|
|
||||||
|
@ -907,10 +931,10 @@ minetest.register_entity(":__builtin:item", {
|
||||||
if self._forcetimer > 0 then
|
if self._forcetimer > 0 then
|
||||||
local cbox = self.object:get_properties().collisionbox
|
local cbox = self.object:get_properties().collisionbox
|
||||||
local ok = false
|
local ok = false
|
||||||
if self._force.x > 0 and (p.x > (self._forcestart.x + 0.5 + (cbox[4] - cbox[1])/2)) then ok = true
|
if self._force.x > 0 and (p.x > (self._forcestart.x + 0.5 + (cbox[4] - cbox[1]) / 2)) then ok = true
|
||||||
elseif self._force.x < 0 and (p.x < (self._forcestart.x + 0.5 - (cbox[4] - cbox[1])/2)) then ok = true
|
elseif self._force.x < 0 and (p.x < (self._forcestart.x + 0.5 - (cbox[4] - cbox[1]) / 2)) then ok = true
|
||||||
elseif self._force.z > 0 and (p.z > (self._forcestart.z + 0.5 + (cbox[6] - cbox[3])/2)) then ok = true
|
elseif self._force.z > 0 and (p.z > (self._forcestart.z + 0.5 + (cbox[6] - cbox[3]) / 2)) then ok = true
|
||||||
elseif self._force.z < 0 and (p.z < (self._forcestart.z + 0.5 - (cbox[6] - cbox[3])/2)) then ok = true end
|
elseif self._force.z < 0 and (p.z < (self._forcestart.z + 0.5 - (cbox[6] - cbox[3]) / 2)) then ok = true end
|
||||||
-- Item was successfully forced out. No more pushing
|
-- Item was successfully forced out. No more pushing
|
||||||
if ok then
|
if ok then
|
||||||
self._forcetimer = -1
|
self._forcetimer = -1
|
||||||
|
@ -941,7 +965,7 @@ minetest.register_entity(":__builtin:item", {
|
||||||
-- Set new item moving speed into the direciton of the liquid
|
-- Set new item moving speed into the direciton of the liquid
|
||||||
local newv = vector.multiply(vec, f)
|
local newv = vector.multiply(vec, f)
|
||||||
-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
|
-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
|
||||||
self.object:set_acceleration({x = newv.x, y = -0.22, z = newv.z})
|
self.object:set_acceleration(vector.new(newv.x, -0.22, newv.z))
|
||||||
|
|
||||||
self.physical_state = true
|
self.physical_state = true
|
||||||
self._flowing = true
|
self._flowing = true
|
||||||
|
@ -954,9 +978,10 @@ minetest.register_entity(":__builtin:item", {
|
||||||
local cur_vec = self.object:get_velocity()
|
local cur_vec = self.object:get_velocity()
|
||||||
-- apply some acceleration in the opposite direction so it doesn't slide forever
|
-- apply some acceleration in the opposite direction so it doesn't slide forever
|
||||||
local vec = {
|
local vec = {
|
||||||
x = 0 -cur_vec.x*0.9,
|
x = 0 - cur_vec.x * 0.9,
|
||||||
y = 3 -cur_vec.y*0.9,
|
y = 3 - cur_vec.y * 0.9,
|
||||||
z = 0 -cur_vec.z*0.9}
|
z = 0 - cur_vec.z * 0.9
|
||||||
|
}
|
||||||
self.object:set_acceleration(vec)
|
self.object:set_acceleration(vec)
|
||||||
-- slow down the item in water
|
-- slow down the item in water
|
||||||
local vel = self.object:get_velocity()
|
local vel = self.object:get_velocity()
|
||||||
|
@ -980,20 +1005,20 @@ minetest.register_entity(":__builtin:item", {
|
||||||
end
|
end
|
||||||
|
|
||||||
-- If node is not registered or node is walkably solid and resting on nodebox
|
-- If node is not registered or node is walkably solid and resting on nodebox
|
||||||
local nn = minetest.get_node({x=p.x, y=p.y-0.5, z=p.z}).name
|
local nn = minetest.get_node(vector.offset(p, 0, -0.5, 0)).name
|
||||||
local def = minetest.registered_nodes[nn]
|
local def = minetest.registered_nodes[nn]
|
||||||
local v = self.object:get_velocity()
|
local v = self.object:get_velocity()
|
||||||
local is_on_floor = def and (def.walkable
|
local is_on_floor = def and (def.walkable
|
||||||
and not def.groups.slippery and v.y == 0)
|
and not def.groups.slippery and v.y == 0)
|
||||||
|
|
||||||
if not minetest.registered_nodes[nn]
|
if not minetest.registered_nodes[nn]
|
||||||
or is_floating or is_on_floor then
|
or is_floating or is_on_floor then
|
||||||
local own_stack = ItemStack(self.object:get_luaentity().itemstring)
|
local own_stack = ItemStack(self.object:get_luaentity().itemstring)
|
||||||
-- Merge with close entities of the same item
|
-- Merge with close entities of the same item
|
||||||
for _, object in pairs(minetest.get_objects_inside_radius(p, 0.8)) do
|
for _, object in pairs(minetest.get_objects_inside_radius(p, 0.8)) do
|
||||||
local obj = object:get_luaentity()
|
local obj = object:get_luaentity()
|
||||||
if obj and obj.name == "__builtin:item"
|
if obj and obj.name == "__builtin:item"
|
||||||
and obj.physical_state == false then
|
and obj.physical_state == false then
|
||||||
if self:try_merge_with(own_stack, object, obj) then
|
if self:try_merge_with(own_stack, object, obj) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
# textdomain: mcl_minecarts
|
||||||
|
Minecart=トロッコ
|
||||||
|
Minecarts can be used for a quick transportion on rails.=トロッコは、レールを使った高速輸送を可能にします。
|
||||||
|
Minecarts only ride on rails and always follow the tracks. At a T-junction with no straight way ahead, they turn left. The speed is affected by the rail type.=トロッコはレール上にしか乗らない為、常に線路に沿って走ります。直進できない丁字路では、取り敢えず左折します。速度はレールの種類によって異なります。
|
||||||
|
You can place the minecart on rails. Right-click it to enter it. Punch it to get it moving.=レールの上にトロッコを置けます。右クリックで乗り込みます。パンチすると動き出します。
|
||||||
|
To obtain the minecart, punch it while holding down the sneak key.=トロッコを入手するには、スニークキーを押しながらパンチします。
|
||||||
|
A minecart with TNT is an explosive vehicle that travels on rail.=TNT付きトロッコは、レール上を行きかう爆薬車両です。
|
||||||
|
Place it on rails. Punch it to move it. The TNT is ignited with a flint and steel or when the minecart is on an powered activator rail.=レール上に配置。パンチで移動。TNTが着火するのは、火打石と打金を使った時か、稼動中のアクティベーターレール上にトロッコが乗った時です。
|
||||||
|
To obtain the minecart and TNT, punch them while holding down the sneak key. You can't do this if the TNT was ignited.=トロッコとTNTを入手するには、スニークキーを押しながらパンチしてください。TNTに火が着いていた場合は、無理です。
|
||||||
|
A minecart with furnace is a vehicle that travels on rails. It can propel itself with fuel.=かまど付きトロッコは、レール上を走行する車両です。燃料で自走できます。
|
||||||
|
Place it on rails. If you give it some coal, the furnace will start burning for a long time and the minecart will be able to move itself. Punch it to get it moving.=レールの上に置きます。石炭を与えると、かまどが長時間燃え続け、トロッコが自走可能になります。パンチすると動き出します。
|
||||||
|
To obtain the minecart and furnace, punch them while holding down the sneak key.=トロッコとかまどを入手するには、スニークキーを押しながらパンチします。
|
||||||
|
Minecart with Chest=チェスト付きトロッコ
|
||||||
|
Minecart with Furnace=かまど付きトロッコ
|
||||||
|
Minecart with Command Block=コマンドブロック付きトロッコ
|
||||||
|
Minecart with Hopper=ホッパー付きトロッコ
|
||||||
|
Minecart with TNT=TNT付きトロッコ
|
||||||
|
Place them on the ground to build your railway, the rails will automatically connect to each other and will turn into curves, T-junctions, crossings and slopes as needed.=地面に置いて線路を作ると、レール同士が自動的につながり、必要に応じてカーブや丁字路、踏切、坂道などに変化します。
|
||||||
|
Rail=レール
|
||||||
|
Rails can be used to build transport tracks for minecarts. Normal rails slightly slow down minecarts due to friction.=レールを利用して、トロッコの輸送路が敷けます。普通のレールは、摩擦の関係でトロッコが少しずつ減速していきます。
|
||||||
|
Powered Rail=パワードレール
|
||||||
|
Rails can be used to build transport tracks for minecarts. Powered rails are able to accelerate and brake minecarts.=レールを利用して、トロッコの輸送路が敷けます。パワードレールは、トロッコを加速させたり、ブレーキをかけたりできます。
|
||||||
|
Without redstone power, the rail will brake minecarts. To make this rail accelerate minecarts, power it with redstone power.=レッドストーン動力なしだと、このレールはトロッコにブレーキをかけます。このレールでトロッコを加速させるには、レッドストーン動力を供給してください。
|
||||||
|
Activator Rail=アクティベーターレール
|
||||||
|
Rails can be used to build transport tracks for minecarts. Activator rails are used to activate special minecarts.=レールを利用して、トロッコの輸送路が敷けます。アクティベーターレールは、特殊なトロッコを作動させるために使われます。
|
||||||
|
To make this rail activate minecarts, power it with redstone power and send a minecart over this piece of rail.=このレールでトロッコを作動させるには、レッドストーン動力を与えたレール上にトロッコを送り込みます。
|
||||||
|
Detector Rail=
|
||||||
|
Rails can be used to build transport tracks for minecarts. A detector rail is able to detect a minecart above it and powers redstone mechanisms.=レールを利用して、トロッコの輸送路が敷けます。ディテクターレールは、その上にあるトロッコを検知でき、その際レッドストーン機構の動力源となります。
|
||||||
|
To detect a minecart and provide redstone power, connect it to redstone trails or redstone mechanisms and send any minecart over the rail.=トロッコを検知してレッドストーン動力を供給するには、レッドストーン導線またはレッドストーン機構に接続し、任意のトロッコをレール上に送り込みます。
|
||||||
|
Track for minecarts=トロッコ用の線路
|
||||||
|
Speed up when powered, slow down when not powered=稼動中は加速、非稼動中は減速
|
||||||
|
Activates minecarts when powered=稼動中はトロッコを作動
|
||||||
|
Emits redstone power when a minecart is detected=トロッコを検知するとレッドストーン動力を放出
|
||||||
|
Vehicle for fast travel on rails=レール上を快速移動するための車両
|
||||||
|
Can be ignited by tools or powered activator rail=道具や稼動中のアクティベーターレールにより着火が可能
|
||||||
|
Sneak to dismount=スニークで降りる
|
|
@ -2,7 +2,7 @@ local S = minetest.get_translator(minetest.get_current_modname())
|
||||||
|
|
||||||
-- Template rail function
|
-- Template rail function
|
||||||
local function register_rail(itemstring, tiles, def_extras, creative)
|
local function register_rail(itemstring, tiles, def_extras, creative)
|
||||||
local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=1,destroy_by_lava_flow=1, transport=1}
|
local groups = {handy=1,pickaxey=1, attached_node=1,rail=1,connect_to_raillike=minetest.raillike_group("rail"),dig_by_water=0,destroy_by_lava_flow=0, transport=1}
|
||||||
if creative == false then
|
if creative == false then
|
||||||
groups.not_in_creative_inventory = 1
|
groups.not_in_creative_inventory = 1
|
||||||
end
|
end
|
||||||
|
|
Before Width: | Height: | Size: 271 B |
Before Width: | Height: | Size: 285 B |
Before Width: | Height: | Size: 282 B |
Before Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 259 B |
Before Width: | Height: | Size: 260 B |
Before Width: | Height: | Size: 257 B |