Add assertPlayerInvisibility() API

Conflicts:
	src/main/java/org/dynmap/bukkit/DynmapPlugin.java

build.xml

@@ -1,51 +0,0 @@
-<project name="dynmap" default="dist" basedir=".">
-	   <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="src" location="src"/>
-	<property name="bin" location="bin"/>
-	<property name="dist" location="dist"/>
-	
-	<target name="init">
-		<mkdir dir="${bin}"/>
-	</target>
-	
-	<target name="compile" depends="init">
-		<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}/${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}/${pluginname}.jar" todir="${plugins}"/>
-		<copy todir="${http_root}">
-			<fileset dir="web"/>
-		</copy>
-	</target>
-	
-	<target name="release" depends="dist">
-		<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"/>
-			<zipfileset dir="${src}" includes="*.java" prefix="src/"/>
-			<zipfileset dir="${web}" includes="**" prefix="web/"/>
-		</zip>
-	</target>
-	
-	<target name="clean">
-		<delete dir="${bin}"/>
-		<delete dir="${dist}"/>
-	</target>
-</project>

build_parameters.xml

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

@@ -1,49 +0,0 @@
-# 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.
-tilepath: 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
-
-disabledcommands:
-  - fullrender
-
-# The maptypes Dynmap will use to render.
-maps:
-  - class: org.dynmap.kzedmap.KzedMap
-    renderers:
-      - class: org.dynmap.kzedmap.DefaultTileRenderer
-        prefix: t
-      - class: org.dynmap.kzedmap.CaveTileRenderer
-        prefix: ct
-
-web:
-    # Interval the browser should poll for updates.
-    updaterate: 2000
-    
-    showchatballoons: true
-    showplayerfacesonmap: true
-    showplayerfacesinmenu: true
-    focuschatballoons: false
-    
-    # The name of the map shown when opening Dynmap's page (must be in menu).
-    defaultmap: defaultmap
-    
-    # The maps shown in the menu.
-    shownmaps:
-      - type: KzedMapType
-        name: defaultmap
-        prefix: t
-      - type: KzedMapType
-        name: cavemap
-        prefix: ct

permissions.txt

@@ -0,0 +1,6 @@
+dynmap.render		# Render current chunk
+dynmap.fullrender	# Issue a full render
+dynmap.hide.self	# Hide self from map
+dynmap.hide.others	# Hide others from map
+dynmap.show.self	# Reveal self on map
+dynmap.show.others	# Reveal others on map

pom.xml

@@ -1,30 +1,177 @@
 <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>dynamic-map</artifactId>
-  <version>0.0.1-SNAPSHOT</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>
-      </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>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.dynmap</groupId>
+	<artifactId>dynmap</artifactId>
+	<version>0.31</version>
+	<name>dynmap</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<BUILD_NUMBER>dev</BUILD_NUMBER>
+	</properties>
+	<url>http://github.com/webbukkit/dynmap/</url>
+	<issueManagement>
+		<system>GitHub</system>
+		<url>https://github.com/webbukkit/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>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.4</version>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<goals><goal>unpack</goal></goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.dynmap</groupId>
+									<artifactId>DynmapCore</artifactId>
+									<version>${project.version}</version>
+									<classifier>bin</classifier>
+									<type>zip</type>
+									<outputDirectory>${project.build.directory}/core</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.5</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>org.dynmap:dynmap-api:jar:*</include>
+									<include>org.dynmap:DynmapCore:jar:*</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<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>
+						<id>build</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<releases>
+			</releases>
+			<snapshots>
+			</snapshots>
+			<id>spout-repo</id>
+			<url>http://repo.spout.org</url>
+		</repository>
+	</repositories>
+	<dependencies>
+		<dependency>
+			<groupId>com.nijikokun.bukkit</groupId>
+			<artifactId>Permissions</artifactId>
+			<version>[2.5.4,)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>bukkit</artifactId>
+			<version>[1.1-R1-SNAPSHOT,)</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.dynmap</groupId>
+			<artifactId>dynmap-api</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-server</artifactId>
+			<version>8.0.1.v20110908</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-servlet</artifactId>
+			<version>8.0.1.v20110908</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.dynmap</groupId>
+			<artifactId>DynmapCore</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.getspout</groupId>
+			<artifactId>spoutpluginapi</artifactId>
+			<version>dev-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
 </project>

