Fixed disable-webserver not being used (thanks for checking that Kilandor).

also the icon

.gitignore

@@ -0,0 +1,25 @@
+# Eclipse stuff
+/.classpath
+/.project
+/.settings
+
+# netbeans
+/nbproject
+
+# we use maven!
+/build.xml
+
+# maven
+/target
+
+# vim
+.*.sw[a-p]
+
+# various other potential build files
+/build
+/bin
+/dist
+/manifest.mf
+
+# Mac filesystem dust
+/.DS_Store

assembly.xml

@@ -0,0 +1,34 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>build</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>LICENSE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/web</directory>
+      <outputDirectory>/dynmap/web</outputDirectory>
+    </fileSet>
+    <fileSet>
+    	<directory>${project.basedir}</directory>
+    	<outputDirectory>/dynmap/</outputDirectory>
+    	<includes>
+    		<include>configuration.txt</include></includes></fileSet>
+  </fileSets>
+  <files>
+  	<file>
+  		<source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  		<outputDirectory>/</outputDirectory>
+  		<destName>dynmap.jar</destName></file></files>
+</assembly>

build.xml

@@ -1,46 +1,41 @@
 <project name="dynmap" default="dist" basedir=".">
-	<!-- Change the following two properties to the correct jar files -->
-	<property name="minecraftserver.jar" location="../../minecraft_server.jar"/>
-	<property name="hmod.jar" location="../../Minecraft_Mod.jar"/>
+	   <property name="bukkit.jar" location="C:\Users\Bob\Desktop\minecraft_server\bukkit-0.0.1-SNAPSHOT.jar"/>
+	    <property name="minecraft" location="C:\Users\Bob\Desktop\minecraft_server"/>
+	    <property name="plugins" location="${minecraft}/plugins/"/>
+	    <property name="http_root" location="/srv/http/dynmap/"/>
+	<property name="pluginname" value="dynmap"/>
 
-	<property name="minecraft" location="../../"/>
-	<property name="plugins" location="${minecraft}/plugins/"/>
-	<property name="http_root" location="/srv/http/dynmap/"/>
-	
 	<property name="src" location="src"/>
 	<property name="bin" location="bin"/>
 	<property name="dist" location="dist"/>
-	<property name="web" location="web"/>
 	
 	<target name="init">
 		<mkdir dir="${bin}"/>
 	</target>
 	
 	<target name="compile" depends="init">
-		<javac srcdir="${src}" destdir="${bin}" includeantruntime="false">
-			<classpath>
-				<pathelement location="${hmod.jar}"/>
-				<pathelement location="${minecraftserver.jar}"/>
-			</classpath>
-		</javac>
+		<javac srcdir="${src}/main/java" destdir="${bin}" classpath="${bukkit.jar}" debug="on" includeantruntime="false" />
 	</target>
 	
 	<target name="dist" depends="compile">
 		<mkdir dir="${dist}"/>
-		<jar jarfile="${dist}/map.jar" basedir="${bin}"/>
+		<jar jarfile="${dist}/${pluginname}.jar">
+			<fileset dir="${bin}"/>
+			<fileset file="${src}/main/resources/plugin.yml"/>
+			<zipfileset file="${src}/main/resources/colors.txt"/>
+		</jar>
 	</target>
 	
 	<target name="deploy" depends="dist">
-		<copy file="${dist}/map.jar" todir="${plugins}"/>
-		<copy file="colors.txt" todir="${minecraft}"/>
+		<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
 		<copy todir="${http_root}">
 			<fileset dir="web"/>
 		</copy>
 	</target>
 	
 	<target name="release" depends="dist">
-		<delete file="dynmap.zip"/>
-		<zip destfile="dynmap.zip">
+		<delete file="${pluginname}.zip"/>
+		<zip destfile="${pluginname}.zip">
 			<zipfileset dir="." includes="README.md" fullpath="readme.txt"/>
 			<zipfileset dir="." includes="build.xml"/>
 			<zipfileset dir="${dist}" includes="*.jar"/>
@@ -53,4 +48,4 @@
 		<delete dir="${bin}"/>
 		<delete dir="${dist}"/>
 	</target>
-</project>
+</project>

build_parameters.xml

