Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-14 22:35:46 +01:00
Code Issues Projects Releases Wiki Activity
781 Commits 7 Branches 130 Tags 27 MiB
9992aa7628
Commit Graph

408 Commits

Author SHA1 Message Date
Mike Primm
fa33977469 Log fullrender messages to commandsender, versus just log 2011-06-16 01:58:12 -05:00
Mike Primm
0b7bd72231 Merge remote branch 'upstream/master' 2011-06-15 01:40:42 -05:00
Mike Primm
b1d1075dfe Add support for ChunkSnapshot API (CB860), maintain legacy support too 2011-06-15 01:27:59 -05:00
Mike Primm
9286cfff66 Add blockburn, snowform, leavesdecay render events 2011-06-13 23:19:02 -05:00
Mike Primm
2f22560f3d Clean up warnings 2011-06-13 22:05:14 -05:00
Mike Primm
0cf7b4be9b Add alternate directory structure to better support huge worlds 2011-06-13 21:43:02 -05:00
FrozenCow
864d815bc4 Changed version to 0.19. 2011-06-13 21:12:35 +02:00
mikeprimm
a827843365 Merge pull request #202 from MiLk/encoding 
Use unicode hexadecimal for specials characters
 2011-06-12 19:56:24 -07:00
Mike Primm
e8a6bf46cf Add support for hidewebchatip option, to replace webchat IP with alias 2011-06-12 19:35:53 -07:00
Mike Primm
40ee132277 Add support for using X-Forwarded-From for better proxy IP handling on 
webchat
 2011-06-12 18:50:41 -07:00
MiLk
7cea521e97 Use unicode hexadecimal for specials characters 
Signed-off-by: MiLk <hello@emilienkenler.com>
 2011-06-09 00:30:50 +02:00
Mike Primm
38163133cb Have per-world control of sending player position and health, prevent 
player icon flicker on addplayer (even when not on world or position
is obfuscated)
 2011-06-03 08:42:24 -05:00
Mike Primm
6a50b2ebcd Add background color support per map, add skylands template default 2011-06-03 03:24:21 -05:00
Mike Primm
2d0b2ef63d Hide player positions when on disabled worlds, add sendposition flat 
to ClientComponent to avoid leaking position data, even when markers
are off, fix problem with stale player marker positions during/right
after map changes
 2011-06-03 00:39:21 -05:00
Mike Primm
0fdeee5177 Make sure all JSON/web text interactions are escaped and/or UTF-8 2011-06-02 00:20:25 -05:00
Mike Primm
3c793b5302 Merge remote branch 'origin/master' 2011-06-01 19:09:46 -05:00
Mike Primm
cf71b38259 Fix tile coord calculation for tile hash on kzed render - too sparse 
because not divided by tile dimensions (inconsistent with flat :<)
 2011-06-01 19:08:53 -05:00
Mike Primm
68a78023c8 Add new block IDs, remove obsolete ones from colorschemes 2011-06-01 01:50:57 -05:00
Mike Primm
4af247593d Improve transparency processing on flat map 2011-06-01 00:12:27 -05:00
Mike Primm
c4646dc299 Add transparency option on Flat and Surface map, fix file locks 2011-05-31 23:44:17 -05:00
Mike Primm
c48d06eec1 Add file access synchronization to prevent conflicting tile updates 2011-05-31 21:20:23 -05:00
Arthur Mayer
44cc1da227 fixed encoding (sorry) 2011-06-01 00:11:41 +02:00
Arthur Mayer
af51d8b7e0 added configurable suffix for webchat 2011-05-31 23:30:02 +02:00
Arthur Mayer
cd02926fb0 made webchat prefix to configurable 2011-05-31 23:10:16 +02:00
Mike Primm
aa7d80407f Fix chatfile - shouldn't have changed this with last fix 2011-06-01 03:33:01 +08:00
Mike Primm
cbbea34859 Make JSON file updates more transactional - fix problem with read 
during updates (seen on flames server)
 2011-05-31 14:01:12 -05:00