src/main/assembly/package.xml

@@ -0,0 +1,27 @@
+<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>bin</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+    	<directory>${project.build.directory}/core</directory>
+    	<outputDirectory>/dynmap</outputDirectory>
+    	<excludes>
+    		<exclude>web/version.js</exclude></excludes></fileSet>
+    <fileSet>
+    	<directory>${project.build.directory}/core/web</directory>
+    	<outputDirectory>/dynmap/web</outputDirectory>
+    	<includes>
+    		<include>version.js</include></includes>
+    	<filtered>true</filtered></fileSet>
+  </fileSets>
+  <files>
+  	<file>
+  	  <source>${project.build.directory}/${artifactId}-${version}.jar</source>
+  	  <outputDirectory>/</outputDirectory>
+  	  <destName>dynmap.jar</destName>
+	</file>
+  </files>
+</assembly>

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

@@ -1,43 +0,0 @@
-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 double x, y, z;
-
-        public Player(String name, double x, double y, double z) {
-            this.name = name;
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-    }
-
-    public static class ChatMessage {
-        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 Tile {
-        public String type = "tile";
-        public String name;
-
-        public Tile(String name) {
-            this.name = name;
-        }
-    }
-}

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

@@ -1,28 +0,0 @@
-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.getX(), blockPlaced.getY(), blockPlaced.getZ());
-    }
-
-    public void onBlockDamage(BlockDamageEvent event) {
-        if (event.getDamageLevel() == BlockDamageLevel.BROKEN) {
-            Block blockBroken = event.getBlock();
-            mgr.touch(blockBroken.getX(), blockBroken.getY(), blockBroken.getZ());
-        }
-    }
-}

src/main/java/org/dynmap/DynmapChunk.java

@@ -1,10 +0,0 @@
-package org.dynmap;
-
-public class DynmapChunk {
-    public int x, z;
-
-    public DynmapChunk(int x, int z) {
-        this.x = x;
-        this.z = z;
-    }
-}

src/main/java/org/dynmap/DynmapPlayerListener.java

@@ -1,71 +0,0 @@
-package org.dynmap;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.util.config.ConfigurationNode;
-
-public class DynmapPlayerListener extends PlayerListener {
-    private MapManager mgr;
-    private PlayerList playerList;
-    private ConfigurationNode configuration;
-
-    public DynmapPlayerListener(MapManager mgr, PlayerList playerList, ConfigurationNode configuration) {
-        this.mgr = mgr;
-        this.playerList = playerList;
-        this.configuration = configuration;
-    }
-
-    @Override
-    public void onPlayerCommand(PlayerChatEvent event) {
-        String[] split = event.getMessage().split(" ");
-        if (split[0].equalsIgnoreCase("/dynmap")) {
-            if (split.length > 1) {
-                if (configuration.getProperty("disabledcommands") instanceof Iterable<?>) {
-                    for(String s : (Iterable<String>)configuration.getProperty("disabledcommands")) {
-                        if (split[1].equals(s)) {
-                            return;
-                        }
-                    }
-                }
-                
-                if (split[1].equals("render")) {
-                    Player player = event.getPlayer();
-                    mgr.touch(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ());
-                    event.setCancelled(true);
-                } else if (split[1].equals("hide")) {
-                    if (split.length == 2) {
-                        playerList.hide(event.getPlayer().getName());
-                    } else {
-                        for (int i = 2; i < split.length; i++) {
-                            playerList.hide(split[i]);
-                        }
-                    }
-                    event.setCancelled(true);
-                } else if (split[1].equals("show")) {
-                    if (split.length == 2) {
-                        playerList.show(event.getPlayer().getName());
-                    } else {
-                        for (int i = 2; i < split.length; i++) {
-                            playerList.show(split[i]);
-                        }
-                    }
-                    event.setCancelled(true);
-                } else if (split[1].equals("fullrender")) {
-                    Player player = event.getPlayer();
-                    mgr.renderFullWorld(player.getLocation());
-                }
-            }
-        }
-    }
-
-    /**
-     * Called when a player sends a chat message
-     * 
-     * @param event
-     *            Relevant event details
-     */
-    public void onPlayerChat(PlayerChatEvent event) {
-        mgr.updateQueue.pushUpdate(new Client.ChatMessage(event.getPlayer().getName(), event.getMessage()));
-    }
-}

