Compare commits
638 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b802ca362 | |||
| ea4375b215 | |||
| a6e94c39a7 | |||
| 8bd6b4837c | |||
| 679f871788 | |||
| b46f10755e | |||
| 3cf799a10f | |||
| 4e99594a3f | |||
| 8a4f991906 | |||
| ab634b3204 | |||
| b836f675e1 | |||
| a4e2003e0e | |||
| 28a8bc39f2 | |||
| 4f0a3afd93 | |||
| 4ac56774fb | |||
| 18b0582152 | |||
| b85c504995 | |||
| cbff0cd9e9 | |||
| c28cf643b3 | |||
| 44aed79e78 | |||
| e192abe666 | |||
| 9754943752 | |||
| 299ab0f856 | |||
| b97c35387c | |||
| f69ad051d1 | |||
| 9231a48998 | |||
| e8f27f7da8 | |||
| db47a9e99f | |||
| 16f72066a8 | |||
| ca4d6f158a | |||
| ad9092c45c | |||
| 95e4db2998 | |||
| 9fe5dcc16e | |||
| 8cd926f4ac | |||
| 7239b51073 | |||
| 262dcae36b | |||
| 062f86c036 | |||
| 5b4029f0ad | |||
| faa4fa3782 | |||
| 9db045d614 | |||
| c81dc83bb1 | |||
| b14701ef6b | |||
| 78f84f17cd | |||
| 7739e1cafd | |||
| d39c04d9cf | |||
| 492afa7328 | |||
| 9465512491 | |||
| 51b52a7d2a | |||
| f106867091 | |||
| 1c4908bbc5 | |||
| baa9b94a5d | |||
| 21136ba1ef | |||
| ec6f8255b5 | |||
| 2f9504b167 | |||
| f67d9e4e04 | |||
| c1644ad419 | |||
| e07557e6e3 | |||
| 52b8a91dc5 | |||
| 64fe804c40 | |||
| 2dd5b82be3 | |||
| d1f0325f87 | |||
| b10a367ce6 | |||
| 4dec387ca1 | |||
| fd3a8f7ddf | |||
| e3f586da56 | |||
| 775984f651 | |||
| 269f2c30fd | |||
| b674f49600 | |||
| b592012ba8 | |||
| 5d1e8a44fd | |||
| 40b27335ea | |||
| d0b07a5d2f | |||
| cb0fee9780 | |||
| 895e9276cd | |||
| 9ee0af8b01 | |||
| 69941fb7f8 | |||
| 36862a968f | |||
| 27204336b2 | |||
| 4846cf5019 | |||
| f7f3c1146f | |||
| aaa5e958f0 | |||
| 726da953bd | |||
| c4f4935fdd | |||
| 3ef8bd7e20 | |||
| ec72762067 | |||
| 4d0ed2a6dc | |||
| 7b252b173b | |||
| 7b0c66e3ae | |||
| 1b066327a8 | |||
| 43d0a971f7 | |||
| 9e60c698de | |||
| bf2affa6d1 | |||
| 98f6cea86a | |||
| 9ae01dc1f8 | |||
| 40efc5cbf3 | |||
| 66bba1c80a | |||
| d9f3b31cc5 | |||
| e465ef5325 | |||
| 225385a43f | |||
| 7d7d07416b | |||
| 5ef308cbee | |||
| d61b601c14 | |||
| 246c679a97 | |||
| 4b317a8e00 | |||
| 1debd4b875 | |||
| 5dcda31990 | |||
| ae16ed2341 | |||
| 2c266d2495 | |||
| 7e40546bc5 | |||
| 5d391c83ea | |||
| 0895bf53e3 | |||
| a7203f8f33 | |||
| 22efbb211a | |||
| 95c4459d8a | |||
| 0ef11caaf2 | |||
| 2e3dfab6c3 | |||
| 42be139e94 | |||
| f866e7f8e3 | |||
| 53fcce9d7c | |||
| 7b8b22fd5a | |||
| 6f54cfacb5 | |||
| 61eaf43ba0 | |||
| 1d368e3adc | |||
| 9e65e2dd4c | |||
| 2d878338cb | |||
| d62d21776d | |||
| a44c5d562d | |||
| 1d9bffe64e | |||
| b4e0687e2a | |||
| 89804f1ba1 | |||
| 9dbc5ef525 | |||
| e5dcb0999d | |||
| 50e0e940d1 | |||
| cb3e42fac4 | |||
| 34cdaf02eb | |||
| 71e6b9b58e | |||
| 1ec342928f | |||
| d45a1379bd | |||
| ecb3dce963 | |||
| 2b8cddd424 | |||
| 13895fec51 | |||
| 88c7245be6 | |||
| 6aad156a32 | |||
| 94535a213e | |||
| 63d6d42356 | |||
| acecbede8e | |||
| e2a8953e4c | |||
| 32eae23963 | |||
| 480c3b3ec5 | |||
| 6c0736a2a0 | |||
| c89abd414b | |||
| da2454b249 | |||
| 5933ef8245 | |||
| b9984c7723 | |||
| 2de50475f1 | |||
| bb838328a7 | |||
| 1980e64b2f | |||
| c3df26f5cb | |||
| 17df533fa6 | |||
| 2393bdd8e8 | |||
| 082b364f52 | |||
| 8a39610b8c | |||
| aa53835772 | |||
| cd5a3ce52b | |||
| 38e104a9fc | |||
| e27cee1f71 | |||
| 15d1d78954 | |||
| e2421c97ed | |||
| 8b72920652 | |||
| 212031a05f | |||
| 804293e291 | |||
| cfdd464f30 | |||
| 4c9d703e15 | |||
| 0eba376e70 | |||
| 89e6355d73 | |||
| 31b6d2dd05 | |||
| d75b65e6e7 | |||
| 1bbe41c068 | |||
| e426fc2380 | |||
| 4e908b5b15 | |||
| b51ab3d9cd | |||
| 9e7d0a1538 | |||
| 5b0bf59f00 | |||
| 0362d89173 | |||
| 1b0f93db07 | |||
| 559bad5676 | |||
| f145444fd4 | |||
| 10b08ca116 | |||
| 1dd244e889 | |||
| 2ea3d645e8 | |||
| 49e34d78a5 | |||
| 17cdb0f745 | |||
| 67b2467bee | |||
| 82c832a4af | |||
| c84dbfceaf | |||
| 27b66940be | |||
| 8240101a46 | |||
| e1a932cf38 | |||
| 39dd1c8509 | |||
| fee0aadcbe | |||
| a8c15d22c3 | |||
| bd833ba510 | |||
| a5a9a62e89 | |||
| e790bfb7e8 | |||
| 0f539f3a6f | |||
| d3f28f064b | |||
| 40149bc1d1 | |||
| 40703db763 | |||
| 2a554395f7 | |||
| c3dce412fa | |||
| 225c2df8df | |||
| 84c212a780 | |||
| 3d9ae5f088 | |||
| 200e089a33 | |||
| 3f509be195 | |||
| 1a2c0b0be1 | |||
| c6a4355718 | |||
| 3e80961d18 | |||
| 9f483ee07a | |||
| d1ba402f4d | |||
| 87cead607f | |||
| 1b2992f1dc | |||
| ed0e94ccb7 | |||
| 364f8f7afc | |||
| 962f20460c | |||
| ce17ac71c6 | |||
| 5adb9afa0a | |||
| 3c80c11888 | |||
| 0714697e05 | |||
| df52f41b87 | |||
| 66a1d0296e | |||
| c827817a94 | |||
| 9895676b63 | |||
| 5d5c94e652 | |||
| 0a568571d9 | |||
| 291c0470ad | |||
| 2f4587579f | |||
| 2d70388587 | |||
| a758c0bb3f | |||
| dd6aed273d | |||
| e2d663ee34 | |||
| dfc920d9bb | |||
| c91631809e | |||
| 457bbebbdd | |||
| 4d3242a370 | |||
| f0d71027f1 | |||
| a98d9239e6 | |||
| 365edd48f8 | |||
| 9f22e3f2b3 | |||
| 78f83197d7 | |||
| 42ae79b76c | |||
| 1178ef0706 | |||
| a506d2ef1f | |||
| 92d9e631a7 | |||
| 8afe388eb6 | |||
| df1dae70c2 | |||
| 777ed9215a | |||
| 25f4bde825 | |||
| fbb1beb359 | |||
| f0852235b2 | |||
| 4faa82e895 | |||
| 7201df1eff | |||
| b6b13843eb | |||
| 10208d4dfa | |||
| d04e156dd1 | |||
| 19412f80c5 | |||
| dea3557546 | |||
| a3c72dbcbc | |||
| dffad16d27 | |||
| 0a3756eb9d | |||
| 821acaa0b9 | |||
| 0fc5c55712 | |||
| c13d04ff2b | |||
| c9925b0b6c | |||
| 725602e61f | |||
| bdeeb4c93b | |||
| b3185c00d6 | |||
| ce20d3da32 | |||
| 69653336bf | |||
| 062f11df21 | |||
| 9e68d11608 | |||
| 3d349cb292 | |||
| d13bd9c4d3 | |||
| 4a256683ab | |||
| 7325d57e88 | |||
| 7348cb1c37 | |||
| 007a3bdefa | |||
| 6d95eb1099 | |||
| 86e21cdaf6 | |||
| d0bb03288d | |||
| be3e618aca | |||
| 35d3614c88 | |||
| ba32af2c58 | |||
| 2a681ef8e6 | |||
| 24684b7760 | |||
| d3d4312ff6 | |||
| 6086a8a957 | |||
| cd2530ca88 | |||
| af0e5699e2 | |||
| d0e14ac408 | |||
| 0636712f80 | |||
| 9bfd2812a6 | |||
| 5f12c9e1f3 | |||
| f8f0e3f4b9 | |||
| ac36ce4560 | |||
| f2612f39c0 | |||
| e7e7bc866d | |||
| 39eed05d83 | |||
| b0624c8714 | |||
| 40351d1894 | |||
| a488478b1d | |||
| c4b49ef308 | |||
| b511ab4fb3 | |||
| bbf69c7911 | |||
| 6de41cd384 | |||
| 7e7ccf1f38 | |||
| 5a6aa00ae7 | |||
| 9c71540928 | |||
| ff1859de8d | |||
| 00be9a3c4f | |||
| dfed2c8966 | |||
| b20aebb09c | |||
| 9cbe98f81b | |||
| a9bfc3fbe1 | |||
| c30e410132 | |||
| 11cd36cdec | |||
| 59e35ffad3 | |||
| 7b26c0baeb | |||
| 60e53ff20b | |||
| 0f756a370b | |||
| f0f525ef79 | |||
| 59a8e31507 | |||
| 6d3288ec42 | |||
| 4e979b1f00 | |||
| 396545340e | |||
| 87bfbf1afe | |||
| 4346a2e803 | |||
| 6c228c1a17 | |||
| d90361af59 | |||
| a0f06e4451 | |||
| 2a4bfef7a6 | |||
| 37d08b6dfa | |||
| eadf19405e | |||
| f0757296f8 | |||
| 3e29b361e6 | |||
| 7b6fd03d78 | |||
| 7be65a2258 | |||
| 1a540cf2bc | |||
| 20fc2efb46 | |||
| d8beba2498 | |||
| 9f0cb5a394 | |||
| df63401d11 | |||
| db95951ade | |||
| 1e020f93a6 | |||
| 7aee6dfb44 | |||
| 546a51a295 | |||
| ec7e791e9f | |||
| b0e7c31964 | |||
| d60dec3d82 | |||
| 89a80103f0 | |||
| 8e14a7223c | |||
| 2e906b57c4 | |||
| 7cf1e901f5 | |||
| ba923fa829 | |||
| 505dbe2f62 | |||
| 48c5828e8f | |||
| eb2317934f | |||
| 60537cda1b | |||
| 508ff2b776 | |||
| 7c4ac2bd7e | |||
| 8c13c2cf47 | |||
| 802019ff72 | |||
| 141890556c | |||
| 353838db41 | |||
| f1547477c9 | |||
| 535a645a84 | |||
| 2dc7f02b32 | |||
| 50bdb73a52 | |||
| 53e6c95432 | |||
| 36f0029e45 | |||
| 5067e970a2 | |||
| 167ca94e69 | |||
| 8d94b86bfd | |||
| a29567430e | |||
| fb2dae48e2 | |||
| 948b4bfd9c | |||
| ca44256ca9 | |||
| a29b6a5aab | |||
| 868254ccc8 | |||
| 195fde8d73 | |||
| ce7b9b94b6 | |||
| 1f0c2e286a | |||
| f79fd5e06f | |||
| 47c1d3955f | |||
| 2c5f5a3d4c | |||
| 81c533051e | |||
| 5cbe5ecfd8 | |||
| d4b4d28c9f | |||
| b8e653b5f7 | |||
| 80fea09598 | |||
| 1d4f914a9f | |||
| bf92dea2eb | |||
| 2dd675b8da | |||
| ff3145336d | |||
| 280181c91e | |||
| 60232e713b | |||
| 55d9030954 | |||
| 452bd75f5d | |||
| 72be1e2602 | |||
| 1c30213aca | |||
| e9a044308f | |||
| 1aabc0c792 | |||
| 4a1513ed65 | |||
| 6d98c9cb84 | |||
| b1b0642fbe | |||
| eecb28d11f | |||
| 90564f2537 | |||
| ded0b979cf | |||
| ed9cc5485c | |||
| cbd5974657 | |||
| 0e5fba58ab | |||
| 2943e63382 | |||
| 30564aade7 | |||
| aabb90ada6 | |||
| 963a8dc53f | |||
| aa6d69385b | |||
| f42c9cf8fb | |||
| 92e0011c8d | |||
| c20d95a7c7 | |||
| 353aa1ed2c | |||
| 5aa43ebcc8 | |||
| b6145461b6 | |||
| 478e431076 | |||
| 6feb7f1b42 | |||
| 016fc66293 | |||
| 6d3e30d425 | |||
| 5be5c5a5bc | |||
| ed5aeb8951 | |||
| 7f0ddadf26 | |||
| a2c61ed278 | |||
| 99eb4ac8a1 | |||
| c75902d9d6 | |||
| 1743949ba5 | |||
| a74a37a0e8 | |||
| 4ed7941288 | |||
| ec59a5f754 | |||
| 895e04b7cc | |||
| 8f0930fa02 | |||
| c1c4328fa5 | |||
| 91240e4f7a | |||
| 17c61a97cc | |||
| b78b852ffb | |||
| 26d4220967 | |||
| 5edc73cc03 | |||
| 6fcfc9379e | |||
| 149fbccfa5 | |||
| 5ca754d2ac | |||
| f13744e858 | |||
| 64ac218003 | |||
| 385bd326cf | |||
| 4e9559f230 | |||
| 6ea864ef6b | |||
| 4e96728c25 | |||
| 1c44ef7f0c | |||
| 227d0d09ba | |||
| d7ba3fa724 | |||
| 7e46adf469 | |||
| f43e2fa441 | |||
| f9819d3d46 | |||
| 19b23bea5f | |||
| d1c0f7ebb4 | |||
| 5a4ddafbbb | |||
| 7c40d96f2e | |||
| b535be16c0 | |||
| 22f5608f9a | |||
| a498422843 | |||
| bfd6efb4a4 | |||
| c8c9df3a34 | |||
| 3349e5b898 | |||
| ed7511ff6a | |||
| 8516e8f9ab | |||
| 47a4d1535f | |||
| 33a55dc7cd | |||
| 1b4f9e8942 | |||
| 2537c4a259 | |||
| b74b6e8068 | |||
| 25979d6a76 | |||
| 3f287388d5 | |||
| 72d2ba6aae | |||
| 611ed4e24a | |||
| eac7a38e73 | |||
| afd7da7763 | |||
| ff7abb6a18 | |||
| ca3f5da5de | |||
| 69012ab7e6 | |||
| e5e502b4f8 | |||
| 42dc0903de | |||
| 4b20637e47 | |||
| 3257ae8480 | |||
| a6ddc561a0 | |||
| 7c82c9eb7b | |||
| 3c62e18502 | |||
| eea5198fb6 | |||
| b82a59ecbc | |||
| 6bfcf36687 | |||
| 6fe0df7d0f | |||
| b9746381eb | |||
| 91dffa3c3e | |||
| 6eb24ecde1 | |||
| 767753c004 | |||
| 97442f8833 | |||
| 62359e3dde | |||
| b5199cfa87 | |||
| f0acc73c56 | |||
| f9dfc38bf1 | |||
| 5c5d39738e | |||
| 27fb629c22 | |||
| c374bf7ca8 | |||
| 7e04b12e37 | |||
| 67637dbf10 | |||
| 6456651d27 | |||
| 9343854b4a | |||
| 5fd8ed840f | |||
| 4d4d8fd8e9 | |||
| bf05965015 | |||
| 47569f2b3c | |||
| 0567195f73 | |||
| e355366ffc | |||
| 3681d50eb2 | |||
| e0c143881f | |||
| 2a49fdee7f | |||
| f39e06b6dc | |||
| 0d5c454dd4 | |||
| 1b447fdc98 | |||
| d84ba05380 | |||
| 3e7f160fcd | |||
| dcaf334828 | |||
| 789306ccff | |||
| e33fa3cb5e | |||
| 8f99117066 | |||
| 2136c0fe83 | |||
| 7a6cffe19d | |||
| 06bef93c82 | |||
| 939e45ce62 | |||
| 7f958269e4 | |||
| 07e3091d13 | |||
| f7ece2b02e | |||
| bd796c2ce0 | |||
| 4e6be35da9 | |||
| 0e0e1e1b0f | |||
| f4ab101403 | |||
| 0902d3f0f5 | |||
| 75c2758fd5 | |||
| 9ddd917f3b | |||
| c5945b1254 | |||
| 9060579615 | |||
| 8f0217185f | |||
| 656971b0b9 | |||
| 5fa3a11024 | |||
| ed3d00bfce | |||
| ba2681d7b2 | |||
| 168570f21f | |||
| b3928d3b1f | |||
| 57aec6092c | |||
| 278f4b1642 | |||
| 26d0b5c571 | |||
| 3cb8bbeaa7 | |||
| 009cfdce93 | |||
| 463565384b | |||
| aed5bb4163 | |||
| bd517e54cf | |||
| b323b7e52d | |||
| 32b3eac589 | |||
| 569a5442a9 | |||
| 25213cae39 | |||
| 82bb5ef64e | |||
| a8748471df | |||
| 721124b886 | |||
| 85e52301d6 | |||
| 08ede3351d | |||
| 9690c898b0 | |||
| 328336bd29 | |||
| 75f0061d97 | |||
| be87c79b1b | |||
| 12a885aa6e | |||
| d33be490a7 | |||
| cb654f2429 | |||
| 2705cb679e | |||
| 372fcedc7c | |||
| 25e909203d | |||
| b312582ce4 | |||
| 73324c71ec | |||
| 0cdb5cf0ec | |||
| cbfb1625bc | |||
| 25e69d03ba | |||
| 9564f02283 | |||
| 9e7378be63 | |||
| 2495c38dc2 | |||
| 17fcdb428c | |||
| 944e4f9cb4 | |||
| 7c0b746220 | |||
| b4cb390333 | |||
| 15cda35434 | |||
| 361d251aa2 | |||
| a565e7d906 | |||
| 57bbb12b39 | |||
| df17c1cc1b | |||
| a4f7aad306 | |||
| 1b2c1a59f9 | |||
| f0bcf88b35 | |||
| 5dbda75c0b | |||
| 5caa945925 | |||
| 6bdfee3636 | |||
| 1ec536b7df | |||
| 9ffda4d43e | |||
| 670ec28b6f | |||
| 771814af98 | |||
| 90f1d38233 | |||
| 54a4f380bd | |||
| bab421c381 | |||
| 9c285c17a9 | |||
| 470a9ce8f1 | |||
| d6b79f8b06 | |||
| 71f1dce956 | |||
| 9857eb337f | |||
| bced9938f3 | |||
| 7f46257e1a | |||
| 5f8b566486 | |||
| 9fe2a3fa7b | |||
| eb6750bb8d | |||
| e86487ab9d | |||
| 5423b49f3d | |||
| a2c6f906fa | |||
| d51474a64a | |||
| 5b41c7d48a | |||
| 034ec7d656 | |||
| fb5e15a2f1 | |||
| 674fc30e77 |
+1
-1
@@ -10,7 +10,7 @@ insert_final_newline = false
|
||||
max_line_length = 1000
|
||||
tab_width = 4
|
||||
trim_trailing_whitespace = false
|
||||
ij_continuation_indent_size = 8
|
||||
ij_continuation_indent_size = 4
|
||||
ij_formatter_off_tag = @formatter:off
|
||||
ij_formatter_on_tag = @formatter:on
|
||||
ij_formatter_tags_enabled = true
|
||||
|
||||
+59
-23
@@ -2,48 +2,63 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
|
||||
plugins {
|
||||
id "java"
|
||||
|
||||
id "com.github.johnrengelman.shadow" version '8.1.1' apply false
|
||||
id "com.gradleup.shadow"
|
||||
}
|
||||
|
||||
|
||||
shadowJar {
|
||||
// required for basic shadowJar setup
|
||||
configurations = [project.configurations.shadow]
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
task addSourcesToCompiledJar(type: ShadowJar) {
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.release = 8
|
||||
options.encoding = "UTF-8"
|
||||
}
|
||||
|
||||
def sourceJarPath = "build/libs/DistantHorizons-api-${rootProject.versionStr}-sources.jar"
|
||||
def secondJarFile = file(sourceJarPath)
|
||||
configurations {
|
||||
testImplementation.extendsFrom compileOnly
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly "org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}"
|
||||
testImplementation "junit:junit:4.13"
|
||||
}
|
||||
|
||||
java {
|
||||
withSourcesJar()
|
||||
}
|
||||
|
||||
task createReleaseApiJar(type: ShadowJar) {
|
||||
|
||||
mustRunAfter sourcesJar
|
||||
dependsOn shadowJar
|
||||
|
||||
// the compiled "-all" jar is used since it's available at the time this task is run
|
||||
def compiledJarPath = "build/libs/DistantHorizonsApi-${rootProject.api_version}-all.jar"
|
||||
def compiledJarFile = file(compiledJarPath)
|
||||
|
||||
// doFirst is so these only run when the task is actually executed
|
||||
doFirst {
|
||||
System.out.println("Adding source files from: \n" +
|
||||
"[" + sourceJarPath + "] to compiled API jar: \n" +
|
||||
"[" + shadowJar.archivePath + "]")
|
||||
System.out.println("Adding class files from: \n" +
|
||||
"[" + compiledJarPath + "] to source API jar: \n" +
|
||||
"[" + shadowJar.archiveFile.get().asFile + "]")
|
||||
|
||||
// Validate the input JAR file
|
||||
if (!secondJarFile.exists()) {
|
||||
throw new GradleException("Second JAR file not found: [${secondJarFile}]")
|
||||
if (!compiledJarFile.exists()) {
|
||||
throw new GradleException("Compiled JAR file not found: [${compiledJarFile}]")
|
||||
}
|
||||
}
|
||||
|
||||
// Set the name of the combined JAR file
|
||||
archiveFileName.set("DistantHorizonsApi-${rootProject.api_version}.jar")
|
||||
|
||||
// Set the destination directory for the combined JAR file
|
||||
destinationDirectory = file('build/libs/merged/')
|
||||
archiveFileName.set("DistantHorizonsApi-${rootProject.api_version}-combined.jar") // jar name
|
||||
destinationDirectory = file('build/libs/') // jar location
|
||||
|
||||
// Set the input JAR files to be combined
|
||||
from sourceSets.main.allJava
|
||||
from {
|
||||
configurations.shadow.collect { it.isDirectory() ? it : zipTree(it) }
|
||||
project.configurations.shadow.collect { it.isDirectory() ? it : zipTree(it) }
|
||||
}
|
||||
|
||||
// set the jars to merge
|
||||
from shadowJar.archivePath
|
||||
from secondJarFile
|
||||
// add the class files
|
||||
from zipTree(compiledJarFile)
|
||||
|
||||
// alternative method to Include the source files in the combined JAR
|
||||
// and/or see which files are being included
|
||||
@@ -77,6 +92,13 @@ task addSourcesToCompiledJar(type: ShadowJar) {
|
||||
}
|
||||
|
||||
}
|
||||
// always create a combined jar for easy deployment
|
||||
assemble.dependsOn(createReleaseApiJar)
|
||||
|
||||
shadowJar {
|
||||
// required for basic shadowJar setup
|
||||
configurations = [project.configurations.shadow]
|
||||
}
|
||||
|
||||
javadoc {
|
||||
options {
|
||||
@@ -87,3 +109,17 @@ javadoc {
|
||||
addStringOption('Xdoclint:all,-missing', '-quiet')
|
||||
}
|
||||
}
|
||||
|
||||
// set the jar name
|
||||
def configureJar = { task ->
|
||||
// outputs in the format:
|
||||
// "DistantHorizonsApi-6.0.0.jar"
|
||||
// "DistantHorizonsApi-6.0.0-sources.jar"
|
||||
task.archiveBaseName = rootProject.api_name
|
||||
task.archiveVersion = rootProject.api_version
|
||||
}
|
||||
configureJar(tasks.named("jar").get())
|
||||
configureJar(tasks.named("sourcesJar").get())
|
||||
configureJar(tasks.named("shadowJar").get())
|
||||
|
||||
|
||||
|
||||
@@ -39,10 +39,6 @@ package com.seibel.distanthorizons.api.enums;
|
||||
*/
|
||||
public enum EDhApiDetailLevel
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
/**
|
||||
* detail level: 0 <Br>
|
||||
* width in Blocks: 1
|
||||
|
||||
@@ -28,10 +28,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiBlocksToAvoid
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
NONE(false),
|
||||
NON_COLLIDING(true);
|
||||
|
||||
|
||||
+27
-16
@@ -22,7 +22,9 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
/**
|
||||
* UNCOMPRESSED <br>
|
||||
* LZ4 <br>
|
||||
* XZ <br><br>
|
||||
* Z_STD <br>
|
||||
* Z_STD_STREAM <br>
|
||||
* LZMA2 <br><br>
|
||||
*
|
||||
* Note: speed and compression ratios are examples
|
||||
* and should only be used for estimated comparisons.
|
||||
@@ -32,10 +34,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiDataCompressionMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
/**
|
||||
* Should only be used internally and for unit testing. <br><br>
|
||||
*
|
||||
@@ -55,19 +53,32 @@ public enum EDhApiDataCompressionMode
|
||||
*/
|
||||
LZ4(1),
|
||||
|
||||
///**
|
||||
// * Decent speed and good compression. <br><br>
|
||||
// *
|
||||
// * Read Speed: 9.31 MS / DTO <br>
|
||||
// * Write Speed: 15.13 MS / DTO <br>
|
||||
// * Compression ratio: 0.2606 <br>
|
||||
// */
|
||||
////@DisallowSelectingViaConfigGui
|
||||
//Z_STD(2),
|
||||
|
||||
/**
|
||||
* Great speed and good compression. <br><br>
|
||||
*
|
||||
* Read Speed: 2.1 MS / DTO <br>
|
||||
* Write Speed: 4.9 MS / DTO <br>
|
||||
* Compression ratio: 0.2606 <br>
|
||||
*/
|
||||
Z_STD_BLOCK(4),
|
||||
|
||||
/**
|
||||
* Extremely slow, but very good compression. <br><br>
|
||||
* Similar to {@link EDhApiDataCompressionMode#Z_STD_BLOCK}
|
||||
* except slower. <br><br>
|
||||
*
|
||||
* This option is only provided for legacy support when processing old databases. <br><br>
|
||||
*
|
||||
* Read Speed: 9.31 MS / DTO <br>
|
||||
* Write Speed: 15.13 MS / DTO <br>
|
||||
* Compression ratio: 0.2606 <br>
|
||||
*/
|
||||
@Deprecated
|
||||
@DisallowSelectingViaConfigGui
|
||||
Z_STD_STREAM(2),
|
||||
|
||||
/**
|
||||
* Extremely slow, but very good compression. <br>
|
||||
* Often causes whole computer stuttering due to memory bandwidth saturation. <br><br>
|
||||
*
|
||||
* Read Speed: 13.29 MS / DTO <br>
|
||||
* Write Speed: 70.95 MS / DTO <br>
|
||||
|
||||
-13
@@ -35,25 +35,12 @@ public enum EDhApiGpuUploadMethod
|
||||
/** Picks the best option based on the GPU the user has. */
|
||||
AUTO(false, false),
|
||||
|
||||
// commented out since it isn't currently in use
|
||||
//BUFFER_STORAGE_MAPPING(true, true),
|
||||
|
||||
/** Fast rendering, no stuttering. */
|
||||
BUFFER_STORAGE(false, true),
|
||||
|
||||
/** Fast rendering but may stutter when uploading. */
|
||||
SUB_DATA(false, false),
|
||||
|
||||
/**
|
||||
* May end up storing buffers in System memory. <br>
|
||||
* Fast rending if in GPU memory, slow if in system memory, <br>
|
||||
* but won't stutter when uploading.
|
||||
*
|
||||
* @deprecated not currently supported
|
||||
*/
|
||||
@Deprecated
|
||||
BUFFER_MAPPING(true, false),
|
||||
|
||||
/** Fast rendering but may stutter when uploading. */
|
||||
DATA(false, false);
|
||||
|
||||
|
||||
-4
@@ -29,10 +29,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiGrassSideRendering
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
AS_GRASS,
|
||||
FADE_TO_DIRT,
|
||||
AS_DIRT;
|
||||
|
||||
-5
@@ -31,11 +31,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiHorizontalQuality
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
// Note: any quadraticBase less than 2.0f has issues with DetailDistanceUtil, and will always return the lowest detail level.
|
||||
// So for now we are limiting the lowest value to 2.0
|
||||
// LOWEST was originally 1.0f and LOW was 1.5f
|
||||
|
||||
@@ -29,10 +29,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiLodShading
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
/**
|
||||
* Uses Minecraft's shading for LODs. <Br>
|
||||
* This means if Minecraft's shading is disabled DH's shading will be as well.
|
||||
|
||||
+26
-12
@@ -17,23 +17,37 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.core.generation.tasks;
|
||||
package com.seibel.distanthorizons.api.enums.config;
|
||||
|
||||
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.function.Consumer;
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
/**
|
||||
* @author Leetom
|
||||
* @version 2022-11-25
|
||||
* ALL
|
||||
* DEBUG
|
||||
* INFO
|
||||
* WARN
|
||||
* ERROR
|
||||
* DISABLED
|
||||
*
|
||||
* @since API 5.0.0
|
||||
* @version 2024-4-6
|
||||
*/
|
||||
public interface IWorldGenTaskTracker
|
||||
public enum EDhApiLoggerLevel
|
||||
{
|
||||
@Nullable
|
||||
Consumer<FullDataSourceV2> getDataSourceConsumer();
|
||||
// ordered from most to least broad
|
||||
ALL(Level.ALL),
|
||||
DEBUG(Level.DEBUG),
|
||||
INFO(Level.INFO),
|
||||
WARN(Level.WARN),
|
||||
ERROR(Level.ERROR),
|
||||
DISABLED(Level.OFF),
|
||||
;
|
||||
|
||||
public final Level level;
|
||||
|
||||
EDhApiLoggerLevel(Level level)
|
||||
{ this.level = level; }
|
||||
|
||||
|
||||
CompletableFuture<Boolean> shouldGenerateSplitChild(long pos);
|
||||
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.enums.config;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
|
||||
/**
|
||||
* @since API 2.0.0
|
||||
* @version 2024-4-6
|
||||
*/
|
||||
public enum EDhApiLoggerMode
|
||||
{
|
||||
DISABLED(Level.OFF, Level.OFF),
|
||||
LOG_ALL_TO_FILE(Level.ALL, Level.OFF),
|
||||
LOG_ERROR_TO_CHAT(Level.ALL, Level.ERROR),
|
||||
LOG_WARNING_TO_CHAT(Level.ALL, Level.WARN),
|
||||
LOG_INFO_TO_CHAT(Level.ALL, Level.INFO),
|
||||
LOG_DEBUG_TO_CHAT(Level.ALL, Level.DEBUG),
|
||||
LOG_ALL_TO_CHAT(Level.ALL, Level.ALL),
|
||||
LOG_ERROR_TO_CHAT_AND_FILE(Level.ERROR, Level.ERROR),
|
||||
LOG_WARNING_TO_CHAT_AND_FILE(Level.WARN, Level.WARN),
|
||||
LOG_INFO_TO_CHAT_AND_FILE(Level.INFO, Level.INFO),
|
||||
LOG_DEBUG_TO_CHAT_AND_FILE(Level.DEBUG, Level.DEBUG),
|
||||
LOG_WARNING_TO_CHAT_AND_INFO_TO_FILE(Level.INFO, Level.WARN),
|
||||
LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE(Level.INFO, Level.ERROR),
|
||||
LOG_ERROR_TO_CHAT_AND_WARNING_TO_FILE(Level.ERROR, Level.WARN),
|
||||
;
|
||||
|
||||
public final Level levelForFile;
|
||||
public final Level levelForChat;
|
||||
|
||||
EDhApiLoggerMode(Level levelForFile, Level levelForChat)
|
||||
{
|
||||
this.levelForFile = levelForFile;
|
||||
this.levelForChat = levelForChat;
|
||||
}
|
||||
|
||||
}
|
||||
+1
-4
@@ -64,10 +64,7 @@ public enum EDhApiMaxHorizontalResolution
|
||||
/** How wide each LOD DataPoint is */
|
||||
public final int dataPointWidth;
|
||||
|
||||
/**
|
||||
* This is the same as detailLevel in LodQuadTreeNode,
|
||||
* lowest is 0 highest is 9
|
||||
*/
|
||||
/** This is the same as detailLevel in LodQuadTreeNode */
|
||||
public final byte detailLevel;
|
||||
|
||||
/* Start/End X/Z give the block positions
|
||||
|
||||
-4
@@ -33,10 +33,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiMcRenderingFadeMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
/**
|
||||
* No fading is done, there will be a pronounced border between
|
||||
* Minecraft and Distant Horizons. <br>
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.seibel.distanthorizons.api.enums.config;
|
||||
|
||||
/**
|
||||
* VULKAN, <br>
|
||||
* OPEN_GL, <br>
|
||||
*
|
||||
* @see EDhApiRenderingEngine
|
||||
*
|
||||
* @since API 7.0.0
|
||||
* @version 2026-3-10
|
||||
*/
|
||||
public enum EDhApiRenderingApi
|
||||
{
|
||||
VULKAN,
|
||||
OPEN_GL;
|
||||
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.seibel.distanthorizons.api.enums.config;
|
||||
|
||||
/**
|
||||
* AUTO, <br>
|
||||
* OPEN_GL, <br>
|
||||
* BLAZE_3D, <br><br>
|
||||
*
|
||||
* @see EDhApiRenderingApi
|
||||
*
|
||||
* @since API 7.0.0
|
||||
* @version 2026-3-10
|
||||
*/
|
||||
public enum EDhApiRenderingEngine
|
||||
{
|
||||
AUTO,
|
||||
OPEN_GL,
|
||||
BLAZE_3D;
|
||||
|
||||
}
|
||||
-5
@@ -35,11 +35,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiServerFolderNameMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
/** Only use the server name */
|
||||
NAME_ONLY,
|
||||
|
||||
|
||||
-56
@@ -1,56 +0,0 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.enums.config;
|
||||
|
||||
/**
|
||||
* NEVER, <br>
|
||||
* DYNAMIC, <br>
|
||||
* ALWAYS <br> <br>
|
||||
*
|
||||
* This represents how far the LODs should overlap with
|
||||
* the vanilla Minecraft terrain.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @since API 2.0.0
|
||||
* @version 2024-4-6
|
||||
*/
|
||||
@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed
|
||||
public enum EDhApiVanillaOverdraw
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
/**
|
||||
* Don't draw LODs where a minecraft chunk could be.
|
||||
* Use Overdraw Offset to tweak the border thickness.
|
||||
*/
|
||||
NEVER,
|
||||
|
||||
/**
|
||||
* Draw LODs over the farther minecraft chunks.
|
||||
* Dynamically decides the border thickness
|
||||
*/
|
||||
DYNAMIC,
|
||||
|
||||
/** Draw LODs over all minecraft chunks. */
|
||||
ALWAYS,
|
||||
}
|
||||
+1
-1
@@ -53,7 +53,7 @@ public enum EDhApiVerticalQuality
|
||||
|
||||
|
||||
|
||||
public int calculateMaxVerticalData(byte dataDetail)
|
||||
public int calculateMaxNumberOfVerticalSlicesAtDetailLevel(byte dataDetail)
|
||||
{
|
||||
// for detail levels lower than what the enum defines, use the lowest quality item
|
||||
int index = MathUtil.clamp(0, dataDetail, this.maxVerticalData.length - 1);
|
||||
|
||||
-4
@@ -28,10 +28,6 @@ package com.seibel.distanthorizons.api.enums.config;
|
||||
*/
|
||||
public enum EDhApiWorldCompressionMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
/**
|
||||
* Every block/biome change is recorded in the database. <br>
|
||||
* This is what DH 2.0 and 2.0.1 all used by default and will store a lot of data.
|
||||
|
||||
-4
@@ -35,10 +35,6 @@ import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui
|
||||
*/
|
||||
public enum EDhApiQualityPreset
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
@DisallowSelectingViaConfigGui
|
||||
CUSTOM,
|
||||
|
||||
|
||||
-4
@@ -34,10 +34,6 @@ import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui
|
||||
*/
|
||||
public enum EDhApiThreadPreset
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
@DisallowSelectingViaConfigGui
|
||||
CUSTOM,
|
||||
|
||||
|
||||
+2
-13
@@ -33,11 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
||||
*/
|
||||
public enum EDhApiDebugRendering
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
/** LODs are rendered normally */
|
||||
OFF,
|
||||
|
||||
@@ -48,11 +43,7 @@ public enum EDhApiDebugRendering
|
||||
SHOW_BLOCK_MATERIAL,
|
||||
|
||||
/** Only draw overlapping LOD quads. */
|
||||
SHOW_OVERLAPPING_QUADS,
|
||||
|
||||
/** LOD colors are based on renderSource flags. */
|
||||
SHOW_RENDER_SOURCE_FLAG;
|
||||
|
||||
SHOW_OVERLAPPING_QUADS;
|
||||
|
||||
public static EDhApiDebugRendering next(EDhApiDebugRendering type)
|
||||
{
|
||||
@@ -65,7 +56,7 @@ public enum EDhApiDebugRendering
|
||||
case SHOW_BLOCK_MATERIAL:
|
||||
return SHOW_OVERLAPPING_QUADS;
|
||||
case SHOW_OVERLAPPING_QUADS:
|
||||
return SHOW_RENDER_SOURCE_FLAG;
|
||||
return OFF;
|
||||
default:
|
||||
return OFF;
|
||||
}
|
||||
@@ -76,8 +67,6 @@ public enum EDhApiDebugRendering
|
||||
switch (type)
|
||||
{
|
||||
case OFF:
|
||||
return SHOW_RENDER_SOURCE_FLAG;
|
||||
case SHOW_RENDER_SOURCE_FLAG:
|
||||
return SHOW_OVERLAPPING_QUADS;
|
||||
case SHOW_OVERLAPPING_QUADS:
|
||||
return SHOW_DETAIL;
|
||||
|
||||
-4
@@ -33,10 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
||||
@Deprecated
|
||||
public enum EDhApiFogDrawMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
/**
|
||||
* Use whatever Fog setting Optifine is using.
|
||||
* If Optifine isn't installed this defaults to {@link EDhApiFogDrawMode#FOG_ENABLED}.
|
||||
|
||||
@@ -30,11 +30,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
||||
*/
|
||||
public enum EDhApiFogFalloff
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
LINEAR(0),
|
||||
EXPONENTIAL(1),
|
||||
EXPONENTIAL_SQUARED(2);
|
||||
|
||||
-5
@@ -33,11 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
||||
*/
|
||||
public enum EDhApiHeightFogDirection
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
ABOVE_CAMERA (true, true, false),
|
||||
BELOW_CAMERA (true, false, true),
|
||||
ABOVE_AND_BELOW_CAMERA (true, true, true),
|
||||
|
||||
+9
-14
@@ -20,22 +20,17 @@
|
||||
package com.seibel.distanthorizons.api.enums.rendering;
|
||||
|
||||
/**
|
||||
* Default <br>
|
||||
* Debug <br>
|
||||
* Disabled <br>
|
||||
* DEFAULT <br>
|
||||
* DEBUG_TRIANGLE <br>
|
||||
* DISABLED <br>
|
||||
*
|
||||
* @since API 2.0.0
|
||||
* @version 2024-4-6
|
||||
* @version 2026-03-23
|
||||
*/
|
||||
public enum EDhApiRendererMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
DEFAULT,
|
||||
DEBUG,
|
||||
DEBUG_TRIANGLE,
|
||||
DISABLED;
|
||||
|
||||
|
||||
@@ -45,8 +40,8 @@ public enum EDhApiRendererMode
|
||||
switch (type)
|
||||
{
|
||||
case DEFAULT:
|
||||
return DEBUG;
|
||||
case DEBUG:
|
||||
return DEBUG_TRIANGLE;
|
||||
case DEBUG_TRIANGLE:
|
||||
return DISABLED;
|
||||
default:
|
||||
return DEFAULT;
|
||||
@@ -60,10 +55,10 @@ public enum EDhApiRendererMode
|
||||
{
|
||||
case DEFAULT:
|
||||
return DISABLED;
|
||||
case DEBUG:
|
||||
case DEBUG_TRIANGLE:
|
||||
return DEFAULT;
|
||||
default:
|
||||
return DEBUG;
|
||||
return DEBUG_TRIANGLE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-20
@@ -21,30 +21,13 @@ package com.seibel.distanthorizons.api.enums.rendering;
|
||||
|
||||
/**
|
||||
* DISABLED, <br>
|
||||
* FAKE, <br>
|
||||
* COMPLETE, <br>
|
||||
*
|
||||
* @since API 2.0.0
|
||||
* @version 2024-4-6
|
||||
* @version 2026-05-19
|
||||
*/
|
||||
public enum EDhApiTransparency
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
DISABLED(false, false),
|
||||
FAKE(true, true),
|
||||
COMPLETE(true, false);
|
||||
|
||||
public final boolean transparencyEnabled;
|
||||
public final boolean fakeTransparencyEnabled;
|
||||
|
||||
EDhApiTransparency(boolean transparencyEnabled, boolean fakeTransparencyEnabled)
|
||||
{
|
||||
this.transparencyEnabled = transparencyEnabled;
|
||||
this.fakeTransparencyEnabled = fakeTransparencyEnabled;
|
||||
}
|
||||
|
||||
DISABLED,
|
||||
COMPLETE;
|
||||
}
|
||||
|
||||
-5
@@ -34,11 +34,6 @@ package com.seibel.distanthorizons.api.enums.worldGeneration;
|
||||
*/
|
||||
public enum EDhApiDistantGeneratorMode
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
/** Don't generate any new terrain, just generate LODs for already generated chunks. */
|
||||
PRE_EXISTING_ONLY((byte) 1),
|
||||
|
||||
|
||||
-5
@@ -31,11 +31,6 @@ package com.seibel.distanthorizons.api.enums.worldGeneration;
|
||||
*/
|
||||
public enum EDhApiDistantGeneratorProgressDisplayLocation
|
||||
{
|
||||
// Reminder:
|
||||
// when adding items up the API minor version
|
||||
// when removing items up the API major version
|
||||
|
||||
|
||||
OVERLAY,
|
||||
CHAT,
|
||||
LOG,
|
||||
|
||||
+7
-1
@@ -19,6 +19,8 @@
|
||||
|
||||
package com.seibel.distanthorizons.api.interfaces;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
||||
|
||||
/**
|
||||
* Implemented by wrappers so developers can
|
||||
* access the underlying Minecraft object(s).
|
||||
@@ -38,7 +40,11 @@ public interface IDhApiUnsafeWrapper
|
||||
* In order to cast this object to something usable, you may want
|
||||
* to use <code>obj.getClass()</code> when in your IDE
|
||||
* in order to determine what object this method returns for
|
||||
* the specific version of Minecraft you are developing for.
|
||||
* the specific version of Minecraft you are developing for. <br><br>
|
||||
*
|
||||
* Note:<br>
|
||||
* This method may return null in some cases, IE {@link IDhApiBlockStateWrapper}
|
||||
* when it is wrapping air.
|
||||
*/
|
||||
Object getWrappedMcObject();
|
||||
|
||||
|
||||
+10
-1
@@ -23,7 +23,10 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
|
||||
import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper;
|
||||
|
||||
/**
|
||||
* A Minecraft version independent way of handling Blocks.
|
||||
* A Minecraft version independent way of handling Blocks. <br><br>
|
||||
*
|
||||
* Note: the wrapped object (IE the object returned by {@link IDhApiUnsafeWrapper#getWrappedMcObject})
|
||||
* will be null if this object is wrapping air.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2023-6-11
|
||||
@@ -39,6 +42,12 @@ public interface IDhApiBlockStateWrapper extends IDhApiUnsafeWrapper
|
||||
/** @since API 1.0.0 */
|
||||
boolean isLiquid();
|
||||
|
||||
/**
|
||||
* Returns a value between 0 (fully transparent) and 16 (fully opaque).
|
||||
* @since 6.1.0
|
||||
*/
|
||||
int getOpacity();
|
||||
|
||||
/**
|
||||
* Returns the full serialized form of the given block
|
||||
* as defined by DH's serialization methods.
|
||||
|
||||
+2
-30
@@ -23,10 +23,10 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
|
||||
/**
|
||||
* Distant Horizons' fog configuration. <br><br>
|
||||
* Distant Horizons' SSAO configuration. <br><br>
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2022-9-6
|
||||
* @version 2026-02-05
|
||||
* @since API 1.0.0
|
||||
*/
|
||||
public interface IDhApiAmbientOcclusionConfig extends IDhApiConfigGroup
|
||||
@@ -34,32 +34,4 @@ public interface IDhApiAmbientOcclusionConfig extends IDhApiConfigGroup
|
||||
/** Determines if Ambient Occlusion is rendered */
|
||||
IDhApiConfigValue<Boolean> enabled();
|
||||
|
||||
/**
|
||||
* Determines how many points in space are sampled for the occlusion test.
|
||||
* Higher numbers will improve quality and reduce banding, but will increase GPU load.
|
||||
*/
|
||||
IDhApiConfigValue<Integer> sampleCount();
|
||||
|
||||
/** Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks. */
|
||||
IDhApiConfigValue<Double> radius();
|
||||
|
||||
/** Determines how dark the Screen Space Ambient Occlusion effect will be. */
|
||||
IDhApiConfigValue<Double> strength();
|
||||
|
||||
/** Increasing the value can reduce banding at the cost of reducing the strength of the effect. */
|
||||
IDhApiConfigValue<Double> bias();
|
||||
|
||||
/**
|
||||
* Determines how dark the occlusion shadows can be. <br>
|
||||
* 0 = totally black at the corners <br>
|
||||
* 1 = no shadow
|
||||
*/
|
||||
IDhApiConfigValue<Double> minLight();
|
||||
|
||||
/**
|
||||
* The radius, measured in pixels, that blurring is calculated. <br>
|
||||
* Higher numbers will reduce banding at the cost of GPU performance.
|
||||
*/
|
||||
IDhApiConfigValue<Integer> blurRadius();
|
||||
|
||||
}
|
||||
|
||||
+5
-5
@@ -44,7 +44,7 @@ public interface IDhApiFarFogConfig extends IDhApiConfigGroup
|
||||
* 0.0 = fog starts at the camera <br>
|
||||
* 1.0 = fog starts at the edge of the fake chunk render distance <br>
|
||||
*/
|
||||
IDhApiConfigValue<Double> farFogStartDistance();
|
||||
IDhApiConfigValue<Float> farFogStartDistance();
|
||||
|
||||
/**
|
||||
* Defines where the fog ends as a percent of the radius
|
||||
@@ -54,18 +54,18 @@ public interface IDhApiFarFogConfig extends IDhApiConfigGroup
|
||||
* 0.0 = fog ends at the camera <br>
|
||||
* 1.0 = fog ends at the edge of the fake chunk render distance <br>
|
||||
*/
|
||||
IDhApiConfigValue<Double> farFogEndDistance();
|
||||
IDhApiConfigValue<Float> farFogEndDistance();
|
||||
|
||||
/** Defines how opaque the fog is at its thinnest point. */
|
||||
IDhApiConfigValue<Double> farFogMinThickness();
|
||||
IDhApiConfigValue<Float> farFogMinThickness();
|
||||
|
||||
/** Defines how opaque the fog is at its thickest point. */
|
||||
IDhApiConfigValue<Double> farFogMaxThickness();
|
||||
IDhApiConfigValue<Float> farFogMaxThickness();
|
||||
|
||||
/** Defines how the fog changes in thickness. */
|
||||
IDhApiConfigValue<EDhApiFogFalloff> farFogFalloff();
|
||||
|
||||
/** Defines the fog density. */
|
||||
IDhApiConfigValue<Double> farFogDensity();
|
||||
IDhApiConfigValue<Float> farFogDensity();
|
||||
|
||||
}
|
||||
|
||||
+16
-10
@@ -85,6 +85,18 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
|
||||
/** Modifies the quadratic function fake chunks use for horizontal quality drop-off. */
|
||||
IDhApiConfigValue<EDhApiHorizontalQuality> horizontalQuality();
|
||||
|
||||
/**
|
||||
* If true DH will try to use the camera position when
|
||||
* determining LOD quality drop-off. <br>
|
||||
* If false DH will use the player's position.
|
||||
* <br><br>
|
||||
* Enabling helps free-cam mods render correctly. <br>
|
||||
* Disabling helps multi-camera mods render correctly (ie Immersive Portals or camera mods).
|
||||
*
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
IDhApiConfigValue<Boolean> useCameraPositionForQualityDropOff();
|
||||
|
||||
IDhApiConfigValue<EDhApiTransparency> transparency();
|
||||
|
||||
/** Defines what blocks won't be rendered as LODs. */
|
||||
@@ -104,7 +116,7 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
|
||||
* 2 = blending of 5x5 <br>
|
||||
* ... <br>
|
||||
*/
|
||||
// IDhApiConfigValue<Integer> getBiomeBlending();
|
||||
IDhApiConfigValue<Integer> getBiomeBlending();
|
||||
|
||||
|
||||
|
||||
@@ -124,19 +136,19 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
|
||||
*
|
||||
* @since API 2.0.0
|
||||
*/
|
||||
IDhApiConfigValue<Double> overdrawPreventionRadius();
|
||||
IDhApiConfigValue<Float> overdrawPreventionRadius();
|
||||
|
||||
/**
|
||||
* Modifies how bright fake chunks are. <br>
|
||||
* This is done when generating the vertex data and is applied before any shaders.
|
||||
*/
|
||||
IDhApiConfigValue<Double> brightnessMultiplier();
|
||||
IDhApiConfigValue<Float> brightnessMultiplier();
|
||||
|
||||
/**
|
||||
* Modifies how saturated fake chunks are. <br>
|
||||
* This is done when generating the vertex data and is applied before any shaders.
|
||||
*/
|
||||
IDhApiConfigValue<Double> saturationMultiplier();
|
||||
IDhApiConfigValue<Float> saturationMultiplier();
|
||||
|
||||
/** Defines if Distant Horizons should attempt to cull fake chunk cave geometry. */
|
||||
IDhApiConfigValue<Boolean> caveCullingEnabled();
|
||||
@@ -150,12 +162,6 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
|
||||
/** If enabled vanilla chunk rendering is disabled and only fake chunks are rendered. */
|
||||
IDhApiConfigValue<Boolean> lodOnlyMode();
|
||||
|
||||
/**
|
||||
* Setting this to a non-zero number will modify vanilla Minecraft's LOD Bias,
|
||||
* increasing how quickly its textures fade away.
|
||||
*/
|
||||
IDhApiConfigValue<Double> lodBias();
|
||||
|
||||
/**
|
||||
* Determines how LODs should be shaded.
|
||||
*
|
||||
|
||||
+6
-6
@@ -52,24 +52,24 @@ public interface IDhApiHeightFogConfig extends IDhApiConfigGroup
|
||||
* Defines the height fog's base height if {@link IDhApiHeightFogConfig#heightFogDirection()}
|
||||
* is set to use a specific height.
|
||||
*/
|
||||
IDhApiConfigValue<Double> heightFogBaseHeight();
|
||||
IDhApiConfigValue<Float> heightFogBaseHeight();
|
||||
|
||||
/** Defines the height fog's starting height as a percent of the world height. */
|
||||
IDhApiConfigValue<Double> heightFogStartingHeightPercent();
|
||||
IDhApiConfigValue<Float> heightFogStartingHeightPercent();
|
||||
|
||||
/** Defines the height fog's ending height as a percent of the world height. */
|
||||
IDhApiConfigValue<Double> heightFogEndingHeightPercent();
|
||||
IDhApiConfigValue<Float> heightFogEndingHeightPercent();
|
||||
|
||||
/** Defines how opaque the height fog is at its thinnest point. */
|
||||
IDhApiConfigValue<Double> heightFogMinThickness();
|
||||
IDhApiConfigValue<Float> heightFogMinThickness();
|
||||
|
||||
/** Defines how opaque the height fog is at its thickest point. */
|
||||
IDhApiConfigValue<Double> heightFogMaxThickness();
|
||||
IDhApiConfigValue<Float> heightFogMaxThickness();
|
||||
|
||||
/** Defines how the height fog changes in thickness. */
|
||||
IDhApiConfigValue<EDhApiFogFalloff> heightFogFalloff();
|
||||
|
||||
/** Defines the height fog's density. */
|
||||
IDhApiConfigValue<Double> heightFogDensity();
|
||||
IDhApiConfigValue<Float> heightFogDensity();
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -37,8 +37,8 @@ public interface IDhApiNoiseTextureConfig extends IDhApiConfigGroup
|
||||
/** Defines how many steps of noise should be applied. */
|
||||
IDhApiConfigValue<Integer> noiseSteps();
|
||||
|
||||
/** Defines how intense the noise will be. */
|
||||
IDhApiConfigValue<Double> noiseIntensity();
|
||||
/** Defines how intense the noise will be, between 0.0 and 1.0. */
|
||||
IDhApiConfigValue<Float> noiseIntensity();
|
||||
|
||||
/**
|
||||
* Defines how far should the noise texture render before it fades away. (in blocks) <br>
|
||||
|
||||
+12
-3
@@ -1,15 +1,18 @@
|
||||
package com.seibel.distanthorizons.api.interfaces.data;
|
||||
|
||||
/**
|
||||
* Can be used to drastically speed up repeat read operations in {@link IDhApiTerrainDataRepo}.
|
||||
* Can be used to drastically speed up repeat read operations in {@link IDhApiTerrainDataRepo}. <br><br>
|
||||
*
|
||||
* Once you are done with this cache, closing it will free up any objects
|
||||
* the cache is holding. This can reduce Garbage Collector overhead and reduce stuttering.
|
||||
*
|
||||
* @see IDhApiTerrainDataRepo
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-7-14
|
||||
* @version 2026-1-29
|
||||
* @since API 3.0.0
|
||||
*/
|
||||
public interface IDhApiTerrainDataCache // TODO should this be AutoClosable?
|
||||
public interface IDhApiTerrainDataCache extends AutoCloseable
|
||||
{
|
||||
/**
|
||||
* Removes any data that's currently stored in this cache.
|
||||
@@ -21,4 +24,10 @@ public interface IDhApiTerrainDataCache // TODO should this be AutoClosable?
|
||||
*/
|
||||
void clear();
|
||||
|
||||
// override without an exception
|
||||
@Override
|
||||
void close();
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+10
-29
@@ -32,7 +32,7 @@ import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
|
||||
* @see IDhApiTerrainDataCache
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2023-6-22
|
||||
* @version 2026-02-03
|
||||
* @since API 1.0.0
|
||||
*/
|
||||
public interface IDhApiTerrainDataRepo
|
||||
@@ -42,24 +42,17 @@ public interface IDhApiTerrainDataRepo
|
||||
// getters //
|
||||
//=========//
|
||||
|
||||
/** @see IDhApiTerrainDataRepo#getSingleDataPointAtBlockPos(IDhApiLevelWrapper, int, int, int, IDhApiTerrainDataCache) */
|
||||
default DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ) { return this.getSingleDataPointAtBlockPos(levelWrapper, blockPosX, blockPosY, blockPosZ, null); }
|
||||
/**
|
||||
* Returns the terrain datapoint at the given block position, at/or containing the given Y position.
|
||||
* @since API 3.0.0
|
||||
*/
|
||||
DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, IDhApiTerrainDataCache dataCache);
|
||||
|
||||
/** @see IDhApiTerrainDataRepo#getColumnDataAtBlockPos(IDhApiLevelWrapper, int, int, IDhApiTerrainDataCache) */
|
||||
default DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ) { return this.getColumnDataAtBlockPos(levelWrapper, blockPosX, blockPosZ, null); }
|
||||
/**
|
||||
* Returns every datapoint in the column located at the given block X and Z position top to bottom.
|
||||
* @since API 3.0.0
|
||||
*/
|
||||
DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, IDhApiTerrainDataCache dataCache);
|
||||
|
||||
/** @see IDhApiTerrainDataRepo#getAllTerrainDataAtChunkPos(IDhApiLevelWrapper, int, int, IDhApiTerrainDataCache) */
|
||||
default DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ) { return this.getAllTerrainDataAtChunkPos(levelWrapper, chunkPosX, chunkPosZ, null); }
|
||||
/**
|
||||
* Returns every datapoint in the given chunk's X and Z position. <br><br>
|
||||
*
|
||||
@@ -71,8 +64,6 @@ public interface IDhApiTerrainDataRepo
|
||||
*/
|
||||
DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, IDhApiTerrainDataCache dataCache);
|
||||
|
||||
/** @see IDhApiTerrainDataRepo#getAllTerrainDataAtRegionPos(IDhApiLevelWrapper, int, int, IDhApiTerrainDataCache) */
|
||||
default DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ) { return this.getAllTerrainDataAtRegionPos(levelWrapper, regionPosX, regionPosZ, null); }
|
||||
/**
|
||||
* Returns every datapoint in the given region's X and Z position. <br><br>
|
||||
*
|
||||
@@ -84,8 +75,6 @@ public interface IDhApiTerrainDataRepo
|
||||
*/
|
||||
DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, IDhApiTerrainDataCache dataCache);
|
||||
|
||||
/** @see IDhApiTerrainDataRepo#getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper, byte, int, int, IDhApiTerrainDataCache) */
|
||||
default DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ) { return this.getAllTerrainDataAtDetailLevelAndPos(levelWrapper, detailLevel, posX, posZ, null); }
|
||||
/**
|
||||
* Returns every datapoint in the column located at the given detail level and X/Z position. <br>
|
||||
* This can be used to return terrain data for non-standard sizes (IE 2x2 blocks or 2x2 chunks).
|
||||
@@ -101,21 +90,6 @@ public interface IDhApiTerrainDataRepo
|
||||
|
||||
|
||||
|
||||
/** @see IDhApiTerrainDataRepo#raycast(IDhApiLevelWrapper, double, double, double, float, float, float, int, IDhApiTerrainDataCache) */
|
||||
default DhApiResult<DhApiRaycastResult> raycast(
|
||||
IDhApiLevelWrapper levelWrapper,
|
||||
double rayOriginX, double rayOriginY, double rayOriginZ,
|
||||
float rayDirectionX, float rayDirectionY, float rayDirectionZ,
|
||||
int maxRayBlockLength)
|
||||
{
|
||||
return this.raycast(
|
||||
levelWrapper,
|
||||
rayOriginX, rayOriginY, rayOriginZ,
|
||||
rayDirectionX, rayDirectionY, rayDirectionZ,
|
||||
maxRayBlockLength,
|
||||
null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the datapoint and position of the LOD
|
||||
* at the end of the given ray. <br><br>
|
||||
@@ -161,9 +135,16 @@ public interface IDhApiTerrainDataRepo
|
||||
//=========//
|
||||
|
||||
/**
|
||||
* Creates a new cache you manage that can be used to speed up repeat
|
||||
* read operations. <br>
|
||||
* Without a cache each operation must: hit the backing database file,
|
||||
* decompress it, and parse it; which is a fairly slow process. <br>
|
||||
*
|
||||
* @return a {@link IDhApiTerrainDataCache} backed by {@link java.lang.ref.SoftReference}'s.
|
||||
* @since API 3.0.0
|
||||
* @since API 5.0.0
|
||||
*/
|
||||
IDhApiTerrainDataCache getSoftCache();
|
||||
IDhApiTerrainDataCache createSoftCache();
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ public interface IDhApiEventInjector extends IDependencyInjector<IDhApiEvent>
|
||||
* @return true if the handler was unbound, false if the handler wasn't bound.
|
||||
* @throws IllegalArgumentException if the implementation object doesn't implement the interface
|
||||
*/
|
||||
// Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
|
||||
// Note to DH Devs: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
|
||||
boolean unbind(Class<? extends IDhApiEvent> dependencyInterface, Class<? extends IDhApiEvent> dependencyClassToRemove) throws IllegalArgumentException;
|
||||
|
||||
|
||||
|
||||
+12
@@ -19,9 +19,21 @@
|
||||
|
||||
package com.seibel.distanthorizons.api.interfaces.override.rendering;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
|
||||
import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable;
|
||||
import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;
|
||||
|
||||
/**
|
||||
* <b>Note: </b><br>
|
||||
* This is only used if Distant Horizons'
|
||||
* {@link IDhApiRenderProxy#getRenderingApi()} returns {@link EDhApiRenderingEngine#OPEN_GL}
|
||||
* and {@link IDhApiRenderProxy#isNativeRenderer()} returns true.
|
||||
* ie this is only used when DH is doing native OpenGL rendering,
|
||||
* if DH is using Blaze3D this interface will be ignored.
|
||||
*
|
||||
* @see IDhApiRenderProxy#getRenderingApi()
|
||||
* @see IDhApiRenderProxy#isNativeRenderer()
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-1-24
|
||||
* @since API 2.0.0
|
||||
|
||||
+11
@@ -19,7 +19,9 @@
|
||||
|
||||
package com.seibel.distanthorizons.api.interfaces.override.rendering;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
|
||||
import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable;
|
||||
import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;
|
||||
import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderableBoxGroup;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
||||
import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
|
||||
@@ -27,7 +29,16 @@ import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
|
||||
import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;
|
||||
|
||||
/**
|
||||
* <b>Note: </b><br>
|
||||
* This is only used if Distant Horizons'
|
||||
* {@link IDhApiRenderProxy#getRenderingApi()} returns {@link EDhApiRenderingEngine#OPEN_GL}
|
||||
* and {@link IDhApiRenderProxy#isNativeRenderer()} returns true.
|
||||
* ie this is only used when DH is doing native OpenGL rendering,
|
||||
* if DH is using Blaze3D this interface will be ignored.
|
||||
*
|
||||
* @see IDhApiShaderProgram
|
||||
* @see IDhApiRenderProxy#getRenderingApi()
|
||||
* @see IDhApiRenderProxy#isNativeRenderer()
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-7-11
|
||||
|
||||
+11
@@ -19,12 +19,23 @@
|
||||
|
||||
package com.seibel.distanthorizons.api.interfaces.override.rendering;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
|
||||
import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable;
|
||||
import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
||||
import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;
|
||||
|
||||
/**
|
||||
* <b>Note: </b><br>
|
||||
* This is only used if Distant Horizons'
|
||||
* {@link IDhApiRenderProxy#getRenderingApi()} returns {@link EDhApiRenderingEngine#OPEN_GL}
|
||||
* and {@link IDhApiRenderProxy#isNativeRenderer()} returns true.
|
||||
* ie this is only used when DH is doing native OpenGL rendering,
|
||||
* if DH is using Blaze3D this interface will be ignored.
|
||||
*
|
||||
* @see IDhApiGenericObjectShaderProgram
|
||||
* @see IDhApiRenderProxy#getRenderingApi()
|
||||
* @see IDhApiRenderProxy#isNativeRenderer()
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-1-24
|
||||
|
||||
+1
-1
@@ -169,7 +169,7 @@ public interface IDhApiWorldGenerator extends Closeable, IDhApiOverrideable
|
||||
*
|
||||
* After the {@link IDhApiWorldGenerator} has been generated, it should be passed into the
|
||||
* resultConsumer's {@link Consumer#accept(Object)} method.
|
||||
* Note: if air blocks aren't included in the with the {@link DhApiChunk} with proper lighting, lower detail levels will appear as black/unlit.
|
||||
* Note: if air blocks aren't included in the {@link IDhApiFullDataSource} with proper lighting, lower detail levels will appear as black/unlit.
|
||||
*
|
||||
* @implNote the default implementation of this method throws an {@link UnsupportedOperationException},
|
||||
* and must be overridden when {@link #getReturnType()} returns {@link EDhApiWorldGeneratorReturnType#API_CHUNKS}.
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@ package com.seibel.distanthorizons.api.interfaces.render;
|
||||
import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
|
||||
import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;
|
||||
import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
|
||||
import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -18,7 +19,7 @@ import java.util.List;
|
||||
* @version 2024-7-3
|
||||
* @since API 3.0.0
|
||||
*/
|
||||
public interface IDhApiCustomRenderObjectFactory
|
||||
public interface IDhApiCustomRenderObjectFactory extends IBindable
|
||||
{
|
||||
/**
|
||||
* Creates a {@link IDhApiRenderableBoxGroup} from for the given {@link DhApiRenderableBox}
|
||||
|
||||
+36
-4
@@ -19,6 +19,9 @@
|
||||
|
||||
package com.seibel.distanthorizons.api.interfaces.render;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingApi;
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
|
||||
import com.seibel.distanthorizons.api.objects.DhApiResult;
|
||||
|
||||
|
||||
@@ -44,6 +47,33 @@ public interface IDhApiRenderProxy
|
||||
*/
|
||||
DhApiResult<Boolean> clearRenderDataCache();
|
||||
|
||||
/**
|
||||
* Returns which specific {@link EDhApiRenderingApi}
|
||||
* Distant Horizons will use for rendering. <br><br>
|
||||
*
|
||||
* @throws IllegalStateException if no renderer has been bound yet,
|
||||
* wait till after {@link DhApiAfterDhInitEvent} has been fired
|
||||
*
|
||||
* @see DhApiAfterDhInitEvent
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
EDhApiRenderingApi getRenderingApi() throws IllegalStateException;
|
||||
/**
|
||||
* Returns true if the current renderer
|
||||
* is calling the base rendering API's method calls. <br>
|
||||
* ie GL.drawArrays() for OpenGL. <Br><br>
|
||||
*
|
||||
* If DH is using a rendering interpretation layer like Blaze3D (Mojang's rendering API)
|
||||
* this will return false.
|
||||
*
|
||||
* @throws IllegalStateException if no renderer has been bound yet,
|
||||
* wait till after {@link DhApiAfterDhInitEvent} has been fired
|
||||
*
|
||||
* @see DhApiAfterDhInitEvent
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
boolean isNativeRenderer() throws IllegalStateException;
|
||||
|
||||
|
||||
|
||||
//=======================//
|
||||
@@ -51,14 +81,16 @@ public interface IDhApiRenderProxy
|
||||
//=======================//
|
||||
|
||||
/**
|
||||
* Returns the name of Distant Horizons' depth texture. <br>
|
||||
* Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet.
|
||||
* Returns the OpenGL name of Distant Horizons' depth texture. <br>
|
||||
* Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet
|
||||
* or a rendering API other than OpenGL is in use.
|
||||
*/
|
||||
DhApiResult<Integer> getDhDepthTextureId();
|
||||
|
||||
/**
|
||||
* Returns the name of Distant Horizons' color texture. <br>
|
||||
* Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet.
|
||||
* Returns the OpenGL name of Distant Horizons' color texture. <br>
|
||||
* Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet
|
||||
* or a rendering API other than OpenGL is in use
|
||||
*/
|
||||
DhApiResult<Integer> getDhColorTextureId();
|
||||
|
||||
|
||||
+1
-1
@@ -73,7 +73,7 @@ public interface IDhApiRenderableBoxGroup extends List<DhApiRenderableBox>
|
||||
* This is a good place to change the origin or notify of any box changes.
|
||||
*/
|
||||
void setPreRenderFunc(Consumer<DhApiRenderParam> renderEventParam);
|
||||
void setPostRenderFunc(Consumer<DhApiRenderParam> renderEventParam); // TODO name?
|
||||
void setPostRenderFunc(Consumer<DhApiRenderParam> renderEventParam);
|
||||
|
||||
/**
|
||||
* If a cube's color, position, or other property is changed this method
|
||||
|
||||
+26
@@ -21,8 +21,14 @@ package com.seibel.distanthorizons.api.interfaces.world;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper;
|
||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBlockColorOverrideEvent;
|
||||
import com.seibel.distanthorizons.api.objects.DhApiResult;
|
||||
import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
@@ -90,6 +96,26 @@ public interface IDhApiLevelWrapper extends IDhApiUnsafeWrapper
|
||||
*/
|
||||
File getDhSaveFolder();
|
||||
|
||||
/**
|
||||
* Returns the color DH would use for the given block/biome
|
||||
* pair at the given world position before any API color overrides
|
||||
* are considered. <br>
|
||||
* API color overrides are ignored to prevent infinite
|
||||
* loops if this event is triggered inside said API override.
|
||||
* <br><br>
|
||||
*
|
||||
* Returns {@link DhApiResult#success} = false if {@link IDhApiLevelWrapper#getLevelType()} returns a {@link EDhApiLevelType#SERVER_LEVEL}
|
||||
* (server levels have no concept of textures or colors).
|
||||
*
|
||||
* @see DhApiBlockColorOverrideEvent
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
DhApiResult<Color> getBlockColorPreApi(
|
||||
IDhApiBlockStateWrapper blockStateWrapper,
|
||||
IDhApiBiomeWrapper biomeWrapper,
|
||||
int blockWorldPosX, int blockWorldPosY, int blockWorldPosZ,
|
||||
IDhApiFullDataSource dataSource);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+12
-10
@@ -27,7 +27,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;
|
||||
|
||||
/**
|
||||
* Called before Distant Horizons starts rendering a buffer. <br>
|
||||
* This event cannot be cancelled, use {@link DhApiBeforeRenderEvent} if you want to cancel rendering.
|
||||
* This event cannot be canceled, use {@link DhApiBeforeRenderEvent} if you want to cancel rendering.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2023-1-31
|
||||
@@ -59,23 +59,25 @@ public abstract class DhApiBeforeBufferRenderEvent implements IDhApiEvent<DhApiB
|
||||
* Measured in blocks.
|
||||
* Should be applied to the model view matrix to move the buffer into its proper place.
|
||||
*/
|
||||
public final DhApiVec3f modelPos;
|
||||
public DhApiVec3f modelPos;
|
||||
|
||||
|
||||
public EventParam(DhApiRenderParam parent, DhApiVec3f modelPos)
|
||||
|
||||
public EventParam() { }
|
||||
|
||||
public void update(DhApiRenderParam parent, DhApiVec3f modelPos)
|
||||
{
|
||||
super(parent);
|
||||
super.update(parent);
|
||||
this.modelPos = modelPos;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public EventParam copy()
|
||||
{
|
||||
return new EventParam(
|
||||
this, this.modelPos.copy()
|
||||
);
|
||||
}
|
||||
public boolean getCopyBeforeFire() { return false; }
|
||||
|
||||
@Override
|
||||
public EventParam copy() { return this; }
|
||||
}
|
||||
|
||||
}
|
||||
+3
@@ -31,7 +31,10 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
|
||||
* @author James Seibel
|
||||
* @version 2025-6-9
|
||||
* @since API 4.1.0
|
||||
* @deprecated Only used for the legacy OpenGL renderer <Br>
|
||||
* Using {@link DhApiAfterColorDepthTextureCreatedEvent} instead is recommended.
|
||||
*/
|
||||
@Deprecated
|
||||
public abstract class DhApiBeforeColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
|
||||
{
|
||||
/** Fired before Distant Horizons creates. */
|
||||
|
||||
+128
@@ -0,0 +1,128 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiCancelableEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiFogRenderParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiMutableFogRenderParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
||||
import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
|
||||
import com.seibel.distanthorizons.coreapi.util.ColorUtil;
|
||||
|
||||
/**
|
||||
* Fired before DH renders its fog.
|
||||
* Canceling this event disables fog for that frame.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2026-05-20
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
public abstract class DhApiBeforeFogRenderEvent implements IDhApiCancelableEvent<DhApiBeforeFogRenderEvent.EventParam>
|
||||
{
|
||||
/** Fired before fog is generated. */
|
||||
public abstract void beforeRender(DhApiCancelableEventParam<DhApiBeforeFogRenderEvent.EventParam> event);
|
||||
|
||||
|
||||
//=========================//
|
||||
// internal DH API methods //
|
||||
//=========================//
|
||||
|
||||
@Override
|
||||
public final void fireEvent(DhApiCancelableEventParam<DhApiBeforeFogRenderEvent.EventParam> event) { this.beforeRender(event); }
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// parameter object //
|
||||
//==================//
|
||||
|
||||
public static class EventParam implements IDhApiEventParam
|
||||
{
|
||||
private DhApiRenderParam renderParam;
|
||||
private DhApiFogRenderParam originalFogRenderParam;
|
||||
private DhApiMutableFogRenderParam fogRenderParam;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
public EventParam() {}
|
||||
|
||||
public void update(DhApiRenderParam renderParam, DhApiFogRenderParam fogRenderParam)
|
||||
{
|
||||
this.renderParam = renderParam;
|
||||
this.originalFogRenderParam = fogRenderParam;
|
||||
this.fogRenderParam = new DhApiMutableFogRenderParam(fogRenderParam);
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=================//
|
||||
// getters/setters //
|
||||
//=================//
|
||||
//region
|
||||
|
||||
public DhApiRenderParam getRenderParam() { return this.renderParam; }
|
||||
|
||||
/** immutable, stores what DH would do without API intervention so API users have a reference point */
|
||||
public DhApiFogRenderParam getOriginalFogRenderParam() { return this.originalFogRenderParam; }
|
||||
/** mutable, can be modified by API users */
|
||||
public DhApiMutableFogRenderParam getFogRenderParam() { return this.fogRenderParam; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==========================//
|
||||
// base api event overrides //
|
||||
//==========================//
|
||||
//region
|
||||
|
||||
/**
|
||||
* Returns the same instance of this event.
|
||||
* Copying this event isn't supported
|
||||
* since the internal parameters must be mutated
|
||||
* by API users in order to be tracked by DH's internal
|
||||
* logic.
|
||||
*/
|
||||
@Override
|
||||
public DhApiBeforeFogRenderEvent.EventParam copy() { return this; }
|
||||
|
||||
@Override
|
||||
public boolean getCopyBeforeFire() { return false; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+26
-25
@@ -54,44 +54,45 @@ public abstract class DhApiBeforeGenericObjectRenderEvent implements IDhApiCance
|
||||
|
||||
public static class EventParam extends DhApiRenderParam implements IDhApiEventParam
|
||||
{
|
||||
public final long boxGroupId;
|
||||
public final String resourceLocationNamespace;
|
||||
public final String resourceLocationPath;
|
||||
public long boxGroupId;
|
||||
public String resourceLocationNamespace;
|
||||
public String resourceLocationPath;
|
||||
|
||||
|
||||
public EventParam(
|
||||
DhApiRenderParam renderParam,
|
||||
IDhApiRenderableBoxGroup boxGroup
|
||||
)
|
||||
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
public EventParam() { }
|
||||
|
||||
/** internal DH method */
|
||||
public void update(DhApiRenderParam renderParam, IDhApiRenderableBoxGroup boxGroup)
|
||||
{
|
||||
super(renderParam);
|
||||
super.update(renderParam);
|
||||
|
||||
this.boxGroupId = boxGroup.getId();
|
||||
this.resourceLocationNamespace = boxGroup.getResourceLocationNamespace();
|
||||
this.resourceLocationPath = boxGroup.getResourceLocationPath();
|
||||
}
|
||||
public EventParam(
|
||||
DhApiRenderParam renderParam,
|
||||
long boxGroupId, String resourceLocationNamespace, String resourceLocationPath
|
||||
)
|
||||
{
|
||||
super(renderParam);
|
||||
|
||||
this.boxGroupId = boxGroupId;
|
||||
this.resourceLocationNamespace = resourceLocationNamespace;
|
||||
this.resourceLocationPath = resourceLocationPath;
|
||||
}
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public EventParam copy()
|
||||
{
|
||||
return new EventParam(
|
||||
this,
|
||||
this.boxGroupId, this.resourceLocationNamespace, this.resourceLocationPath
|
||||
);
|
||||
}
|
||||
public EventParam copy() { return this; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+187
@@ -0,0 +1,187 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
|
||||
import com.seibel.distanthorizons.coreapi.util.ColorUtil;
|
||||
|
||||
/**
|
||||
* Performance note: this event will be fired millions of times on concurrent threads,
|
||||
* make it thread safe and as fast as possible. <br>
|
||||
* (If every LOD block goes through this event, On a 512 render distance world,
|
||||
* at the medium quality preset, it will be triggered around 40,000,000 times.)
|
||||
* <Br><Br>
|
||||
*
|
||||
* This event is fired when DH needs to convert a {@link IDhApiBlockStateWrapper}
|
||||
* into a color for rendering. This event is fired after DH attempts to determine
|
||||
* the color itself (using the base color, tinting, etc.). <Br>
|
||||
* Using this event will override the tinting config for this block
|
||||
* unless you re-implement that logic yourself.
|
||||
* <Br><Br>
|
||||
*
|
||||
* This event will only trigger for {@link IDhApiBlockStateWrapper}s that have been registered
|
||||
* via {@link DhApiBlockStateWrapperCreatedEvent.EventParam#setAllowApiColorOverride(boolean)}.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2026-05-18
|
||||
* @since API 6.0.0
|
||||
* @see IDhApiBlockStateWrapper
|
||||
*/
|
||||
public abstract class DhApiBlockColorOverrideEvent implements IDhApiEvent<DhApiBlockColorOverrideEvent.EventParam>
|
||||
{
|
||||
public abstract void onBlockColorOverridden(DhApiEventParam<EventParam> event);
|
||||
|
||||
|
||||
|
||||
//=========================//
|
||||
// internal DH API methods //
|
||||
//=========================//
|
||||
|
||||
@Override
|
||||
public final void fireEvent(DhApiEventParam<EventParam> event) { this.onBlockColorOverridden(event); }
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// parameter object //
|
||||
//==================//
|
||||
|
||||
public static class EventParam implements IDhApiEventParam
|
||||
{
|
||||
private IDhApiLevelWrapper levelWrapper;
|
||||
private IDhApiFullDataSource dataSource;
|
||||
private IDhApiBlockStateWrapper blockStateWrapper = null;
|
||||
private IDhApiBiomeWrapper biomeWrapper = null;
|
||||
private int colorAsInt = -1;
|
||||
private int blockPosX = 0, blockPosY = 0, blockPosZ = 0;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
public EventParam() {}
|
||||
|
||||
public void update(
|
||||
IDhApiLevelWrapper levelWrapper,
|
||||
IDhApiFullDataSource dataSource,
|
||||
IDhApiBlockStateWrapper blockStateWrapper,
|
||||
IDhApiBiomeWrapper biomeWrapper,
|
||||
int colorAsInt,
|
||||
int blockPosX, int blockPosY, int blockPosZ)
|
||||
{
|
||||
this.levelWrapper = levelWrapper;
|
||||
this.dataSource = dataSource;
|
||||
this.blockStateWrapper = blockStateWrapper;
|
||||
this.biomeWrapper = biomeWrapper;
|
||||
this.colorAsInt = colorAsInt;
|
||||
|
||||
this.blockPosX = blockPosX;
|
||||
this.blockPosY = blockPosY;
|
||||
this.blockPosZ = blockPosZ;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=================//
|
||||
// getters/setters //
|
||||
//=================//
|
||||
//region
|
||||
|
||||
public IDhApiBlockStateWrapper getBlockStateWrapper() { return this.blockStateWrapper; }
|
||||
/** @since API 7.0.0 */
|
||||
public IDhApiBiomeWrapper getBiomeWrapper() { return this.biomeWrapper; }
|
||||
|
||||
/** the level DH is resolving this block's color in. */
|
||||
public IDhApiLevelWrapper getLevelWrapper() { return this.levelWrapper; }
|
||||
/**
|
||||
* The DH datasource that contains this block's position. Can be used to access adjacent
|
||||
* {@link IDhApiBlockStateWrapper}'s and {@link IDhApiBiomeWrapper}'s for adjacent aware tinting.
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
public IDhApiFullDataSource getDataSource() { return this.dataSource; }
|
||||
|
||||
public int getColorAsInt() { return this.colorAsInt; }
|
||||
public int getAlpha() { return ColorUtil.getAlpha(this.colorAsInt); }
|
||||
public int getRed() { return ColorUtil.getRed(this.colorAsInt); }
|
||||
public int getGreen() { return ColorUtil.getGreen(this.colorAsInt); }
|
||||
public int getBlue() { return ColorUtil.getBlue(this.colorAsInt); }
|
||||
public void setColor(int red, int green, int blue) throws IllegalArgumentException { this.setColor(this.getAlpha(), red, green, blue); }
|
||||
/**
|
||||
* Note: when if you set a partially transparent alpha channel the underlying {@link IDhApiBlockStateWrapper#getOpacity()}
|
||||
* method should also return a non-opaque value.
|
||||
* Otherwise LODs may behave incorrectly.
|
||||
*/
|
||||
public void setColor(int alpha, int red, int green, int blue) throws IllegalArgumentException
|
||||
{
|
||||
ColorUtil.throwIfColorValueOutOfIntRange("alpha", alpha);
|
||||
ColorUtil.throwIfColorValueOutOfIntRange("red", red);
|
||||
ColorUtil.throwIfColorValueOutOfIntRange("green", green);
|
||||
ColorUtil.throwIfColorValueOutOfIntRange("blue", blue);
|
||||
|
||||
this.colorAsInt = ColorUtil.argbToInt(alpha, red, green, blue);
|
||||
}
|
||||
|
||||
/** @return the block's X value in the world */
|
||||
public int getBlockPosX() { return blockPosX; }
|
||||
/** @return the block's Y value in the world */
|
||||
public int getBlockPosY() { return blockPosY; }
|
||||
/** @return the block's Z value in the world */
|
||||
public int getBlockPosZ() { return blockPosZ; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==========================//
|
||||
// base api event overrides //
|
||||
//==========================//
|
||||
//region
|
||||
|
||||
/**
|
||||
* Returns the same instance of this event.
|
||||
* Copying this event isn't supported
|
||||
* since the internal parameters must be mutated
|
||||
* by API users in order to be tracked by DH's internal
|
||||
* logic.
|
||||
*/
|
||||
@Override
|
||||
public EventParam copy() { return this; }
|
||||
|
||||
@Override
|
||||
public boolean getCopyBeforeFire() { return false; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+131
@@ -0,0 +1,131 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
|
||||
|
||||
/**
|
||||
* Can be used to modify {@link IDhApiBlockStateWrapper}'s as they're created.
|
||||
* This can be helpful for modded blocks that are mis-categorized by DH's base logic. <br><br>
|
||||
*
|
||||
* Note: this is only fired once per {@link IDhApiBlockStateWrapper} that is created
|
||||
* and those {@link IDhApiBlockStateWrapper} will only be created once per JVM session.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2026-04-14
|
||||
* @since API 6.0.0
|
||||
* @see IDhApiBlockStateWrapper
|
||||
*/
|
||||
public abstract class DhApiBlockStateWrapperCreatedEvent implements IDhApiEvent<DhApiBlockStateWrapperCreatedEvent.EventParam>
|
||||
{
|
||||
public abstract void blockStateWrapperCreated(DhApiEventParam<EventParam> event);
|
||||
|
||||
|
||||
//=========================//
|
||||
// internal DH API methods //
|
||||
//=========================//
|
||||
|
||||
@Override
|
||||
public final void fireEvent(DhApiEventParam<EventParam> event) { this.blockStateWrapperCreated(event); }
|
||||
|
||||
|
||||
//==================//
|
||||
// parameter object //
|
||||
//==================//
|
||||
|
||||
public static class EventParam implements IDhApiEventParam
|
||||
{
|
||||
/**
|
||||
* A copy of the wrapper that will be created. <Br>
|
||||
* Note: modifying this object won't change anything
|
||||
* a new wrapper will be created after this event finishes.
|
||||
*/
|
||||
private final IDhApiBlockStateWrapper blockStateWrapper;
|
||||
|
||||
private boolean overridesSet = false;
|
||||
private EDhApiBlockMaterial blockMaterial = null;
|
||||
private Integer opacity = null;
|
||||
private Boolean allowApiColorOverride = null;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public EventParam(IDhApiBlockStateWrapper blockStateWrapper) { this.blockStateWrapper = blockStateWrapper; }
|
||||
|
||||
|
||||
|
||||
//=================//
|
||||
// getters/setters //
|
||||
//=================//
|
||||
|
||||
public IDhApiBlockStateWrapper getBlockStateWrapper() { return this.blockStateWrapper; }
|
||||
|
||||
/** if set this will override the value currently set in the given {@link IDhApiBlockStateWrapper} */
|
||||
public void setBlockMaterial(EDhApiBlockMaterial blockMaterial)
|
||||
{
|
||||
this.blockMaterial = blockMaterial;
|
||||
this.overridesSet = true;
|
||||
}
|
||||
public EDhApiBlockMaterial getBlockMaterial() { return this.blockMaterial; }
|
||||
|
||||
/** if set this will override the value currently set in the given {@link IDhApiBlockStateWrapper} */
|
||||
public void setOpacity(int opacity)
|
||||
{
|
||||
this.opacity = opacity;
|
||||
this.overridesSet = true;
|
||||
}
|
||||
public Integer getOpacity() { return this.opacity; }
|
||||
|
||||
/** if set to true this {@link IDhApiBlockStateWrapper} will trigger {@link DhApiBlockColorOverrideEvent} */
|
||||
public void setAllowApiColorOverride(boolean allowApiColorOverride)
|
||||
{
|
||||
this.allowApiColorOverride = allowApiColorOverride;
|
||||
this.overridesSet = true;
|
||||
}
|
||||
public Boolean getAllowApiColorOverride() { return this.allowApiColorOverride; }
|
||||
|
||||
/** If true then one or more options for this block were set to be changed */
|
||||
public boolean getOverridesSet() { return this.overridesSet; }
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Returns the same instance of this event.
|
||||
* Copying this event isn't supported
|
||||
* since the internal parameters must be mutated
|
||||
* by API users in order to be tracked by DH's internal
|
||||
* logic.
|
||||
*/
|
||||
@Override
|
||||
public EventParam copy() { return this; }
|
||||
|
||||
@Override
|
||||
public boolean getCopyBeforeFire() { return false; }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+1
@@ -34,6 +34,7 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
|
||||
* @author James Seibel
|
||||
* @version 2023-6-23
|
||||
* @see IDhApiTerrainDataRepo
|
||||
* @see DhApiChunkProcessingEvent
|
||||
* @since API 1.0.0
|
||||
*/
|
||||
public abstract class DhApiChunkModifiedEvent implements IDhApiEvent<DhApiChunkModifiedEvent.EventParam>
|
||||
|
||||
+198
@@ -0,0 +1,198 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
|
||||
import com.seibel.distanthorizons.api.interfaces.factories.IDhApiWrapperFactory;
|
||||
import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
|
||||
|
||||
/**
|
||||
* Used to override which blocks may be stored in a given chunk.
|
||||
* This can be used for X-ray prevention or to replace problematic mod blocks
|
||||
* that don't fit into the {@link IDhApiBlockStateWrapper} format DH requires
|
||||
* (IE modded blocks that use NBT data
|
||||
* to determine their model and/or texture). <br/><br/>
|
||||
*
|
||||
* This event is fired for each block or biome change when DH is processing a chunk.
|
||||
* A change happens when DH finds a different block or biome while walking through a chunk.
|
||||
* For example with the block sequence:<br/>
|
||||
* <code> stone -> stone -> air -> stone </code> <br/>
|
||||
* This event would be fired for the first, third, and forth blocks in the sequence
|
||||
* (IE the first stone, first air, and last stone respectively). <br/> <br/>
|
||||
*
|
||||
* The order DH will process blocks is undefined so a specific ordering shouldn't be relied upon for your logic to function. <br/> <br/>
|
||||
*
|
||||
* <b>Threading note:</b> this event may be called concurrently across multiple threads. <br/>
|
||||
* <b>Performance note:</b> this event will be called very frequently, avoid expensive lookups or other slow operations if possible. <br/>
|
||||
*
|
||||
* @see DhApiLevelLoadEvent
|
||||
* @see IDhApiWrapperFactory
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2025-09-29
|
||||
* @see DhApiChunkModifiedEvent
|
||||
* @since API 4.1.0
|
||||
*/
|
||||
public abstract class DhApiChunkProcessingEvent implements IDhApiEvent<DhApiChunkProcessingEvent.EventParam>
|
||||
{
|
||||
public abstract void blockOrBiomeChangedDuringChunkProcessing(DhApiEventParam<EventParam> event);
|
||||
|
||||
|
||||
//=========================//
|
||||
// internal DH API methods //
|
||||
//=========================//
|
||||
|
||||
@Override
|
||||
public final void fireEvent(DhApiEventParam<EventParam> event) { this.blockOrBiomeChangedDuringChunkProcessing(event); }
|
||||
|
||||
|
||||
//==================//
|
||||
// parameter object //
|
||||
//==================//
|
||||
|
||||
public static class EventParam implements IDhApiEventParam
|
||||
{
|
||||
/** The saved level. */
|
||||
public final IDhApiLevelWrapper levelWrapper;
|
||||
|
||||
/** the processed chunk's X pos in chunk coordinates */
|
||||
public final int chunkX;
|
||||
/** the processed chunk's Z pos in chunk coordinates */
|
||||
public final int chunkZ;
|
||||
|
||||
|
||||
public int relativeBlockPosX;
|
||||
public int blockPosY;
|
||||
public int relativeBlockPosZ;
|
||||
|
||||
public IDhApiBlockStateWrapper currentBlock;
|
||||
public IDhApiBiomeWrapper currentBiome;
|
||||
|
||||
private IDhApiBlockStateWrapper newBlock;
|
||||
private IDhApiBiomeWrapper newBiome;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public EventParam(IDhApiLevelWrapper newLevelWrapper, int chunkX, int chunkZ)
|
||||
{
|
||||
this.levelWrapper = newLevelWrapper;
|
||||
this.chunkX = chunkX;
|
||||
this.chunkZ = chunkZ;
|
||||
}
|
||||
|
||||
/**
|
||||
* Internal method use by Distant Horizons
|
||||
* to set up this event.
|
||||
*/
|
||||
public void updateForPosition(
|
||||
int relativeBlockPosX, int blockPosY, int relativeBlockPosZ,
|
||||
IDhApiBlockStateWrapper currentBlock,
|
||||
IDhApiBiomeWrapper currentBiome)
|
||||
{
|
||||
this.relativeBlockPosX = relativeBlockPosX;
|
||||
this.blockPosY = blockPosY;
|
||||
this.relativeBlockPosZ = relativeBlockPosZ;
|
||||
|
||||
this.newBlock = null;
|
||||
this.newBiome = null;
|
||||
|
||||
this.currentBlock = currentBlock;
|
||||
this.currentBiome = currentBiome;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//=================//
|
||||
// getters/setters //
|
||||
//=================//
|
||||
|
||||
/**
|
||||
* Sets the {@link IDhApiBlockStateWrapper} that should be used at this event's current position in the chunk.
|
||||
* If you don't want to modify the block at this event's current position,
|
||||
* either don't call this method or pass in null. <br>
|
||||
* Passing in null will remove the override, meaning the original block will be used. <br><br>
|
||||
*
|
||||
* A {@link IDhApiWrapperFactory} should be used to get the {@link IDhApiBlockStateWrapper} that's returned.
|
||||
* Attempting to create your own {@link IDhApiBlockStateWrapper} will cause a {@link ClassCastException}. <br/> <br/>
|
||||
*
|
||||
* If multiple API users are listening to this event the override may already have been set.
|
||||
* With that in mind it is recommended to check if an override has already been set via
|
||||
* {@link EventParam#getBlockOverride()} to handle that occurrence. <br>
|
||||
* Note that the order of API events firing is undefined so a specific order shouldn't be relied upon. <br><br>
|
||||
*
|
||||
* @see IDhApiWrapperFactory
|
||||
*/
|
||||
public void setBlockOverride(IDhApiBlockStateWrapper block) { this.newBlock = block; }
|
||||
/**
|
||||
* Returns the currently overriding block for this position.
|
||||
* This will be null if no other API event has set the override.
|
||||
*/
|
||||
public IDhApiBlockStateWrapper getBlockOverride() { return this.newBlock; }
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Sets the {@link IDhApiBiomeWrapper} that should be used at this event's current position in the chunk.
|
||||
* If you don't want to modify the biome at this event's current position,
|
||||
* either don't call this method or pass in null. <br>
|
||||
* Passing in null will remove the override, meaning the original biome will be used. <br><br>
|
||||
*
|
||||
* A {@link IDhApiWrapperFactory} should be used to get the {@link IDhApiBiomeWrapper} that's returned.
|
||||
* Attempting to create your own {@link IDhApiBiomeWrapper} will cause a {@link ClassCastException}. <br/> <br/>
|
||||
*
|
||||
* If multiple API users are listening to this event the override may already have been set.
|
||||
* With that in mind it is recommended to check if an override has already been set via
|
||||
* {@link EventParam#getBiomeOverride()} ()} to handle that occurrence. <br>
|
||||
* Note that the order of API events firing is undefined so a specific order shouldn't be relied upon. <br><br>
|
||||
*
|
||||
* @see IDhApiWrapperFactory
|
||||
*/
|
||||
public void setBiomeOverride(IDhApiBiomeWrapper biome) { this.newBiome = biome; }
|
||||
/**
|
||||
* Returns the currently overriding biome for this position.
|
||||
* This will be null if no other API event has set the override.
|
||||
*/
|
||||
public IDhApiBiomeWrapper getBiomeOverride() { return this.newBiome; }
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Returns the same instance of this event.
|
||||
* Copying this event isn't recommended due to
|
||||
* how often it would be called per chunk, creating
|
||||
* unnecessary garbage collector pressure.
|
||||
*/
|
||||
@Override
|
||||
public EventParam copy() { return this; }
|
||||
|
||||
@Override
|
||||
public boolean getCopyBeforeFire() { return false; }
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+4
-2
@@ -31,9 +31,11 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
|
||||
* @author James Seibel
|
||||
* @version 2024-3-2
|
||||
* @since API 2.0.0
|
||||
* @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
|
||||
* @deprecated Only used for the legacy OpenGL renderer <Br>
|
||||
* Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
|
||||
* Using {@link DhApiAfterColorDepthTextureCreatedEvent} instead is recommended
|
||||
*/
|
||||
@Deprecated
|
||||
@Deprecated // internal notes: this method must be kept around due to Iris using it and we don't want to break old Iris support
|
||||
public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>
|
||||
{
|
||||
/** Fired before Distant Horizons creates. */
|
||||
|
||||
+18
@@ -9,5 +9,23 @@ import com.seibel.distanthorizons.api.interfaces.util.IDhApiCopyable;
|
||||
*/
|
||||
public interface IDhApiEventParam extends IDhApiCopyable
|
||||
{
|
||||
/**
|
||||
* Internal DH use. <br> <br>
|
||||
*
|
||||
* Most API events will clone their parameters
|
||||
* before firing to prevent API implementors
|
||||
* from modifying the properties causing
|
||||
* any subsequent listeners to see the wrong data. <br><br>
|
||||
*
|
||||
* However, this can be overridden for API events that shouldn't
|
||||
* be cloned before firing.
|
||||
* Generally that would be done for performance reasons
|
||||
* where an event may fire hundreds or thousands of times
|
||||
* in quick succession or where the event parameter is needed
|
||||
* internally by DH after firing.
|
||||
*
|
||||
* @since API 4.1.0
|
||||
*/
|
||||
default boolean getCopyBeforeFire() { return true; }
|
||||
|
||||
}
|
||||
|
||||
+202
@@ -0,0 +1,202 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* Contains all the information needed to render Distant Horizons' fog.
|
||||
*
|
||||
* @see IDhApiFogConfig
|
||||
* @see IDhApiFarFogConfig
|
||||
* @see IDhApiHeightFogConfig
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2026-05-20
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
public class DhApiFogRenderParam implements IDhApiEventParam
|
||||
{
|
||||
protected Color fogColor;
|
||||
public Color getFogColor() { return this.fogColor; }
|
||||
|
||||
// far fog //
|
||||
//region
|
||||
|
||||
protected EDhApiFogFalloff farFogFalloff;
|
||||
/** @see IDhApiFarFogConfig#farFogFalloff() */
|
||||
public EDhApiFogFalloff getFarFogFalloff() { return this.farFogFalloff; }
|
||||
|
||||
protected float farFogStartPercent;
|
||||
/** @see IDhApiFarFogConfig#farFogStartDistance() */
|
||||
public float getFarFogStartPercent() { return this.farFogStartPercent; }
|
||||
|
||||
protected float farFogEndPercent;
|
||||
/** @see IDhApiFarFogConfig#farFogEndDistance() */
|
||||
public float getFarFogEndPercent() { return this.farFogEndPercent; }
|
||||
|
||||
protected float farFogMinThickness;
|
||||
/** @see IDhApiFarFogConfig#farFogMinThickness() */
|
||||
public float getFarFogMinThickness() { return this.farFogMinThickness; }
|
||||
|
||||
protected float farFogMaxThickness;
|
||||
/** @see IDhApiFarFogConfig#farFogMaxThickness() */
|
||||
public float getFarFogMaxThickness() { return this.farFogMaxThickness; }
|
||||
|
||||
protected float farFogDensity;
|
||||
/** @see IDhApiFarFogConfig#farFogDensity() */
|
||||
public float getFarFogDensity() { return this.farFogDensity; }
|
||||
|
||||
//endregion
|
||||
|
||||
// height fog //
|
||||
//region
|
||||
|
||||
protected EDhApiFogFalloff heightFogFalloff;
|
||||
/** @see IDhApiHeightFogConfig#heightFogFalloff() */
|
||||
public EDhApiFogFalloff getHeightFogFalloff() { return this.heightFogFalloff; }
|
||||
|
||||
protected EDhApiHeightFogMixMode heightFogMixingMode;
|
||||
/** @see IDhApiHeightFogConfig#heightFogMixMode() */
|
||||
public EDhApiHeightFogMixMode getHeightFogMixingMode() { return this.heightFogMixingMode; }
|
||||
|
||||
protected EDhApiHeightFogDirection heightFogDirection;
|
||||
/** @see IDhApiHeightFogConfig#heightFogDirection() */
|
||||
public EDhApiHeightFogDirection getHeightFogDirection() { return this.heightFogDirection; }
|
||||
|
||||
protected float heightFogBaseHeight;
|
||||
/** @see IDhApiHeightFogConfig#heightFogBaseHeight() */
|
||||
public float getHeightFogBaseHeight() { return this.heightFogBaseHeight; }
|
||||
|
||||
protected float heightFogStartPercent;
|
||||
/** @see IDhApiHeightFogConfig#heightFogStartingHeightPercent() */
|
||||
public float getHeightFogStartPercent() { return this.heightFogStartPercent; }
|
||||
|
||||
protected float heightFogEndPercent;
|
||||
/** @see IDhApiHeightFogConfig#heightFogEndingHeightPercent() */
|
||||
public float getHeightFogEndPercent() { return this.heightFogEndPercent; }
|
||||
|
||||
protected float heightFogMinThickness;
|
||||
/** @see IDhApiHeightFogConfig#heightFogMinThickness() */
|
||||
public float getHeightFogMinThickness() { return this.heightFogMinThickness; }
|
||||
|
||||
protected float heightFogMaxThickness;
|
||||
/** @see IDhApiHeightFogConfig#heightFogMaxThickness() */
|
||||
public float getHeightFogMaxThickness() { return this.heightFogMaxThickness; }
|
||||
|
||||
protected float heightFogDensity;
|
||||
/** @see IDhApiHeightFogConfig#heightFogDensity() */
|
||||
public float getHeightFogDensity() { return this.heightFogDensity; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
public DhApiFogRenderParam(DhApiFogRenderParam parent)
|
||||
{
|
||||
this(
|
||||
parent.fogColor,
|
||||
|
||||
// far fog
|
||||
parent.farFogFalloff,
|
||||
parent.farFogStartPercent, parent.farFogEndPercent,
|
||||
parent.farFogMinThickness, parent.farFogEndPercent,
|
||||
parent.farFogDensity,
|
||||
|
||||
// height fog
|
||||
parent.heightFogFalloff,
|
||||
parent.heightFogMixingMode, parent.heightFogDirection,
|
||||
parent.heightFogBaseHeight,
|
||||
parent.heightFogStartPercent, parent.heightFogEndPercent,
|
||||
parent.heightFogMinThickness, parent.heightFogMaxThickness,
|
||||
parent.heightFogDensity
|
||||
);
|
||||
}
|
||||
public DhApiFogRenderParam(
|
||||
Color fogColor,
|
||||
|
||||
// far fog
|
||||
EDhApiFogFalloff farFogFalloff,
|
||||
float farFogStartPercent, float farFogEndPercent,
|
||||
float farFogMinThickness, float farFogMaxThickness,
|
||||
float farFogDensity,
|
||||
|
||||
// height fog
|
||||
EDhApiFogFalloff heightFogFalloff,
|
||||
EDhApiHeightFogMixMode heightFogMixingMode, EDhApiHeightFogDirection heightFogDirection,
|
||||
float heightFogBaseHeight,
|
||||
float heightFogStartPercent, float heightFogEndPercent,
|
||||
float heightFogMinThickness, float heightFogMaxThickness,
|
||||
float heightFogDensity
|
||||
)
|
||||
{
|
||||
this.fogColor = fogColor;
|
||||
|
||||
// far fog
|
||||
this.farFogFalloff = farFogFalloff;
|
||||
this.farFogStartPercent = farFogStartPercent;
|
||||
this.farFogEndPercent = farFogEndPercent;
|
||||
this.farFogMinThickness = farFogMinThickness;
|
||||
this.farFogMaxThickness = farFogMaxThickness;
|
||||
this.farFogDensity = farFogDensity;
|
||||
|
||||
// height fog
|
||||
this.heightFogFalloff = heightFogFalloff;
|
||||
this.heightFogMixingMode = heightFogMixingMode;
|
||||
this.heightFogDirection = heightFogDirection;
|
||||
this.heightFogBaseHeight = heightFogBaseHeight;
|
||||
this.heightFogStartPercent = heightFogStartPercent;
|
||||
this.heightFogEndPercent = heightFogEndPercent;
|
||||
this.heightFogMinThickness = heightFogMinThickness;
|
||||
this.heightFogMaxThickness = heightFogMaxThickness;
|
||||
this.heightFogDensity = heightFogDensity;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public DhApiFogRenderParam copy() { return new DhApiFogRenderParam(this); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
+117
@@ -0,0 +1,117 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
/**
|
||||
* A mutable version of {@link DhApiFogRenderParam} to allow
|
||||
* API modification of DH's fog rendering.
|
||||
*
|
||||
* @see IDhApiFogConfig
|
||||
* @see IDhApiFarFogConfig
|
||||
* @see IDhApiHeightFogConfig
|
||||
* @see DhApiFogRenderParam
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2026-05-20
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
public class DhApiMutableFogRenderParam extends DhApiFogRenderParam
|
||||
{
|
||||
public void setFogColor(Color fogColor) { this.fogColor = fogColor; }
|
||||
|
||||
// far fog //
|
||||
//region
|
||||
|
||||
/** @see IDhApiFarFogConfig#farFogFalloff() */
|
||||
public void setFarFogFalloff(EDhApiFogFalloff farFogFalloff) { this.farFogFalloff = farFogFalloff; }
|
||||
/** @see IDhApiFarFogConfig#farFogStartDistance() */
|
||||
public void setFarFogStartPercent(float farFogStartPercent) { this.farFogStartPercent = farFogStartPercent; }
|
||||
/** @see IDhApiFarFogConfig#farFogEndDistance() */
|
||||
public void setFarFogEndPercent(float farFogEndPercent) { this.farFogEndPercent = farFogEndPercent; }
|
||||
/** @see IDhApiFarFogConfig#farFogMinThickness() */
|
||||
public void setFarFogMinThickness(float farFogMinThickness) { this.farFogMinThickness = farFogMinThickness; }
|
||||
/** @see IDhApiFarFogConfig#farFogMaxThickness() */
|
||||
public void setFarFogMaxThickness(float farFogMaxThickness) { this.farFogMaxThickness = farFogMaxThickness; }
|
||||
/** @see IDhApiFarFogConfig#farFogDensity() */
|
||||
public void setFarFogDensity(float farFogDensity) { this.farFogDensity = farFogDensity; }
|
||||
|
||||
//endregion
|
||||
|
||||
// height fog //
|
||||
//region
|
||||
|
||||
/** @see IDhApiHeightFogConfig#heightFogFalloff() */
|
||||
public void setHeightFogFalloff(EDhApiFogFalloff heightFogFalloff) { this.heightFogFalloff = heightFogFalloff; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogMixMode() */
|
||||
public void setHeightFogMixingMode(EDhApiHeightFogMixMode heightFogMixingMode) { this.heightFogMixingMode = heightFogMixingMode; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogDirection() */
|
||||
public void setHeightFogDirection(EDhApiHeightFogDirection heightFogDirection) { this.heightFogDirection = heightFogDirection; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogBaseHeight() */
|
||||
public void setHeightFogBaseHeight(float heightFogBaseHeight) { this.heightFogBaseHeight = heightFogBaseHeight; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogStartingHeightPercent() */
|
||||
public void setHeightFogStartPercent(float heightFogStartPercent) { this.heightFogStartPercent = heightFogStartPercent; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogEndingHeightPercent() */
|
||||
public void setHeightFogEndPercent(float heightFogEnd) { this.heightFogEndPercent = heightFogEnd; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogMinThickness() */
|
||||
public void setHeightFogMinThickness(float heightFogMinThickness) { this.heightFogMinThickness = heightFogMinThickness; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogMaxThickness() */
|
||||
public void setHeightFogMaxThickness(float heightFogMaxThickness) { this.heightFogMaxThickness = heightFogMaxThickness; }
|
||||
/** @see IDhApiHeightFogConfig#heightFogDensity() */
|
||||
public void setHeightFogDensity(float heightFogDensity) { this.heightFogDensity = heightFogDensity; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
public DhApiMutableFogRenderParam(DhApiFogRenderParam parent)
|
||||
{ super(parent); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public DhApiMutableFogRenderParam copy() { return new DhApiMutableFogRenderParam(this); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
+74
-29
@@ -20,6 +20,8 @@
|
||||
package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
|
||||
import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
||||
|
||||
@@ -27,66 +29,83 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
||||
* Contains information relevant to Distant Horizons and Minecraft rendering.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-1-31
|
||||
* @version 2025-12-23
|
||||
* @since API 1.0.0
|
||||
*/
|
||||
public class DhApiRenderParam implements IDhApiEventParam
|
||||
{
|
||||
/** Indicates what render pass DH is currently rendering */
|
||||
public final EDhApiRenderPass renderPass;
|
||||
public EDhApiRenderPass renderPass;
|
||||
|
||||
/** Indicates how far into this tick the frame is. */
|
||||
public final float partialTicks;
|
||||
public float partialTicks;
|
||||
|
||||
/**
|
||||
* Indicates DH's near clip plane, measured in blocks.
|
||||
* Note: this may change based on time, player speed, and other factors.
|
||||
*/
|
||||
public final float nearClipPlane;
|
||||
public float nearClipPlane;
|
||||
/**
|
||||
* Indicates DH's far clip plane, measured in blocks.
|
||||
* Note: this may change based on time, player speed, and other factors.
|
||||
*/
|
||||
public final float farClipPlane;
|
||||
public float farClipPlane;
|
||||
|
||||
/** The projection matrix Minecraft is using to render this frame. */
|
||||
public final DhApiMat4f mcProjectionMatrix;
|
||||
public final DhApiMat4f mcProjectionMatrix = new DhApiMat4f();
|
||||
/** The model view matrix Minecraft is using to render this frame. */
|
||||
public final DhApiMat4f mcModelViewMatrix;
|
||||
public final DhApiMat4f mcModelViewMatrix = new DhApiMat4f();
|
||||
public final DhApiMat4f mcInverseMvmProjectionMatrix = new DhApiMat4f();
|
||||
|
||||
/** The projection matrix Distant Horizons is using to render this frame. */
|
||||
public final DhApiMat4f dhProjectionMatrix;
|
||||
public final DhApiMat4f dhProjectionMatrix = new DhApiMat4f();
|
||||
/** The model view matrix Distant Horizons is using to render this frame. */
|
||||
public final DhApiMat4f dhModelViewMatrix;
|
||||
public final DhApiMat4f dhModelViewMatrix = new DhApiMat4f();
|
||||
/** combination of the MVM and projection matrices */
|
||||
public final DhApiMat4f dhMvmProjMatrix = new DhApiMat4f();
|
||||
public final DhApiMat4f dhInverseMvmProjectionMatrix = new DhApiMat4f();
|
||||
|
||||
public final int worldYOffset;
|
||||
public int worldYOffset;
|
||||
|
||||
/**
|
||||
* The level currently being rendered.
|
||||
*
|
||||
* @since API 5.1.0
|
||||
*/
|
||||
public IDhApiLevelWrapper clientLevelWrapper;
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
public DhApiRenderParam() {}
|
||||
|
||||
public DhApiRenderParam(DhApiRenderParam parent)
|
||||
/** Internal DH method */
|
||||
public void update(DhApiRenderParam param)
|
||||
{
|
||||
this(
|
||||
parent.renderPass,
|
||||
parent.partialTicks,
|
||||
parent.nearClipPlane, parent.farClipPlane,
|
||||
parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
|
||||
parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
|
||||
parent.worldYOffset
|
||||
this.update(
|
||||
param.renderPass,
|
||||
param.partialTicks,
|
||||
param.nearClipPlane, param.farClipPlane,
|
||||
param.mcProjectionMatrix, param.mcModelViewMatrix,
|
||||
param.dhProjectionMatrix, param.mcModelViewMatrix,
|
||||
param.worldYOffset,
|
||||
param.clientLevelWrapper
|
||||
);
|
||||
}
|
||||
public DhApiRenderParam(
|
||||
/** Internal DH method */
|
||||
public void update(
|
||||
EDhApiRenderPass renderPass,
|
||||
float newPartialTicks,
|
||||
float nearClipPlane, float farClipPlane,
|
||||
DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix,
|
||||
DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix,
|
||||
int worldYOffset
|
||||
)
|
||||
int worldYOffset,
|
||||
IDhApiLevelWrapper clientLevelWrapper
|
||||
)
|
||||
{
|
||||
this.renderPass = renderPass;
|
||||
|
||||
@@ -95,26 +114,52 @@ public class DhApiRenderParam implements IDhApiEventParam
|
||||
this.farClipPlane = farClipPlane;
|
||||
this.nearClipPlane = nearClipPlane;
|
||||
|
||||
this.mcProjectionMatrix = newMcProjectionMatrix;
|
||||
this.mcModelViewMatrix = newMcModelViewMatrix;
|
||||
// mc matricies
|
||||
{
|
||||
this.mcProjectionMatrix.set(newMcProjectionMatrix);
|
||||
this.mcModelViewMatrix.set(newMcModelViewMatrix);
|
||||
|
||||
this.dhProjectionMatrix = newDhProjectionMatrix;
|
||||
this.dhModelViewMatrix = newDhModelViewMatrix;
|
||||
// inverse mvm Proj
|
||||
this.mcInverseMvmProjectionMatrix.set(newMcProjectionMatrix);
|
||||
this.mcInverseMvmProjectionMatrix.invert();
|
||||
}
|
||||
|
||||
// dh matricies
|
||||
{
|
||||
this.dhProjectionMatrix.set(newDhProjectionMatrix);
|
||||
this.dhModelViewMatrix.set(newDhModelViewMatrix);
|
||||
|
||||
// proj
|
||||
this.dhMvmProjMatrix.set(this.dhProjectionMatrix);
|
||||
this.dhMvmProjMatrix.multiply(this.dhModelViewMatrix);
|
||||
|
||||
// inverse mvm Proj
|
||||
this.dhInverseMvmProjectionMatrix.set(this.dhMvmProjMatrix);
|
||||
this.dhInverseMvmProjectionMatrix.invert();
|
||||
}
|
||||
|
||||
this.worldYOffset = worldYOffset;
|
||||
this.clientLevelWrapper = clientLevelWrapper;
|
||||
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public DhApiRenderParam copy()
|
||||
{
|
||||
return new DhApiRenderParam(this);
|
||||
}
|
||||
public boolean getCopyBeforeFire() { return false; }
|
||||
|
||||
@Override
|
||||
public DhApiRenderParam copy() { return this; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public class DhApiResult<T>
|
||||
|
||||
|
||||
|
||||
// these constructors are private because the create... methods below are easier to understand
|
||||
// these constructors are private because the create methods below are easier to understand
|
||||
private DhApiResult(boolean success, String message) { this(success, message, null); }
|
||||
private DhApiResult(boolean success, String message, T payload)
|
||||
{
|
||||
|
||||
@@ -31,7 +31,7 @@ import java.util.List;
|
||||
* Contains a list of {@link DhApiTerrainDataPoint} representing the blocks in a Minecraft chunk.
|
||||
*
|
||||
* @author Builderb0y, James Seibel
|
||||
* @version 2024-7-21
|
||||
* @version 2025-12-11
|
||||
* @since API 2.0.0
|
||||
*
|
||||
* @see IDhApiWrapperFactory
|
||||
@@ -54,27 +54,12 @@ public class DhApiChunk
|
||||
// constructors //
|
||||
//==============//
|
||||
|
||||
/**
|
||||
* Deprecated due to the topYBlockPos and bottomYBlockPos variables being put in the wrong order.
|
||||
* They should have been in bottom -> top order.
|
||||
*
|
||||
* @see DhApiChunk#create(int, int, int, int)
|
||||
*/
|
||||
@Deprecated
|
||||
public DhApiChunk(int chunkPosX, int chunkPosZ, int topYBlockPos, int bottomYBlockPos)
|
||||
{ this(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos, false); }
|
||||
|
||||
/**
|
||||
* @since API 3.0.0
|
||||
*/
|
||||
/** @since API 3.0.0 */
|
||||
public static DhApiChunk create(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
|
||||
{ return new DhApiChunk(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos, false); }
|
||||
{ return new DhApiChunk(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos); }
|
||||
|
||||
/**
|
||||
* Only visible to internal DH methods
|
||||
* @param ignoredParameter is only present to differentiate the two constructors and isn't actually used
|
||||
*/
|
||||
private DhApiChunk(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos, boolean ignoredParameter)
|
||||
/** Only visible to internal DH methods */
|
||||
private DhApiChunk(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
|
||||
{
|
||||
this.chunkPosX = chunkPosX;
|
||||
this.chunkPosZ = chunkPosZ;
|
||||
|
||||
+29
-31
@@ -29,7 +29,7 @@ import java.util.ArrayList;
|
||||
* Holds a single datapoint of terrain data.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-7-20
|
||||
* @version 2025-11-15
|
||||
* @since API 1.0.0
|
||||
*/
|
||||
public class DhApiTerrainDataPoint
|
||||
@@ -47,6 +47,10 @@ public class DhApiTerrainDataPoint
|
||||
|
||||
public final int blockLightLevel;
|
||||
public final int skyLightLevel;
|
||||
/**
|
||||
* An unsigned block position of the bottom vertex for this LOD relative to the level's minimum height.
|
||||
* Should be greater than or equal to 0.
|
||||
*/
|
||||
public final int bottomYBlockPos;
|
||||
public final int topYBlockPos;
|
||||
|
||||
@@ -59,28 +63,7 @@ public class DhApiTerrainDataPoint
|
||||
// constructors //
|
||||
//==============//
|
||||
|
||||
/**
|
||||
* Deprecated due to the topYBlockPos and bottomYBlockPos variables being put in the wrong order.
|
||||
* They should have been in bottom -> top order.
|
||||
*
|
||||
* @see DhApiTerrainDataPoint#create(byte, int, int, int, int, IDhApiBlockStateWrapper, IDhApiBiomeWrapper)
|
||||
*/
|
||||
@Deprecated
|
||||
public DhApiTerrainDataPoint(
|
||||
byte detailLevel,
|
||||
int blockLightLevel, int skyLightLevel,
|
||||
int topYBlockPos, int bottomYBlockPos,
|
||||
IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper)
|
||||
{
|
||||
this(detailLevel, blockLightLevel, skyLightLevel,
|
||||
bottomYBlockPos, topYBlockPos,
|
||||
blockStateWrapper, biomeWrapper,
|
||||
false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @since API 3.0.0
|
||||
*/
|
||||
/** @since API 3.0.0 */
|
||||
public static DhApiTerrainDataPoint create(
|
||||
byte detailLevel,
|
||||
int blockLightLevel, int skyLightLevel,
|
||||
@@ -91,20 +74,15 @@ public class DhApiTerrainDataPoint
|
||||
return new DhApiTerrainDataPoint(
|
||||
detailLevel, blockLightLevel, skyLightLevel,
|
||||
bottomYBlockPos, topYBlockPos,
|
||||
blockStateWrapper, biomeWrapper,
|
||||
false);
|
||||
blockStateWrapper, biomeWrapper);
|
||||
}
|
||||
|
||||
/**
|
||||
* Only visible to internal DH methods
|
||||
* @param ignoredParameter is only present to differentiate the two constructors and isn't actually used
|
||||
*/
|
||||
/** Only visible to internal DH methods */
|
||||
private DhApiTerrainDataPoint(
|
||||
byte detailLevel,
|
||||
int blockLightLevel, int skyLightLevel,
|
||||
int bottomYBlockPos, int topYBlockPos,
|
||||
IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper,
|
||||
boolean ignoredParameter
|
||||
IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper
|
||||
)
|
||||
{
|
||||
this.detailLevel = detailLevel;
|
||||
@@ -118,4 +96,24 @@ public class DhApiTerrainDataPoint
|
||||
this.biomeWrapper = biomeWrapper;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return "[Block:" + this.blockStateWrapper.getSerialString() +
|
||||
",Biome:" + this.biomeWrapper.getName() +
|
||||
",TopY:" + this.topYBlockPos +
|
||||
",BottomY:" + this.bottomYBlockPos +
|
||||
",BlockLight:" + this.blockLightLevel +
|
||||
",SkyLight:" + this.skyLightLevel +
|
||||
"]";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -21,6 +21,8 @@ package com.seibel.distanthorizons.api.objects.math;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.util.IDhApiCopyable;
|
||||
|
||||
import java.nio.FloatBuffer;
|
||||
|
||||
/**
|
||||
* An (almost) exact copy of Minecraft's 1.16.5
|
||||
* implementation of a 4x4 float matrix. <br><br>
|
||||
@@ -33,7 +35,7 @@ import com.seibel.distanthorizons.api.interfaces.util.IDhApiCopyable;
|
||||
* </code>
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-6-30
|
||||
* @version 2026-05-22
|
||||
*/
|
||||
public class DhApiMat4f implements IDhApiCopyable
|
||||
{
|
||||
@@ -62,6 +64,7 @@ public class DhApiMat4f implements IDhApiCopyable
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
public DhApiMat4f() { /* all values are 0 */ }
|
||||
|
||||
@@ -71,14 +74,17 @@ public class DhApiMat4f implements IDhApiCopyable
|
||||
this.m01 = sourceMatrix.m01;
|
||||
this.m02 = sourceMatrix.m02;
|
||||
this.m03 = sourceMatrix.m03;
|
||||
|
||||
this.m10 = sourceMatrix.m10;
|
||||
this.m11 = sourceMatrix.m11;
|
||||
this.m12 = sourceMatrix.m12;
|
||||
this.m13 = sourceMatrix.m13;
|
||||
|
||||
this.m20 = sourceMatrix.m20;
|
||||
this.m21 = sourceMatrix.m21;
|
||||
this.m22 = sourceMatrix.m22;
|
||||
this.m23 = sourceMatrix.m23;
|
||||
|
||||
this.m30 = sourceMatrix.m30;
|
||||
this.m31 = sourceMatrix.m31;
|
||||
this.m32 = sourceMatrix.m32;
|
||||
@@ -109,12 +115,74 @@ public class DhApiMat4f implements IDhApiCopyable
|
||||
this.m33 = values[15];
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// methods //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
/** Returns the values of this matrix in row major order (AKA rows then columns) */
|
||||
public float[] getValuesAsArray()
|
||||
{
|
||||
float[] array = new float[16];
|
||||
this.putValuesInArray(array);
|
||||
return array;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the values of this matrix in row major order (AKA rows then columns)
|
||||
* @since API 7.0.0
|
||||
*/
|
||||
public void putValuesInArray(float[] array)
|
||||
{
|
||||
array[0] = this.m00;
|
||||
array[1] = this.m01;
|
||||
array[2] = this.m02;
|
||||
array[3] = this.m03;
|
||||
|
||||
array[4] = this.m10;
|
||||
array[5] = this.m11;
|
||||
array[6] = this.m12;
|
||||
array[7] = this.m13;
|
||||
|
||||
array[8] = this.m20;
|
||||
array[9] = this.m21;
|
||||
array[10] = this.m22;
|
||||
array[11] = this.m23;
|
||||
|
||||
array[12] = this.m30;
|
||||
array[13] = this.m31;
|
||||
array[14] = this.m32;
|
||||
array[15] = this.m33;
|
||||
}
|
||||
|
||||
|
||||
/** @since API 7.0.0 */
|
||||
public void set(DhApiMat4f mat)
|
||||
{
|
||||
this.m00 = mat.m00;
|
||||
this.m01 = mat.m01;
|
||||
this.m02 = mat.m02;
|
||||
this.m03 = mat.m03;
|
||||
|
||||
this.m10 = mat.m10;
|
||||
this.m11 = mat.m11;
|
||||
this.m12 = mat.m12;
|
||||
this.m13 = mat.m13;
|
||||
|
||||
this.m20 = mat.m20;
|
||||
this.m21 = mat.m21;
|
||||
this.m22 = mat.m22;
|
||||
this.m23 = mat.m23;
|
||||
|
||||
this.m30 = mat.m30;
|
||||
this.m31 = mat.m31;
|
||||
this.m32 = mat.m32;
|
||||
this.m33 = mat.m33;
|
||||
}
|
||||
|
||||
public void setIdentity()
|
||||
{
|
||||
@@ -279,47 +347,14 @@ public class DhApiMat4f implements IDhApiCopyable
|
||||
this.m33 *= scalar;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// Distant Horizons //
|
||||
// methods //
|
||||
//==================//
|
||||
|
||||
private static int getArrayIndex(int xIndex, int zIndex) { return (zIndex * 4) + xIndex; }
|
||||
|
||||
/** Returns the values of this matrix in row major order (AKA rows then columns) */
|
||||
public float[] getValuesAsArray()
|
||||
{
|
||||
return new float[]{
|
||||
this.m00,
|
||||
this.m01,
|
||||
this.m02,
|
||||
this.m03,
|
||||
|
||||
this.m10,
|
||||
this.m11,
|
||||
this.m12,
|
||||
this.m13,
|
||||
|
||||
this.m20,
|
||||
this.m21,
|
||||
this.m22,
|
||||
this.m23,
|
||||
|
||||
this.m30,
|
||||
this.m31,
|
||||
this.m32,
|
||||
this.m33,
|
||||
};
|
||||
}
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj)
|
||||
@@ -388,4 +423,8 @@ public class DhApiMat4f implements IDhApiCopyable
|
||||
@Override
|
||||
public DhApiMat4f copy() { return new DhApiMat4f(this); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+1
@@ -23,6 +23,7 @@ public class DhApiRenderableBox
|
||||
public DhApiVec3d maxPos;
|
||||
|
||||
public Color color;
|
||||
/** @see EDhApiBlockMaterial */
|
||||
public byte material;
|
||||
|
||||
|
||||
|
||||
+13
-9
@@ -143,19 +143,23 @@ public class ApiEventInjector extends DependencyInjector<IDhApiEvent> implements
|
||||
|
||||
|
||||
// attempt to clone the event input if possible
|
||||
// this is done to reduce the likely hood that one event listener
|
||||
// will make change the event parameter for other listeners
|
||||
// this is done to reduce the likelihood that one event listener
|
||||
// will change the event parameter for other listeners
|
||||
T input = eventInput;
|
||||
if (eventInput instanceof IDhApiEventParam)
|
||||
{
|
||||
try
|
||||
IDhApiEventParam dhApiEventParam = (IDhApiEventParam) eventInput;
|
||||
if (dhApiEventParam.getCopyBeforeFire())
|
||||
{
|
||||
//noinspection unchecked
|
||||
input = (T) ((IDhApiEventParam) eventInput).copy();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unable to clone event parameter ["+eventInput.getClass().getSimpleName()+"], error: ["+e.getMessage()+"].", e);
|
||||
try
|
||||
{
|
||||
//noinspection unchecked
|
||||
input = (T) dhApiEventParam.copy();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unable to clone event parameter [" + eventInput.getClass().getSimpleName() + "], error: [" + e.getMessage() + "].", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+101
-19
@@ -35,7 +35,19 @@ import java.util.Map;
|
||||
*/
|
||||
public class DependencyInjector<BindableType extends IBindable> implements IDependencyInjector<BindableType> // Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
|
||||
{
|
||||
protected final Map<Class<? extends BindableType>, ArrayList<BindableType>> dependencies = new HashMap<>();
|
||||
/**
|
||||
* empty list is to reduce GC pressure slightly in the common path
|
||||
* that {@link DependencyInjector#getInternalLogic(Class, boolean)} is called
|
||||
* when nothing has been bound.
|
||||
*/
|
||||
private static final ArrayList<?> EMPTY_GET_ALL_LIST = new ArrayList<>();
|
||||
static
|
||||
{
|
||||
EMPTY_GET_ALL_LIST.add(null);
|
||||
}
|
||||
|
||||
|
||||
protected final HashMap<Class<? extends BindableType>, ArrayList<BindableType>> dependencies = new HashMap<>();
|
||||
|
||||
/** Internal class reference to BindableType since we can't get it any other way. */
|
||||
protected final Class<? extends BindableType> bindableInterface;
|
||||
@@ -43,11 +55,11 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
|
||||
protected final boolean allowDuplicateBindings;
|
||||
|
||||
|
||||
public DependencyInjector(Class<BindableType> newBindableInterface)
|
||||
{
|
||||
this.bindableInterface = newBindableInterface;
|
||||
this.allowDuplicateBindings = false;
|
||||
}
|
||||
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
public DependencyInjector(Class<BindableType> newBindableInterface, boolean newAllowDuplicateBindings)
|
||||
{
|
||||
@@ -55,18 +67,30 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
|
||||
this.allowDuplicateBindings = newAllowDuplicateBindings;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// binding //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public void bind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
|
||||
{
|
||||
// duplicate check if requested
|
||||
if (this.dependencies.containsKey(dependencyInterface) && !this.allowDuplicateBindings)
|
||||
if (this.dependencies.containsKey(dependencyInterface)
|
||||
&& !this.allowDuplicateBindings)
|
||||
{
|
||||
throw new IllegalStateException("The dependency [" + dependencyInterface.getSimpleName() + "] has already been bound.");
|
||||
}
|
||||
|
||||
if (dependencyImplementation == null)
|
||||
{
|
||||
throw new NullPointerException("Can't bind null to ["+dependencyInterface.getSimpleName()+"]");
|
||||
}
|
||||
|
||||
|
||||
// make sure the given dependency implements the necessary interfaces
|
||||
boolean implementsInterface = this.checkIfClassImplements(dependencyImplementation.getClass(), dependencyInterface) ||
|
||||
@@ -129,25 +153,84 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
|
||||
@Override
|
||||
public boolean checkIfClassExtends(Class<?> classToTest, Class<?> extensionToLookFor) { return extensionToLookFor.isAssignableFrom(classToTest); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//===========//
|
||||
// unbinding //
|
||||
//===========//
|
||||
//region
|
||||
|
||||
public void replaceBinding(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
|
||||
{
|
||||
this.unbindAll(dependencyInterface);
|
||||
this.bind(dependencyInterface, dependencyImplementation);
|
||||
}
|
||||
|
||||
public void unbindAll(Class<? extends BindableType> dependencyInterface) throws IllegalStateException, IllegalArgumentException
|
||||
{
|
||||
// remove the dependency if present
|
||||
this.dependencies.remove(dependencyInterface);
|
||||
}
|
||||
|
||||
public void unbind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
|
||||
{
|
||||
// check if this object is bound
|
||||
if (!this.dependencies.containsKey(dependencyInterface))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// make sure the given dependency implements the necessary interfaces
|
||||
boolean implementsInterface = this.checkIfClassImplements(dependencyImplementation.getClass(), dependencyInterface)
|
||||
|| this.checkIfClassExtends(dependencyImplementation.getClass(), dependencyInterface);
|
||||
boolean implementsBindable = this.checkIfClassImplements(dependencyImplementation.getClass(), this.bindableInterface);
|
||||
|
||||
// display any errors
|
||||
if (!implementsInterface)
|
||||
{
|
||||
throw new IllegalArgumentException("The dependency [" + dependencyImplementation.getClass().getSimpleName() + "] doesn't implement or extend: [" + dependencyInterface.getSimpleName() + "].");
|
||||
}
|
||||
if (!implementsBindable)
|
||||
{
|
||||
throw new IllegalArgumentException("The dependency [" + dependencyImplementation.getClass().getSimpleName() + "] doesn't implement the interface: [" + IBindable.class.getSimpleName() + "].");
|
||||
}
|
||||
|
||||
|
||||
// make sure the hashSet has an array to hold the dependency
|
||||
if (!this.dependencies.containsKey(dependencyInterface))
|
||||
{
|
||||
this.dependencies.put(dependencyInterface, new ArrayList<BindableType>());
|
||||
}
|
||||
|
||||
// remove the dependency if present
|
||||
this.dependencies.get(dependencyInterface).remove(dependencyImplementation);
|
||||
this.dependencies.remove(dependencyInterface);
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// getters //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public <T extends BindableType> T get(Class<T> interfaceClass) throws ClassCastException
|
||||
{
|
||||
return (T) this.getInternalLogic(interfaceClass, false).get(0);
|
||||
}
|
||||
{ return (T) this.getInternalLogic(interfaceClass, false).get(0); }
|
||||
|
||||
@Override
|
||||
public <T extends BindableType> ArrayList<T> getAll(Class<T> interfaceClass) throws ClassCastException
|
||||
{
|
||||
return this.getInternalLogic(interfaceClass, false);
|
||||
}
|
||||
{ return this.getInternalLogic(interfaceClass, false); }
|
||||
|
||||
@Override
|
||||
public <T extends BindableType> T get(Class<T> interfaceClass, boolean allowIncompleteDependencies) throws ClassCastException
|
||||
{
|
||||
return (T) this.getInternalLogic(interfaceClass, allowIncompleteDependencies).get(0);
|
||||
}
|
||||
{ return (T) this.getInternalLogic(interfaceClass, allowIncompleteDependencies).get(0); }
|
||||
|
||||
/**
|
||||
* Always returns a list of size 1 or greater,
|
||||
@@ -175,11 +258,10 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
|
||||
|
||||
|
||||
// return an empty list to prevent null pointers
|
||||
ArrayList<T> emptyList = new ArrayList<T>();
|
||||
emptyList.add(null);
|
||||
return emptyList;
|
||||
return (ArrayList<T>)EMPTY_GET_ALL_LIST;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
/** Removes all bound dependencies. */
|
||||
|
||||
@@ -31,26 +31,31 @@ public final class ModInfo
|
||||
public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
|
||||
|
||||
/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
|
||||
public static final int PROTOCOL_VERSION = 11;
|
||||
public static final String WRAPPER_PACKET_PATH = "message";
|
||||
public static final int PROTOCOL_VERSION = 15;
|
||||
|
||||
/**
|
||||
* The full plugin channel name (RESOURCE_NAMESPACE:WRAPPER_PACKET_PATH)
|
||||
* must be 20 characters or fewer for compatibility with MC 1.13 and older.
|
||||
*/
|
||||
public static final String WRAPPER_PACKET_PATH = "msg";
|
||||
|
||||
/** The internal mod name */
|
||||
public static final String NAME = "DistantHorizons";
|
||||
/** Human-readable version of NAME */
|
||||
public static final String READABLE_NAME = "Distant Horizons";
|
||||
public static final String VERSION = "2.3.5-b-dev";
|
||||
public static final String VERSION = "3.0.4-b-dev";
|
||||
/** Returns true if the current build is an unstable developer build, false otherwise. */
|
||||
public static final boolean IS_DEV_BUILD = VERSION.toLowerCase().contains("dev");
|
||||
|
||||
/** This version should only be updated when breaking changes are introduced to the DH API */
|
||||
public static final int API_MAJOR_VERSION = 4;
|
||||
public static final int API_MAJOR_VERSION = 7;
|
||||
/** This version should be updated whenever new methods are added to the DH API */
|
||||
public static final int API_MINOR_VERSION = 1;
|
||||
public static final int API_MINOR_VERSION = 0;
|
||||
/** This version should be updated whenever non-breaking fixes are added to the DH API */
|
||||
public static final int API_PATCH_VERSION = 0;
|
||||
|
||||
/** If the config file has an older version it'll be re-created from scratch. */
|
||||
public static final int CONFIG_FILE_VERSION = 3;
|
||||
public static final int CONFIG_FILE_VERSION = 4;
|
||||
|
||||
/** All DH owned threads should start with this string to allow for easier debugging and profiling. */
|
||||
public static final String THREAD_NAME_PREFIX = "DH-";
|
||||
|
||||
-83
@@ -1,83 +0,0 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.coreapi.interfaces.config;
|
||||
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* Use for making the config variables
|
||||
*
|
||||
* @author coolGi
|
||||
* @version 2022-5-26
|
||||
*/
|
||||
public interface IConfigEntry<T>
|
||||
{
|
||||
|
||||
/** Gets the default value of the option */
|
||||
T getDefaultValue();
|
||||
|
||||
void setApiValue(T newApiValue);
|
||||
T getApiValue();
|
||||
|
||||
/** Returns true if this config can be set via the API. */
|
||||
boolean getAllowApiOverride();
|
||||
|
||||
void set(T newValue);
|
||||
T get();
|
||||
T getTrueValue();
|
||||
|
||||
/** Sets the value without saving */
|
||||
void setWithoutSaving(T newValue);
|
||||
|
||||
/** Gets the min value */
|
||||
T getMin();
|
||||
/** Sets the min value */
|
||||
void setMin(T newMin);
|
||||
/** Gets the max value */
|
||||
T getMax();
|
||||
/** Sets the max value */
|
||||
void setMax(T newMax);
|
||||
/** Sets the min and max in 1 setter */
|
||||
void setMinMax(T newMin, T newMax);
|
||||
|
||||
/** Gets the comment */
|
||||
String getComment();
|
||||
/** Sets the comment */
|
||||
void setComment(String newComment);
|
||||
|
||||
/**
|
||||
* Checks if the option is valid
|
||||
*
|
||||
* 0 == valid
|
||||
* 2 == invalid
|
||||
* 1 == number too high
|
||||
* -1 == number too low
|
||||
*/
|
||||
byte isValid(); // TODO replace with an enum
|
||||
/** Checks if a value is valid */
|
||||
byte isValid(T value);
|
||||
|
||||
/** Is the value of this equal to another */
|
||||
boolean equals(IConfigEntry<?> obj);
|
||||
|
||||
void addValueChangeListener(Consumer<T> onValueChangeFunc);
|
||||
|
||||
}
|
||||
+11
-1
@@ -17,7 +17,7 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.core.util;
|
||||
package com.seibel.distanthorizons.coreapi.util;
|
||||
|
||||
import java.awt.*;
|
||||
|
||||
@@ -89,6 +89,16 @@ public class ColorUtil
|
||||
/** @param newBlue should be a value between 0 and 255 */
|
||||
public static int setBlue(int color, int newBlue) { return (getAlpha(color) << 24) | (getRed(color) << 16) | (getGreen(color) << 8) | newBlue; }
|
||||
|
||||
/** @throws IllegalArgumentException if the given int value is out of the range 0 - 255 (exclusive) */
|
||||
public static void throwIfColorValueOutOfIntRange(String colorName, int value) throws IllegalArgumentException
|
||||
{
|
||||
if (value < 0
|
||||
|| value > 255)
|
||||
{
|
||||
throw new IllegalArgumentException("["+colorName+"] with the value ["+value+"] is out of the expected range 0 - 255 (exclusive).");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static int applyShade(int color, int shade)
|
||||
+44
-30
@@ -1,18 +1,23 @@
|
||||
plugins {
|
||||
id "java"
|
||||
id "com.github.johnrengelman.shadow" version '8.1.1' apply false // Set this to true if you're using the standalone Core project
|
||||
id "com.gradleup.shadow"
|
||||
}
|
||||
|
||||
apply plugin: "application"
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url "https://repo.enonic.com/public/" }
|
||||
}
|
||||
|
||||
application {
|
||||
mainClass.set("com.seibel.distanthorizons.core.jar.JarMain")
|
||||
tasks.withType(JavaCompile).configureEach {
|
||||
options.release = 8
|
||||
options.encoding = "UTF-8"
|
||||
}
|
||||
|
||||
configurations {
|
||||
shadowedArtifact // Used by DH to specify that we want to implement the shadowed core JAR file instead of the regular JAR file
|
||||
shade
|
||||
implementation.extendsFrom shade
|
||||
testImplementation.extendsFrom compileOnly
|
||||
}
|
||||
|
||||
OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
|
||||
@@ -20,36 +25,45 @@ OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePl
|
||||
// Set the OS lwjgl is using to the current os
|
||||
project.ext.lwjglNatives = "natives-" + os.toFamilyName()
|
||||
|
||||
dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
|
||||
// Imports most of lwjgl's libraries (well, only the ones that we need)
|
||||
implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions
|
||||
dependencies {
|
||||
// API project dependency
|
||||
implementation project(":api")
|
||||
|
||||
// REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use
|
||||
implementation "org.lwjgl:lwjgl"
|
||||
implementation "org.lwjgl:lwjgl-assimp"
|
||||
implementation "org.lwjgl:lwjgl-glfw"
|
||||
implementation "org.lwjgl:lwjgl-openal"
|
||||
implementation "org.lwjgl:lwjgl-opengl"
|
||||
implementation "org.lwjgl:lwjgl-stb"
|
||||
implementation "org.lwjgl:lwjgl-tinyfd"
|
||||
runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
|
||||
runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
|
||||
runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
|
||||
runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
|
||||
runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
|
||||
runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
|
||||
runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
|
||||
// MC-provided libraries (available at runtime via Minecraft)
|
||||
compileOnly platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
|
||||
compileOnly "org.lwjgl:lwjgl"
|
||||
compileOnly "org.lwjgl:lwjgl-assimp"
|
||||
compileOnly "org.lwjgl:lwjgl-glfw"
|
||||
compileOnly "org.lwjgl:lwjgl-stb"
|
||||
compileOnly "org.lwjgl:lwjgl-tinyfd"
|
||||
testRuntimeOnly platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
|
||||
testRuntimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
|
||||
testRuntimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
|
||||
testRuntimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
|
||||
testRuntimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
|
||||
testRuntimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
|
||||
|
||||
// FIXME for some reason this line doesn't actually shade in the library
|
||||
// shade "it.unimi.dsi:fastutil:${rootProject.fastutil_version}" // Add our own fastutil version
|
||||
compileOnly("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
|
||||
compileOnly("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
|
||||
compileOnly("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
|
||||
compileOnly("org.joml:joml:${rootProject.joml_version}")
|
||||
compileOnly("io.netty:netty-buffer:${rootProject.netty_version}")
|
||||
compileOnly("org.jetbrains:annotations:16.0.2")
|
||||
compileOnly("com.google.code.findbugs:jsr305:3.0.2")
|
||||
compileOnly("com.google.guava:guava:31.1-jre")
|
||||
|
||||
// DH's bundled libraries (shadowed + relocated in loader jars)
|
||||
implementation("com.github.luben:zstd-jni:${rootProject.zstd_version}")
|
||||
implementation("org.lz4:lz4-java:${rootProject.lz4_version}")
|
||||
implementation("org.tukaani:xz:${rootProject.xz_version}")
|
||||
implementation("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
|
||||
implementation("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
|
||||
implementation("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
|
||||
|
||||
// Some other dependencies
|
||||
implementation("org.jetbrains:annotations:16.0.2")
|
||||
implementation("com.google.code.findbugs:jsr305:3.0.2")
|
||||
implementation("com.google.common:google-collect:0.5")
|
||||
implementation("com.google.guava:guava:31.1-jre")
|
||||
|
||||
// JUnit (core tests only)
|
||||
compileOnly("junit:junit:4.13")
|
||||
compileOnly("org.junit.jupiter:junit-jupiter:5.8.2")
|
||||
compileOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
|
||||
}
|
||||
|
||||
artifacts {
|
||||
|
||||
@@ -19,43 +19,69 @@
|
||||
|
||||
package com.seibel.distanthorizons.core;
|
||||
|
||||
import com.github.luben.zstd.ZstdOutputStream;
|
||||
import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderObjectFactory;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
|
||||
import com.seibel.distanthorizons.core.api.internal.ClientApi;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
|
||||
import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||
import com.seibel.distanthorizons.core.world.DhApiWorldProxy;
|
||||
import com.seibel.distanthorizons.core.api.external.methods.config.DhApiConfig;
|
||||
import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo;
|
||||
import com.seibel.distanthorizons.api.DhApi;
|
||||
import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import net.jpountz.lz4.LZ4FrameOutputStream;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import org.sqlite.SQLiteJDBCLoader;
|
||||
import org.sqlite.util.OSInfo;
|
||||
import org.tukaani.xz.XZOutputStream;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.File;
|
||||
import java.lang.management.GarbageCollectorMXBean;
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.util.List;
|
||||
|
||||
/** Handles first time Core setup. */
|
||||
public class Initializer
|
||||
{
|
||||
private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME + "-" + Initializer.class.getSimpleName());
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||
|
||||
|
||||
public static void init()
|
||||
|
||||
public static void preConfigInit()
|
||||
{
|
||||
//============================//
|
||||
// check referenced libraries //
|
||||
//============================//
|
||||
//region
|
||||
|
||||
LOGGER.info("Running library validation...");
|
||||
|
||||
// confirm that all referenced libraries are available to use
|
||||
try
|
||||
{
|
||||
// if any library isn't present in the jar its class
|
||||
// will throw an error (not an exception)
|
||||
Class<?> fastCompressor = LZ4FrameOutputStream.class;
|
||||
Class<?> smallCompressor = XZOutputStream.class;
|
||||
Class<?> lz4Compressor = LZ4FrameOutputStream.class;
|
||||
Class<?> zstdCompressor = ZstdOutputStream.class;
|
||||
|
||||
{
|
||||
byte[] testCompressByteArray = new byte[1024];
|
||||
for (int i = 0; i < testCompressByteArray.length; i++)
|
||||
{
|
||||
testCompressByteArray[i] = (byte) (i % 126);
|
||||
}
|
||||
byte[] compressedBytes = com.github.luben.zstd.Zstd.compress(testCompressByteArray);
|
||||
com.github.luben.zstd.Zstd.decompress(compressedBytes);
|
||||
}
|
||||
|
||||
Class<?> lzmaCompressor = XZOutputStream.class;
|
||||
//Class<?> networking = ByteBuf.class;
|
||||
Class<?> config = com.electronwill.nightconfig.core.Config.class;
|
||||
Class<?> oldFastUtil = it.unimi.dsi.fastutil.longs.LongArrayList.class; // available in 8.2.1
|
||||
@@ -63,30 +89,6 @@ public class Initializer
|
||||
Class<?> sqliteJava = org.sqlite.SQLiteConnection.class;
|
||||
Class<?> sqliteNative = org.sqlite.core.NativeDB.class;
|
||||
|
||||
//// maybe these lines are needed to shade SQLite, James isn't sure.
|
||||
//// Although they never seemed to fail, which is a bit odd.
|
||||
//try
|
||||
//{
|
||||
// // needed by Forge to load the Java database connection
|
||||
// Class.forName("org.sqlite.JDBC");
|
||||
// LOGGER.info("loaded normal SQLITE");
|
||||
//}
|
||||
//catch (ClassNotFoundException e)
|
||||
//{
|
||||
// LOGGER.warn("normal: " + e.getMessage(), e);
|
||||
//}
|
||||
//
|
||||
//try
|
||||
//{
|
||||
// // needed by Forge to load the Java database connection
|
||||
// Class.forName("DistantHorizons.libraries.sqlite.JDBC");
|
||||
// LOGGER.info("loaded shaded SQLITE");
|
||||
//}
|
||||
//catch (ClassNotFoundException e)
|
||||
//{
|
||||
// LOGGER.warn("shaded: " + e.getMessage(), e);
|
||||
//}
|
||||
|
||||
boolean sqliteLoaded = SQLiteJDBCLoader.initialize();
|
||||
if (!sqliteLoaded)
|
||||
{
|
||||
@@ -95,12 +97,18 @@ public class Initializer
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: [" + e.getMessage() + "].", e);
|
||||
// throwing here should crash the game, notifying the developer that something is wrong
|
||||
throw new RuntimeException(e);
|
||||
MC_CLIENT.crashMinecraft("Distant Horizons critical setup error: One or more libraries are either in-accessible, corrupted, or overwritten by another mod. Error: [" + e.getMessage() + "].", e);
|
||||
}
|
||||
|
||||
// confirm the resource directory is present
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==========================//
|
||||
// check resource directory //
|
||||
//==========================//
|
||||
//region
|
||||
|
||||
try
|
||||
{
|
||||
int scriptCount = DatabaseUpdater.getAutoUpdateScriptCount();
|
||||
@@ -111,10 +119,18 @@ public class Initializer
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.fatal("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].");
|
||||
throw new RuntimeException(e);
|
||||
MC_CLIENT.crashMinecraft("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].", e);
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//===========================//
|
||||
// Java AWT Headless setting //
|
||||
//===========================//
|
||||
//region
|
||||
|
||||
// This code has been disabled since it can cause Mac
|
||||
// to lock up and refuse the load (there's a bug with Java.awt texture loading)
|
||||
//if (MC_CLIENT != null)
|
||||
@@ -131,18 +147,103 @@ public class Initializer
|
||||
// }
|
||||
//}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//===================//
|
||||
// API delayed setup //
|
||||
//===================//
|
||||
//region
|
||||
|
||||
// link Core's config to the API
|
||||
DhApi.Delayed.configs = DhApiConfig.INSTANCE;
|
||||
DhApi.Delayed.terrainRepo = DhApiTerrainDataRepo.INSTANCE;
|
||||
DhApi.Delayed.worldProxy = DhApiWorldProxy.INSTANCE;
|
||||
DhApi.Delayed.renderProxy = DhApiRenderProxy.INSTANCE;
|
||||
DhApi.Delayed.customRenderObjectFactory = GenericRenderObjectFactory.INSTANCE;
|
||||
DhApi.Delayed.wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
||||
if (DhApi.Delayed.wrapperFactory == null)
|
||||
{
|
||||
LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
|
||||
MC_CLIENT.crashMinecraft("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
|
||||
}
|
||||
|
||||
DhApi.Delayed.customRenderObjectFactory = SingletonInjector.INSTANCE.get(IDhApiCustomRenderObjectFactory.class);
|
||||
if (DhApi.Delayed.customRenderObjectFactory == null)
|
||||
{
|
||||
MC_CLIENT.crashMinecraft("Programmer Error: No ["+IDhApiCustomRenderObjectFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
|
||||
}
|
||||
|
||||
DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
|
||||
|
||||
//endregion
|
||||
|
||||
}
|
||||
|
||||
/** fired after DH's config has been set up */
|
||||
public static void postConfigInit()
|
||||
{
|
||||
|
||||
|
||||
//==============================//
|
||||
// G1 Garbage collector warning //
|
||||
//==============================//
|
||||
//region
|
||||
|
||||
// log a warning if G1GC is being used
|
||||
// (this garbage collector is known to cause stuttering)
|
||||
{
|
||||
boolean g1GcInUse = false;
|
||||
|
||||
StringBuilder garbageCollectorNames = new StringBuilder();
|
||||
List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans();
|
||||
for (GarbageCollectorMXBean gcMxBean : gcMxBeans)
|
||||
{
|
||||
if (!garbageCollectorNames.toString().isEmpty())
|
||||
{
|
||||
garbageCollectorNames.append(", ");
|
||||
}
|
||||
garbageCollectorNames.append(gcMxBean.getName());
|
||||
|
||||
// "G1 Young Generation" // "G1 Concurrent GC" // "G1 Old Generation"
|
||||
if (gcMxBean.getName().toLowerCase().contains("g1 "))
|
||||
{
|
||||
g1GcInUse = true;
|
||||
}
|
||||
}
|
||||
LOGGER.info("Garbage collectors: ["+garbageCollectorNames+"]");
|
||||
|
||||
|
||||
if (g1GcInUse)
|
||||
{
|
||||
String warningMessageHeader = "Distant Horizons: G1 Garbage collector detected.";
|
||||
String warningMessageBody =
|
||||
"This can cause FPS stuttering. \n" +
|
||||
"It's recommended to use a concurrent garbage collector \n" +
|
||||
"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) \n" +
|
||||
"for a smoother experience."
|
||||
;
|
||||
|
||||
if (Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
|
||||
{
|
||||
LOGGER.warn(
|
||||
warningMessageHeader + "\n" +
|
||||
warningMessageBody +
|
||||
"");
|
||||
}
|
||||
|
||||
if (Config.Common.Logging.Warning.showGarbageCollectorWarning.get())
|
||||
{
|
||||
ClientApi.INSTANCE.showChatMessageNextFrame(
|
||||
MinecraftTextFormat.ORANGE + warningMessageHeader + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
|
||||
warningMessageBody +
|
||||
"");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
+2
-26
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiAmbientOcclusionConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
|
||||
@@ -35,30 +35,6 @@ public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Boolean> enabled()
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Ssao.enableSsao); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Integer> sampleCount()
|
||||
{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Ssao.sampleCount); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> radius()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.radius); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> strength()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.strength); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> bias()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.bias); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> minLight()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.minLight); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Integer> blurRadius()
|
||||
{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Ssao.blurRadius); }
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.enableSsao); }
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiDebuggingConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
|
||||
|
||||
@@ -34,7 +34,7 @@ public class DhApiDebuggingConfig implements IDhApiDebuggingConfig
|
||||
|
||||
|
||||
public IDhApiConfigValue<EDhApiDebugRendering> debugRendering()
|
||||
{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRendering); }
|
||||
{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRenderingColors); }
|
||||
|
||||
public IDhApiConfigValue<Boolean> debugKeybindings()
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Debugging.enableDebugKeybindings); }
|
||||
|
||||
+11
-11
@@ -22,7 +22,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
public class DhApiFarFogConfig implements IDhApiFarFogConfig
|
||||
@@ -34,27 +34,27 @@ public class DhApiFarFogConfig implements IDhApiFarFogConfig
|
||||
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> farFogStartDistance()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogStart); }
|
||||
public IDhApiConfigValue<Float> farFogStartDistance()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogStart); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> farFogEndDistance()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogEnd); }
|
||||
public IDhApiConfigValue<Float> farFogEndDistance()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogEnd); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> farFogMinThickness()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogMin); }
|
||||
public IDhApiConfigValue<Float> farFogMinThickness()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogMin); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> farFogMaxThickness()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogMax); }
|
||||
public IDhApiConfigValue<Float> farFogMaxThickness()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogMax); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<EDhApiFogFalloff> farFogFalloff()
|
||||
{ return new DhApiConfigValue<EDhApiFogFalloff, EDhApiFogFalloff>(Config.Client.Advanced.Graphics.Fog.farFogFalloff); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> farFogDensity()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogDensity); }
|
||||
public IDhApiConfigValue<Float> farFogDensity()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogDensity); }
|
||||
|
||||
}
|
||||
|
||||
+4
-3
@@ -25,9 +25,10 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.coreapi.util.converters.ApiFogDrawModeConverter;
|
||||
import com.seibel.distanthorizons.core.config.api.converters.ApiFogDrawModeConverter;
|
||||
import com.seibel.distanthorizons.core.config.api.converters.InvertedBoolConverter;
|
||||
|
||||
public class DhApiFogConfig implements IDhApiFogConfig
|
||||
{
|
||||
@@ -67,7 +68,7 @@ public class DhApiFogConfig implements IDhApiFogConfig
|
||||
@Override
|
||||
@Deprecated
|
||||
public IDhApiConfigValue<Boolean> disableVanillaFog()
|
||||
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.disableVanillaFog); }
|
||||
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog, new InvertedBoolConverter()); }
|
||||
@Override
|
||||
public IDhApiConfigValue<Boolean> enableVanillaFog()
|
||||
{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog); }
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiGenericRenderingConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
public class DhApiGenericRenderingConfig implements IDhApiGenericRenderingConfig
|
||||
|
||||
+17
-18
@@ -23,10 +23,10 @@ import com.seibel.distanthorizons.api.enums.config.*;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.*;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.coreapi.util.converters.RenderModeEnabledConverter;
|
||||
import com.seibel.distanthorizons.core.config.api.converters.RenderModeEnabledConverter;
|
||||
|
||||
public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||
{
|
||||
@@ -85,22 +85,25 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||
public IDhApiConfigValue<EDhApiHorizontalQuality> horizontalQuality()
|
||||
{ return new DhApiConfigValue<EDhApiHorizontalQuality, EDhApiHorizontalQuality>(Config.Client.Advanced.Graphics.Quality.horizontalQuality); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Boolean> useCameraPositionForQualityDropOff()
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.useCameraPositionForQualityDropOff); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<EDhApiTransparency> transparency()
|
||||
{ return new DhApiConfigValue<EDhApiTransparency, EDhApiTransparency>(Config.Client.Advanced.Graphics.Quality.transparency); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<EDhApiBlocksToAvoid> blocksToAvoid()
|
||||
{ return new DhApiConfigValue<EDhApiBlocksToAvoid, EDhApiBlocksToAvoid>(Config.Client.Advanced.Graphics.Quality.blocksToIgnore); }
|
||||
{ return new DhApiConfigValue<EDhApiBlocksToAvoid, EDhApiBlocksToAvoid>(Config.Client.Advanced.Graphics.Culling.blocksToIgnore); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Boolean> tintWithAvoidedBlocks()
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); }
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Culling.tintWithAvoidedBlocks); }
|
||||
|
||||
// TODO re-implement
|
||||
// @Override
|
||||
// public IDhApiConfigValue<Integer> getBiomeBlending()
|
||||
// { return new DhApiConfigValue<Integer, Integer>(Quality.lodBiomeBlending); }
|
||||
@Override
|
||||
public IDhApiConfigValue<Integer> getBiomeBlending()
|
||||
{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending); }
|
||||
|
||||
|
||||
|
||||
@@ -109,16 +112,16 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||
//===========================//
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> overdrawPreventionRadius()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); }
|
||||
public IDhApiConfigValue<Float> overdrawPreventionRadius()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> brightnessMultiplier()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); }
|
||||
public IDhApiConfigValue<Float> brightnessMultiplier()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> saturationMultiplier()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); }
|
||||
public IDhApiConfigValue<Float> saturationMultiplier()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Boolean> caveCullingEnabled()
|
||||
@@ -136,10 +139,6 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||
public IDhApiConfigValue<Boolean> lodOnlyMode()
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Debugging.lodOnlyMode); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> lodBias()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.lodBias); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<EDhApiLodShading> lodShading()
|
||||
{ return new DhApiConfigValue<EDhApiLodShading, EDhApiLodShading>(Config.Client.Advanced.Graphics.Quality.lodShading); }
|
||||
|
||||
+13
-13
@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
public class DhApiHeightFogConfig implements IDhApiHeightFogConfig
|
||||
@@ -44,31 +44,31 @@ public class DhApiHeightFogConfig implements IDhApiHeightFogConfig
|
||||
{ return new DhApiConfigValue<EDhApiHeightFogDirection, EDhApiHeightFogDirection>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDirection); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> heightFogBaseHeight()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); }
|
||||
public IDhApiConfigValue<Float> heightFogBaseHeight()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> heightFogStartingHeightPercent()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); }
|
||||
public IDhApiConfigValue<Float> heightFogStartingHeightPercent()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> heightFogEndingHeightPercent()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); }
|
||||
public IDhApiConfigValue<Float> heightFogEndingHeightPercent()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> heightFogMinThickness()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); }
|
||||
public IDhApiConfigValue<Float> heightFogMinThickness()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> heightFogMaxThickness()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); }
|
||||
public IDhApiConfigValue<Float> heightFogMaxThickness()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<EDhApiFogFalloff> heightFogFalloff()
|
||||
{ return new DhApiConfigValue<EDhApiFogFalloff, EDhApiFogFalloff>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogFalloff); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> heightFogDensity()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); }
|
||||
public IDhApiConfigValue<Float> heightFogDensity()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); }
|
||||
|
||||
}
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiThreadingConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiplayerConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiServerFolderNameMode;
|
||||
|
||||
|
||||
+3
-3
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiNoiseTextureConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig
|
||||
@@ -41,8 +41,8 @@ public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig
|
||||
{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Double> noiseIntensity()
|
||||
{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); }
|
||||
public IDhApiConfigValue<Float> noiseIntensity()
|
||||
{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Integer> noiseDropoff()
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.common;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
|
||||
|
||||
+25
-4
@@ -2,10 +2,10 @@ package com.seibel.distanthorizons.core.api.external.methods.data;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.data.IDhApiTerrainDataCache;
|
||||
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap;
|
||||
import it.unimi.dsi.fastutil.longs.LongSet;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.lang.ref.SoftReference;
|
||||
@@ -13,15 +13,16 @@ import java.lang.ref.SoftReference;
|
||||
public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
|
||||
{
|
||||
private final Object modificationLock = new Object();
|
||||
private Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
|
||||
private final Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataCache.class.getSimpleName());
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// internal methods //
|
||||
//==================//
|
||||
//region
|
||||
|
||||
public void add(long pos, FullDataSourceV2 dataSource)
|
||||
{
|
||||
@@ -48,11 +49,14 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
|
||||
}
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// API methods //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public void clear()
|
||||
@@ -82,6 +86,23 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
|
||||
}
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// base overrides //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public void close() { this.clear(); }
|
||||
|
||||
@Override
|
||||
public String toString() { return "Size: " + this.posToFullDataRef.size(); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+102
-61
@@ -31,25 +31,25 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
|
||||
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||
import com.seibel.distanthorizons.core.pos.DhLodPos;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
||||
import com.seibel.distanthorizons.core.pos.DhSectionPos;
|
||||
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
|
||||
import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
|
||||
import com.seibel.distanthorizons.core.util.DhApiTerrainDataPointUtil;
|
||||
import com.seibel.distanthorizons.core.util.FullDataPointUtil;
|
||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||
import com.seibel.distanthorizons.core.util.RayCastUtil;
|
||||
import com.seibel.distanthorizons.core.util.math.Vec3f;
|
||||
import com.seibel.distanthorizons.core.util.math.DhVec3f;
|
||||
import com.seibel.distanthorizons.core.world.AbstractDhWorld;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
|
||||
import com.seibel.distanthorizons.core.util.math.Vec3d;
|
||||
import com.seibel.distanthorizons.core.util.math.Vec3i;
|
||||
import com.seibel.distanthorizons.core.util.math.DhVec3d;
|
||||
import com.seibel.distanthorizons.core.util.math.DhVec3i;
|
||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.awt.*;
|
||||
@@ -64,55 +64,64 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
{
|
||||
public static DhApiTerrainDataRepo INSTANCE = new DhApiTerrainDataRepo();
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataRepo.class.getSimpleName());
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
private static final AbstractDebugWireframeRenderer DEBUG_RENDERER = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
|
||||
|
||||
// debugging values
|
||||
private static volatile boolean debugThreadRunning = false;
|
||||
private static DhApiTerrainDataCache debugDataCache = new DhApiTerrainDataCache();
|
||||
private static DhApiVec3i currentDebugVec3i = new Vec3i();
|
||||
private static DhApiVec3i currentDebugVec3i = new DhVec3i();
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
private DhApiTerrainDataRepo()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// Getter Methods //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, @Nullable IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, dataCache); }
|
||||
public DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataAtBlockYPos(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, dataCache); }
|
||||
@Override
|
||||
public DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, @Nullable IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, dataCache); }
|
||||
public DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataColumnArray(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, dataCache); }
|
||||
|
||||
@Override
|
||||
public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, @Nullable IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(LodUtil.CHUNK_DETAIL_LEVEL, chunkPosX, chunkPosZ), dataCache); }
|
||||
public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(LodUtil.CHUNK_DETAIL_LEVEL, chunkPosX, chunkPosZ), dataCache); }
|
||||
|
||||
@Override
|
||||
public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, @Nullable IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ), dataCache); }
|
||||
public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ), dataCache); }
|
||||
|
||||
@Override
|
||||
public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ, @Nullable IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(detailLevel, posX, posZ), dataCache); }
|
||||
public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ, IDhApiTerrainDataCache dataCache)
|
||||
{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(detailLevel, posX, posZ), dataCache); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
// private getters //
|
||||
//region
|
||||
|
||||
/** Returns a single API terrain datapoint that contains the given Y block position */
|
||||
private static DhApiResult<DhApiTerrainDataPoint> getTerrainDataAtBlockYPos(IDhApiLevelWrapper levelWrapper, DhLodPos requestedColumnPos, Integer blockYPos, @Nullable IDhApiTerrainDataCache dataCache)
|
||||
private static DhApiResult<DhApiTerrainDataPoint> getTerrainDataAtBlockYPos(IDhApiLevelWrapper levelWrapper, long requestedColumnPos, Integer blockYPos, IDhApiTerrainDataCache dataCache)
|
||||
{
|
||||
DhApiResult<DhApiTerrainDataPoint[]> result = getTerrainDataColumnArray(levelWrapper, requestedColumnPos, blockYPos, dataCache);
|
||||
if (result.success && result.payload.length > 0)
|
||||
@@ -126,7 +135,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all the block columns represented by the given {@link DhLodPos}. <br>
|
||||
* Returns all the block columns represented by the given {@link DhSectionPos}. <br>
|
||||
* IE, A position with the detail level: <br>
|
||||
* 0 (block): will return a 1x1 matrix of data. (don't do this, we have a specific method for that.) <br>
|
||||
* 1 (2 blocks): will return a 2x2 matrix of data. <br>
|
||||
@@ -135,11 +144,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
* will stop and return the in progress data if any errors are encountered.
|
||||
*/
|
||||
private static DhApiResult<DhApiTerrainDataPoint[][][]> getTerrainDataOverAreaForPositionDetailLevel(
|
||||
IDhApiLevelWrapper levelWrapper, DhLodPos requestedAreaPos,
|
||||
@Nullable IDhApiTerrainDataCache dataCache)
|
||||
IDhApiLevelWrapper levelWrapper, long requestedAreaPos,
|
||||
IDhApiTerrainDataCache dataCache)
|
||||
{
|
||||
DhLodPos startingBlockPos = requestedAreaPos.getCornerLodPos(LodUtil.BLOCK_DETAIL_LEVEL);
|
||||
int widthOfAreaInBlocks = BitShiftUtil.powerOfTwo(requestedAreaPos.detailLevel);
|
||||
byte requestedDetailLevel = DhSectionPos.getDetailLevel(requestedAreaPos);
|
||||
long startingBlockPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL,
|
||||
DhSectionPos.getX(requestedAreaPos) * BitShiftUtil.powerOfTwo(requestedDetailLevel - LodUtil.BLOCK_DETAIL_LEVEL),
|
||||
DhSectionPos.getZ(requestedAreaPos) * BitShiftUtil.powerOfTwo(requestedDetailLevel - LodUtil.BLOCK_DETAIL_LEVEL));
|
||||
int widthOfAreaInBlocks = BitShiftUtil.powerOfTwo(requestedDetailLevel);
|
||||
|
||||
DhApiTerrainDataPoint[][][] returnArray = new DhApiTerrainDataPoint[widthOfAreaInBlocks][widthOfAreaInBlocks][];
|
||||
int dataColumnsReturned = 0;
|
||||
@@ -149,7 +161,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
{
|
||||
for (int z = 0; z < widthOfAreaInBlocks; z++)
|
||||
{
|
||||
DhLodPos blockColumnPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, startingBlockPos.x + x, startingBlockPos.z + z);
|
||||
long blockColumnPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, DhSectionPos.getX(startingBlockPos) + x, DhSectionPos.getZ(startingBlockPos) + z);
|
||||
DhApiResult<DhApiTerrainDataPoint[]> result = getTerrainDataColumnArray(levelWrapper, blockColumnPos, null, dataCache);
|
||||
if (result.success)
|
||||
{
|
||||
@@ -175,8 +187,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
*/
|
||||
private static DhApiResult<DhApiTerrainDataPoint[]> getTerrainDataColumnArray(
|
||||
IDhApiLevelWrapper levelWrapper,
|
||||
DhLodPos requestedColumnPos, Integer nullableBlockYPos,
|
||||
@Nullable IDhApiTerrainDataCache apiDataCache)
|
||||
long requestedColumnPos, Integer nullableBlockYPos,
|
||||
IDhApiTerrainDataCache apiDataCache)
|
||||
{
|
||||
//============//
|
||||
// validation //
|
||||
@@ -197,9 +209,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
|
||||
|
||||
|
||||
// the data cache can be null, but must be our own implementation
|
||||
if (apiDataCache != null
|
||||
&& !(apiDataCache instanceof DhApiTerrainDataCache))
|
||||
// require a data cache to prevent horrible performance (especially on ray-casts)
|
||||
if (apiDataCache == null)
|
||||
{
|
||||
return DhApiResult.createFail("Missing [" + IDhApiTerrainDataCache.class.getSimpleName() + "], if a cache isn't provided your repo operations will be significantly slower.");
|
||||
}
|
||||
|
||||
// the data cache must be our own implementation
|
||||
if (!(apiDataCache instanceof DhApiTerrainDataCache))
|
||||
{
|
||||
return DhApiResult.createFail("Unsupported [" + IDhApiTerrainDataCache.class.getSimpleName() + "] implementation, only the core class [" + DhApiTerrainDataCache.class.getSimpleName() + "] is a valid parameter.");
|
||||
}
|
||||
@@ -213,12 +230,12 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
}
|
||||
|
||||
// get the detail levels for this request
|
||||
byte requestedDetailLevel = requestedColumnPos.detailLevel;
|
||||
byte requestedDetailLevel = DhSectionPos.getDetailLevel(requestedColumnPos);
|
||||
byte sectionDetailLevel = (byte) (requestedDetailLevel + DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
|
||||
|
||||
// get the positions for this request
|
||||
long sectionPos = requestedColumnPos.getSectionPosWithSectionDetailLevel(sectionDetailLevel);
|
||||
DhLodPos relativePos = requestedColumnPos.getDhSectionRelativePositionForDetailLevel();
|
||||
long sectionPos = DhSectionPos.convertToDetailLevel(requestedColumnPos, sectionDetailLevel);
|
||||
long relativePos = DhSectionPos.getDhSectionRelativePositionForDetailLevel(requestedColumnPos, DhSectionPos.getDetailLevel(requestedColumnPos));
|
||||
|
||||
|
||||
|
||||
@@ -258,7 +275,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
//===============================//
|
||||
|
||||
FullDataPointIdMap mapping = dataSource.mapping;
|
||||
LongArrayList dataColumn = dataSource.get(relativePos.x, relativePos.z);
|
||||
LongArrayList dataColumn = dataSource.getColumnAtRelPos(DhSectionPos.getX(relativePos), DhSectionPos.getZ(relativePos));
|
||||
if (dataColumn != null)
|
||||
{
|
||||
int dataColumnIndexCount = dataColumn.size();
|
||||
@@ -277,7 +294,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
if (!getSpecificYCoordinate)
|
||||
{
|
||||
// if we aren't look for a specific datapoint, add each datapoint to the return array
|
||||
returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
|
||||
returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -294,7 +311,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
if (bottomY <= requestedY && requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
|
||||
{
|
||||
// this datapoint contains the requested block position, return it
|
||||
DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
|
||||
DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
|
||||
return DhApiResult.createSuccess(new DhApiTerrainDataPoint[]{apiTerrainData});
|
||||
}
|
||||
}
|
||||
@@ -330,11 +347,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
}
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//====================//
|
||||
// raycasting methods //
|
||||
//====================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public DhApiResult<DhApiRaycastResult> raycast(
|
||||
@@ -345,7 +365,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
@Nullable
|
||||
IDhApiTerrainDataCache dataCache)
|
||||
{
|
||||
return this.raycastLodData(levelWrapper, new Vec3d(rayOriginX, rayOriginY, rayOriginZ), new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), maxRayBlockLength, dataCache);
|
||||
return this.raycastLodData(levelWrapper,
|
||||
new DhVec3d(rayOriginX, rayOriginY, rayOriginZ),
|
||||
new DhVec3f(rayDirectionX, rayDirectionY, rayDirectionZ),
|
||||
maxRayBlockLength, dataCache);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -356,15 +379,15 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
*/
|
||||
private DhApiResult<DhApiRaycastResult> raycastLodData(
|
||||
IDhApiLevelWrapper levelWrapper,
|
||||
Vec3d rayOrigin, Vec3f rayDirection,
|
||||
DhVec3d rayOrigin, DhVec3f rayDirection,
|
||||
int maxRayBlockLength,
|
||||
@Nullable
|
||||
IDhApiTerrainDataCache dataCache)
|
||||
{
|
||||
rayDirection.normalize();
|
||||
|
||||
int minBlockHeight = levelWrapper.getMinHeight();
|
||||
int maxBlockHeight = levelWrapper.getMaxHeight();
|
||||
int minLevelBlockHeight = levelWrapper.getMinHeight();
|
||||
int maxLevelBlockHeight = levelWrapper.getMaxHeight();
|
||||
|
||||
|
||||
|
||||
@@ -373,19 +396,20 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
int currentLength = 0;
|
||||
|
||||
// the exact position of this step
|
||||
Vec3d exactPos = new Vec3d(rayOrigin.x, rayOrigin.y, rayOrigin.z);
|
||||
DhVec3d exactPos = new DhVec3d(rayOrigin.x, rayOrigin.y, rayOrigin.z);
|
||||
// the block position for this step
|
||||
Vec3i blockPos = new Vec3i((int) Math.round(rayOrigin.x), (int) Math.round(rayOrigin.y), (int) Math.round(rayOrigin.z));
|
||||
DhVec3i blockPos = new DhVec3i((int) Math.round(rayOrigin.x), (int) Math.round(rayOrigin.y), (int) Math.round(rayOrigin.z));
|
||||
|
||||
DhApiRaycastResult closetFoundDataPoint = null;
|
||||
|
||||
|
||||
while (blockPos.y >= minBlockHeight && blockPos.y < maxBlockHeight
|
||||
while (blockPos.y >= minLevelBlockHeight
|
||||
&& blockPos.y < maxLevelBlockHeight
|
||||
&& currentLength <= maxRayBlockLength)
|
||||
{
|
||||
// get the LOD columns around this position
|
||||
ArrayList<Vec3i> columnPositions = getIntersectingColumnsAtPosition(blockPos, rayDirection);
|
||||
for (Vec3i columnPos : columnPositions)
|
||||
ArrayList<DhVec3i> columnPositions = getIntersectingColumnsAtPosition(blockPos, rayDirection);
|
||||
for (DhVec3i columnPos : columnPositions)
|
||||
{
|
||||
// check each column
|
||||
DhApiResult<DhApiTerrainDataPoint[]> result = this.getColumnDataAtBlockPos(levelWrapper, columnPos.x, columnPos.z, dataCache);
|
||||
@@ -402,8 +426,9 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
if (dataPoint.blockStateWrapper != null && !dataPoint.blockStateWrapper.isAir())
|
||||
{
|
||||
// does this LOD contain the given Y position?
|
||||
Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
|
||||
if (exactPos.y >= dataPoint.bottomYBlockPos && exactPos.y <= dataPoint.topYBlockPos)
|
||||
DhVec3i dataPointPos = new DhVec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
|
||||
if (exactPos.y >= dataPoint.bottomYBlockPos
|
||||
&& exactPos.y <= dataPoint.topYBlockPos)
|
||||
{
|
||||
if (closetFoundDataPoint == null)
|
||||
{
|
||||
@@ -454,15 +479,15 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
*
|
||||
* Used to make sure the raycast step doesn't accidentally walk over any adjacent data.
|
||||
*/
|
||||
private static ArrayList<Vec3i> getIntersectingColumnsAtPosition(Vec3i rayEndingPos, Vec3f rayDirection)
|
||||
private static ArrayList<DhVec3i> getIntersectingColumnsAtPosition(DhVec3i rayEndingPos, DhVec3f rayDirection)
|
||||
{
|
||||
ArrayList<Vec3i> returnList = new ArrayList<>(9);
|
||||
ArrayList<DhVec3i> returnList = new ArrayList<>(9);
|
||||
|
||||
for (int x = -1; x <= 1; x++)
|
||||
{
|
||||
for (int z = -1; z <= 1; z++)
|
||||
{
|
||||
Vec3i pos = new Vec3i(rayEndingPos.x + x, rayEndingPos.y, rayEndingPos.z + z);
|
||||
DhVec3i pos = new DhVec3i(rayEndingPos.x + x, rayEndingPos.y, rayEndingPos.z + z);
|
||||
|
||||
// check if this column is intersected by the ray
|
||||
if (RayCastUtil.rayIntersectsSquare(rayEndingPos.x, rayEndingPos.z, rayDirection.x, rayDirection.z, pos.x, pos.z, 1))
|
||||
@@ -475,11 +500,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
return returnList;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// setter methods //
|
||||
//================//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public DhApiResult<Void> overwriteChunkDataAsync(IDhApiLevelWrapper levelWrapper, Object[] chunkObjectArray) throws ClassCastException
|
||||
@@ -503,26 +531,32 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
|
||||
// this will throw a cast exception if the chunk object array isn't correct
|
||||
IChunkWrapper chunk = SingletonInjector.INSTANCE.get(IWrapperFactory.class).createChunkWrapper(chunkObjectArray);
|
||||
SharedApi.INSTANCE.applyChunkUpdate(chunk, dhLevel.getLevelWrapper(), true);
|
||||
SharedApi.INSTANCE.applyChunkUpdate(chunk, dhLevel.getLevelWrapper());
|
||||
|
||||
|
||||
return DhApiResult.createSuccess();
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// API helpers //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
@Override
|
||||
public IDhApiTerrainDataCache getSoftCache() { return new DhApiTerrainDataCache(); }
|
||||
public IDhApiTerrainDataCache createSoftCache() { return new DhApiTerrainDataCache(); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//===============//
|
||||
// debug methods //
|
||||
//===============//
|
||||
//region
|
||||
|
||||
/**
|
||||
* This method is here for debugging the repo and isn't intended for normal use.
|
||||
@@ -536,10 +570,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
Thread thread = new Thread(() -> {
|
||||
try
|
||||
{
|
||||
DhApiResult<DhApiTerrainDataPoint> single = getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, debugDataCache);
|
||||
DhApiResult<DhApiTerrainDataPoint[]> column = getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, debugDataCache);
|
||||
DhApiResult<DhApiTerrainDataPoint> single = getTerrainDataAtBlockYPos(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, debugDataCache);
|
||||
DhApiResult<DhApiTerrainDataPoint[]> column = getTerrainDataColumnArray(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, debugDataCache);
|
||||
|
||||
DhLodPos chunkPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ).convertToDetailLevel(LodUtil.CHUNK_DETAIL_LEVEL);
|
||||
long chunkPos = DhSectionPos.encodeContaining(LodUtil.CHUNK_DETAIL_LEVEL, new DhChunkPos(blockPosX, blockPosZ));
|
||||
DhApiResult<DhApiTerrainDataPoint[][][]> area = getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, chunkPos, debugDataCache);
|
||||
|
||||
|
||||
@@ -572,12 +606,16 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
}
|
||||
|
||||
// draw raycast position
|
||||
if (rayCast.success && rayCast.payload != null)
|
||||
if (rayCast.success
|
||||
&& rayCast.payload != null)
|
||||
{
|
||||
DebugRenderer.makeParticle(
|
||||
new DebugRenderer.BoxParticle(
|
||||
new DebugRenderer.Box(
|
||||
DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), rayCast.payload.dataPoint.bottomYBlockPos, rayCast.payload.dataPoint.topYBlockPos, -0.1f, Color.RED),
|
||||
DEBUG_RENDERER.makeParticle(
|
||||
new AbstractDebugWireframeRenderer.BoxParticle(
|
||||
new AbstractDebugWireframeRenderer.Box(
|
||||
DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z),
|
||||
rayCast.payload.dataPoint.bottomYBlockPos,
|
||||
rayCast.payload.dataPoint.topYBlockPos,
|
||||
-0.1f, Color.RED),
|
||||
1.0, 0f
|
||||
)
|
||||
);
|
||||
@@ -599,5 +637,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
|
||||
}
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+32
-38
@@ -4,32 +4,32 @@ import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
|
||||
import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
|
||||
import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.network.event.internal.CloseInternalEvent;
|
||||
import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
|
||||
import com.seibel.distanthorizons.core.network.session.NetworkSession;
|
||||
import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
|
||||
import com.seibel.distanthorizons.core.world.AbstractDhWorld;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Objects;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
/**
|
||||
* This class is used to manage the level keys.
|
||||
*/
|
||||
public class ClientPluginChannelApi
|
||||
{
|
||||
private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
|
||||
() -> Config.Common.Logging.logNetworkEvent.get());
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder()
|
||||
.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
|
||||
.build();
|
||||
|
||||
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||
private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
|
||||
|
||||
private final Consumer<IServerKeyedClientLevel> levelLoadHandler;
|
||||
private final Consumer<IClientLevelWrapper> levelUnloadHandler;
|
||||
|
||||
@Nullable
|
||||
public NetworkSession networkSession;
|
||||
|
||||
@@ -39,10 +39,8 @@ public class ClientPluginChannelApi
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public ClientPluginChannelApi(Consumer<IServerKeyedClientLevel> levelLoadHandler, Consumer<IClientLevelWrapper> levelUnloadHandler)
|
||||
public ClientPluginChannelApi()
|
||||
{
|
||||
this.levelLoadHandler = levelLoadHandler;
|
||||
this.levelUnloadHandler = levelUnloadHandler;
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +63,7 @@ public class ClientPluginChannelApi
|
||||
//================//
|
||||
|
||||
/** fired when this client connects to a server with DH support */
|
||||
public void onJoinServer(@NonNull NetworkSession networkSession)
|
||||
public void onJoinServer(@NotNull NetworkSession networkSession)
|
||||
{
|
||||
Objects.requireNonNull(networkSession);
|
||||
this.networkSession = networkSession;
|
||||
@@ -75,41 +73,37 @@ public class ClientPluginChannelApi
|
||||
|
||||
private void onLevelInitMessage(LevelInitMessage msg)
|
||||
{
|
||||
if (!msg.levelKey.matches(LevelInitMessage.VALIDATION_REGEX))
|
||||
if (!msg.serverKey.isEmpty() && !msg.serverKey.matches(LevelInitMessage.SERVER_KEY_REGEX))
|
||||
{
|
||||
throw new IllegalArgumentException("Server sent invalid server key.");
|
||||
}
|
||||
|
||||
if (!msg.levelKey.matches(LevelInitMessage.LEVEL_KEY_REGEX))
|
||||
{
|
||||
throw new IllegalArgumentException("Server sent invalid level key.");
|
||||
}
|
||||
|
||||
LOGGER.info("Server level key received: [" + msg.levelKey + "].");
|
||||
LOGGER.info("Level init received for [" + msg.dimensionResourceLocation + "]: server key [" + msg.serverKey + "], level key [" + msg.levelKey + "]");
|
||||
|
||||
MC.executeOnRenderThread(() ->
|
||||
RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("ClientPluginChannelApi onLevelInitMessage", () ->
|
||||
{
|
||||
IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
|
||||
IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
|
||||
IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel(clientLevel);
|
||||
|
||||
if (existingKeyedClientLevel != null)
|
||||
{
|
||||
if (!existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
|
||||
{
|
||||
LOGGER.info("Unloading previous level with key: [" + existingKeyedClientLevel.getServerLevelKey() + "].");
|
||||
this.levelUnloadHandler.accept(existingKeyedClientLevel);
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.info("Level key matches the previous level key, ignoring the message.");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.info("Unloading non-keyed level: [" + clientLevel.getDhIdentifier() + "].");
|
||||
this.levelUnloadHandler.accept(clientLevel);
|
||||
}
|
||||
|
||||
if (existingKeyedClientLevel == null || !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
|
||||
if (existingKeyedClientLevel == null
|
||||
|| !existingKeyedClientLevel.getServerKey().equals(msg.serverKey)
|
||||
|| !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
|
||||
{
|
||||
LOGGER.info("Loading level with key: [" + msg.levelKey + "].");
|
||||
IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.levelKey);
|
||||
this.levelLoadHandler.accept(keyedLevel);
|
||||
|
||||
IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.dimensionResourceLocation, msg.serverKey, msg.levelKey);
|
||||
|
||||
if (keyedLevel != null) {
|
||||
AbstractDhWorld world = SharedApi.getAbstractDhWorld();
|
||||
if (world != null) {
|
||||
world.getOrLoadLevel(keyedLevel);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -19,18 +19,15 @@
|
||||
|
||||
package com.seibel.distanthorizons.core.api.internal;
|
||||
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelUnloadEvent;
|
||||
import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
|
||||
import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
|
||||
import com.seibel.distanthorizons.core.world.*;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
|
||||
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
@@ -41,7 +38,7 @@ public class ServerApi
|
||||
{
|
||||
public static final ServerApi INSTANCE = new ServerApi();
|
||||
|
||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
|
||||
|
||||
@@ -53,30 +50,6 @@ public class ServerApi
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// tick events //
|
||||
//=============//
|
||||
|
||||
public void serverTickEvent()
|
||||
{
|
||||
try
|
||||
{
|
||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
||||
if (serverWorld != null)
|
||||
{
|
||||
serverWorld.serverTick();
|
||||
SharedApi.worldGenTick(serverWorld::worldGenTick);
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// try catch is necessary to prevent crashing the internal server when an exception is thrown
|
||||
LOGGER.error("ServerTickEvent error: " + e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//===============//
|
||||
// server events //
|
||||
//===============//
|
||||
@@ -101,20 +74,18 @@ public class ServerApi
|
||||
}
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// level events //
|
||||
//==============//
|
||||
|
||||
public void serverLevelLoadEvent(IServerLevelWrapper level)
|
||||
public void serverLevelLoadEvent(IServerLevelWrapper levelWrapper)
|
||||
{
|
||||
LOGGER.debug("Server Level " + level + " loading");
|
||||
LOGGER.debug("Server Level " + levelWrapper + " loading");
|
||||
|
||||
AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
|
||||
if (serverWorld != null)
|
||||
{
|
||||
serverWorld.getOrLoadLevel(level);
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level));
|
||||
serverWorld.getOrLoadLevel(levelWrapper);
|
||||
}
|
||||
}
|
||||
public void serverLevelUnloadEvent(IServerLevelWrapper level)
|
||||
@@ -125,19 +96,16 @@ public class ServerApi
|
||||
if (serverWorld != null)
|
||||
{
|
||||
serverWorld.unloadLevel(level);
|
||||
SharedApi.INSTANCE.clearQueuedChunkUpdates();
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//=======================//
|
||||
// chunk modified events //
|
||||
//=======================//
|
||||
|
||||
public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, false); }
|
||||
public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, true); }
|
||||
public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
|
||||
public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
|
||||
|
||||
|
||||
|
||||
@@ -147,12 +115,12 @@ public class ServerApi
|
||||
|
||||
public void serverPlayerJoinEvent(IServerPlayerWrapper player)
|
||||
{
|
||||
if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
|
||||
if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
||||
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||
LOGGER.info("Player ["+player.getName()+"] joined.");
|
||||
if (serverWorld != null)
|
||||
{
|
||||
@@ -161,12 +129,12 @@ public class ServerApi
|
||||
}
|
||||
public void serverPlayerDisconnectEvent(IServerPlayerWrapper player)
|
||||
{
|
||||
if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
|
||||
if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
||||
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||
LOGGER.info("Player ["+player.getName()+"] disconnected.");
|
||||
if (serverWorld != null)
|
||||
{
|
||||
@@ -175,12 +143,12 @@ public class ServerApi
|
||||
}
|
||||
public void serverPlayerLevelChangeEvent(IServerPlayerWrapper player, IServerLevelWrapper originLevel, IServerLevelWrapper destinationLevel)
|
||||
{
|
||||
if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
|
||||
if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
||||
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||
LOGGER.info("Player ["+player.getName()+"] changed level: ["+originLevel.getKeyedLevelDimensionName()+"] -> ["+destinationLevel.getKeyedLevelDimensionName()+"].");
|
||||
if (serverWorld != null)
|
||||
{
|
||||
@@ -195,12 +163,12 @@ public class ServerApi
|
||||
*/
|
||||
public void pluginMessageReceived(IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message)
|
||||
{
|
||||
if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
|
||||
if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
|
||||
IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
|
||||
if (serverWorld != null)
|
||||
{
|
||||
serverWorld.getServerPlayerStateManager().handlePluginMessage(player, message);
|
||||
|
||||
@@ -22,30 +22,28 @@ package com.seibel.distanthorizons.core.api.internal;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldUnloadEvent;
|
||||
import com.seibel.distanthorizons.core.Initializer;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateData;
|
||||
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateQueueManager;
|
||||
import com.seibel.distanthorizons.core.api.internal.chunkUpdating.WorldChunkUpdateManager;
|
||||
import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.generation.DhLightingEngine;
|
||||
import com.seibel.distanthorizons.core.level.DhClientLevel;
|
||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.logging.f3.F3Screen;
|
||||
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
|
||||
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
||||
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
|
||||
import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
|
||||
import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
|
||||
import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
|
||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||
import com.seibel.distanthorizons.core.util.objects.Pair;
|
||||
import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
|
||||
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
|
||||
import com.seibel.distanthorizons.core.world.*;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.*;
|
||||
@@ -56,144 +54,141 @@ public class SharedApi
|
||||
{
|
||||
public static final SharedApi INSTANCE = new SharedApi();
|
||||
|
||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
/** will be null on the server-side */
|
||||
@Nullable
|
||||
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
||||
/** will be null on the server-side */
|
||||
|
||||
public static final WorldChunkUpdateManager WORLD_CHUNK_UPDATE_MANAGER = WorldChunkUpdateManager.INSTANCE; // local fariable for quick access
|
||||
|
||||
|
||||
@Nullable
|
||||
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||
private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
|
||||
|
||||
private static final UpdateChunkPosManager UPDATE_POS_MANAGER = new UpdateChunkPosManager();
|
||||
/**
|
||||
* how many chunks can be queued for updating per thread + player (in multiplayer),
|
||||
* used to prevent updates from infinitely pilling up if the user flies around extremely fast
|
||||
*/
|
||||
private static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
|
||||
|
||||
/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
|
||||
private static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
|
||||
|
||||
|
||||
private static AbstractDhWorld currentWorld;
|
||||
private static int lastWorldGenTickDelta = 0;
|
||||
private static long lastOverloadedLogMessageMsTime = 0;
|
||||
private static final Object worldLockObject = new Object();
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
private SharedApi() { }
|
||||
public static void init() { Initializer.init(); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//===============//
|
||||
// world methods //
|
||||
//===============//
|
||||
//region
|
||||
|
||||
public static EWorldEnvironment getEnvironment() { return (currentWorld == null) ? null : currentWorld.environment; }
|
||||
|
||||
public static void setDhWorld(AbstractDhWorld newWorld)
|
||||
{
|
||||
AbstractDhWorld oldWorld = currentWorld;
|
||||
if (oldWorld != null)
|
||||
synchronized (worldLockObject)
|
||||
{
|
||||
oldWorld.close();
|
||||
}
|
||||
currentWorld = newWorld;
|
||||
|
||||
// starting and stopping the DataRenderTransformer is necessary to prevent attempting to
|
||||
// access the MC level at inappropriate times, which can cause exceptions
|
||||
if (currentWorld != null)
|
||||
{
|
||||
ThreadPoolUtil.setupThreadPools();
|
||||
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldLoadEvent.class, new DhApiWorldLoadEvent.EventParam());
|
||||
}
|
||||
else
|
||||
{
|
||||
ThreadPoolUtil.shutdownThreadPools();
|
||||
DebugRenderer.clearRenderables();
|
||||
|
||||
if (MC_RENDER != null)
|
||||
AbstractDhWorld oldWorld = currentWorld;
|
||||
if (oldWorld != null)
|
||||
{
|
||||
MC_RENDER.clearTargetFrameBuffer();
|
||||
oldWorld.close();
|
||||
}
|
||||
currentWorld = newWorld;
|
||||
|
||||
// shouldn't be necessary, but if we missed closing one of the connections this should make sure they're all closed
|
||||
AbstractDhRepo.closeAllConnections();
|
||||
// needs to be closed on world shutdown to clear out un-processed chunks
|
||||
UPDATE_POS_MANAGER.clear();
|
||||
// starting and stopping the DataRenderTransformer is necessary to prevent attempting to
|
||||
// access the MC level at inappropriate times, which can cause exceptions
|
||||
if (currentWorld != null)
|
||||
{
|
||||
ThreadPoolUtil.setupThreadPools();
|
||||
|
||||
// recommend that the garbage collector cleans up any objects from the old world and thread pools
|
||||
System.gc();
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldLoadEvent.class, new DhApiWorldLoadEvent.EventParam());
|
||||
}
|
||||
else
|
||||
{
|
||||
ThreadPoolUtil.shutdownThreadPools();
|
||||
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldUnloadEvent.class, new DhApiWorldUnloadEvent.EventParam());
|
||||
// delayed get because SharedApi will be created before the singleton has been bound
|
||||
AbstractDebugWireframeRenderer debugWireframeRenderer = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
|
||||
debugWireframeRenderer.clearRenderables();
|
||||
|
||||
// fired after the unload event so API users can't change the read-only for any new worlds
|
||||
DhApiWorldProxy.INSTANCE.setReadOnly(false, false);
|
||||
}
|
||||
}
|
||||
|
||||
public static void worldGenTick(Runnable worldGenRunnable)
|
||||
{
|
||||
lastWorldGenTickDelta--;
|
||||
if (lastWorldGenTickDelta <= 0)
|
||||
{
|
||||
worldGenRunnable.run();
|
||||
lastWorldGenTickDelta = 20;
|
||||
if (MC_RENDER != null)
|
||||
{
|
||||
MC_RENDER.clearTargetFrameBuffer();
|
||||
}
|
||||
|
||||
// shouldn't be necessary, but if we missed closing one of the connections this should make sure they're all closed
|
||||
AbstractDhRepo.closeAllConnections();
|
||||
// needs to be closed on world shutdown to clear out un-processed chunks
|
||||
WORLD_CHUNK_UPDATE_MANAGER.clear();
|
||||
|
||||
RenderThreadTaskHandler.INSTANCE.clearDebugStats();
|
||||
|
||||
// recommend that the garbage collector cleans up any objects from the old world and thread pools
|
||||
System.gc();
|
||||
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldUnloadEvent.class, new DhApiWorldUnloadEvent.EventParam());
|
||||
|
||||
// fired after the unload event so API users can't change the read-only for any new worlds
|
||||
DhApiWorldProxy.INSTANCE.setReadOnly(false, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
|
||||
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientServerWorld} */
|
||||
public static DhClientServerWorld getDhClientServerWorld() { return (currentWorld instanceof DhClientServerWorld) ? (DhClientServerWorld) currentWorld : null; }
|
||||
|
||||
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientWorld} or {@link DhClientServerWorld} */
|
||||
public static IDhClientWorld getIDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
|
||||
@Nullable
|
||||
public static IDhClientWorld tryGetDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
|
||||
|
||||
/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhServerWorld} or {@link DhClientServerWorld} */
|
||||
public static IDhServerWorld getIDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
|
||||
@Nullable
|
||||
public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// chunk update //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
/**
|
||||
* Used to prevent getting a full chunk from MC if it isn't necessary. <br>
|
||||
* This is important since asking MC for a chunk is slow and may block the render thread.
|
||||
*/
|
||||
public static boolean isChunkAtBlockPosAlreadyUpdating(int blockPosX, int blockPosZ)
|
||||
{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
|
||||
|
||||
public static boolean isChunkAtChunkPosAlreadyUpdating(int chunkPosX, int chunkPosZ)
|
||||
{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
|
||||
|
||||
/**
|
||||
* This is often fired when unloading a level.
|
||||
* This is done to prevent overloading the system when
|
||||
* rapidly changing dimensions.
|
||||
* (IE prevent DH from infinitely allocating memory
|
||||
*/
|
||||
public void clearQueuedChunkUpdates() { UPDATE_POS_MANAGER.clear(); }
|
||||
|
||||
public int getQueuedChunkUpdateCount() { return UPDATE_POS_MANAGER.closestQueue.size(); }
|
||||
|
||||
|
||||
|
||||
/** handles both block place and break events */
|
||||
public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true); }
|
||||
public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, false); }
|
||||
|
||||
public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean updateNeighborChunks)
|
||||
public static boolean isChunkAtBlockPosAlreadyUpdating(ILevelWrapper levelWrapper, int blockPosX, int blockPosZ)
|
||||
{
|
||||
//========================//
|
||||
// world and level checks //
|
||||
//========================//
|
||||
ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
|
||||
if (manager == null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return manager.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ)));
|
||||
}
|
||||
|
||||
public static boolean isChunkAtChunkPosAlreadyUpdating(ILevelWrapper levelWrapper, int chunkPosX, int chunkPosZ)
|
||||
{
|
||||
ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
|
||||
if (manager == null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return manager.contains(new DhChunkPos(chunkPosX, chunkPosZ));
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper levelWrapper)
|
||||
{
|
||||
//===================//
|
||||
// validation checks //
|
||||
//===================//
|
||||
|
||||
if (chunkWrapper == null)
|
||||
{
|
||||
@@ -204,38 +199,38 @@ public class SharedApi
|
||||
AbstractDhWorld dhWorld = SharedApi.getAbstractDhWorld();
|
||||
if (dhWorld == null)
|
||||
{
|
||||
if (level instanceof IClientLevelWrapper)
|
||||
if (levelWrapper instanceof IClientLevelWrapper)
|
||||
{
|
||||
// If the client world isn't loaded yet, keep track of which chunks were loaded so we can use them later.
|
||||
// This may happen if the client world and client level load events happen out of order
|
||||
IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
|
||||
ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
|
||||
IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
|
||||
ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.put(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// ignore updates if the world is read-only
|
||||
if (DhApiWorldProxy.INSTANCE.getReadOnly())
|
||||
if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// only continue if the level is loaded
|
||||
IDhLevel dhLevel = dhWorld.getLevel(level);
|
||||
IDhLevel dhLevel = dhWorld.getLevel(levelWrapper);
|
||||
if (dhLevel == null)
|
||||
{
|
||||
if (level instanceof IClientLevelWrapper)
|
||||
if (levelWrapper instanceof IClientLevelWrapper)
|
||||
{
|
||||
// the client level isn't loaded yet
|
||||
IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
|
||||
ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
|
||||
IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
|
||||
ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.put(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// ignore chunk updates if the network should handle them
|
||||
if (dhLevel instanceof DhClientLevel)
|
||||
{
|
||||
if (!((DhClientLevel) dhLevel).shouldProcessChunkUpdate(chunkWrapper.getChunkPos()))
|
||||
@@ -244,128 +239,47 @@ public class SharedApi
|
||||
}
|
||||
}
|
||||
|
||||
// shoudln't normally happen, but just in case
|
||||
if (UPDATE_POS_MANAGER.contains(chunkWrapper.getChunkPos()))
|
||||
// ignore chunk updates for non-rendered levels
|
||||
String dimName = dhLevel.getLevelWrapper().getDimensionName();
|
||||
if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ChunkUpdateQueueManager chunkManager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
|
||||
// ignore the wrong level wrapper type or
|
||||
// if the chunk is already queued for handling
|
||||
if (chunkManager == null
|
||||
|| chunkManager.contains(chunkWrapper.getChunkPos()))
|
||||
{
|
||||
// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//===============================//
|
||||
// update the necessary chunk(s) //
|
||||
//===============================//
|
||||
|
||||
if (!updateNeighborChunks)
|
||||
{
|
||||
// only update the center chunk
|
||||
|
||||
queueChunkUpdate(chunkWrapper, null, dhLevel);
|
||||
}
|
||||
else
|
||||
{
|
||||
// update the center with any existing neighbour chunks.
|
||||
// this is done so lighting changes are propagated correctly
|
||||
queueChunkUpdate(chunkWrapper, getNeighbourChunkListForChunk(chunkWrapper,dhLevel), dhLevel);
|
||||
}
|
||||
}
|
||||
private static ArrayList<IChunkWrapper> getNeighbourChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
|
||||
{
|
||||
// get the neighboring chunk list
|
||||
ArrayList<IChunkWrapper> neighbourChunkList = new ArrayList<>(9);
|
||||
for (int xOffset = -1; xOffset <= 1; xOffset++)
|
||||
{
|
||||
for (int zOffset = -1; zOffset <= 1; zOffset++)
|
||||
{
|
||||
if (xOffset == 0 && zOffset == 0)
|
||||
{
|
||||
// center chunk
|
||||
neighbourChunkList.add(chunkWrapper);
|
||||
}
|
||||
else
|
||||
{
|
||||
// neighboring chunk
|
||||
DhChunkPos neighbourPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
|
||||
IChunkWrapper neighbourChunk = dhLevel.getLevelWrapper().tryGetChunk(neighbourPos);
|
||||
if (neighbourChunk != null)
|
||||
{
|
||||
neighbourChunkList.add(neighbourChunk);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return neighbourChunkList;
|
||||
queueChunkUpdate(chunkManager, chunkWrapper, dhLevel);
|
||||
}
|
||||
|
||||
private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel)
|
||||
{ queueChunkUpdate(chunkWrapper, neighbourChunkList, dhLevel,false); }
|
||||
private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
|
||||
private static void queueChunkUpdate(ChunkUpdateQueueManager chunkManager, IChunkWrapper chunkWrapper, IDhLevel dhLevel)
|
||||
{
|
||||
int maxUpdateSizeMultiplier;
|
||||
if (MC_CLIENT != null && MC_CLIENT.playerExists())
|
||||
// return if the chunk is already queued
|
||||
if (chunkManager.contains(chunkWrapper.getChunkPos()))
|
||||
{
|
||||
// Local worlds & multiplayer
|
||||
UPDATE_POS_MANAGER.setCenter(MC_CLIENT.getPlayerChunkPos());
|
||||
maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Dedicated servers
|
||||
// Also includes spawn chunks since they're likely to be intentionally utilized with updates
|
||||
maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
|
||||
}
|
||||
|
||||
UPDATE_POS_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
|
||||
* Config.Common.MultiThreading.numberOfThreads.get()
|
||||
* maxUpdateSizeMultiplier;
|
||||
|
||||
UpdateChunkData updateData = new UpdateChunkData(chunkWrapper, neighbourChunkList, dhLevel, lightUpdateOnly);
|
||||
if(lightUpdateOnly)
|
||||
{
|
||||
UPDATE_POS_MANAGER.removeItem(chunkWrapper.getChunkPos());
|
||||
}
|
||||
int remainingCapacity = UPDATE_POS_MANAGER.addItem(chunkWrapper.getChunkPos(), updateData);
|
||||
if (remainingCapacity <= 0)
|
||||
{
|
||||
// limit how often an overloaded message can be sent
|
||||
long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
|
||||
if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
|
||||
{
|
||||
lastOverloadedLogMessageMsTime = System.currentTimeMillis();
|
||||
|
||||
String message = "\u00A76" + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + "\u00A7r" +
|
||||
"\nThis may result in holes in your LODs. " +
|
||||
"\nFix: move through the world slower, decrease your vanilla render distance, slow down your world pre-generator (IE Chunky), or increase the Distant Horizons' CPU thread counts. " +
|
||||
"\nMax queue count ["+UPDATE_POS_MANAGER.maxSize+"] (["+ MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER +"] per thread+players).";
|
||||
|
||||
boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
|
||||
if (showWarningInChat)
|
||||
{
|
||||
ClientApi.INSTANCE.showChatMessageNextFrame(message);
|
||||
}
|
||||
|
||||
// Don't log warnings in singleplayer or in hosted LAN since it usually isn't a problem (and if it is it's easy to notice).
|
||||
// Servers should always log since being overloaded is harder to notice.
|
||||
EWorldEnvironment environment = SharedApi.getEnvironment();
|
||||
if (showWarningInChat || environment == EWorldEnvironment.SERVER_ONLY)
|
||||
{
|
||||
LOGGER.warn(message);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// add chunk update data to preUpdate queue
|
||||
ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, dhLevel);
|
||||
chunkManager.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
|
||||
|
||||
// queue updates up to the number of CPU cores allocated for the job
|
||||
// (this prevents doing extra work queuing tasks that may not be necessary)
|
||||
// and makes sure the chunks closest to the player are updated first
|
||||
PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
|
||||
if (executor != null && executor.getQueueSize() < executor.getPoolSize())
|
||||
|
||||
// queue the next position if there are still positions to process
|
||||
AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
|
||||
if (executor != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
executor.execute(SharedApi::processQueuedChunkUpdate);
|
||||
executor.execute(WORLD_CHUNK_UPDATE_MANAGER::processEachQueue);
|
||||
}
|
||||
catch (RejectedExecutionException ignore)
|
||||
{
|
||||
@@ -373,260 +287,19 @@ public class SharedApi
|
||||
}
|
||||
}
|
||||
}
|
||||
private static void processQueuedChunkUpdate()
|
||||
{
|
||||
//LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount());
|
||||
|
||||
UpdateChunkData updateData = UPDATE_POS_MANAGER.popClosest();
|
||||
if (updateData == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IChunkWrapper chunkWrapper = updateData.chunkWrapper;
|
||||
@Nullable ArrayList<IChunkWrapper> neighbourChunkList = updateData.neighbourChunkList;
|
||||
IDhLevel dhLevel = updateData.dhLevel;
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
|
||||
|
||||
// check if this chunk has been converted into an LOD already
|
||||
int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
|
||||
int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
|
||||
if (checkChunkHash)
|
||||
{
|
||||
if (oldChunkHash == newChunkHash && !updateData.lightUpdateOnly)
|
||||
{
|
||||
// if the chunk hashes are the same then we don't need to bother with lighting the chunk
|
||||
// or creating/updating the LODs
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// having a list of the nearby chunks is needed for lighting and beacon generation
|
||||
ArrayList<IChunkWrapper> nearbyChunkList;
|
||||
if (neighbourChunkList != null)
|
||||
{
|
||||
nearbyChunkList = neighbourChunkList;
|
||||
}
|
||||
else
|
||||
{
|
||||
nearbyChunkList = new ArrayList<>(1);
|
||||
nearbyChunkList.add(chunkWrapper);
|
||||
}
|
||||
|
||||
// if this chunk will update its lighting
|
||||
// then queue adjacent chunks to update theirs as well
|
||||
// adjacent chunk will have 'lightUpdateOnly' true
|
||||
// so they won't schedule further chunk updates
|
||||
if (!updateData.lightUpdateOnly)
|
||||
{
|
||||
for (IChunkWrapper adjacentChunk : nearbyChunkList)
|
||||
{
|
||||
// pulling a new chunkWrapper is necessary to prevent concurrent modification on the existing chunkWrappers
|
||||
IChunkWrapper newCenterChunk = dhLevel.getLevelWrapper().tryGetChunk(adjacentChunk.getChunkPos());
|
||||
if (newCenterChunk != null)
|
||||
{
|
||||
queueChunkUpdate(newCenterChunk, getNeighbourChunkListForChunk(newCenterChunk, dhLevel), dhLevel, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// sky lighting is populated later at the data source level
|
||||
DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, dhLevel.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
|
||||
|
||||
dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
|
||||
dhLevel.updateChunkAsync(chunkWrapper, newChunkHash);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
|
||||
}
|
||||
finally
|
||||
{
|
||||
// queue the next position if there are still positions to process
|
||||
AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
|
||||
if (executor != null && !UPDATE_POS_MANAGER.updateDataByChunkPos.isEmpty())
|
||||
{
|
||||
try
|
||||
{
|
||||
executor.execute(SharedApi::processQueuedChunkUpdate);
|
||||
}
|
||||
catch (RejectedExecutionException ignore)
|
||||
{
|
||||
// the executor was shut down, it should be back up shortly and able to accept new jobs
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// F3 Menu //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
public String getDebugMenuString()
|
||||
{
|
||||
String updatingCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.closestQueue.size());
|
||||
String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.maxSize);
|
||||
return "Queued chunk updates: "+updatingCountStr+" / "+maxUpdateCountStr;
|
||||
}
|
||||
public ArrayList<String> getDebugMenuString() { return WORLD_CHUNK_UPDATE_MANAGER.getDebugMenuString(); }
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// helper classes //
|
||||
//================//
|
||||
|
||||
/** contains the objects needed to update a chunk */
|
||||
private static class UpdateChunkData
|
||||
{
|
||||
public IChunkWrapper chunkWrapper;
|
||||
@Nullable
|
||||
public ArrayList<IChunkWrapper> neighbourChunkList;
|
||||
public IDhLevel dhLevel;
|
||||
/** adjacent chunks will only update their light */
|
||||
public boolean lightUpdateOnly;
|
||||
|
||||
public UpdateChunkData(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
|
||||
{
|
||||
this.chunkWrapper = chunkWrapper;
|
||||
this.neighbourChunkList = neighbourChunkList;
|
||||
this.dhLevel = dhLevel;
|
||||
this.lightUpdateOnly = lightUpdateOnly;
|
||||
}
|
||||
}
|
||||
|
||||
/** keeps track of which chunks need to be updated */
|
||||
private static class UpdateChunkPosManager
|
||||
{
|
||||
private final PriorityBlockingQueue<DhChunkPos> closestQueue;
|
||||
private final PriorityBlockingQueue<DhChunkPos> furthestQueue;
|
||||
private final ConcurrentHashMap<DhChunkPos, UpdateChunkData> updateDataByChunkPos;
|
||||
|
||||
private DhChunkPos center;
|
||||
private int maxSize = 500;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public UpdateChunkPosManager()
|
||||
{
|
||||
this.closestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> pos.squaredDistance(this.center)));
|
||||
this.furthestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> ((DhChunkPos)pos).squaredDistance(this.center)).reversed());
|
||||
this.updateDataByChunkPos = new ConcurrentHashMap<>();
|
||||
// defaulting to 0,0 is fine since it'll be updated once we start adding items
|
||||
this.center = new DhChunkPos(0, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// list/set methods //
|
||||
//==================//
|
||||
|
||||
public boolean contains(DhChunkPos pos) { return this.updateDataByChunkPos.containsKey(pos); }
|
||||
|
||||
public void clear()
|
||||
{
|
||||
this.updateDataByChunkPos.clear();
|
||||
this.closestQueue.clear();
|
||||
this.furthestQueue.clear();
|
||||
}
|
||||
|
||||
public void removeItem(DhChunkPos pos)
|
||||
{
|
||||
this.updateDataByChunkPos.remove(pos);
|
||||
this.closestQueue.remove(pos);
|
||||
this.furthestQueue.remove(pos);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds an item to the queue of chunks that need to be updated.
|
||||
* If there are no more slots, replaces the item furthest from the center.
|
||||
*
|
||||
* @return The number of remaining slots available in the queue.
|
||||
*/
|
||||
public int addItem(DhChunkPos pos, UpdateChunkData updateData)
|
||||
{
|
||||
int remainingSlots = this.maxSize - this.updateDataByChunkPos.size();
|
||||
if (this.updateDataByChunkPos.containsKey(pos))
|
||||
{
|
||||
// Chunk is already present in queue, no need to insert
|
||||
return remainingSlots;
|
||||
}
|
||||
|
||||
// If no slots are left, get one by removing the item furthest from the center
|
||||
if (remainingSlots <= 0)
|
||||
{
|
||||
DhChunkPos furthest = this.furthestQueue.poll();
|
||||
if (furthest != null)
|
||||
{
|
||||
this.closestQueue.remove(furthest);
|
||||
this.updateDataByChunkPos.remove(furthest);
|
||||
}
|
||||
}
|
||||
|
||||
this.updateDataByChunkPos.put(pos, updateData);
|
||||
this.closestQueue.add(pos);
|
||||
this.furthestQueue.add(pos);
|
||||
|
||||
return remainingSlots;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// position methods //
|
||||
//==================//
|
||||
|
||||
public void setCenter(DhChunkPos newCenter)
|
||||
{
|
||||
// if the rebuild time takes too long
|
||||
// (in James' testing a queue of 500 items only took around 0.1 milliseconds)
|
||||
// this equation could be changed to only update after moving 2 or 4 chunks from the center
|
||||
if (newCenter.equals(this.center))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.center = newCenter;
|
||||
|
||||
// rebuild the priority queues to match the new center
|
||||
this.closestQueue.clear();
|
||||
this.furthestQueue.clear();
|
||||
for (DhChunkPos pos : this.updateDataByChunkPos.keySet())
|
||||
{
|
||||
this.closestQueue.add(pos);
|
||||
this.furthestQueue.add(pos);
|
||||
}
|
||||
}
|
||||
|
||||
public UpdateChunkData popClosest()
|
||||
{
|
||||
if (this.closestQueue.isEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
DhChunkPos closest = this.closestQueue.poll();
|
||||
if (closest == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
this.furthestQueue.remove(closest);
|
||||
return this.updateDataByChunkPos.remove(closest);
|
||||
}
|
||||
|
||||
}
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
|
||||
+127
@@ -0,0 +1,127 @@
|
||||
package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
|
||||
|
||||
import com.seibel.distanthorizons.core.api.internal.SharedApi;
|
||||
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Comparator;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.PriorityBlockingQueue;
|
||||
|
||||
public class ChunkPosQueue
|
||||
{
|
||||
private final PriorityBlockingQueue<DhChunkPos> closestQueue;
|
||||
private final PriorityBlockingQueue<DhChunkPos> furthestQueue;
|
||||
private final ConcurrentHashMap<DhChunkPos, ChunkUpdateData> updateDataByChunkPos;
|
||||
|
||||
private DhChunkPos center;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public ChunkPosQueue()
|
||||
{
|
||||
this.closestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> pos.squaredDistance(this.center)));
|
||||
this.furthestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> ((DhChunkPos)pos).squaredDistance(this.center)).reversed());
|
||||
this.updateDataByChunkPos = new ConcurrentHashMap<>();
|
||||
// defaulting to 0,0 is fine since it'll be updated once we start adding items
|
||||
this.center = new DhChunkPos(0, 0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// list methods //
|
||||
//==============//
|
||||
|
||||
public boolean contains(DhChunkPos pos) { return this.updateDataByChunkPos.containsKey(pos); }
|
||||
|
||||
public void clear()
|
||||
{
|
||||
this.updateDataByChunkPos.clear();
|
||||
this.closestQueue.clear();
|
||||
this.furthestQueue.clear();
|
||||
}
|
||||
|
||||
public void addItem(DhChunkPos pos, ChunkUpdateData updateData)
|
||||
{
|
||||
if (this.updateDataByChunkPos.containsKey(pos))
|
||||
{
|
||||
// Chunk is already present in queue, no need to insert
|
||||
return;
|
||||
}
|
||||
this.updateDataByChunkPos.put(pos, updateData);
|
||||
this.closestQueue.add(pos);
|
||||
this.furthestQueue.add(pos);
|
||||
}
|
||||
|
||||
public int getQueuedCount() { return this.updateDataByChunkPos.size(); }
|
||||
|
||||
public boolean isEmpty() { return this.updateDataByChunkPos.isEmpty(); }
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// position methods //
|
||||
//==================//
|
||||
|
||||
public void setCenter(DhChunkPos newCenter)
|
||||
{
|
||||
// if the rebuild time takes too long
|
||||
// (in James' testing a queue of 500 items only took around 0.1 milliseconds)
|
||||
// this equation could be changed to only update after moving 2 or 4 chunks from the center
|
||||
if (newCenter.equals(this.center))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this.center = newCenter;
|
||||
|
||||
// rebuild the priority queues to match the new center
|
||||
this.closestQueue.clear();
|
||||
this.furthestQueue.clear();
|
||||
for (DhChunkPos pos : this.updateDataByChunkPos.keySet())
|
||||
{
|
||||
this.closestQueue.add(pos);
|
||||
this.furthestQueue.add(pos);
|
||||
}
|
||||
}
|
||||
|
||||
public ChunkUpdateData popClosest()
|
||||
{
|
||||
if (this.closestQueue.isEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
DhChunkPos closest = this.closestQueue.poll();
|
||||
if (closest == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
this.furthestQueue.remove(closest);
|
||||
return this.updateDataByChunkPos.remove(closest);
|
||||
}
|
||||
@Nullable
|
||||
public ChunkUpdateData popFurthest()
|
||||
{
|
||||
if (this.furthestQueue.isEmpty())
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
DhChunkPos furthest = this.furthestQueue.poll();
|
||||
if (furthest == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
this.closestQueue.remove(furthest);
|
||||
return this.updateDataByChunkPos.remove(furthest);
|
||||
}
|
||||
}
|
||||
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
|
||||
|
||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class ChunkUpdateData
|
||||
{
|
||||
public IChunkWrapper chunkWrapper;
|
||||
public IDhLevel dhLevel;
|
||||
|
||||
|
||||
|
||||
public ChunkUpdateData(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
|
||||
{
|
||||
this.chunkWrapper = chunkWrapper;
|
||||
this.dhLevel = dhLevel;
|
||||
}
|
||||
}
|
||||
+408
@@ -0,0 +1,408 @@
|
||||
package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
|
||||
|
||||
import com.google.common.cache.CacheBuilder;
|
||||
import com.seibel.distanthorizons.core.api.internal.ClientApi;
|
||||
import com.seibel.distanthorizons.core.api.internal.SharedApi;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
|
||||
import com.seibel.distanthorizons.core.generation.DhLightingEngine;
|
||||
import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.logging.f3.F3Screen;
|
||||
import com.seibel.distanthorizons.core.pos.DhChunkPos;
|
||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
|
||||
import com.seibel.distanthorizons.core.world.EWorldEnvironment;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.*;
|
||||
|
||||
|
||||
/**
|
||||
* @see WorldChunkUpdateManager
|
||||
*/
|
||||
public class ChunkUpdateQueueManager
|
||||
{
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||
private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
|
||||
|
||||
/**
|
||||
* how many chunks can be queued for updating per thread + player (in multiplayer),
|
||||
* used to prevent updates from infinitely pilling up if the user flies around extremely fast
|
||||
*/
|
||||
public static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
|
||||
|
||||
/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
|
||||
public static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
|
||||
|
||||
|
||||
|
||||
private final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
|
||||
private static long lastOverloadedLogMessageMsTime = 0;
|
||||
|
||||
|
||||
|
||||
|
||||
public final ChunkPosQueue updateQueue;
|
||||
public final ChunkPosQueue preUpdateQueue;
|
||||
|
||||
public final ConcurrentMap<DhChunkPos, IChunkWrapper> queuedChunkWrapperByChunkPos = CacheBuilder.newBuilder()
|
||||
.expireAfterWrite(20, TimeUnit.SECONDS)
|
||||
.<DhChunkPos, IChunkWrapper>build()
|
||||
.asMap();
|
||||
|
||||
/** dynamically changes based on the number of threads currently available */
|
||||
public int maxSize = 500;
|
||||
|
||||
/** used to prevent flickering */
|
||||
public long lastMsTimeShownActiveInF3Screen = System.currentTimeMillis();
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
public ChunkUpdateQueueManager()
|
||||
{
|
||||
this.updateQueue = new ChunkPosQueue();
|
||||
this.preUpdateQueue = new ChunkPosQueue();
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// list/set methods //
|
||||
//==================//
|
||||
//region
|
||||
|
||||
public boolean contains(DhChunkPos pos)
|
||||
{
|
||||
return this.updateQueue.contains(pos)
|
||||
|| this.ignoredChunkPosSet.contains(pos)
|
||||
|| this.preUpdateQueue.contains(pos);
|
||||
}
|
||||
|
||||
public void clear()
|
||||
{
|
||||
this.updateQueue.clear();
|
||||
this.preUpdateQueue.clear();
|
||||
this.ignoredChunkPosSet.clear();
|
||||
}
|
||||
public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
|
||||
|
||||
public boolean updateQueuesEmpty()
|
||||
{
|
||||
return this.updateQueue.isEmpty()
|
||||
&& this.preUpdateQueue.isEmpty();
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds an item to the pre-update queue of chunks that might need to be updated.
|
||||
* If there are no more slots, replaces the item furthest from the center in the update queue.
|
||||
*/
|
||||
public void addItemToPreUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
|
||||
{ this.addItemToQueue(pos, updateData, this.preUpdateQueue); }
|
||||
|
||||
public void addItemToUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
|
||||
{ this.addItemToQueue(pos, updateData, this.updateQueue); }
|
||||
|
||||
private void addItemToQueue(DhChunkPos pos, ChunkUpdateData updateData, ChunkPosQueue queue)
|
||||
{
|
||||
int remainingSlots = this.maxSize - this.getQueuedCount();
|
||||
|
||||
// If no slots are left, get one by removing the item furthest from the center
|
||||
if (remainingSlots <= 0)
|
||||
{
|
||||
ChunkUpdateData removedData = queue.popFurthest();
|
||||
if (removedData != null)
|
||||
{
|
||||
this.queuedChunkWrapperByChunkPos.remove(removedData.chunkWrapper.getChunkPos());
|
||||
}
|
||||
}
|
||||
|
||||
queue.addItem(pos,updateData);
|
||||
this.queuedChunkWrapperByChunkPos.putIfAbsent(pos, updateData.chunkWrapper);
|
||||
|
||||
remainingSlots = this.maxSize - this.getQueuedCount();
|
||||
if (remainingSlots <= 0)
|
||||
{
|
||||
this.sendOverloadMessage();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void sendOverloadMessage()
|
||||
{
|
||||
// limit how often an overloaded message can be sent
|
||||
long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
|
||||
if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
|
||||
{
|
||||
lastOverloadedLogMessageMsTime = System.currentTimeMillis();
|
||||
|
||||
String message = MinecraftTextFormat.ORANGE + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + MinecraftTextFormat.CLEAR_FORMATTING +
|
||||
"\nThis may result in holes in your LODs. " +
|
||||
"\nFix: move through the world slower, decrease your vanilla render distance, slow down your world pre-generator (IE Chunky), or increase the Distant Horizons' CPU thread counts. " +
|
||||
"\nMax queue count [" + this.maxSize + "] ([" + MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
|
||||
|
||||
boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
|
||||
if (showWarningInChat)
|
||||
{
|
||||
ClientApi.INSTANCE.showChatMessageNextFrame(message);
|
||||
}
|
||||
|
||||
// Don't log warnings in singleplayer or in hosted LAN since it usually isn't a problem (and if it is it's easy to notice).
|
||||
// Servers should always log since being overloaded is harder to notice.
|
||||
EWorldEnvironment environment = SharedApi.getEnvironment();
|
||||
if (showWarningInChat || environment == EWorldEnvironment.SERVER_ONLY)
|
||||
{
|
||||
LOGGER.warn(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tries to return a cloned chunk wrapper from memory.
|
||||
* Returns null if no chunk is available.
|
||||
* <br><br>
|
||||
* This is done instead of accessing the MC level since
|
||||
* accessing the level often requires running on the render or server
|
||||
* thread, which causes stuttering.
|
||||
*/
|
||||
@Nullable
|
||||
public IChunkWrapper tryGetChunk(DhChunkPos pos)
|
||||
{
|
||||
IChunkWrapper existingWrapper = this.queuedChunkWrapperByChunkPos.get(pos);
|
||||
if (existingWrapper == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return existingWrapper.copy();
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// ignores //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
public void addPosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.add(chunkPos); }
|
||||
public void removePosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.remove(chunkPos); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//===================//
|
||||
// update processing //
|
||||
//===================//
|
||||
//region
|
||||
|
||||
public void processQueue()
|
||||
{
|
||||
// update the center & max size of the queue manager
|
||||
int maxUpdateSizeMultiplier;
|
||||
if (MC_CLIENT != null && MC_CLIENT.playerExists())
|
||||
{
|
||||
// Local worlds & multiplayer
|
||||
this.setCenter(MC_CLIENT.getPlayerChunkPos());
|
||||
maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Dedicated servers
|
||||
// Also includes spawn chunks since they're likely to be intentionally utilized with updates
|
||||
maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
|
||||
}
|
||||
|
||||
this.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
|
||||
* Config.Common.MultiThreading.numberOfThreads.get()
|
||||
* maxUpdateSizeMultiplier;
|
||||
|
||||
|
||||
|
||||
//===============================//
|
||||
// update the necessary chunk(s) //
|
||||
//===============================//
|
||||
|
||||
this.processQueuedChunkPreUpdate();
|
||||
this.processQueuedChunkUpdate();
|
||||
|
||||
// queue the next position if there are still positions to process
|
||||
AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
|
||||
if (executor != null && !this.updateQueuesEmpty())
|
||||
{
|
||||
try
|
||||
{
|
||||
executor.execute(this::processQueue);
|
||||
}
|
||||
catch (RejectedExecutionException ignore)
|
||||
{
|
||||
// the executor was shut down, it should be back up shortly and able to accept new jobs
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void processQueuedChunkPreUpdate()
|
||||
{
|
||||
ChunkUpdateData preUpdateData = this.preUpdateQueue.popClosest();
|
||||
if (preUpdateData == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IDhLevel dhLevel = preUpdateData.dhLevel;
|
||||
IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
|
||||
chunkWrapper.createDhHeightMaps();
|
||||
|
||||
try
|
||||
{
|
||||
// check if this chunk has been converted into an LOD already
|
||||
boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
|
||||
if (checkChunkHash)
|
||||
{
|
||||
int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
|
||||
int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
|
||||
|
||||
boolean hasNewChunkHash = (oldChunkHash != newChunkHash);
|
||||
if (!hasNewChunkHash)
|
||||
{
|
||||
// do not update the chunk if the hash is the same
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unexpected error when pre-updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void processQueuedChunkUpdate()
|
||||
{
|
||||
ChunkUpdateData updateData = this.updateQueue.popClosest();
|
||||
if (updateData == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
IChunkWrapper chunkWrapper = updateData.chunkWrapper;
|
||||
IDhLevel dhLevel = updateData.dhLevel;
|
||||
ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
|
||||
|
||||
// having a list of the nearby chunks is needed for lighting and beacon generation
|
||||
ArrayList<IChunkWrapper> nearbyChunkList = this.tryGetNeighborChunkListForChunk(chunkWrapper);
|
||||
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
// sky lighting is populated later at the data source level
|
||||
DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, levelWrapper.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
|
||||
|
||||
dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
|
||||
|
||||
int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
|
||||
dhLevel.updateChunkAsync(chunkWrapper, newChunkHash);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
|
||||
}
|
||||
|
||||
this.queuedChunkWrapperByChunkPos.remove(updateData.chunkWrapper.getChunkPos());
|
||||
}
|
||||
private ArrayList<IChunkWrapper> tryGetNeighborChunkListForChunk(IChunkWrapper chunkWrapper)
|
||||
{
|
||||
// get the neighboring chunk list
|
||||
ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
|
||||
for (int xOffset = -1; xOffset <= 1; xOffset++)
|
||||
{
|
||||
for (int zOffset = -1; zOffset <= 1; zOffset++)
|
||||
{
|
||||
if (xOffset == 0 && zOffset == 0)
|
||||
{
|
||||
// center chunk
|
||||
neighborChunkList.add(chunkWrapper);
|
||||
}
|
||||
else
|
||||
{
|
||||
// neighboring chunk
|
||||
DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
|
||||
IChunkWrapper neighborChunk = this.tryGetChunk(neighborPos);
|
||||
if (neighborChunk != null)
|
||||
{
|
||||
neighborChunkList.add(neighborChunk);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return neighborChunkList;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//==================//
|
||||
// position methods //
|
||||
//==================//
|
||||
//region
|
||||
|
||||
public void setCenter(DhChunkPos newCenter)
|
||||
{
|
||||
this.updateQueue.setCenter(newCenter);
|
||||
this.preUpdateQueue.setCenter(newCenter);
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// F3 Menu //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
public String getDebugMenuString()
|
||||
{
|
||||
String y = MinecraftTextFormat.YELLOW;
|
||||
String o = MinecraftTextFormat.ORANGE;
|
||||
String cf = MinecraftTextFormat.CLEAR_FORMATTING;
|
||||
|
||||
|
||||
String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(this.preUpdateQueue.getQueuedCount());
|
||||
String updatingCountStr = F3Screen.NUMBER_FORMAT.format(this.updateQueue.getQueuedCount());
|
||||
String queuedCountStr = F3Screen.NUMBER_FORMAT.format(this.getQueuedCount());
|
||||
|
||||
String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(this.maxSize);
|
||||
|
||||
return "Queued chunk updates: "+"("+y+preUpdatingCountStr+cf+" + "+o+updatingCountStr+cf+") ["+queuedCountStr+"/"+maxUpdateCountStr+"]";
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
+190
@@ -0,0 +1,190 @@
|
||||
package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
|
||||
|
||||
import com.seibel.distanthorizons.core.api.internal.SharedApi;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.world.AbstractDhWorld;
|
||||
import com.seibel.distanthorizons.core.world.EWorldEnvironment;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
/**
|
||||
* Holds all the {@link ChunkUpdateQueueManager} for a loaded world.
|
||||
* Different queues are needed for each level to prevent
|
||||
* chunks from bleeding between levels (IE a nether chunk applied to the overworld).
|
||||
*
|
||||
* @see ChunkUpdateQueueManager
|
||||
*/
|
||||
public class WorldChunkUpdateManager
|
||||
{
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
/** singleton since we only expect to have one world loaded at a time */
|
||||
public static final WorldChunkUpdateManager INSTANCE = new WorldChunkUpdateManager();
|
||||
|
||||
public static final Set<String> LOGGED_GET_ERROR_MESSAGES = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
|
||||
|
||||
|
||||
/**
|
||||
* Queues are only removed during world shutdown.
|
||||
* The assumption is that there will be a limited number of {@link ILevelWrapper}'s
|
||||
* for a given world.
|
||||
*/
|
||||
private final ConcurrentHashMap<ILevelWrapper, ChunkUpdateQueueManager> updateQueueByLevelWrapper = new ConcurrentHashMap<>();
|
||||
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
//region
|
||||
|
||||
private WorldChunkUpdateManager() { }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=================//
|
||||
// manager methods //
|
||||
//=================//
|
||||
//region
|
||||
|
||||
/**
|
||||
* @return null if the world is unloaded or the given level wrapper is the wrong type
|
||||
*/
|
||||
@Nullable
|
||||
public ChunkUpdateQueueManager getByLevelWrapper(ILevelWrapper levelWrapper)
|
||||
{
|
||||
AbstractDhWorld world = SharedApi.getAbstractDhWorld();
|
||||
if (world == null)
|
||||
{
|
||||
// world isn't loaded, no warnings need to be logged
|
||||
return null;
|
||||
}
|
||||
|
||||
// we only want to load chunks for certain level wrappers
|
||||
// this is done specifically on a local-server to prevent
|
||||
// loading both the server and client level wrappers
|
||||
if (world.environment == EWorldEnvironment.CLIENT_ONLY
|
||||
// when connected to a server we should only ever load client wrappers anyway
|
||||
// but this check confirms it
|
||||
&& !(levelWrapper instanceof IClientLevelWrapper))
|
||||
{
|
||||
// how did we get a server level wrapper on the client?
|
||||
// this shouldn't happen, but just in case
|
||||
return null;
|
||||
}
|
||||
else if (
|
||||
(world.environment == EWorldEnvironment.SERVER_ONLY
|
||||
|| world.environment == EWorldEnvironment.CLIENT_SERVER)
|
||||
// when hosting a server we only care about the server wrappers
|
||||
&& !(levelWrapper instanceof IServerLevelWrapper))
|
||||
{
|
||||
// ignore client updates on the server
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
ChunkUpdateQueueManager queueManager = this.updateQueueByLevelWrapper.get(levelWrapper);
|
||||
if (queueManager != null)
|
||||
{
|
||||
return queueManager;
|
||||
}
|
||||
|
||||
return this.updateQueueByLevelWrapper.compute(levelWrapper,
|
||||
(ILevelWrapper newLevelWrapper, ChunkUpdateQueueManager oldQueueManager) ->
|
||||
{
|
||||
if (oldQueueManager != null)
|
||||
{
|
||||
return oldQueueManager;
|
||||
}
|
||||
|
||||
oldQueueManager = new ChunkUpdateQueueManager();
|
||||
return oldQueueManager;
|
||||
});
|
||||
}
|
||||
|
||||
public void processEachQueue()
|
||||
{
|
||||
this.updateQueueByLevelWrapper.forEach(
|
||||
(ILevelWrapper levelWrapper, ChunkUpdateQueueManager updateManager) ->
|
||||
{
|
||||
updateManager.processQueue();
|
||||
});
|
||||
}
|
||||
|
||||
public int getTotalQueuedCount()
|
||||
{
|
||||
AtomicInteger queueCountRef = new AtomicInteger(0);
|
||||
|
||||
this.updateQueueByLevelWrapper.forEach(
|
||||
(ILevelWrapper levelWrapper, ChunkUpdateQueueManager updateManager) ->
|
||||
{
|
||||
queueCountRef.addAndGet(updateManager.getQueuedCount());
|
||||
});
|
||||
|
||||
return queueCountRef.get();
|
||||
}
|
||||
|
||||
public void clear() { this.updateQueueByLevelWrapper.clear(); }
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// F3 Menu //
|
||||
//=========//
|
||||
//region
|
||||
|
||||
public ArrayList<String> getDebugMenuString()
|
||||
{
|
||||
ArrayList<String> stringList = new ArrayList<>();
|
||||
stringList.add("");// placeholder for the total count
|
||||
|
||||
// add each queue to the list
|
||||
AtomicInteger totalQueueCountRef = new AtomicInteger(0);
|
||||
AtomicInteger activeQueueCountRef = new AtomicInteger(0);
|
||||
this.updateQueueByLevelWrapper.forEach(
|
||||
(ILevelWrapper levelWrapper, ChunkUpdateQueueManager updateManager) ->
|
||||
{
|
||||
// is this queue active?
|
||||
if (!updateManager.updateQueuesEmpty())
|
||||
{
|
||||
updateManager.lastMsTimeShownActiveInF3Screen = System.currentTimeMillis();
|
||||
activeQueueCountRef.incrementAndGet();
|
||||
}
|
||||
|
||||
// show this queue if it hasn't been empty long enough
|
||||
// (done to prevent flickering on the F3 screen when the queue rapidly fills/empties)
|
||||
long timeSinceQueueLastShownActiveMs = System.currentTimeMillis() - updateManager.lastMsTimeShownActiveInF3Screen;
|
||||
if (timeSinceQueueLastShownActiveMs < 4_000)
|
||||
{
|
||||
stringList.add(levelWrapper.getDimensionName() + ": " + updateManager.getDebugMenuString());
|
||||
}
|
||||
|
||||
totalQueueCountRef.incrementAndGet();
|
||||
});
|
||||
|
||||
// replace the first line with the number of total/active queues
|
||||
// (helpful if we need to diagnose a leak due to a massive number of queue level wrappers)
|
||||
stringList.set(0, "Chunk Update Queues: "+activeQueueCountRef.get()+"/"+totalQueueCountRef.get());
|
||||
|
||||
return stringList;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
package com.seibel.distanthorizons.core.api.internal.rendering;
|
||||
|
||||
import com.seibel.distanthorizons.core.api.internal.ClientApi;
|
||||
import com.seibel.distanthorizons.core.util.math.DhMat4f;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
|
||||
|
||||
/**
|
||||
* Used to track the rendering state for the current frame.
|
||||
*
|
||||
* @see ClientApi
|
||||
*/
|
||||
public class DhRenderState
|
||||
{
|
||||
public DhMat4f mcModelViewMatrix = null;
|
||||
public DhMat4f mcProjectionMatrix = null;
|
||||
/**
|
||||
* percentage of time into the current client tick. <br><br>
|
||||
*
|
||||
* Can be converted to a millisecond frametime
|
||||
* (IE time between frames in milliseconds) using the formula: <br>
|
||||
* <code>
|
||||
* (partialTickTime/20*1000)
|
||||
* </code> <br>
|
||||
* IE 60 FPS = 16.6 MS <br>
|
||||
*
|
||||
* @link https://fpstoms.com/
|
||||
* @see IMinecraftRenderWrapper#getPartialTickTime()
|
||||
*/
|
||||
public float partialTickTime = -1;
|
||||
public IClientLevelWrapper clientLevelWrapper = null;
|
||||
|
||||
/**
|
||||
* This will generally be true if the player is: <br>
|
||||
* - blinded <br>
|
||||
* - under lava/water <br>
|
||||
* <br>
|
||||
* In those cases some rendering logic may need to be changed
|
||||
* to look correct.
|
||||
*/
|
||||
public boolean vanillaFogEnabled = false;
|
||||
|
||||
|
||||
|
||||
//========//
|
||||
// checks //
|
||||
//========//
|
||||
|
||||
public String unableToRenderBecause()
|
||||
{
|
||||
String errorReasons = "";
|
||||
|
||||
// the matrix may be the identity matrix or and old/incorrect matrix
|
||||
// but we did set it at least once before this
|
||||
if (this.mcModelViewMatrix == null)
|
||||
{
|
||||
errorReasons += "no MVM Matrix, ";
|
||||
}
|
||||
|
||||
if (this.mcProjectionMatrix == null)
|
||||
{
|
||||
errorReasons += "no Projection Matrix, ";
|
||||
}
|
||||
|
||||
if (this.partialTickTime == -1)
|
||||
{
|
||||
errorReasons += "no Frame Time, ";
|
||||
}
|
||||
|
||||
if (this.clientLevelWrapper == null)
|
||||
{
|
||||
errorReasons += "no Level Wrapper, ";
|
||||
}
|
||||
|
||||
return errorReasons;
|
||||
}
|
||||
|
||||
public void canRenderOrThrow() throws IllegalStateException
|
||||
{
|
||||
String errorReasons = this.unableToRenderBecause();
|
||||
if (!errorReasons.isEmpty())
|
||||
{
|
||||
throw new IllegalStateException(errorReasons);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,275 +0,0 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.core.config;
|
||||
|
||||
import com.seibel.distanthorizons.core.config.file.ConfigFileHandling;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
|
||||
import com.seibel.distanthorizons.core.config.types.ConfigCategory;
|
||||
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
||||
import com.seibel.distanthorizons.core.config.types.ConfigUiLinkedEntry;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.nio.file.Path;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Indexes and sets everything up for the file handling and gui
|
||||
*
|
||||
* @author coolGi
|
||||
* @author Ran
|
||||
* @version 2023-8-26
|
||||
*/
|
||||
// Init the config after singletons have been blinded
|
||||
public class ConfigBase
|
||||
{
|
||||
/** Our own config instance, don't modify unless you are the DH mod */
|
||||
public static ConfigBase INSTANCE;
|
||||
public ConfigFileHandling configFileINSTANCE;
|
||||
|
||||
private final Logger logger;
|
||||
public final String modID;
|
||||
public final String modName;
|
||||
public final int configVersion;
|
||||
|
||||
public boolean isLoaded = false;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* What the config works with
|
||||
* <br>
|
||||
* <br> {@link Enum}
|
||||
* <br> {@link Boolean}
|
||||
* <br> {@link Byte}
|
||||
* <br> {@link Integer}
|
||||
* <br> {@link Double}
|
||||
* <br> {@link Short}
|
||||
* <br> {@link Long}
|
||||
* <br> {@link Float}
|
||||
* <br> {@link String}
|
||||
* <br>
|
||||
* <br> // Below, "T" should be a value from above
|
||||
* <br> // Note: This is not checked, so we trust that you are doing the right thing (TODO: Check it)
|
||||
* <br> List<T>
|
||||
* <br> ArrayList<T>
|
||||
* <br> Map<String, T>
|
||||
* <br> HashMap<String, T>
|
||||
*/
|
||||
public static final List<Class<?>> acceptableInputs = new ArrayList<Class<?>>()
|
||||
{{
|
||||
add(Boolean.class);
|
||||
add(Byte.class);
|
||||
add(Integer.class);
|
||||
add(Double.class);
|
||||
add(Short.class);
|
||||
add(Long.class);
|
||||
add(Float.class);
|
||||
add(String.class);
|
||||
|
||||
// TODO[CONFIG]: Check the type of these is valid
|
||||
add(List.class);
|
||||
add(ArrayList.class);
|
||||
add(Map.class);
|
||||
add(HashMap.class);
|
||||
}};
|
||||
|
||||
/** Disables the minimum and maximum of any variable */
|
||||
public boolean disableMinMax = false; // Very fun to use, but should always be disabled by default
|
||||
public final List<AbstractConfigType<?, ?>> entries = new ArrayList<>();
|
||||
|
||||
|
||||
public ConfigBase(String modID, String modName, Class<?> configClass)
|
||||
{
|
||||
this(modID, modName, configClass, getConfigPath(modName), -1);
|
||||
}
|
||||
public ConfigBase(String modID, String modName, Class<?> configClass, Path configPath)
|
||||
{
|
||||
this(modID, modName, configClass, configPath, -1);
|
||||
}
|
||||
public ConfigBase(String modID, String modName, Class<?> configClass, int configVersion)
|
||||
{
|
||||
this(modID, modName, configClass, getConfigPath(modName), configVersion);
|
||||
}
|
||||
|
||||
public ConfigBase(String modID, String modName, Class<?> configClass, Path configPath, int configVersion)
|
||||
{
|
||||
this.logger = LogManager.getLogger(this.getClass().getSimpleName() + ", " + modID);
|
||||
|
||||
this.logger.info("Initialising config for " + modName);
|
||||
this.modID = modID;
|
||||
this.modName = modName;
|
||||
this.configVersion = configVersion;
|
||||
|
||||
this.initNestedClass(configClass, ""); // Init root category
|
||||
|
||||
// File handling (load from file)
|
||||
this.configFileINSTANCE = new ConfigFileHandling(this, configPath);
|
||||
this.configFileINSTANCE.loadFromFile();
|
||||
|
||||
this.isLoaded = true;
|
||||
this.logger.info("Config for " + modName + " initialised");
|
||||
}
|
||||
|
||||
private void initNestedClass(Class<?> configClass, String category)
|
||||
{
|
||||
// Put all the entries in entries
|
||||
|
||||
for (Field field : configClass.getFields())
|
||||
{
|
||||
if (AbstractConfigType.class.isAssignableFrom(field.getType()))
|
||||
{
|
||||
try
|
||||
{
|
||||
this.entries.add((AbstractConfigType<?, ?>) field.get(field.getType()));
|
||||
}
|
||||
catch (IllegalAccessException exception)
|
||||
{
|
||||
this.logger.warn(exception);
|
||||
}
|
||||
|
||||
AbstractConfigType<?, ?> entry = this.entries.get(this.entries.size() - 1);
|
||||
entry.category = category;
|
||||
entry.name = field.getName();
|
||||
entry.configBase = this;
|
||||
|
||||
if (ConfigEntry.class.isAssignableFrom(field.getType()))
|
||||
{ // If item is type ConfigEntry
|
||||
if (!isAcceptableType(entry.getType()))
|
||||
{
|
||||
this.logger.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
|
||||
this.logger.error("Type [" + entry.getType() + "] is not one of these types [" + acceptableInputs.toString() + "]");
|
||||
this.entries.remove(this.entries.size() - 1); // Delete the entry if it is invalid so the game can still run
|
||||
}
|
||||
}
|
||||
|
||||
if (ConfigCategory.class.isAssignableFrom(field.getType()))
|
||||
{ // If it's a category then init the stuff inside it and put it in the category list
|
||||
assert entry instanceof ConfigCategory;
|
||||
if (((ConfigCategory) entry).getDestination() == null)
|
||||
((ConfigCategory) entry).destination = entry.getNameWCategory();
|
||||
if (entry.get() != null)
|
||||
{
|
||||
this.initNestedClass(((ConfigCategory) entry).get(), ((ConfigCategory) entry).getDestination());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isAcceptableType(Class<?> Clazz)
|
||||
{
|
||||
if (Clazz.isEnum())
|
||||
return true;
|
||||
return acceptableInputs.contains(Clazz);
|
||||
}
|
||||
|
||||
|
||||
/** Gets the default config path given a mod name */
|
||||
public static Path getConfigPath(String modName)
|
||||
{
|
||||
return SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class)
|
||||
.getInstallationDirectory().toPath().resolve("config").resolve(modName + ".toml");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Used for checking that all the lang files for the config exist
|
||||
*
|
||||
* @param onlyShowNew If disabled then it would basically remake the config lang
|
||||
* @param checkEnums Checks if all the lang for the enum's exist
|
||||
*/
|
||||
// This is just to re-format the lang or check if there is something in the lang that is missing
|
||||
@SuppressWarnings("unchecked")
|
||||
public String generateLang(boolean onlyShowNew, boolean checkEnums)
|
||||
{
|
||||
ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
|
||||
List<Class<? extends Enum<?>>> enumList = new ArrayList<>();
|
||||
|
||||
String generatedLang = "";
|
||||
|
||||
String starter = " \"";
|
||||
String separator = "\":\n \"";
|
||||
String ending = "\",\n";
|
||||
|
||||
for (AbstractConfigType<?, ?> entry : this.entries)
|
||||
{
|
||||
String entryPrefix = "lod.config." + entry.getNameWCategory();
|
||||
|
||||
if (checkEnums && entry.getType().isEnum() && !enumList.contains(entry.getType()))
|
||||
{ // Put it in an enum list to work with at the end
|
||||
enumList.add((Class<? extends Enum<?>>) entry.getType());
|
||||
}
|
||||
if (!onlyShowNew || langWrapper.langExists(entryPrefix))
|
||||
{
|
||||
if (!ConfigUiLinkedEntry.class.isAssignableFrom(entry.getClass()))
|
||||
{ // If it is a linked item, dont generate the base lang
|
||||
generatedLang += starter
|
||||
+ entryPrefix
|
||||
+ separator
|
||||
+ langWrapper.getLang(entryPrefix)
|
||||
+ ending
|
||||
;
|
||||
}
|
||||
// Adds tooltips
|
||||
if (langWrapper.langExists(entryPrefix + ".@tooltip"))
|
||||
{
|
||||
generatedLang += starter
|
||||
+ entryPrefix + ".@tooltip"
|
||||
+ separator
|
||||
+ langWrapper.getLang(entryPrefix + ".@tooltip")
|
||||
.replaceAll("\n", "\\\\n")
|
||||
.replaceAll("\"", "\\\\\"")
|
||||
+ ending
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!enumList.isEmpty())
|
||||
{
|
||||
generatedLang += "\n"; // Separate the main lang with the enum's
|
||||
|
||||
for (Class<? extends Enum> anEnum : enumList)
|
||||
{
|
||||
for (Object enumStr : new ArrayList<>(EnumSet.allOf(anEnum)))
|
||||
{
|
||||
String enumPrefix = "lod.config.enum." + anEnum.getSimpleName() + "." + enumStr.toString();
|
||||
|
||||
if (!onlyShowNew || langWrapper.langExists(enumPrefix))
|
||||
{
|
||||
generatedLang += starter
|
||||
+ enumPrefix
|
||||
+ separator
|
||||
+ langWrapper.getLang(enumPrefix)
|
||||
+ ending
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return generatedLang;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,330 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.core.config;
|
||||
|
||||
import com.seibel.distanthorizons.core.config.file.ConfigFileHandler;
|
||||
import com.seibel.distanthorizons.core.config.types.*;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
|
||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||
import com.seibel.distanthorizons.core.logging.DhLogger;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.nio.file.Path;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* Sets up everything in {@link Config} for the file/GUI and keeps track of all
|
||||
* entries therein. <br>
|
||||
* This should be run after the singletons have been bound.
|
||||
*
|
||||
* @author coolGi
|
||||
* @author Ran
|
||||
*
|
||||
* @see Config
|
||||
*/
|
||||
public class ConfigHandler
|
||||
{
|
||||
private static final DhLogger LOGGER = new DhLoggerBuilder().build();
|
||||
|
||||
private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
|
||||
|
||||
/**
|
||||
* What the config works with
|
||||
* <br>
|
||||
* <br> {@link Enum}
|
||||
* <br> {@link Boolean}
|
||||
* <br> {@link Byte}
|
||||
* <br> {@link Integer}
|
||||
* <br> {@link Double}
|
||||
* <br> {@link Short}
|
||||
* <br> {@link Long}
|
||||
* <br> {@link Float}
|
||||
* <br> {@link String}
|
||||
* <br>
|
||||
* <br> // Below, "T" should be a value from above
|
||||
* <br> // Note: This is not checked, so we trust that you are doing the right thing
|
||||
* <br> List<T>
|
||||
* <br> ArrayList<T>
|
||||
* <br> Map<String, T>
|
||||
* <br> HashMap<String, T>
|
||||
*/
|
||||
private static final List<Class<?>> ACCEPTABLE_INPUTS = new ArrayList<Class<?>>()
|
||||
{{
|
||||
this.add(Boolean.class);
|
||||
this.add(Byte.class);
|
||||
this.add(Integer.class);
|
||||
this.add(Double.class);
|
||||
this.add(Short.class);
|
||||
this.add(Long.class);
|
||||
this.add(Float.class);
|
||||
this.add(String.class);
|
||||
|
||||
// partially implemented but not entirely
|
||||
this.add(List.class);
|
||||
this.add(ArrayList.class);
|
||||
this.add(Map.class);
|
||||
this.add(HashMap.class);
|
||||
}};
|
||||
|
||||
|
||||
|
||||
public static final ConfigHandler INSTANCE = new ConfigHandler();
|
||||
|
||||
public final ConfigFileHandler configFileHandler = new ConfigFileHandler(getConfigPath());
|
||||
public final List<AbstractConfigBase<?>> configBaseList = new ArrayList<>();
|
||||
|
||||
public boolean isLoaded = false;
|
||||
/**
|
||||
* Disables the minimum and maximum validation. <Br>
|
||||
* Fun to use, but should be disabled by default.
|
||||
*/
|
||||
public boolean runMinMaxValidation = true;
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public static void tryRunFirstTimeSetup()
|
||||
{
|
||||
if (INSTANCE.isLoaded)
|
||||
{
|
||||
LOGGER.debug("ConfigHandler setup already run, ignoring.");
|
||||
return;
|
||||
}
|
||||
|
||||
INSTANCE.runFirstTimeSetup();
|
||||
}
|
||||
private void runFirstTimeSetup()
|
||||
{
|
||||
LOGGER.info("Initialising config for [" + ModInfo.NAME + "]");
|
||||
|
||||
this.initNestedClass(Config.class, ""); // Init root category
|
||||
|
||||
this.configFileHandler.loadFromFile();
|
||||
this.runMinMaxValidation = !Config.Client.Advanced.Debugging.allowUnsafeValues.get();
|
||||
|
||||
this.isLoaded = true;
|
||||
LOGGER.info("[" + ModInfo.NAME + "] Config initialised");
|
||||
}
|
||||
/** Gets the default config path given a mod name */
|
||||
private static Path getConfigPath()
|
||||
{
|
||||
return MC_SHARED
|
||||
.getInstallationDirectory().toPath()
|
||||
.resolve("config")
|
||||
.resolve(ModInfo.NAME + ".toml");
|
||||
}
|
||||
/** Put all the config entries into configEntryList */
|
||||
private void initNestedClass(Class<?> configClass, String category)
|
||||
{
|
||||
Field[] fields = configClass.getFields();
|
||||
for (Field field : fields)
|
||||
{
|
||||
// ignore any non-config variables
|
||||
if (!AbstractConfigBase.class.isAssignableFrom(field.getType()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// add this config to the master list
|
||||
try
|
||||
{
|
||||
this.configBaseList.add((AbstractConfigBase<?>) field.get(field.getType()));
|
||||
}
|
||||
catch (IllegalAccessException e)
|
||||
{
|
||||
LOGGER.warn("Unable to add config ["+field.getType().getName()+"], error: ["+e.getMessage()+"].", e);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// set any necessary variables in this config
|
||||
AbstractConfigBase<?> configBase = this.configBaseList.get(this.configBaseList.size() - 1);
|
||||
configBase.category = category;
|
||||
configBase.name = field.getName();
|
||||
|
||||
|
||||
// validate the config's input type
|
||||
if (ConfigEntry.class.isAssignableFrom(field.getType()))
|
||||
{
|
||||
if (!isAcceptableType(configBase.getType()))
|
||||
{
|
||||
LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
|
||||
LOGGER.error("Type [" + configBase.getType() + "] is not one of these types [" + ACCEPTABLE_INPUTS.toString() + "]");
|
||||
this.configBaseList.remove(this.configBaseList.size() - 1); // Delete the entry if it is invalid so the game can still run
|
||||
}
|
||||
}
|
||||
|
||||
// recursively add deeper categories if present
|
||||
if (ConfigCategory.class.isAssignableFrom(field.getType()))
|
||||
{
|
||||
ConfigCategory configCategory = (ConfigCategory) configBase;
|
||||
|
||||
if (configCategory.getDestination() == null)
|
||||
{
|
||||
configCategory.destination = configBase.getNameAndCategory();
|
||||
}
|
||||
|
||||
// shouldn't happen, but just in case
|
||||
if (configBase.get() != null)
|
||||
{
|
||||
this.initNestedClass(configCategory.get(), configCategory.getDestination());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
private static boolean isAcceptableType(Class<?> inputClass)
|
||||
{
|
||||
if (inputClass.isEnum())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return ACCEPTABLE_INPUTS.contains(inputClass);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//===============//
|
||||
// lang handling //
|
||||
//===============//
|
||||
|
||||
/**
|
||||
* Used for checking that all the lang files for the config exist.
|
||||
* This is just to re-format the lang or check if there is something in the lang that is missing
|
||||
*
|
||||
* @param onlyShowMissing If false then this will remake the entire config lang
|
||||
* @param checkEnums Checks if all the lang for the enum's exist
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
public String generateLang(boolean onlyShowMissing, boolean checkEnums)
|
||||
{
|
||||
ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
|
||||
List<Class<? extends Enum<?>>> enumList = new ArrayList<>();
|
||||
|
||||
String generatedLang = "";
|
||||
|
||||
String starter = " \"";
|
||||
String separator = "\":\n \"";
|
||||
String ending = "\",\n";
|
||||
|
||||
// config entries
|
||||
for (AbstractConfigBase<?> entry : this.configBaseList)
|
||||
{
|
||||
String entryPrefix = "distanthorizons.config." + entry.getNameAndCategory();
|
||||
|
||||
if (checkEnums
|
||||
&& entry.getType().isEnum()
|
||||
&& !enumList.contains(entry.getType()))
|
||||
{
|
||||
// Put it in an enum list to work with at the end
|
||||
enumList.add((Class<? extends Enum<?>>) entry.getType());
|
||||
}
|
||||
|
||||
|
||||
// config file items don't need lang entries
|
||||
if (!entry.getAppearance().showInGui)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// some entries don't need localization
|
||||
if (ConfigUiLinkedEntry.class.isAssignableFrom(entry.getClass())
|
||||
|| ConfigUISpacer.class.isAssignableFrom(entry.getClass()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ConfigUIComment.class.isAssignableFrom(entry.getClass())
|
||||
&& ((ConfigUIComment)entry).parentConfigPath != null)
|
||||
{
|
||||
entryPrefix = "distanthorizons.config." + ((ConfigUIComment)entry).parentConfigPath;
|
||||
}
|
||||
|
||||
|
||||
if (langWrapper.langExists(entryPrefix)
|
||||
&& onlyShowMissing)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
generatedLang += starter
|
||||
+ entryPrefix
|
||||
+ separator
|
||||
+ langWrapper.getLang(entryPrefix)
|
||||
+ ending
|
||||
;
|
||||
|
||||
// only add tooltips for entries that are also missing
|
||||
// their primary lang
|
||||
// this is done since not all menu items need a tooltip
|
||||
if (!langWrapper.langExists(entryPrefix + ".@tooltip")
|
||||
|| !onlyShowMissing)
|
||||
{
|
||||
generatedLang += starter
|
||||
+ entryPrefix + ".@tooltip"
|
||||
+ separator
|
||||
+ langWrapper.getLang(entryPrefix + ".@tooltip")
|
||||
.replaceAll("\n", "\\\\n")
|
||||
.replaceAll("\"", "\\\\\"")
|
||||
+ ending
|
||||
;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// enums
|
||||
if (!enumList.isEmpty())
|
||||
{
|
||||
generatedLang += "\n"; // Separate the main lang with the enum's
|
||||
|
||||
for (Class<? extends Enum> anEnum : enumList)
|
||||
{
|
||||
for (Object enumStr : new ArrayList<Object>(EnumSet.allOf(anEnum)))
|
||||
{
|
||||
String enumPrefix = "distanthorizons.config.enum." + anEnum.getSimpleName() + "." + enumStr.toString();
|
||||
|
||||
if (!langWrapper.langExists(enumPrefix)
|
||||
|| !onlyShowMissing)
|
||||
{
|
||||
generatedLang += starter
|
||||
+ enumPrefix
|
||||
+ separator
|
||||
+ langWrapper.getLang(enumPrefix)
|
||||
+ ending
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return generatedLang;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
+13
-3
@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
||||
public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
||||
public class ConfigPresetOptions<TQuickEnum, TConfig>
|
||||
{
|
||||
public final ConfigEntry<TConfig> configEntry;
|
||||
|
||||
@@ -32,7 +32,11 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
||||
|
||||
|
||||
|
||||
public ConfigEntryWithPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
|
||||
//=============//
|
||||
// constructor //
|
||||
//=============//
|
||||
|
||||
public ConfigPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
|
||||
{
|
||||
this.configEntry = configEntry;
|
||||
this.configOptionByQualityOption = configOptionByQualityOption;
|
||||
@@ -40,6 +44,10 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
||||
|
||||
|
||||
|
||||
//=========//
|
||||
// methods //
|
||||
//=========//
|
||||
|
||||
public void updateConfigEntry(TQuickEnum quickQuality)
|
||||
{
|
||||
TConfig newValue = this.configOptionByQualityOption.get(quickQuality);
|
||||
@@ -48,7 +56,9 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
|
||||
|
||||
public HashSet<TQuickEnum> getPossibleQualitiesFromCurrentOptionValue()
|
||||
{
|
||||
TConfig inputOptionValue = this.configEntry.get();
|
||||
// get true value so we can ignore API overrides,
|
||||
// users find this confusing if their preset is set to "CUSTOM"
|
||||
TConfig inputOptionValue = this.configEntry.getTrueValue();
|
||||
HashSet<TQuickEnum> possibleQualities = new HashSet<>();
|
||||
|
||||
for (TQuickEnum key : this.configOptionByQualityOption.keySet())
|
||||
+49
-21
@@ -17,12 +17,12 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.objects.config;
|
||||
package com.seibel.distanthorizons.core.config.api;
|
||||
|
||||
import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
|
||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
|
||||
import com.seibel.distanthorizons.core.config.types.ConfigEntry;
|
||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||
import com.seibel.distanthorizons.coreapi.util.converters.DefaultConverter;
|
||||
import com.seibel.distanthorizons.core.config.api.converters.DefaultConverter;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@@ -41,11 +41,17 @@ import java.util.function.Consumer;
|
||||
*/
|
||||
public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<apiType>
|
||||
{
|
||||
private final IConfigEntry<coreType> configEntry;
|
||||
private final ConfigEntry<coreType> configBase;
|
||||
|
||||
private final IConverter<coreType, apiType> configConverter;
|
||||
|
||||
|
||||
|
||||
//==============//
|
||||
// constructors //
|
||||
//==============//
|
||||
//region
|
||||
|
||||
/**
|
||||
* This constructor should only be called internally. <br>
|
||||
* There is no reason for API users to create this object. <br><br>
|
||||
@@ -53,9 +59,9 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
||||
* Uses the default object converter, this requires coreType and apiType to be the same.
|
||||
*/
|
||||
@SuppressWarnings("unchecked") // DefaultConverter's cast is safe
|
||||
public DhApiConfigValue(IConfigEntry<coreType> newConfigEntry)
|
||||
public DhApiConfigValue(ConfigEntry<coreType> configBase)
|
||||
{
|
||||
this.configEntry = newConfigEntry;
|
||||
this.configBase = configBase;
|
||||
this.configConverter = (IConverter<coreType, apiType>) new DefaultConverter<coreType>();
|
||||
}
|
||||
|
||||
@@ -63,22 +69,40 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
||||
* This constructor should only be called internally. <br>
|
||||
* There is no reason for API users to create this object. <br><br>
|
||||
*/
|
||||
public DhApiConfigValue(IConfigEntry<coreType> newConfigEntry, IConverter<coreType, apiType> newConverter)
|
||||
public DhApiConfigValue(ConfigEntry<coreType> configBase, IConverter<coreType, apiType> newConverter)
|
||||
{
|
||||
this.configEntry = newConfigEntry;
|
||||
this.configBase = configBase;
|
||||
this.configConverter = newConverter;
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
public apiType getValue() { return this.configConverter.convertToApiType(this.configEntry.get()); }
|
||||
public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configEntry.getTrueValue()); }
|
||||
public apiType getApiValue() { return this.configConverter.convertToApiType(this.configEntry.getApiValue()); }
|
||||
|
||||
|
||||
//===========//
|
||||
// overrides //
|
||||
//===========//
|
||||
//region
|
||||
|
||||
@Override public apiType getValue() { return this.configConverter.convertToApiType(this.configBase.get()); }
|
||||
@Override public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configBase.getTrueValue()); }
|
||||
@Override public apiType getApiValue()
|
||||
{
|
||||
// if no API value is set, this should return null
|
||||
if (this.configBase.getApiValue() == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return this.configConverter.convertToApiType(this.configBase.getApiValue());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setValue(apiType newValue)
|
||||
{
|
||||
if (this.configEntry.getAllowApiOverride())
|
||||
if (this.configBase.getAllowApiOverride())
|
||||
{
|
||||
this.configEntry.setApiValue(this.configConverter.convertToCoreType(newValue));
|
||||
this.configBase.setApiValue(this.configConverter.convertToCoreType(newValue));
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@@ -87,13 +111,13 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean clearValue()
|
||||
{
|
||||
if (this.configEntry.getAllowApiOverride())
|
||||
if (this.configBase.getAllowApiOverride())
|
||||
{
|
||||
// no converter should be used here since null objects may need to be handled differently
|
||||
// TODO the API should just have a bool to keep track of whether the API value is in use instead of using NULL
|
||||
this.configEntry.setApiValue(null);
|
||||
this.configBase.setApiValue(null);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
@@ -102,20 +126,24 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
|
||||
}
|
||||
}
|
||||
|
||||
public boolean getCanBeOverrodeByApi() { return this.configEntry.getAllowApiOverride(); }
|
||||
@Override
|
||||
public boolean getCanBeOverrodeByApi() { return this.configBase.getAllowApiOverride(); }
|
||||
|
||||
public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configEntry.getDefaultValue()); }
|
||||
public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configEntry.getMax()); }
|
||||
public apiType getMinValue() { return this.configConverter.convertToApiType(this.configEntry.getMin()); }
|
||||
@Override public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
|
||||
@Override public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
|
||||
@Override public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
|
||||
|
||||
|
||||
@Override
|
||||
public void addChangeListener(Consumer<apiType> onValueChangeFunc)
|
||||
{
|
||||
this.configEntry.addValueChangeListener((coreValue) ->
|
||||
this.configBase.addValueChangeListener((coreValue) ->
|
||||
{
|
||||
apiType apiValue = this.configConverter.convertToApiType(coreValue);
|
||||
onValueChangeFunc.accept(apiValue);
|
||||
});
|
||||
}
|
||||
|
||||
//endregion
|
||||
|
||||
}
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.coreapi.util.converters;
|
||||
package com.seibel.distanthorizons.core.config.api.converters;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogDrawMode;
|
||||
import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user