Mike Primm
d393ccf6e9 Add render statistics, support for tile hashcodes to stop non-updates 2011-05-31 00:33:54 -05:00
Mike Primm
d0bee6f030 Handle trap in Json handling if timestamp not specified 2011-05-30 10:45:58 -05:00
Mike Primm
840854aef0 Fix snow rendering on flat map 2011-05-30 10:16:56 -05:00
Mike Primm
09e1ebc972 Add 'sidebaropened' option to auto-pin sidebar 2011-05-30 09:56:10 -05:00
Mike Primm
c00bd077cb Add support in web UI for automatic day/night cycle when night-and-day 
set for a given map.
 2011-05-29 17:24:46 -05:00
Mike Primm
544283a650 More memory tuning on BufferedImage handling, workaround bukkit leak 2011-05-29 09:33:51 -05:00
Mike Primm
a25fcc0001 Create BufferedImage using our own buffer - allows faster pixel 
writing
 2011-05-29 01:52:57 -05:00
Mike Primm
fc88dfad41 Fix boundary condition on height field - raw can be zero, function 
return value must not be.  Also, fix debugger loading function.
 2011-05-28 03:22:50 -05:00
Mike Primm
15fb1ec743 Fetch height map from Chunk - more performance 2011-05-28 01:59:02 -05:00
Mike Primm
b0b1ab5926 Add night-and-day support for FlatMap 2011-05-28 01:16:54 -05:00
Mike Primm
9b12ebc025 Shift all rendering over to async thread pool, minimize server thread 
load
 2011-05-28 00:08:29 -05:00
Mike Primm
d2c947653d Add night view via ambientlight setting on Flat and Surface maps, add 
night-and-day setting to generate both night (default) and day
(prefix+'_day') versions of tiles, and add transparency to generated
PNG files
 2011-05-27 00:56:56 -05:00
FrozenCow
993b26beb4 Changed version to 0.18. 2011-05-26 23:57:42 +02:00
Mike Primm
f9f615db2d Fix exception in world ordering code when world not in worlds list 2011-05-26 15:32:56 -05:00
FrozenCow
bc6176f3e1 Fixed order of worlds in sidebar. 2011-05-26 19:05:16 +02:00
FrozenCow
0db2296e97 Reverted map-structure for worlds, so that worlds have an order again. 
This reverts commit f0cdd5614b, fd0c430695 and cee491f610.
 2011-05-26 18:06:17 +02:00
FrozenCow
f0cdd5614b Fix when leaving out the world: section. 2011-05-26 03:03:45 +02:00
FrozenCow
cee491f610 Made configuration structure of worlds like templates (looks nicer :D). 2011-05-26 02:33:26 +02:00
FrozenCow
108e9d24c4 Changed the way templates and world-configuration are handled. 2011-05-24 02:13:43 +02:00
mikeprimm
015f898255 Screwed up merge 2011-05-23 08:16:35 -07:00
mikeprimm
7cf75873b8 Add hiddenworlds attribute to suppress templates on selected worlds 2011-05-23 08:06:08 -07:00
Mike Primm
23f5ec5a27 Fix handling of existing maps tag under world definitions 2011-05-22 19:21:27 -05:00
Mike Primm
19fca36bac Add support world-type-specific templates, to allow automatic 
initializing of worlds (make configuration.txt work unmodified for
most folks, while still supporting per-world customizations)
 2011-05-22 17:28:12 -05:00
Mike Primm
fe25cb6a0f Fix player faces when aliases being used, and strip color from player 
display names sent to web UI
 2011-05-23 03:23:11 +08:00