src/main/java/org/dynmap/DynmapPlugin.java

@@ -1,114 +0,0 @@
-package org.dynmap;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.event.Event;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.block.BlockListener;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginLoader;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.util.config.Configuration;
-import org.dynmap.debug.BukkitPlayerDebugger;
-import org.dynmap.web.HttpServer;
-import org.dynmap.web.handlers.ClientConfigurationHandler;
-import org.dynmap.web.handlers.ClientUpdateHandler;
-import org.dynmap.web.handlers.FilesystemHandler;
-
-public class DynmapPlugin extends JavaPlugin {
-
-    protected static final Logger log = Logger.getLogger("Minecraft");
-
-    private HttpServer webServer = null;
-    private MapManager mapManager = null;
-    private PlayerList playerList;
-    private Configuration configuration;
-
-    private BukkitPlayerDebugger debugger = new BukkitPlayerDebugger(this);
-
-    public static File dataRoot;
-
-    public DynmapPlugin(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
-        super(pluginLoader, instance, desc, folder, plugin, cLoader);
-        dataRoot = folder;
-    }
-
-    public World getWorld() {
-        return getServer().getWorlds().get(0);
-    }
-
-    public MapManager getMapManager() {
-        return mapManager;
-    }
-
-    public HttpServer getWebServer() {
-        return webServer;
-    }
-
-    public void onEnable() {
-        configuration = new Configuration(new File(this.getDataFolder(), "configuration.txt"));
-        configuration.load();
-
-        debugger.enable();
-        playerList = new PlayerList(getServer());
-        playerList.load();
-
-        mapManager = new MapManager(getWorld(), debugger, configuration);
-        mapManager.startManager();
-
-        InetAddress bindAddress;
-        {
-            String address = configuration.getString("webserver-bindaddress", "0.0.0.0");
-            try {
-                bindAddress = address.equals("0.0.0.0")
-                        ? null
-                        : InetAddress.getByName(address);
-            } catch (UnknownHostException e) {
-                bindAddress = null;
-            }
-        }
-        int port = configuration.getInt("webserver-port", 8123);
-
-        webServer = new HttpServer(bindAddress, port);
-        webServer.handlers.put("/", new FilesystemHandler(mapManager.webDirectory));
-        webServer.handlers.put("/tiles/", new FilesystemHandler(mapManager.tileDirectory));
-        webServer.handlers.put("/up/", new ClientUpdateHandler(mapManager, playerList, getWorld()));
-        webServer.handlers.put("/up/configuration", new ClientConfigurationHandler((Map<?, ?>) configuration.getProperty("web")));
-
-        try {
-            webServer.startServer();
-        } catch (IOException e) {
-            log.severe("Failed to start WebServer on " + bindAddress + ":" + port + "!");
-        }
-
-        registerEvents();
-    }
-
-    public void onDisable() {
-        mapManager.stopManager();
-
-        if (webServer != null) {
-            webServer.shutdown();
-            webServer = null;
-        }
-        debugger.disable();
-    }
-
-    public void registerEvents() {
-        BlockListener blockListener = new DynmapBlockListener(mapManager);
-        getServer().getPluginManager().registerEvent(Event.Type.BLOCK_PLACED, blockListener, Priority.Normal, this);
-        getServer().getPluginManager().registerEvent(Event.Type.BLOCK_DAMAGED, blockListener, Priority.Normal, this);
-
-        PlayerListener playerListener = new DynmapPlayerListener(mapManager, playerList, configuration);
-        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this);
-        getServer().getPluginManager().registerEvent(Event.Type.PLAYER_CHAT, playerListener, Priority.Normal, this);
-    }
-}