@@ -0,0 +1,6 @@
+<project name="dynmap_parameters" basedir=".">
+	<property name="bukkit.jar" location="../../bukkit.jar"/>
+	<property name="minecraft" location="../../"/>
+	<property name="plugins" location="${minecraft}/plugins/"/>
+	<property name="http_root" location="/srv/http/dynmap/"/>
+</project>

configuration.txt

@@ -0,0 +1,101 @@
+# All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/
+
+# How often a tile gets rendered (in seconds).
+renderinterval: 1
+
+# 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
+
+# Writes JSON to file in the webpath
+jsonfile: false
+
+# How often the json file gets written to(in seconds)
+jsonfile-interval: 1
+
+# The maptypes Dynmap will use to render.
+worlds:
+  - name: world
+    maps:
+      - class: org.dynmap.kzedmap.KzedMap
+        renderers:
+          - class: org.dynmap.kzedmap.DefaultTileRenderer
+            prefix: t
+            maximumheight: 127
+          - class: org.dynmap.kzedmap.CaveTileRenderer
+            prefix: ct
+            maximumheight: 127
+  - name: nether
+    maps:
+      - class: org.dynmap.kzedmap.KzedMap
+        renderers:
+          - class: org.dynmap.kzedmap.DefaultTileRenderer
+            prefix: nt
+            maximumheight: 64
+
+web:
+    # Handles the clientside updates differently only enable if using jsonfile
+    jsonfile: false
+
+    # Interval the browser should poll for updates.
+    updaterate: 2000
+    
+    # showchat: modal/balloons
+    showchat: modal
+    messagettl: 15000
+        
+    showplayerfacesonmap: true
+    showplayerfacesinmenu: true
+    focuschatballoons: false
+    joinmessage: "%playername% joined"
+    quitmessage: "%playername% quit"
+    
+    defaultworld: world
+    worlds:
+      - title: World
+        name: world
+        maps:
+          - type: KzedMapType
+            title: Surface
+            name: surface
+            prefix: t
+          - type: KzedMapType
+            title: Cave
+            name: cave
+            prefix: ct
+      - title: Nether
+        name: nether
+        maps:
+          - type: KzedMapType
+            title: Surface
+            name: nether
+            prefix: nt
+      # Example:
+      #- title: Other World           # With what name the world is displayed.
+      #  name: world_other            # The actual name of the world (equal to your directory-name).
+      #  maps:
+      #    - type: KzedMapType        # The type (or perspective) of the map. At the moment, there are no others than KzedMapType.
+      #      title: Surface           # The name of the map that will be displayed.
+      #      name: surface            # The actual name of the map (should be unique for this world).
+      #      prefix: t                # The prefix of the tile-files that are generated.
+      #      icon: block_other.png    # Sets a custom icon for the map. (optional)
+      #    - type: KzedMapType
+      #      title: Cave
+      #      name: cave
+      #      prefix: ct
+
+# Enables debugging.
+#debuggers:
+#  - class: org.dynmap.debug.LogDebugger
+#  - class: org.dynmap.debug.BukkitPlayerDebugger

pom.xml

@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bukkit</groupId>
+  <artifactId>dynmap</artifactId>
+  <version>0.13</version>
+  <name>DynamicMap</name>
+  <url>http://www.bukkit.org</url>
+  <build>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <version>2.0.2</version>
+              <configuration>
+                  <source>1.6</source>
+                  <target>1.6</target>
+              </configuration>
+          </plugin>
+          <plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+    				<descriptors>
+        				<descriptor>assembly.xml</descriptor>
+    				</descriptors>
+				</configuration>
+				<executions>
+   					<execution>
+       					<id>build</id>
+        				<phase>package</phase>
+        				<goals>
+            				<goal>single</goal>
+        				</goals>
+    				</execution>
+				</executions>
+			</plugin>
+      	</plugins>
+  </build>
+  <dependencies>
+  	<dependency>
+  	  <groupId>org.bukkit</groupId>
+  	  <artifactId>bukkit</artifactId>
+  	  <version>0.0.1-SNAPSHOT</version>
+  	  <type>jar</type>
+      <scope>compile</scope>
+  	</dependency>
+  </dependencies>
+</project>

readme.txt

