Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,150 Commits 6 Branches 128 Tags 33 MiB
Commit Graph

563 Commits

Author SHA1 Message Date
Mike Primm 60147e8d16 Handle proxy cascades on X-Forwrded-For 2022-02-22 22:33:33 -06:00
Mike Primm a9b4ace851 Add support for trusted-proxies subnet ranges, handle nested proxies 2022-02-22 22:11:48 -06:00
Mike Primm 037d1803a7 Update candles, candle cake models 2022-02-22 21:14:33 -06:00
Mike Primm 97e5627e0d Fix update URL for AWS S3 2022-02-22 00:57:11 -06:00
Mike Primm f075bf236c Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0 2022-02-22 00:00:38 -06:00
Mike Primm ad226141fe Avoid multithread use of client 2022-02-22 00:00:18 -06:00
Mike Primm 6a95c9231a Zap dynmap_webchat.json if error parsing it 2022-02-21 18:51:31 -06:00
mikeprimm b6d0c816a4
Merge pull request #3685 from ein-stein-chen/fix-biome-color-loading 
Fix loading of biome colorschemes
 2022-02-21 18:45:25 -06:00
Mike Primm 9066fa0135 Fix transparency handling in WEBP tile generation 2022-02-21 17:57:04 -06:00
Mike Primm 10289f85b7 Fix player markers on AWS S3 web 2022-02-20 22:26:30 -06:00
Mike Primm ef045da32f Add prefix path support for AWS S3 website 2022-02-20 21:38:50 -06:00
Mike Primm ea97296684 Get AWS S3 storage based web working 2022-02-20 20:58:21 -06:00
Mike Primm 45bc02cf3a Switch to sdk v2 2022-02-18 00:40:55 -06:00
Mike Primm be43f53d81 Start S3 support 2022-02-17 21:59:53 -06:00
Mike Primm 50dce9b854 Fix comment 2022-02-17 14:35:07 -06:00
Alexander Degenhart ec8d44ea7c
Fix loading of biome colorschemes 2022-02-17 21:33:37 +01:00
Mike Primm 8eb69514f2 Handle bigger tiles in zoom out tiles 2022-02-17 11:33:55 -06:00
Mike Primm 474c5ecca9 Fix render save/restore when tile scale set 2022-02-17 09:15:49 -06:00
Mike Primm a81249539b Avoid exception on bad modellist from DynmapBlockScan 2022-02-16 22:56:36 -06:00
Mike Primm ee78384cdc Add tilescale and defaulttilescal : option for bigger tiles 2022-02-16 21:13:57 -06:00
Mike Primm 3a39688dc8 Avoid exception report during shutdown 2022-02-16 18:43:30 -06:00
Mike Primm 342e67e205 Fix structure blocks 2022-02-16 00:51:03 -06:00
Mike Primm 15b1328c0e Make shutdown InterruptedExceptions not noisy 2022-02-16 00:50:53 -06:00
Mike Primm 04147aadb1 Fix brewing stand model 2022-02-15 22:39:15 -06:00
Mike Primm dacd51aabb Fix handling of flipped texture offsets 2022-02-15 22:39:01 -06:00
Mike Primm 53c4ebf233 Fix dropper model 2022-02-14 23:14:32 -06:00
Mike Primm 19038b3f8b Fix models for spore flower, dried kelp 2022-02-14 23:05:50 -06:00
Mike Primm b43efb1bb6 Fix sunflower model 2022-02-14 22:13:31 -06:00
Mike Primm d0e627607b Fix dripleaf models 2022-02-14 22:01:37 -06:00
Mike Primm 9126cbf649 Update command block, repeating command block, chained command block 2022-02-14 20:58:25 -06:00
Mike Primm 685b4f9e68 Handle doubble flip on texture 2022-02-14 20:27:19 -06:00
Mike Primm de79f8e8bc Fix end rods, and water shading in cauldron 2022-02-14 00:24:57 -06:00
Mike Primm dc129548aa Fix cauldron models 2022-02-13 23:59:17 -06:00
Mike Primm 619167c2df Shade stems using foliage vs grass 2022-02-13 15:01:57 -06:00
Mike Primm 41b5c6f353 Update models for chorus plant and flower 2022-02-12 23:14:52 -06:00
Mike Primm 069c518a7c Fix for nether wart, melot stems, pumpkin stems 2022-02-12 22:23:28 -06:00
Mike Primm 6e2959a63a Update glass pane models 2022-02-12 18:00:31 -06:00
Mike Primm 95c41d91be Pedantic lighting on path 2022-02-12 02:36:44 -06:00
Mike Primm b88aa42853 Fix levers 2022-02-12 02:24:30 -06:00
Mike Primm d941aec6eb Add publicURL setting and '/dynmap url' command 2022-02-12 01:30:00 -06:00
Mike Primm de344869b7 Switch rails to state mapping 2022-02-11 00:40:52 -06:00
Mike Primm 93c84ef15e Reduce patch noise 2022-02-10 23:30:02 -06:00
Mike Primm ff2e1b3b50 Fix scaled textures in ModelBlockModel patches 2022-02-10 22:18:19 -06:00
Mike Primm 8fbc3e3534 More modsupport updates for improved DynmapBlockScan 2022-02-09 22:38:09 -06:00
Mike Primm 611832fa22 More fixes and enhancements for modsupport API 2022-02-08 21:10:58 -06:00
Mike Primm a2f8f9defa Extend modsupport API to deprecate numeric ID, meta values 2022-02-07 20:02:17 -06:00
Mike Primm b3de1dafe3 Tidy up Eclipse workspace 2022-02-07 10:04:12 -06:00
Mike Primm f441cf4ecd Rework lantern with shade=false 2022-02-05 18:55:55 -06:00
Mike Primm 79f27e9565 Add support for shade=false models, switch light/fire blocks over to use 
it
 2022-02-05 18:24:38 -06:00
