Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-29 05:55:57 +01:00
Code Issues Projects Releases Wiki Activity
1,029 Commits 6 Branches 104 Tags 7.9 MiB
deafe50305
Commit Graph

425 Commits

Author SHA1 Message Date
Lukas Rieger (Blue)
cb722840c7
Add mangrove-sign resources 2022-08-01 13:19:58 +02:00
Lukas Rieger (Blue)
fd519e6bf7
Update BlueMapAPI 2022-08-01 12:53:58 +02:00
Lukas Rieger (Blue)
fba273f620
Fix Key equals() 2022-08-01 11:12:50 +02:00
Lukas Rieger (Blue)
ffc472ce84
Fix not loading textures if they are outside the block(s) folder 2022-08-01 00:15:39 +02:00
Lukas Rieger (Blue)
00b01cd0da
Fix lowres tiles failig to load correctly 2022-07-31 22:19:15 +02:00
Lukas Rieger (Blue)
330f2cdbe2
Pretty-print main settings file, to make manual editing easier 2022-07-31 18:58:59 +02:00
Lukas Rieger (Blue)
cef202ebba
Switch to tiles with added wrapper-object for future additional data 2022-07-31 18:06:57 +02:00
Lukas Rieger (Blue)
be04097ec5
Write markers to map-storage and add option to periodically update markers and players to storage 2022-07-30 15:31:42 +02:00
Lukas Rieger (Blue)
ca1d5cb50b
Add option to configure marker-sets in the map-configs 2022-07-30 13:24:07 +02:00
Lukas Rieger (Blue)
879e4f993d
Update BlueMapAPI 2022-07-27 20:31:14 +02:00
Lukas Rieger (Blue)
95e3211a4a
Change git-hash detection, fix ci 2022-07-26 22:04:01 +02:00
Lukas Rieger (Blue)
4da988d31c
Implement BlueMapAPI v2 2022-07-24 12:10:00 +02:00
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)
7f5a54f37a
Merge branch 'master' into feature/v2 2022-06-07 21:45:35 +02:00
Lukas Rieger (Blue)
a53b3daa28
Fix latest-version still being 1.18 (whoops) 2022-06-07 21:26:47 +02:00
Lukas Rieger (Blue)
bbbb36c7a7
Add 1.19 resources 2022-06-07 17:35:56 +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)
b92536da64
Working on moving settings.json 2022-06-03 18:52:15 +02:00
Lukas Rieger (Blue)
b28b4e8c1f
Use default exception handler again 2022-06-01 12:59:18 +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)
92ac2177cd
Fix falsely considering regions outside of the defined render-boundaries 2022-04-24 18:53:06 +02:00
Lukas Rieger (Blue)
e555d558b7
Refactored config management 2022-04-20 22:54:27 +02:00
Lukas Rieger (Blue)
3f634974bc
Reduce log-presence of the ClassNotFound error for RemovelCause on forge 2022-01-22 23:22:42 +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)
4da37cd9f3
Use BlueMaps thread pool for caches in SQLStorage 2022-01-09 15:59:43 +01:00
Lukas Rieger (Blue)
acb7cf1e7b
Close underlying stream on exception in FileStorage 2022-01-09 15:54:06 +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)
2e44193883
Fix swamp biome grass color in 1.18 2021-11-30 22:18:28 +01:00
Lukas Rieger (Blue)
c681a36f3c
Fix IndexOutOfBoundsException for LegacyBiomes with id 170 2021-11-27 23:30:52 +01:00
Blue (Lukas Rieger)
d32eb6f407
Merge branch 'bleeding' into feature/sql 2021-11-21 15:16:41 +01:00
Blue (Lukas Rieger)
23fcab94ac
Complete adding forge 1.17.1 2021-11-20 15:06:52 +01:00
Blue (Lukas Rieger)
ae00af5860
Support 1.18 worlds, add fabric 1.18 support, start adding forge 1.17.1 2021-11-20 12:31:18 +01:00
Lukas Rieger
b98ff9fb99
exclude db-password from debug-dump 2021-11-19 18:57:37 +01:00
Blue (Lukas Rieger)
915f9d9608
Add SQL-Storage and add storage configs 2021-11-14 14:18:31 +01:00
Blue (Lukas Rieger)
f52d463458
Fix biome-id -1 crashing the render 2021-11-09 00:09:43 +01:00
Blue (Lukas Rieger)
4e05ad444b
Fix missing decompession when reading tile-files 2021-11-06 17:12:21 +01:00
Blue (Lukas Rieger)
13944404e1
Add missing license header 2021-11-06 16:26:58 +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)
999c148ded
Add NoSuchFileException to be catched in AtomicFileHelper 2021-09-30 23:49:47 +02:00
Blue (Lukas Rieger)
31910382b0
Apply spotless fixes 2021-09-19 22:15:50 +02:00
Blue (Lukas Rieger)
877100aeb0
More performance tweaking 2021-09-19 19:37:42 +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)
34d89ae0fe
Fix lowres lighting and color calculation issues 2021-09-17 17:13:34 +02:00
Blue (Lukas Rieger)
b06ef68d99
Add ThreadDump to debug-dump-command 2021-09-15 01:09:45 +02:00
Blue (Lukas Rieger)
b4832fd237
Merge branch 'master' into bleeding 2021-09-15 01:08:37 +02:00
Blue (Lukas Rieger)
6a6e8a64bc
Fix MCAWorld not using the Vector-Cache everywhere 2021-09-14 10:29:52 +02:00
Blue (Lukas Rieger)
9fb57f36a2
Remove unneccesary import 2021-09-13 23:39:33 +02:00
Blue (Lukas Rieger)
1d11206d13
Tentative fix trying to move a non-existing filepart file 2021-09-13 23:05:47 +02:00
Blue (Lukas Rieger)
4447c318bd
Improve cave-render detection and update default configs 2021-09-13 22:14:21 +02:00
Blue (Lukas Rieger)
a09d930b15
Release connection break a bit to not completely freeze the webserver on too many requests 2021-09-13 20:10:08 +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)
31e35ce205
Tentative fix for the ClassNotFound errors 2021-09-13 19:44:03 +02:00
Blue (Lukas Rieger)
6579c2090e
Add crimson and warped signs 2021-09-13 19:42:07 +02:00
Blue (Lukas Rieger)
fd109b2407
Potential fix for chisels block-id hack 2021-08-10 21:26:49 +02:00
Blue (Lukas Rieger)
52cb680803
Remove 1.12 version 2021-08-10 21:09:20 +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)
d88a25ad47
Model-Rewrite: Complete, further performance improvements in progress 2021-07-17 16:06:50 +02:00
Blue (Lukas Rieger)
4c23bd5add
Model-Rewrite: Add new mutable model class and deprectate old model classes 2021-06-26 23:20:33 +02:00
Blue (Lukas Rieger)
2b7d18d63f
Merge branch 'master' into bleeding 2021-06-25 15:46:41 +02:00
Blue (Lukas Rieger)
59bd00734c
Small debug dump improvements 2021-06-25 13:51:24 +02:00
Blue (Lukas Rieger)
bb588c322f
Small final/static improvement 2021-06-25 11:05:24 +02:00
Blue (Lukas Rieger)
0818f945c8
Remove unused function in HiresModelManager 2021-06-24 10:36:50 +02:00
Blue (Lukas Rieger)
4d6a83f62a
Small improvements 2021-06-23 14:43:14 +02:00
Blue (Lukas Rieger)
8ad048ae2a
Add </bluemap debug dump> command 2021-06-16 20:09:45 +02:00
Blue (Lukas Rieger)
d04a877f98
Fix translation copy-pasta fail (ignore this ;D) 2021-06-09 17:59:28 +02:00
Blue (Lukas Rieger)
5c591f591f
Print a warning instead of an error when a file can not be loaded, but can be regenerated 2021-06-09 17:27:33 +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)
be059a108f
Update gradle to 7.0.2 and add fabric-1.17 implementation 2021-06-08 22:44:55 +02:00
Blue (Lukas Rieger)
67a0e2a0bf
Improve Version-Management and add support for variable world-heights to be able to support custom 1.17 worlds 2021-06-04 11:25:05 +02:00
Blue (Lukas Rieger)
ecef2c4996
First small performance improvement towards using less immutable vectors 2021-06-04 11:23:53 +02:00
Blue (Lukas Rieger)
633021d6e8
Implement API additions 2021-05-24 14:48:31 +02:00
Blue (Lukas Rieger)
4a54cf7b79
Add null-check to Lazy 2021-05-23 16:08:52 +02:00
Blue (Lukas Rieger)
c1f3122c68
Make version handling more flexible 2021-05-23 10:12:34 +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)
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)
0fc3f2abe1
Fix 1.12 light grey bed resource extension 2021-05-09 09:33:44 +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)
27295cb988
Intermediate commit: Lots of redesigning with the RenderManager and Render-Tasks 2021-04-24 22:11:26 +02:00
Blue (Lukas Rieger)
ad809600b6
Improve thread-pool-settings for the WebServer 2021-04-02 13:18:33 +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)
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)
29020c7b72
Improve debug-log when loading resources, Fix #128 and Fix #147 2021-02-04 18:05:58 +01:00
Blue (Lukas Rieger)
46bd75a068
Add support for custom datapack dimensions 
Fixes #154
 2021-02-04 15:02:21 +01:00
