Commit Graph

265 Commits

Author SHA1 Message Date
Lukas Rieger (Blue)
03f58c7739
Moving live-player-endpoint to maps/[mapid]/live/player, webroot/data is now webroot/maps, fixed color-css-alpha format 2022-06-27 01:13:48 +02:00
Lukas Rieger (Blue)
8e8934a8c4
Split and move settings.json for each map 2022-06-06 22:51:26 +02:00
Lukas Rieger (Blue)
a4ce85b9f8
Merge branch 'master' into feature/v2 2022-06-05 22:03:17 +02:00
Lukas Rieger (Blue)
ef5e2c08aa
Fix possible int-overflow on radius-update 2022-06-03 18:57:43 +02:00
Lukas Rieger (Blue)
b92536da64
Working on moving settings.json 2022-06-03 18:52:15 +02:00
Lukas Rieger (Blue)
79a12d4d80
Automatic mod-resource-loading, loading fabric netsted jars and more 2022-06-01 00:03:35 +02:00
Lukas Rieger (Blue)
f98376fe27
Fix parent and texture-variable baking 2022-05-29 02:34:26 +02:00
Lukas Rieger (Blue)
7389cb1a16
Completely rework ResourcePack and resource-loading 2022-05-28 21:55:41 +02:00
Lukas Rieger (Blue)
4e7deb2562
Fix missing word 2022-04-24 19:01:28 +02:00
Lukas Rieger (Blue)
92ac2177cd
Fix falsely considering regions outside of the defined render-boundaries 2022-04-24 18:53:06 +02:00
Lukas Rieger (Blue)
2f6238349c
Fix render-thread-calculation can still be below 1 2022-04-24 16:00:13 +02:00
Lukas Rieger (Blue)
492573c866
Fix config formatting and render-thread-calculation 2022-04-24 15:56:03 +02:00
Lukas Rieger (Blue)
e555d558b7
Refactored config management 2022-04-20 22:54:27 +02:00
Lukas Rieger (Blue)
3f049d0523
Require Java 11 2022-01-16 14:20:27 +01:00
Lukas Rieger (Blue)
cd008a32f0
Update gradle, switch to gradle-kotlin where possible (forge doesnt work), improve build-script setup 2022-01-15 01:18:02 +01:00
Lukas Rieger (Blue)
0929678d3b
Merge branch 'master' into feature/sql 2021-12-02 14:11:37 +01:00
Lukas Rieger (Blue)
6186b16e8d
Push BlueMapVue and remove wrong comment from code 2021-12-02 14:10:14 +01:00
Lukas Rieger (Blue)
79b6319ec5
Push BlueMapVue 2021-11-30 22:56:12 +01:00
Lukas Rieger (Blue)
65f906ab08
Update BlueMapVue 2021-11-30 22:01:04 +01:00
Blue (Lukas Rieger)
915f9d9608
Add SQL-Storage and add storage configs 2021-11-14 14:18:31 +01:00
Blue (Lukas Rieger)
49e956ed66
Refactor Map-Storage to be more modular in preparation for SQL-storage 2021-11-06 16:14:14 +01:00
Blue (Lukas Rieger)
3608c050ac
Push BlueMapVue and BlueMapAPI 2021-11-06 16:04:24 +01:00
Blue (Lukas Rieger)
31910382b0
Apply spotless fixes 2021-09-19 22:15:50 +02:00
Blue (Lukas Rieger)
c728170eea
Implement API v1.7.0 2021-09-19 18:52:14 +02:00
Blue (Lukas Rieger)
27545f3149
Update BlueMapVue 2021-09-19 16:07:30 +02:00
Blue (Lukas Rieger)
4806458f9d
Add option to pause rendering if a set amout of players is online 2021-09-18 14:04:03 +02:00
Blue (Lukas Rieger)
b06ef68d99
Add ThreadDump to debug-dump-command 2021-09-15 01:09:45 +02:00
Blue (Lukas Rieger)
8eb74004c6
Fix running update task not being removed if a purge is scheduled 2021-09-13 22:41:52 +02:00
Blue (Lukas Rieger)
1b8bdf2bf4
actually read the worldSkyLight config value 2021-09-13 20:20:10 +02:00
Blue (Lukas Rieger)
eadf854c50
Fix several lighting issues on high and lowres renders 2021-09-13 19:44:31 +02:00
Blue (Lukas Rieger)
e178f935aa
Rewrite of the render-engine and big performance improvements
- changed most immutable vectors with mutable ones
- dropped 1.12.2 support
- improved caching and block/chunk access
- much more smaller tweaks
2021-07-25 13:08:40 +02:00
Blue (Lukas Rieger)
8838bd6f32
Merge branch 'master' into bleeding 2021-07-25 12:57:11 +02:00
Blue (Lukas Rieger)
a1baff4579
Add additional chunk-info to /bluemap debug block 2021-07-20 16:49:26 +02:00
Blue (Lukas Rieger)
3913878e20
Fix sometimes using a world as command-parameter doesnt find the maps to use 2021-07-20 16:39:57 +02:00
Blue (Lukas Rieger)
47b0c60a7f
Fix numbers being replaced by undescores in API#createImage() 2021-07-20 13:56:06 +02:00
Blue (Lukas Rieger)
d88a25ad47
Model-Rewrite: Complete, further performance improvements in progress 2021-07-17 16:06:50 +02:00
Blue (Lukas Rieger)
42a8960705
Update BlueMapVue 2021-06-23 17:12:02 +02:00
Blue (Lukas Rieger)
3c0229811c
Add some info to cancel-command 2021-06-23 14:50:05 +02:00
Blue (Lukas Rieger)
4d6a83f62a
Small improvements 2021-06-23 14:43:14 +02:00
Blue (Lukas Rieger)
22383d30e0
Push BlueMapAPIand BlueMapVue for newest changes 2021-06-22 00:37:38 +02:00
Blue (Lukas Rieger)
470a5cbad1
Fix syncronization issue with the marker-api 2021-06-17 22:56:29 +02:00
Blue (Lukas Rieger)
8ad048ae2a
Add </bluemap debug dump> command 2021-06-16 20:09:45 +02:00
Blue (Lukas Rieger)
d3fe328d8e
Final fix for occasional crash
<Comparison method violates its general contract>
2021-06-16 01:06:23 +02:00
Blue (Lukas Rieger)
5cdadbd7e2
Tentative fix for occasional crash #2 <Comparison method violates its general contract> 2021-06-15 14:28:20 +02:00
Blue (Lukas Rieger)
99c4c623f8
Tentative fix for occasional crash <Comparison method violates its general contract> 2021-06-15 00:51:35 +02:00
Blue (Lukas Rieger)
c6823377a5
Add command to list marker-ids 2021-06-09 17:58:38 +02:00
Blue (Lukas Rieger)
e78071115d
Add setting to disable/enable free-flight-mode in the webapp 2021-06-09 15:54:19 +02:00
Blue (Lukas Rieger)
0e1e4056bb
Workaround for SpongePowered/Configurate#206
When that issue is fixed, this commit can be reverted.
2021-06-09 13:54:14 +02:00
Blue (Lukas Rieger)
dadc882ef2
Push BMVue for menu-closing when entering fullscreen 2021-06-09 00:47:47 +02:00
Blue (Lukas Rieger)
6e01b607ac
Add additional full-update intervall and periodically restart file-watchers 2021-06-09 00:34:12 +02:00
Blue (Lukas Rieger)
633021d6e8
Implement API additions 2021-05-24 14:48:31 +02:00
Blue (Lukas Rieger)
c1f3122c68
Make version handling more flexible 2021-05-23 10:12:34 +02:00
Blue (Lukas Rieger)
e90f329ad8
Add abillity to freeze maps (they wont update) and persist stopped render-threads 2021-05-17 00:24:27 +02:00
Blue (Lukas Rieger)
c0edb3d294
Update gradle, update configurate-library and improve gradle build 2021-05-16 18:13:30 +02:00
Blue (Lukas Rieger)
53378ba059
Add MapUpdateTask and tentatively fix for RenderSorting 2021-05-16 11:13:21 +02:00
Blue (Lukas Rieger)
f4926fe72d
Always reset the maps render state if purging started 2021-05-11 00:44:42 +02:00
Blue (Lukas Rieger)
00d7d3e397
Add cancel command, rework purge command and rename render command 2021-05-11 00:34:12 +02:00
Blue (Lukas Rieger)
e40e45ad12
Improved the render-time estimation 2021-05-10 13:06:25 +02:00
Blue (Lukas Rieger)
d2d6071446
Reimplement render command and add update command 2021-05-08 23:47:13 +02:00
Blue (Lukas Rieger)
16237d292a
Implement file-watchers and remove events that are not needed anymore 2021-05-02 14:51:42 +02:00
Blue (Lukas Rieger)
de21666d55
Push BlueMapVue 2021-04-24 23:17:57 +02:00
Blue (Lukas Rieger)
27295cb988
Intermediate commit: Lots of redesigning with the RenderManager and Render-Tasks 2021-04-24 22:11:26 +02:00
Blue (Lukas Rieger)
5095f0df41
Attempt to fix build 2021-04-24 19:59:36 +02:00
Blue (Lukas Rieger)
5a342e1fe0
Replaced metrics and save-threads with TimerTasks 2021-04-02 12:20:48 +02:00
Blue (Lukas Rieger)
07932506fd
Small webserver code-style improvements 2021-04-02 10:42:10 +02:00
Blue (Lukas Rieger)
a23178f772
Improve file/folder access and creation for a better reliabillity 2021-03-28 18:56:26 +02:00
Blue (Lukas Rieger)
481a452b9c
Some changes to remove 404-responses from the webserver on empty map-tiles 2021-03-28 13:25:39 +02:00
Blue (Lukas Rieger)
bd5071eb61
Push BlueMapVue 2021-03-27 19:42:21 +01:00
Blue (Lukas Rieger)
26ccd8a304
Push BlueMapVue 2021-03-24 18:02:23 +01:00
Blue (Lukas Rieger)
06aacca536
Push BlueMapVue 2021-03-24 17:18:17 +01:00
Blue (Lukas Rieger)
412e607e09
Implement BlueMapAPI 1.5.0 2021-03-23 00:02:20 +01:00
Blue (Lukas Rieger)
658ff7007d
Push BlueMapVue 2021-03-21 13:36:49 +01:00
Blue (Lukas Rieger)
7e3d1f8741
Push BlueMapVue 2021-03-20 23:16:36 +01:00
Blue (Lukas Rieger)
8972549e7a
Push BlueMapVue and tidy up .gitignore 2021-03-19 01:27:53 +01:00
Blue (Lukas Rieger)
2cd2606f58
Replace the webapp with the new BlueMapVue project and adapt the build-script 2021-03-18 22:55:07 +01:00
Blue (Lukas Rieger)
af88ad6e40
Improve RenderTask code-style 2021-02-04 02:00:21 +01:00
Blue (Lukas Rieger)
be1e5a7d95
Push API version and properly implement equals and hashCode for MarkerSet and Marker 2021-02-04 01:22:40 +01:00
pop4959
75de07843b
Clearer wording on the file download message (#125) 2020-12-26 23:53:00 +01:00
Blue (Lukas Rieger)
9f0ea12f0b
Fix NPE when using /bluemap version when bluemap is not loaded 2020-11-13 15:17:35 +01:00
Blue (Lukas Rieger)
6b2e845654
Fix possible integer-overflow when radius-rendering on big worlds 2020-10-23 18:15:26 +02:00
Blue (Lukas Rieger)
68561b1860
Add /bluemap version command and improve /bluemap worlds 2020-10-04 18:01:33 +02:00
Blue (Lukas Rieger)
981a12e349
Fix code stylings 2020-10-04 12:38:09 +02:00
Blue (Lukas Rieger)
961e65b3b3
Merge branch 'rye761-logactivity' into bleeding 2020-10-04 12:25:35 +02:00
Blue (Lukas Rieger)
8b2ddd6e68
Update BlueMapAPI 2020-10-04 12:21:06 +02:00
Ryan Aird
73e8da9c37 Restrict logging of web requests to the CLI when run with --verbose or -b 2020-10-01 14:38:02 -06:00
Blue (Lukas Rieger)
00b9b05431
Actually subtract a tile-position not a block-position to get the correct center 2020-09-30 15:46:42 +02:00
Blue (Lukas Rieger)
e62c5d5be3
Add debug command to save the world and flush scheduled changed chunks
Also change the status command messages a little
2020-09-25 18:24:07 +02:00
Blue (Lukas Rieger)
e5a75f25e1 Change map-updating to rely on chunks rather than tiles
and trigger the updates on chunk-save-events rather than world-save-events if possible to make it more reliable.
2020-09-20 21:12:15 +02:00
Blue (Lukas Rieger)
67f1e03f00 Do render-sorting based on the spawnpoint or radius-render center 2020-09-18 11:37:08 +02:00
Blue (Lukas Rieger)
3b6ed4c297 Make the uuid argument for the /bluemap render cancel command optional
So it can be used on the console to cancel render-tasks
2020-09-15 16:35:10 +02:00
Blue (Lukas Rieger)
2d14e83787 Add NPE to the expected exceptions when trying to fetch a skin 2020-09-15 16:04:10 +02:00
Blue (Lukas Rieger)
e8fc7028d0 Invalidate chunk-cache after a world-save, not directly with the block-change event
To prevent the chunk being loaded again before the changes are being saved to disk.
2020-09-12 17:43:40 +02:00
Blue (Lukas Rieger)
c5ba4b1fea Add /bluemap help command to show all available commands
closes #79
2020-09-12 16:29:01 +02:00
Blue (Lukas Rieger)
a5817d0897 Add purge command 2020-08-30 22:25:38 +02:00
Blue (Lukas Rieger)
cd24f57031 Fix possible NPE and the forge-server instance never being initialized 2020-08-30 20:52:30 +02:00
Blue (Lukas Rieger)
1f93feac9d Load the webserver early to host available resources already during resource-loading 2020-08-30 02:51:39 +02:00
Blue (Lukas Rieger)
29e18506c1 Remove unused method 2020-08-30 02:30:55 +02:00
Blue (Lukas Rieger)
4fc9215f4d Update configurate version 2020-08-30 01:25:10 +02:00
Blue (Lukas Rieger)
9c8ff358b1 Periodically ensure caches are kept clean 2020-08-26 17:25:45 +02:00
Blue (Lukas Rieger)
3756ad591d Actually fix the plugin.conf issue now 2020-08-26 15:06:34 +02:00
Blue (Lukas Rieger)
8585c9637f Add some http-headers to live-api requests 2020-08-26 14:38:20 +02:00
Blue (Lukas Rieger)
576313bd35 Fix default plugin.conf not being generated correctly 2020-08-26 14:12:10 +02:00
Blue (Lukas Rieger)
36161a1f49 Fixes and tweaks after testing 2020-08-25 18:05:25 +02:00
Blue (Lukas Rieger)
76ecb75e73 Make core cross-version compatible 2020-08-25 15:07:42 +02:00
Blue (Lukas Rieger)
72adc573b2 Move resource files to avoid conflicts 2020-08-25 01:39:21 +02:00
Blue (Lukas Rieger)
8adf2eaccf Load plugin.conf earlier and some integrated webserver improvements 2020-08-25 00:57:24 +02:00
Blue (Lukas Rieger)
b6c4971420 Add default configs, generalize CLI and Plugins into BlueMapService and reimplement Plugin and CLI 2020-08-24 23:58:11 +02:00
Blue (Lukas Rieger)
b9763a0963 Reorganize configs: split config classes and update the plugin accordingliy 2020-08-23 23:29:14 +02:00
Blue (Lukas Rieger)
6cfc179e86 Switched to caffeine caches and more optimizations 2020-08-23 12:36:29 +02:00
Blue (Lukas Rieger)
de9953637f Fix NPE trying to unload the plugin 2020-08-19 21:33:02 +02:00
Blue (Lukas Rieger)
c63ec971d6 Fix players not shown after spigot reload and tidy up a lot of exception-handling 2020-08-19 20:17:49 +02:00
Blue (Lukas Rieger)
24c3d52f17 Fix steve-include and make skin update warnings a debug-message 2020-08-16 19:05:30 +02:00
Blue (Lukas Rieger)
724d553a64 Fix live-enable config option not working 2020-08-16 14:47:21 +02:00
Blue (Lukas Rieger)
1716098622 Add live-api configurations 2020-08-16 13:49:40 +02:00
Blue (Lukas Rieger)
c4f0256ca0 Implement playermarkers on the web-app 2020-08-07 14:17:48 +02:00
Blue (Lukas Rieger)
b286670953 Finish implementing the first live-api for sponge 2020-08-06 17:24:36 +02:00
Blue (Lukas Rieger)
b64941783f Merge branch 'mc/1.13' into feature/live 2020-08-04 16:15:55 +02:00
Blue (Lukas Rieger)
2a14718f62 Add license-header check and fix all missing or invalid license headers 2020-08-03 17:51:07 +02:00
Blue (Lukas Rieger)
7861405f60 Fix Fabric build script and implement the fabric-plugin 2020-08-03 14:15:05 +02:00
Blue (Lukas Rieger)
187649a613 Implement player live-api on sponge 2020-07-31 00:42:10 +02:00
Blue (Lukas Rieger)
2e1254ddc8 Merge remote-tracking branch 'origin/mc/1.13' into feature/live 2020-07-30 21:57:37 +02:00
Blue (Lukas Rieger)
3fd22e5b45 Add debug command to clear caches 2020-07-29 20:29:53 +02:00
Blue (Lukas Rieger)
7405520713 Dont let render-threads die. If an error occurs, let them wait for a while, then resurrect them 2020-07-29 20:16:20 +02:00
Blue (Lukas Rieger)
ca4fec8c1a Remove now unneeded exceptions 2020-07-29 20:11:25 +02:00
Blue (Lukas Rieger)
a33dda0a29 More sanity checks and fallbacks to chunkloaders and better IOException handling 2020-07-29 20:00:58 +02:00
Blue (Lukas Rieger)
7f0df85b6f Make debug and render command execute async 2020-07-29 17:01:38 +02:00
Blue (Lukas Rieger)
34c5e96392 Merge branch 'mc/1.13' into feature/live 2020-07-05 15:59:44 +02:00
Blue (Lukas Rieger)
4c65c475dd Fix possible NPE when loading render-manager state. Fixes #46 2020-07-02 17:20:27 +02:00
Blue (Lukas Rieger)
53093a43ff Fix map name being compared instead of map-id. Fixes #51 2020-07-02 17:14:16 +02:00
Blue (Lukas Rieger)
a2cefd78aa Change command requirements for base command. Fixes #52 2020-07-02 17:11:38 +02:00
Blue (Lukas Rieger)
484e4d0779 First changes towards live updates 2020-07-02 13:08:47 +02:00
Blue (Lukas Rieger)
8a43c3e596 Sanity-check map-ids and add config to ignore missing light-data, fixes #35 and fixes #38 2020-05-11 14:42:30 +02:00
Blue (Lukas Rieger)
90473bd83b More command improvements 2020-05-11 13:23:56 +02:00
Blue (Lukas Rieger)
0535a29f8e Command and world-name improvements 2020-05-10 17:29:16 +02:00
Blue (Lukas Rieger)
a246da133c Rework commands 2020-05-10 01:28:09 +02:00
Blue (Lukas Rieger)
b6c0d64d62 Implement API 1.1.0 and fix flickering with markers when zoomed out 2020-04-23 18:08:19 +02:00
Blue (Lukas Rieger)
cd2b9ec650 Add missing licence headers 2020-04-20 12:50:28 +02:00
Blue (Lukas Rieger)
ba69d26c85 Fix loading and saving of markers.json to correctly merge changes 2020-04-20 12:33:55 +02:00
Blue (Lukas Rieger)
6acc75674c Merge branch 'feature/marker' into mc/1.13 2020-04-19 20:13:02 +02:00
Blue (Lukas Rieger)
d8e189528e Implement MarkerAPI 2020-04-19 20:12:37 +02:00
Blue (Lukas Rieger)
eb93b7d1ab Fix some issues with rendering with map-limits 2020-04-16 15:31:33 +02:00
Blue (Lukas Rieger)
bc16ef5d26 First Renderer-API implementation 2020-04-10 17:16:47 +02:00
Blue (Lukas Rieger)
b7a1150b18 Add BlueMapAPI submodule 2020-04-09 22:15:08 +02:00
Blue (Lukas Rieger)
2f046b63d4 Add delay for scheduling tile-renders after a world-save. Fixes #24 and fixes #30 2020-04-09 17:14:00 +02:00
Blue (Lukas Rieger)
e9b8675c2c Finish first forge-mod implementation 2020-04-07 21:04:46 +02:00
Blue (Lukas Rieger)
323cb1bc81 Change project setup: split targets into different jars and relocate shadowed libs 2020-03-30 01:45:32 +02:00
Blue (Lukas Rieger)
0816529f25 Escape special char in code 2020-03-29 19:25:54 +02:00
Blue (Lukas Rieger)
de8031effd Push version for next release 2020-03-29 11:47:37 +02:00
Blue (Lukas Rieger)
62ce024dc6 Better tentative fix for #24 2020-03-28 16:25:38 +01:00
Blue (Lukas Rieger)
d21f6baf68 Push version for new release 2020-03-14 18:21:10 +01:00