src/main/java/org/dynmap/MapLocation.java

@@ -1,6 +0,0 @@
-package org.dynmap;
-
-public class MapLocation {
-    public float x;
-    public float y;
-}

src/main/java/org/dynmap/MapManager.java

@@ -1,238 +0,0 @@
-package org.dynmap;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.util.config.ConfigurationNode;
-import org.dynmap.debug.Debugger;
-
-public class MapManager extends Thread {
-    protected static final Logger log = Logger.getLogger("Minecraft");
-
-    private World world;
-    private Debugger debugger;
-    private MapType[] maps;
-    public StaleQueue staleQueue;
-    public UpdateQueue updateQueue;
-    public PlayerList playerList;
-
-    /* lock for our data structures */
-    public static final Object lock = new Object();
-
-    /* whether the worker thread should be running now */
-    private boolean running = false;
-
-    /* path to image tile directory */
-    public File tileDirectory;
-
-    /* web files location */
-    public File webDirectory;
-
-    /* bind web server to ip-address */
-    public String bindaddress = "0.0.0.0";
-
-    /* port to run web server on */
-    public int serverport = 8123;
-
-    /* time to pause between rendering tiles (ms) */
-    public int renderWait = 500;
-
-    public boolean loadChunks = true;
-
-    public void debug(String msg) {
-        debugger.debug(msg);
-    }
-
-    private static File combinePaths(File parent, String path) {
-        return combinePaths(parent, new File(path));
-    }
-
-    private static File combinePaths(File parent, File path) {
-        if (path.isAbsolute())
-            return path;
-        return new File(parent, path.getPath());
-    }
-
-    public MapManager(World world, Debugger debugger, ConfigurationNode configuration) {
-        this.world = world;
-        this.debugger = debugger;
-        this.staleQueue = new StaleQueue();
-        this.updateQueue = new UpdateQueue();
-
-        tileDirectory = combinePaths(DynmapPlugin.dataRoot, configuration.getString("tilespath", "web/tiles"));
-        webDirectory = combinePaths(DynmapPlugin.dataRoot, configuration.getString("webpath", "web"));
-        renderWait = (int) (configuration.getDouble("renderinterval", 0.5) * 1000);
-        loadChunks = configuration.getBoolean("loadchunks", true);
-
-        if (!tileDirectory.isDirectory())
-            tileDirectory.mkdirs();
-
-        maps = loadMapTypes(configuration);
-    }
-
-    void renderFullWorld(Location l) {
-        debugger.debug("Full render starting...");
-        for (MapType map : maps) {
-            int requiredChunkCount = 200;
-            HashSet<MapTile> found = new HashSet<MapTile>();
-            HashSet<MapTile> rendered = new HashSet<MapTile>();
-            LinkedList<MapTile> renderQueue = new LinkedList<MapTile>();
-            LinkedList<DynmapChunk> loadedChunks = new LinkedList<DynmapChunk>();
-
-            for (MapTile tile : map.getTiles(l)) {
-                if (!found.contains(tile)) {
-                    found.add(tile);
-                    renderQueue.add(tile);
-                }
-            }
-            while (!renderQueue.isEmpty()) {
-                MapTile tile = renderQueue.pollFirst();
-
-                DynmapChunk[] requiredChunks = tile.getMap().getRequiredChunks(tile);
-
-                if (requiredChunks.length > requiredChunkCount)
-                    requiredChunkCount = requiredChunks.length;
-                // Unload old chunks.
-                while (loadedChunks.size() >= requiredChunkCount - requiredChunks.length) {
-                    DynmapChunk c = loadedChunks.pollFirst();
-                    world.unloadChunk(c.x, c.z, false, true);
-                }
-
-                // Load the required chunks.
-                for (DynmapChunk chunk : requiredChunks) {
-                    boolean wasLoaded = world.isChunkLoaded(chunk.x, chunk.z);
-                    world.loadChunk(chunk.x, chunk.z, false);
-                    if (!wasLoaded)
-                        loadedChunks.add(chunk);
-                }
-
-                if (map.render(tile)) {
-                    found.remove(tile);
-                    rendered.add(tile);
-                    updateQueue.pushUpdate(new Client.Tile(tile.getName()));
-                    for (MapTile adjTile : map.getAdjecentTiles(tile)) {
-                        if (!found.contains(adjTile) && !rendered.contains(adjTile)) {
-                            found.add(adjTile);
-                            renderQueue.add(adjTile);
-                        }
-                    }
-                }
-                found.remove(tile);
-                System.gc();
-            }
-
-            // Unload remaining chunks to clean-up.
-            while (!loadedChunks.isEmpty()) {
-                DynmapChunk c = loadedChunks.pollFirst();
-                world.unloadChunk(c.x, c.z, false, true);
-            }
-        }
-        debugger.debug("Full render finished.");
-    }
-
-    private MapType[] loadMapTypes(ConfigurationNode configuration) {
-        List<?> configuredMaps = (List<?>) configuration.getProperty("maps");
-        ArrayList<MapType> mapTypes = new ArrayList<MapType>();
-        for (Object configuredMapObj : configuredMaps) {
-            try {
-                @SuppressWarnings("unchecked")
-                Map<String, Object> configuredMap = (Map<String, Object>) configuredMapObj;
-                String typeName = (String) configuredMap.get("class");
-                log.info("Loading map '" + typeName.toString() + "'...");
-                Class<?> mapTypeClass = Class.forName(typeName);
-                Constructor<?> constructor = mapTypeClass.getConstructor(MapManager.class, World.class, Debugger.class, Map.class);
-                MapType mapType = (MapType) constructor.newInstance(this, world, debugger, configuredMap);
-                mapTypes.add(mapType);
-            } catch (Exception e) {
-                debugger.error("Error loading map", e);
-            }
-        }
-        MapType[] result = new MapType[mapTypes.size()];
-        mapTypes.toArray(result);
-        return result;
-    }
-
-    /* initialize and start map manager */
-    public void startManager() {
-        synchronized (lock) {
-            running = true;
-            this.start();
-            try {
-                this.setPriority(MIN_PRIORITY);
-                log.info("Set minimum priority for worker thread");
-            } catch (SecurityException e) {
-                log.info("Failed to set minimum priority for worker thread!");
-            }
-        }
-    }
-
-    /* stop map manager */
-    public void stopManager() {
-        synchronized (lock) {
-            if (!running)
-                return;
-
-            log.info("Stopping map renderer...");
-            running = false;
-
-            try {
-                this.join();
-            } catch (InterruptedException e) {
-                log.info("Waiting for map renderer to stop is interrupted");
-            }
-        }
-    }
-
-    /* the worker/renderer thread */
-    public void run() {
-        try {
-            log.info("Map renderer has started.");
-
-            while (running) {
-                MapTile t = staleQueue.popStaleTile();
-                if (t != null) {
-                    debugger.debug("Rendering tile " + t + "...");
-                    boolean isNonEmptyTile = t.getMap().render(t);
-                    updateQueue.pushUpdate(new Client.Tile(t.getName()));
-
-                    try {
-                        Thread.sleep(renderWait);
-                    } catch (InterruptedException e) {
-                    }
-                } else {
-                    try {
-                        Thread.sleep(500);
-                    } catch (InterruptedException e) {
-                    }
-                }
-            }
-
-            log.info("Map renderer has stopped.");
-        } catch (Exception ex) {
-            debugger.error("Exception on rendering-thread: " + ex.toString());
-            ex.printStackTrace();
-        }
-    }
-
-    public void touch(int x, int y, int z) {
-        for (int i = 0; i < maps.length; i++) {
-            MapTile[] tiles = maps[i].getTiles(new Location(world, x, y, z));
-            for (int j = 0; j < tiles.length; j++) {
-                invalidateTile(tiles[j]);
-            }
-        }
-    }
-
-    public void invalidateTile(MapTile tile) {
-        debugger.debug("Invalidating tile " + tile.getName());
-        staleQueue.pushStaleTile(tile);
-    }
-}