Blue (Lukas Rieger)
af0b76d3e7
Syncronize blockidconfig with a readwritelock Fixes #135 2021-02-04 14:31:25 +01:00
tsutoringo
163ec6a4a6
Fix not defined 'reject'. (#155) 2021-02-04 11:11:48 +01:00
Blue (Lukas Rieger)
17f9094de2
Fix bug where parent-elements can be inherited when they shouldnt 2021-02-01 13:18:14 +01:00
Blue (Lukas Rieger)
3172b6f64a
Just copy propertyVariants if oldVariants would be empty. Fixes #124 2020-12-19 19:59:51 +01:00
Ryan
d509c48025
Add option to save command line logs (#102) 
* Add logger that uses java.util.Logger
* Add file log handler and options to save command line log
* Support subdirectories and only use LoggerLogger as global log when saving the log file
 2020-10-21 21:38:20 +02:00
Blue (Lukas Rieger)
e071ed83fa
Allow reading chunk-sections that have an integer y tag instead of a byte 2020-10-05 17:09:28 +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
Ryan Aird
ddffdd6102 Split logging into separate function and use tabs instead of spaces' 2020-10-03 20:39:26 -06: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
Ryan Aird
f646c1dedb Add python style request logging 2020-10-01 12:14:44 -06:00
Blue (Lukas Rieger)
5784491feb Use the correct DataVersion numbers to choose the chunk-compatibillity 2020-09-19 19:53:03 +02:00
Blue (Lukas Rieger)
d9a2f98481 Only update hash when the camera is no longer moving 
to reduce the history-spam as much as possible while still retaining the url-feature
 2020-09-18 11:50:36 +02:00
Blue (Lukas Rieger)
b8cd92b507 Create the webserver-connection syncronized 
to make sure it is fully started before it can get closed again. Fixes #89
 2020-09-16 10:26:57 +02:00
Blue (Lukas Rieger)
e9ab39c052 Use own ForkJoinPool for cache-cleanups to avoid class-loading errors 
On forge there was a problem sometimes, where presumably a join-fork-thread was created with a class-loader that did not have access to all classes, and therefore crashed in a ClassNotFoundException. This fixes this issue.
 2020-09-15 12:02:12 +02:00
Blue (Lukas Rieger)
6e02ef7a78 Improve exception handling when loading chunks 
Fixes #85
 2020-09-12 16:42:55 +02:00
Blue (Lukas Rieger)
5d82c40884 Ignore fully translucent blocks in the terrain-height calculation 
This makes sure that, e.g. barrier-blocks are not visible on the lowres map. Fixes #83
 2020-09-07 12:28:14 +02:00
Blue (Lukas Rieger)
2e3aa2204c Add favicon to web-app 2020-08-30 21:28:30 +02:00
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)
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)
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