FrozenCow
2866eaa905 Added ability to reload (also using 'dynmap reload'). 2011-05-22 19:42:47 +02:00
FrozenCow
ca9be50422 Another fix for chat. 2011-05-22 18:51:11 +02:00
FrozenCow
f00e05f25e Fixed web-to-mc chat for JsonFile? 2011-05-22 18:24:09 +02:00
FrozenCow
d6cce5ed48 Fixed client-updates for JsonFile. 2011-05-22 18:11:16 +02:00
FrozenCow
15489833df Fixed allowwebchat for JsonFile. 2011-05-22 17:46:11 +02:00
FrozenCow
d5c19703f6 Added map-icon to configuration. 2011-05-22 17:45:30 +02:00
FrozenCow
fea84a45b2 Corrected JsonFile use of webpath. 2011-05-22 17:09:42 +02:00
FrozenCow
1622bb4408 Added center to configuration with default 0,64,0 like before. 2011-05-22 16:48:43 +02:00
zeeZ
3fd511a8d1 Added armor (merged from zeeZ). 2011-05-22 16:28:26 +02:00
FrozenCow
3b16a36b99 Made use of log.log instead of .info. 2011-05-22 16:28:19 +02:00
zeeZ
5ae837f911 Added log prefix to info logger. 2011-05-22 16:28:14 +02:00
FrozenCow
5f8c44ee6b Transfered chat/webchat functionality to their components. 2011-05-22 16:28:10 +02:00
FrozenCow
e2f0307eeb Cleaned up depricated configuration. 2011-05-22 16:28:06 +02:00
FrozenCow
d5b4f6c8c4 Transfered client-updates to two components (jsonfile and internal). 2011-05-22 16:28:01 +02:00
FrozenCow
9fa46597d1 Made use of org.json.simple for updates. 2011-05-22 16:27:57 +02:00
FrozenCow
987e6bcb54 Moved HeroChat code to HeroWebChatModule. 2011-05-22 16:27:53 +02:00
FrozenCow
b2cb15b75c Moved regions-code to regions-component. 2011-05-22 16:27:49 +02:00
FrozenCow
e57301b14e Added events for components and implemented 'buildclientconfiguration'-event in ClientConfigurationComponent. 2011-05-22 16:27:43 +02:00
FrozenCow
38c8254707 Added simple start for server-side components. 2011-05-22 16:27:37 +02:00
Mike Primm
de73cd4028 Better fix for HeroChat - still need herochatwebchannel's channel to 
be set to join-messages: true to allow web messages before first
player message in channel.
 2011-05-22 01:53:48 -05:00
Mike Primm
06785be5f3 Fixes for alias/nicknames in web UI (esp handling player icons), 
HeroChat fixes
 2011-05-21 23:58:48 -05:00
Mike Primm
b108cad2d3 Merge remote branch 'upstream/master' 2011-05-21 01:30:07 -05:00
mikeprimm
cb010802db Merge pull request #156 from mikeprimm/master 
Implement chunk snapshotting approach to drop memory use and CPU use significantly, add shadows option (via shadowstrength) on defaulttilerender, add fix for nicknamed players' skins
 2011-05-20 23:03:35 -07:00
Mike Primm
4fb1ddf49a Fix for skins on players with nicknames - send up account name as well 
as display name.
 2011-05-21 00:59:08 -05:00
Mike Primm
325f069b46 Add BufferedImage cache 2011-05-21 00:30:42 -05:00
Mike Primm
024e7dc96c Tune shadow render, add to accept wait queue on web server 2011-05-20 23:26:46 -05:00
Mike Primm
992a905b0a Add shadowstrength attribute for surface renderer - enables shadows 
based on top-down chunk sky light data
 2011-05-20 20:52:34 -05:00
mikeprimm
920dea04ee Make sure boundary condition is respected - getHighestBlockY must return 1 or higher 2011-05-20 08:47:35 -07:00
mikeprimm
2ccf70d3fe Make sure boundary condition is right on getMaximumY - must be 1 or higher 2011-05-20 08:46:12 -07:00
Mike Primm
3365a96565 Prototype of chunk snapshot support - pre-Bukkit API (reflection 
based, with fallback to existing APIs)
 2011-05-20 01:38:49 -05:00
FrozenCow
c3f0062862 Fixed ConfigurationNode. 2011-05-19 11:15:15 +02:00
Mike Primm
26f4f7d994 Add support for WorldGuard on built-in server, fix getNodes() on new 
ConfigurationNode class
 2011-05-18 23:29:33 -05:00
FrozenCow
a7ba34065b Fixed arguments for createInstance. 2011-05-19 03:18:20 +02:00
zeeZ
728cd8304a Option to output player health in json for later web usage. 2011-05-19 01:52:38 +02:00
FrozenCow
7937a64f06 Cleaned up logging. 2011-05-19 01:36:14 +02:00
FrozenCow
e28ee185b6 Cleaned up configuration handling and added new logging class. 2011-05-19 01:36:05 +02:00
Mike Primm
084cf3f0f9 Missed one LOG_PREFIX 2011-05-19 01:35:10 +02:00
Mike Primm
28e98a617d Add basic progress messages on fullrender (end of each map, every 100 
renders), and add dispose on Graphics2D to accelerate non-heap memory
recovery
 2011-05-19 01:35:10 +02:00