@@ -1,22 +0,0 @@
-Commands
---------------------------------------------------
-/map_wait [wait] - set wait between tile renders (ms)
-/map_stat - query number of tiles in render queue
-/map_regen - regenerate entire map (currently buggy)
-/map_debug - send map debugging messages
-/map_nodebug - disable map debugging messages
-/map_regenzoom - regenerates zoom-out tiles
-
-/addsign [name] - adds a named sign to the map
-/removesign [name] - removes a named sign to the map
-/listsigns - list all named signs
-/tpsign [name] - teleport to a named sign
-
-server.properties
---------------------------------------------------
-map-colorsetpath - point to colors.txt
-map-tilepath - point to web/tiles folder
-map-signspath - point to signs.txt file (do not need to create the file, one will be created when you create a sign)
-map-serverport - the port the web server runs on (default is 8123)
-map-showmarkers - a list of which markers to show on the map, comma separated if multiple (spawn, homes, warps, signs, players, all, none)
-map-generateportraits - whether player-portraits are generated by the server (0, 1, default: 0)

src/Cache.java

@@ -1,114 +0,0 @@
-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/DMFlatFileSource.java

@@ -1,13 +0,0 @@
-/* FlatFileSource class wrapper to expose protected properties */
-
-import java.util.List;
-
-public class DMFlatFileSource extends FlatFileSource {
-	public List<Warp> getAllWarps() {
-		return this.warps;
-	}
-	
-	public List<Warp> getAllHomes() {
-		return this.homes;
-	}
-}

src/DMMySQLSource.java

@@ -1,13 +0,0 @@
-/* MySQLSource class wrapper to expose protected properties */
-
-import java.util.List;
-
-public class DMMySQLSource extends MySQLSource {
-	public List<Warp> getAllWarps() {
-		return this.warps;
-	}
-	
-	public List<Warp> getAllHomes() {
-		return this.homes;
-	}
-}

src/MapListener.java

@@ -1,151 +0,0 @@
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.logging.Logger;
-
-public class MapListener extends PluginListener {
-	private static final Logger log = Logger.getLogger("Minecraft");
-	private MapManager mgr;
-	
-	public MapListener(MapManager mgr)
-	{
-		this.mgr = mgr;
-	}
-
-	@Override
-	public boolean onBlockCreate(Player player, Block blockPlaced, Block blockClicked, int itemInHand)
-	{
-		if(mgr.touch(blockPlaced.getX(), blockPlaced.getY(), blockPlaced.getZ()))
-			mgr.debug(player.getName() + " touch " + blockPlaced.getX() + "," + blockPlaced.getY() + "," + blockPlaced.getZ() + " from onBlockCreate");
-		return false;
-	}
-
-	@Override
-	public boolean onBlockDestroy(Player player, Block block)
-	{
-		int x = block.getX();
-		int y = block.getY();
-		int z = block.getZ();
-		if(x == 0 && y == 0 && z == 0)
-			return false;
-
-		if(mgr.touch(x, y, z))
-			mgr.debug(player.getName() + " touch " + x + "," + y + "," + z + " from onBlockBreak");
-
-		return false;
-	}
-
-	@Override
-	public void onLogin(Player player)
-	{
-		mgr.getPlayerImage(player);
-	}
-	
-	@Override
-	public boolean onCommand(Player player, String[] split)
-	{
-		if(!player.canUseCommand(split[0]))
-			return false;
-
-		if(split[0].equals("/map_wait")) {
-			if(split.length < 2) {
-				mgr.renderWait = 1000;
-			} else {
-				try {
-					mgr.renderWait = Integer.parseInt(split[1]);
-				} catch(NumberFormatException e) {
-					player.sendMessage(Colors.Rose + "Invalid number");
-				}
-			}
-			return true;
-		}
-
-		if(split[0].equals("/map_regen")) {
-			mgr.regenerate((int) player.getX(), (int) player.getY(), (int) player.getZ());
-			player.sendMessage(Colors.Rose + "Map regeneration in progress");
-			return true;
-		}
-
-		if(split[0].equals("/map_stat")) {
-			player.sendMessage(Colors.Rose + "Stale tiles: " + mgr.getStaleCount() + " Recent updates: " + mgr.getRecentUpdateCount());
-			return true;
-		}
-
-		if(split[0].equals("/map_debug")) {
-			mgr.debugPlayer = player.getName();
-			return true;
-		}
-
-		if(split[0].equals("/map_nodebug")) {
-			mgr.debugPlayer = null;
-			return true;
-		}
-		
-		if(split[0].equals("/addsign")) {
-			if(split.length < 2)
-			{
-				player.sendMessage("Map> " + Colors.Red + "Usage: /addsign [name]");
-			}
-			else
-			{
-				if (mgr.addSign(player, split[1], player.getX(), player.getY(), player.getZ()))
-				{
-					player.sendMessage("Map> " + Colors.White + "Sign \"" + split[1] + "\" added successfully");
-				}
-			}
-			return true;
-		}
-		
-		if(split[0].equals("/removesign")) {
-			if(split.length < 2)
-			{
-				player.sendMessage("Map> " + Colors.Red + "Usage: /removesign [name]");
-			}
-			else
-			{
-				if (mgr.removeSign(player, split[1]))
-				{
-					player.sendMessage("Map> " + Colors.White + "Sign \"" + split[1] + "\" removed successfully");
-				}
-			}
-			return true;
-		}
-		
-		if(split[0].equals("/listsigns")) {
-			String msg = "";
-			Collection<Warp> values = mgr.signs.values();
-	    	Iterator<Warp> it = values.iterator();
-	    	while(it.hasNext())
-	    	{
-	    		Warp sign = it.next();
-	    		String line = " - " + sign.Name + "\t";
-	    		msg += line;
-	    	}
-	    	player.sendMessage("" + Colors.White + msg);
-			return true;
-		}
-		
-		if(split[0].equals("/tpsign")) {
-			if(split.length < 2)
-			{
-				player.sendMessage("Map> " + Colors.Red + "Usage: /tpsign [name]");
-			}
-			else
-			{
-				if (mgr.teleportToSign(player, split[1]))
-				{
-					//player.sendMessage("Map> " + Colors.White + "");
-				}
-			}
-			return true;
-		}
-
-		if(split[0].equals("/map_regenzoom")) {
-			mgr.regenerateZoom((int) player.getX(), (int) player.getY(), (int) player.getZ());
-			player.sendMessage(Colors.Rose + "regenerateZoom done");
-			return true;
-		}
-
-		return false;
-	}
-}

