Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-09-01 10:29:47 +02:00
Code Issues Projects Releases Wiki Activity
552 Commits 6 Branches 102 Tags 15 MiB
d88a25ad47
Commit Graph

276 Commits

Author SHA1 Message Date
Blue (Lukas Rieger)
6d122a9b10 Fix player-following on world change and actually change the map too, closes #77 2020-08-30 21:00:05 +02:00
Blue (Lukas Rieger)
0559df9730 Improve the use of the file-index for combined file-access 2020-08-30 15:47:53 +02:00
Blue (Lukas Rieger)
591e105c05 Remove guava and yaml-config dependency and tidy up build-script dependencies 2020-08-30 13:25:22 +02:00
Blue (Lukas Rieger)
a79ddace71 Actually throw the interrupted exception if interrupted while loading 2020-08-30 02:49:33 +02:00
Blue (Lukas Rieger)
29e18506c1 Remove unused method 2020-08-30 02:30:55 +02:00
Blue (Lukas Rieger)
8efc23e6a1 Disable autogeneration missing-config logs because they might be misleading in what they do 2020-08-30 01:34:54 +02:00
Blue (Lukas Rieger)
4fc9215f4d Update configurate version 2020-08-30 01:25:10 +02:00
Blue (Lukas Rieger)
63d00073c5 Correctly calculate the number of bits-per block for 1.16-chunks 2020-08-30 00:56:54 +02:00
Blue (Lukas Rieger)
0aa69c7591 Add index to merged file-access, change resource-loading log to debug instead of warnings and make it fail faster on model-errors 2020-08-29 02:18:35 +02:00
Blue (Lukas Rieger)
96959550c6 Also check .mca filesize when loading a chunk 2020-08-26 17:33:45 +02:00
Blue (Lukas Rieger)
9c8ff358b1 Periodically ensure caches are kept clean 2020-08-26 17:25:45 +02:00
Blue (Lukas Rieger)
a5f756d017 Add filesize check before reading .mca files 2020-08-26 14:39:07 +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)
28d56e7374 Also adapt resourceExtensions gradle tasks 2020-08-25 11:59:17 +02:00
Blue (Lukas Rieger)
a2b670c381 Add resourceExtensions for all mc-versions 2020-08-25 11:49:02 +02:00
Blue (Lukas Rieger)
9a9ad1885b Add resources for all mc-versions 2020-08-25 11:35:39 +02:00
Blue (Lukas Rieger)
5514771b6a Merge branch 'base' 2020-08-25 11:27:01 +02:00
Blue (Lukas Rieger)
8950325915 Fix two things from the moved resources 2020-08-25 01:59:03 +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)
669b04ed7b Merge branch 'base' 2020-08-23 12:38:57 +02:00
Blue (Lukas Rieger)
6cfc179e86 Switched to caffeine caches and more optimizations 2020-08-23 12:36:29 +02:00
Blue (Lukas Rieger)
dacab3073f Merge branch 'base' 2020-08-19 21:28:53 +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)
3960869f15 Stop following player-markers when they disappear from the map 2020-08-17 18:42:44 +02:00
Blue (Lukas Rieger)
5bbf67d085 Improve player-follow controls and smooth scrolling 2020-08-17 12:18:19 +02:00
Blue (Lukas Rieger)
0b55274eda Fix player marker follow not getting released correctly 2020-08-17 02:05:48 +02:00
Blue (Lukas Rieger)
1c22865e98 Merge branch 'base' 2020-08-16 21:24:15 +02:00
Blue (Lukas Rieger)
d5f12ee451 Add abillity to stick to a player in web-app 2020-08-16 21:21:02 +02:00
Blue (Lukas Rieger)
eab962cdac Merge branch 'base' 2020-08-16 19:09:00 +02:00
Blue (Lukas Rieger)
e60d60fc93 Fix head image file extension 2020-08-16 19:08:52 +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)
bb7592cdfe Fix player-markers not updating the world correctly, the second 2020-08-16 17:54:21 +02:00
Blue (Lukas Rieger)
2b2cf2da4b Fix player-markers not updating the world correctly 2020-08-16 17:48:14 +02:00
Blue (Lukas Rieger)
b4a0d3d8c2 Merge branch 'base' 2020-08-16 17:35:53 +02:00
Blue (Lukas Rieger)
8c5f15e64e Fix webapp error when live-api is disabled 2020-08-16 17:35:31 +02:00
Blue (Lukas Rieger)
465a38080a Merge branch 'base' 2020-08-16 15:18:55 +02:00
Blue (Lukas Rieger)
1716098622 Add live-api configurations 2020-08-16 13:49:40 +02:00
Blue (Lukas Rieger)
3a5dac58ea Remove unneeded imports 2020-08-15 15:22:10 +02:00
Blue (Lukas Rieger)
19ef75cede Merge branch 'base' 2020-08-15 15:08:11 +02:00
Blue (Lukas Rieger)
f054513e8e Merge branch 'mc/1.13' into feature/live 2020-08-08 10:46:35 +02:00
Blue (Lukas Rieger)
a0e3b0c2af Small bugfix in the webapp 2020-08-08 10:40:14 +02:00
Blue (Lukas Rieger)
c23335df7c Add 0.0.0.0 support for webserver and make it the default config value 2020-08-08 10:39:22 +02:00
Blue (Lukas Rieger)
c4f0256ca0 Implement playermarkers on the web-app 2020-08-07 14:17:48 +02:00
Blue (Lukas Rieger)
b6d358a097 Merge branch 'mc/1.13' into feature/live 2020-08-06 17:26:19 +02:00
Blue (Lukas Rieger)
62c8306b8c Add a button to clear the browsers (tile) cache and reload them 2020-08-06 17:25:54 +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)
c6d28c318b Merge branch 'mc/1.13' 2020-08-03 14:19:17 +02:00
Blue (Lukas Rieger)
9283f2caec Tidy up some chunkloading math 2020-08-03 00:10:37 +02:00
Blue (Lukas Rieger)
e40c3bd0d5 Change hash code generation to improve performance 2020-08-03 00:10:00 +02:00
Blue (Lukas Rieger)
2a0aecf359 Add tint-color for the stonecutter. Fixes #63 2020-07-31 09:50:25 +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)
2ea7ebbe4e Merge branch 'mc/1.13' 2020-07-29 21:10:03 +02:00
Blue (Lukas Rieger)
4beb00ba9e Fix empty sections now not being detected 2020-07-29 21:09:47 +02:00
Blue (Lukas Rieger)
040995b2ae Merge branch 'mc/1.13' 2020-07-29 20:46:50 +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)
a4c8004834 Add some extra sanity checks and fallbacks to chunkloaders 2020-07-29 18:04:16 +02:00
Blue (Lukas Rieger)
d97560cc82 Optimize chunk filter a little 2020-07-29 17:06:50 +02:00
Blue (Lukas Rieger)
aaeeeb136a Actually, we should not rely on an exception here 2020-07-29 16:43:04 +02:00
Blue (Lukas Rieger)
6e123e1c3f Treat not existent region files as empty (not generated) chunks. Fixes #57 2020-07-29 16:36:38 +02:00
Blue (Lukas Rieger)
2a5bdfa9c7 Merge branch 'mc/1.13' 2020-07-29 16:27:25 +02:00
Blue (Lukas Rieger)
71c165fe53 Push apache.commons lang3 dependency version to fix an NPE 2020-07-29 16:26:58 +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)
f492e2c278 Merge branch 'mc/1.13' 2020-07-02 19:52:50 +02:00
Blue (Lukas Rieger)
4ea40c7611 Define EPSILON, since it seems not to be defined by default on all systems. Fixes #48 2020-07-02 19:52:28 +02:00
Blue (Lukas Rieger)
95647acb1e Merge branch 'mc/1.13' 2020-07-02 17:39:16 +02:00
Blue (Lukas Rieger)
4fbd785b3e Catch exception when a model defines a collapsed face. Fixes #43 2020-07-02 17:37:58 +02:00
Blue (Lukas Rieger)
0fe7cf94a9 Add texture-key check. Fixes #53 2020-07-02 16:41:19 +02:00
Blue (Lukas Rieger)
032a640255 Update spigot and resources to support 1.16 2020-07-02 15:52:22 +02:00
Blue (Lukas Rieger)
5282bdc284 Merge branch 'mc/1.13' 2020-07-02 15:38:09 +02:00
Blue (Lukas Rieger)
484e4d0779 First changes towards live updates 2020-07-02 13:08:47 +02:00
Blue (Lukas Rieger)
67cb42fa40 Add support for reading 1.16 region-files 2020-05-15 12:39:19 +02:00
Blue (Lukas Rieger)
2b644e7254 Merge branch 'mc/1.13' 2020-05-11 14:42:52 +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)
8b4e6a3a32 Merge branch 'mc/1.13' 2020-05-11 13:24:52 +02:00
Blue (Lukas Rieger)
0535a29f8e Command and world-name improvements 2020-05-10 17:29:16 +02:00
Blue (Lukas Rieger)
95afba305f Merge branch 'mc/1.13' 2020-05-10 01:44:24 +02:00
Blue (Lukas Rieger)
cf74a70f32 Suppress some compile warnings 
The resource can not be closed at this point, it will be closed later so we ignore the warning.
 2020-04-24 09:11:52 +02:00
