Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-22 02:26:00 +01:00
Code Issues Projects Releases Wiki Activity
711 Commits 6 Branches 104 Tags 7.8 MiB
b030270208
Commit Graph

354 Commits

Author SHA1 Message Date
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
Blue (Lukas Rieger)
89fa4e6f95 Merge branch 'mc/1.13' 2020-04-09 20:12:44 +02:00
Blue (Lukas Rieger)
677dfcda02 Change the way images are cropped hopefully fixing #32 2020-04-09 17:56:08 +02:00
Blue (Lukas Rieger)
0dfbc96dff Merge branch 'mc/1.13' 2020-04-07 14:56:13 +02:00
Blue (Lukas Rieger)
8d9220f611 Correct build setups for CLI and Forge implementations 2020-04-06 17:55:35 +02:00
Blue (Lukas Rieger)
88ab4b2eb8 Merge branch 'mc/1.13' 2020-04-06 16:56:35 +02:00
Blue (Lukas Rieger)
24c50c27c6 Revert "Fix loading some chunk formats in 1.12. Fixes #33" 
This reverts commit 1ddc229047.
 2020-04-06 14:18:40 +02:00
Blue (Lukas Rieger)
1ddc229047 Fix loading some chunk formats in 1.12. Fixes #33 2020-04-04 15:57:59 +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)
5f7517a9d6 Merge branch 'mc/1.13' 2020-03-29 11:49:03 +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)
de7b0cba02 Tentative fix for #24 2020-03-27 15:41:09 +01:00
Blue (Lukas Rieger)
eeac5b3125 Merge branch 'mc/1.13' 2020-03-26 12:07:52 +01:00
Blue (Lukas Rieger)
85f5d8947b Fix empty path resolving 2020-03-26 12:07:17 +01:00
Blue (Lukas Rieger)
3b58874a1c Merge branch 'mc/1.13' 2020-03-25 22:14:05 +01:00
Blue (Lukas Rieger)
5421f956d2 Fix lighting bug and two bugs with resource-loading 2020-03-25 21:54:59 +01:00
Blue (Lukas Rieger)
cbbcfa6d59 Merge branch 'mc/1.13' 2020-03-17 20:27:18 +01:00
Blue (Lukas Rieger)
46875b9e68 Fix rounding bevore saving does not work correctly 2020-03-17 20:23:59 +01:00
Blue (Lukas Rieger)
eb6fe1164f Merge branch 'mc/1.13' 2020-03-14 18:22:57 +01:00
Blue (Lukas Rieger)
d21f6baf68 Push version for new release 2020-03-14 18:21:10 +01:00
Blue (Lukas Rieger)
54acd321f9 Fix a bug that prevents map changing via url and add sky color to dimensions 2020-03-14 18:18:02 +01:00
Blue (Lukas Rieger)
1455a5ae01 Merge branch 'mc/1.13' 2020-03-14 17:09:54 +01:00
Blue (Lukas Rieger)
275076bf66 Add menu footer, block-info hightlight and renamed a switch 2020-03-14 17:09:40 +01:00
Blue (Lukas Rieger)
d34628dfdf Merge branch 'mc/1.13' 2020-03-13 18:22:49 +01:00
Blue (Lukas Rieger)
2ed2fa3e35 Add click menu and debug option to web-app and fix two render-saving bugs that caused corrupted files sometimes 2020-03-13 18:11:31 +01:00
Blue (Lukas Rieger)
3e11b67ed5 Merge branch 'mc/1.13' 2020-03-08 22:03:19 +01:00
Blue (Lukas Rieger)
dde30e932d Fix a bug with saving tiles sometimes and one with the ui 2020-03-08 22:02:44 +01:00
Blue (Lukas Rieger)
c4e2a4c683 Merge branch 'mc/1.13' 2020-03-08 21:20:36 +01:00
Blue (Lukas Rieger)
33ff579f9b Fix alert box catching all mouse-events 2020-03-08 21:20:21 +01:00
Blue (Lukas Rieger)
f7f5ca76b2 Merge branch 'mc/1.13' 2020-03-08 20:57:34 +01:00
Blue (Lukas Rieger)
80f1d90cdf Update configs for lighting changes and finalize ui 2020-03-08 20:56:52 +01:00
Blue (Lukas Rieger)
ba2092b614 Introduce shaders to improve rendering, add night and rework the ui 2020-03-04 20:31:00 +01:00
Blue (Lukas Rieger)
a0ae675af1 Some changes to the shader to enable dynamic day/night changes 2020-02-13 20:27:53 +01:00
Blue (Lukas Rieger)
37ee65e356 Fix indentations 2020-02-11 21:14:22 +01:00
Blue (Lukas Rieger)
27129b0e53 Add shaders in the web-app and process lighting there 2020-02-11 21:10:59 +01:00
Blue (Lukas Rieger)
db208d4b8f No longer bake the ao and lighting data (breaking change) 2020-02-11 19:35:35 +01:00
Blue (Lukas Rieger)
b6cd0123ea Fix version after merge 2020-02-09 19:04:44 +01:00
Blue (Lukas Rieger)
04ea7a7a8a Merge branch 'mc/1.13' 2020-02-09 19:03:51 +01:00
Blue (Lukas Rieger)
fa6c5ea1f5 Push version for new release 2020-02-09 19:02:22 +01:00
Blue (Lukas Rieger)
8aaca521d0 Fix the models for the changed chest textures layout (really now) 2020-02-09 16:42:00 +01:00
Blue (Lukas Rieger)
4b6489b775 Fix the models for the changed chest textures layout 2020-02-09 16:36:08 +01:00
Blue (Lukas Rieger)
a7818287da Update support for Minecraft 1.15 2020-02-08 17:24:34 +01:00
Blue (Lukas Rieger)
f62130f2cc Improve biome-coloring and add support for 1.15 format chunks with 3d biomes 2020-02-08 17:21:13 +01:00
Blue (Lukas Rieger)
38b5811a8e Add barrier id-mapping 2020-02-07 19:21:21 +01:00
Blue (Lukas Rieger)
cee881ccb5 Add some more 1.12 format compatibillity 2020-02-07 18:41:44 +01:00
Blue (Lukas Rieger)
190d65ca7f Added radius-render command and some small improvements 2020-02-06 19:26:51 +01:00
Blue (Lukas Rieger)
e3500de150 Add tile-entities: beds 2020-01-26 17:28:43 +01:00
Blue (Lukas Rieger)
98fbd3e808 Add tile-entities: chests and signs 2020-01-26 02:06:19 +01:00
Blue (Lukas Rieger)
316f2d3293 Add mipmapping where possible and possibly fix grass side overlay for resourcepacks 2020-01-22 20:39:38 +01:00
Blue (Lukas Rieger)
8cf7bb3dc4 Push version for new prerelease 2020-01-21 23:33:19 +01:00
Blue (Lukas Rieger)
a217ddf045 Catch web-app error and cancel alert animations 2020-01-21 23:06:09 +01:00
Blue (Lukas Rieger)
9427c1cc58 Fix render error when loading resource-variants with no successfully loaded models 2020-01-21 20:10:11 +01:00
Lukas Rieger
fe3f8eb53e
Merge pull request #22 from ewized/fix/addressbar 
Fix/addressbar
 2020-01-19 18:38:24 +01:00