zeeZ
d840b07960 Organize imports. 2011-05-17 11:30:06 +02:00
zeeZ
b36821f3b4 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/main/java/org/dynmap/MapManager.java
	src/main/java/org/dynmap/debug/LogDebugger.java
	src/main/java/org/dynmap/web/handlers/FileHandler.java
	src/main/java/org/dynmap/web/handlers/SendMessageHandler.java
 2011-05-17 11:24:13 +02:00
Mike Primm
deef732129 Fix re-entrancy problem in FileHandler (shared buffer can cause 
corrupted or exchanged tiles)
 2011-05-16 21:11:28 -05:00
zeeZ
17ba0d4d00 Organize imports. 2011-05-17 02:43:25 +02:00
zeeZ
ccbd6bf45e Prefix all (intentional) output properly. 2011-05-17 02:38:49 +02:00
zeeZ
d915f7b14a Fix error if no render triggers are defined. 2011-05-17 06:58:32 +08:00
zeeZ
b804aa72f8 Fix error if no render triggers are defined. 2011-05-17 00:38:26 +02:00
zeeZ
17f5f43772 Tabs and spaces. 2011-05-16 20:55:19 +08:00
zeeZ
5e107cccb9 Op always has permission 2011-05-16 20:55:19 +08:00
zeeZ
05f3ced64f Tabs and spaces. 2011-05-16 14:51:18 +02:00
zeeZ
b01e0c8cdc Op always has permission 2011-05-16 14:28:18 +02:00
Mike Primm
04056572f8 Optimize the getRequiredChunks() to load only chunks that are needed - 
reduces chunks needed by 42% versus current implementation.
 2011-05-15 23:50:50 -05:00
Mike Primm
271990b87c Reduce heap memory allocation on render path (less heap junk) by 
replacing java.awt.Color with work-alike, lightweight updatable
alternative.
 2011-05-15 22:25:45 -05:00
Mike Primm
355d54842f One more with the tabs 2011-05-15 08:05:36 -05:00
Mike Primm
e26ac97787 Clean up tabs 2011-05-15 08:02:45 -05:00
Mike Primm
03376dab52 Finish HeroChat support - handle directing web messages to selected 
channel (versus spamming everyone)
 2011-05-15 07:56:45 -05:00
Mike Primm
0ffc825b05 Re-merge the nether render support, and update race condition fixes 2011-05-14 23:25:59 -05:00
Mike Primm
600dd00bcd HeroChat support - reflection based binding to it 2011-05-15 01:18:20 +02:00
zeeZ
fe93f64273 Added data value colored blocks to flat map 2011-05-14 21:28:21 +08:00
FrozenCow
e752ae3bd5 Changed version to 0.17. 2011-05-13 12:49:43 +02:00
FrozenCow
84d01c530a Replaced tabs with spaces to conform the Bukkit standards. 2011-05-13 10:41:02 +02:00
Mike Primm
daa2d0f186 Pull debug message 2011-05-13 10:31:50 +02:00
Mike Primm
17644a5778 Add tile data coloring (aka colored wool support), combine rendering 
of default tiles and their zoomed counterparts (saves reloading the
default tile, and keeps the scale levels of the map consistent during
a fullrender and otherwise)
 2011-05-13 10:31:38 +02:00
Mike Primm
0a8f2a182a Shift all imageIO and file I/O to async thread 
Minus the version change in plugin.yml.
 2011-05-13 10:29:38 +02:00
zeeZ
7f5d3ab23d Consistency to make Kilandor happy :-). 2011-05-10 12:51:52 +02:00
zeeZ
bb45cc10cb Added weather to json world output (hasStorm and isThundering) 2011-05-10 12:51:52 +02:00
zeeZ
c0479bff05 Fixed NPE if using regionless config. 2011-05-10 12:51:52 +02:00
zeeZ
cf1d6c414d Organize imports 2011-05-10 12:51:52 +02:00
zeeZ
9eab216525 Use Bukkit's way to strip colors. 2011-05-10 12:51:52 +02:00
FrozenCow
b8fe65bc99 Partly reverted previous change to get back to zeeZ' getDisplayName. 2011-05-10 12:51:52 +02:00
FrozenCow
1a5ddeeda5 Removed generation of .tar.bz2. 2011-05-10 12:26:26 +02:00
Mike Primm
5f23afe608 Don't need additional delay - using AsycnQueue for that 2011-05-10 12:26:18 +02:00
Mike Primm
0a1de1b18e Add option to run incremental renders on sync thread, using same chunk 
logic as timesliced full render, in order to handle cases where
assumption that all chunks needed for incremental render are already
resident (which can be false if player telepots, move quickly,
multiple players are active, etc).
 2011-05-10 12:26:11 +02:00
