Commit Graph

463 Commits

Author SHA1 Message Date
Lukas Rieger
7cdc8213fa
Merge pull request #538 from Salzian/parallel-settings-loading
Parallelized initial settings loading
2024-05-09 12:40:51 +02:00
Salzian
fe5c1fa785 Parallelized initial settings loading 2024-05-08 23:47:50 +02:00
Lukas Rieger (Blue)
36c1d3f7ac
Restructure resource-extensions, fix some issues and add support for biome grass_color_modifier 2024-05-08 19:31:36 +02:00
Lukas Rieger (Blue)
81fe41fd2b
Renderstate rewrite, and moving biomes to datapacks, mc-version and vanilla-resources and resource-extensions rewrite (wip) 2024-05-07 16:45:24 +02:00
Lukas Rieger (Blue)
fa966c4363
Change popup-marker to always be in front of other markers 2024-04-08 13:37:34 +02:00
Lukas Rieger (Blue)
240ca6c00e
Fix some issues with the new sql-storage implementations 2024-04-07 12:55:41 +02:00
Lukas Rieger (Blue)
f18f7a9a16
Update vite 2024-04-06 01:36:26 +02:00
Lukas Rieger (Blue)
f66437ac83
Apply spotless fixes 2024-04-06 01:33:24 +02:00
Lukas Rieger (Blue)
fdf242acdf
Rework storages to make them extensible with addons 2024-04-06 01:26:16 +02:00
Lukas Rieger (Blue)
f097517320
Publish BlueMapCore and BlueMapCommon to BlueColored repo 2024-04-04 02:07:09 +02:00
Lukas Rieger (Blue)
498a4f3190
Minimum required Java version is now 16, drop support for spigot versions < 1.16.5 2024-03-29 13:08:59 +01:00
Lukas Rieger (Blue)
757979b7b4
Implement equals and hashCode for BlueMapMap and BlueMapWorld 2024-03-24 00:07:10 +01:00
Lukas Rieger (Blue)
6e8247ae3a
Tentative fix for flickering with some custom animated textures 2024-03-21 14:40:20 +01:00
Gerber Lóránt Viktor
a847e247e5
Add mechanism for retrieving BlockEntity data (#524)
* Add mechanism for retrieving BlockEntity data

This commit adds a mechanism for retrieving block entity data.
Block entity data is required to support for example text on signs,
banner patterns, or mods such as Domum Ornamentum.

* Fix the coordinate-packing for block entity-loading

This commit fixes the incorrect shifting of bits when
packing the chunk-local coordinates of a block entity
into a 64-bit long for lookups.

* Change mapping type of BlockEntity lookups

This commit changes the type stored for BlockEntity
mappings from a class of the type associated with the
ID to a method reference to its constructor.

* Tidy BlockEntity mappings

This commit introduces a small functional interface
to make the type less ungodly. Also silences the warning
about referencing subclasses in the superclass, it is
fine in this case, we're just storing a reference to
the constructor.

* Add missing license headers

The license headers were missing. Oops.
2024-03-20 23:23:03 +01:00
Lukas Rieger (Blue)
b60b14372f
Fix menu-title of player-markers not translatable 2024-03-20 22:05:38 +01:00
Lukas Rieger (Blue)
aecbd23ba7
Implement animated textures 2024-02-26 01:59:28 +01:00
Lukas Rieger (Blue)
c9a8c83d6e
Fix map hires sometimes not loading when loading a map 2024-02-25 15:09:10 +01:00
Lukas Rieger (Blue)
ceb31b68eb
Add more cache-control headers to sql.php 2024-02-25 02:19:40 +01:00
Lukas Rieger (Blue)
b625af695c
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2024-02-25 02:15:45 +01:00
Lukas Rieger (Blue)
908789a815
Add more cache-control headers to integrated webserver 2024-02-25 02:15:34 +01:00
Nikita
c0c946d154
Update ru translation (#515)
Co-authored-by: NikitaCartes-forks <66517597+NikitaCartes-forks@users.noreply.github.com>
2024-02-25 01:26:08 +01:00
Lukas Rieger (Blue)
b02b91d3bb
Use the global cache-hash for settings and textures .json requests 2024-02-25 01:00:20 +01:00
Lukas Rieger (Blue)
0d36a0f70b
Fix region file watcher ignoring linear files 2024-02-24 22:09:25 +01:00
Lukas Rieger (Blue)
35c236e9ce
Turn storage-enum into a registry 2024-02-24 14:11:56 +01:00
Lukas Rieger (Blue)
122ba83ebb
Correct content-type header and response for empty map tiles 2024-02-24 10:44:25 +01:00
Lukas Rieger (Blue)
6e68a8f0e0
[breaking] Switch hires tile format to prbm (modified prwm) 2024-02-23 17:32:07 +01:00
Lukas Rieger (Blue)
ff1e38a7e1
Fix Map-Updates not working correctly 2024-02-22 12:58:57 +01:00
TechnicJelle
2dd7a0a9c2
Log user-added Scrips & Styles when they load in (#506) 2024-02-14 21:23:27 +01:00
Lukas Rieger (Blue)
81e8da3b70
Fix storage performance 2024-02-08 13:18:49 +01:00
Lukas Rieger
16981f2797
Refactor World-Management and Region/Chunk-Loading (#496)
* Implement PackedIntArrayAccess

* First working render with BlueNBT

* Progress converting chunkloaders

* Core rewrite done

* WIP - Restructuring configs and world-map mapping

* WIP - Compiling and starting without exceptions :)

* Fix cave detection

* Ensure configuration backwards compatibility (resolve dimension from configured world if missing)

* Implement support for 1.16+ chunks

* Implement support for 1.15+ chunks

* Implement support for 1.13+ chunks and some fixes

* Also find worlds based on their id again in BlueMapAPI

* Improve autogenerated config names

* Implement equals for all ServerWorld implementations

* Get rid of var usage
2024-02-07 20:43:37 +01:00
Lukas Rieger (Blue)
b3c4f3737d
Webapp: Fix screen-pos calculation on click 2024-01-25 15:28:33 +01:00
Lukas Rieger (Blue)
61f883b134
Add -m option to cli, which allows to filter the maps that should be loaded and rendered 2024-01-23 19:35:25 +01:00
Lukas Rieger (Blue)
6a10fac624
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2024-01-22 09:52:07 +01:00
Lukas Rieger (Blue)
039a95c813
Update vite 2024-01-22 09:52:02 +01:00
jhqwqmc
b1aba76d09
Update zh_CN.conf (#501) 2024-01-18 13:43:33 +01:00
Lukas Rieger (Blue)
a703a92357
Remove pretty-printing from settings.json 2024-01-17 18:27:44 +01:00
Lukas Rieger (Blue)
50b7f3670e
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2024-01-14 10:05:05 +01:00
Lukas Rieger (Blue)
d6e4e69417
Fix unlisted markers being counted 2024-01-14 10:05:00 +01:00
Arkyoh
6bf4291779
Update fr.conf (#497) 2024-01-06 10:41:47 +01:00
birbkeks
e62919f14f
updated Turkish language (#495)
* Update tr.conf

fixed typos

* Update tr.conf

fixed more typos
2023-12-23 20:14:01 +01:00
TechnicJelle
7c3485363e
Fix grammar in BlueMapService.java (#494) 2023-12-14 16:26:31 +01:00
Albus Rex
0bad1b6b2a
PDO php script implementation (#486)
* pdo connector implementation

* renamed php script

* made mysql default

* made errors generic

* Some small changes to make it work with mysql

* Better newlines

---------

Co-authored-by: AlbusRex <braisskarget@gmail.com>
Co-authored-by: Lukas Rieger (Blue) <TBlueF@users.noreply.github.com>
2023-11-20 12:40:47 +01:00
Lukas Rieger (Blue)
20d32cb9c9
Hide map-menu button if there is only one map, hide marker menu button if there are no markers 2023-11-19 17:15:08 +01:00
Lukas Rieger (Blue)
73103eda3b
Improve redraw-trigger on settings-changes 2023-11-19 13:42:56 +01:00
Lukas Rieger (Blue)
77c1e42009
Change default nether and end configs to have a better void color 2023-11-19 11:22:43 +01:00
Lukas Rieger (Blue)
c7af5e9639
Fix url angle in free-flight not applying correctly. Fixes: #485 2023-11-18 14:45:06 +01:00
Lukas Rieger (Blue)
6d3774f24e
Set fallback void color to black, pause high fps redraws if nothing changes to save GPU usage 2023-11-18 14:20:45 +01:00
Lukas Rieger (Blue)
24a6b2f370
Fix freeflight option not removed from menu. Fixes: #482 2023-10-06 08:26:10 +02:00
TechnicJelle
48445db7b5
Add map config for having a different void colour (#477)
* Added global webapp option for not having a void

* Fix for non-default lighting conditions

* Replace `isVoid` with whole `voidColor` feature!

* Default void colour should be black

* And now the default sky colour can also be set back to what it was

* Fix the low-res void colour

* Add config option for the new void colour setting!

(I hope I haven't forgotten any place to add it, but it does work, so I don't think so..?)
2023-09-30 23:42:37 +02:00
Lukas Rieger
01027af969
Update Gradle and 1.20.2 support (#479)
* Update gradle

* Update Fabric-Loom and ForgeGradle

* Add fabric-1.20.2 implementation

* Finalize 1.20.2 update

---------

Co-authored-by: NikitaCartes <nikich98@yandex.ru>
2023-09-27 17:39:47 +02:00
TechnicJelle
7047df73d0
Made webserver binding logging less confusing (#474)
People often think "0.0.0.0" is the IP they should connect to when BlueMap logs `WebServer bound to: /0.0.0.0:8100`
Or they see the IPv6 address being logged, and think BlueMap is only running on IPv6.
2023-09-07 08:41:50 +02:00
Lukas Rieger (Blue)
7156993323
Make webserver resource-closing more watertight against potential leaks 2023-09-05 14:22:30 +02:00
Lukas Rieger (Blue)
15d402cceb
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-08-10 16:10:06 +02:00
Lukas Rieger (Blue)
4aadaeb2e0
Fix indentation of frozen status on map list 2023-08-10 16:09:57 +02:00
TWME
87032fde81
Update zh_TW.conf (#460)
* Update zh_TW.conf

* Create zh_TW_new.conf

* Update zh_TW.conf

* Delete zh_TW_new.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf
2023-07-30 16:17:15 +02:00
Lukas Rieger (Blue)
0eb12a1588
Fix webapp error when player-markers are disabled 2023-07-16 02:03:54 +02:00
Lukas Rieger (Blue)
c851812f42
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-07-11 20:07:24 +02:00
Lukas Rieger (Blue)
074bc4a436
Fix not able to teleport to players on other worlds. Fixes: #451 2023-07-11 20:07:10 +02:00
TechnicJelle
eaac9f8f84
Translated new strings to Dutch (#453) 2023-07-09 15:33:32 +02:00
Lukas Rieger (Blue)
282b3806f3
Do not reset camera when pressing the update-map button 2023-07-09 15:25:38 +02:00
Lukas Rieger (Blue)
1f7f51c1e1
Add webapp option to default to flat-view 2023-07-04 14:42:12 +02:00
Lukas Rieger (Blue)
1b2dc45b4b
Add debug-log, improve logging in general and fix weblogger not closing correctly 2023-07-01 09:44:19 +02:00
Lukas Rieger (Blue)
15f5e8fd00
Fix default log file name 2023-06-29 13:51:41 +02:00
Lukas Rieger (Blue)
0ebea9982f
Apply Spotless fixes for BlueMapCommon 2023-06-29 13:42:56 +02:00
Lukas Rieger (Blue)
d570884def
Add advanced webserver logging + settings 2023-06-29 13:37:31 +02:00
Lukas Rieger (Blue)
8f97b08eb5
Use string-builder in verbose logger 2023-06-29 08:38:46 +02:00
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)
31ae055ae5
Fix marker-set default-hide not working anymore 2023-06-19 11:47:53 +02:00
Lukas Rieger (Blue)
2f78f75a90
escape marker-set id when saving to local storage 2023-06-19 11:42:25 +02:00
Lukas Rieger (Blue)
76e3c4e758
Fix markers being selectable 2023-06-19 11:28:11 +02:00
Lukas Rieger (Blue)
49f76c1b11
Fix markers overlap over menu if more than 100 markers are on the map 2023-06-19 11:05:56 +02:00
Lukas Rieger (Blue)
b3c7d89793
revert accidentally committed vite config change 2023-06-18 23:52:41 +02:00
Lukas Rieger (Blue)
55095f1b5e
Add capabillity to use -follow players- in first-person mode. Closes: #175 2023-06-18 23:44:07 +02:00
Lukas Rieger (Blue)
cb638910ce
Remember hide/show status of marker-sets 2023-06-18 17:15:44 +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
Lukas Rieger (Blue)
55fb955ed7
Fix clear() method not actually clearing the markerset. Fixes: #430 2023-06-17 13:33:42 +02:00
Lukas Rieger (Blue)
e46efc4c53
Use root-map element for scroll-events. Fixes: #409 2023-06-17 12:42:34 +02:00
Lukas Rieger (Blue)
22f2b09fe5
Fix Mobile first-person Controls not showing. Fixes: #447 2023-06-17 11:59:16 +02:00
Lukas Rieger (Blue)
4fc6d7f889
Fix stuck moving when window looses focus. Fixes: #408 2023-06-17 11:53:39 +02:00
Antti Ellilä
da8a12158b
Expose more JavaScript classes (#449)
With the lack of a proper JavaScript API for addons, it might be useful to just expose all the classes in the global namespace for usage and code injection.
2023-06-15 20:08:36 +02:00
stdpi
bac87ec546
chore: add Vietnamese translation (#448) 2023-06-15 19:12:22 +02:00
Lukas Rieger (Blue)
d120a00496
rename _index.php to mysql.php 2023-06-12 23:14:05 +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)
22917d36eb
Update vite for security-issue fix
(We are not affected, but updating doesnt hurt)
2023-06-07 14:18:46 +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