src/TileUpdate.java

@@ -1,12 +0,0 @@
-/* this class stores a tile update */
-
-public class TileUpdate {
-	public long at;
-	public MapTile tile;
-
-	public TileUpdate(long at, MapTile tile)
-	{
-		this.at = at;
-		this.tile = tile;
-	}
-}

src/WebServer.java

@@ -1,53 +0,0 @@
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import java.util.logging.Logger;
-
-public class WebServer extends Thread {
-
-	public static final String VERSION = "Huncraft";
-	protected static final Logger log = Logger.getLogger("Minecraft");
-
-	private ServerSocket sock = null;
-	private boolean running = false;
-
-	private MapManager mgr;
-
-	public WebServer(int port, MapManager mgr) throws IOException
-	{
-		this.mgr = mgr;
-		sock = new ServerSocket(port, 5, InetAddress.getByName("127.0.0.1"));
-		running = true;
-		start();
-		log.info("map WebServer started on port " + port);
-	}
-
-	public void run()
-	{
-		while (running) {
-			try {
-				Socket socket = sock.accept();
-				WebServerRequest requestThread = new WebServerRequest(socket, mgr);
-				requestThread.start();
-			}
-			catch (IOException e) {
-				log.info("map WebServer.run() stops with IOException");
-				break;
-			}
-		}
-		log.info("map WebServer run() exiting");
-	}
-
-	public void shutdown()
-	{
-		try {
-			if(sock != null) {
-				sock.close();
-			}
-		} catch(IOException e) {
-			log.info("map stop() got IOException while closing socket");
-		}
-		running = false;
-	}
-}

src/WebServerRequest.java

