Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,159 Commits 5 Branches 99 Tags 14 MiB
Commit Graph

292 Commits

Author SHA1 Message Date
Lukas Rieger (Blue) 4141d21a70
Add support for xff header in verbose web logger 2023-06-29 08:29:53 +02:00
Lukas Rieger (Blue) 0ac939a644
Always initialize PlayerSkinUpdater to be available to API 2023-06-22 08:21:36 +02:00
Lukas Rieger (Blue) 987015b617
Fix wrong config-key in plugin.conf template 2023-06-21 09:05:53 +02:00
Lukas Rieger (Blue) fdd4713dfb
Fix command permission for deleting a map from a storage 2023-06-20 22:05:24 +02:00
Lukas Rieger (Blue) b4b3e72d51
Make configs generate paths with forwardslashes whenever possible 2023-06-19 15:44:57 +02:00
Lukas Rieger (Blue) 85f4735050
Fix hours in AM/PM format instead of 24 2023-06-18 13:51:07 +02:00
Lukas Rieger (Blue) 2e572ddb11
Fix status command formatting and add last render times to status and maps commands 2023-06-18 13:46:41 +02:00
MrSolarius f149b823a7
Add support for postgres databases (#443) 
* Refactor : wrap every single SQL query inside an interface

* Feat : create every SQL request for postgres

* Refactor : rename SQLQueryAbstractFactory to SQLQueryFactory

* Feat : add dialect settings to blue map !

* Feat : Create two new storageClass for different storage approche

* Feat : add read BYTEA support

* Fix : remove unuseful println

* Fix : remove edited sql.conf

* Refactor / Feat : support for mysql

* Lots of tiny tweaks

---------

Co-authored-by: Lukas Rieger (Blue) <TBlueF@users.noreply.github.com>
 2023-06-12 22:55:44 +02:00
TechnicJelle c807699c7c
Add port-in-use check (#440) 
* Add port-in-use check to plugin

* Add port-in-use check to CLI
 2023-06-08 23:12:20 +02:00
Lukas Rieger (Blue) e2037e9698
Run status-command in separate thread 2023-05-15 17:40:47 +02:00
Lukas Rieger (Blue) 083c6c06c2
Improve progressEstimation function 2023-05-15 17:18:25 +02:00
Lukas Rieger (Blue) 742f96db6a
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-05-15 17:01:28 +02:00
Lukas Rieger (Blue) f1f2336dff
Remove syncronization from estimateProgress() function 2023-05-15 17:01:10 +02:00
z-glitch 463f5cb120
Update URL for 3rd party addons and tools. (#431) 2023-05-14 11:55:35 +02:00
Lukas Rieger (Blue) 659fb99eb6
Avoid NPE if accessing the API while bluemap is unloaded 2023-05-14 02:18:31 +02:00
Lukas Rieger (Blue) 92e5300c1e
Clear chunks from cache when starting a render-task for them 2023-05-09 22:09:18 +02:00
Antti Ellilä f467220400
Start rendering after everything else is loaded (#425) 
To attempt to fix the weirdness with tile filters not working at startup
 2023-05-07 19:24:43 +02:00
Lukas Rieger (Blue) 94dbd372dc
Fix typo 2023-05-01 20:43:16 +02:00
Lukas Rieger (Blue) 004f296b5e
Add storages command 2023-05-01 20:41:30 +02:00
Lukas Rieger (Blue) 5e17df6b2a
Fix locking on the same lock that is used for loading causes the server to freeze 2023-03-13 19:30:31 +01:00
Lukas Rieger (Blue) 86b7e752ee
Improve default sql.conf (Jelle edition) 2023-03-11 11:47:08 +01:00
Lukas Rieger (Blue) 4181732db7
Improve default sql.conf 2 2023-03-11 11:45:27 +01:00
Lukas Rieger (Blue) dbbcbb94c3
Improve default sql.conf 2023-03-11 11:43:46 +01:00
Lukas Rieger (Blue) 1be7dd5746
Implement abillity to handle Http-Requests asyncrounously 2023-03-06 20:38:38 +01:00
Lukas Rieger (Blue) f3f609c573
Generalize purge task for all storages 2023-03-04 12:40:12 +01:00
Lukas Rieger (Blue) c2499df3a7
Change image response to 204 and always save an empty players.json 2023-03-02 16:30:28 +01:00
Lukas Rieger (Blue) 0f58b7409b
Revert "Fix PR #395 ^^" 
This reverts commit 7612998bda.
 2023-02-25 22:42:45 +01:00
Lukas Rieger (Blue) 7612998bda
Fix PR #395 ^^ 2023-02-25 22:03:31 +01:00
nlog b9a3c2849a
Modify setFrozen behavior (#395) 2023-02-25 21:59:04 +01:00
Lukas Rieger (Blue) 631c409f79
Keep webserver running if bluemap disables due to no active maps being configured 2023-02-25 12:28:07 +01:00
Lukas Rieger (Blue) 892506f2f9
Remove uneccesary lock, fix double server header, organize packages and class-names 2023-02-24 13:55:21 +01:00
Lukas Rieger (Blue) 0123041925
Fix webserver only working after plugin reload 2023-02-23 10:54:17 +01:00
Lukas Rieger (Blue) f4c6adc685
Rewrite integrated webserver to be non-blocking 2023-02-22 16:19:34 +01:00
Lukas Rieger (Blue) a0f34d3d96
Prevent the integrated webserver from sending raw php files 2023-02-15 21:10:23 +01:00
Lukas Rieger (Blue) fdb846a435
Remove the marker-examples alltogether 
Makes the default map.conf more clean,
and makes people read the wiki ;p
 2023-02-08 13:08:17 +01:00
Lukas Rieger (Blue) 38932cea28
Add sorting and listed properties to map.conf example markers 2023-02-08 12:53:56 +01:00
Lukas Rieger (Blue) e5729a767c
Fix bug that updates the settings.json if the webapp is being disabled 2023-01-15 11:43:22 +01:00
Lukas Rieger (Blue) 45331b8103
Still start sorting-index with 0 :) 2023-01-06 19:10:41 +01:00
Lukas Rieger (Blue) 3defd493d2
Improve default map config generation if there are more than one dimensions of the same type 2023-01-06 19:04:01 +01:00
Lukas Rieger (Blue) 1fa8bb5e4c
Add light-reload command to reload bluemap without reloading all block-resources 2023-01-03 16:03:07 +01:00
Lukas Rieger (Blue) 3b37be432c
Tentative fix for webserver not closing for 10 seconds when bluemap unloads 2023-01-03 16:01:24 +01:00
Lukas Rieger (Blue) eeabc2135c
Move assets out of the live folder because it makes absolutely no sense for them to be there 2022-12-29 17:54:17 +01:00
Lukas Rieger (Blue) 9560024eb5
Add abillity to add holes to shape and extrude markers 2022-12-29 17:49:08 +01:00
Lukas Rieger (Blue) df5acb6c53
Improve inhabited time check 2022-12-17 15:12:23 +01:00
Lukas Rieger (Blue) c7fc230dcf
Fix inhabited time check 2022-12-17 15:10:22 +01:00
Lukas Rieger (Blue) cf93cb56c4
Improve min-inhabited-time calculations and add hidden radius setting 2022-12-17 15:06:18 +01:00
Lukas Rieger (Blue) 2a94b0faab
Fix live-interface paths 2022-12-13 17:39:12 +01:00
Lukas Rieger (Blue) 6d53bce0dd
Add stuff 2022-12-13 16:54:31 +01:00
Lukas Rieger (Blue) 1368f86d13
Also reset texture-gallery on map-purge 2022-11-28 20:38:34 +01:00
Lukas Rieger (Blue) 1771768afe
Add a connection-timeout as this might resolve cases where the webserver is hanging for a long time 2022-11-14 17:24:26 +01:00
Lukas Rieger (Blue) 66ce77ccc9
Fix bug in api implementation returning the wrong player-visibillity 2022-11-07 11:48:28 +01:00
Mark-225 1f3ebafd10
More accurate player head layers (#353) 2022-10-23 19:38:42 +02:00
Lukas Rieger (Blue) 8faa067634
Fix default config-template value for caves 2022-10-23 00:56:35 +02:00
Lukas Rieger (Blue) ff100e2656
Add option to use ocean-floor-heightmap to improve cave-detection 2022-10-23 00:52:39 +02:00
Lukas Rieger (Blue) 81f309b0be
Create directories with symlinks in mind, fixes #349 2022-10-14 10:24:19 +02:00
Lukas Rieger (Blue) 5624c5f216
Fix some issues with the purge command 2022-10-04 20:40:38 +02:00
Lukas Rieger (Blue) d7eb9e8083
Fix outdated warning message text 2022-10-02 20:50:20 +02:00
Lukas Rieger (Blue) 9afcb33790
Push BlueMapVue and add version to index.html on web-app creation 2022-09-12 12:02:36 +02:00
Lukas Rieger (Blue) e8f8317d52
Fix/improve handling of two exceptions 2022-09-08 12:29:11 +02:00
Lukas Rieger (Blue) d9df6989ff
Add option to hide players if they are in the shadows *mystic sound here* 2022-09-02 23:10:51 +02:00
Lukas Rieger (Blue) 60a8f5f98e
Close storages that failed to load and misconfigured maps dont stop loading the others 2022-08-27 15:08:17 +02:00
Lukas Rieger (Blue) 478ccf52a5
Update BlueMapAPI + Implementation 2022-08-25 15:46:37 +02:00
Lukas Rieger (Blue) 471183b419
Add some SQL-Storage settings and tweak some connection-pool settings 2022-08-21 00:28:40 +02:00
Lukas Rieger (Blue) efd365daeb
Fix issue with checking render-playerlimit 2022-08-21 00:26:34 +02:00
Lukas Rieger (Blue) 4c9b45e6eb
Fix sql-config-template, remove debug-log and add map-id to cli-filewatcher output 2022-08-18 18:06:55 +02:00
Lukas Rieger (Blue) eac01bb06e
Change y to z for start-pos config 2022-08-18 16:08:33 +02:00
Lukas Rieger (Blue) f80e7ea546
Fix config template for start-pos 2022-08-18 16:06:00 +02:00
Lukas Rieger (Blue) bd88b2979d
Remove the user & password settings for database, as they should be added to the jdbc-connection string 2022-08-17 23:27:56 +02:00
Lukas Rieger (Blue) 89ca7053dd
Fix map-region filter limits on the z-Axis based on minY instead of minZ 2022-08-17 22:38:07 +02:00
Lukas Rieger (Blue) 83806641ac
Add minimum inhabitedTime configuration to maps 2022-08-15 11:43:16 +02:00
Lukas Rieger (Blue) c3a26abc3b
Add option to disable saving the hires-layer 2022-08-15 00:19:24 +02:00
Lukas Rieger (Blue) cf5a0da221
Fix IndexOutOfBoundsException if CombinedRenderTask is almost finished 2022-08-14 21:30:15 +02:00
Lukas Rieger (Blue) 42e53f0135
Fixes for lowres lighting and map-purging/saving, tweak default settings 2022-08-14 20:36:50 +02:00
Lukas Rieger (Blue) 413151e9ed
Merge branch 'feature/lowres' 2022-08-12 18:11:26 +02:00
Lukas Rieger (Blue) 562deb17a3
Finalize new lowres tiles implementation 2022-08-12 18:11:11 +02:00
Lukas Rieger (Blue) 44906f889b
Small performance improvements (resolving world-ids and sql-querys) 2022-08-09 22:35:21 +02:00
Lukas Rieger (Blue) 7d14ca4a29
Merge branch 'master' into feature/lowres 2022-08-08 21:29:50 +02:00
Lukas Rieger (Blue) 81574c5176
Rewrite lowres tiles with mutiple LODs 2022-08-07 20:32:55 +02:00
Lukas Rieger (Blue) e2f1f10fdb
Fix hires-slider-default being controlled by the lowres-default setting 2022-08-07 08:35:16 +02:00
Lukas Rieger (Blue) bddd455581
Fix some map-purging issues 2022-08-06 07:05:29 +02:00
Lukas Rieger (Blue) c289fd8c13
Never overwrite existing world-ids 2022-08-03 17:35:16 +02:00
Lukas Rieger (Blue) dafabac5bb
Add a way to register externally rendered or static maps without a world 2022-08-03 12:54:03 +02:00
Lukas Rieger (Blue) d4f00682a6
Fix web-app api throwing an error and add full errors to the StateDumper 2022-08-02 18:14:38 +02:00
Lukas Rieger (Blue) fd519e6bf7
Update BlueMapAPI 2022-08-01 12:53:58 +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) bc8e52abbf
Use int for ports instead of short to support full port-range 2022-07-31 22:34:18 +02:00
Lukas Rieger (Blue) 77b7854d0f
Fix typo 2022-07-31 22:00:30 +02:00
Lukas Rieger (Blue) 5271025933
Fix name-format in the sql.conf 2022-07-31 21:58:10 +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) ae992419bb
Fix Caffeine using wrong thread-pool and add sorting to initial map-update 2022-07-31 18:45:30 +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) 2d57b1a32a
Fix accidentally pushed unfinised code >_> 2022-07-28 23:05:47 +02:00
Lukas Rieger (Blue) cd3a607022
Push BlueMapAPI 2022-07-28 22:58:16 +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) c4e7349c54
Add player-filter to plugin-state 2022-07-04 13:07:56 +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) 8e8934a8c4
Split and move settings.json for each map 2022-06-06 22:51:26 +02:00