Mike Primm cf5f4a0d9e Handle other visibility values in patch definitions 2022-02-05 15:22:00 -06:00
Mike Primm 9d89e56586 General warning cleanup in DynmapCore 2022-02-05 15:16:08 -06:00
Mike Primm d6b1383825 Rework scaffolding models 2022-02-05 14:02:55 -06:00
Mike Primm c83af6dfdc Finish fix for grindstone model 2022-02-05 13:18:34 -06:00
Mike Primm 1093da7657 Add compassazimuth to perspectives (oveeride for compass orientation) 
and 'oldnorth' perspective
 2022-02-05 03:11:25 -06:00
Mike Primm 0c34d5a5b5 Shift SQLite to single session in thread pool (it isn't very thread 
safe)
 2022-02-05 02:05:54 -06:00
Mike Primm b8d08a8ce2 Fix chain models 2022-02-05 00:52:30 -06:00
Mike Primm 88cea7c6e6 Add tables tags, <hr> to sanitizer 2022-02-05 00:02:30 -06:00
Mike Primm e70f2845e8 Make sanizing consistent between initial and updates, add <center> 2022-02-04 23:50:49 -06:00
Mike Primm bdfa148bfb Fix bamboo models 2022-02-04 23:19:47 -06:00
Mike Primm fec2d1af03 Fix webpath update path 2022-02-04 23:14:31 -06:00
Mike Primm 6b208dd038 Add update-webpath-files setting to allow disable of web file updating 2022-02-04 21:47:33 -06:00
Mike Primm 716635c20e Create standalone directory, if needed, during storage startup 2022-02-04 20:09:07 -06:00
Mike Primm e1af7ad952 Fix null check in PHP 2022-02-04 15:40:38 -06:00
Mike Primm 8e7b57bd89 Handle botched version upgrade on pristine mysql/mariadb 2022-02-03 15:24:57 -06:00
Mike Primm 26a987c98d Fix content type on webp 2022-02-03 15:24:37 -06:00
Mike Primm 8efdbed0b4 Fix SQL in PHP for NewImage 2022-02-03 15:12:59 -06:00
Mike Primm 327833832d Handle rollover from newImage to Image in MySQL PHP 2022-02-03 09:24:36 -06:00
DartCZ b1a320d4bb
Include t.newImage after db structure changes 2022-02-03 13:47:43 +01:00
Mike Primm 4b8fa4a81d Switch slabs and wall torches to state= (test case) 2022-02-02 00:10:48 -06:00
Mike Primm 66082093de Add state= mapping for replacing data= in models and textures 
(eventually)
 2022-02-01 23:50:58 -06:00
Mike Primm 592ad5028e Fix cocoa model 2022-01-31 08:52:50 -06:00
Mike Primm 18740c4c2b Restore depricated method in PatchBlockModel 2022-01-30 16:12:46 -06:00
Mike Primm e22ad9b8bf Start prep for shadow lighting rework 2022-01-30 14:23:00 -06:00
Mike Primm fd420f739f Force cleanup of lingering render jobs (avoid shutdown exceptions) 2022-01-30 13:29:37 -06:00
Mike Primm 7fe8feb08d Fix lever models 2022-01-30 13:29:11 -06:00
Mike Primm 3823767c77 Fix cake ; handle defaulted UV values the odd ways MC seems to 2022-01-30 12:34:26 -06:00
Mike Primm df3f6a2c19 Fix Sculk Sensor 2022-01-30 02:15:18 -06:00
Mike Primm 2ba2eb8517 Fix observer, handle vertical flips in modellist 2022-01-30 01:16:47 -06:00
Mike Primm fcdb7d04b5 Switch azalea leaves to transparent 2022-01-30 00:14:25 -06:00
Mike Primm f61288b7fd Fix azalea leaves (do not foliage shade) 2022-01-29 23:51:41 -06:00
Mike Primm 18325c4b96 Add the other glazed terracotta block fixes 2022-01-29 17:30:29 -06:00
Mike Primm cd11283685 Fix for soul campfire, switch torches to modellist, add origin for 
rotate
 2022-01-29 16:54:36 -06:00
