Made the different version numbers refer to version in pom.xml.

this time...

build.xml

@@ -22,6 +22,15 @@
 		<jar jarfile="${dist}/${pluginname}.jar">
 			<fileset dir="${bin}"/>
 			<fileset file="${src}/main/resources/plugin.yml"/>
+			<fileset file="${src}/main/resources/configuration.txt"/>
+			<fileset file="${src}/main/resources/custom-lightings.txt"/>
+			<fileset file="${src}/main/resources/custom-perspectives.txt"/>
+			<fileset file="${src}/main/resources/custom-shaders.txt"/>
+			<fileset file="${src}/main/resources/lightings.txt"/>
+			<fileset file="${src}/main/resources/models.txt"/>
+			<fileset file="${src}/main/resources/perspectives.txt"/>
+			<fileset file="${src}/main/resources/texture.txt"/>
+			<fileset file="${src}/main/resources/worlds.txt"/>
 			<zipfileset file="${src}/main/resources/colors.txt"/>
 		</jar>
 	</target>

configuration.txt

@@ -1,429 +0,0 @@
-# All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/
-
-components:
-  - class: org.dynmap.ClientConfigurationComponent
-  
-  - class: org.dynmap.InternalClientUpdateComponent
-    sendhealth: true
-    sendposition: true
-    allowwebchat: true
-    webchat-interval: 5
-    hidewebchatip: false
-    trustclientname: false
-  #- class: org.dynmap.JsonFileClientUpdateComponent
-  #  writeinterval: 1
-  #  sendhealth: true
-  #  sendposition: true
-  #  allowwebchat: false
-  #  hidewebchatip: false
-  
-  - class: org.dynmap.SimpleWebChatComponent
-    allowchat: true
-  #- class: org.dynmap.herochat.HeroWebChatComponent
-  #  # Control which HeroChat channel messages from web are directed to 
-  #  herochatwebchannel: Global
-  #  # Control which channels are monitored and reported to the web
-  #  herochatchannels:
-  #    - Global
-  #    #- Trade
-  #    #- Haggle
-  
-  - class: org.dynmap.ClientComponent
-    type: chat
-  - class: org.dynmap.ClientComponent
-    type: chatballoon
-    focuschatballoons: false
-  - class: org.dynmap.ClientComponent
-    type: chatbox
-    showplayerfaces: true
-    messagettl: 5
-  - class: org.dynmap.ClientComponent
-    type: playermarkers
-    showplayerfaces: true
-    showplayerhealth: true
-  #- class: org.dynmap.ClientComponent
-  #  type: digitalclock
-  - class: org.dynmap.ClientComponent
-    type: timeofdayclock
-    showdigitalclock: true
-    #showweather: true
-  #- class: org.dynmap.regions.RegionsComponent
-  #  type: regions
-  #  name: WorldGuard
-  #  useworldpath: true
-  #  filename: regions.yml
-  #  basenode: regions
-  #  use3dregions: true
-  #  infowindow: '<div class="infowindow"><span style="font-size:120%;">%regionname% - %priority% (%parent%)</span><br /> Owners <span style="font-weight:bold;">%playerowners% %groupowners%</span><br />Members <span style="font-weight:bold;">%playermembers% %groupmembers%</span><br />Flags<br /><span style="font-weight:bold;">%flags%</span></div>'
-  #  regionstyle:
-  #    strokeColor: "#FF0000"
-  #    strokeOpacity: 0.8
-  #    strokeWeight: 3
-  #    fillColor: "#FF0000"
-  #    fillOpacity: 0.35
-  #  # Optional setting to limit which regions to show, by name - if commented out, all regions are shown
-  #  visibleregions:
-  #    - homebase
-  #    - miningsite
-  #- class: org.dynmap.TestComponent
-  #  stuff: "This is some configuration-value"
-
-# Treat hiddenplayers.txt as a whitelist for players to be shown on the map? (Default false)
-display-whitelist: false
-
-# How often a tile gets rendered (in seconds).
-renderinterval: 1
-
-# Zoom-out tile update period - how often to scan for and process tile updates into zoom-out tiles (in seconds)
-zoomoutperiod: 60
-
-# Tile hashing is used to minimize tile file updates when no changes have occurred - set to false to disable
-enabletilehash: true
-
-render-triggers:
-  #- chunkloaded
-  #- playermove
-  #- playerjoin
-  - blockplaced
-  - blockbreak
-  - snowform
-  - leavesdecay
-  - blockburn
-  - chunkgenerated
-
-# The path where the tile-files are placed.
-tilespath: web/tiles
-
-# The path where the web-files are located.
-webpath: web
-
-# The network-interface the webserver will bind to (0.0.0.0 for all interfaces, 127.0.0.1 for only local access).
-webserver-bindaddress: 0.0.0.0
-
-# The TCP-port the webserver will listen on.
-webserver-port: 8123
-
-# Disables Webserver portion of Dynmap (Advanced users only)
-disable-webserver: false
-
-# Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default))
-allow-symlinks: true
-
-# Period between tile renders for fullrender, in seconds (non-zero to pace fullrenders, lessen CPU load)
-timesliceinterval: 0.0
-
-# Maximum chunk loads per server tick (1/20th of a second) - reducing this below 90 will impact render performance, but also will reduce server thread load
-maxchunkspertick: 200
-
-# Interval the browser should poll for updates.
-updaterate: 2000
-
-showplayerfacesinmenu: true
-
-# Set sidebaropened: true to pin menu sidebar opened
-#sidebaropened: true
-
-joinmessage: "%playername% joined"
-quitmessage: "%playername% quit"
-spammessage: "You may only chat once every %interval% seconds."
-webprefix: "§2[WEB] "
-websuffix: "§f"
-
-defaultzoom: 0
-defaultworld: world
-
-# template world - this is used for worlds that exist but aren't defined in the worlds section.
-# Also, it supplies the "maps" section for worlds lacking a maps section, and the "center"
-# for worlds lacking a "center" section.
-templates:
-  # Template for normal world
-  normal:
-    enabled: true
-  #  # If bigworld set to true, use alternate directory layout better suited to large worlds
-  #  bigworld: true
-  #  # Number of extra zoom-out levels for world (each level is twice as big as the previous one)
-  #  extrazoomout: 3
-    center:
-      x: 0
-      y: 64
-      z: 0
-    maps:
-      - class: org.dynmap.flat.FlatMap
-        name: flat
-        title: "Flat"
-        prefix: flat
-        colorscheme: default
-        # The textured setting makes the flat render toning much more consistent with the other maps: set to 'none' for the original flat texture, 'smooth' for blended tile top colors, 'dither' for dither pattern
-        textured: smooth
-  #      # To render a world as a "night view", set shadowstrength and ambientlight
-  #      shadowstrength: 1.0
-  #      ambientlight: 4
-  #      # To render both night and day versions of tiles (when ambientlight is set), set true
-  #      night-and-day: true
-  #      # Option to turn on transparency support (off by default) - slows render
-  #      transparency: true
-  #      # Background color for map during the day
-  #      backgroundday: "#153E7E"
-  #      # Background color for map during the night
-  #      backgroundnight: "#000000"        
-  #      # Background color for map (independent of night/day)
-  #      background: "#000000"
-      - class: org.dynmap.kzedmap.KzedMap
-        renderers:
-          - class: org.dynmap.kzedmap.DefaultTileRenderer
-            name: surface
-            title: "Surface"
-            prefix: t
-            maximumheight: 127
-            colorscheme: default
-  #          # Add shadows to world (based on top-down shadows from chunk data)
-  #          shadowstrength: 1.0
-  #          # To render a world as a "night view", set shadowstrength and ambientlight
-  #          ambientlight: 4
-  #          # To render both night and day versions of tiles (when ambientlight is set), set true
-  #          night-and-day: true
-  #          # Option to turn off transparency support (on by default) - speeds render
-  #          transparency: false
-  #          # Background color for map during the day
-  #          backgroundday: "#153E7E"
-  #          # Background color for map during the night
-  #          backgroundnight: "#000000"        
-  #          # Background color for map (independent of night/day)
-  #          background: "#000000"
-  #          # Sets the icon to 'images/block_custom.png'
-  #          icon: custom
-  #          # Biome-based mapping
-  #        - class: org.dynmap.kzedmap.DefaultTileRenderer
-  #          name: biome
-  #          title: "Biome"
-  #          prefix: b
-  #          maximumheight: 127
-  #          colorscheme: default
-  #          # Biome-based coloring : biome=biome type, temperature=biome-temperature, rainfall=biome-rainfall
-  #          biomecolored: biome
-  #        - class: org.dynmap.kzedmap.HighlightTileRenderer
-  #          prefix: ht
-  #          maximumheight: 127
-  #          colorscheme: default
-  #          highlight: # For highlighting multiple block-types.
-  #            - 56 # Highlight diamond-ore
-  #            - 66 # Highlight minecart track
-  #          highlight: 56 # For highlighting a single block-type.
-          - class: org.dynmap.kzedmap.CaveTileRenderer
-            name: cave
-            title: "Cave"
-            prefix: ct
-            maximumheight: 127
-  # Nether world template
-  nether:
-    enabled: true
-  #  # If bigworld set to true, use alternate directory layout better suited to large worlds
-  #  bigworld: true
-  #  # Number of extra zoom-out levels for world (each level is twice as big as the previous one)
-  #  extrazoomout: 3
-    center:
-      x: 0
-      y: 64
-      z: 0
-    maps:
-      - class: org.dynmap.flat.FlatMap
-        name: flat
-        title: "Flat"
-        prefix: flat
-        colorscheme: default
-        # Map background color (day or night)
-        background: "#300806"
-        # The textured setting makes the flat render toning much more consistent with the other maps: set to 'none' for the original flat texture, 'smooth' for blended tile top colors, 'dither' for dither pattern
-        textured: smooth
-      - class: org.dynmap.kzedmap.KzedMap
-        renderers:
-          - class: org.dynmap.kzedmap.DefaultTileRenderer
-            name: nether
-            title: "Surface"
-            prefix: nt
-            maximumheight: 127
-            colorscheme: default
-            # Map background color (day or night)
-            background: "#300806"
-  # Skylands world template
-  skylands:
-    enabled: true
-  #  # If bigworld set to true, use alternate directory layout better suited to large worlds
-  #  bigworld: true
-  #  # Number of extra zoom-out levels for world (each level is twice as big as the previous one)
-  #  extrazoomout: 3
-    center:
-      x: 0
-      y: 64
-      z: 0
-    maps:
-      - class: org.dynmap.flat.FlatMap
-        name: flat
-        title: "Flat"
-        prefix: flat
-        colorscheme: default
-        # Background color for map during the day
-        backgroundday: "#153E7E"
-        # Background color for map during the night
-        backgroundnight: "#000000"        
-        # The textured setting makes the flat render toning much more consistent with the other maps: set to 'none' for the original flat texture, 'smooth' for blended tile top colors, 'dither' for dither pattern
-        textured: smooth
-      - class: org.dynmap.kzedmap.KzedMap
-        renderers:
-          - class: org.dynmap.kzedmap.DefaultTileRenderer
-            name: skylands
-            title: "Surface"
-            prefix: st
-            maximumheight: 127
-            colorscheme: default
-            # Background color for map during the day
-            backgroundday: "#153E7E"
-            # Background color for map during the night
-            backgroundnight: "#000000"        
-            night-and-day: true
-            shadowstrength: 1.0
-            ambientlight: 4
-
-# The maptypes Dynmap will use to render.
-worlds:
-  # Worlds can be handled by templates, based on world type
-  # You can override the properties of the template by specifying them in this section
-  #    for example 'Title: "My Awesome World"'
-  #- name: world
-  #  title: "World"
-  #   Use 'enabled: false' to disable a certain world.
-  #  enabled: false
-  #   Use sendposition: false to prevent player positions from showing when on this world (if sendposition is globally enabled)
-  #  sendposition: false
-  #   Use sendhealth: false ot prevent player health from showing when on this world (if sendhealth is globally enabled)
-  #  sendhealth: false
-  #  # If world isn't contiguous chunks (due to teleporting, for example), fullrender needs to be given other locations to scan for tiles on each patch of chunks
-  #  fullrenderlocations:
-  #    - x: 10000
-  #      y: 64
-  #      z: 20000
-  #    - x: -15000
-  #      y: 64
-  #      z: -5000
-  #  # Use visibilitylimits to restrict which areas of maps on your world to render (zero or more rectangles can be defined)
-  #  visibilitylimits:
-  #    - x0: -1000
-  #      z0: -1000
-  #      x1: 1000
-  #      z1: 1000
-  #    - x0: -2000
-  #      z0: -1000
-  #      x1: -1000
-  #      z1: -500
-  #  # Use hidestyle to control how hidden-but-existing chunks are to be rendered (air=empty air (same as ungenerated), stone=a flat stone plain, ocean=a flat ocean)
-  #  hidestyle: stone
-  #  # Use 'autogenerate-to-visibilitylimits: true' to choose to force the generation of ungenerated chunks while rendering maps on this world, for any chunks within the defined
-  #  # visibilitylimits (limits must be set).  The three options here are: none (default - no autogenerate), map-only (temporarily generate chunks for map, but don't save them (no world change),
-  #  # permanent (generate and save chunks - this permanently adds the chunks to the world, as if a player had visited them - BE SURE THIS IS WHAT YOU WANT)
-  #  autogenerate-to-visibilitylimits: map-only
-  #   Use 'template: mycustomtemplate' to use the properties specified in the template 'mycustomtemplate' to this world. Default it is set to the environment-name (normal or nether).
-  #  template: mycustomtemplate
-  #   Rest of comes from template - uncomment to tailor for world specifically
-  #  center:
-  #    x: 0
-  #    y: 64
-  #    z: 0
-  #  # If bigworld set to true, use alternate directory layout better suited to large worlds
-  #  bigworld: true
-  #  # Number of extra zoom-out levels for world (each level is twice as big as the previous one)
-  #  extrazoomout: 3
-  #  maps:
-  #    - class: org.dynmap.flat.FlatMap
-  #      name: flat
-  #      title: "Flat"
-  #      prefix: flat
-  #      colorscheme: default
-  #      # The textured setting makes the flat render toning much more consistent with the other maps: set to 'none' for the original flat texture, 'smooth' for blended tile top colors, 'dither' for dither pattern
-  #      textured: smooth
-  #      # To render a world as a "night view", set shadowstrength and ambientlight
-  #      shadowstrength: 1.0
-  #      ambientlight: 4
-  #      # To render both night and day versions of tiles (when ambientlight is set), set true
-  #      night-and-day: true
-  #      # Option to turn on transparency support (off by default) - slows render
-  #      transparency: true
-  #      # Background color for map during the day
-  #      backgroundday: "#153E7E"
-  #      # Background color for map during the night
-  #      backgroundnight: "#000000"        
-  #      # Backgrounc color for map (independent of night/day)
-  #      background: "#000000"
-  #    - class: org.dynmap.kzedmap.KzedMap
-  #      renderers:
-  #        - class: org.dynmap.kzedmap.DefaultTileRenderer
-  #          name: surface
-  #          title: "Surface"
-  #          prefix: t
-  #          maximumheight: 127
-  #          colorscheme: default
-  #          # Add shadows to world (based on top-down shadows from chunk data)
-  #          shadowstrength: 1.0
-  #          # To render a world as a "night view", set shadowstrength and ambientlight
-  #          ambientlight: 4
-  #          # To render both night and day versions of tiles (when ambientlight is set), set true
-  #          night-and-day: true
-  #          # Option to turn off transparency support (on by default) - speeds render
-  #          transparency: false
-  #          # Background color for map during the day
-  #          backgroundday: "#153E7E"
-  #          # Background color for map during the night
-  #          backgroundnight: "#000000"        
-  #          # Backgrounc color for map (independent of night/day)
-  #          background: "#000000"
-  #          # Sets the icon to 'images/block_custom.png'
-  #          icon: custom
-  #        - class: org.dynmap.kzedmap.HighlightTileRenderer
-  #          prefix: ht
-  #          maximumheight: 127
-  #          colorscheme: default
-  #          highlight: # For highlighting multiple block-types.
-  #            - 56 # Highlight diamond-ore
-  #            - 66 # Highlight minecart track
-  #          highlight: 56 # For highlighting a single block-type.
-  #        - class: org.dynmap.kzedmap.CaveTileRenderer
-  #          name: cave
-  #          title: "Cave"
-  #          prefix: ct
-  #          maximumheight: 127
-  #
-  # To just label world, and inherit rest from template, just provide name and title
-  #- name: world2
-  #  title: "Second World"
-  #
-  #- name: nether
-  #  title: "Nether"
-  #  center:
-  #    x: 0
-  #    y: 64
-  #    z: 0
-  #  # Number of extra zoom-out levels for world (each level is twice as big as the previous one)
-  #  extrazoomout: 3
-  #  maps:
-  #    - class: org.dynmap.flat.FlatMap
-  #      name: flat
-  #      title: "Flat"
-  #      prefix: flat
-  #      colorscheme: default
-  #      # The textured setting makes the flat render toning much more consistent with the other maps: set to 'none' for the original flat texture, 'smooth' for blended tile top colors, 'dither' for dither pattern
-  #      textured: smooth
-  #    - class: org.dynmap.kzedmap.KzedMap
-  #      renderers:
-  #        - class: org.dynmap.kzedmap.DefaultTileRenderer
-  #          name: nether
-  #          title: "Surface"
-  #          prefix: nt
-  #          maximumheight: 127
-  #          colorscheme: default
-
-# Set to true to enable verbose startup messages - can help with debugging map configuration problems
-# Set to false for a much quieter startup log
-verbose: true
-
-# Enables debugging.
-#debuggers:
-#  - class: org.dynmap.debug.LogDebugger

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.dynmap</groupId>
   <artifactId>dynmap</artifactId>