Mike Primm
88db6445f9 Added timeslicing to configuration 2011-05-10 12:26:02 +02:00
Mike Primm
6c708d1b3a Add version log message - keep track builds easier 2011-05-10 12:25:56 +02:00
Mike Primm
dcdfb3da5d Trap on bogus world names or player with bad current location 2011-05-10 12:25:48 +02:00
Mike Primm
95cc3ae869 Add "time-sliced" implementation of fullrender, which does one tile at 
a time using the Bukkit scheduler while using a tunable interval
between tiles (0.5 second default), and avoids player timeouts and
blooming the chunk and entity population.
 2011-05-10 12:25:34 +02:00
FrozenCow
106f95d8b6 Removed a println. 2011-05-08 21:15:44 +02:00
FrozenCow
be60623719 Fixed tabs. 2011-05-07 22:11:41 +02:00
FrozenCow
b66be7a47c Merge remote-tracking branch 'kilandor/master' 2011-05-07 00:04:05 +02:00
zeeZ
63b9579fa5 Strip colors off chat, use getDisplayName instead of getName 2011-05-01 23:11:29 +02:00
zeeZ
ca9aa0727f Fix for worlds with weird names and URLDecode mumbo-jumbo 2011-04-28 16:34:50 +02:00
Jason Booth
b3ccd203c8 Added some info 
Fix for spam warning for php(Thanks for bug report flames)
 2011-04-13 20:23:24 -05:00
Jason Booth
8e59f37995 Initial Support for Regions system on dynmap 
Included Worldguard support(default)
Also residence support(incomplete)
 2011-04-13 19:58:25 -05:00
zeeZ
91b60be572 Less config checks in loop, added newline at EOF 2011-04-11 23:57:10 +02:00
zeeZ
69fcc1706e Option to treat hiddenplayers.txt as a whitelist. 2011-04-11 04:10:47 +02:00
zeeZ
ab6352a17d Hidden players stored in lowercase. 2011-04-11 02:40:03 +02:00
zeeZ
631f06d091 More detailed permissions 2011-04-11 02:27:56 +02:00
zeeZ
553a956949 Flipped flat map so North is up 2011-04-08 21:40:16 +02:00
FrozenCow
d53b3bc340 Added HighlightTileRenderer (thanks in part to rockNme2349) 2011-04-07 15:46:50 +02:00
FrozenCow
eb276dd59d Another attempt to make server conform http. 2011-04-06 00:54:48 +02:00
FrozenCow
b47bbee4e8 Cleaned up join/quit messages (not being send as chat messages) 2011-04-05 22:58:46 +02:00
FrozenCow
e1e13df4b2 Removed redundant configuration values and made use of customizable join/quit messages. 2011-04-05 22:30:43 +02:00
FrozenCow
d4a2d2d32f Changed version to 0.16. 2011-04-05 01:05:51 +02:00
FrozenCow
43bc625c08 Another fix for IndexOutOfBounds (by ignoring it...) 2011-03-29 00:59:10 +02:00
FrozenCow
43a652f15a Fixed IndexOutOfBoundsException (sortof?) 2011-03-28 18:32:29 +02:00
FrozenCow
649edfdc2d Changed events for the latest Bukkit changes. 2011-03-28 18:27:11 +02:00
FrozenCow
2a9b768e3f Removed onLoad again. 2011-03-27 13:14:35 +02:00
FrozenCow
777b55f27b Changed version to 0.15. 2011-03-20 18:12:02 +01:00
FrozenCow
09568294f3 Removed getWorld. 2011-03-20 18:09:54 +01:00
FrozenCow
9206fce435 Set version to 0.14. 2011-03-17 22:26:37 +01:00
FrozenCow
37ad28dbcc Removed empty line. 2011-03-17 03:29:25 +01:00