Mike Primm 64fe6d8b39 Fix comparator and repeater models 2022-01-29 13:07:35 -06:00
Mike Primm f433454ac2 Finish modellist implementation, use for campfire, comparator 2022-01-29 03:57:04 -06:00
Mike Primm c6c46bdd41 Makes sure popups for circles, areas, lines had correct class 2022-01-28 19:42:34 -06:00
Mike Primm e5cab354ea Mark label as markup:true for UI (for alternate UIs) 2022-01-28 19:06:28 -06:00
Mike Primm 47edac3a33 Fix markup label handling on areas, lines, circles 2022-01-28 18:53:00 -06:00
Mike Primm 2d0a45795a Alter MySQL schema update to avoid tile table lock issues (hopefully) 2022-01-26 20:20:52 -06:00
Mike Primm ea79274938 Add model element rotation to modellist 2022-01-23 22:33:47 -06:00
Mike Primm d8cf759671 Remove debug noise 2022-01-23 21:49:49 -06:00
Mike Primm 4452777585 Add more vanilla model friendly modellist type for model file, use for 
comparator
 2022-01-23 21:44:26 -06:00
Mike Primm a3df8251f9 Freshen colorschemes to 1.18, deprecate dead RPs, drop block number 
mappings
 2022-01-22 15:13:46 -06:00
Mike Primm a20c43960a Fix texture rotations on crafting table, furnace 2022-01-21 16:25:40 -06:00
Mike Primm 4a97d31585 Fix carved pumpkin and jack-o-lantern rotations 2022-01-21 15:47:08 -06:00
Mike Primm df83858675 Fix End Portal models 2022-01-20 00:02:54 -06:00
Mike Primm 363d95e10b Finish piston head fix 2022-01-19 22:44:53 -06:00
Mike Primm 18f2bba608 Fix piston head models 2022-01-19 22:38:25 -06:00
Mike Primm 83cfe0b1ea Add contents level to composter model 2022-01-19 21:23:39 -06:00
Mike Primm 44e3ebbff3 Fix for grindstone block 2022-01-19 20:58:23 -06:00
Mike Primm bfb11c36f5 Fix model and texture definitions for bells 2022-01-19 19:50:57 -06:00
Mike Primm 7afb6e5fb8 Fix off-by-one on max chunk section 2022-01-18 23:55:17 -06:00
Mike Primm 2dd6664bdb Add connectionString to SQLException reports, if defined 2022-01-18 22:07:07 -06:00
Mike Primm 4268b0b6c8 Make SQLException reporting more verbose 2022-01-18 21:57:48 -06:00
Mike Primm 04104d125c Update tp Leaflet 1.8.0-dev for tile seam fix (hopefully) 2022-01-18 20:08:20 -06:00
Mike Primm c887df5ad8 Limit MySQL purgemap deletes 2022-01-16 21:49:52 -06:00
Mike Primm 45299a153c Finish upgrade SQL 2022-01-16 20:22:16 -06:00
Mike Primm bbdebbffa6 Update DB schemas for bigger blobs - make MySQL/MariaDB more common 2022-01-16 13:38:06 -06:00
mikeprimm ebb312c90e
Merge pull request #3611 from JLyne/multipolygon-fix 
Fix 3D areas
 2022-01-15 18:21:59 -06:00
James Lyne 3ebc1b4123 Fix references to removed MultiPolygon constructor 2022-01-14 15:39:49 +00:00
Mike Primm b85a159bda Handle manual edits of markers.yml, update of non-markup values 2022-01-12 22:19:12 -06:00
Mike Primm 04ef31fa3b Switch label on markers to be stored as HTML fragment 2022-01-12 20:48:28 -06:00
mikeprimm a19674c20c
Merge pull request #3599 from JurgenKuyper/v3.0 
update tiles storage to use mediumblob
 2022-01-10 10:59:30 -06:00