-  <version>0.19.2</version>
+  <version>0.22</version>
   <name>dynmap</name>
     <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -13,6 +13,24 @@
   	<url>https://github.com/FrozenCow/dynmap/issues</url>
   </issueManagement>
   <build>
+	  <resources>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>true</filtering>
+		  <includes>
+			<include>*.yml</include>
+			<include>*.txt</include>
+		  </includes>
+		</resource>
+		<resource>
+		  <directory>src/main/resources</directory>
+		  <filtering>false</filtering>
+		  <excludes>
+			<exclude>*.yml</exclude>
+			<exclude>*.txt</exclude>
+		  </excludes>
+		</resource>
+	  </resources>
       <plugins>
           <plugin>
               <groupId>org.apache.maven.plugins</groupId>
@@ -29,6 +47,12 @@
     				<descriptors>
         				<descriptor>src/main/assembly/package.xml</descriptor>
     				</descriptors>
+					<!-- Hack for bug in maven-assembly: http://jira.codehaus.org/browse/MASSEMBLY-449 -->
+					<archiverConfig>
+						<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
+						<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
+						<defaultDirectoryMode>493</defaultDirectoryMode>
+					</archiverConfig>
 				</configuration>
 				<executions>
    					<execution>

src/main/assembly/package.xml

@@ -15,23 +15,37 @@
         <include>CHANGELOG*</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/web/</directory>