src/main/java/org/dynmap/MapTile.java

@@ -1,15 +0,0 @@
-package org.dynmap;
-
-public abstract class MapTile {
-    private MapType map;
-
-    public MapType getMap() {
-        return map;
-    }
-
-    public abstract String getName();
-
-    public MapTile(MapType map) {
-        this.map = map;
-    }
-}

src/main/java/org/dynmap/MapType.java

@@ -1,41 +0,0 @@
-package org.dynmap;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.dynmap.debug.Debugger;
-
-public abstract class MapType {
-    private MapManager manager;
-
-    public MapManager getMapManager() {
-        return manager;
-    }
-
-    private World world;
-
-    public World getWorld() {
-        return world;
-    }
-
-    private Debugger debugger;
-
-    public Debugger getDebugger() {
-        return debugger;
-    }
-
-    public MapType(MapManager manager, World world, Debugger debugger) {
-        this.manager = manager;
-        this.world = world;
-        this.debugger = debugger;
-    }
-
-    public abstract MapTile[] getTiles(Location l);
-
-    public abstract MapTile[] getAdjecentTiles(MapTile tile);
-
-    public abstract DynmapChunk[] getRequiredChunks(MapTile tile);
-
-    public abstract boolean render(MapTile tile);
-
-    public abstract boolean isRendered(MapTile tile);
-}