Joshua Rodriguez
f4f24bb770 Only update location on hash change fixes #9 2020-01-19 08:29:42 -08:00
Joshua Rodriguez
9d4b586686 Also log error message to the console 2020-01-19 08:27:27 -08:00
Blue (Lukas Rieger)
7fe60fa96d Fix bug with compression config 2020-01-19 16:51:50 +01:00
Blue (Lukas Rieger)
a56b610afb Add configuration to set a start-point of the map, defaults to world-spawn 2020-01-19 16:30:36 +01:00
Blue (Lukas Rieger)
3e2fa6dd59 Little improvement and tentative fix for #12 2020-01-19 12:08:58 +01:00
Blue (Lukas Rieger)
eb45eb9b15 Whoops, this was not meant to be committed 2020-01-19 02:01:21 +01:00
Blue (Lukas Rieger)
5dc59b454b Do some quick mobile stylings 2020-01-19 00:26:43 +01:00
Blue (Lukas Rieger)
c5485e6657 Add touch controls 2020-01-18 23:33:38 +01:00
Katrix
7cca8e428f Limit raycast objects to the current tile 2020-01-18 19:30:44 +01:00
Blue (Lukas Rieger)
aaaaf7e18a Also use config with lowres model compression 2020-01-18 16:42:34 +01:00
Blue (Lukas Rieger)
5ea1fbb4c5 Little styling additions and QoL, also only load hires-tiles when zoomed in - closes #16 2020-01-18 16:04:46 +01:00
Blue (Lukas Rieger)
3b5393202f Add configuration if gzip-compression should be used 2020-01-18 14:34:20 +01:00
Blue (Lukas Rieger)
2bc1f2dace Add etag handling and cache-control headers to webserver - closes #17 2020-01-18 13:43:32 +01:00
Blue (Lukas Rieger)
a75f238222 No need to double check :D 2020-01-18 12:59:23 +01:00
Blue (Lukas Rieger)
ee384322d7 Also search in parent folder for a level.dat 2020-01-18 12:47:06 +01:00
Blue (Lukas Rieger)
6b8dadd1dc Merge branch 'feature/plugins' 2020-01-18 01:02:09 +01:00
Lukas Rieger
42ff8e5b95
Fix white line below compass and inherit font-family 2020-01-17 09:55:14 +01:00
Joshua Rodriguez
6d1c9770ae Set positon cords from input field 2020-01-16 08:27:32 -08:00
Blue (Lukas Rieger)
b6cc6c5ea7 Merge branch 'master' into feature/bukkit 2020-01-15 21:20:39 +01:00
Blue (Lukas Rieger)
d68a9f0067 Further tries to fix the build on linux 2020-01-15 21:09:28 +01:00
Blue (Lukas Rieger)
113aaab865 Fix build by creating an empty package-lock if none exists 2020-01-15 20:57:51 +01:00
Blue (Lukas Rieger)
4914814744 More common/plugin refactoring 2 2020-01-15 20:20:22 +01:00
Joshua Rodriguez
fa0d13f48f fix map swaping 2020-01-14 16:46:27 -08:00
Joshua Rodriguez
989e4253f2 Fix a few issues with building on windows 2020-01-14 14:38:03 -08:00
Joshua Rodriguez
cebe8b93ad Use scss syntax 2020-01-14 08:03:17 -08:00
Joshua Rodriguez
9cc466e177 Split css into scss modules 2020-01-14 07:55:08 -08:00
Joshua Rodriguez
7931da2475 " -> ' 2020-01-14 07:42:55 -08:00
Joshua Rodriguez
e5660ac754 spaces -> tabs 2020-01-14 07:40:07 -08:00
Joshua Rodriguez
713c9a5494 Use async/await insead of callbacks 2020-01-14 07:32:19 -08:00
Joshua Rodriguez
60cdab8516 Separate JavaScript into es6 classes 2020-01-14 07:02:22 -08:00
Joshua Rodriguez
7ae08d1f44 Use NPM and webpack to build web features 2020-01-13 20:45:39 -08:00
Blue (Lukas Rieger)
7ecc86f498 Push version for bugfix release 2020-01-13 18:29:17 +01:00
Blue (Lukas Rieger)
4cf114b7ac Fix concurrency bug with new mappings being added 2020-01-13 18:25:28 +01:00
Blue (Lukas Rieger)
29a74c125a Always cache generated fallback id mappings 2020-01-13 17:17:57 +01:00
Blue (Lukas Rieger)
bfbc5ca108 Fix typo and push version to next release 2020-01-12 12:39:40 +01:00
Blue (Lukas Rieger)
8f992413da Change render-data-folder structure to have only one folder per world 2020-01-10 18:19:59 +01:00
Blue (Lukas Rieger)
1af2a8c86d Reorganize config, add render-bounds and make some optimizations 2020-01-10 17:54:36 +01:00
Blue (Lukas Rieger)
5168bfcc05 Add blockIdMapping supported by forges block-id registry in the level.dat file of the world 2020-01-08 00:37:30 +01:00
Blue (Lukas Rieger)
a6bf0ae2ca Remove generated resource from git 2020-01-07 18:23:03 +01:00
Blue (Lukas Rieger)
538f1f7887 Add id:meta and biome debug info to debug command 2020-01-07 18:19:35 +01:00
Blue (Lukas Rieger)
49ddaa7c81 Fix some possible errors if blocks dont contain expected properties 2020-01-07 14:27:48 +01:00
Blue (Lukas Rieger)
1c44bd2ac4 Remove extra configs again and move them into resource-packs and mods 2020-01-07 00:48:06 +01:00
Blue (Lukas Rieger)
7d9b4d3f4b Fix an exception when trying to access ungenerated chunks in an area that has no region file 2020-01-06 20:26:06 +01:00
Blue (Lukas Rieger)
76ea6e1918 Remove the BlockContext concept and move the functionality to the Block itself, this improves Render-Speed by A LOT! 2020-01-06 15:15:25 +01:00
Blue (Lukas Rieger)
3e87768d25 Fix some invalid documantation 2020-01-06 13:09:11 +01:00
Blue (Lukas Rieger)
b15fc534e6 Remove ChunkNotGeneratedException and treat not loaded chunks just empty when rendering 2020-01-06 13:04:19 +01:00
Blue (Lukas Rieger)
c1bcd4733d Remove WorldChunk because we just live better without that concept 2020-01-05 19:45:44 +01:00
Blue (Lukas Rieger)
bfdf7fa7ce Add bluemap:missing block and basic unit tests. 
The bluemap:missing block will be used as fallback if bluemap cant render another block for some reason.
The unit tests are just the setup, they will need to catch up over time ^^
 2020-01-05 18:52:30 +01:00