@@ -1,145 +0,0 @@
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.Socket;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Logger;
-
-public class WebServerRequest extends Thread {
-	protected static final Logger log = Logger.getLogger("Minecraft");
-
-	private Socket sock;
-	private MapManager mgr;
-
-	public WebServerRequest(Socket socket, MapManager mgr)
-	{
-		sock = socket;
-		this.mgr = mgr;
-	}
-
-	private static void sendHeader(BufferedOutputStream out, int code, String contentType, long contentLength, long lastModified) throws IOException
-	{
-		out.write(("HTTP/1.0 " + code + " OK\r\n" + 
-					"Date: " + new Date().toString() + "\r\n" +
-					"Server: JibbleWebServer/1.0\r\n" +
-					"Content-Type: " + contentType + "\r\n" +
-					"Expires: Thu, 01 Dec 1994 16:00:00 GMT\r\n" +
-					((contentLength != -1) ? "Content-Length: " + contentLength + "\r\n" : "") +
-					"Last-modified: " + new Date(lastModified).toString() + "\r\n" +
-					"\r\n").getBytes());
-	}
-
-	private static void sendError(BufferedOutputStream out, int code, String message) throws IOException
-	{
-		message = message + "<hr>" + WebServer.VERSION;
-		sendHeader(out, code, "text/html", message.length(), System.currentTimeMillis());
-		out.write(message.getBytes());
-		out.flush();
-		out.close();
-	}
-
-	public void run()
-	{
-		InputStream reader = null;
-		try {
-			sock.setSoTimeout(30000);
-			BufferedReader in = new BufferedReader(new InputStreamReader(sock.getInputStream()));
-			BufferedOutputStream out = new BufferedOutputStream(sock.getOutputStream());
-
-			String request = in.readLine();
-			if (request == null || !request.startsWith("GET ") || !(request.endsWith(" HTTP/1.0") || request.endsWith("HTTP/1.1"))) {
-				// Invalid request type (no "GET")
-				sendError(out, 500, "Invalid Method.");
-				return;
-			}
-
-			String path = request.substring(4, request.length() - 9);
-
-			int current = (int) (System.currentTimeMillis() / 1000);
-			long cutoff = 0;
-
-			if(path.charAt(0) == '/') {
-				try {
-					cutoff = ((long) Integer.parseInt(path.substring(1))) * 1000;
-				} catch(NumberFormatException e) {
-				}
-			}
-
-			sendHeader(out, 200, "text/plain", -1, System.currentTimeMillis());
-
-			StringBuilder sb = new StringBuilder();
-			sb.append(current + " " + etc.getServer().getRelativeTime() + "\n");
-
-			if (mgr.showPlayers) {
-				for(Player player : etc.getServer().getPlayerList()) {
-					sb.append(player.getName() + " player " + player.getX() + " " + player.getY() + " " + player.getZ() + "\n");
-				}
-			}
-			
-			if (mgr.showSigns) {
-				for(Warp sign : mgr.signs.values())
-				{
-					sb.append(sign.Name + " sign " + sign.Location.x + " " + sign.Location.y + " " + sign.Location.z + "\n");
-				}
-			}
-
-			if (mgr.showWarps) {
-				List<Warp> warps = mgr.loadWarps();
-				
-				if (warps != null) {
-					for(Warp warp : warps) {
-						sb.append(warp.Name + " warp " + warp.Location.x + " " + warp.Location.y + " " + warp.Location.z + "\n");
-					}
-				}
-			}
-			
-			if (mgr.showHomes) {
-				List<Warp> homes = mgr.loadHomes();
-				
-				if (homes != null) {
-					for(Warp warp : homes) {
-						sb.append(warp.Name + " home " + warp.Location.x + " " + warp.Location.y + " " + warp.Location.z + "\n");
-					}
-				}
-			}
-			
-			if (mgr.showSpawn) {
-				Location spawnLocation = etc.getServer().getSpawnLocation();
-				
-				sb.append("Spawn spawn " + spawnLocation.x + " " + spawnLocation.y + " " + spawnLocation.z + "\n");
-			}
-			
-			synchronized(mgr.lock) {
-				for(TileUpdate tu : mgr.tileUpdates) {
-					if(tu.at >= cutoff) {
-						sb.append(tu.tile.px + "_" + tu.tile.py + " " + tu.tile.zpx + "_" + tu.tile.zpy + " t\n");
-					}
-				}
-
-				for(TileUpdate tu : mgr.caveTileUpdates) {
-					if(tu.at >= cutoff) {
-						sb.append(tu.tile.px + "_" + tu.tile.py + " " + tu.tile.zpx + "_" + tu.tile.zpy + " c\n");
-					}
-				}
-			}
-
-			out.write(sb.toString().getBytes());
-
-			out.flush();
-			out.close();
-		}
-		catch (IOException e) {
-			if (reader != null) {
-				try {
-					reader.close();
-				}
-				catch (Exception anye) {
-					// Do nothing.
-				}
-			}
-		}
-	}
-}

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

