forked from upstream/RaycastedAntiESP
Compare commits
654
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17dacdb877 | ||
|
|
395e4a592d | ||
|
|
5e6e249fd4 | ||
|
|
6685d60fc4 | ||
|
|
7f9f6606bc | ||
|
|
e31349db26 | ||
|
|
58bab35223 | ||
|
|
4afe454de9 | ||
|
|
e75c3731b1 | ||
|
|
2556f5b369 | ||
|
|
0243cef884 | ||
|
|
f8fbbd8a74 | ||
|
|
f22133efe8 | ||
|
|
08db0d384f | ||
|
|
0ac8dc372f | ||
|
|
c5a5009fe9 | ||
|
|
aae0060cd4 | ||
|
|
56ff445cb6 | ||
|
|
be880e80c7 | ||
|
|
d80555c016 | ||
|
|
2e33bf9415 | ||
|
|
0f87b90787 | ||
|
|
0a9f115e92 | ||
|
|
ebfa47efbc | ||
|
|
5be167fdb3 | ||
|
|
0799b911a9 | ||
|
|
97d2bc7bdd | ||
|
|
0bd6b4203f | ||
|
|
f4a61f43ff | ||
|
|
9372928ae9 | ||
|
|
68ed857f25 | ||
|
|
30569c711f | ||
|
|
5005b3eb7b | ||
|
|
dd00bdd1fa | ||
|
|
0e1c2815ae | ||
|
|
489db71b2b | ||
|
|
2a821c0ebf | ||
|
|
7115fe6e34 | ||
|
|
323c83c93e | ||
|
|
aa0dc3297a | ||
|
|
cb4c55fdbd | ||
|
|
a6c79d4bbe | ||
|
|
3f8ac5cc5d | ||
|
|
3bd4c5339c | ||
|
|
9f3bb3793a | ||
|
|
baf560546f | ||
|
|
9f27907a83 | ||
|
|
f4eba53f7f | ||
|
|
f60934a023 | ||
|
|
e524d072b2 | ||
|
|
4e1ca5401c | ||
|
|
4381459a69 | ||
|
|
1e7be8637c | ||
|
|
5ee2a18173 | ||
|
|
c98c1c474f | ||
|
|
d3ddb28ec3 | ||
|
|
1a2469cbc4 | ||
|
|
1fc5000782 | ||
|
|
9121c0f4f6 | ||
|
|
5833213c20 | ||
|
|
1d3d3f5b55 | ||
|
|
dcb5af8721 | ||
|
|
ac3745d1e4 | ||
|
|
76d11242f6 | ||
|
|
108ba8a5b4 | ||
|
|
5228e06033 | ||
|
|
7884b02d8a | ||
|
|
fb861860bb | ||
|
|
d7036dd9d6 | ||
|
|
777e31cf59 | ||
|
|
7645335bb6 | ||
|
|
297278b998 | ||
|
|
b3455dfb92 | ||
|
|
2eecde1ee3 | ||
|
|
688f39463b | ||
|
|
fc23764bce | ||
|
|
5a57e44869 | ||
|
|
4318f8b23e | ||
|
|
8b370d0fe2 | ||
|
|
4a8527909a | ||
|
|
eca024118f | ||
|
|
3f814cd6d6 | ||
|
|
2cbe04c6cc | ||
|
|
2151f88f95 | ||
|
|
af387145fa | ||
|
|
8f760b7769 | ||
|
|
b4d35ab9f5 | ||
|
|
1c510322a9 | ||
|
|
dd1dd32391 | ||
|
|
f1342514e0 | ||
|
|
331bd2a4c0 | ||
|
|
a9de49a9a9 | ||
|
|
e2c61cb926 | ||
|
|
036ff55317 | ||
|
|
19c58d5a71 | ||
|
|
6c3d75643a | ||
|
|
587f45f86b | ||
|
|
5eb815010d | ||
|
|
70a0c1d1de | ||
|
|
c59d650a94 | ||
|
|
bcdbdf3c94 | ||
|
|
99eb62a72e | ||
|
|
e17d0b616a | ||
|
|
7c44cc1614 | ||
|
|
d75c5604e0 | ||
|
|
902d0dcf20 | ||
|
|
dbe04d1861 | ||
|
|
a0ffab833e | ||
|
|
e95fb3a97b | ||
|
|
d033cba970 | ||
|
|
c810152fa8 | ||
|
|
28929c0e20 | ||
|
|
8046bbad91 | ||
|
|
59fef9cd5d | ||
|
|
98b31ee4cf | ||
|
|
be5b1b59f6 | ||
|
|
49d8c7cbf7 | ||
|
|
a51ff8beaa | ||
|
|
c3183ef3d4 | ||
|
|
b5e78cc0ff | ||
|
|
3c7fabb52e | ||
|
|
004fc8bec9 | ||
|
|
45c6306482 | ||
|
|
b37624b38f | ||
|
|
5aaa9bd6c9 | ||
|
|
89a2629b77 | ||
|
|
83759a1c61 | ||
|
|
79cf23d04f | ||
|
|
513dfc2b96 | ||
|
|
1632258ae8 | ||
|
|
98b910fd2e | ||
|
|
4c97544ac7 | ||
|
|
d01b080207 | ||
|
|
f167004657 | ||
|
|
260278c380 | ||
|
|
fe864dfb42 | ||
|
|
ee84361f7f | ||
|
|
054b092b10 | ||
|
|
3dfcb5e8a4 | ||
|
|
53ffc67492 | ||
|
|
38d9f794e8 | ||
|
|
19c1db1fec | ||
|
|
38eeba1875 | ||
|
|
d3561e28ca | ||
|
|
702ef77248 | ||
|
|
e347904aa1 | ||
|
|
03d0844907 | ||
|
|
ca41d935aa | ||
|
|
a7764ada31 | ||
|
|
53c3c5cb4c | ||
|
|
a065180096 | ||
|
|
2389ac0f8a | ||
|
|
b12037bbe9 | ||
|
|
6b8abe25cf | ||
|
|
a791eabacb | ||
|
|
ceb0d48554 | ||
|
|
9e7c62dc02 | ||
|
|
4c21c16e3b | ||
|
|
2db473077f | ||
|
|
078cfa8266 | ||
|
|
e7ee8991b9 | ||
|
|
77a7394d22 | ||
|
|
c34bfdb61f | ||
|
|
43e11210cf | ||
|
|
cb39e82485 | ||
|
|
d3756978dc | ||
|
|
fcaffbabcc | ||
|
|
c6e4af9cdb | ||
|
|
335958939b | ||
|
|
12c3894d04 | ||
|
|
50fdebf44b | ||
|
|
f941b6cc7b | ||
|
|
c30aced6be | ||
|
|
7eb515d8c2 | ||
|
|
36ddc2ab4b | ||
|
|
5e13f99fbf | ||
|
|
af1e35cf80 | ||
|
|
1ac28cca35 | ||
|
|
562f203d09 | ||
|
|
a1c0a6d860 | ||
|
|
2e816d92b8 | ||
|
|
3fedbc2a17 | ||
|
|
abd2dab77c | ||
|
|
a7eacf704d | ||
|
|
a55022d4fd | ||
|
|
8b6b0332eb | ||
|
|
79f018cd13 | ||
|
|
5815d327cf | ||
|
|
b76b0c900b | ||
|
|
9c6ab79f1c | ||
|
|
01f37f6e1d | ||
|
|
958c6468b4 | ||
|
|
3977e21568 | ||
|
|
92dfbe9599 | ||
|
|
74f823b1a7 | ||
|
|
7d07e67d5b | ||
|
|
7ddf475e90 | ||
|
|
20bd20b60a | ||
|
|
e858c4e6eb | ||
|
|
5127ebd260 | ||
|
|
f88b482a65 | ||
|
|
a325dcc05f | ||
|
|
186dd11aeb | ||
|
|
4131f0c61b | ||
|
|
5d94735581 | ||
|
|
7d6a4860f6 | ||
|
|
31b6ec3426 | ||
|
|
97703c90d0 | ||
|
|
d9109fcbcd | ||
|
|
ba93e28d09 | ||
|
|
55de301117 | ||
|
|
2da16f39a5 | ||
|
|
ff81ae5d1a | ||
|
|
18472570f4 | ||
|
|
07d563c343 | ||
|
|
6b89ab91e1 | ||
|
|
8b6c2a895f | ||
|
|
eb49446618 | ||
|
|
6d3e768689 | ||
|
|
d828461ce5 | ||
|
|
bf51d0cfb6 | ||
|
|
73cec9faf5 | ||
|
|
af7c1253e2 | ||
|
|
d84b4c4bd8 | ||
|
|
b8998ca936 | ||
|
|
2363190bbf | ||
|
|
7068eec49e | ||
|
|
516f4425a7 | ||
|
|
5c541178a4 | ||
|
|
acab9879e1 | ||
|
|
d1c7efa586 | ||
|
|
21dceabb2f | ||
|
|
ea8e11710c | ||
|
|
72b838921f | ||
|
|
55d770496a | ||
|
|
bfbe635032 | ||
|
|
d560cbbd56 | ||
|
|
a0a3834c13 | ||
|
|
566cd93e8d | ||
|
|
78fcec3f11 | ||
|
|
fbdbcd39e3 | ||
|
|
2f0555c030 | ||
|
|
758263345f | ||
|
|
56ec5ffcb7 | ||
|
|
7e58806271 | ||
|
|
9791348634 | ||
|
|
09a95cc735 | ||
|
|
529b7977d4 | ||
|
|
6f4a6d4b2e | ||
|
|
f57829e7fc | ||
|
|
cf69030c56 | ||
|
|
828f302d5c | ||
|
|
927066adb9 | ||
|
|
7c2fc00a87 | ||
|
|
29890541af | ||
|
|
0ebd1903b1 | ||
|
|
f0cb5d0281 | ||
|
|
300ae927d7 | ||
|
|
54dc47c89f | ||
|
|
60f8ea55b0 | ||
|
|
47e7a08547 | ||
|
|
e2089aace3 | ||
|
|
cef2a0e7ee | ||
|
|
609fa9f9f4 | ||
|
|
383bfe0abe | ||
|
|
bd2c0f0c62 | ||
|
|
08dff2867f | ||
|
|
84114b3325 | ||
|
|
30f78ab351 | ||
|
|
0d8eec08ae | ||
|
|
79d67832ac | ||
|
|
8429c33791 | ||
|
|
ddc5052741 | ||
|
|
9aff6869d1 | ||
|
|
09f92498fc | ||
|
|
47182ad24a | ||
|
|
e1a7a9b278 | ||
|
|
5390965693 | ||
|
|
75e7a3ddff | ||
|
|
17c0db3980 | ||
|
|
13e6ece4ae | ||
|
|
dfe1ff6f9c | ||
|
|
c84993571a | ||
|
|
a2efea0060 | ||
|
|
15d30ce397 | ||
|
|
5baeb75619 | ||
|
|
11ef7e6388 | ||
|
|
6c1b3fdc7c | ||
|
|
1a25c49271 | ||
|
|
001e8b3688 | ||
|
|
22c1321873 | ||
|
|
167b4be8b8 | ||
|
|
0a5c130cd1 | ||
|
|
eb64d03d05 | ||
|
|
95d14e97b3 | ||
|
|
c1e71c52aa | ||
|
|
18e1857d83 | ||
|
|
6a1214e126 | ||
|
|
6b1f9cf24f | ||
|
|
96dec1d654 | ||
|
|
b6507cb052 | ||
|
|
5f27b1da1f | ||
|
|
433a09b7c6 | ||
|
|
a57dba3ff4 | ||
|
|
5f34f0cc6f | ||
|
|
c09a69381f | ||
|
|
44f9bf4196 | ||
|
|
973e500c9f | ||
|
|
f436f31dea | ||
|
|
a6b9d34bab | ||
|
|
b5ef1d7ac4 | ||
|
|
516197aa36 | ||
|
|
08212cdb78 | ||
|
|
4658e99bd9 | ||
|
|
f74d6c90e8 | ||
|
|
26e830bdd0 | ||
|
|
0fb6d31cde | ||
|
|
07b2c50edc | ||
|
|
be9796c712 | ||
|
|
433f873f82 | ||
|
|
914909039e | ||
|
|
92c5a9f4d1 | ||
|
|
bfaa8605f0 | ||
|
|
55f68eed8c | ||
|
|
2634b1a59e | ||
|
|
dd4d0476dd | ||
|
|
b6bb3abd28 | ||
|
|
a70ecf0b9d | ||
|
|
40b7d9e58d | ||
|
|
05e2caaf43 | ||
|
|
4030db77c7 | ||
|
|
d2913e2c64 | ||
|
|
9f5fa5cd3a | ||
|
|
2f92860f76 | ||
|
|
4d06bac9a3 | ||
|
|
7b63d6b352 | ||
|
|
1fe44a8e45 | ||
|
|
bb3f06a070 | ||
|
|
c9ee55f864 | ||
|
|
5654216ac3 | ||
|
|
351397852c | ||
|
|
6532fb619c | ||
|
|
ae63a4c56f | ||
|
|
ae4ff7c593 | ||
|
|
e016d4339f | ||
|
|
d1071427d1 | ||
|
|
c4d56582d8 | ||
|
|
266e04aa0c | ||
|
|
cf0240b940 | ||
|
|
1eee0946a3 | ||
|
|
f49f58749b | ||
|
|
8e06c4a3d8 | ||
|
|
1f5e428023 | ||
|
|
96a92e95e9 | ||
|
|
5e80239c14 | ||
|
|
8943800c59 | ||
|
|
858b08d558 | ||
|
|
625218513f | ||
|
|
e9cd8a031e | ||
|
|
4d161ca0a2 | ||
|
|
6a92d4de18 | ||
|
|
b8ecbf3636 | ||
|
|
e53fad05e3 | ||
|
|
8138e326b6 | ||
|
|
a31ba406c6 | ||
|
|
2237edc1fd | ||
|
|
f8ec2b7000 | ||
|
|
00ee95a537 | ||
|
|
0e31708380 | ||
|
|
5a3b083928 | ||
|
|
a9cc1ab604 | ||
|
|
4d20087dfa | ||
|
|
b8236c2e6d | ||
|
|
d3d67de973 | ||
|
|
96ee9c6931 | ||
|
|
b184eda584 | ||
|
|
d15420d46a | ||
|
|
b62a008063 | ||
|
|
3e00bbf61b | ||
|
|
359feffdcf | ||
|
|
06978953b1 | ||
|
|
e1fc76df77 | ||
|
|
4153cf4aac | ||
|
|
2d7303eb33 | ||
|
|
b0d8e32202 | ||
|
|
5649f4ad7c | ||
|
|
9e5ad8c0a3 | ||
|
|
57848b81f8 | ||
|
|
2dc2dbb5f7 | ||
|
|
34690d2408 | ||
|
|
90f5ddbe8a | ||
|
|
98edc8968b | ||
|
|
e632a5b98d | ||
|
|
5d8c786ba4 | ||
|
|
bd1edf8332 | ||
|
|
7a003368ff | ||
|
|
542d681bb4 | ||
|
|
500aa72106 | ||
|
|
e9a22ff518 | ||
|
|
fca7cc9d2d | ||
|
|
4486e60ff2 | ||
|
|
f322ab668a | ||
|
|
59059248df | ||
|
|
b499b62745 | ||
|
|
2d7dc391ae | ||
|
|
d81a7bde44 | ||
|
|
149bae4ac2 | ||
|
|
d61be5ba8d | ||
|
|
c06fe81df3 | ||
|
|
9c7dd360a5 | ||
|
|
c58417f15b | ||
|
|
7b6c663510 | ||
|
|
1a97a70d9b | ||
|
|
ee473162bf | ||
|
|
41b41cace6 | ||
|
|
01cd0d04da | ||
|
|
7b6aa88e0f | ||
|
|
dbef12eb7b | ||
|
|
15f5d77bae | ||
|
|
f45c85a838 | ||
|
|
8cdad10f14 | ||
|
|
ae98d76ded | ||
|
|
3f1e3a170d | ||
|
|
3c053dbacc | ||
|
|
1e0f08083e | ||
|
|
ae66f039f7 | ||
|
|
5224317545 | ||
|
|
6a3a8b5768 | ||
|
|
4eeb2b5d06 | ||
|
|
0995d546da | ||
|
|
a01ff503f4 | ||
|
|
066c6a32ea | ||
|
|
5d2b6c9f4a | ||
|
|
7a8a7364df | ||
|
|
0072c9ff8e | ||
|
|
d78f562762 | ||
|
|
c6e845527e | ||
|
|
68cb54c0ed | ||
|
|
7c45f6ec4e | ||
|
|
53f0615805 | ||
|
|
dd9d807d92 | ||
|
|
902ed25a5b | ||
|
|
7a90d92c0a | ||
|
|
7ca097b35c | ||
|
|
d0a6c8475e | ||
|
|
b1fa7e7c96 | ||
|
|
70bbb06ee9 | ||
|
|
8193baf9df | ||
|
|
d6e62f11ee | ||
|
|
992dad2775 | ||
|
|
814cf86541 | ||
|
|
f3e4c1cb47 | ||
|
|
0bf28b6951 | ||
|
|
e71e9006fd | ||
|
|
06b3395d03 | ||
|
|
222987baae | ||
|
|
a495d3946d | ||
|
|
7a514d6236 | ||
|
|
26a4d4c10c | ||
|
|
cbb48372ac | ||
|
|
ff31d9085a | ||
|
|
1d93653422 | ||
|
|
db13824a0f | ||
|
|
dba313847c | ||
|
|
c319a6ffd4 | ||
|
|
486e5dcb36 | ||
|
|
20842449af | ||
|
|
027f62727a | ||
|
|
3ae7ca0d2e | ||
|
|
3fa02c2561 | ||
|
|
32a0b94f61 | ||
|
|
e28b7b6f23 | ||
|
|
2fc7e50145 | ||
|
|
c56ee078c9 | ||
|
|
4400151878 | ||
|
|
50d0e54687 | ||
|
|
2f15ca9d5b | ||
|
|
f6535848c0 | ||
|
|
4b96935f34 | ||
|
|
40b99d5c43 | ||
|
|
e448e18472 | ||
|
|
d806ae3c0b | ||
|
|
34fe60a7ae | ||
|
|
0ff67e11a7 | ||
|
|
98eaf72cae | ||
|
|
e5c7f6ef90 | ||
|
|
da73bb26ec | ||
|
|
bd57a9b72c | ||
|
|
116f5e8e03 | ||
|
|
bcfdd731e2 | ||
|
|
e83ec5e6a2 | ||
|
|
2b48e7e8d2 | ||
|
|
38c39aecc5 | ||
|
|
70ec4c212f | ||
|
|
d5026d28d4 | ||
|
|
df5e9f6ca8 | ||
|
|
7f1a284eae | ||
|
|
87aba0e2b5 | ||
|
|
d46d63668b | ||
|
|
83a278b00a | ||
|
|
c1e0db5613 | ||
|
|
34db141f08 | ||
|
|
61831a813a | ||
|
|
a68bcfdbf5 | ||
|
|
9ca8b4ee3a | ||
|
|
77825067de | ||
|
|
635f407c3a | ||
|
|
c18b30da36 | ||
|
|
b524cfdf10 | ||
|
|
968c803106 | ||
|
|
77c5a18433 | ||
|
|
085fa59e42 | ||
|
|
2db88a4498 | ||
|
|
081e762c5c | ||
|
|
1733fd1884 | ||
|
|
773378e6cb | ||
|
|
ac67aa8786 | ||
|
|
40bbaeb5ff | ||
|
|
76f5816162 | ||
|
|
1201ff1370 | ||
|
|
e9935f0350 | ||
|
|
11f1c6ecb7 | ||
|
|
0a6302674d | ||
|
|
4283dfd87b | ||
|
|
9d01af18f3 | ||
|
|
77dd9bb31a | ||
|
|
47f862323b | ||
|
|
c356ed0172 | ||
|
|
8d39fa5427 | ||
|
|
7e0725c538 | ||
|
|
b958d0dc46 | ||
|
|
e9adb65690 | ||
|
|
6a289c81a9 | ||
|
|
34b04ff059 | ||
|
|
1a73c2509a | ||
|
|
e3731f76f0 | ||
|
|
bd1f6ad482 | ||
|
|
951e4f4ad9 | ||
|
|
114746aeaf | ||
|
|
9dc9652917 | ||
|
|
b97f675159 | ||
|
|
f5e16fc75d | ||
|
|
6dc3f2f84e | ||
|
|
8e76557a88 | ||
|
|
f76e2bbcf7 | ||
|
|
c228cef24a | ||
|
|
098aab5e31 | ||
|
|
31b500bc7b | ||
|
|
d5e3281cf2 | ||
|
|
98dbefd576 | ||
|
|
4dce9b3278 | ||
|
|
d5bf02b4ea | ||
|
|
ed98e2abeb | ||
|
|
9a07bd0119 | ||
|
|
87cd59b346 | ||
|
|
74aca26910 | ||
|
|
25f5652a12 | ||
|
|
7679f08d06 | ||
|
|
7ad99917d1 | ||
|
|
ce56eb316e | ||
|
|
74426d80af | ||
|
|
fdb1f567ac | ||
|
|
e823f7a2f7 | ||
|
|
7c1f7fd2a6 | ||
|
|
c26e6a1623 | ||
|
|
8155903342 | ||
|
|
f2ade6b0b8 | ||
|
|
f486d1fc2e | ||
|
|
50eeab8cfe | ||
|
|
4009fe6d02 | ||
|
|
b7e6fa9c5f | ||
|
|
dcc986c232 | ||
|
|
95cea9f875 | ||
|
|
a151bdbeca | ||
|
|
6d288de95b | ||
|
|
aa0ebdbc93 | ||
|
|
af50b9c69c | ||
|
|
963fbbe9be | ||
|
|
02ef0c3343 | ||
|
|
1ac6e6b50b | ||
|
|
f1dfe64d67 | ||
|
|
6e8d47b96e | ||
|
|
f04b79bb4a | ||
|
|
bf17a65246 | ||
|
|
3d4702e520 | ||
|
|
266302f09c | ||
|
|
ac130a739e | ||
|
|
dcc316e7e7 | ||
|
|
754214fa8d | ||
|
|
a6f47f137c | ||
|
|
97e43e65f8 | ||
|
|
ef81d97eef | ||
|
|
36d75c8933 | ||
|
|
b37f8465aa | ||
|
|
3d34992fcc | ||
|
|
4602dde7df | ||
|
|
a81d5caa45 | ||
|
|
7ef25e5dc3 | ||
|
|
529ab3f583 | ||
|
|
951883cb1b | ||
|
|
08113b57ba | ||
|
|
63e9c8bea1 | ||
|
|
1d14468924 | ||
|
|
5378fd5907 | ||
|
|
5e8d8bb43e | ||
|
|
da5c68b07c | ||
|
|
0f9af7c217 | ||
|
|
1fd227e8ba | ||
|
|
e4c653fe6a | ||
|
|
f2dc9f7d18 | ||
|
|
8998338563 | ||
|
|
361bbf84bc | ||
|
|
384393358c | ||
|
|
9c2d542f3c | ||
|
|
ab930c4c30 | ||
|
|
1f64514366 | ||
|
|
398592225e | ||
|
|
a95b79d428 | ||
|
|
67c9758a96 | ||
|
|
f555249cc9 | ||
|
|
5e4bc1f0fb | ||
|
|
53d49cf542 | ||
|
|
9b34fa51a0 | ||
|
|
573d8331dc | ||
|
|
333b211b00 | ||
|
|
81718b8848 | ||
|
|
6084a373c8 | ||
|
|
f22f6db331 | ||
|
|
4c7733420f | ||
|
|
88c004997d | ||
|
|
8eb18e8793 | ||
|
|
f56a4e147b | ||
|
|
651668b62e | ||
|
|
1e4f45d4ee | ||
|
|
0bab09e26b | ||
|
|
848e0ccbe8 | ||
|
|
ee402042e6 | ||
|
|
744bc97f0f | ||
|
|
c27da66cf0 | ||
|
|
0039ee0e0f | ||
|
|
1c8347ecb4 | ||
|
|
9e86c1680d | ||
|
|
065f2e2a17 | ||
|
|
3cba095d77 | ||
|
|
24f99bebfb | ||
|
|
f650cda9f6 | ||
|
|
392b503223 | ||
|
|
d66b270051 | ||
|
|
fa7fd4fdd7 | ||
|
|
d8d81c4662 | ||
|
|
b338dc2175 | ||
|
|
3ab250e4ef | ||
|
|
231d2bc7d1 | ||
|
|
d10865070b |
No files matched your search
@@ -0,0 +1,15 @@
|
||||
# These are supported funding model platforms
|
||||
|
||||
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
||||
patreon: # Replace with a single Patreon username
|
||||
open_collective: # Replace with a single Open Collective username
|
||||
ko_fi: cubicake
|
||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||
liberapay: # Replace with a single Liberapay username
|
||||
issuehunt: # Replace with a single IssueHunt username
|
||||
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||
polar: # Replace with a single Polar username
|
||||
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
|
||||
thanks_dev: # Replace with a single thanks.dev username
|
||||
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||
@@ -0,0 +1,26 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: "[Bug]: xyz"
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behaviour. A video or images may be helpful here.
|
||||
|
||||
**Expected behavior**
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**General debugging information**
|
||||
- Any relevant crash or console logs
|
||||
- The output of `/raycastedentityocclusions`
|
||||
- The output of `/raycastedentityocclusions config-values`
|
||||
- The link returned by `/spark profiler start --timeout 11`
|
||||
|
||||
**Additional context**
|
||||
Add any other context about the problem here.
|
||||
@@ -0,0 +1,20 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: "[Feature Request]"
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Is your feature request related to a problem? Please describe.**
|
||||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
|
||||
|
||||
**Describe the solution you'd like**
|
||||
A clear and concise description of what you want to happen.
|
||||
|
||||
**Describe alternatives you've considered**
|
||||
A clear and concise description of any alternative solutions or features you've considered.
|
||||
|
||||
**Additional context**
|
||||
Add any other context or screenshots about the feature request here.
|
||||
@@ -1,10 +1,14 @@
|
||||
# User-specific stuff
|
||||
.idea/
|
||||
|
||||
README.md
|
||||
*.md
|
||||
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
# mpeltonen/sbt-idea plugin
|
||||
@@ -114,6 +118,7 @@ gradle-app.setting
|
||||
# Common working directory
|
||||
run/
|
||||
runs/
|
||||
run-1-21-11/
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
||||
@@ -0,0 +1,3 @@
|
||||
[submodule "logging"]
|
||||
path = logging
|
||||
url = https://github.com/Cubicake/CubiLogging.git
|
||||
@@ -0,0 +1,6 @@
|
||||
## Contributions
|
||||
Contributions via pull requests are welcome. Please join our [discord](https://discord.cubi.games) or make an `issue` to discuss any contributions beforehand to make sure they will not conflict with or hinder existing plans.
|
||||
|
||||
A good place to start with contributions is to look for `issue`s flagged with the label `help wanted`.
|
||||
|
||||
You must hold the rights to any code you contribute, and must agree to licence it under the same licence as the rest of the project in perpetuity, explicitly including any and all changes to the project's licence by project maintainers in the future. The project's licence can always be found at [LICENSE.md](LICENSE.md).
|
||||
@@ -1,21 +1,661 @@
|
||||
MIT License
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (c) 2025 Cubicake
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
Preamble
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
@@ -1,26 +1,41 @@
|
||||
This is a simple server-side plugin for PaperMC (May also work with Spigot, this is untested) that hides entities from players if they do not have line-of-sight. All raycasts are run async to reduce performance impact.
|
||||
Use cases:
|
||||
### Latest stable version: v1.6.5 | Latest alpha version: v2.0.0-alpha-2.1
|
||||
|
||||
- To prevent mob nametags from being visible through walls
|
||||
- If the mobs don't exist, you can't see them
|
||||
- Act as an "anticheat" to block players from using mods such as freecam to find entities through walls
|
||||
- This is not an actual anticheat and will not detect freecam, instead just making freecam less useful
|
||||
- Freecam will still be useful for locating structures and features such as caves
|
||||
- Reduce client lag
|
||||
- In servers with large megabases full of item frames, armour stands and other entities, RaycastedEntityOcclusion will prevent these entities from lagging the client unless they are within line-of-sight
|
||||
The latest stable version can currently only be found on Modrinth https://modrinth.com/plugin/raycasted-anti-esp/ or by compiling from `v1.6.x`. The latest alpha version can be found on the [discord](https://discord.cubi.games) or by compiling from `main`.
|
||||
|
||||
Config info:
|
||||
This is a predominantly async plugin for PaperMC and its forks that hides/culls entities (and tile entities) from players if they do not have line-of-sight.
|
||||
|
||||
The config has three settings:
|
||||
The supported versions are 1.21.x PaperMC and Pufferfish. Other server versions and software may work too.
|
||||
|
||||
AlwaysShowRadius: 4
|
||||
RaycastRadius: 64
|
||||
SearchRadius: 72
|
||||
## Use cases:
|
||||
|
||||
Entities inside the AlwaysShowRadius are always shown, even if occluded. This is to prevent nasty surprises when turning a corner quickly.
|
||||
The SearchRadius is a misnomer, it's actually a cubic bounding box around the player within which entities will be checked. If an entity is within the SearchRadius but not the RaycastRadius, it will be automatically hidden.
|
||||
The RaycastRadius is the radius where entities will be checked. If an entity is currently hidden it will run a raycast every tick. This is to quickly detect when the entity becomes visible. If the entity is currently visible, it will only ruun the raycast every 10 ticks to reduce performance impact.
|
||||
- Prevent cheating (anti-esp hacks)
|
||||
- Block usage of pie-ray to locate underground bases
|
||||
- Prevent mods such as mini-maps or cheat clients from displaying the locations of hidden entities
|
||||
- Increase client-side performance for low-end devices
|
||||
- Massive megabases containing hundreds of armour stands, item frames, banners etc can cause performance issues on low-end devices unable to process so many entities. REO will cull those entities for the client, reducing the number of entities to process.
|
||||
- Hide nametags behind walls
|
||||
- Yes, this plugin is a bit overkill for doing that, yes you can do it anyways.
|
||||
|
||||
## Dependencies:
|
||||
- Packetevents (soft depend)
|
||||
- Only needed if you are using the cull-players option and wish for the players to remain in the tablist
|
||||
|
||||
Known issues:
|
||||
- Players are also occluded. This itself is not an issue, however hiding players also removes them from the tab list and command autocomplete.
|
||||
- Due to the nature of the plugin, there will be a short delay once an entity should be visible before it appears, causing it to appear like it "popped" into view
|
||||
## Known issues:
|
||||
- Due to the nature of the plugin, there will be a short delay once an entity should be visible before it appears, causing it to appear like it "popped" into view. This issue is partially resolved by turning engine-mode to 2, and is worse for players with higher ping.
|
||||
|
||||
## v2 performance optimisation notes
|
||||
- `AbstractBlockView#isBlockOccluding`: the hot path is the `ConcurrentHashMap` lookup with a new `ImmutableChunkSectionLocatable` allocated per ray step. A faster map is feasible only if we can avoid per-lookup allocations and keep thread-safety. Options include a per-world map keyed by a packed `long` for chunk section coords (reducing allocations), or a `ThreadLocal` mutable key for lookups. Fastutil primitive maps are not concurrent, so they would require synchronization or per-world locks that can erase the gains; benchmark before adopting.
|
||||
- `AbstractBlockView#getNeedingRecheck`: this is inherently an O(n) scan over tracked tile entities. Avoiding it would require additional state (e.g., a priority queue keyed by next recheck tick) and extra updates whenever visibility/last-checked changes. That design is feasible but significantly more complex and should only be done if profiling shows the scan dominates.
|
||||
- `PacketEventsBlockViewController#ingestChunkAndSetTileEntitiesToHiddenBlocks`: most cost comes from `BaseChunk#getBlockId` inside PacketEvents. From this repo we can only shave minor overhead (e.g., reducing allocations), but meaningful wins likely require PacketEvents exposing bulk palette access or faster block-state retrieval.
|
||||
|
||||
## Versioning:
|
||||
Note that the following versioning information only applies to v2 and beyond.
|
||||
|
||||
RaycastedAntiESP binaries are composed of four distinct modules: the core, Locatable-lib (used for platform-independent location objects), [CubiLogging](https://github.com/Cubicake/CubiLogging/tree/main), and a platform adapter.
|
||||
|
||||
Each of these has its own versioning system. Locatable-lib and the logging api both declare public apis, and follow [Semantic Versioning](https://semver.org/#semantic-versioning-specification-semver). The platform adapter and core do not declare public apis, and thus [cannot follow semantic versioning](https://semver.org/#spec-item-1). They still follow a major.minor.patch versioning system, but which version number increments is less deterministic. Generally, major version bumps will be for when significant refactoring or rewriting has occurred, or a very significant distinct feature has been added or removed. Minor version bumps will be for the addition/removal of smaller distinct features, while patch version bumps are for bug fixes and tweaks or minor addition/removals which are related to the features added/removed in the minor version bumps.
|
||||
|
||||
In addition to the versions for each module, there is also an overall version for each platform binary, which is the version that is advertised in the description and file name, and is used for update checks. This version is a combination of the core and platform adapter versions, in the format `{core version}-PlatformName-{platform adapter version}`. This allows all platforms to share the same first three version numbers, while still allowing for differences in the platform adapter versions.
|
||||
|
||||
## Contributions:
|
||||
Contributions via pull requests are welcome. See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
|
||||
@@ -1,49 +0,0 @@
|
||||
plugins {
|
||||
id 'java'
|
||||
}
|
||||
|
||||
group = 'games.cubi'
|
||||
version = '1.1.0'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
name = "papermc-repo"
|
||||
url = "https://repo.papermc.io/repository/maven-public/"
|
||||
}
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/groups/public/"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
|
||||
}
|
||||
|
||||
def targetJavaVersion = 21
|
||||
java {
|
||||
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
|
||||
sourceCompatibility = javaVersion
|
||||
targetCompatibility = javaVersion
|
||||
if (JavaVersion.current() < javaVersion) {
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.encoding = 'UTF-8'
|
||||
|
||||
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
|
||||
options.release.set(targetJavaVersion)
|
||||
}
|
||||
}
|
||||
|
||||
processResources {
|
||||
def props = [version: version]
|
||||
inputs.properties props
|
||||
filteringCharset 'UTF-8'
|
||||
filesMatching('plugin.yml') {
|
||||
expand props
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
import java.time.Instant
|
||||
|
||||
plugins {
|
||||
id("java-library")
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url = uri("https://repo.codemc.io/repository/maven-releases/") }
|
||||
maven { url = uri("https://repo.codemc.io/repository/maven-snapshots/") }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("org.spongepowered:configurate-core:4.2.0")
|
||||
compileOnly("org.spongepowered:configurate-yaml:4.2.0")
|
||||
|
||||
implementation(project(":locatable-lib"))
|
||||
compileOnly(project(":logging"))
|
||||
}
|
||||
|
||||
val coreVersion = "0.3.1-SNAPSHOT"
|
||||
|
||||
val isRelease = gradle.startParameter.taskNames.any {
|
||||
it.contains("buildRelease")
|
||||
}
|
||||
|
||||
fun getVersionString(): String {
|
||||
if (isRelease) {
|
||||
return coreVersion.substringBefore("-") // Remove any suffixes like "-SNAPSHOT"
|
||||
} else {
|
||||
return coreVersion
|
||||
}
|
||||
}
|
||||
|
||||
fun getBasicVersionString(): String {
|
||||
return if (isRelease) {
|
||||
coreVersion.substringBefore("-") // Remove any suffixes like "-SNAPSHOT"
|
||||
} else {
|
||||
coreVersion
|
||||
}
|
||||
}
|
||||
|
||||
version = getVersionString()
|
||||
|
||||
val commitShort = providers.exec {
|
||||
commandLine("git", "rev-parse", "--short=8", "HEAD")
|
||||
}.standardOutput.asText.map { it.trim() }
|
||||
|
||||
val commitFull = providers.exec {
|
||||
commandLine("git", "rev-parse", "HEAD")
|
||||
}.standardOutput.asText.map { it.trim() }
|
||||
|
||||
val buildTime = providers.provider {
|
||||
Instant.now().toString()
|
||||
}
|
||||
|
||||
tasks {
|
||||
processResources {
|
||||
val gitProps = mapOf(
|
||||
"short_git" to commitShort.get(),
|
||||
"long_git" to commitFull.get(),
|
||||
"build_time" to buildTime.get(),
|
||||
"version" to getBasicVersionString()
|
||||
)
|
||||
inputs.properties(gitProps)
|
||||
filesMatching("build-properties/core.yml") {
|
||||
expand(gitProps)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
toolchain.languageVersion = JavaLanguageVersion.of(21)
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package games.cubi.raycastedantiesp.core;
|
||||
|
||||
import games.cubi.logs.PlatformLogger;
|
||||
import games.cubi.logs.Logger;
|
||||
|
||||
public class Core {
|
||||
|
||||
public static Core instance;
|
||||
|
||||
private Core(PlatformLogger logger) {
|
||||
Logger.init(logger);
|
||||
}
|
||||
|
||||
public static Core initialize(PlatformLogger logger) {
|
||||
if (instance != null) {
|
||||
return instance;
|
||||
}
|
||||
instance = new Core(logger);
|
||||
return instance;
|
||||
}
|
||||
|
||||
public static Core getInstance() {
|
||||
if (instance == null) {
|
||||
Logger.error(new IllegalStateException("Core has not been initialized yet but Core#getInstance called!"),1, Core.class);
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void intelliJStopThinkingThisIsAUtilClass() {}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public record BlockProcessorConfig(BlockProcessorMode mode, boolean trackAllBlocks) implements Config {
|
||||
public static BlockProcessorConfig load(ConfigurationNode root) {
|
||||
ConfigurationNode node = ConfigReader.node(root, "block-processor");
|
||||
String modeName = ConfigReader.string(ConfigReader.node(node, "mode"), "block-processor.mode");
|
||||
BlockProcessorMode mode = BlockProcessorMode.fromString(modeName);
|
||||
if (mode == null) {
|
||||
throw new ConfigLoadException("block-processor.mode has unsupported value '" + modeName + "'");
|
||||
}
|
||||
return new BlockProcessorConfig(
|
||||
mode,
|
||||
ConfigReader.bool(ConfigReader.node(node, "track-all-blocks"), "block-processor.track-all-blocks")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public enum BlockProcessorMode implements ConfigEnum {
|
||||
PACKETEVENTS("packetevents");
|
||||
|
||||
private final String configName;
|
||||
|
||||
BlockProcessorMode(String configName) {
|
||||
this.configName = configName;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return configName;
|
||||
}
|
||||
|
||||
public static @Nullable BlockProcessorMode fromString(String name) {
|
||||
for (BlockProcessorMode mode : values()) {
|
||||
if (mode.configName.equalsIgnoreCase(name)) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getValues() {
|
||||
return new String[] {configName};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.ChunkSectionConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.EntityConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.PlayerConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.SoundEffectsConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.TileEntityConfig;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public record ChecksConfig(PlayerConfig playerConfig, EntityConfig entityConfig, TileEntityConfig tileEntityConfig, SoundEffectsConfig soundEffectsConfig, ChunkSectionConfig chunkSectionConfig) implements Config {
|
||||
public static ChecksConfig load(ConfigurationNode root) {
|
||||
ConfigurationNode checks = ConfigReader.node(root, "checks");
|
||||
return new ChecksConfig(
|
||||
PlayerConfig.load(ConfigReader.node(checks, "player"), "checks.player"),
|
||||
EntityConfig.load(ConfigReader.node(checks, "entity"), "checks.entity"),
|
||||
TileEntityConfig.load(ConfigReader.node(checks, "tile-entity"), "checks.tile-entity"),
|
||||
SoundEffectsConfig.load(ConfigReader.node(checks, "sound-effects"), "checks.sound-effects"),
|
||||
ChunkSectionConfig.load(ConfigReader.node(checks, "chunk-section"), "checks.chunk-section")
|
||||
);
|
||||
}
|
||||
|
||||
public boolean hasRestartOnlyChanges(ChecksConfig startup) {
|
||||
return playerConfig.enabled() != startup.playerConfig.enabled()
|
||||
|| entityConfig.enabled() != startup.entityConfig.enabled()
|
||||
|| tileEntityConfig.enabled() != startup.tileEntityConfig.enabled()
|
||||
|| chunkSectionConfig.enabled() != startup.chunkSectionConfig.enabled();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
public interface Config {
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
public interface ConfigEnum {
|
||||
String[] getValues();
|
||||
|
||||
Registry REGISTRY = new Registry();
|
||||
|
||||
default void register() {
|
||||
REGISTRY.add(this.getClass());
|
||||
}
|
||||
|
||||
static String[] getAllValues() {
|
||||
return REGISTRY.getAllValues();
|
||||
}
|
||||
|
||||
final class Registry {
|
||||
private final Set<Class<? extends ConfigEnum>> enums = new HashSet<>();
|
||||
|
||||
void add(Class<? extends ConfigEnum> e) {
|
||||
enums.add(e);
|
||||
}
|
||||
|
||||
String[] getAllValues() {
|
||||
return enums.stream()
|
||||
.flatMap(e -> Arrays.stream(e.getEnumConstants()[0].getValues()))
|
||||
.toArray(String[]::new);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public interface ConfigExtension<T extends Config> {
|
||||
Class<T> type();
|
||||
|
||||
T load(ConfigurationNode config, BlockProcessorConfig blockProcessorConfig);
|
||||
|
||||
default boolean requiresRestart(T startupConfig, T nextConfig) {
|
||||
return !startupConfig.equals(nextConfig);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
public class ConfigLoadException extends RuntimeException {
|
||||
public ConfigLoadException(String message) {
|
||||
super(message);
|
||||
}
|
||||
|
||||
public ConfigLoadException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,357 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import games.cubi.logs.Logger;
|
||||
import games.cubi.raycastedantiesp.core.config.engine.EngineConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.EntityConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.PlayerConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.TileEntityConfig;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
import org.spongepowered.configurate.yaml.NodeStyle;
|
||||
import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ConfigManager {
|
||||
private static final String REQUIRED_CONFIG_VERSION = "2.0";
|
||||
private static ConfigManager instance;
|
||||
|
||||
private final Supplier<InputStream> resourceSupplier;
|
||||
private final Path dataFolder;
|
||||
private final Path configPath;
|
||||
private final YamlConfigurationLoader loader;
|
||||
private final List<ConfigExtension<? extends Config>> extensions;
|
||||
|
||||
private ConfigurationNode config;
|
||||
private RootConfig startupConfig;
|
||||
private volatile RootConfig activeConfig;
|
||||
|
||||
private ConfigManager(Supplier<InputStream> resourceSupplier, Path dataFolder, List<ConfigExtension<? extends Config>> extensions) {
|
||||
this.resourceSupplier = resourceSupplier;
|
||||
this.dataFolder = dataFolder;
|
||||
this.extensions = List.copyOf(extensions);
|
||||
this.configPath = dataFolder.resolve("config.yml");
|
||||
this.loader = YamlConfigurationLoader.builder()
|
||||
.path(configPath)
|
||||
.nodeStyle(NodeStyle.BLOCK)
|
||||
.build();
|
||||
load();
|
||||
}
|
||||
|
||||
public static ConfigManager initialiseConfigManager(Supplier<InputStream> resourceSupplier, Path dataFolder, List<ConfigExtension<? extends Config>> extensions) {
|
||||
if (instance == null) {
|
||||
instance = new ConfigManager(resourceSupplier, dataFolder, extensions);
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public static ConfigManager get() {
|
||||
if (instance == null) {
|
||||
Logger.errorAndReturn(new RuntimeException("ConfigManager accessed before being initiated. Please report this."), 2, ConfigManager.class);
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
public void load() {
|
||||
ensureConfigFileExists();
|
||||
ConfigurationNode loaded = loadConfigNode();
|
||||
ConfigurationNode defaults = loadBundledDefaults();
|
||||
if (defaults != null && mergeMissing(defaults, loaded)) {
|
||||
saveConfigNode(loaded);
|
||||
}
|
||||
RootConfig parsed = parse(loaded);
|
||||
validateReload(parsed);
|
||||
config = loaded;
|
||||
if (startupConfig == null) {
|
||||
startupConfig = parsed;
|
||||
}
|
||||
activeConfig = parsed;
|
||||
}
|
||||
|
||||
public SetConfigResult setConfigValue(String path, String rawValue) {
|
||||
ConfigurationNode candidate = loadConfigNode();
|
||||
ConfigurationNode target = node(candidate, path);
|
||||
if (target.virtual()) {
|
||||
return SetConfigResult.invalid("Unknown config path: " + path);
|
||||
}
|
||||
|
||||
ConfigReader.setRaw(target, ConfigReader.parseRawValue(rawValue));
|
||||
|
||||
return applyCandidate(candidate, false);
|
||||
}
|
||||
|
||||
public SetConfigResult addConfigListValue(String path, String rawValue) {
|
||||
return mutateConfigListValue(path, rawValue, ListMutation.ADD);
|
||||
}
|
||||
|
||||
public SetConfigResult removeConfigListValue(String path, String rawValue) {
|
||||
return mutateConfigListValue(path, rawValue, ListMutation.REMOVE);
|
||||
}
|
||||
|
||||
private SetConfigResult mutateConfigListValue(String path, String rawValue, ListMutation mutation) {
|
||||
ConfigurationNode candidate = loadConfigNode();
|
||||
ConfigurationNode target = node(candidate, path);
|
||||
if (target.virtual()) {
|
||||
return SetConfigResult.invalid("Unknown config path: " + path);
|
||||
}
|
||||
if (!target.childrenMap().isEmpty()) {
|
||||
return SetConfigResult.invalid(path + " is not a list path");
|
||||
}
|
||||
|
||||
List<Object> values = new ArrayList<>(target.childrenList().stream().map(ConfigurationNode::raw).toList());
|
||||
if (values.isEmpty() && target.raw() != null && !(target.raw() instanceof List<?>)) {
|
||||
return SetConfigResult.invalid(path + " is not a list path");
|
||||
}
|
||||
|
||||
Object parsedValue = ConfigReader.parseRawValue(rawValue);
|
||||
boolean changed = switch (mutation) {
|
||||
case ADD -> {
|
||||
if (values.contains(parsedValue)) {
|
||||
yield false;
|
||||
}
|
||||
values.add(parsedValue);
|
||||
yield true;
|
||||
}
|
||||
case REMOVE -> values.remove(parsedValue);
|
||||
};
|
||||
|
||||
if (!changed) {
|
||||
return SetConfigResult.invalid("No change made for " + path);
|
||||
}
|
||||
|
||||
ConfigReader.setRaw(target, values);
|
||||
return applyCandidate(candidate, true);
|
||||
}
|
||||
|
||||
private SetConfigResult applyCandidate(ConfigurationNode candidate, boolean allowRestartRequired) {
|
||||
RootConfig parsed;
|
||||
try {
|
||||
parsed = parse(candidate);
|
||||
validateReload(parsed);
|
||||
} catch (RestartRequiredException e) {
|
||||
if (!allowRestartRequired) {
|
||||
return SetConfigResult.invalid(e.getMessage());
|
||||
}
|
||||
config = candidate;
|
||||
saveConfigNode(candidate);
|
||||
return SetConfigResult.restartRequired(e.getMessage());
|
||||
} catch (ConfigLoadException e) {
|
||||
return SetConfigResult.invalid(e.getMessage());
|
||||
}
|
||||
|
||||
config = candidate;
|
||||
activeConfig = parsed;
|
||||
saveConfigNode(candidate);
|
||||
return SetConfigResult.ok();
|
||||
}
|
||||
|
||||
public PlayerConfig getPlayerConfig() {
|
||||
return activeConfig.checksConfig().playerConfig();
|
||||
}
|
||||
|
||||
public EntityConfig getEntityConfig() {
|
||||
return activeConfig.checksConfig().entityConfig();
|
||||
}
|
||||
|
||||
public TileEntityConfig getTileEntityConfig() {
|
||||
return activeConfig.checksConfig().tileEntityConfig();
|
||||
}
|
||||
|
||||
public DebugConfig getDebugConfig() {
|
||||
RootConfig current = activeConfig;
|
||||
return current == null ? null : current.debugConfig();
|
||||
}
|
||||
|
||||
public EngineConfig getEngineConfig() {
|
||||
return activeConfig.engineConfig();
|
||||
}
|
||||
|
||||
public BlockProcessorConfig getBlockProcessorConfig() {
|
||||
return activeConfig.blockProcessorConfig();
|
||||
}
|
||||
|
||||
public <T extends Config> T getExtensionConfig(Class<T> type) {
|
||||
return activeConfig.extensionConfig(type);
|
||||
}
|
||||
|
||||
public ConfigurationNode getConfigFile() {
|
||||
return config;
|
||||
}
|
||||
|
||||
public Map<String, Object> getConfigValues() {
|
||||
Map<String, Object> values = new LinkedHashMap<>();
|
||||
collectConfigValues(config, "", values);
|
||||
return values;
|
||||
}
|
||||
|
||||
private RootConfig parse(ConfigurationNode loaded) {
|
||||
String version = ConfigReader.string(ConfigReader.node(loaded, "config-version"), "config-version");
|
||||
if (!REQUIRED_CONFIG_VERSION.equals(version)) {
|
||||
throw new ConfigLoadException("Unsupported config-version '" + version + "'. RaycastedAntiESP requires config-version '2.0'.");
|
||||
}
|
||||
|
||||
ChecksConfig checksConfig = ChecksConfig.load(loaded);
|
||||
EngineConfig engineConfig = EngineConfig.load(loaded);
|
||||
BlockProcessorConfig blockProcessorConfig = BlockProcessorConfig.load(loaded);
|
||||
DebugConfig debugConfig = DebugConfig.load(loaded);
|
||||
Map<Class<? extends Config>, Config> extensionConfigs = new LinkedHashMap<>();
|
||||
for (ConfigExtension<? extends Config> extension : extensions) {
|
||||
extensionConfigs.put(extension.type(), extension.load(loaded, blockProcessorConfig));
|
||||
}
|
||||
|
||||
if (!blockProcessorConfig.trackAllBlocks() && checksConfig.chunkSectionConfig().enabled()) {
|
||||
throw new ConfigLoadException("checks.chunk-section.enabled must be false when block-processor.track-all-blocks is false");
|
||||
}
|
||||
|
||||
return new RootConfig(version, checksConfig, engineConfig, blockProcessorConfig, debugConfig, Map.copyOf(extensionConfigs));
|
||||
}
|
||||
|
||||
private void validateReload(RootConfig next) {
|
||||
if (startupConfig == null) {
|
||||
return;
|
||||
}
|
||||
if (next.engineConfig().mode() != startupConfig.engineConfig().mode()) {
|
||||
throw new RestartRequiredException("engine.mode cannot be changed without a restart");
|
||||
}
|
||||
if (!next.blockProcessorConfig().equals(startupConfig.blockProcessorConfig())) {
|
||||
throw new RestartRequiredException("block-processor cannot be changed without a restart");
|
||||
}
|
||||
if (next.checksConfig().hasRestartOnlyChanges(startupConfig.checksConfig())) {
|
||||
throw new RestartRequiredException("checks cannot be enabled or disabled without a restart");
|
||||
}
|
||||
for (ConfigExtension<? extends Config> extension : extensions) {
|
||||
validateExtensionReload(extension, next);
|
||||
}
|
||||
}
|
||||
|
||||
private <T extends Config> void validateExtensionReload(ConfigExtension<T> extension, RootConfig next) {
|
||||
T startupExtensionConfig = startupConfig.extensionConfig(extension.type());
|
||||
T nextExtensionConfig = next.extensionConfig(extension.type());
|
||||
if (extension.requiresRestart(startupExtensionConfig, nextExtensionConfig)) {
|
||||
throw new RestartRequiredException("block-processor." + extension.type().getSimpleName() + " cannot be changed without a restart");
|
||||
}
|
||||
}
|
||||
|
||||
private void collectConfigValues(ConfigurationNode node, String path, Map<String, Object> values) {
|
||||
if (node.childrenMap().isEmpty() && node.childrenList().isEmpty()) {
|
||||
if (!path.isEmpty() && !node.virtual()) {
|
||||
values.put(path, node.raw());
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (!node.childrenList().isEmpty()) {
|
||||
values.put(path, node.childrenList().stream().map(ConfigurationNode::raw).toList());
|
||||
return;
|
||||
}
|
||||
|
||||
for (Map.Entry<Object, ? extends ConfigurationNode> entry : node.childrenMap().entrySet()) {
|
||||
String key = String.valueOf(entry.getKey());
|
||||
String nextPath = path.isEmpty() ? key : path + "." + key;
|
||||
collectConfigValues(entry.getValue(), nextPath, values);
|
||||
}
|
||||
}
|
||||
|
||||
private void ensureConfigFileExists() {
|
||||
try {
|
||||
Files.createDirectories(dataFolder);
|
||||
if (!Files.exists(configPath)) {
|
||||
InputStream resource = resourceSupplier.get();
|
||||
if (resource != null) {
|
||||
try (resource) {
|
||||
Files.copy(resource, configPath);
|
||||
}
|
||||
} else {
|
||||
Files.createFile(configPath);
|
||||
}
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new ConfigLoadException("Failed to create config.yml", e);
|
||||
}
|
||||
}
|
||||
|
||||
private ConfigurationNode loadConfigNode() {
|
||||
try {
|
||||
return loader.load();
|
||||
} catch (IOException e) {
|
||||
throw new ConfigLoadException("Failed to load config.yml", e);
|
||||
}
|
||||
}
|
||||
|
||||
private ConfigurationNode loadBundledDefaults() {
|
||||
InputStream resource = resourceSupplier.get();
|
||||
if (resource == null) {
|
||||
return null;
|
||||
}
|
||||
try (resource) {
|
||||
return YamlConfigurationLoader.builder()
|
||||
.source(() -> new BufferedReader(new InputStreamReader(resource)))
|
||||
.build()
|
||||
.load();
|
||||
} catch (IOException e) {
|
||||
throw new ConfigLoadException("Failed to load bundled config defaults", e);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean mergeMissing(ConfigurationNode defaults, ConfigurationNode target) {
|
||||
if (target.virtual()) {
|
||||
target.from(defaults);
|
||||
return true;
|
||||
}
|
||||
|
||||
boolean changed = false;
|
||||
if (!defaults.childrenMap().isEmpty()) {
|
||||
for (Map.Entry<Object, ? extends ConfigurationNode> entry : defaults.childrenMap().entrySet()) {
|
||||
changed |= mergeMissing(entry.getValue(), target.node(entry.getKey()));
|
||||
}
|
||||
}
|
||||
return changed;
|
||||
}
|
||||
|
||||
private void saveConfigNode(ConfigurationNode node) {
|
||||
try {
|
||||
loader.save(node);
|
||||
} catch (IOException e) {
|
||||
throw new ConfigLoadException("Failed to save config.yml", e);
|
||||
}
|
||||
}
|
||||
|
||||
private ConfigurationNode node(ConfigurationNode root, String path) {
|
||||
String[] parts = path.split("\\.");
|
||||
return ConfigReader.node(root, parts);
|
||||
}
|
||||
|
||||
private enum ListMutation {
|
||||
ADD,
|
||||
REMOVE
|
||||
}
|
||||
|
||||
private static final class RestartRequiredException extends ConfigLoadException {
|
||||
private RestartRequiredException(String message) {
|
||||
super(message);
|
||||
}
|
||||
}
|
||||
|
||||
public record SetConfigResult(boolean success, boolean restartRequired, String message) {
|
||||
public static SetConfigResult ok() {
|
||||
return new SetConfigResult(true, false, "Config value updated.");
|
||||
}
|
||||
|
||||
public static SetConfigResult restartRequired(String message) {
|
||||
return new SetConfigResult(true, true, message);
|
||||
}
|
||||
|
||||
public static SetConfigResult invalid(String message) {
|
||||
return new SetConfigResult(false, false, message);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
import org.spongepowered.configurate.serialize.SerializationException;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public final class ConfigReader {
|
||||
private ConfigReader() {}
|
||||
|
||||
public static ConfigurationNode node(ConfigurationNode parent, String... path) {
|
||||
return parent.node((Object[]) path);
|
||||
}
|
||||
|
||||
public static String string(ConfigurationNode node, String path) {
|
||||
Object raw = node.raw();
|
||||
if (raw instanceof String value) {
|
||||
return value;
|
||||
}
|
||||
throw invalid(path, "string", raw);
|
||||
}
|
||||
|
||||
public static int integer(ConfigurationNode node, String path) {
|
||||
Object raw = node.raw();
|
||||
if (raw instanceof Number value && value.doubleValue() % 1 == 0) {
|
||||
return value.intValue();
|
||||
}
|
||||
throw invalid(path, "integer", raw);
|
||||
}
|
||||
|
||||
public static boolean bool(ConfigurationNode node, String path) {
|
||||
Object raw = node.raw();
|
||||
if (raw instanceof Boolean value) {
|
||||
return value;
|
||||
}
|
||||
throw invalid(path, "boolean", raw);
|
||||
}
|
||||
|
||||
public static List<String> stringList(ConfigurationNode node, String path) {
|
||||
if (node.virtual() || node.raw() == null) {
|
||||
return List.of();
|
||||
}
|
||||
if (node.childrenList().isEmpty()) {
|
||||
Object raw = node.raw();
|
||||
if (raw instanceof List<?> list && list.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
throw invalid(path, "list of strings", raw);
|
||||
}
|
||||
List<String> values = new ArrayList<>();
|
||||
for (ConfigurationNode child : node.childrenList()) {
|
||||
Object raw = child.raw();
|
||||
if (!(raw instanceof String value)) {
|
||||
throw invalid(path, "list of strings", raw);
|
||||
}
|
||||
values.add(value);
|
||||
}
|
||||
return List.copyOf(values);
|
||||
}
|
||||
|
||||
public static List<Integer> integerList(ConfigurationNode node, String path) {
|
||||
if (node.virtual() || node.raw() == null) {
|
||||
return List.of();
|
||||
}
|
||||
if (node.childrenList().isEmpty()) {
|
||||
Object raw = node.raw();
|
||||
if (raw instanceof List<?> list && list.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
throw invalid(path, "list of integers", raw);
|
||||
}
|
||||
List<Integer> values = new ArrayList<>();
|
||||
for (ConfigurationNode child : node.childrenList()) {
|
||||
Object raw = child.raw();
|
||||
if (!(raw instanceof Number value) || value.doubleValue() % 1 != 0) {
|
||||
throw invalid(path, "list of integers", raw);
|
||||
}
|
||||
int id = value.intValue();
|
||||
if (id < 0) {
|
||||
throw new ConfigLoadException(path + " cannot contain negative block state IDs: " + id);
|
||||
}
|
||||
values.add(id);
|
||||
}
|
||||
return List.copyOf(values);
|
||||
}
|
||||
|
||||
public static Object parseRawValue(String rawValue) {
|
||||
try {
|
||||
ConfigurationNode parsed = org.spongepowered.configurate.yaml.YamlConfigurationLoader.builder()
|
||||
.source(() -> new java.io.BufferedReader(new java.io.StringReader("value: " + rawValue)))
|
||||
.build()
|
||||
.load();
|
||||
return parsed.node("value").raw();
|
||||
} catch (java.io.IOException e) {
|
||||
throw new ConfigLoadException("Invalid YAML value: " + rawValue, e);
|
||||
}
|
||||
}
|
||||
|
||||
public static void setRaw(ConfigurationNode node, Object value) {
|
||||
try {
|
||||
node.set(value);
|
||||
} catch (SerializationException e) {
|
||||
throw new ConfigLoadException("Failed to set config value", e);
|
||||
}
|
||||
}
|
||||
|
||||
private static ConfigLoadException invalid(String path, String expected, Object raw) {
|
||||
String actual = raw == null ? "null" : raw.getClass().getSimpleName();
|
||||
return new ConfigLoadException(path + " must be a " + expected + " but was " + actual);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public record DebugConfig(byte infoLevel, List<String> infoExemptedClasses, byte warnLevel, List<String> warnExemptedClasses,
|
||||
byte errorLevel, List<String> errorExemptedClasses, boolean debugParticles, boolean timings) implements Config {
|
||||
|
||||
public static DebugConfig load(ConfigurationNode root) {
|
||||
ConfigurationNode node = ConfigReader.node(root, "debug");
|
||||
return new DebugConfig(
|
||||
level(ConfigReader.node(node, "info-level"), "debug.info-level"),
|
||||
ConfigReader.stringList(ConfigReader.node(node, "info-exempted-classes"), "debug.info-exempted-classes"),
|
||||
level(ConfigReader.node(node, "warn-level"), "debug.warn-level"),
|
||||
ConfigReader.stringList(ConfigReader.node(node, "warn-exempted-classes"), "debug.warn-exempted-classes"),
|
||||
level(ConfigReader.node(node, "error-level"), "debug.error-level"),
|
||||
ConfigReader.stringList(ConfigReader.node(node, "error-exempted-classes"), "debug.error-exempted-classes"),
|
||||
ConfigReader.bool(ConfigReader.node(node, "particles"), "debug.particles"),
|
||||
ConfigReader.bool(ConfigReader.node(node, "timings"), "debug.timings")
|
||||
);
|
||||
}
|
||||
|
||||
public byte getInfoLevel() {
|
||||
return infoLevel;
|
||||
}
|
||||
|
||||
public byte getWarnLevel() {
|
||||
return warnLevel;
|
||||
}
|
||||
|
||||
public byte getErrorLevel() {
|
||||
return errorLevel;
|
||||
}
|
||||
|
||||
public boolean showDebugParticles() {
|
||||
return debugParticles;
|
||||
}
|
||||
|
||||
public boolean recordTimings() {
|
||||
return timings;
|
||||
}
|
||||
|
||||
public boolean isExempted(Severity severity, Class<?>... sources) {
|
||||
List<String> exempted = switch (severity) {
|
||||
case INFO -> infoExemptedClasses;
|
||||
case WARN -> warnExemptedClasses;
|
||||
case ERROR -> errorExemptedClasses;
|
||||
};
|
||||
if (sources == null || exempted.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
for (Class<?> source : sources) {
|
||||
if (source == null) {
|
||||
continue;
|
||||
}
|
||||
if (exempted.contains(source.getSimpleName()) || exempted.contains(source.getName())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static byte level(ConfigurationNode node, String path) {
|
||||
int level = ConfigReader.integer(node, path);
|
||||
if (level < 0 || level > 10) {
|
||||
throw new ConfigLoadException(path + " must be between 0 and 10");
|
||||
}
|
||||
return (byte) level;
|
||||
}
|
||||
|
||||
public enum Severity {
|
||||
INFO,
|
||||
WARN,
|
||||
ERROR
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package games.cubi.raycastedantiesp.core.config;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.engine.EngineConfig;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public record RootConfig(String configVersion, ChecksConfig checksConfig, EngineConfig engineConfig, BlockProcessorConfig blockProcessorConfig, DebugConfig debugConfig, Map<Class<? extends Config>, Config> extensionConfigs) implements Config {
|
||||
public <T extends Config> T extensionConfig(Class<T> type) {
|
||||
Config config = extensionConfigs.get(type);
|
||||
return type.cast(config);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package games.cubi.raycastedantiesp.core.config.engine;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.Config;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigLoadException;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigReader;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public record EngineConfig(EngineMode mode, SimpleEngineConfig simpleConfig) implements Config {
|
||||
public static EngineConfig load(ConfigurationNode root) {
|
||||
ConfigurationNode node = ConfigReader.node(root, "engine");
|
||||
String modeName = ConfigReader.string(ConfigReader.node(node, "mode"), "engine.mode");
|
||||
EngineMode mode = EngineMode.fromString(modeName);
|
||||
if (mode == null) {
|
||||
throw new ConfigLoadException("engine.mode has unsupported value '" + modeName + "'");
|
||||
}
|
||||
return new EngineConfig(mode, SimpleEngineConfig.load(ConfigReader.node(node, "simple")));
|
||||
}
|
||||
|
||||
public EngineMode getMode() {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package games.cubi.raycastedantiesp.core.config.engine;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigEnum;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public enum EngineMode implements ConfigEnum {
|
||||
SIMPLE("simple"),
|
||||
NETTY("netty");
|
||||
|
||||
private final String configName;
|
||||
|
||||
EngineMode(String configName) {
|
||||
this.configName = configName;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return configName;
|
||||
}
|
||||
|
||||
public static @Nullable EngineMode fromString(String name) {
|
||||
for (EngineMode mode : values()) {
|
||||
if (mode.configName.equalsIgnoreCase(name)) {
|
||||
return mode;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getValues() {
|
||||
return new String[] {"simple", "netty"};
|
||||
}
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package games.cubi.raycastedantiesp.core.config.engine;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.Config;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigLoadException;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigReader;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public record SimpleEngineConfig(int asyncProcessingThreads) implements Config {
|
||||
public static SimpleEngineConfig load(ConfigurationNode node) {
|
||||
int threads = ConfigReader.integer(ConfigReader.node(node, "async-processing-threads"), "engine.simple.async-processing-threads");
|
||||
if (threads < 1) {
|
||||
throw new ConfigLoadException("engine.simple.async-processing-threads must be at least 1");
|
||||
}
|
||||
return new SimpleEngineConfig(threads);
|
||||
}
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package games.cubi.raycastedantiesp.core.config.raycast;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.Config;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigReader;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public record ChunkSectionConfig(boolean enabled, int maxOccludingCount, int alwaysShowRadiusChunks, int visibleRecheckIntervalTicks) implements Config {
|
||||
public static ChunkSectionConfig load(ConfigurationNode node, String path) {
|
||||
return new ChunkSectionConfig(
|
||||
ConfigReader.bool(ConfigReader.node(node, "enabled"), path + ".enabled"),
|
||||
ConfigReader.integer(ConfigReader.node(node, "max-occluding-count"), path + ".max-occluding-count"),
|
||||
ConfigReader.integer(ConfigReader.node(node, "always-show-radius-chunks"), path + ".always-show-radius-chunks"),
|
||||
ConfigReader.integer(ConfigReader.node(node, "visible-recheck-interval-ticks"), path + ".visible-recheck-interval-ticks")
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package games.cubi.raycastedantiesp.core.config.raycast;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public class EntityConfig extends RaycastConfig {
|
||||
private EntityConfig(RaycastConfig config) {
|
||||
super(config.enabled(), config.hideSoundsWhenHidden(), config.getMaxOccludingCount(), config.getAlwaysShowRadius(),
|
||||
config.getRaycastRadius(), config.hideOnSpawnDistance(), config.getVisibleRecheckIntervalTicks());
|
||||
}
|
||||
|
||||
public static EntityConfig load(ConfigurationNode node, String path) {
|
||||
return new EntityConfig(RaycastConfig.load(node, path, true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package games.cubi.raycastedantiesp.core.config.raycast;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public class PlayerConfig extends RaycastConfig {
|
||||
private PlayerConfig(RaycastConfig config) {
|
||||
super(config.enabled(), config.hideSoundsWhenHidden(), config.getMaxOccludingCount(), config.getAlwaysShowRadius(),
|
||||
config.getRaycastRadius(), config.hideOnSpawnDistance(), config.getVisibleRecheckIntervalTicks());
|
||||
}
|
||||
|
||||
public static PlayerConfig load(ConfigurationNode node, String path) {
|
||||
return new PlayerConfig(RaycastConfig.load(node, path, true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package games.cubi.raycastedantiesp.core.config.raycast;
|
||||
|
||||
import games.cubi.logs.Logger;
|
||||
import games.cubi.raycastedantiesp.core.config.Config;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigLoadException;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigReader;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public class RaycastConfig implements Config {
|
||||
private final boolean enabled;
|
||||
private final boolean hideSoundsWhenHidden;
|
||||
private final byte maxOccludingCount;
|
||||
private final short alwaysShowRadius;
|
||||
private final short raycastRadius;
|
||||
private final short hideOnSpawnDistance;
|
||||
private final short visibleRecheckIntervalTicks;
|
||||
|
||||
public RaycastConfig(boolean enabled, boolean hideSoundsWhenHidden, int maxOccludingCount, int alwaysShowRadius,
|
||||
int raycastRadius, int hideOnSpawnDistance, int visibleRecheckIntervalTicks) {
|
||||
this.enabled = enabled;
|
||||
this.hideSoundsWhenHidden = hideSoundsWhenHidden;
|
||||
this.maxOccludingCount = (byte) maxOccludingCount;
|
||||
this.alwaysShowRadius = (short) alwaysShowRadius;
|
||||
this.raycastRadius = (short) raycastRadius;
|
||||
this.hideOnSpawnDistance = (short) hideOnSpawnDistance;
|
||||
this.visibleRecheckIntervalTicks = (short) visibleRecheckIntervalTicks;
|
||||
}
|
||||
|
||||
protected static RaycastConfig load(ConfigurationNode node, String path, boolean hasHideSoundsWhenHidden) {
|
||||
int maxOccludingCount = ConfigReader.integer(ConfigReader.node(node, "max-occluding-count"), path + ".max-occluding-count");
|
||||
if (maxOccludingCount < -1 || maxOccludingCount > Byte.MAX_VALUE) {
|
||||
Logger.warning(path + ".max-occluding-count must be between -1 and " + Byte.MAX_VALUE + " but was " + maxOccludingCount +". Defaulting to 3.", 4, RaycastConfig.class);
|
||||
maxOccludingCount = 3;
|
||||
}
|
||||
int alwaysShowRadius = ConfigReader.integer(ConfigReader.node(node, "always-show-radius"), path + ".always-show-radius");
|
||||
if (alwaysShowRadius < -1 || alwaysShowRadius > Short.MAX_VALUE) {
|
||||
Logger.warning(path + ".always-show-radius must be between -1 and " + Short.MAX_VALUE + " but was " + alwaysShowRadius +". Defaulting to 8.", 4, RaycastConfig.class);
|
||||
alwaysShowRadius = 8;
|
||||
}
|
||||
int raycastRadius = ConfigReader.integer(ConfigReader.node(node, "raycast-radius"), path + ".raycast-radius");
|
||||
if (raycastRadius < -1 || raycastRadius > Short.MAX_VALUE) {
|
||||
Logger.warning(path + ".raycast-radius must be between -1 and " + Short.MAX_VALUE + " but was " + raycastRadius +". Defaulting to 48.", 4, RaycastConfig.class);
|
||||
raycastRadius = 48;
|
||||
}
|
||||
int hideOnSpawnDistance = ConfigReader.integer(ConfigReader.node(node, "hide-on-spawn-distance"), path + ".hide-on-spawn-distance");
|
||||
if (hideOnSpawnDistance < -1 || hideOnSpawnDistance > Short.MAX_VALUE) {
|
||||
Logger.warning(path + ".hide-on-spawn-distance must be between -1 and " + Short.MAX_VALUE + " but was " + hideOnSpawnDistance +". Defaulting to 32.", 4, RaycastConfig.class);
|
||||
hideOnSpawnDistance = 32;
|
||||
}
|
||||
int visibleRecheckIntervalTicks = ConfigReader.integer(ConfigReader.node(node, "visible-recheck-interval-ticks"), path + ".visible-recheck-interval-ticks");
|
||||
if (visibleRecheckIntervalTicks < -1 || visibleRecheckIntervalTicks > Short.MAX_VALUE) {
|
||||
Logger.warning(path + ".visible-recheck-interval-ticks must be between -1 and " + Short.MAX_VALUE + " but was " + visibleRecheckIntervalTicks +". Defaulting to 5.", 4, RaycastConfig.class);
|
||||
visibleRecheckIntervalTicks = 5;
|
||||
}
|
||||
return new RaycastConfig(
|
||||
ConfigReader.bool(ConfigReader.node(node, "enabled"), path + ".enabled"),
|
||||
hasHideSoundsWhenHidden && ConfigReader.bool(ConfigReader.node(node, "hide-sounds-when-hidden"), path + ".hide-sounds-when-hidden"),
|
||||
maxOccludingCount,
|
||||
alwaysShowRadius,
|
||||
raycastRadius,
|
||||
hideOnSpawnDistance,
|
||||
visibleRecheckIntervalTicks
|
||||
);
|
||||
}
|
||||
|
||||
public boolean enabled() {
|
||||
return enabled;
|
||||
}
|
||||
|
||||
public boolean hideSoundsWhenHidden() {
|
||||
return hideSoundsWhenHidden;
|
||||
}
|
||||
|
||||
public byte getMaxOccludingCount() {
|
||||
return maxOccludingCount;
|
||||
}
|
||||
|
||||
public short getAlwaysShowRadius() {
|
||||
return alwaysShowRadius;
|
||||
}
|
||||
|
||||
public short getRaycastRadius() {
|
||||
return raycastRadius;
|
||||
}
|
||||
|
||||
public short hideOnSpawnDistance() {
|
||||
return hideOnSpawnDistance;
|
||||
}
|
||||
|
||||
public short getVisibleRecheckIntervalTicks() {
|
||||
return visibleRecheckIntervalTicks;
|
||||
}
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package games.cubi.raycastedantiesp.core.config.raycast;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.config.Config;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigReader;
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public record SoundEffectsConfig(
|
||||
boolean enabled,
|
||||
int maxOccludingCount,
|
||||
int alwaysPlayRadius,
|
||||
int raycastRadius
|
||||
) implements Config {
|
||||
public static SoundEffectsConfig load(ConfigurationNode node, String path) {
|
||||
return new SoundEffectsConfig(
|
||||
ConfigReader.bool(ConfigReader.node(node, "enabled"), path + ".enabled"),
|
||||
ConfigReader.integer(ConfigReader.node(node, "max-occluding-count"), path + ".max-occluding-count"),
|
||||
ConfigReader.integer(ConfigReader.node(node, "always-play-radius"), path + ".always-play-radius"),
|
||||
ConfigReader.integer(ConfigReader.node(node, "raycast-radius"), path + ".raycast-radius")
|
||||
);
|
||||
}
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package games.cubi.raycastedantiesp.core.config.raycast;
|
||||
|
||||
import org.spongepowered.configurate.ConfigurationNode;
|
||||
|
||||
public class TileEntityConfig extends RaycastConfig {
|
||||
private TileEntityConfig(RaycastConfig config) {
|
||||
super(config.enabled(), false, config.getMaxOccludingCount(), config.getAlwaysShowRadius(),
|
||||
config.getRaycastRadius(), config.hideOnSpawnDistance(), config.getVisibleRecheckIntervalTicks());
|
||||
}
|
||||
|
||||
public static TileEntityConfig load(ConfigurationNode node, String path) {
|
||||
return new TileEntityConfig(RaycastConfig.load(node, path, false));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package games.cubi.raycastedantiesp.core.engine;
|
||||
|
||||
public interface AsyncRunner {
|
||||
void runNow(Runnable task);
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package games.cubi.raycastedantiesp.core.engine;
|
||||
|
||||
public interface Engine {
|
||||
void tick();
|
||||
}
|
||||
@@ -0,0 +1,173 @@
|
||||
package games.cubi.raycastedantiesp.core.engine;
|
||||
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.logs.Logger;
|
||||
import games.cubi.raycastedantiesp.core.config.ConfigManager;
|
||||
import games.cubi.raycastedantiesp.core.config.DebugConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.EntityConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.PlayerConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.TileEntityConfig;
|
||||
import games.cubi.raycastedantiesp.core.players.PlayerData;
|
||||
import games.cubi.raycastedantiesp.core.players.PlayerRegistry;
|
||||
import games.cubi.raycastedantiesp.core.raycast.ParticleSpawner;
|
||||
import games.cubi.raycastedantiesp.core.raycast.RaycastUtil;
|
||||
import games.cubi.raycastedantiesp.core.view.BlockView;
|
||||
import games.cubi.raycastedantiesp.core.view.EntityView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
import java.util.function.IntSupplier;
|
||||
|
||||
public class SimpleEngine implements Engine {
|
||||
private final ConfigManager config;
|
||||
private final ParticleSpawner particleSpawner;
|
||||
private final IntSupplier currentTickSupplier;
|
||||
private final AtomicInteger tickThreadsRunning = new AtomicInteger(0);
|
||||
private final AtomicLong tickNanos = new AtomicLong(0);
|
||||
private final AsyncRunner asyncRunner;
|
||||
|
||||
public SimpleEngine(ConfigManager config, ParticleSpawner particleSpawner, IntSupplier currentTickSupplier, AsyncRunner asyncRunner) {
|
||||
this.config = config;
|
||||
this.particleSpawner = particleSpawner;
|
||||
this.currentTickSupplier = currentTickSupplier;
|
||||
this.asyncRunner = asyncRunner;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void tick() {
|
||||
int threads = config.getEngineConfig().simpleConfig().asyncProcessingThreads();
|
||||
if (threads < 1) threads = 1;
|
||||
|
||||
if (!tickThreadsRunning.compareAndSet(0, threads)) {
|
||||
Logger.warning("RaycastedAntiESP is still ticking from the last tick! Skipping this tick to avoid concurrent modification issues. Current tick: " + currentTickSupplier.getAsInt(), 2, SimpleEngine.class);
|
||||
return;
|
||||
}
|
||||
|
||||
tickNanos.set(System.nanoTime());
|
||||
|
||||
final int currentTick = currentTickSupplier.getAsInt();
|
||||
Collection<PlayerData> allPlayers = PlayerRegistry.getInstance().getAllPlayerData();
|
||||
|
||||
EntityConfig entityConfig = config.getEntityConfig();
|
||||
PlayerConfig playerConfig = config.getPlayerConfig();
|
||||
TileEntityConfig tileEntityConfig = config.getTileEntityConfig();
|
||||
DebugConfig debugConfig = config.getDebugConfig();
|
||||
|
||||
// If only one thread is configured, just use the current async thread to avoid the overhead of scheduling tasks and context switching.
|
||||
if (threads == 1) {
|
||||
try {
|
||||
processTickForPlayers(new ArrayList<>(allPlayers), entityConfig, playerConfig, tileEntityConfig, debugConfig.showDebugParticles(), currentTick);
|
||||
}
|
||||
finally {
|
||||
tickThreadsRunning.set(0);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
List<List<PlayerData>> batches = new ArrayList<>(threads);
|
||||
for (int i = 0; i < threads; i++) {
|
||||
batches.add(new ArrayList<>());
|
||||
}
|
||||
|
||||
int index = 0;
|
||||
for (PlayerData playerData : allPlayers) {
|
||||
batches.get(index++ % threads).add(playerData);
|
||||
}
|
||||
|
||||
for (List<PlayerData> batch : batches) {
|
||||
asyncRunner.runNow(() -> {
|
||||
try {
|
||||
processTickForPlayers(batch, entityConfig, playerConfig, tileEntityConfig, debugConfig.showDebugParticles(), currentTick);
|
||||
}
|
||||
finally {
|
||||
int threadsRemaining = tickThreadsRunning.decrementAndGet();
|
||||
if (threadsRemaining < 0) {
|
||||
Logger.warning("tickThreadsRunning went below 0! This should never happen. Resetting to 0 to avoid further issues.", 2, SimpleEngine.class);
|
||||
tickThreadsRunning.set(0);
|
||||
}
|
||||
if (threadsRemaining == 0) {
|
||||
long elapsedNanos = System.nanoTime() - tickNanos.get();
|
||||
if (elapsedNanos > 40 * 1000000) {//40 ms
|
||||
Logger.warning("Tick completed in " + (elapsedNanos / 1_000_000.0) + " ms. If you see this warning frequently, consider reducing the raycasting load by adjusting the configuration.", 5, SimpleEngine.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void processTickForPlayers(List<PlayerData> playerDataList, EntityConfig entityConfig, PlayerConfig playerConfig, TileEntityConfig tileEntityConfig,
|
||||
boolean debugParticles, int currentTick) {
|
||||
|
||||
for (PlayerData playerData : playerDataList) {
|
||||
if (playerData.hasBypassPermission()) continue;
|
||||
|
||||
BlockView blockView = playerData.blockView();
|
||||
|
||||
Locatable playerLocation = playerData.ownLocation();
|
||||
if (playerLocation == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (entityConfig.enabled()) checkEntities(playerData, playerLocation, entityConfig, debugParticles, blockView, currentTick);
|
||||
if (playerConfig.enabled()) checkPlayers(playerData, playerLocation, playerConfig, debugParticles, blockView, currentTick);
|
||||
if (tileEntityConfig.enabled()) checkTileEntities(playerData, playerLocation, tileEntityConfig, debugParticles, blockView, currentTick);
|
||||
}
|
||||
}
|
||||
|
||||
private void checkEntities(PlayerData player, Locatable playerLocation, EntityConfig entityConfig, boolean debugParticles, BlockView blockView, int currentTick) {
|
||||
EntityView<?> entityView = player.entityView();
|
||||
|
||||
for (UUID entityUUID : entityView.getNeedingRecheck(entityConfig.getVisibleRecheckIntervalTicks(), currentTick)) {
|
||||
boolean wasVisible = entityView.isVisible(entityUUID, currentTick);
|
||||
Locatable entityLocation = entityView.getLocation(entityUUID);
|
||||
if (entityLocation == null) {
|
||||
Logger.debug("SimpleEngine.checkEntities skipped-null-location viewer=" + player.getPlayerUUID()
|
||||
+ " target=" + entityUUID
|
||||
+ " wasVisible=" + wasVisible
|
||||
+ " tick=" + currentTick);
|
||||
continue;
|
||||
}
|
||||
boolean canSee = RaycastUtil.raycast(player, playerLocation, entityLocation, entityConfig.getMaxOccludingCount(), entityConfig.getAlwaysShowRadius(), entityConfig.getRaycastRadius(), debugParticles, blockView, 1, particleSpawner);
|
||||
entityView.setVisibility(entityUUID, canSee, currentTick);
|
||||
}
|
||||
}
|
||||
|
||||
private void checkPlayers(PlayerData player, Locatable playerLocation, PlayerConfig playerConfig, boolean debugParticles, BlockView blockView, int currentTick) {
|
||||
EntityView<?> playerView = player.playerView();
|
||||
|
||||
for (UUID otherPlayerUUID : playerView.getNeedingRecheck(playerConfig.getVisibleRecheckIntervalTicks(), currentTick)) {
|
||||
boolean wasVisible = playerView.isVisible(otherPlayerUUID, currentTick);
|
||||
Locatable otherPlayerLocation = playerView.getLocation(otherPlayerUUID);
|
||||
if (otherPlayerLocation == null) {
|
||||
Logger.debug("SimpleEngine.checkPlayers skipped-null-location viewer=" + player.getPlayerUUID()
|
||||
+ " target=" + otherPlayerUUID
|
||||
+ " wasVisible=" + wasVisible
|
||||
+ " tick=" + currentTick);
|
||||
continue;
|
||||
}
|
||||
boolean canSee = RaycastUtil.raycast(player, playerLocation, otherPlayerLocation, playerConfig.getMaxOccludingCount(), playerConfig.getAlwaysShowRadius(), playerConfig.getRaycastRadius(), debugParticles, blockView, 1, particleSpawner);
|
||||
playerView.setVisibility(otherPlayerUUID, canSee, currentTick);
|
||||
}
|
||||
}
|
||||
|
||||
private void checkTileEntities(PlayerData player, Locatable playerLocation, TileEntityConfig tileEntityConfig, boolean debugParticles, BlockView blockView, int currentTick) {
|
||||
for (BlockLocatable tileEntityLocation : blockView.getNeedingRecheck(tileEntityConfig.getVisibleRecheckIntervalTicks(), currentTick)) {
|
||||
if (tileEntityLocation.world() == null || !tileEntityLocation.world().equals(playerLocation.world())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (playerLocation.distanceSquared(tileEntityLocation) > (double) tileEntityConfig.getRaycastRadius() * tileEntityConfig.getRaycastRadius()) {
|
||||
blockView.setVisibility(tileEntityLocation, false, currentTick);
|
||||
continue;
|
||||
}
|
||||
boolean canSee = RaycastUtil.raycast(player, playerLocation, tileEntityLocation, tileEntityConfig.getMaxOccludingCount() + 1, tileEntityConfig.getAlwaysShowRadius(), tileEntityConfig.getRaycastRadius(), debugParticles, blockView, 1, particleSpawner);
|
||||
blockView.setVisibility(tileEntityLocation, canSee, currentTick);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package games.cubi.raycastedantiesp.core.locatables;
|
||||
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Per-player platform-independent representation of an entity
|
||||
*/
|
||||
public interface EntityLocatable<EntityType, PacketReplayData> extends MutableLocatable {
|
||||
|
||||
int entityID();
|
||||
|
||||
UUID entityUUID();
|
||||
|
||||
boolean visible();
|
||||
EntityLocatable<?, ?> setVisible(boolean visible);
|
||||
|
||||
int lastChecked();
|
||||
EntityLocatable<?, ?> setLastChecked(int lastChecked);
|
||||
|
||||
boolean clientVisible();
|
||||
EntityLocatable<?, ?> setClientVisible(boolean clientVisible);
|
||||
|
||||
boolean isSelfEntity();
|
||||
|
||||
float yaw();
|
||||
EntityLocatable<?, ?> setYaw(float yaw);
|
||||
|
||||
float pitch();
|
||||
EntityLocatable<?, ?> setPitch(float pitch);
|
||||
|
||||
float headYaw();
|
||||
EntityLocatable<?, ?> setHeadYaw(float headYaw);
|
||||
|
||||
double velocityX();
|
||||
double velocityY();
|
||||
double velocityZ();
|
||||
EntityLocatable<?, ?> setVelocity(double velocityX, double velocityY, double velocityZ);
|
||||
|
||||
boolean onGround();
|
||||
EntityLocatable<?, ?> setOnGround(boolean onGround);
|
||||
|
||||
EntityType entityType();
|
||||
|
||||
int entityData();
|
||||
EntityLocatable<?, ?> setEntityData(int entityData);
|
||||
|
||||
int[] passengerIDs();
|
||||
EntityLocatable<?, ?> setPassengerIDs(int[] passengerIDs);
|
||||
|
||||
void setVehicleID(int vehicleID);
|
||||
int vehicleID();
|
||||
|
||||
void addLeashedEntity(int leashedEntityID);
|
||||
void removeLeashedEntity(int leashedEntityID);
|
||||
int@Nullable[] leashedEntityIDsOrNull();
|
||||
int leashingEntity();
|
||||
void setLeashingEntity(int leashingEntityID);
|
||||
|
||||
PacketReplayData packetReplayData();
|
||||
EntityLocatable<?, ?> setPacketReplayData(PacketReplayData packetReplayData);
|
||||
|
||||
/**
|
||||
* For use when the player disconnects, clears all data.
|
||||
*/
|
||||
void clear();
|
||||
|
||||
default <T> T cast() {
|
||||
return (T) this;
|
||||
}
|
||||
}
|
||||
+398
@@ -0,0 +1,398 @@
|
||||
package games.cubi.raycastedantiesp.core.locatables;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
import games.cubi.locatables.implementations.MutableLocatableImpl;
|
||||
import games.cubi.raycastedantiesp.core.players.PlayerData;
|
||||
import games.cubi.raycastedantiesp.core.utils.Clearable;
|
||||
import games.cubi.raycastedantiesp.core.utils.IntArrayList;
|
||||
import games.cubi.raycastedantiesp.core.utils.IntArrayListMarker;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* Designed for use with netty-based systems, where entity data updates only ever come from one thread, but reads may come from multiple threads. This is however not enforced, and must be kept in mind when using this class.
|
||||
* A representation of an entity for a specific player.
|
||||
*/
|
||||
public abstract class NettyEntityLocatable<EntityType, PacketReplayData extends Clearable> implements EntityLocatable<EntityType, PacketReplayData> {
|
||||
// immutable fields
|
||||
private final int entityID;
|
||||
private final UUID entityUUID;
|
||||
private final boolean isSelfEntity;
|
||||
private final EntityType entityType;
|
||||
private final PlayerData owningPlayer;
|
||||
|
||||
// Netty mutatable fields. Should NEVER be mutated from the engine thread, but reads are fine.
|
||||
private volatile UUID world;
|
||||
private volatile double x, y, z;
|
||||
private volatile float yaw;
|
||||
private volatile float pitch;
|
||||
private volatile float headYaw;
|
||||
private volatile double velocityX;
|
||||
private volatile double velocityY;
|
||||
private volatile double velocityZ;
|
||||
private volatile boolean onGround = true;
|
||||
private int@IntArrayListMarker[] leashedIDs;
|
||||
private int leasherID = NO_LEASHER;
|
||||
private int[] passengerIDs;
|
||||
private int vehicleID = -1;
|
||||
|
||||
|
||||
private volatile int entityData;
|
||||
private volatile PacketReplayData packetReplayData; // For use storing the packets we can't be bothered to directly store, with all cached packets being sent back out to the client when entity is visible again.
|
||||
|
||||
// mutatable by several threads (engine and netty), may need to investigate atomic updates for thread safety
|
||||
private volatile int lastChecked;
|
||||
private volatile boolean clientVisible = true;
|
||||
|
||||
// engine thread mutable, reads from netty and engine.
|
||||
private volatile boolean visible;
|
||||
|
||||
public NettyEntityLocatable(PlayerData owningPlayer, UUID world, double x, double y, double z, int entityID, UUID entityUUID, boolean isSelfEntity, EntityType entityType, boolean visible) {
|
||||
this.world = world;
|
||||
this.x = x; this.y = y; this.z = z;
|
||||
|
||||
this.entityID = entityID;
|
||||
this.entityUUID = entityUUID;
|
||||
this.isSelfEntity = isSelfEntity;
|
||||
this.entityType = entityType;
|
||||
|
||||
this.visible = visible;
|
||||
|
||||
this.owningPlayer = owningPlayer;
|
||||
}
|
||||
|
||||
// For creating the self entity, where we don't have access to the world or position. Always visible.
|
||||
protected NettyEntityLocatable(PlayerData selfData, int selfPlayerID, UUID ownUUID) {
|
||||
entityID = selfPlayerID;
|
||||
entityUUID = ownUUID;
|
||||
owningPlayer = selfData;
|
||||
isSelfEntity = true;
|
||||
entityType = null;
|
||||
clientVisible = true;
|
||||
visible = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.NettyEntity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int entityID() {
|
||||
return entityID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID entityUUID() {
|
||||
return entityUUID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visible() {
|
||||
return visible;
|
||||
}
|
||||
|
||||
/**
|
||||
* Wherever possible, effort should be made to only call this from the engine thread, for thread safety reasons.
|
||||
*/
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setVisible(boolean visible) {
|
||||
this.visible = visible;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int lastChecked() {
|
||||
return lastChecked;
|
||||
}
|
||||
// todo it may be that this is only ever set by the engine thread? If so, just volatile annotation may be safe enough, as no two engine threads should update a single player at the same time (add guard lock for this)
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setLastChecked(int lastChecked) {
|
||||
this.lastChecked = lastChecked;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean clientVisible() {
|
||||
return clientVisible;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setClientVisible(boolean clientVisible) {
|
||||
this.clientVisible = clientVisible;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSelfEntity() {
|
||||
return isSelfEntity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float yaw() {
|
||||
return yaw;
|
||||
}
|
||||
|
||||
/**
|
||||
* THIS METHOD IS ONLY SAFE TO CALL FROM THE PLAYER's NETTY THREAD
|
||||
*/
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setYaw(float yaw) {
|
||||
this.yaw = yaw;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float pitch() {
|
||||
return pitch;
|
||||
}
|
||||
|
||||
/**
|
||||
* THIS METHOD IS ONLY SAFE TO CALL FROM THE PLAYER's NETTY THREAD
|
||||
*/
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setPitch(float pitch) {
|
||||
this.pitch = pitch;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float headYaw() {
|
||||
return headYaw;
|
||||
}
|
||||
|
||||
/**
|
||||
* THIS METHOD IS ONLY SAFE TO CALL FROM THE PLAYER's NETTY THREAD
|
||||
*/
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setHeadYaw(float headYaw) {
|
||||
this.headYaw = headYaw;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double velocityX() {
|
||||
return velocityX;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double velocityY() {
|
||||
return velocityY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double velocityZ() {
|
||||
return velocityZ;
|
||||
}
|
||||
|
||||
/**
|
||||
* THIS METHOD IS ONLY SAFE TO CALL FROM THE PLAYER's NETTY THREAD
|
||||
*/
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setVelocity(double velocityX, double velocityY, double velocityZ) {
|
||||
this.velocityX = velocityX;
|
||||
this.velocityY = velocityY;
|
||||
this.velocityZ = velocityZ;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onGround() {
|
||||
return onGround;
|
||||
}
|
||||
|
||||
/**
|
||||
* THIS METHOD IS ONLY SAFE TO CALL FROM THE PLAYER's NETTY THREAD
|
||||
*/
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setOnGround(boolean onGround) {
|
||||
this.onGround = onGround;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityType entityType() {
|
||||
return entityType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int entityData() {
|
||||
return entityData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setEntityData(int entityData) {
|
||||
this.entityData = entityData;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] passengerIDs() {
|
||||
return passengerIDs == null ? null : passengerIDs.clone();
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setPassengerIDs(int[] passengerIDs) {
|
||||
this.passengerIDs = passengerIDs == null ? new int[0] : passengerIDs.clone();
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setVehicleID(int vehicleID) {
|
||||
this.vehicleID = vehicleID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int vehicleID() {
|
||||
return vehicleID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addLeashedEntity(int leashedEntityID) {
|
||||
leashedIDs = IntArrayList.add(leashedIDs, leashedEntityID);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeLeashedEntity(int leashedEntityID) {
|
||||
leashedIDs = IntArrayList.remove(leashedIDs, leashedEntityID);
|
||||
}
|
||||
|
||||
public int@Nullable[] leashedEntityIDsOrNull() {
|
||||
return IntArrayList.getCopyOrNull(leashedIDs);
|
||||
}
|
||||
|
||||
public static final int NO_LEASHER = -2;
|
||||
|
||||
@Override
|
||||
public int leashingEntity() {
|
||||
return leasherID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLeashingEntity(int leashingEntityID) {
|
||||
this.leasherID = leashingEntityID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketReplayData packetReplayData() {
|
||||
return packetReplayData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityLocatable<?, ?> setPacketReplayData(PacketReplayData packetReplayData) {
|
||||
this.packetReplayData = packetReplayData;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double x() {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double y() {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double z() {
|
||||
return z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID world() {
|
||||
return world;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable clonePlainAndCentreIfBlockLocation() {
|
||||
return new MutableLocatableImpl(world, x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setX(double x) {
|
||||
this.x = x;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setY(double y) {
|
||||
this.y = y;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setZ(double z) {
|
||||
this.z = z;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setWorld(UUID world) {
|
||||
this.world = world;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable set(double x, double y, double z) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
updatePassengerPositions();
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable add(double x, double y, double z) {
|
||||
this.x += x;
|
||||
this.y += y;
|
||||
this.z += z;
|
||||
updatePassengerPositions();
|
||||
return this;
|
||||
}
|
||||
|
||||
// This does not correctly set the passenger position, as the passenger is above the vehicle. It is however close enough to minimise annoying interpolation on show.
|
||||
private void updatePassengerPositions() {
|
||||
if (passengerIDs == null || passengerIDs.length == 0) return;
|
||||
for (int passengerID : passengerIDs) {
|
||||
NettyEntityLocatable<?, ?> passenger = owningPlayer.entityFromID(passengerID);
|
||||
if (passenger != null) {
|
||||
passenger.setVehicleID(entityID);
|
||||
passenger.setWorld(world);
|
||||
passenger.setX(x);
|
||||
passenger.setY(y);
|
||||
passenger.setZ(z);
|
||||
passenger.updatePassengerPositions();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
world = null;
|
||||
packetReplayData.clear();
|
||||
packetReplayData = null;
|
||||
|
||||
vehicleID = -1;
|
||||
passengerIDs = null;
|
||||
leashedIDs = null;
|
||||
leasherID = NO_LEASHER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return isEqualTo(other);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return makeHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toStringForm();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,123 @@
|
||||
package games.cubi.raycastedantiesp.core.locatables;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.raycastedantiesp.core.utils.Clearable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public abstract class NettyTileEntity<PacketReplayData extends Clearable> implements TileEntityLocatable<PacketReplayData> {
|
||||
private volatile boolean visible;
|
||||
private volatile int lastChecked;
|
||||
private final int blockID;
|
||||
private volatile PacketReplayData extraData;
|
||||
|
||||
private final int x, y, z;
|
||||
private final UUID world;
|
||||
|
||||
public NettyTileEntity(Locatable location, boolean visible, int lastChecked, int blockID) {
|
||||
x = location.blockX();
|
||||
y = location.blockY();
|
||||
z = location.blockZ();
|
||||
world = location.world();
|
||||
|
||||
this.blockID = blockID;
|
||||
|
||||
this.visible = visible;
|
||||
this.lastChecked = lastChecked;
|
||||
}
|
||||
|
||||
public NettyTileEntity(UUID world, int x, int y, int z, boolean visible, int blockID) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
this.visible = visible;
|
||||
this.blockID = blockID;
|
||||
this.world = world;
|
||||
lastChecked = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean visible() {
|
||||
return visible;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntityLocatable<PacketReplayData> setVisible(boolean visible) {
|
||||
this.visible = visible;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int lastChecked() {
|
||||
return lastChecked;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntityLocatable<PacketReplayData> setLastChecked(int lastChecked) {
|
||||
this.lastChecked = lastChecked;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockID() {
|
||||
return blockID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketReplayData extraData() {
|
||||
return extraData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntityLocatable<PacketReplayData> setExtraData(PacketReplayData extraData) {
|
||||
this.extraData = extraData;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockX() {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockY() {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockZ() {
|
||||
return z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.NettyTileEntity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID world() {
|
||||
return world;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
if (extraData != null) {
|
||||
extraData.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return isEqualTo(other);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return blockHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toStringForm();
|
||||
}
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package games.cubi.raycastedantiesp.core.locatables;
|
||||
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
import games.cubi.locatables.ImmutableLocatable;
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
import games.cubi.raycastedantiesp.core.utils.Clearable;
|
||||
|
||||
public interface TileEntityLocatable<T> extends BlockLocatable, ImmutableLocatable, Clearable {
|
||||
boolean visible();
|
||||
TileEntityLocatable<T> setVisible(boolean visible);
|
||||
|
||||
int lastChecked();
|
||||
TileEntityLocatable<T> setLastChecked(int lastChecked);
|
||||
|
||||
int blockID();
|
||||
|
||||
T extraData();
|
||||
TileEntityLocatable<T> setExtraData(T extraData);
|
||||
|
||||
@Override
|
||||
default boolean isMutable() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
default MutableLocatable castToMutableOrNull() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
package games.cubi.raycastedantiesp.core.players;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.locatables.implementations.ThreadSafeLocatable;
|
||||
import games.cubi.logs.Logger;
|
||||
import games.cubi.raycastedantiesp.core.locatables.NettyEntityLocatable;
|
||||
import games.cubi.raycastedantiesp.core.view.BlockView;
|
||||
import games.cubi.raycastedantiesp.core.view.EntityView;
|
||||
import games.cubi.raycastedantiesp.core.view.ViewRegistry;
|
||||
import games.cubi.raycastedantiesp.core.view.controller.PacketEntityViewController;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Queue;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerData {
|
||||
private final UUID playerUUID;
|
||||
private final int joinTick;
|
||||
private volatile boolean hasBypassPermission;
|
||||
private final ThreadSafeLocatable ownLocation;
|
||||
|
||||
private final BlockView blockView;
|
||||
private final EntityView<?> entityView;
|
||||
private final EntityView<?> playerView;
|
||||
|
||||
public PlayerData(UUID player, boolean hasBypassPermission, int joinTick) {
|
||||
this(player, joinTick);
|
||||
this.hasBypassPermission = hasBypassPermission;
|
||||
}
|
||||
|
||||
public PlayerData(UUID player, int joinTick) {
|
||||
this.joinTick = joinTick;
|
||||
this.playerUUID = player;
|
||||
|
||||
blockView = ViewRegistry.createBlockView();
|
||||
entityView = ViewRegistry.createEntityView();
|
||||
playerView = ViewRegistry.createPlayerEntityView();
|
||||
ownLocation = new ThreadSafeLocatable(null, 0, 0, 0);
|
||||
}
|
||||
|
||||
public EntityView<?> entityView() {
|
||||
return entityView;
|
||||
}
|
||||
|
||||
public EntityView<?> playerView() {
|
||||
return playerView;
|
||||
}
|
||||
|
||||
private final Queue<Runnable> nettyTasks = new java.util.concurrent.ConcurrentLinkedQueue<>();
|
||||
|
||||
/**
|
||||
* Schedules a task to run as soon as possible on the Netty thread for this player. The task will be run immediately when the next packet is sent to this player. Safe to call from any thread.
|
||||
* @param task The task to run on the Netty thread for this player.
|
||||
* @Appropriate_Calling_Threads All
|
||||
*/
|
||||
public void runNettyTaskASAP(Runnable task) {
|
||||
nettyTasks.add(task);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Appropriate_Calling_Threads Netty thread associated with this player
|
||||
*/
|
||||
public void runAllNettyTasks() {
|
||||
List<Runnable> tasksToRun = new ArrayList<>();
|
||||
for (Runnable task; (task = nettyTasks.poll()) != null; ) {
|
||||
tasksToRun.add(task);
|
||||
}
|
||||
for (Runnable task : tasksToRun) {
|
||||
try {
|
||||
task.run();
|
||||
} catch (Exception e) {
|
||||
Logger.error("Error while running netty task for player " + playerUUID, e, 3, PlayerData.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public BlockView blockView() {
|
||||
return blockView;
|
||||
}
|
||||
|
||||
public void updateOwnLocation(UUID world, double x, double y, double z) {
|
||||
ownLocation.set(x, y, z, world);
|
||||
}
|
||||
|
||||
public Locatable ownLocation() {
|
||||
ThreadSafeLocatable existing = ownLocation;
|
||||
return existing == null ? null : existing.clonePlainAndCentreIfBlockLocation();
|
||||
}
|
||||
|
||||
public UUID getPlayerUUID() {
|
||||
return playerUUID;
|
||||
}
|
||||
|
||||
public boolean hasBypassPermission() {
|
||||
return hasBypassPermission;
|
||||
}
|
||||
|
||||
public int getJoinTick() {
|
||||
return joinTick;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Either the entity or player view for this player, depending on the entity ID
|
||||
*/
|
||||
public EntityView<?> viewFromEntityID(int entityID) {
|
||||
if (entityView.exists(entityID)) {
|
||||
return entityView;
|
||||
}
|
||||
if (playerView.exists(entityID)) {
|
||||
return playerView;
|
||||
}
|
||||
Logger.warning("Could not find view for entityID=" + entityID + " uuid=" + playerUUID, 6, PacketEntityViewController.class);
|
||||
return null;
|
||||
}
|
||||
|
||||
public NettyEntityLocatable<?,?> entityFromID(int entityID) {
|
||||
EntityView<?> entityView = viewFromEntityID(entityID);
|
||||
if (entityView == null) {
|
||||
return null;
|
||||
}
|
||||
return (NettyEntityLocatable<?, ?>) entityView.getEntity(entityID);
|
||||
}
|
||||
|
||||
public void setBypassPermission(boolean hasBypassPermission) {
|
||||
this.hasBypassPermission = hasBypassPermission;
|
||||
} //todo: need to link up
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "PlayerData{" +
|
||||
"playerUUID=" + playerUUID +
|
||||
", joinTick=" + joinTick +
|
||||
", hasBypassPermission=" + hasBypassPermission +
|
||||
", ownLocation=" + ownLocation +
|
||||
", blockView=" + blockView +
|
||||
", entityView=" + entityView +
|
||||
", playerView=" + playerView +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package games.cubi.raycastedantiesp.core.players;
|
||||
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public class PlayerRegistry {
|
||||
|
||||
private static PlayerRegistry instance;
|
||||
|
||||
private PlayerRegistry() {}
|
||||
|
||||
public static PlayerRegistry getInstance() {
|
||||
if (instance == null) {
|
||||
instance = new PlayerRegistry();
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
private final ConcurrentHashMap<UUID, PlayerData> playerDataMap = new ConcurrentHashMap<>();
|
||||
|
||||
public void registerPlayer(UUID playerUUID, boolean hasBypassPermission, int joinTick) {
|
||||
playerDataMap.putIfAbsent(playerUUID, new PlayerData(playerUUID, hasBypassPermission, joinTick));
|
||||
}
|
||||
|
||||
/** Forcefully registers a player and returns the new PlayerData, even if they were already registered.**/
|
||||
public PlayerData registerAndGetPlayer(UUID playerUUID, int joinTick) {
|
||||
PlayerData newData = new PlayerData(playerUUID, joinTick);
|
||||
playerDataMap.put(playerUUID, newData);
|
||||
return newData;
|
||||
}
|
||||
|
||||
public PlayerData registerAndGetPlayer(UUID playerUUID, boolean hasBypassPermission, int joinTick) {
|
||||
PlayerData newData = new PlayerData(playerUUID, hasBypassPermission, joinTick);
|
||||
PlayerData existingData = playerDataMap.putIfAbsent(playerUUID, newData);
|
||||
return existingData != null ? existingData : newData;
|
||||
}
|
||||
|
||||
public void unregisterPlayer(UUID playerUUID) {
|
||||
PlayerData unregisteredPlayer = playerDataMap.remove(playerUUID);
|
||||
if (unregisteredPlayer == null) {
|
||||
return;
|
||||
}
|
||||
unregisteredPlayer.blockView().clear();
|
||||
unregisteredPlayer.entityView().clear();
|
||||
unregisteredPlayer.playerView().clear();
|
||||
}
|
||||
|
||||
public PlayerData getPlayerData(UUID playerUUID) {
|
||||
return playerDataMap.get(playerUUID);
|
||||
}
|
||||
|
||||
public boolean isPlayerRegistered(UUID playerUUID) {
|
||||
return playerDataMap.containsKey(playerUUID);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Live, mutable collection of all PlayerData instances.
|
||||
* **/
|
||||
public Collection<PlayerData> getAllPlayerData() {
|
||||
return playerDataMap.values();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package games.cubi.raycastedantiesp.core.raycast;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
|
||||
public interface ParticleSpawner {
|
||||
|
||||
enum Colour {
|
||||
RED, GREEN, BLUE,
|
||||
}
|
||||
|
||||
void spawnParticleAt(Locatable locatable, Colour color);
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package games.cubi.raycastedantiesp.core.raycast;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
import games.cubi.locatables.implementations.MutableBlockVector;
|
||||
import games.cubi.logs.Logger;
|
||||
import games.cubi.raycastedantiesp.core.players.PlayerData;
|
||||
import games.cubi.raycastedantiesp.core.view.BlockView;
|
||||
|
||||
public class RaycastUtil {
|
||||
|
||||
//True: Has line-of-sight
|
||||
public static boolean raycast(PlayerData player, Locatable start, Locatable end, int maxOccluding, int alwaysShowRadius, int maxRaycastRadius, boolean debug, BlockView snap, int stepSize, ParticleSpawner particleSpawner) {
|
||||
if (!start.world().equals(end.world())) return false;
|
||||
|
||||
MutableLocatable clonedEnd = end.clonePlainAndCentreIfBlockLocation();
|
||||
double total = start.distance(clonedEnd) - stepSize; //benchmarking shows that calling distance() is faster than distanceSquared() then checking distanceSquared < stepSize*stepSize every time despite the latter replacing a square root with multiplication
|
||||
if (total <= alwaysShowRadius) return true;
|
||||
if (total > maxRaycastRadius) return false;
|
||||
if (debug && particleSpawner == null) {
|
||||
Logger.errorAndReturn(new RuntimeException("raycast called with debug enabled but no ParticleSpawner supplied"), 2, RaycastUtil.class);
|
||||
}
|
||||
|
||||
Locatable dir = clonedEnd.subtract(start).normalize().scalarMultiply(stepSize);
|
||||
|
||||
MutableBlockVector current = new MutableBlockVector(start.world(), start.x(),start.y(),start.z());
|
||||
|
||||
for (double traveled = 0; traveled < total; traveled += stepSize) { //benchmarking shows that for loop is marginally faster than while loop initially (after running for a while they are equal
|
||||
current.add(dir);
|
||||
|
||||
if (snap.isBlockOccluding(current)) {//This works as MutableBlockVector resolves to a block location in #equals and #hashCode, and thus works fine as a key in the snapshot manager
|
||||
maxOccluding--;
|
||||
if (debug) particleSpawner.spawnParticleAt(current, ParticleSpawner.Colour.RED);
|
||||
if (maxOccluding < 1) return false;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (debug) particleSpawner.spawnParticleAt(current, ParticleSpawner.Colour.GREEN);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
import games.cubi.logs.Logger;
|
||||
import org.jspecify.annotations.NullMarked;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
// Not specific to RaycastedAntiESP, could be moved to a more general utils package if needed
|
||||
@NullMarked
|
||||
public record BuildProperties(String gitHashLong, String gitHashShort, String buildTime, Version version) {
|
||||
public static final BuildProperties CORE = fromResource("build-properties/core.yml");
|
||||
public static final BuildProperties PLATFORM = fromResource("build-properties/platform.yml");
|
||||
public static final BuildProperties LOGGER = fromResource("build-properties/logging.yml");
|
||||
public static final BuildProperties LOCATABLES = fromResource("build-properties/locatable-lib.yml");
|
||||
|
||||
public static BuildProperties fromResource(String resourcePath) {
|
||||
try (InputStream inputStream = BuildProperties.class.getClassLoader().getResourceAsStream(resourcePath)) {
|
||||
if (inputStream == null) {
|
||||
Logger.error(new IllegalArgumentException("BuildProperties resource not found: " + resourcePath), 2, BuildProperties.class);
|
||||
return error();
|
||||
}
|
||||
|
||||
String shortGit = null;
|
||||
String longGit = null;
|
||||
String buildTime = null;
|
||||
Version version = null;
|
||||
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
|
||||
String line;
|
||||
while ((line = reader.readLine()) != null) {
|
||||
String trimmedLine = line.trim();
|
||||
if (trimmedLine.isEmpty() || trimmedLine.startsWith("#")) continue;
|
||||
|
||||
String[] parts = trimmedLine.split(":", 2);
|
||||
if (parts.length != 2) continue;
|
||||
|
||||
String key = parts[0].trim();
|
||||
String value = parts[1].trim();
|
||||
|
||||
if ((value.startsWith("\"") && value.endsWith("\"")) || (value.startsWith("'") && value.endsWith("'"))) {
|
||||
value = value.substring(1, value.length() - 1);
|
||||
}
|
||||
|
||||
switch (key) {
|
||||
case "short-git" -> shortGit = value;
|
||||
case "long-git" -> longGit = value;
|
||||
case "build-time" -> buildTime = value;
|
||||
case "version" -> version = Version.parse(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (shortGit == null || longGit == null || buildTime == null || version == null) {
|
||||
Logger.error(new IllegalArgumentException("Missing required build properties in resource: " + resourcePath + ". Found shortGit=" + shortGit + ", longGit=" + longGit + ", buildTime=" + buildTime + ", version=" + version), 2, BuildProperties.class);
|
||||
return error();
|
||||
}
|
||||
return new BuildProperties(longGit, shortGit, buildTime, version);
|
||||
} catch (Exception e) {
|
||||
Logger.error(new IllegalArgumentException("Failed to parse BuildProperties resource: " + resourcePath, e), 2, BuildProperties.class);
|
||||
return error();
|
||||
}
|
||||
}
|
||||
|
||||
private static BuildProperties error() {
|
||||
return new BuildProperties("unknown", "unknown", "unknown", new Version(-1, -1, -1, true));
|
||||
}
|
||||
|
||||
record Version(short major, short minor, short patch, boolean snapshot) {
|
||||
Version(int major, int minor, int patch, boolean snapshot) {
|
||||
this((short) major, (short) minor, (short) patch, snapshot);
|
||||
}
|
||||
|
||||
public static Version parse(String versionString) {
|
||||
String[] parts = versionString.split("[.-]");
|
||||
if (parts.length < 3) {
|
||||
Logger.errorAndReturn(new IllegalArgumentException("Version string must be in the format 'major.minor.patch'"), 2, BuildProperties.class, Version.class);
|
||||
}
|
||||
try {
|
||||
short major = Short.parseShort(parts[0]);
|
||||
short minor = Short.parseShort(parts[1]);
|
||||
short patch = Short.parseShort(parts[2]);
|
||||
boolean snapshot = versionString.contains("SNAPSHOT");
|
||||
return new Version(major, minor, patch, snapshot);
|
||||
} catch (NumberFormatException e) {
|
||||
Logger.errorAndReturn(new IllegalArgumentException("Version parts must be valid short integers. Attempted: " + versionString, e), 2, BuildProperties.class, Version.class);
|
||||
return new Version(-1, -1, -1, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
import java.util.function.Function;
|
||||
|
||||
/**
|
||||
* A Set-like data structure that stores canonical instances of key values.
|
||||
* Any compatible key type may be used for lookup, but only canonical values
|
||||
* of type {@code V} may be stored.
|
||||
*
|
||||
* @param <K> key type used for lookup
|
||||
* @param <V> stored canonical value type
|
||||
*/
|
||||
public interface CanonicalSet<K, V extends K> {
|
||||
int size();
|
||||
|
||||
boolean isEmpty();
|
||||
|
||||
boolean contains(K keyValue);
|
||||
|
||||
@Nullable V get(K keyValue);
|
||||
|
||||
@Nullable V add(V keyValue);
|
||||
|
||||
void addAll(Set<? extends V> keyValues);
|
||||
|
||||
@Nullable V computeIfAbsent(K keyValue, @NotNull Function<? super K, ? extends V> mappingFunction);
|
||||
|
||||
@Nullable V remove(K keyValue);
|
||||
|
||||
void clear();
|
||||
|
||||
@NotNull Set<V> keySet();
|
||||
|
||||
@NotNull Collection<V> values();
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
public interface Clearable {
|
||||
/**
|
||||
* Dereferences all internal references to other objects, allowing them to be garbage collected. In theory this isn't needed but idk what's causing the memory leak so we're covering all bases.
|
||||
*/
|
||||
void clear();
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.function.Function;
|
||||
|
||||
public class ConcurrentSelfMap<K, V extends K> implements CanonicalSet<K, V> {
|
||||
private final ConcurrentHashMap<V, V> backingMap = new ConcurrentHashMap<>();
|
||||
|
||||
public ConcurrentSelfMap() {}
|
||||
|
||||
@Override
|
||||
public int size() {
|
||||
return backingMap.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEmpty() {
|
||||
return backingMap.isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean contains(K keyValue) {
|
||||
return backingMap.containsKey(keyValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable V get(K keyValue) {
|
||||
return backingMap.get(keyValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable V add(V keyValue) {
|
||||
return backingMap.put(keyValue, keyValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addAll(Set<? extends V> keyValues) {
|
||||
for (V keyValue : keyValues) {
|
||||
backingMap.put(keyValue, keyValue);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable V computeIfAbsent(
|
||||
K keyValue,
|
||||
@NotNull Function<? super K, ? extends V> mappingFunction
|
||||
) {
|
||||
V existing = backingMap.get(keyValue);
|
||||
if (existing != null) {
|
||||
return existing;
|
||||
}
|
||||
|
||||
V canonicalValue = mappingFunction.apply(keyValue);
|
||||
if (canonicalValue == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!canonicalValue.equals(keyValue)) {
|
||||
throw new IllegalArgumentException(
|
||||
"Computed canonical value must be equal to the key value."
|
||||
);
|
||||
}
|
||||
|
||||
V racedValue = backingMap.putIfAbsent(canonicalValue, canonicalValue);
|
||||
return racedValue != null ? racedValue : canonicalValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable V remove(K keyValue) {
|
||||
return backingMap.remove(keyValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
backingMap.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull Set<V> keySet() {
|
||||
return backingMap.keySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull Collection<V> values() {
|
||||
return backingMap.values();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
import games.cubi.logs.Logger;
|
||||
|
||||
/**
|
||||
* Static utility class for operations on int arrays annotated with {@link IntArrayListMarker}, which are intended to be used as lists of integers without the overhead of autoboxing.
|
||||
* <p>
|
||||
* {@link IntArrayListMarker} fields may be null or non-initialised to save memory, {@code IntArrayList} methods will treat null or non-initialised arrays as empty lists.
|
||||
* <p>
|
||||
* Arrays expand and contract as needed such that the length of the backing array is always equal to the number of elements in the list, so there is no extra capacity. This means that adding or removing elements from the list will involve creating a new array and copying the existing elements, which can be inefficient for large lists. However, this design choice was made to save memory and avoid the overhead of maintaining a separate size field and capacity management logic.
|
||||
*/
|
||||
public class IntArrayList {
|
||||
private IntArrayList() {}
|
||||
|
||||
public static int size(int@IntArrayListMarker[] array) {
|
||||
return array == null ? 0 : array.length;
|
||||
}
|
||||
|
||||
public static boolean isEmpty(int@IntArrayListMarker[] array) {
|
||||
return array == null || array.length == 0;
|
||||
}
|
||||
|
||||
public static boolean contains(int@IntArrayListMarker[] array, int value) {
|
||||
if (array == null) return false;
|
||||
for (int i : array) {
|
||||
if (i == value) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Caller of this method <b>must</b> reassign the returned array to the original array reference, as the original array will not be modified and a new array with the added element will be returned.
|
||||
*/
|
||||
public static int@IntArrayListMarker[] add(int@IntArrayListMarker[] array, int value) {
|
||||
if (array == null) {
|
||||
return new int[]{value};
|
||||
} else {
|
||||
int[] newArray = new int[array.length + 1];
|
||||
System.arraycopy(array, 0, newArray, 0, array.length);
|
||||
newArray[array.length] = value;
|
||||
return newArray;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Caller of this method <b>must</b> reassign the returned array to the original array reference, as the original array will not be modified and a new array with the added element will be returned.
|
||||
*/
|
||||
public static int@IntArrayListMarker[] remove(int@IntArrayListMarker[] array, int value) {
|
||||
if (array == null) return null;
|
||||
int index = -1;
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
if (array[i] == value) {
|
||||
index = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (index == -1) return array; // value not found, return original array
|
||||
int[] newArray = new int[array.length - 1];
|
||||
System.arraycopy(array, 0, newArray, 0, index);
|
||||
System.arraycopy(array, index + 1, newArray, index, array.length - index - 1);
|
||||
return newArray;
|
||||
}
|
||||
|
||||
/**
|
||||
* Caller of this method <b>must</b> reassign the returned array to the original array reference, as the original array will not be modified and a new array with the added element will be returned.
|
||||
*/
|
||||
public static int@IntArrayListMarker[] clear(int@IntArrayListMarker[] array) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public static int get(int@IntArrayListMarker[] array, int index) {
|
||||
if (array == null) Logger.errorAndReturn(new IndexOutOfBoundsException("Attempted to find value at index: " + index + ", for IntArrayList with size: 0"), 3, IntArrayList.class);
|
||||
if (index < 0 || index >= array.length) Logger.errorAndReturn(new IndexOutOfBoundsException("Attempted to find value at index: " + index + ", for IntArrayList with size: " + size(array)), 3, IntArrayList.class);
|
||||
return array[index];
|
||||
}
|
||||
|
||||
public static int@IntArrayListMarker[] set(int@IntArrayListMarker[] array, int index, int value) {
|
||||
array[index] = value;
|
||||
return array;
|
||||
}
|
||||
|
||||
public static int[] getCopyOrNull(int@IntArrayListMarker[] array) {
|
||||
if (size(array) == 0) return null;
|
||||
int[] copy = new int[array.length];
|
||||
System.arraycopy(array, 0, copy, 0, array.length);
|
||||
return copy;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
import java.lang.annotation.*; /**
|
||||
* {@code int[]} fields annotated with this are backing arrays for {@code IntArrayLists}. {@code IntArrayLists} are not objects directly, instead just an {@code int[]} array, with static operations provided by {@link IntArrayList}.
|
||||
* <p>
|
||||
* This is used to avoid the overhead of an actual object for each {@link IntArrayList}. To further reduce overhead, the field may not be initialised, {@link IntArrayList} is null safe.
|
||||
*
|
||||
* <p> Do not use this array directly, all calls should go through {@link IntArrayList}.
|
||||
*/
|
||||
@Documented @Retention(RetentionPolicy.SOURCE) @Target({ElementType.TYPE_USE, ElementType.FIELD, ElementType.PARAMETER})
|
||||
public @interface IntArrayListMarker {}
|
||||
@@ -0,0 +1,39 @@
|
||||
package games.cubi.raycastedantiesp.core.utils;
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
@Documented
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface Packet {
|
||||
//todo note: spawn living entity and painting are really old and no longer used, delete them from code maybe
|
||||
enum Packets {
|
||||
@Until("1.9")
|
||||
SPAWN_LIVING_ENTITY("N/A", "WrapperPlayServerSpawnEntityLiving"),
|
||||
SPAWN_ENTITY("https://minecraft.wiki/w/Java_Edition_protocol/Packets#Spawn_Entity", "WrapperPlayServerSpawnEntity"), //Note does not fire for self player
|
||||
ENTITY_ANIMATION("https://minecraft.wiki/w/Java_Edition_protocol/Packets#Entity_Animation", "WrapperPlayServerEntityAnimation"),
|
||||
ENTITY_EVENT("https://minecraft.wiki/w/Java_Edition_protocol/Packets#Entity_Event", "WrapperPlayServerEntityStatus"),
|
||||
HURT_ANIMATION("https://minecraft.wiki/w/Java_Edition_protocol/Packets#Hurt_Animation", "WrapperPlayServerHurtAnimation"),
|
||||
UPDATE_ATTRIBUTES("https://minecraft.wiki/w/Java_Edition_protocol/Packets#Update_Attributes", "WrapperPlayServerUpdateAttributes"),
|
||||
LEASH_ENTITY("https://minecraft.wiki/w/Java_Edition_protocol/Packets#Link_Entities", "WrapperPlayServerAttachEntity"), //Note in 1.8 and below this was also used for setting passengers
|
||||
;
|
||||
|
||||
Packets(String wikiURL, String PEName) {
|
||||
}
|
||||
}
|
||||
|
||||
Packets value();
|
||||
|
||||
@Documented
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
@interface Since {
|
||||
String value();
|
||||
}
|
||||
|
||||
@Documented
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
@interface Until {
|
||||
String value();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,196 @@
|
||||
package games.cubi.raycastedantiesp.core.view;
|
||||
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
import games.cubi.locatables.ChunkSectionLocatable;
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.locatables.implementations.ImmutableBlockLocatable;
|
||||
import games.cubi.raycastedantiesp.core.locatables.TileEntityLocatable;
|
||||
import games.cubi.raycastedantiesp.core.utils.CanonicalSet;
|
||||
import games.cubi.raycastedantiesp.core.utils.ConcurrentSelfMap;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
|
||||
public abstract class AbstractBlockView<T extends TileEntityLocatable<?>> implements BlockView {
|
||||
public static final int CHUNK_SIZE = 16;
|
||||
public static final int LOCAL_MASK = CHUNK_SIZE - 1;
|
||||
|
||||
private final Map<ChunkSectionLocatable, BitSet /*true if that position is occluding. Positions are 0-15 for x,y,z*/> chunks = new ConcurrentHashMap<>();
|
||||
private final CanonicalSet<Locatable, T> knownTileEntities = new ConcurrentSelfMap<>();
|
||||
private final ConcurrentLinkedQueue<BlockViewTransition> transitions = new ConcurrentLinkedQueue<>();
|
||||
|
||||
@Deprecated
|
||||
protected abstract T createTrackedTileEntity(BlockLocatable location, int blockID, boolean visible);
|
||||
|
||||
protected abstract T createTrackedTileEntity(UUID world, int x, int y, int z, int blockID);
|
||||
|
||||
|
||||
public boolean isBlockOccluding(UUID world, int x, int y, int z) {
|
||||
final BitSet chunk = getChunk(world, x >> 4, y >> 4, z >> 4);
|
||||
if (chunk == null) {
|
||||
// chunks may be empty if there are no occluding blocks in that chunk
|
||||
return false;
|
||||
}
|
||||
|
||||
return chunk.get(maskAndPack(x, y, z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isBlockOccluding(BlockLocatable location) {
|
||||
return location != null
|
||||
&& location.world() != null
|
||||
&& isBlockOccluding(location.world(), location.blockX(), location.blockY(), location.blockZ());
|
||||
}
|
||||
|
||||
public int loadedChunkCount() {
|
||||
return chunks.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertTileEntityIfAbsent(BlockLocatable location, int blockID, boolean visible) {
|
||||
knownTileEntities.computeIfAbsent(location, ignored -> createTrackedTileEntity(location, blockID, visible));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertTileEntity(BlockLocatable location, int blockID, boolean visible) {
|
||||
knownTileEntities.remove(location);
|
||||
knownTileEntities.add(createTrackedTileEntity(location, blockID, visible));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeTileEntity(BlockLocatable location) {
|
||||
T tileEntity = knownTileEntities.remove(location);
|
||||
if (tileEntity != null) {
|
||||
tileEntity.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public T getTrackedTileEntity(BlockLocatable location) {
|
||||
return knownTileEntities.get(location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public T getTrackedTileEntity(ImmutableBlockLocatable location) {
|
||||
return knownTileEntities.get(location);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isVisible(BlockLocatable location, int currentTick) {
|
||||
T state = knownTileEntities.get(location);
|
||||
return state == null || state.visible();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setVisibility(BlockLocatable location, boolean visible, int currentTick) {
|
||||
T existing = knownTileEntities.get(location);
|
||||
if (existing == null) {
|
||||
return;
|
||||
}
|
||||
if (existing.visible() != visible) {
|
||||
transitions.add(new BlockViewTransition(
|
||||
visible ? BlockViewTransition.Type.SHOW : BlockViewTransition.Type.HIDE,
|
||||
location
|
||||
));
|
||||
}
|
||||
existing.setVisible(visible);
|
||||
existing.setLastChecked(currentTick);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<BlockLocatable> getKnownTileEntities() {
|
||||
return List.copyOf(knownTileEntities.keySet());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<BlockLocatable> getNeedingRecheck(int recheckTicks, int currentTick) {
|
||||
List<BlockLocatable> needingRecheck = new ArrayList<>();
|
||||
for (T tileEntity : knownTileEntities.values()) {
|
||||
if (tileEntity.visible() && currentTick - tileEntity.lastChecked() < recheckTicks) {
|
||||
continue;
|
||||
}
|
||||
needingRecheck.add(tileEntity);
|
||||
}
|
||||
return needingRecheck;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasPendingTransitions() {
|
||||
return !transitions.isEmpty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BlockViewTransition> drainTransitions() {
|
||||
List<BlockViewTransition> drained = new ArrayList<>();
|
||||
BlockViewTransition transition;
|
||||
while ((transition = transitions.poll()) != null) {
|
||||
drained.add(transition);
|
||||
}
|
||||
return drained;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void upsertBlock(UUID world, int x, int y, int z, boolean occluding) {
|
||||
final BitSet chunk = getOrCreateChunk(world, x >> 4, y >> 4, z >> 4);
|
||||
chunk.set(maskAndPack(x, y, z), occluding);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeChunk(UUID world, int chunkX, int chunkZ) {
|
||||
chunks.entrySet().removeIf(entry ->
|
||||
entry.getKey().world().equals(world)
|
||||
&& entry.getKey().chunkX() == chunkX
|
||||
&& entry.getKey().chunkZ() == chunkZ
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeChunkSection(UUID world, int chunkX, int chunkY, int chunkZ) {
|
||||
chunks.remove(new ChunkSectionLocatable.ImmutableChunkSectionLocatable(world, chunkX, chunkY, chunkZ));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void replaceChunkSection(UUID world, int chunkX, int chunkY, int chunkZ, BitSet occludingBlocks) {
|
||||
chunks.put(new ChunkSectionLocatable.ImmutableChunkSectionLocatable(world, chunkX, chunkY, chunkZ), occludingBlocks
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
chunks.clear();
|
||||
knownTileEntities.clear();
|
||||
transitions.clear();
|
||||
}
|
||||
|
||||
public static int maskAndPack(int x, int y, int z) {
|
||||
return pack(x & LOCAL_MASK, y & LOCAL_MASK, z & LOCAL_MASK);
|
||||
}
|
||||
|
||||
public static int pack(int x, int y, int z) {
|
||||
return (x & LOCAL_MASK) | ((y & LOCAL_MASK) << 4) | ((z & LOCAL_MASK) << 8);
|
||||
}
|
||||
|
||||
public static int unpackX(int packed) {
|
||||
return packed & LOCAL_MASK;
|
||||
}
|
||||
|
||||
public static int unpackY(int packed) {
|
||||
return (packed >> 4) & LOCAL_MASK;
|
||||
}
|
||||
|
||||
public static int unpackZ(int packed) {
|
||||
return (packed >> 8) & LOCAL_MASK;
|
||||
}
|
||||
|
||||
private BitSet getChunk(UUID world, int chunkX, int chunkY, int chunkZ) {
|
||||
return chunks.get(new ChunkSectionLocatable.ImmutableChunkSectionLocatable(world, chunkX, chunkY, chunkZ));
|
||||
}
|
||||
|
||||
private BitSet getOrCreateChunk(UUID world, int chunkX, int chunkY, int chunkZ) {
|
||||
return chunks.computeIfAbsent(
|
||||
new ChunkSectionLocatable.ImmutableChunkSectionLocatable(world, chunkX, chunkY, chunkZ),
|
||||
ignored -> new BitSet(CHUNK_SIZE*CHUNK_SIZE*CHUNK_SIZE)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package games.cubi.raycastedantiesp.core.view;
|
||||
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
import games.cubi.locatables.implementations.ImmutableBlockLocatable;
|
||||
import games.cubi.raycastedantiesp.core.locatables.TileEntityLocatable;
|
||||
import games.cubi.raycastedantiesp.core.utils.Clearable;
|
||||
|
||||
import java.util.BitSet;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface BlockView extends Clearable {
|
||||
boolean isBlockOccluding(BlockLocatable location);
|
||||
|
||||
void insertTileEntityIfAbsent(BlockLocatable location, int blockID, boolean visible);
|
||||
|
||||
void insertTileEntity(BlockLocatable location, int blockID, boolean visible);
|
||||
|
||||
void removeTileEntity(BlockLocatable location);
|
||||
|
||||
TileEntityLocatable<?> getTrackedTileEntity(BlockLocatable location);
|
||||
|
||||
TileEntityLocatable<?> getTrackedTileEntity(ImmutableBlockLocatable location);
|
||||
|
||||
boolean isVisible(BlockLocatable location, int currentTick);
|
||||
|
||||
void setVisibility(BlockLocatable location, boolean visible, int currentTick);
|
||||
|
||||
Collection<BlockLocatable> getKnownTileEntities();
|
||||
|
||||
Collection<BlockLocatable> getNeedingRecheck(int recheckTicks, int currentTick);
|
||||
|
||||
boolean hasPendingTransitions();
|
||||
|
||||
List<BlockViewTransition> drainTransitions();
|
||||
|
||||
void upsertBlock(UUID world, int x, int y, int z, boolean occluding);
|
||||
|
||||
void removeChunk(UUID world, int chunkX, int chunkZ);
|
||||
|
||||
void removeChunkSection(UUID world, int chunkX, int chunkY, int chunkZ);
|
||||
|
||||
void replaceChunkSection(UUID world, int chunkX, int chunkY, int chunkZ, BitSet occludingBlocks);
|
||||
|
||||
default <T> T cast() {
|
||||
return (T) this;
|
||||
}
|
||||
|
||||
interface Factory {
|
||||
BlockView createBlockView();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package games.cubi.raycastedantiesp.core.view;
|
||||
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
|
||||
// Used to cache visibility changes until the player's netty thread next processes them.
|
||||
public record BlockViewTransition(Type type, BlockLocatable location) {
|
||||
public enum Type {
|
||||
SHOW,
|
||||
HIDE,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package games.cubi.raycastedantiesp.core.view;
|
||||
|
||||
import games.cubi.raycastedantiesp.core.locatables.EntityLocatable;
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.raycastedantiesp.core.utils.Clearable;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public interface EntityView<T extends EntityLocatable<?, ?>> extends Clearable {
|
||||
void insertEntity(T entity);
|
||||
|
||||
void removeEntity(int entityID, int currentTick);
|
||||
|
||||
void removeEntity(UUID entityUUID, int currentTick);
|
||||
|
||||
T getEntity(UUID entityUUID);
|
||||
|
||||
T getEntity(int entityID);
|
||||
|
||||
Locatable getLocation(UUID entityUUID);
|
||||
|
||||
int getEntityID(UUID entityUUID);
|
||||
|
||||
boolean exists(UUID entityUUID);
|
||||
|
||||
boolean exists(int entityID);
|
||||
|
||||
@Deprecated
|
||||
boolean isVisible(UUID entityUUID, int currentTick);
|
||||
|
||||
boolean isVisible(UUID entityUUID);
|
||||
|
||||
boolean isVisible(int entityID);
|
||||
|
||||
void setVisibility(UUID entityUUID, boolean visible, int currentTick);
|
||||
|
||||
Collection<UUID> getKnownEntities();
|
||||
|
||||
Collection<UUID> getNeedingRecheck(int recheckTicks, int currentTick);
|
||||
|
||||
boolean hasPendingTransitions();
|
||||
|
||||
List<EntityViewTransition> drainTransitions();
|
||||
|
||||
boolean isPlayerView();
|
||||
|
||||
default <T> T cast() {
|
||||
return (T) this;
|
||||
}
|
||||
|
||||
interface Factory {
|
||||
EntityView<?> createEntityView();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package games.cubi.raycastedantiesp.core.view;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
// Used to cache visibility changes until the player's netty thread next processes
|
||||
public record EntityViewTransition(Type type, UUID targetUUID, int entityID) {
|
||||
public enum Type {
|
||||
SHOW,
|
||||
HIDE,
|
||||
FORGET,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package games.cubi.raycastedantiesp.core.view;
|
||||
|
||||
import games.cubi.logs.Logger;
|
||||
|
||||
public final class ViewRegistry {
|
||||
private static EntityView.Factory entityViewFactory;
|
||||
private static EntityView.Factory playerEntityViewFactory;
|
||||
private static BlockView.Factory blockViewFactory;
|
||||
|
||||
private ViewRegistry() {}
|
||||
|
||||
public static void initialise(BlockView.Factory blockViewFactory1, EntityView.Factory entityViewFactory1, EntityView.Factory playerEntityViewFactory1) {
|
||||
blockViewFactory = blockViewFactory1;
|
||||
entityViewFactory = entityViewFactory1;
|
||||
playerEntityViewFactory = playerEntityViewFactory1;
|
||||
}
|
||||
|
||||
public static BlockView createBlockView() {
|
||||
if (blockViewFactory == null) {
|
||||
Logger.error(new IllegalStateException("Block view factory is null. Did you forget to initialise ViewRegistry?"), 1, ViewRegistry.class);
|
||||
}
|
||||
return blockViewFactory.createBlockView();
|
||||
}
|
||||
|
||||
public static EntityView<?> createEntityView() {
|
||||
if (entityViewFactory == null) {
|
||||
Logger.error(new IllegalStateException("Entity view factory is null. Did you forget to initialise ViewRegistry?"), 1, ViewRegistry.class);
|
||||
}
|
||||
return entityViewFactory.createEntityView();
|
||||
}
|
||||
|
||||
public static EntityView<?> createPlayerEntityView() {
|
||||
if (playerEntityViewFactory == null) {
|
||||
Logger.error(new IllegalStateException("Player entity view factory is null. Did you forget to initialise ViewRegistry?"), 1, ViewRegistry.class);
|
||||
}
|
||||
return playerEntityViewFactory.createEntityView();
|
||||
}
|
||||
}
|
||||
+401
@@ -0,0 +1,401 @@
|
||||
package games.cubi.raycastedantiesp.core.view.controller;
|
||||
|
||||
import games.cubi.logs.Logger;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.EntityConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.PlayerConfig;
|
||||
import games.cubi.raycastedantiesp.core.config.raycast.RaycastConfig;
|
||||
import games.cubi.raycastedantiesp.core.locatables.NettyEntityLocatable;
|
||||
import games.cubi.raycastedantiesp.core.players.PlayerData;
|
||||
import games.cubi.raycastedantiesp.core.players.PlayerRegistry;
|
||||
import games.cubi.raycastedantiesp.core.utils.Packet;
|
||||
import games.cubi.raycastedantiesp.core.view.EntityView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.UUID;
|
||||
|
||||
import static games.cubi.raycastedantiesp.core.locatables.NettyEntityLocatable.NO_LEASHER;
|
||||
|
||||
/**
|
||||
* @param <P> The platform's packet wrapper (PacketWrapper<?>)
|
||||
*/
|
||||
public abstract class PacketEntityViewController<P> {
|
||||
private static final int SAFETY_MARGIN_FACTOR = 2; // Multiplier for the max delayed packet retry count. While the below values were set based on testing which showed no errors, these are magic numbers based on nothing concrete, and mojang could break it at any time. Adding a safety factor should prevent any issues.
|
||||
public static final int DELAYED_CACHE_PACKET_RETRY_COUNT = 3 * SAFETY_MARGIN_FACTOR; // A delay of 3 seems to be exactly perfect from my testing, with no packets needing more or less than two retries.
|
||||
public static final int DELAYED_PASSENGER_PACKET_RETRY_COUNT = 72 * SAFETY_MARGIN_FACTOR; //Such a high delay only seems relevant when the player spawns in while riding an entity, probably because all player packets are sent before the vehicle packets.
|
||||
public static final int DELAYED_LEASH_PACKET_RETRY_COUNT = 64 * SAFETY_MARGIN_FACTOR;
|
||||
|
||||
protected EntityConfig entityConfig = null;
|
||||
protected PlayerConfig playerConfig = null;
|
||||
protected double hideOnSpawnEntityDistanceSquared = 0;
|
||||
protected double hideOnSpawnPlayerDistanceSquared = 0;
|
||||
|
||||
protected void handlePlayPhaseLoginPacket(int entityID, UUID playerUUID, int currentTick) {
|
||||
PlayerData playerData = PlayerRegistry.getInstance().getPlayerData(playerUUID);
|
||||
playerData.playerView().insertEntity(createSelfEntity(playerData, entityID, playerUUID).cast());
|
||||
}
|
||||
|
||||
protected PlayerData handleLoginPhaseLoginPacket(UUID playerUUID, int currentTick) {
|
||||
return PlayerRegistry.getInstance().registerAndGetPlayer(playerUUID, currentTick);
|
||||
}
|
||||
|
||||
protected abstract NettyEntityLocatable<?,?> createSelfEntity(PlayerData ownData, int entityID, UUID playerUUID);
|
||||
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*//*
|
||||
protected boolean handleLivingEntitySpawn(P packet, PlayerData playerData, UUID world, int currentTick) {
|
||||
if (world == null) {
|
||||
Logger.error(new RuntimeException("World null when handling spawn living entity packet, uuid=" + playerData.getPlayerUUID() + " tick=" + currentTick), 2, PacketEntityViewController.class);
|
||||
return true;
|
||||
}
|
||||
NettyEntityLocatable<?,?> entity = processLivingEntitySpawn(playerData, packet, world, currentTick);
|
||||
|
||||
if (entityConfig.enabled()) {
|
||||
double distanceSquared = playerData.ownLocation().distanceSquared(entity);
|
||||
if (distanceSquared > hideOnSpawnEntityDistanceSquared) {
|
||||
entity.setVisible(false);
|
||||
entity.setClientVisible(false);
|
||||
insertEntityToEntityView(entity, playerData);
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
entity.setClientVisible(true);
|
||||
}
|
||||
insertEntityToEntityView(entity, playerData);
|
||||
return false;
|
||||
}*/
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
@Packet(Packet.Packets.SPAWN_ENTITY)
|
||||
protected boolean handleEntitySpawn(P packet, boolean isPlayer, PlayerData playerData, UUID world, int currentTick) {
|
||||
if (world == null) {
|
||||
Logger.error(new RuntimeException("World null when handling spawn entity packet, uuid=" + playerData.getPlayerUUID() + " tick=" + currentTick), 2, PacketEntityViewController.class);
|
||||
return true;
|
||||
}
|
||||
|
||||
NettyEntityLocatable<?,?> entity = processEntitySpawn(playerData, packet, world, currentTick);
|
||||
|
||||
if ((!isPlayer && entityConfig.enabled()) || isPlayer && playerConfig.enabled()) {
|
||||
double distanceSquared = playerData.ownLocation().distanceSquared(entity);
|
||||
if (distanceSquared > (isPlayer ? hideOnSpawnPlayerDistanceSquared : hideOnSpawnEntityDistanceSquared)) {
|
||||
entity.setVisible(false);
|
||||
entity.setClientVisible(false);
|
||||
if (isPlayer) {
|
||||
insertEntityToPlayerView(entity, playerData);
|
||||
return true;
|
||||
}
|
||||
insertEntityToEntityView(entity, playerData);
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
entity.setClientVisible(true);
|
||||
}
|
||||
if (isPlayer) {
|
||||
insertEntityToPlayerView(entity, playerData);
|
||||
return false;
|
||||
}
|
||||
insertEntityToEntityView(entity, playerData);
|
||||
return false;
|
||||
}
|
||||
|
||||
@Packet(Packet.Packets.ENTITY_ANIMATION)
|
||||
protected boolean handleEntityAnimation(int entityID, PlayerData playerData) {
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
|
||||
@Packet(Packet.Packets.ENTITY_EVENT)
|
||||
protected boolean handleEntityEvent(int entityID, PlayerData playerData) {
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
|
||||
@Packet(Packet.Packets.HURT_ANIMATION)
|
||||
protected boolean handleHurtAnimation(int entityID, PlayerData playerData) {
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleRelativeMove(P packet, PlayerData playerData, int currentTick) {
|
||||
int entityID = processRelativeMovePacket(packet, playerData, currentTick);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleRelativeMoveAndRotation(P packet, PlayerData playerData, int currentTick) {
|
||||
int entityID = processRelativeMoveAndRotationPacket(packet, playerData, currentTick);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleTeleport(P packet, PlayerData playerData, int currentTick) {
|
||||
int entityID = processTeleportPacket(packet, playerData, currentTick);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handlePositionSync(P packet, PlayerData playerData, int currentTick) {
|
||||
int entityID = processPositionSyncPacket(packet, playerData, currentTick);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityRotation(P packet, PlayerData playerData, int currentTick) {
|
||||
int entityID = processRotationPacket(packet, playerData, currentTick);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityHeadLook(P packet, PlayerData playerData, int currentTick) {
|
||||
int entityID = processHeadLookPacket(packet, playerData, currentTick);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityMetadata(P packet, int entityID, PlayerData playerData, int currentTick) {
|
||||
cachePacket(packet, entityID, playerData);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleRemoveEntityEffect(P packet, int entityID, PlayerData playerData, int currentTick) {
|
||||
cachePacket(packet, entityID, playerData);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityEquipment(P packet, int entityID, PlayerData playerData, int currentTick) {
|
||||
cachePacket(packet, entityID, playerData);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityVelocity(P packet, int entityID, PlayerData playerData, int currentTick) {
|
||||
processEntityVelocityPacket(packet, playerData, currentTick);
|
||||
cachePacket(packet, entityID, playerData); //todo: may be wrong?
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityEffect(P packet, int entityID, PlayerData playerData, int currentTick) {
|
||||
cachePacket(packet, entityID, playerData);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleEntityPassengers(int entityID, int[] passengers, PlayerData playerData, int currentTick) {
|
||||
return handleEntityPassengers(entityID, passengers, playerData, currentTick, DELAYED_PASSENGER_PACKET_RETRY_COUNT);
|
||||
}
|
||||
|
||||
//This (and leash handling) leaks some info to the client, as it will receive the passenger packet even if the passengers are auto-hidden once parsed, but as the packet doesn't include any location or type info, this shouldn't be too incriminating.
|
||||
private boolean handleEntityPassengers(int entityID, int[] passengers, PlayerData playerData, int currentTick, int retriesRemaining) {
|
||||
NettyEntityLocatable<?,?> entity = playerData.entityFromID(entityID);
|
||||
if (entity == null) {
|
||||
if (retriesRemaining > 0) {
|
||||
delayPacketHandling(playerData, () -> handleEntityPassengers(entityID, passengers, playerData, currentTick, retriesRemaining - 1));
|
||||
return false;
|
||||
}
|
||||
Logger.error("Found null vehicle when handling entity passengers packet, vehicleID=" + entityID + " for player: " + playerData.getPlayerUUID(), 2, PacketEntityViewController.class);
|
||||
return false;
|
||||
}
|
||||
entity.setPassengerIDs(passengers);
|
||||
boolean shouldRetry = false;
|
||||
for (int passengerID : passengers) {
|
||||
NettyEntityLocatable<?,?> passenger = playerData.entityFromID(passengerID);
|
||||
if (passenger == null) {
|
||||
if (retriesRemaining > 0) {
|
||||
shouldRetry = true;
|
||||
continue;
|
||||
}
|
||||
Logger.error("Found null passenger when handling entity passengers packet, passengerID=" + passengerID + " for player: " + playerData.getPlayerUUID(), 2, PacketEntityViewController.class);
|
||||
continue;
|
||||
}
|
||||
passenger.setVehicleID(entityID);
|
||||
}
|
||||
if (shouldRetry) {
|
||||
delayPacketHandling(playerData, () -> handleEntityPassengers(entityID, passengers, playerData, currentTick, retriesRemaining - 1));
|
||||
}
|
||||
checkVehicle(entity, playerData);
|
||||
if (cancelIfEnabledAndHidden(entityID, playerData)) return true;
|
||||
boolean passengersNotVisible = false;
|
||||
ArrayList<Integer> visiblePassengers = new ArrayList<>(passengers.length);
|
||||
for (int passengerID : passengers) {
|
||||
if (cancelIfEnabledAndHidden(passengerID, playerData)) {
|
||||
passengersNotVisible = true;
|
||||
}
|
||||
else {
|
||||
visiblePassengers.add(passengerID);
|
||||
}
|
||||
}
|
||||
if (passengersNotVisible) {
|
||||
//some passengers are hidden but others aren't. Cancel this packet and send another silently with just the visible passengers.
|
||||
sendEntityPassengerPacket(entityID, visiblePassengers, playerData);
|
||||
}
|
||||
return passengersNotVisible;
|
||||
}
|
||||
|
||||
private void checkVehicle(NettyEntityLocatable<?,?> entity, PlayerData playerData) {
|
||||
int vehicleID = entity.vehicleID();
|
||||
if (vehicleID >= 0) {
|
||||
NettyEntityLocatable<?,?> vehicle = playerData.entityFromID(vehicleID);
|
||||
if (vehicle == null) {
|
||||
Logger.error(new RuntimeException("Found null vehicle when handling entity passengers packet, vehicleID=" + vehicleID + " for player: " + playerData.getPlayerUUID()), 2, PacketEntityViewController.class);
|
||||
return;
|
||||
}
|
||||
if (cancelIfEnabledAndHidden(vehicleID, playerData)) {
|
||||
//Vehicle is hidden, so this entity should be hidden as well. No need to check passengers.
|
||||
return;
|
||||
}
|
||||
//Vehicle is visible, but this entity may not be.
|
||||
if (cancelIfEnabledAndHidden(entity.entityID(), playerData)) {
|
||||
return;
|
||||
}
|
||||
ArrayList<Integer> passengers = new ArrayList<>();
|
||||
passengers.add(entity.entityID());
|
||||
sendEntityPassengerPacket(vehicleID, passengers, playerData);
|
||||
}
|
||||
}
|
||||
|
||||
protected void handleDestroyEntities(int[] entityIDs, PlayerData playerData, int currentTick) {
|
||||
for (int entityID : entityIDs) {
|
||||
EntityView<?> entityView = playerData.viewFromEntityID(entityID);
|
||||
if (entityView == null) {
|
||||
Logger.error("Could not find view for entity when processing destroy packet, id=" + entityID, 2, PacketEntityViewController.class);
|
||||
continue;
|
||||
}
|
||||
entityView.removeEntity(entityID, currentTick);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
protected boolean handleAttributeUpdate(P packet, int entityID, PlayerData playerData, int currentTick) {
|
||||
cachePacket(packet, entityID, playerData);
|
||||
return cancelIfEnabledAndHidden(entityID, playerData);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether or not to cancel the packet event. <code>true</code> to cancel, <code>false</code> to do nothing.
|
||||
*/
|
||||
@Packet(Packet.Packets.LEASH_ENTITY)
|
||||
protected boolean handleLeashEntity(int leashedEntity, int leashingEntity, PlayerData playerData) {
|
||||
return handleLeashEntity(leashedEntity, leashingEntity, playerData, DELAYED_LEASH_PACKET_RETRY_COUNT);
|
||||
}
|
||||
|
||||
private boolean handleLeashEntity(int leashedEntity, int leashingEntity, PlayerData playerData, int retriesRemaining) {
|
||||
//Note, leashing entity ID will be -1 to unleash. From testing it sometimes seems to be 0?
|
||||
NettyEntityLocatable<?,?> leashed = playerData.entityFromID(leashedEntity);
|
||||
if (leashed == null) {
|
||||
if (retriesRemaining > 0) {
|
||||
delayPacketHandling(playerData, () -> handleLeashEntity(leashedEntity, leashingEntity, playerData, retriesRemaining - 1));
|
||||
return false;
|
||||
}
|
||||
Logger.error(new RuntimeException("Found null leashed entity when handling leash entity packet, leashedEntityID=" + leashedEntity + " for player: " + playerData.getPlayerUUID()), 2, PacketEntityViewController.class);
|
||||
return false;
|
||||
}
|
||||
if (leashingEntity == -1 || leashingEntity == 0) {
|
||||
int previouslyLeashingEntityID = leashed.leashingEntity();
|
||||
if (previouslyLeashingEntityID == NO_LEASHER) {
|
||||
Logger.error("Entity was already unleashing when handling leash entity packet, leashedEntityID=" + leashedEntity + " for player: " + playerData.getPlayerUUID(), 2, PacketEntityViewController.class);
|
||||
return false;
|
||||
}
|
||||
playerData.entityFromID(previouslyLeashingEntityID).removeLeashedEntity(leashedEntity);
|
||||
leashed.setLeashingEntity(NO_LEASHER);
|
||||
return cancelIfEnabledAndHidden(leashedEntity, playerData);
|
||||
}
|
||||
else {
|
||||
NettyEntityLocatable<?,?> leashing = playerData.entityFromID(leashingEntity);
|
||||
if (leashing == null) {
|
||||
if (retriesRemaining > 0) {
|
||||
delayPacketHandling(playerData, () -> handleLeashEntity(leashedEntity, leashingEntity, playerData, retriesRemaining - 1));
|
||||
return false;
|
||||
}
|
||||
Logger.error("Found null leashing entity when handling leash entity packet, leashingEntityID=" + leashingEntity + ", leashedEntityID=" + leashedEntity + " for player: " + playerData.getPlayerUUID(), 2, PacketEntityViewController.class);
|
||||
return false;
|
||||
}
|
||||
leashed.setLeashingEntity(leashingEntity);
|
||||
leashing.addLeashedEntity(leashedEntity);
|
||||
return cancelIfEnabledAndHidden(leashedEntity, playerData) || cancelIfEnabledAndHidden(leashingEntity, playerData);
|
||||
}
|
||||
}
|
||||
|
||||
protected RaycastConfig getCorrectConfig(EntityView<?> entityView) {
|
||||
if (entityView.isPlayerView()) {
|
||||
return playerConfig;
|
||||
} else {
|
||||
return entityConfig;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return True if the packet should be suppressed
|
||||
*/
|
||||
protected boolean cancelIfEnabledAndHidden(int entityID, PlayerData playerData) {
|
||||
EntityView<?> entityView = playerData.viewFromEntityID(entityID);
|
||||
|
||||
if (entityView == null) {
|
||||
Logger.warning("Checked if packet for entity should be cancelled, but entity did not exist. ID: " + entityID + " for player: " + playerData.getPlayerUUID(), 6, PacketEntityViewController.class);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (entityView.isVisible(entityID)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return getCorrectConfig(entityView).enabled(); // If this statement is reached, the entity should be hidden, so if the config is enabled it is hidden.
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The created entity, with a default visibility of <code>true</code>. Does not insert the entity into any views, that is the responsibility of the caller.
|
||||
*/
|
||||
protected abstract NettyEntityLocatable<?,?> processEntitySpawn(PlayerData playerData, P packet, UUID world, int currentTick);
|
||||
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processRelativeMovePacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processRelativeMoveAndRotationPacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processTeleportPacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processPositionSyncPacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
protected abstract void cachePacket(P packet, int entityID, PlayerData playerData);
|
||||
|
||||
//Only needed because for some absurd reason mojang decides to send some packets before the spawn packet of the entity.
|
||||
protected void delayPacketHandling(PlayerData playerData, Runnable task) {
|
||||
playerData.runNettyTaskASAP(task);
|
||||
}
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processRotationPacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processHeadLookPacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
/** @return The entity ID of the entity */
|
||||
protected abstract int processEntityVelocityPacket(P packet, PlayerData playerData, int currentTick);
|
||||
|
||||
/**Silently sends the provided array of entities as passengers for the required vehicle.*/
|
||||
protected abstract void sendEntityPassengerPacket(int vehicle, ArrayList<Integer> passengers, PlayerData playerData);
|
||||
|
||||
protected abstract void insertEntityToPlayerView(NettyEntityLocatable<?,?> entity, PlayerData playerData);
|
||||
|
||||
protected abstract void insertEntityToEntityView(NettyEntityLocatable<?,?> entity, PlayerData playerData);
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
short-git: ${short_git}
|
||||
long-git: ${long_git}
|
||||
build-time: ${build_time}
|
||||
version: ${version}
|
||||
@@ -0,0 +1,4 @@
|
||||
group=games.cubi
|
||||
org.gradle.configuration-cache=true
|
||||
org.gradle.parallel=true
|
||||
org.gradle.caching=true
|
||||
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
# Copyright © 2015 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -15,6 +15,8 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
@@ -84,7 +86,7 @@ done
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
@@ -112,7 +114,6 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -170,7 +171,6 @@ fi
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
@@ -203,15 +203,14 @@ fi
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
Vendored
+3
-2
@@ -13,6 +13,8 @@
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@@ -68,11 +70,10 @@ goto fail
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
import java.time.Instant
|
||||
|
||||
plugins {
|
||||
id("java")
|
||||
}
|
||||
|
||||
group = "games.cubi.locatables"
|
||||
version = "0.1.0"
|
||||
|
||||
val commitShort = providers.exec {
|
||||
commandLine("git", "rev-parse", "--short=8", "HEAD")
|
||||
}.standardOutput.asText.map { it.trim() }
|
||||
|
||||
val commitFull = providers.exec {
|
||||
commandLine("git", "rev-parse", "HEAD")
|
||||
}.standardOutput.asText.map { it.trim() }
|
||||
|
||||
val buildTime = providers.provider {
|
||||
Instant.now().toString()
|
||||
}
|
||||
|
||||
tasks {
|
||||
processResources {
|
||||
val gitProps = mapOf(
|
||||
"short_git" to commitShort.get(),
|
||||
"long_git" to commitFull.get(),
|
||||
"build_time" to buildTime.get(),
|
||||
"version" to version.toString()
|
||||
)
|
||||
// build-properties is not used by the locatables library itself, but is included in the jar so that platforms can access it.
|
||||
filesMatching("build-properties/locatable-lib.yml") {
|
||||
expand(gitProps)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly(project(":logging"))
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
import games.cubi.locatables.implementations.MutableLocatableImpl;
|
||||
|
||||
public non-sealed interface BlockLocatable extends Locatable {
|
||||
|
||||
default MutableLocatable clonePlainAndCentreIfBlockLocation() {
|
||||
return new MutableLocatableImpl(world(), blockX() + 0.5, blockY() + 0.5, blockZ() + 0.5);
|
||||
}
|
||||
|
||||
default boolean isEqual(Object o) {
|
||||
if (this == o) return true;
|
||||
if (!(o instanceof BlockLocatable other)) return false;
|
||||
return this.blockX() == other.blockX() && this.blockY() == other.blockY() && this.blockZ() == other.blockZ() && world().equals(other.world());
|
||||
}
|
||||
|
||||
default int blockHash() {
|
||||
int result = 17;
|
||||
result = 31 * result + (this.world() != null ? this.world().hashCode() : 0);
|
||||
result = 31 * result + this.blockX();
|
||||
result = 31 * result + this.blockY();
|
||||
result = 31 * result + this.blockZ();
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
default double x() {
|
||||
return blockX();
|
||||
}
|
||||
|
||||
@Override
|
||||
default double y() {
|
||||
return blockY();
|
||||
}
|
||||
|
||||
@Override
|
||||
default double z() {
|
||||
return blockZ();
|
||||
}
|
||||
|
||||
@Override
|
||||
int blockX();
|
||||
|
||||
@Override
|
||||
int blockY();
|
||||
|
||||
@Override
|
||||
int blockZ();
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public sealed interface ChunkLocatable permits ChunkLocatable.ImmutableChunkLocatable, ChunkSectionLocatable {
|
||||
UUID world();
|
||||
int chunkX();
|
||||
int chunkZ();
|
||||
|
||||
record ImmutableChunkLocatable(UUID world, int chunkX, int chunkZ) implements ChunkLocatable {
|
||||
public ImmutableChunkLocatable(Locatable locatable) {
|
||||
this(locatable.world(), locatable.chunkX(), locatable.chunkZ());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public sealed interface ChunkSectionLocatable extends ChunkLocatable permits ChunkSectionLocatable.ImmutableChunkSectionLocatable, Locatable {
|
||||
int chunkY();
|
||||
|
||||
record ImmutableChunkSectionLocatable(UUID world, int chunkX, int chunkY, int chunkZ) implements ChunkSectionLocatable {
|
||||
public ImmutableChunkSectionLocatable(Locatable locatable) {
|
||||
this(locatable.world(), locatable.chunkX(), locatable.chunkY(), locatable.chunkZ());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
public non-sealed interface ImmutableLocatable extends Locatable {
|
||||
default boolean isMutable() {
|
||||
return false;
|
||||
}
|
||||
|
||||
default MutableLocatable castToMutableOrNull() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,203 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
import games.cubi.locatables.implementations.*;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
// A vector-like interface representing a location in a 3D space within a specific world.
|
||||
public sealed interface Locatable extends ChunkSectionLocatable, StrictEquality permits MutableLocatable, ImmutableLocatable, BlockLocatable {
|
||||
|
||||
double x();
|
||||
double y();
|
||||
double z();
|
||||
UUID world();
|
||||
|
||||
default int blockX() {
|
||||
return (int) Math.floor(x());
|
||||
}
|
||||
default int blockY() {
|
||||
return (int) Math.floor(y());
|
||||
}
|
||||
default int blockZ() {
|
||||
return (int) Math.floor(z());
|
||||
}
|
||||
|
||||
@Override
|
||||
default int chunkX() {
|
||||
return blockX() >> 4;
|
||||
}
|
||||
@Override
|
||||
default int chunkZ() {
|
||||
return blockZ() >> 4;
|
||||
}
|
||||
@Override
|
||||
default int chunkY() {
|
||||
return blockY() >> 4;
|
||||
}
|
||||
|
||||
default double length() {
|
||||
return Math.sqrt(lengthSquared());
|
||||
}
|
||||
|
||||
default double lengthSquared() {
|
||||
return x() * x() + y() * y() + z() * z();
|
||||
}
|
||||
|
||||
default double distance(Locatable locatable) {
|
||||
return Math.sqrt(distanceSquared(locatable));
|
||||
}
|
||||
|
||||
default double distanceSquared(Locatable locatable) {
|
||||
double dx = x() - locatable.x();
|
||||
double dy = y() - locatable.y();
|
||||
double dz = z() - locatable.z();
|
||||
return dx * dx + dy * dy + dz * dz;
|
||||
}
|
||||
|
||||
default double distanceSquared(double x, double y, double z) {
|
||||
double dx = this.x() - x;
|
||||
double dy = this.y() - y;
|
||||
double dz = this.z() - z;
|
||||
return dx * dx + dy * dy + dz * dz;
|
||||
}
|
||||
|
||||
default MutableLocatable clonePlainAndCentreIfBlockLocation() {
|
||||
return new MutableLocatableImpl(world(), x(), y(), z());
|
||||
}
|
||||
|
||||
/**@return An array of the 3 coordinates, in the order [x,y,z]. This is used for atomic updates of all 3 coordinates.*/
|
||||
default double[] getAtomicPositionArray() {
|
||||
synchronized (this) {
|
||||
return new double[]{x(), y(), z()};
|
||||
}
|
||||
}
|
||||
|
||||
LocatableType getType();
|
||||
|
||||
boolean isMutable();
|
||||
|
||||
MutableLocatable castToMutableOrNull(); // There shouldn't be a need for an equivalent of this method for immutable locatables as all of their methods are common to all Locatables
|
||||
|
||||
default boolean isEqualTo(Object thatOne) {
|
||||
if (this == thatOne) return true;
|
||||
if (!(thatOne instanceof Locatable that)) return false;
|
||||
if (!(this.world().equals(that.world()))) return false;
|
||||
|
||||
if (Double.doubleToLongBits(this.x()) != Double.doubleToLongBits(that.x())) {
|
||||
return false;
|
||||
}
|
||||
if (Double.doubleToLongBits(this.y()) != Double.doubleToLongBits(that.y())) {
|
||||
return false;
|
||||
}
|
||||
if (Double.doubleToLongBits(this.z()) != Double.doubleToLongBits(that.z())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
default int makeHash() {
|
||||
int hash = 3;
|
||||
|
||||
hash = 19 * hash + this.world().hashCode();
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(x()));
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(y()));
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(z()));
|
||||
return hash;
|
||||
}
|
||||
|
||||
default String toStringForm() {
|
||||
return getType()+
|
||||
"{" +
|
||||
"world=" + world() +
|
||||
", x=" + x() +
|
||||
", y=" + y() +
|
||||
", z=" + z() +
|
||||
'}';
|
||||
}
|
||||
|
||||
enum LocatableType {
|
||||
ThreadSafe,
|
||||
NettyEntity,
|
||||
NettyTileEntity,
|
||||
MutableBlockVector,
|
||||
ImmutableBlockLocation,
|
||||
Immutable,
|
||||
Mutable,
|
||||
// implementations from other modules/projects should use the following
|
||||
ExternalMutable,
|
||||
ExternalImmutable,
|
||||
ExternalMutableBlock,
|
||||
ExternalImmutableBlock,
|
||||
}
|
||||
|
||||
static Locatable convertLocatable(Locatable from, LocatableType to, boolean clone) {
|
||||
switch (to) {
|
||||
case ThreadSafe -> {
|
||||
if ((from instanceof ThreadSafeLocatable) && !clone) return from;
|
||||
return new ThreadSafeLocatable(from.world(), from.x(), from.y(), from.z());
|
||||
}
|
||||
case MutableBlockVector -> {
|
||||
if ((from instanceof MutableBlockVector) && !clone) return from;
|
||||
return new MutableBlockVector(from.world(), from.x(), from.y(), from.z());
|
||||
}
|
||||
case ImmutableBlockLocation -> {
|
||||
if ((from instanceof ImmutableBlockLocatable) && !clone) return from;
|
||||
return new ImmutableBlockLocatable(from.world(), from.x(), from.y(), from.z());
|
||||
}
|
||||
case Mutable -> {
|
||||
if ((from instanceof MutableLocatableImpl) && !clone) return from;
|
||||
return new MutableLocatableImpl(from.world(), from.x(), from.y(), from.z());
|
||||
}
|
||||
default -> {
|
||||
return new MutableLocatableImpl(from.world(), from.x(), from.y(), from.z());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static Locatable copyOf(Locatable locatable) {
|
||||
return convertLocatable(locatable, locatable.getType(), true);
|
||||
}
|
||||
|
||||
static Locatable create(UUID world, double x, double y, double z, LocatableType type) {
|
||||
switch (type) {
|
||||
case ThreadSafe -> {
|
||||
return new ThreadSafeLocatable(world, x, y, z);
|
||||
}
|
||||
case MutableBlockVector, ExternalMutableBlock -> {
|
||||
return new MutableBlockVector(world, x, y, z);
|
||||
}
|
||||
case Mutable, ExternalMutable -> {
|
||||
return new MutableLocatableImpl(world, x, y, z);
|
||||
}
|
||||
case ImmutableBlockLocation, ExternalImmutableBlock -> {
|
||||
return new ImmutableBlockLocatable(world, x, y, z);
|
||||
}
|
||||
case Immutable, ExternalImmutable -> {
|
||||
return new ImmutableLocatableImpl(world, x, y, z);
|
||||
}
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
static <T extends Locatable> T create(UUID world, double x, double y, double z, Class<T> type) {
|
||||
if (type == ThreadSafeLocatable.class) {
|
||||
return (T) new ThreadSafeLocatable(world, x, y, z);
|
||||
} else if (type == MutableBlockVector.class) {
|
||||
return (T) new MutableBlockVector(world, x, y, z);
|
||||
} else if (type == ImmutableBlockLocatable.class) {
|
||||
return (T) new ImmutableBlockLocatable(world, x, y, z);
|
||||
} else if (type == MutableLocatableImpl.class) {
|
||||
return (T) new MutableLocatableImpl(world, x, y, z);
|
||||
} else if (type == ImmutableLocatableImpl.class) {
|
||||
return (T) new ImmutableLocatableImpl(world, x, y, z);
|
||||
} else {
|
||||
throw new IllegalArgumentException("Unsupported Locatable type: " + type.getName());
|
||||
}
|
||||
}
|
||||
|
||||
static Locatable create(UUID world, double x, double y, double z) {
|
||||
return create(world, x, y, z, LocatableType.Mutable);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public non-sealed interface MutableLocatable extends Locatable {
|
||||
MutableLocatable setX(double x);
|
||||
MutableLocatable setY(double y);
|
||||
MutableLocatable setZ(double z);
|
||||
MutableLocatable setWorld(UUID world);
|
||||
|
||||
/**@return The same Locatable, with the same direction but a length of 1.*/
|
||||
default MutableLocatable normalize() {
|
||||
double length = length();
|
||||
return scalarMultiply(1.0 / length);
|
||||
}
|
||||
|
||||
/**@return The same Locatable, now mutated.*/
|
||||
default MutableLocatable add(Locatable locatable) {
|
||||
setX(x() + locatable.x());
|
||||
setY(y() + locatable.y());
|
||||
setZ(z() + locatable.z());
|
||||
return this;
|
||||
}
|
||||
|
||||
default MutableLocatable add(double x, double y, double z) {
|
||||
setX(x() + x);
|
||||
setY(y() + y);
|
||||
setZ(z() + z);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**@return The same Locatable, now mutated.*/
|
||||
default MutableLocatable subtract(Locatable locatable) {
|
||||
setX(x() - locatable.x());
|
||||
setY(y() - locatable.y());
|
||||
setZ(z() - locatable.z());
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param locatable The locatable to copy the position and world from.
|
||||
* @return The same Locatable, now mutated to have the same position and world as the given locatable.
|
||||
*/
|
||||
default MutableLocatable set(Locatable locatable) {
|
||||
setX(locatable.x());
|
||||
setY(locatable.y());
|
||||
setZ(locatable.z());
|
||||
setWorld(locatable.world());
|
||||
return this;
|
||||
}
|
||||
|
||||
default MutableLocatable set(double x, double y, double z) {
|
||||
setX(x);
|
||||
setY(y);
|
||||
setZ(z);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The same Locatable, now mutated to have the same position and world as the given values.
|
||||
*/
|
||||
default MutableLocatable set(double x, double y, double z, UUID world) {
|
||||
setWorld(world);
|
||||
setX(x);
|
||||
setY(y);
|
||||
setZ(z);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**@return The same Locatable, now mutated.*/
|
||||
default MutableLocatable scalarMultiply(double factor) {
|
||||
setX(x() * factor);
|
||||
setY(y() * factor);
|
||||
setZ(z() * factor);
|
||||
return this;
|
||||
}
|
||||
|
||||
default boolean isMutable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
default MutableLocatable castToMutableOrNull() {
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package games.cubi.locatables;
|
||||
|
||||
public interface StrictEquality {
|
||||
/**
|
||||
* For use with classes of interfaces such as {@link games.cubi.locatables.Locatable}, where the interface contract specifies that all implementations must use interface-defined <code>equals</code> and <code>hashcode</code> methods for interchangeability in data structures. In this case, the default {@link Object#equals(Object)} method is no longer able to confirm genuine equality, as it only checks for interface field equality.
|
||||
* <p>
|
||||
* This method should check for more typical equality, meaning that all fields of the object are equal, and the classes of the two objects are the same. This is useful for debugging and testing, as it allows us to confirm that two objects are genuinely equal, rather than just being interchangeable in data structures.
|
||||
* @param other The other object to compare to.
|
||||
* @return <code>True</code> if the two objects are
|
||||
* <p>- references to the same object, or
|
||||
* <p>- different objects of the same class with equal fields.
|
||||
* <p><code>False</code> otherwise.
|
||||
*/
|
||||
boolean strictlyEquals(Object other);
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package games.cubi.locatables.implementations;
|
||||
|
||||
import games.cubi.locatables.ImmutableLocatable;
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ImmutableBlockLocatable(UUID world, int blockX, int blockY, int blockZ) implements BlockLocatable, ImmutableLocatable {
|
||||
|
||||
public ImmutableBlockLocatable(UUID world, double x, double y, double z) {
|
||||
this(world, (int) Math.floor(x), (int) Math.floor(y), (int) Math.floor(z));
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.ImmutableBlockLocation;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
return isEqual(o);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return blockHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toStringForm();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean strictlyEquals(Object other) {
|
||||
if (this == other) return true;
|
||||
if (!(other instanceof ImmutableBlockLocatable(UUID world1, int x, int y, int z))) return false;
|
||||
return blockX == x && blockY == y && blockZ == z && world.equals(world1);
|
||||
}
|
||||
}
|
||||
+38
@@ -0,0 +1,38 @@
|
||||
package games.cubi.locatables.implementations;
|
||||
|
||||
import games.cubi.locatables.ImmutableLocatable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public record ImmutableLocatableImpl(UUID world, double x, double y, double z) implements ImmutableLocatable {
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.Immutable;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
return isEqualTo(o);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return makeHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toStringForm();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean strictlyEquals(Object other) {
|
||||
if (this == other) return true;
|
||||
if (!(other instanceof ImmutableLocatableImpl(UUID world1, double x1, double y1, double z1))) return false;
|
||||
return this.world.equals(world1) &&
|
||||
Double.doubleToLongBits(this.x) == Double.doubleToLongBits(x1) &&
|
||||
Double.doubleToLongBits(this.y) == Double.doubleToLongBits(y1) &&
|
||||
Double.doubleToLongBits(this.z) == Double.doubleToLongBits(z1);
|
||||
}
|
||||
}
|
||||
+172
@@ -0,0 +1,172 @@
|
||||
package games.cubi.locatables.implementations;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
import games.cubi.locatables.BlockLocatable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* A mutable locatable representing a floating-point vector in a given world, akin to a MutableLocatableImpl. However, Object#equals and Object#hashCode are implemented as per BlockLocatable, meaning that they are equal if their blockX, blockY, blockZ and world are equal.
|
||||
* <p>
|
||||
* This allows them to be used as keys in hashmaps where they will be considered equal to AbstractBlockLocations with the same block coordinates and world, but they can also be mutated and have vector-like operations performed on them.
|
||||
* <p>
|
||||
* The object is named "Vector" to reflect the fact that it supports floating-point coordinates under the hood.
|
||||
*/
|
||||
public class MutableBlockVector implements BlockLocatable, MutableLocatable {
|
||||
private UUID world;
|
||||
private double mutableX;
|
||||
private double mutableY;
|
||||
private double mutableZ;
|
||||
|
||||
public MutableBlockVector(UUID world, double x, double y, double z) {
|
||||
this.world = world;
|
||||
this.mutableX = x;
|
||||
this.mutableY = y;
|
||||
this.mutableZ = z;
|
||||
}
|
||||
|
||||
public MutableBlockVector(UUID world, int x, int y, int z) {
|
||||
this.world = world;
|
||||
this.mutableX = x;
|
||||
this.mutableY = y;
|
||||
this.mutableZ = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.MutableBlockVector;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double length() {
|
||||
return Math.sqrt(lengthSquared());
|
||||
}
|
||||
|
||||
@Override
|
||||
public double lengthSquared() {
|
||||
return mutableX*mutableX + mutableY*mutableY + mutableZ*mutableZ;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable add(Locatable locatable) {
|
||||
this.mutableX += locatable.x();
|
||||
this.mutableY += locatable.y();
|
||||
this.mutableZ += locatable.z();
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable subtract(Locatable locatable) {
|
||||
this.mutableX -= locatable.x();
|
||||
this.mutableY -= locatable.y();
|
||||
this.mutableZ -= locatable.z();
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable scalarMultiply(double factor) {
|
||||
this.mutableX *= factor;
|
||||
this.mutableY *= factor;
|
||||
this.mutableZ *= factor;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID world() {
|
||||
return world;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockX() {
|
||||
return (int) Math.floor(mutableX);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockY() {
|
||||
return (int) Math.floor(mutableY);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockZ() {
|
||||
return (int) Math.floor(mutableZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double x() {
|
||||
return mutableX;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double y() {
|
||||
return mutableY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double z() {
|
||||
return mutableZ;
|
||||
}
|
||||
|
||||
public void add(int dx, int dy, int dz) {
|
||||
this.mutableX += dx;
|
||||
this.mutableY += dy;
|
||||
this.mutableZ += dz;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setX(double x) {
|
||||
this.mutableX = x;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setY(double y) {
|
||||
this.mutableY = y;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setZ(double z) {
|
||||
this.mutableZ = z;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setWorld(UUID world) {
|
||||
this.world = world;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* This checks equality with AbstractBlockLocations, not Locatables. Use Locatable#isEqualTo for that. Thus, hashmap lookups are compatible with only AbstractBlockLocations, not Locatables.
|
||||
*/
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
return isEqual(o);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return blockHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toStringForm();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean strictlyEquals(Object other) {
|
||||
if (this == other) return true;
|
||||
if (!(other instanceof MutableBlockVector that)) return false;
|
||||
if (!(this.world().equals(that.world()))) return false;
|
||||
|
||||
if (Double.doubleToLongBits(this.x()) != Double.doubleToLongBits(that.x())) {
|
||||
return false;
|
||||
}
|
||||
if (Double.doubleToLongBits(this.y()) != Double.doubleToLongBits(that.y())) {
|
||||
return false;
|
||||
}
|
||||
return Double.doubleToLongBits(this.z()) == Double.doubleToLongBits(that.z());
|
||||
}
|
||||
}
|
||||
+97
@@ -0,0 +1,97 @@
|
||||
package games.cubi.locatables.implementations;
|
||||
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
public class MutableLocatableImpl implements MutableLocatable {
|
||||
private double x;
|
||||
private double y;
|
||||
private double z;
|
||||
private UUID world;
|
||||
|
||||
public MutableLocatableImpl(UUID world, double x, double y, double z) {
|
||||
this.world = world;
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.Mutable;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID world() {
|
||||
return world;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double x() {
|
||||
return x;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double y() {
|
||||
return y;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double z() {
|
||||
return z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setX(double x) {
|
||||
this.x = x;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setY(double y) {
|
||||
this.y = y;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setZ(double z) {
|
||||
this.z = z;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MutableLocatable setWorld(UUID world) {
|
||||
this.world = world;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
return isEqualTo(o);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return makeHash();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return toStringForm();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean strictlyEquals(Object other) {
|
||||
if (this == other) return true;
|
||||
if (!(other instanceof MutableLocatableImpl that)) return false;
|
||||
if (!(this.world().equals(that.world()))) return false;
|
||||
|
||||
if (Double.doubleToLongBits(this.x()) != Double.doubleToLongBits(that.x())) {
|
||||
return false;
|
||||
}
|
||||
if (Double.doubleToLongBits(this.y()) != Double.doubleToLongBits(that.y())) {
|
||||
return false;
|
||||
}
|
||||
return Double.doubleToLongBits(this.z()) == Double.doubleToLongBits(that.z());
|
||||
}
|
||||
}
|
||||
+328
@@ -0,0 +1,328 @@
|
||||
package games.cubi.locatables.implementations;
|
||||
|
||||
import games.cubi.locatables.Locatable;
|
||||
import games.cubi.locatables.MutableLocatable;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.locks.StampedLock;
|
||||
|
||||
public class ThreadSafeLocatable implements MutableLocatable {
|
||||
private volatile UUID world;
|
||||
|
||||
private double x, y, z;
|
||||
|
||||
private final StampedLock lock = new StampedLock();
|
||||
|
||||
public ThreadSafeLocatable(UUID world, double x, double y, double z) {
|
||||
this.world = world;
|
||||
this.x = x; this.y = y; this.z = z;
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs a write operation on x, y, z fields under a write lock.
|
||||
*/
|
||||
private void withWriteLock(Runnable body) {
|
||||
long stamp = lock.writeLock();
|
||||
try {
|
||||
body.run();
|
||||
} finally {
|
||||
lock.unlockWrite(stamp);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (!(o instanceof Locatable that)) return false;
|
||||
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
|
||||
UUID thatWorld = that.world();
|
||||
double[] thatPos = that.getAtomicPositionArray();
|
||||
|
||||
boolean equal = this.world.equals(thatWorld) &&
|
||||
Double.doubleToLongBits(this.x) == Double.doubleToLongBits(thatPos[0]) &&
|
||||
Double.doubleToLongBits(this.y) == Double.doubleToLongBits(thatPos[1]) &&
|
||||
Double.doubleToLongBits(this.z) == Double.doubleToLongBits(thatPos[2]);
|
||||
if (!lock.validate(stamp)) {
|
||||
// If the lock was invalid, we can't trust the result, so we have to retry with locks again
|
||||
stamp = lock.readLock();
|
||||
thatWorld = that.world();
|
||||
thatPos = that.getAtomicPositionArray();
|
||||
try {
|
||||
equal = this.world.equals(thatWorld) &&
|
||||
Double.doubleToLongBits(this.x) == Double.doubleToLongBits(thatPos[0]) &&
|
||||
Double.doubleToLongBits(this.y) == Double.doubleToLongBits(thatPos[1]) &&
|
||||
Double.doubleToLongBits(this.z) == Double.doubleToLongBits(thatPos[2]);
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return equal;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
int hash = 3;
|
||||
// while we could just grab the values, release the lock, and then calculate the hash, that would marginally increase ram use for a marginal performance gain and this looks neater
|
||||
hash = 19 * hash + this.world.hashCode();
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.x));
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.y));
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.z));
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
hash = 3;
|
||||
hash = 19 * hash + this.world.hashCode();
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.x));
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.y));
|
||||
hash = 19 * hash + Long.hashCode(Double.doubleToLongBits(this.z));
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return hash;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
// It's a string, who cares if it's not thread safe?
|
||||
return toStringForm();
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocatableType getType() {
|
||||
return LocatableType.ThreadSafe;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double length() {
|
||||
return Math.sqrt(lengthSquared());
|
||||
}
|
||||
|
||||
@Override
|
||||
public double lengthSquared() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
double result = x*x + y*y + z*z;
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
result = x*x + y*y + z*z;
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Normalised internal vectors, may busy-wait if write access is locked
|
||||
*/
|
||||
@Override
|
||||
public MutableLocatable normalize() {
|
||||
withWriteLock(() -> {
|
||||
double len = Math.sqrt(x*x + y*y + z*z);
|
||||
x /= len; y /= len; z /= len;
|
||||
});
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable add(Locatable locatable) {
|
||||
double[] otherPosition = locatable.getAtomicPositionArray();
|
||||
withWriteLock(() -> {
|
||||
x += otherPosition[0];
|
||||
y += otherPosition[1];
|
||||
z += otherPosition[2];
|
||||
});
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable add(double x, double y, double z) {
|
||||
withWriteLock(() -> { this.x += x; this.y += y; this.z += z; });
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable subtract(Locatable locatable) {
|
||||
double[] otherPosition = locatable.getAtomicPositionArray();
|
||||
withWriteLock(() -> {
|
||||
x -= otherPosition[0];
|
||||
y -= otherPosition[1];
|
||||
z -= otherPosition[2];
|
||||
});
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable scalarMultiply(double factor) {
|
||||
withWriteLock(() -> { x *= factor; y *= factor; z *= factor; });
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UUID world() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
UUID result = world;
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
result = world;
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockX() {
|
||||
return (int) Math.floor(x());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockY() {
|
||||
return (int) Math.floor(y());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int blockZ() {
|
||||
return (int) Math.floor(z());
|
||||
}
|
||||
|
||||
@Override
|
||||
public double x() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
double result = x;
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
result = x;
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double y() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
double result = y;
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
result = y;
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double z() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
double result = z;
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
result = z;
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double[] getAtomicPositionArray() {
|
||||
long stamp = lock.tryOptimisticRead();
|
||||
double[] result = new double[]{x, y, z};
|
||||
if (!lock.validate(stamp)) {
|
||||
stamp = lock.readLock();
|
||||
try {
|
||||
result = new double[]{x, y, z};
|
||||
} finally {
|
||||
lock.unlockRead(stamp);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setX(double x) {
|
||||
withWriteLock(() -> this.x = x);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setY(double y) {
|
||||
withWriteLock(() -> this.y = y);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setZ(double z) {
|
||||
withWriteLock(() -> this.z = z);
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable setWorld(UUID world) {
|
||||
this.world = world;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable set(Locatable locatable) {
|
||||
double[] otherPosition = locatable.getAtomicPositionArray();
|
||||
withWriteLock(() -> {
|
||||
this.world = locatable.world(); // technically this could be racy, but the world shouldn't be changing often
|
||||
this.x = otherPosition[0];
|
||||
this.y = otherPosition[1];
|
||||
this.z = otherPosition[2];
|
||||
});
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MutableLocatable set(double x, double y, double z, UUID world) {
|
||||
withWriteLock(() -> {
|
||||
this.world = world;
|
||||
this.x = x; this.y = y; this.z = z;
|
||||
});
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean strictlyEquals(Object other) {
|
||||
if (this == other) return true;
|
||||
if (!(other instanceof ThreadSafeLocatable that)) return false;
|
||||
|
||||
long thisStamp = lock.tryOptimisticRead();
|
||||
long thatStamp = that.lock.tryOptimisticRead();
|
||||
boolean equal = this.world.equals(that.world) &&
|
||||
Double.doubleToLongBits(this.x) == Double.doubleToLongBits(that.x) &&
|
||||
Double.doubleToLongBits(this.y) == Double.doubleToLongBits(that.y) &&
|
||||
Double.doubleToLongBits(this.z) == Double.doubleToLongBits(that.z);
|
||||
if (!lock.validate(thisStamp) || !that.lock.validate(thatStamp)) {
|
||||
// If either lock was invalid, we can't trust the result, so we have to retry with locks again
|
||||
thisStamp = lock.readLock();
|
||||
thatStamp = that.lock.readLock();
|
||||
try {
|
||||
equal = this.world.equals(that.world) &&
|
||||
Double.doubleToLongBits(this.x) == Double.doubleToLongBits(that.x) &&
|
||||
Double.doubleToLongBits(this.y) == Double.doubleToLongBits(that.y) &&
|
||||
Double.doubleToLongBits(this.z) == Double.doubleToLongBits(that.z);
|
||||
} finally {
|
||||
lock.unlockRead(thisStamp);
|
||||
that.lock.unlockRead(thatStamp);
|
||||
}
|
||||
}
|
||||
return equal;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
short-git: ${short_git}
|
||||
long-git: ${long_git}
|
||||
build-time: ${build_time}
|
||||
version: ${version}
|
||||
@@ -0,0 +1,24 @@
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Mobile Tools for Java (J2ME)
|
||||
.mtj.tmp/
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
replay_pid*
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
@@ -0,0 +1,2 @@
|
||||
#Fri May 08 16:17:09 ACST 2026
|
||||
gradle.version=8.13
|
||||
Binary file not shown.
Binary file not shown.
Whitespace-only changes.
Generated
+5
@@ -0,0 +1,5 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Environment-dependent path to Maven home directory
|
||||
/mavenHomeManager.xml
|
||||
+661
@@ -0,0 +1,661 @@
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
@@ -0,0 +1,2 @@
|
||||
# CubiLogging
|
||||
Minimal logging util for my own use.
|
||||
@@ -0,0 +1,43 @@
|
||||
import java.time.Instant
|
||||
|
||||
plugins {
|
||||
id("java")
|
||||
}
|
||||
|
||||
group = "games.cubi.logs"
|
||||
version = "1.1.0"
|
||||
|
||||
val commitShort = providers.exec {
|
||||
commandLine("git", "rev-parse", "--short=8", "HEAD")
|
||||
}.standardOutput.asText.map { it.trim() }
|
||||
|
||||
val commitFull = providers.exec {
|
||||
commandLine("git", "rev-parse", "HEAD")
|
||||
}.standardOutput.asText.map { it.trim() }
|
||||
|
||||
val buildTime = providers.provider {
|
||||
Instant.now().toString()
|
||||
}
|
||||
|
||||
tasks {
|
||||
processResources {
|
||||
val gitProps = mapOf(
|
||||
"short_git" to commitShort.get(),
|
||||
"long_git" to commitFull.get(),
|
||||
"build_time" to buildTime.get(),
|
||||
"version" to version.toString()
|
||||
)
|
||||
// build-properties is not used by the logging library itself, but is included in the jar so that platforms can access it.
|
||||
filesMatching("build-properties/logging.yml") {
|
||||
expand(gitProps)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation("org.jetbrains:annotations:24.0.1")
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
+251
@@ -0,0 +1,251 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
Vendored
+94
@@ -0,0 +1,94 @@
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@@ -0,0 +1,8 @@
|
||||
package games.cubi.logs;
|
||||
|
||||
//Paper always prints the name of the exception being thrown, even if the message is empty. So, the name of this class will point the user to the actual error message. For other platforms, this should throw silently, leaving just the error message above it
|
||||
public class CheckPreviousLogForError extends RuntimeException {
|
||||
public CheckPreviousLogForError() {
|
||||
super(null,null, false, false);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package games.cubi.logs;
|
||||
|
||||
import org.jetbrains.annotations.Range;
|
||||
|
||||
public class FallbackLogger implements PlatformLogger {
|
||||
@Override
|
||||
public void warningAndReturn(Throwable throwable, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
if (throwable instanceof RuntimeException runtimeException) {
|
||||
throw runtimeException;
|
||||
} else {
|
||||
throw new RuntimeException(throwable);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void warning(Throwable throwable, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
warning(PlatformLogger.processThrowable(throwable), level, source);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug(String message) {
|
||||
System.out.println("[DEBUG] " + message);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(Throwable throwable, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
error(PlatformLogger.processThrowable(throwable), level, source);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(String message, Throwable throwable, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
error(PlatformLogger.processThrowable(throwable, message), level, source);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void info(String message, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
System.out.println("[INFO] " + constructMessage(message, source));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void warning(String message, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
System.out.println("[WARN] " + constructMessage(message, source));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error(String message, @Range(from = 1, to = 10) int level, Class<?>... source) {
|
||||
System.err.println("[ERROR] " + constructMessage(message, source));
|
||||
}
|
||||
|
||||
private String constructMessage(String message, Class<?>... source) {
|
||||
Class<?>[] combined = new Class<?>[source.length + 1];
|
||||
combined[0] = CubiGames.class; // Really stupid basic way to sign the log as by us. This logger should never be used anyways, so it's fine
|
||||
System.arraycopy(source, 0, combined, 1, source.length);
|
||||
return PlatformLogger.constructMessage(message, combined) + " | Additionally, no logger was found, so this message was printed using the fallback logger.";
|
||||
}
|
||||
|
||||
static class CubiGames {}
|
||||
}
|
||||
Loaded 100 of 145 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user