Blue (Lukas Rieger)
bd7de954ce Merge branch 'mc/1.13' 2020-04-23 18:09:04 +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)
12d944657d Merge branch 'mc/1.13' 2020-04-20 18:10:27 +02:00
Blue (Lukas Rieger)
f813f9d925 Fix error without marker.json 2020-04-20 18:08:51 +02:00
Blue (Lukas Rieger)
bc472b8090 Merge branch 'mc/1.13' 2020-04-20 13:51:08 +02:00
Blue (Lukas Rieger)
cd2b9ec650 Add missing licence headers 2020-04-20 12:50:28 +02:00
Blue (Lukas Rieger)
73c4151ef2 Merge branch 'mc/1.13' 2020-04-20 12:34:53 +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)
2cbff3ccdb Complete implementing markers on the web-client 2020-04-17 14:56:30 +02:00
Blue (Lukas Rieger)
cac4aece8b Merge branch 'mc/1.13' 2020-04-16 15:43:43 +02:00
Blue (Lukas Rieger)
2f79c61d8c Remove unwanted log 2020-04-16 15:42:20 +02:00
Blue (Lukas Rieger)
7856501001 Merge branch 'mc/1.13' 2020-04-16 15:32:55 +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)
9a09f39b5a First part on implementing markers 2020-04-16 12:33:24 +02:00