+      <outputDirectory>/dynmap/web/</outputDirectory>
+	  <includes>
+		<include>version.js</include>
+	  </includes>
+      <filtered>true</filtered>
+    </fileSet>
     <fileSet>
       <directory>${project.basedir}/web</directory>
       <outputDirectory>/dynmap/web</outputDirectory>
+	  <excludes>
+		<exclude>version.js</exclude>
+	  </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/colorschemes</directory>
       <outputDirectory>/dynmap/colorschemes</outputDirectory>
     </fileSet>
     <fileSet>
-    	<directory>${project.basedir}</directory>
-    	<outputDirectory>/dynmap/</outputDirectory>
-    	<includes>
-    		<include>configuration.txt</include></includes></fileSet>
+    	<directory>${project.basedir}/texturepacks</directory>
+    	<outputDirectory>/dynmap/texturepacks</outputDirectory></fileSet>
+    <fileSet>
+    	<directory>${project.basedir}/renderdata</directory>
+    	<outputDirectory>/dynmap/renderdata</outputDirectory></fileSet>
   </fileSets>
   <files>
   	<file>
-  		<source>${project.build.directory}/${artifactId}-${version}.jar</source>
-  		<outputDirectory>/</outputDirectory>
-  		<destName>dynmap.jar</destName></file></files>
+  	  <source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  	  <outputDirectory>/</outputDirectory>
+  	  <destName>dynmap.jar</destName>
+	</file>
+  </files>
 </assembly>

src/main/java/org/dynmap/Armor.java