src/main/java/org/dynmap/PlayerList.java

@@ -1,84 +0,0 @@
-package org.dynmap;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Scanner;
-
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
-public class PlayerList {
-    private Server server;
-    private HashSet<String> hiddenPlayerNames = new HashSet<String>();
-    private File hiddenPlayersFile = new File(DynmapPlugin.dataRoot, "hiddenplayers.txt");
-
-    public PlayerList(Server server) {
-        this.server = server;
-    }
-
-    public void save() {
-        OutputStream stream;
-        try {
-            stream = new FileOutputStream(hiddenPlayersFile);
-            OutputStreamWriter writer = new OutputStreamWriter(stream);
-            for (String player : hiddenPlayerNames) {
-                writer.write(player);
-                writer.write("\n");
-            }
-            writer.close();
-            stream.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void load() {
-        try {
-            Scanner scanner = new Scanner(hiddenPlayersFile);
-            while (scanner.hasNextLine()) {
-                String line = scanner.nextLine();
-                hiddenPlayerNames.add(line);
-            }
-            scanner.close();
-        } catch (FileNotFoundException e) {
-            return;
-        }
-    }
-
-    public void hide(String playerName) {
-        hiddenPlayerNames.add(playerName);
-        save();
-    }
-
-    public void show(String playerName) {
-        hiddenPlayerNames.remove(playerName);
-        save();
-    }
-
-    public void setVisible(String playerName, boolean visible) {
-        if (visible)
-            show(playerName);
-        else
-            hide(playerName);
-    }
-
-    public Player[] getVisiblePlayers() {
-        ArrayList<Player> visiblePlayers = new ArrayList<Player>();
-        Player[] onlinePlayers = server.getOnlinePlayers();
-        for (int i = 0; i < onlinePlayers.length; i++) {
-            Player p = onlinePlayers[i];
-            if (!hiddenPlayerNames.contains(p.getName())) {
-                visiblePlayers.add(p);
-            }
-        }
-        Player[] result = new Player[visiblePlayers.size()];
-        visiblePlayers.toArray(result);
-        return result;
-    }
-}

src/main/java/org/dynmap/StaleQueue.java

@@ -1,50 +0,0 @@
-package org.dynmap;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-public class StaleQueue {
-    /* a list of MapTiles to be updated */
-    private LinkedList<MapTile> staleTilesQueue;
-    private Set<MapTile> staleTiles;
-
-    public StaleQueue() {
-        staleTilesQueue = new LinkedList<MapTile>();
-        staleTiles = new HashSet<MapTile>();
-    }
-
-    public int size() {
-        return staleTilesQueue.size();
-    }
-
-    /* put a MapTile that needs to be regenerated on the list of stale tiles */
-    public boolean pushStaleTile(MapTile m) {
-        synchronized (MapManager.lock) {
-            if (staleTiles.add(m)) {
-                staleTilesQueue.addLast(m);
-                return true;
-            }
-            return false;
-        }
-    }
-
-    /*
-     * get next MapTile that needs to be regenerated, or null the mapTile is
-     * removed from the list of stale tiles!
-     */
-    public MapTile popStaleTile() {
-        synchronized (MapManager.lock) {
-            try {
-                MapTile t = staleTilesQueue.removeFirst();
-                if (!staleTiles.remove(t)) {
-                    // This should never happen.
-                }
-                return t;
-            } catch (NoSuchElementException e) {
-                return null;
-            }
-        }
-    }
-}

src/main/java/org/dynmap/UpdateQueue.java

@@ -1,70 +0,0 @@
-package org.dynmap;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.ListIterator;
-
-public class UpdateQueue {
-    public Object lock = new Object();
-    private LinkedList<Update> updateQueue = new LinkedList<Update>();
-
-    private static final int maxUpdateAge = 120000;
-
-    public void pushUpdate(Object obj) {
-        long now = System.currentTimeMillis();
-        long deadline = now - maxUpdateAge;
-        synchronized (lock) {
-            ListIterator<Update> i = updateQueue.listIterator(0);
-            while (i.hasNext()) {
-                Update u = i.next();
-                if (u.time < deadline || u.obj == obj)
-                    i.remove();
-            }
-            updateQueue.addLast(new Update(now, obj));
-        }
-    }
-
-    private ArrayList<Object> tmpupdates = new ArrayList<Object>();
-
-    public Object[] getUpdatedObjects(long since) {
-        long now = System.currentTimeMillis();
-        long deadline = now - maxUpdateAge;
-        Object[] updates;
-        synchronized (lock) {
-            tmpupdates.clear();
-            Iterator<Update> it = updateQueue.descendingIterator();
-            while (it.hasNext()) {
-                Update u = it.next();
-                if (u.time >= since) {
-                    // Tile is new.
-                    tmpupdates.add(u.obj);
-                } else if (u.time < deadline) {
-                    // Tile is too old, removing this one (will eventually decrease).
-                    it.remove();
-                    break;
-                } else {
-                    // Tile is old, but not old enough for removal.
-                    break;
-                }
-            }
-            
-            // Reverse output.
-            updates = new Object[tmpupdates.size()];
-            for (int i = 0; i < updates.length; i++) {
-                updates[i] = tmpupdates.get(updates.length-1-i);
-            }
-        }
-        return updates;
-    }
-
-    public class Update {
-        public long time;
-        public Object obj;
-
-        public Update(long time, Object obj) {
-            this.time = time;
-            this.obj = obj;
-        }
-    }
-}

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

@@ -0,0 +1,43 @@
+package org.dynmap.bukkit;
+
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+public class Armor {
+    /**
+     * http://www.minecraftwiki.net/wiki/Item_Durability#Armor_durability
+     * We rely on getArmorContents() to return 4 armor pieces in the order
+     * of: boots, pants, chest, helmet
+     */
+    private static final int armorPoints[] = {3, 6, 8, 3};
+
+    public static final int getArmorPoints(Player player) {
+        int currentDurability = 0;
+        int baseDurability = 0;
+        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];
+        }
+        int ap = 0;
+        if(baseDurability > 0)
+    		ap = ((baseArmorPoints - 1) * currentDurability) / baseDurability + 1;
+        return ap;
+    }
+}