Blue (Lukas Rieger)
d20e0843ab Add lazyloading util class and cache blockcolor-calculation to improve render-speed 2020-01-04 21:13:21 +01:00
Blue (Lukas Rieger)
c60a62a6cd Add some more resources-compatibility and tweak some values in configs and colors 2020-01-04 20:04:47 +01:00
Blue (Lukas Rieger)
22c2772c70 Autopopulate configs with discovered blockids and biomes 2019-12-31 12:23:41 +01:00
Blue (Lukas Rieger)
f6be5dd30f Reorganize and expose some config files to create the abillity to integrate mods 2019-12-30 22:36:48 +01:00
Blue (Lukas Rieger)
29feb3e4a9 Fix some color issues 2019-12-29 18:52:12 +01:00
Blue (Lukas Rieger)
c499c778a5 Change path in zip-tasks to relative path 2019-12-29 16:41:30 +01:00
Blue (Lukas Rieger)
ff00f3f1b6 Complete rewrite of resource loading, render-optimizations and fixes for resource-packs 2019-12-29 16:23:43 +01:00
Blue (Lukas Rieger)
e4daeebecf Fix an error if the server is starting with bluemap and newly generated worlds 2019-11-25 11:00:32 +01:00
Blue (Lukas Rieger)
e5df42faa3 Fix loading blocks from sections with large block ids in 1.12 2019-11-24 10:20:59 +01:00
Blue (Lukas Rieger)
27d7f37e38 Fix default values for different implementations 2019-11-23 21:24:17 +01:00
Blue (Lukas Rieger)
5858142eb1 Push version for next release 2019-11-23 20:44:28 +01:00
Blue (Lukas Rieger)
fee5d7ec46 Rewrite the CLI to use a config file 2019-11-23 20:28:44 +01:00
Blue (Lukas Rieger)
fa32a90138 Add missing licence headers 2019-11-23 15:39:21 +01:00
Blue (Lukas Rieger)
60bde768c0 Delete unused classes and refactor util-classes for a consistent naming 2019-11-23 15:35:20 +01:00
Blue (Lukas Rieger)
0d7657dcd7 Fix vines always rendering with the top-property set to true with 1.12-mca-version 2019-11-23 14:24:21 +01:00
Blue (Lukas Rieger)
fd155d6ce6 Improve resource-loading and texture-file generation and add implementation specific configurations 2019-11-23 14:22:39 +01:00
Blue (Lukas Rieger)
2b3ef38672 Reorganize configuration files (part 1) 2019-11-17 17:56:04 +01:00
Blue (Lukas Rieger)
9b59483cbe Fix doors not adapting the correct data from their other half 2019-11-15 20:05:18 +01:00
Blue (Lukas Rieger)
82ab8c2c7c Add own metrics and save and load the state the render-manager of the sponge-plugin 2019-11-15 18:59:13 +01:00
Blue (Lukas Rieger)
731c31e601 Remove wrong dependency and include bStats to SpongePlugin 2019-11-12 20:46:00 +01:00
Blue (Lukas Rieger)
8c90b3a38e Fix world render argument parsing and catch an uncaught error 2019-11-12 18:41:40 +01:00
Blue (Lukas Rieger)
f570c2088e Fix generated webroot.zip not beeing ignored by git 2019-11-11 20:46:46 +01:00
Blue (Lukas Rieger)
3fd724c74b Add SpongePlugin implementation and fix and improve a lot of different things 2019-11-11 20:36:31 +01:00
Blue (Lukas Rieger)
987cc5a01b Add render configuration to the core 2019-11-02 17:44:37 +01:00
Blue (Lukas Rieger)
49ae2cf08f Initial commit: Merging Projects BlueMapCore, BlueMapCLI and BlueMapSponge into one 2019-11-02 17:23:48 +01:00