@@ -2,6 +2,7 @@ package org.dynmap;
 
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.Material;
 
 public class Armor {
@@ -10,27 +11,34 @@ public class Armor {
      * We rely on getArmorContents() to return 4 armor pieces in the order
      * of: boots, pants, chest, helmet
      */
-    private static final double armorPoints[] = {1.5, 3.0, 4.0, 1.5};
+    private static final int armorPoints[] = {3, 6, 8, 3};
 
     public static final int getArmorPoints(Player player) {
         int currentDurability = 0;
         int baseDurability = 0;
-        double baseArmorPoints = 0;
-        ItemStack inventory[] = player.getInventory().getArmorContents();
-        for(int i=0;i<inventory.length;i++) {
-            if(inventory[i] == null)
-                continue;
-            Material m = inventory[i].getType();
-            if(m == null)
-                continue;
-            final short maxDurability = m.getMaxDurability();
-            if(maxDurability < 0)
-                continue;
-            final short durability = inventory[i].getDurability();
-            baseDurability += maxDurability;
-            currentDurability += maxDurability - durability;
-            baseArmorPoints += armorPoints[i];
+        int baseArmorPoints = 0;
+        ItemStack[] itm = new ItemStack[4];
+        PlayerInventory inv = player.getInventory();
+        itm[0] = inv.getBoots();
+        itm[1]= inv.getLeggings();
+        itm[2] = inv.getChestplate();
+        itm[3] = inv.getHelmet();
+        for(int i = 0; i < 4; i++) {
+    		if(itm[i] == null) continue;
+        	int dur = itm[i].getDurability();
+        	int max = itm[i].getType().getMaxDurability();
+        	if(max <= 0) continue;
+        	if(i == 2)
+    			max = max + 1;	/* Always 1 too low for chestplate */
+        	else
+        		max = max - 3;	/* Always 3 too high, versus how client calculates it */
+        	baseDurability += max;
+        	currentDurability += max - dur;
+        	baseArmorPoints += armorPoints[i];
         }
-        return (int)(2*baseArmorPoints*currentDurability/baseDurability);
+        int ap = 0;
+        if(baseDurability > 0)
+    		ap = ((baseArmorPoints - 1) * currentDurability) / baseDurability + 1;
+        return ap;
     }
 }

src/main/java/org/dynmap/AsynchronousQueue.java

@@ -12,10 +12,14 @@ public class AsynchronousQueue<T> {
     private Set<T> set = new HashSet<T>();
     private Handler<T> handler;
     private int dequeueTime;
-
-    public AsynchronousQueue(Handler<T> handler, int dequeueTime) {
+    private int accelDequeueTime;
+    private int accelDequeueThresh;
+    
+    public AsynchronousQueue(Handler<T> handler, int dequeueTime, int accelDequeueThresh, int accelDequeueTime) {
         this.handler = handler;
         this.dequeueTime = dequeueTime;
+        this.accelDequeueTime = accelDequeueTime;
+        this.accelDequeueThresh = accelDequeueThresh;
     }
 
     public boolean push(T t) {
@@ -30,15 +34,10 @@ public class AsynchronousQueue<T> {
 
     private T pop() {
         synchronized (lock) {
-            try {
-                T t = queue.removeFirst();
-                if (!set.remove(t)) {
-                    // This should never happen.
-                }
-                return t;
-            } catch (NoSuchElementException e) {
-                return null;
-            }
+            T t = queue.pollFirst();
+            if(t != null)
+                set.remove(t);
+            return t;
         }
     }
 
@@ -88,7 +87,10 @@ public class AsynchronousQueue<T> {
                 if (t != null) {
                     handler.handle(t);
                 }
-                sleep(dequeueTime);
+                if(set.size() >= accelDequeueThresh)
+                    sleep(accelDequeueTime);
+                else
+                    sleep(dequeueTime);
             }
 
         } catch (Exception ex) {

src/main/java/org/dynmap/Cache.java

@@ -1,111 +0,0 @@
-package org.dynmap;
-
-import java.util.HashMap;
-
-public class Cache<K, V> {
-    private final int size;
-    private int len;
-
-    private CacheNode head;
-    private CacheNode tail;
-
-    private class CacheNode {
-        public CacheNode prev;
-        public CacheNode next;
-        public K key;
-        public V value;
-
-        public CacheNode(K key, V value) {
-            this.key = key;
-            this.value = value;
-            prev = null;
-            next = null;
-        }
-
-        public void unlink() {
-            if (prev == null) {
-                head = next;
-            } else {
-                prev.next = next;
-            }
-
-            if (next == null) {
-                tail = prev;
-            } else {
-                next.prev = prev;
-            }
-
-            prev = null;
-            next = null;
-
-            len--;
-        }
-
-        public void append() {
-            if (tail == null) {
-                head = this;
-                tail = this;
-            } else {
-                tail.next = this;
-                prev = tail;
-                tail = this;
-            }
-
-            len++;
-        }
-    }
-
-    private HashMap<K, CacheNode> map;
-
-    public Cache(int size) {
-        this.size = size;
-        len = 0;
-
-        head = null;
-        tail = null;
-
-        map = new HashMap<K, CacheNode>();
-    }
-
-    /*
-     * returns value for key, if key exists in the cache otherwise null
-     */
-    public V get(K key) {
-        CacheNode n = map.get(key);
-        if (n == null)
-            return null;
-        return n.value;
-    }
-
-    /*
-     * puts a new key-value pair in the cache if the key existed already, the
-     * value is updated, and the old value is returned if the key didn't exist,
-     * it is added; the oldest value (now pushed out of the cache) may be
-     * returned, or null if the cache isn't yet full
-     */
-    public V put(K key, V value) {
-        CacheNode n = map.get(key);
-        if (n == null) {
-            V ret = null;
-
-            if (len >= size) {
-                CacheNode first = head;
-                first.unlink();
-                map.remove(first.key);
-                ret = first.value;
-            }
-
-            CacheNode add = new CacheNode(key, value);
-            add.append();
-            map.put(key, add);
-
-            return ret;
-        } else {
-            n.unlink();
-            V old = n.value;
-            n.value = value;
-            n.append();
-            return old;
-        }
-    }
-}

src/main/java/org/dynmap/Client.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.io.Writer;
 
 import org.bukkit.ChatColor;
+import org.dynmap.markers.Marker;
+import org.dynmap.markers.MarkerSet;
 import org.json.simple.JSONAware;
 import org.json.simple.JSONStreamAware;
 
@@ -77,4 +79,8 @@ public class Client {
         }
     }
 
+    public static class ComponentMessage extends Update {
+        public String type = "component";
+        /* Each subclass must provide 'ctype' string for component 'type' */
+    }
 }

src/main/java/org/dynmap/ClientConfigurationComponent.java

@@ -18,11 +18,13 @@ public class ClientConfigurationComponent extends Component {
                 s(t, "joinmessage", c.getString("joinmessage", "%playername% joined"));
                 s(t, "quitmessage", c.getString("quitmessage", "%playername% quit"));
                 s(t, "spammessage", c.getString("spammessage", "You may only chat once every %interval% seconds."));
-                s(t, "webprefix", c.getString("webprefix", "[WEB] "));
+                s(t, "webprefix", unescapeString(c.getString("webprefix", "[WEB] ")));
                 s(t, "defaultzoom", c.getInteger("defaultzoom", 0));
-                s(t, "sidebaropened", c.getBoolean("sidebaropened", false));
+                s(t, "sidebaropened", c.getString("sidebaropened", "false"));
+                s(t, "dynmapversion", plugin.getDescription().getVersion());
                 
                 DynmapWorld defaultWorld = null;
+                String defmap = null;
                 for(DynmapWorld world : plugin.mapManager.getWorlds()) {
                     if (defaultWorld == null) defaultWorld = world;
                     ConfigurationNode wn = world.configuration;
@@ -37,10 +39,12 @@ public class ClientConfigurationComponent extends Component {
                     a(t, "worlds", wo);
                     
                     for(MapType mt : world.maps) {
-                        mt.buildClientConfiguration(wo);
+                        mt.buildClientConfiguration(wo, world);
+                        if(defmap == null) defmap = mt.getName();
                     }
                 }
                 s(t, "defaultworld", c.getString("defaultworld", defaultWorld == null ? "world" : defaultWorld.world.getName()));
+                s(t, "defaultmap", c.getString("defaultmap", defmap == null ? "surface" : defmap));
             }
         });
     }

src/main/java/org/dynmap/ClientUpdateComponent.java

@@ -42,7 +42,9 @@ public class ClientUpdateComponent extends Component {
             s(jp, "account", p.getName());
             /* Don't leak player location for world not visible on maps, or if sendposition disbaled */
             DynmapWorld pworld = MapManager.mapman.worldsLookup.get(p.getWorld().getName());
-            if(configuration.getBoolean("sendpositon", true) && (pworld != null) && pworld.sendposition) {
+            /* Fix typo on 'sendpositon' to 'sendposition', keep bad one in case someone used it */
+            if(configuration.getBoolean("sendposition", true) && configuration.getBoolean("sendpositon", true) &&
+                    (pworld != null) && pworld.sendposition) {
                 s(jp, "world", p.getWorld().getName());
                 s(jp, "x", pl.getX());
                 s(jp, "y", pl.getY());

src/main/java/org/dynmap/Color.java

@@ -32,7 +32,7 @@ public class Color {
         return ((val >> 24) & 0xFF);
     }
     public final boolean isTransparent() {
-        return (val == TRANSPARENT);
+        return ((val & 0xFF000000) == TRANSPARENT);
     }
     public final void setTransparent() {
         val = TRANSPARENT;
@@ -52,4 +52,23 @@ public class Color {
     public final int getComponent(int idx) {
         return 0xFF & (val >> ((3-idx)*8));
     }
+    public final void setAlpha(int v) {
+        val = (val & 0x00FFFFFF) | (v << 24);
+    }
+    /**
+     * Scale each color component, based on the corresponding component
+     */
+    public final void blendColor(Color c) {
+        blendColor(c.val);
+    }
+    /**
+     * Scale each color component, based on the corresponding component
+     */
+    public final void blendColor(int argb) {
+        int nval = (((((val >> 24) & 0xFF) * ((argb >> 24) & 0xFF)) / 255) << 24);
+        nval = nval | (((((val >> 16) & 0xFF) * ((argb >> 16) & 0xFF)) / 255) << 16);
+        nval = nval | (((((val >> 8) & 0xFF) * ((argb >> 8) & 0xFF)) / 255) << 8);
+        nval = nval | (((val & 0xFF) * (argb & 0xFF)) / 255);
+        val = nval;
+    }
 }

src/main/java/org/dynmap/ColorScheme.java

@@ -132,7 +132,7 @@ public class ColorScheme {
                 c[1] = new Color(Integer.parseInt(split[9]), Integer.parseInt(split[10]), Integer.parseInt(split[11]), Integer.parseInt(split[12]));
                 c[2] = new Color(Integer.parseInt(split[13]), Integer.parseInt(split[14]), Integer.parseInt(split[15]), Integer.parseInt(split[16]));
                 /* Blended color - for 'smooth' option on flat map */
-                c[4] = new Color((c[0].getRed()+c[2].getRed())/2, (c[0].getGreen()+c[2].getGreen())/2, (c[0].getBlue()+c[2].getBlue())/2, (c[0].getAlpha()+c[2].getAlpha())/2);
+                c[4] = new Color((c[1].getRed()+c[3].getRed())/2, (c[1].getGreen()+c[3].getGreen())/2, (c[1].getBlue()+c[3].getBlue())/2, (c[1].getAlpha()+c[3].getAlpha())/2);
 
                 if(isbiome) {
                     if(istemp) {
@@ -235,4 +235,7 @@ public class ColorScheme {
         else
             return null;
     }
+    public static void reset() {
+        cache.clear();
+    }
 }

src/main/java/org/dynmap/Component.java

@@ -10,4 +10,12 @@ public abstract class Component {
     
     public void dispose() {
     }
+    
+    /* Substitute proper values for escape sequences */
+    public static String unescapeString(String v) {
+        /* Replace color code &color; */
+        v = v.replaceAll("&color;", "\u00A7");
+        
+        return v;
+    }
 }

src/main/java/org/dynmap/DynmapPlayerChatListener.java

@@ -15,19 +15,22 @@ public class DynmapPlayerChatListener extends PlayerListener {
     @Override
     public void onPlayerChat(PlayerChatEvent event) {
         if(event.isCancelled()) return;
-        plugin.mapManager.pushUpdate(new Client.ChatMessage("player", "", 
+        if(plugin.mapManager != null)
+            plugin.mapManager.pushUpdate(new Client.ChatMessage("player", "", 
                                                             event.getPlayer().getDisplayName(), event.getMessage(),
                                                             event.getPlayer().getName()));
     }
 
     @Override
     public void onPlayerJoin(PlayerJoinEvent event) {
-        plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+        if(plugin.mapManager != null)
+            plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
     }
 
     @Override
     public void onPlayerQuit(PlayerQuitEvent event) {
-        plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
+        if(plugin.mapManager != null)
+            plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getDisplayName(), event.getPlayer().getName()));
     }
 
 }

src/main/java/org/dynmap/DynmapWebChatEvent.java

@@ -0,0 +1,31 @@
+package org.dynmap;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+
+/**
+ * Custom bukkit event, corresponding to the receiving of a web-chat message from a web UI user
+ */
+public class DynmapWebChatEvent extends Event implements Cancellable {
+    private String source;
+    private String name;
+    private String message;
+    private boolean cancelled;
+    
+    public DynmapWebChatEvent(String source, String name, String message) {
+        super("org.dynmap.DynmapWebChatEvent");
+        this.source = source;
+        this.name = name;
+        this.message = message;
+        this.cancelled = false;
+    }
+    public boolean isCancelled() { return cancelled; }
+    
+    public void setCancelled(boolean cancel) { cancelled = cancel; }
+
+    public String getSource() { return source; }
+    
+    public String getName() { return name; }
+    
+    public String getMessage() { return message; }
+    
+}

src/main/java/org/dynmap/DynmapWorld.java

@@ -1,13 +1,14 @@
 package org.dynmap;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.bukkit.World;
 import org.bukkit.Location;
+import org.dynmap.MapType.ImageFormat;
 import org.dynmap.debug.Debug;
-import org.dynmap.kzedmap.KzedMap;
-import org.dynmap.kzedmap.KzedMap.KzedBufferedImage;
+import org.dynmap.utils.DynmapBufferedImage;
 import org.dynmap.utils.FileLockManager;
 import org.dynmap.utils.MapChunkCache;
 
@@ -32,6 +33,7 @@ public class DynmapWorld {
     public ConfigurationNode configuration;
     public List<Location> seedloc;
     public List<MapChunkCache.VisibilityLimit> visibility_limits;
+    public List<MapChunkCache.VisibilityLimit> hidden_limits;
     public AutoGenerateOption do_autogenerate;
     public MapChunkCache.HiddenChunkStyle hiddenchunkstyle;
     public int servertime;
@@ -41,8 +43,10 @@ public class DynmapWorld {
     private int extrazoomoutlevels;  /* Number of additional zoom out levels to generate */
     public File worldtilepath;
     private Object lock = new Object();
-    private HashSet<String> zoomoutupdates[];
+    @SuppressWarnings("unchecked")
+    private HashSet<String> zoomoutupdates[] = new HashSet[0];
     private boolean checkts = true;	/* Check timestamps on first run with new configuration */
+    private boolean cancelled;
     
     @SuppressWarnings("unchecked")
     public void setExtraZoomOutLevels(int lvl) {
@@ -59,21 +63,39 @@ public class DynmapWorld {
     }
     
     private void enqueueZoomOutUpdate(File f, int level) {
-        if(level >= extrazoomoutlevels)
-            return;
         synchronized(lock) {
+            if(level >= zoomoutupdates.length) {
+               @SuppressWarnings("unchecked")
+               HashSet<String> new_zoomout[] = new HashSet[level+1];
+               System.arraycopy(zoomoutupdates, 0, new_zoomout, 0, zoomoutupdates.length);
+               for(int i = 0; i < new_zoomout.length; i++) {
+                   if(i < zoomoutupdates.length)
+                       new_zoomout[i] = zoomoutupdates[i];
+                   else
+                       new_zoomout[i] = new HashSet<String>();
+               }
+               zoomoutupdates = new_zoomout;
+            }
             zoomoutupdates[level].add(f.getPath());
         }
     }
     
     private boolean popQueuedUpdate(File f, int level) {
-        if(level >= extrazoomoutlevels)
+        if(level >= zoomoutupdates.length)
             return false;
         synchronized(lock) {
             return zoomoutupdates[level].remove(f.getPath());
         }
     }
     
+    private String[]	peekQueuedUpdates(int level) {
+        if(level >= zoomoutupdates.length)
+            return new String[0];
+        synchronized(lock) {
+            return zoomoutupdates[level].toArray(new String[zoomoutupdates[level].size()]);
+        }
+    }
+    
     private static class DirFilter implements FilenameFilter {
         public boolean accept(File f, String n) {
             if(!n.equals("..") && !n.equals(".")) {
@@ -84,11 +106,21 @@ public class DynmapWorld {
         }
     }
 
+    private static final String COORDSTART = "-0123456789";
     private static class PNGFileFilter implements FilenameFilter {
         String prefix;
-        public PNGFileFilter(String pre) { prefix = pre; }
+        String suffix;
+        public PNGFileFilter(String pre, MapType.ImageFormat fmt) {
+            if((pre != null) && (pre.length() > 0))
+                prefix = pre; 
+            suffix = "." + fmt.getFileExt();
+        }
         public boolean accept(File f, String n) {
-            if(n.endsWith(".png") && n.startsWith(prefix)) {
+            if(n.endsWith(suffix)) {
+                if((prefix != null) && (!n.startsWith(prefix)))
+                    return false;
+                if((prefix == null) && (COORDSTART.indexOf(n.charAt(0)) < 0))
+                    return false;
                 File fn = new File(f, n);
                 return fn.isFile();
             }
@@ -97,76 +129,146 @@ public class DynmapWorld {
     }
 
     public void freshenZoomOutFiles() {
-        for(int i = 0; i < extrazoomoutlevels; i++) {
-            freshenZoomOutFilesByLevel(i);
+        boolean done = false;
+        int last_done = 0;
+        for(int i = 0; (!cancelled) && (!done); i++) {
+            done = freshenZoomOutFilesByLevel(i);
+            last_done = i;
+        }
+        /* Purge updates for levels above what any map needs */
+        for(int i = last_done; i < zoomoutupdates.length; i++) {
+            zoomoutupdates[i].clear();
         }
         checkts = false;	/* Just handle queued updates after first scan */
     }
     
+    public void cancelZoomOutFreshen() {
+        cancelled = true;
+    }
+    
     private static class PrefixData {
     	int stepsize;
     	int[] stepseq;
     	boolean neg_step_x;
+        boolean neg_step_y;
     	String baseprefix;
     	int zoomlevel;
+    	int background;
     	String zoomprefix;
     	String fnprefix;
         String zfnprefix;
         int bigworldshift;
+        boolean isbigmap;
+        MapType.ImageFormat fmt;
     }
     
-    public void freshenZoomOutFilesByLevel(int zoomlevel) {
+    public boolean freshenZoomOutFilesByLevel(int zoomlevel) {
         int cnt = 0;
         Debug.debug("freshenZoomOutFiles(" + world.getName() + "," + zoomlevel + ")");
         if(worldtilepath.exists() == false) /* Quit if not found */
-            return;
+            return true;
         HashMap<String, PrefixData> maptab = buildPrefixData(zoomlevel);
 
-        if(bigworld) {  /* If big world, next directories are map name specific */
-            DirFilter df = new DirFilter();
-            for(String pfx : maptab.keySet()) { /* Walk through prefixes, as directories */
-                PrefixData pd = maptab.get(pfx);
-                File dname = new File(worldtilepath, pfx);
-                /* Now, go through subdirectories under this one, and process them */
-                String[] subdir = dname.list(df);
-                if(subdir == null) continue;
-                for(String s : subdir) {
-                    File sdname = new File(dname, s);
-                    cnt += processZoomDirectory(sdname, pd);
+        if(checkts) {	/* If doing timestamp based scan (initial) */
+        	DirFilter df = new DirFilter();
+        	for(String pfx : maptab.keySet()) { /* Walk through prefixes */
+                if(cancelled) return true;
+        		PrefixData pd = maptab.get(pfx);
+        		if(pd.isbigmap) { /* If big world, next directories are map name specific */
+        			File dname = new File(worldtilepath, pfx);
+        			/* Now, go through subdirectories under this one, and process them */
+        			String[] subdir = dname.list(df);
+        			if(subdir == null) continue;
+        			for(String s : subdir) {
+        			    if(cancelled) return true;
+        				File sdname = new File(dname, s);
+        				cnt += processZoomDirectory(sdname, pd);
+        			}
+        		}
+        		else {  /* Else, classic file layout */
+        			cnt += processZoomDirectory(worldtilepath, maptab.get(pfx));
+        		}
+        	}
+        	Debug.debug("freshenZoomOutFiles(" + world.getName() + "," + zoomlevel + ") - done (" + cnt + " updated files)");
+        }
+        else {	/* Else, only process updates */
+            String[] paths = peekQueuedUpdates(zoomlevel);	/* Get pending updates */
+            HashMap<String, ProcessTileRec> toprocess = new HashMap<String, ProcessTileRec>();
+            /* Accumulate zoomed tiles to be processed (combine triggering subtiles) */
+            for(String p : paths) {
+                if(cancelled) return true;
+            	File f = new File(p);	/* Make file */
+            	/* Find matching prefix */
+            	for(PrefixData pd : maptab.values()) { /* Walk through prefixes */
+                    if(cancelled) return true;
+            		ProcessTileRec tr = null;
+            		/* If big map and matches name pattern */
+            		if(pd.isbigmap && f.getName().startsWith(pd.fnprefix) && 
+            				f.getParentFile().getParentFile().getName().equals(pd.baseprefix)) {
+                        tr = processZoomFile(f, pd);
+            		}
+                    /* If not big map and matches name pattern */
+                    else if((!pd.isbigmap) && f.getName().startsWith(pd.fnprefix)) {
+                        tr = processZoomFile(f, pd);
+                    }
+                    if(tr != null) {
+                        String zfpath = tr.zf.getPath();
+                        if(!toprocess.containsKey(zfpath))  {
+                            toprocess.put(zfpath, tr);
+                        }
+                    }
                 }
             }
-        }
-        else {  /* Else, classic file layout */
-            for(String pfx : maptab.keySet()) { /* Walk through prefixes, as directories */
-                cnt += processZoomDirectory(worldtilepath, maptab.get(pfx));
+            /* Do processing */
+            for(ProcessTileRec s : toprocess.values()) {
+                if(cancelled) return true;
+                processZoomTile(s.pd, s.zf, s.zfname, s.x, s.y);
             }
         }
-        Debug.debug("freshenZoomOutFiles(" + world.getName() + "," + zoomlevel + ") - done (" + cnt + " updated files)");
+        /* Return true when we have none left at the level */
+        return (maptab.size() == 0);
     }
     
     private HashMap<String, PrefixData> buildPrefixData(int zoomlevel) {
         HashMap<String, PrefixData> maptab = new HashMap<String, PrefixData>();
         /* Build table of file prefixes and step sizes */
         for(MapType mt : maps) {
-            List<String> pfx = mt.baseZoomFilePrefixes();
+            /* If level is above top needed for this map, skip */
+            if(zoomlevel > (this.extrazoomoutlevels + mt.getMapZoomOutLevels()))
+                continue;
+            List<MapType.ZoomInfo> pfx = mt.baseZoomFileInfo();
             int stepsize = mt.baseZoomFileStepSize();
             int bigworldshift = mt.getBigWorldShift();
             boolean neg_step_x = false;
-            if(stepsize < 0) {
-                stepsize = -stepsize;
-                neg_step_x = true;
+            boolean neg_step_y = false;
+            switch(mt.zoomFileMapStep()) {
+                case X_PLUS_Y_PLUS:
+                    break;
+                case X_MINUS_Y_PLUS:
+                    neg_step_x = true;
+                    break;
+                case X_PLUS_Y_MINUS:
+                    neg_step_y = true;
+                    break;
+                case X_MINUS_Y_MINUS:
+                    neg_step_x = neg_step_y = true;
+                    break;
             }
             int[] stepseq = mt.zoomFileStepSequence();
-            for(String p : pfx) {
+            for(MapType.ZoomInfo p : pfx) {
                 PrefixData pd = new PrefixData();
                 pd.stepsize = stepsize;
                 pd.neg_step_x = neg_step_x;
+                pd.neg_step_y = neg_step_y;
                 pd.stepseq = stepseq;
-                pd.baseprefix = p;
+                pd.baseprefix = p.prefix;
+                pd.background = p.background_argb;
                 pd.zoomlevel = zoomlevel;
-                pd.zoomprefix = "zzzzzzzzzzzz".substring(0, zoomlevel);
+                pd.zoomprefix = "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz".substring(0, zoomlevel);
                 pd.bigworldshift = bigworldshift;
-                if(bigworld) {
+                pd.isbigmap = mt.isBigWorldMap(this);
+                pd.fmt = mt.getImageFormat();
+                if(pd.isbigmap) {
                     if(zoomlevel > 0) {
                         pd.zoomprefix += "_";
                         pd.zfnprefix = "z" + pd.zoomprefix;
@@ -181,7 +283,7 @@ public class DynmapWorld {
                     pd.zfnprefix = "z" + pd.fnprefix;
                 }
                 
-                maptab.put(p, pd);
+                maptab.put(p.prefix, pd);
             }
         }
         return maptab;
@@ -191,19 +293,20 @@ public class DynmapWorld {
         File zf;
         String zfname;
         int x, y;
+        PrefixData pd;
     }
 
     private String makeFilePath(PrefixData pd, int x, int y, boolean zoomed) {
-        if(bigworld)
-            return pd.baseprefix + "/" + (x >> pd.bigworldshift) + "_" + (y >> pd.bigworldshift) + "/" + (zoomed?pd.zfnprefix:pd.fnprefix) + x + "_" + y + ".png";
+        if(pd.isbigmap)
+            return pd.baseprefix + "/" + (x >> pd.bigworldshift) + "_" + (y >> pd.bigworldshift) + "/" + (zoomed?pd.zfnprefix:pd.fnprefix) + x + "_" + y + "." + pd.fmt.getFileExt();
         else
-            return (zoomed?pd.zfnprefix:pd.fnprefix) + "_" + x + "_" + y + ".png";            
+            return (zoomed?pd.zfnprefix:pd.fnprefix) + "_" + x + "_" + y + "." + pd.fmt.getFileExt();            
     }
     
     private int processZoomDirectory(File dir, PrefixData pd) {
         Debug.debug("processZoomDirectory(" + dir.getPath() + "," + pd.baseprefix + ")");
         HashMap<String, ProcessTileRec> toprocess = new HashMap<String, ProcessTileRec>();
-        String[] files = dir.list(new PNGFileFilter(pd.fnprefix));
+        String[] files = dir.list(new PNGFileFilter(pd.fnprefix, pd.fmt));
         if(files == null)
             return 0;
         for(String fn : files) {
@@ -218,7 +321,7 @@ public class DynmapWorld {
         int cnt = 0;
         /* Do processing */
         for(ProcessTileRec s : toprocess.values()) {
-            processZoomTile(pd, dir, s.zf, s.zfname, s.x, s.y);
+            processZoomTile(s.pd, s.zf, s.zfname, s.x, s.y);
             cnt++;
         }
         Debug.debug("processZoomDirectory(" + dir.getPath() + "," + pd.baseprefix + ") - done (" + cnt + " files)");
@@ -255,10 +358,12 @@ public class DynmapWorld {
         else
             x = x + (x % (2*step));
         if(pd.neg_step_x) x = -x;
+        if(pd.neg_step_y) y = -y;
         if(y >= 0)
             y = y - (y % (2*step));
         else
             y = y + (y % (2*step));
+        if(pd.neg_step_y) y = -y;
         /* Make name of corresponding zoomed tile */
         String zfname = makeFilePath(pd, x, y, true);
         File zf = new File(worldtilepath, zfname);
@@ -273,22 +378,25 @@ public class DynmapWorld {
         rec.x = x;
         rec.y = y;
         rec.zfname = zfname;
+        rec.pd = pd;
         Debug.debug("Process " + zf.getPath() + " due to " + f.getPath());
         return rec;
     }
     
-    private void processZoomTile(PrefixData pd, File dir, File zf, String zfname, int tx, int ty) {
-        Debug.debug("processZoomFile(" + pd.baseprefix + "," + dir.getPath() + "," + zf.getPath() + "," + tx + "," + ty + ")");
+    private void processZoomTile(PrefixData pd, File zf, String zfname, int tx, int ty) {
+        Debug.debug("processZoomFile(" + pd.baseprefix + "," + zf.getPath() + "," + tx + "," + ty + ")");
         int width = 128, height = 128;
         BufferedImage zIm = null;
-        KzedBufferedImage kzIm = null;
+        DynmapBufferedImage kzIm = null;
         int[] argb = new int[width*height];
         int step = pd.stepsize << pd.zoomlevel;
         int ztx = tx;
+        int zty = ty;
         tx = tx - (pd.neg_step_x?step:0);	/* Adjust for negative step */ 
+        ty = ty - (pd.neg_step_y?step:0);   /* Adjust for negative step */ 
 
         /* create image buffer */
-        kzIm = KzedMap.allocateBufferedImage(width, height);
+        kzIm = DynmapBufferedImage.allocateBufferedImage(width, height);
         zIm = kzIm.buf_img;
 
         for(int i = 0; i < 4; i++) {
@@ -308,43 +416,51 @@ public class DynmapWorld {
                     im.getRGB(0, 0, width, height, argb, 0, width);    /* Read data */
                     im.flush();
                     /* Do binlinear scale to 64x64 */
-                    Color c1 = new Color();
+                    int off = 0;
                     for(int y = 0; y < height; y += 2) {
-                        for(int x = 0; x < width; x += 2) {
-                            int red = 0;
-                            int green = 0;
-                            int blue = 0;
-                            int alpha = 0;
-                            for(int yy = y; yy < y+2; yy++) {
-                                for(int xx = x; xx < x+2; xx++) {
-                                    c1.setARGB(argb[(yy*width)+xx]);
-                                    red += c1.getRed();
-                                    green += c1.getGreen();
-                                    blue += c1.getBlue();
-                                    alpha += c1.getAlpha();
-                                }
-                            }
-                            c1.setRGBA(red>>2, green>>2, blue>>2, alpha>>2);
-                            argb[(y*width/2) + (x/2)] = c1.getARGB();
+                        off = y*width;
+                        for(int x = 0; x < width; x += 2, off += 2) {
+                            int p0 = argb[off];
+                            int p1 = argb[off+1];
+                            int p2 = argb[off+width];
+                            int p3 = argb[off+width+1];
+                            int alpha = ((p0 >> 24) & 0xFF) + ((p1 >> 24) & 0xFF) + ((p2 >> 24) & 0xFF) + ((p3 >> 24) & 0xFF);
+                            int red = ((p0 >> 16) & 0xFF) + ((p1 >> 16) & 0xFF) + ((p2 >> 16) & 0xFF) + ((p3 >> 16) & 0xFF);
+                            int green = ((p0 >> 8) & 0xFF) + ((p1 >> 8) & 0xFF) + ((p2 >> 8) & 0xFF) + ((p3 >> 8) & 0xFF);
+                            int blue = (p0 & 0xFF) + (p1 & 0xFF) + (p2 & 0xFF) + (p3 & 0xFF);
+                            argb[off>>1] = (((alpha>>2)&0xFF)<<24) | (((red>>2)&0xFF)<<16) | (((green>>2)&0xFF)<<8) | ((blue>>2)&0xFF);
                         }
                     }
                     /* blit scaled rendered tile onto zoom-out tile */
                     zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
                 }
+                else if((pd.background != 0) && (pd.fmt != ImageFormat.FORMAT_PNG)) {
+                    Arrays.fill(argb, pd.background);
+                    /* blit scaled rendered tile onto zoom-out tile */
+                    zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
+                }
+            }
+            else if((pd.background != 0) && (pd.fmt != ImageFormat.FORMAT_PNG)) {
+                Arrays.fill(argb, pd.background);
+                /* blit scaled rendered tile onto zoom-out tile */
+                zIm.setRGB(((i>>1) != 0)?0:width/2, (i & 1) * height/2, width/2, height/2, argb, 0, width);
             }
         }
         FileLockManager.getWriteLock(zf);
         try {
-            TileHashManager hashman = MapManager.mapman.hashman;
+            MapManager mm = MapManager.mapman;
+            if(mm == null)
+                return;
+            TileHashManager hashman = mm.hashman;
             long crc = hashman.calculateTileHash(kzIm.argb_buf); /* Get hash of tile */
             int tilex = ztx/step/2;
-            int tiley = ty/step/2;
+            int tiley = zty/step/2;
             String key = world.getName()+".z"+pd.zoomprefix+pd.baseprefix;
-            if((!zf.exists()) || (crc != MapManager.mapman.hashman.getImageHashCode(key, null, tilex, tiley))) {
+            if((!zf.exists()) || (crc != mm.hashman.getImageHashCode(key, null, tilex, tiley))) {
                 try {
                     if(!zf.getParentFile().exists())
                         zf.getParentFile().mkdirs();
-                    FileLockManager.imageIOWrite(zIm, "png", zf);
+                    FileLockManager.imageIOWrite(zIm, pd.fmt, zf);
                     Debug.debug("Saved zoom-out tile at " + zf.getPath());
                 } catch (IOException e) {
                     Debug.error("Failed to save zoom-out tile: " + zf.getName(), e);
@@ -357,7 +473,7 @@ public class DynmapWorld {
             }
         } finally {
             FileLockManager.releaseWriteLock(zf);
-            KzedMap.freeBufferedImage(kzIm);
+            DynmapBufferedImage.freeBufferedImage(kzIm);
         }
     }
 }

src/main/java/org/dynmap/Event.java

@@ -1,21 +1,31 @@
 package org.dynmap;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 public class Event<T> {
     private List<Listener<T>> listeners = new LinkedList<Listener<T>>();
+    private Object lock = new Object();
 
-    public synchronized void addListener(Listener<T> l) {
-        listeners.add(l);
+    public void addListener(Listener<T> l) {
+        synchronized(lock) {
+            listeners.add(l);
+        }
     }
 
-    public synchronized void removeListener(Listener<T> l) {
-        listeners.remove(l);
+    public void removeListener(Listener<T> l) {
+        synchronized(lock) {
+            listeners.remove(l);
+        }
     }
 
-    public synchronized void trigger(T t) {
-        for (Listener<T> l : listeners) {
+    public void trigger(T t) {
+        ArrayList<Listener<T>> iterlist;
+        synchronized(lock) {
+            iterlist = new ArrayList<Listener<T>>(listeners);
+        }
+        for (Listener<T> l : iterlist) {
             l.triggered(t);
         }
     }

src/main/java/org/dynmap/InternalClientUpdateComponent.java

@@ -45,9 +45,11 @@ public class InternalClientUpdateComponent extends ClientUpdateComponent {
     }
     
     protected void webChat(String name, String message) {
+        if(plugin.mapManager == null)
+            return;
         // TODO: Change null to something meaningful.
         plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null));
-        Log.info(plugin.configuration.getString("webprefix", "\u00A72[WEB] ") + name + ": " + plugin.configuration.getString("websuffix", "\u00A7f") + message);
+        Log.info(unescapeString(plugin.configuration.getString("webprefix", "\u00A72[WEB] ")) + name + ": " + unescapeString(plugin.configuration.getString("websuffix", "\u00A7f")) + message);
         ChatEvent event = new ChatEvent("web", name, message);
         plugin.events.trigger("webchat", event);
     }

src/main/java/org/dynmap/JsonFileClientUpdateComponent.java

@@ -22,8 +22,6 @@ import static org.dynmap.JSONUtils.*;
 import java.nio.charset.Charset;
 
 public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
-    protected TimerTask task;
-    protected Timer timer;
     protected long jsonInterval;
     protected long currentTimestamp = 0;
     protected long lastTimestamp = 0;
@@ -39,7 +37,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
         final boolean allowwebchat = configuration.getBoolean("allowwebchat", false);
         jsonInterval = (long)(configuration.getFloat("writeinterval", 1) * 1000);
         hidewebchatip = configuration.getBoolean("hidewebchatip", false);
-        task = new TimerTask() {
+        MapManager.scheduleDelayedJob(new Runnable() {
             @Override
             public void run() {
                 currentTimestamp = System.currentTimeMillis();
@@ -48,15 +46,17 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
                     handleWebChat();
                 }
                 lastTimestamp = currentTimestamp;
-            }
-        };
-        timer = new Timer();
-        timer.scheduleAtFixedRate(task, jsonInterval, jsonInterval);
+                MapManager.scheduleDelayedJob(this, jsonInterval);
+            }}, jsonInterval);
+        
         plugin.events.addListener("buildclientconfiguration", new Event.Listener<JSONObject>() {
             @Override
             public void triggered(JSONObject t) {
                 s(t, "jsonfile", true);
                 s(t, "allowwebchat", allowwebchat);
+                
+                // For 'sendmessage.php'
+                s(t, "webchat-interval", configuration.getFloat("webchat-interval", 5.0f));
             }
         });
         plugin.events.addListener("initialized", new Event.Listener<Object>() {
@@ -81,6 +81,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
             return new File(plugin.getDataFolder(), webpath.toString());
     }
     
+    private static final int RETRY_LIMIT = 5;
     protected void writeConfiguration() {
         File outputFile;
         File outputTempFile;
@@ -88,17 +89,27 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
         plugin.events.trigger("buildclientconfiguration", clientConfiguration);
         outputFile = getStandaloneFile("dynmap_config.json");
         outputTempFile = getStandaloneFile("dynmap_config.json.new");
-
-        try {
-            FileOutputStream fos = new FileOutputStream(outputTempFile);
-            fos.write(clientConfiguration.toJSONString().getBytes("UTF-8"));
-            fos.close();
-            outputFile.delete();
-            outputTempFile.renameTo(outputFile);
-        } catch (FileNotFoundException ex) {
-            Log.severe("Exception while writing JSON-configuration-file.", ex);
-        } catch (IOException ioe) {
-            Log.severe("Exception while writing JSON-configuration-file.", ioe);
+        
+        int retrycnt = 0;
+        boolean done = false;
+        while(!done) {
+            try {
+                FileOutputStream fos = new FileOutputStream(outputTempFile);
+                fos.write(clientConfiguration.toJSONString().getBytes("UTF-8"));
+                fos.close();
+                outputFile.delete();
+                outputTempFile.renameTo(outputFile);
+                done = true;
+            } catch (IOException ioe) {
+                if(retrycnt < RETRY_LIMIT) {
+                    try { Thread.sleep(20 * (1 << retrycnt)); } catch (InterruptedException ix) {}
+                    retrycnt++;
+                }
+                else {
+                    Log.severe("Exception while writing JSON-configuration-file.", ioe);
+                    done = true;
+                }
+            }
         }
     }
     
@@ -106,6 +117,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
     protected void writeUpdates() {
         File outputFile;
         File outputTempFile;
+        if(plugin.mapManager == null) return;
         //Handles Updates
         for (DynmapWorld dynmapWorld : plugin.mapManager.getWorlds()) {
             World world = dynmapWorld.world;
@@ -117,16 +129,26 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
 
             outputFile = getStandaloneFile("dynmap_" + world.getName() + ".json");
             outputTempFile = getStandaloneFile("dynmap_" + world.getName() + ".json.new");
-            try {
-                FileOutputStream fos = new FileOutputStream(outputTempFile);
-                fos.write(Json.stringifyJson(update).getBytes("UTF-8"));
-                fos.close();
-                outputFile.delete();
-                outputTempFile.renameTo(outputFile);
-            } catch (FileNotFoundException ex) {
-                Log.severe("Exception while writing JSON-file.", ex);
-            } catch (IOException ioe) {
-                Log.severe("Exception while writing JSON-file.", ioe);
+            int retrycnt = 0;
+            boolean done = false;
+            while(!done) {
+                try {
+                    FileOutputStream fos = new FileOutputStream(outputTempFile);
+                    fos.write(Json.stringifyJson(update).getBytes("UTF-8"));
+                    fos.close();
+                    outputFile.delete();
+                    outputTempFile.renameTo(outputFile);
+                    done = true;
+                } catch (IOException ioe) {
+                    if(retrycnt < RETRY_LIMIT) {
+                        try { Thread.sleep(20 * (1 << retrycnt)); } catch (InterruptedException ix) {}
+                        retrycnt++;
+                    }
+                    else {
+                        Log.severe("Exception while writing JSON-file.", ioe);
+                        done = true;
+                    }
+                }
             }
             plugin.events.<ClientUpdateEvent>trigger("clientupdatewritten", clientUpdate);
         }
@@ -174,9 +196,10 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
     }
     
     protected void webChat(String name, String message) {
+        if(plugin.mapManager == null) return;
         // TODO: Change null to something meaningful.
         plugin.mapManager.pushUpdate(new Client.ChatMessage("web", null, name, message, null));
-        Log.info(plugin.configuration.getString("webprefix", "\u00A2[WEB] ") + name + ": " + plugin.configuration.getString("websuffix", "\u00A7f") + message);
+        Log.info(unescapeString(plugin.configuration.getString("webprefix", "\u00A2[WEB] ")) + name + ": " + unescapeString(plugin.configuration.getString("websuffix", "\u00A7f")) + message);
         ChatEvent event = new ChatEvent("web", name, message);
         plugin.events.trigger("webchat", event);
     }
@@ -184,6 +207,5 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
     @Override
     public void dispose() {
         super.dispose();
-        timer.cancel();
     }
 }