James Lyne 27aa077116 Add %uuid% placeholder for skin-url 2022-01-07 23:06:48 +00:00
JurgenKuyper a81a6a9486
update tiles storage to use mediumblob 
set type to mediumblob to allow for boost type 3 to be stored
 2022-01-06 10:53:18 +01:00
Mike Primm 2f3f2350b3 Fix lantern render details 2021-12-30 16:55:43 -06:00
Mike Primm c48ed688b2 Make state sensitive custom models cache more efficient (save memory) 2021-12-29 18:41:54 -06:00
Mike Primm 0166895a7f Tune memory use on generic chunks, lighting lookup performance 2021-12-28 22:14:19 -06:00
Mike Primm adcfedd68e Kill debug noise 2021-12-28 16:28:12 -06:00
Mike Primm f577d8f6f4 Update ColorSchemes, support block state based lookup 2021-12-28 16:27:01 -06:00
Mike Primm 44bcf6bbab Update links 2021-12-28 14:57:00 -06:00
Mike Primm dbf595c38d Update colormaps 2021-12-28 14:51:58 -06:00
Mike Primm 332292c42c Fix mushroom stem render, cleanup System.out uses 2021-12-28 14:37:20 -06:00
mikeprimm 48ba0b2e41
Merge pull request #3571 from JLyne/tabcomplete 
Add tab completions for commands
 2021-12-28 10:16:05 -06:00
Mike Primm 8b510102f9 Add basic horizontal light spread to fallback sky lighting 2021-12-26 15:54:57 -06:00
Mike Primm 227a18ceac Check isLightOn flag as well 2021-12-25 22:39:06 -06:00
Mike Primm 450921569c Improve forge chunk generate handling 2021-12-25 21:46:28 -06:00
Mike Primm b611d34242 Turn on use of good light again 2021-12-24 21:57:14 -06:00
Mike Primm 5b735dab3f Implement basic sky lighting for chunks with broken lighting (spigot) 2021-12-24 21:55:19 -06:00
Mike Primm 3a3a970883 Implement basic sky lighting for chunks with broken lighting 
(forge,fabric)
 2021-12-24 20:38:05 -06:00
Mike Primm 05819b1b74 Further handle broken lighting data... start builder pattern for 
blockstate
 2021-12-24 10:19:02 -06:00
Mike Primm 67ab35658c Switch to assuming sky light data for states below 'light' are crap... 2021-12-24 09:22:32 -06:00
Mike Primm bd4a34e2ae Shift string safely into Log class, finish hack substitution string 2021-12-24 00:08:52 -06:00
Mike Primm 9e602f50d6 Initial mitigation for folks updating Dynmap but not patching MC for 
some reason
 2021-12-23 14:27:33 -06:00
Mike Primm 895dcf3244 Fix webp v1.2.x 2021-12-22 22:33:10 -06:00
Mike Primm efceaf2d8d Fix placed lanterns, sout lanterns 2021-12-22 22:09:16 -06:00
Mike Primm 94c91b12b9 Add stack dump for render exceptions (debug) 2021-12-22 21:51:59 -06:00
James Lyne 182d214c83 Improve tab completion for quoted arguments 2021-12-21 15:54:09 +00:00
James Lyne 742e289d56 /dynmapexp tabcompletions 2021-12-21 15:54:09 +00:00
James Lyne 2b2735516b /dmarker tabcompletions 2021-12-21 15:54:09 +00:00
James Lyne 20d93ad3a5 /dmap tabcompletions 2021-12-21 15:54:07 +00:00
James Lyne c87df916f2 /dynmap tabcompletions 2021-12-21 11:58:54 +00:00
James Lyne 424000a05f Very basic single level spigot tabcomplete 2021-12-21 11:58:54 +00:00
Mike Primm a5bbe6bdd4 Make pessimistic assumption on lighting to handle broken chunk 
generators
 2021-12-20 18:07:54 -06:00
Mike Primm 99caded016 Update chunk state/version shaders 2021-12-19 23:44:48 -06:00
Mike Primm 24d78e5f78 Add chunkstatus and chunkversion shaders (for problem determination) 2021-12-19 21:02:35 -06:00
Mike Primm 9691656579 Further tune logic for fluid model selection 2021-12-19 14:39:53 -06:00
Mike Primm 3a2b5a2326 Start work on culling for fluids to improve render performance 
(hopefully)
 2021-12-19 12:22:01 -06:00
Mike Primm 003de384ca Handle negative height values for ISO perspective clipping 2021-12-18 20:42:40 -06:00
Mike Primm 9a75210abf Drop generateSky log spam 2021-12-16 14:07:50 -06:00
Mike Primm 69a6bb2a2a Apply lighting workaround to 1.16.5+ 2021-12-16 12:32:10 -06:00