@@ -0,0 +1,108 @@
+package org.dynmap;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class AsynchronousQueue<T> {
+    protected static final Logger log = Logger.getLogger("Minecraft");
+
+    private Object lock = new Object();
+    private Thread thread;
+    private LinkedList<T> queue = new LinkedList<T>();
+    private Set<T> set = new HashSet<T>();
+    private Handler<T> handler;
+    private int dequeueTime;
+
+    public AsynchronousQueue(Handler<T> handler, int dequeueTime) {
+        this.handler = handler;
+        this.dequeueTime = dequeueTime;
+    }
+
+    public boolean push(T t) {
+        synchronized (lock) {
+            if (set.add(t)) {
+                queue.addLast(t);
+                return true;
+            }
+            return false;
+        }
+    }
+
+    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;
+            }
+        }
+    }
+
+    public int size() {
+        return set.size();
+    }
+
+    public void start() {
+        synchronized (lock) {
+            thread = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    running();
+                }
+            });
+            thread.start();
+            try {
+                thread.setPriority(Thread.MIN_PRIORITY);
+            } catch (SecurityException e) {
+                log.info("Failed to set minimum priority for worker thread!");
+            }
+        }
+    }
+
+    public void stop() {
+        synchronized (lock) {
+            if (thread == null)
+                return;
+            Thread oldThread = thread;
+            thread = null;
+
+            log.info("Stopping map renderer...");
+
+            try {
+                oldThread.join();
+            } catch (InterruptedException e) {
+                log.info("Waiting for map renderer to stop is interrupted");
+            }
+        }
+    }
+
+    private void running() {
+        try {
+            while (Thread.currentThread() == thread) {
+                T t = pop();
+                if (t != null) {
+                    handler.handle(t);
+                }
+                sleep(dequeueTime);
+            }
+
+        } catch (Exception ex) {
+            log.log(Level.SEVERE, "Exception on rendering-thread", ex);
+        }
+    }
+
+    private void sleep(int time) {
+        try {
+            Thread.sleep(time);
+        } catch (InterruptedException e) {
+        }
+    }
+}

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

@@ -0,0 +1,111 @@
+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

@@ -0,0 +1,60 @@
+package org.dynmap;
+
+public class Client {
+    public static class Update {
+        public long timestamp;
+        public long servertime;
+        public Player[] players;
+        public Object[] updates;
+    }
+
+    public static class Player {
+        public String type = "player";
+        public String name;
+        public String world;
+        public double x, y, z;
+
+        public Player(String name, String world, double x, double y, double z) {
+            this.name = name;
+            this.world = world;
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+    }
+
+    public static class Stamped {
+        public long timestamp = System.currentTimeMillis();
+    }
+    
+    public static class ChatMessage extends Stamped {
+        public String type = "chat";
+        public String playerName;
+        public String message;
+
+        public ChatMessage(String playerName, String message) {
+            this.playerName = playerName;
+            this.message = message;
+        }
+    }
+    
+    public static class WebChatMessage extends Stamped {
+        public String type = "webchat";
+        public String playerName;
+        public String message;
+
+        public WebChatMessage(String playerName, String message) {
+            this.playerName = playerName;
+            this.message = message;
+        }
+    }
+
+    public static class Tile extends Stamped {
+        public String type = "tile";
+        public String name;
+
+        public Tile(String name) {
+            this.name = name;
+        }
+    }
+}

src/main/java/org/dynmap/DynmapBlockListener.java

@@ -0,0 +1,28 @@
+package org.dynmap;
+
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockDamageLevel;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockListener;
+import org.bukkit.event.block.BlockPlaceEvent;
+
+public class DynmapBlockListener extends BlockListener {
+    private MapManager mgr;
+
+    public DynmapBlockListener(MapManager mgr) {
+        this.mgr = mgr;
+    }
+
+    @Override
+    public void onBlockPlace(BlockPlaceEvent event) {
+        Block blockPlaced = event.getBlockPlaced();
+        mgr.touch(blockPlaced.getLocation());
+    }
+
+    public void onBlockDamage(BlockDamageEvent event) {
+        if (event.getDamageLevel() == BlockDamageLevel.BROKEN) {
+            Block blockBroken = event.getBlock();
+            mgr.touch(blockBroken.getLocation());
+        }
+    }
+}