Add upgrade version check

This reverts commit 3483b19cef.

permissions.txt

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

@@ -5,7 +5,7 @@
 	<name>dynmap</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<BUILD_NUMBER>dev</BUILD_NUMBER>
+		<BUILD_NUMBER>Dev</BUILD_NUMBER>
 	</properties>
 	<url>http://github.com/webbukkit/dynmap/</url>
 	<issueManagement>
@@ -119,22 +119,28 @@
 			</releases>
 			<snapshots>
 			</snapshots>
-			<id>spout-repo</id>
-			<url>http://repo.spout.org</url>
+			<id>bukkit-repo</id>
+			<url>http://repo.bukkit.org/content/repositories/releases/</url>
+		</repository>
+		<repository>
+			<releases>
+			</releases>
+			<snapshots>
+			</snapshots>
+			<id>dynmap-repo</id>
+			<url>http://repo.mikeprimm.com/</url>
 		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>com.nijikokun.bukkit</groupId>
 			<artifactId>Permissions</artifactId>
-			<version>[2.5.4,)</version>
+			<version>3.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>[1.2.5-R4.0,1.7)</version>
-			<type>jar</type>
-			<scope>compile</scope>
+			<version>1.3.2-R3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dynmap</groupId>
@@ -161,28 +167,17 @@
 			<groupId>ru.tehkode</groupId>
 			<artifactId>PermissionsEx</artifactId>
 			<version>1.19.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/PermissionsEx.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>de.bananaco</groupId>
 			<artifactId>bPermissions</artifactId>
 			<version>2.9.1</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/bpermissions.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.platymuus.bukkit.permissions</groupId>
 			<artifactId>PermissionsBukkit</artifactId>
 			<version>1.6</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/PermissionsBukkit.jar</systemPath>
-		</dependency>
-		<dependency>
-			<groupId>org.bukkit</groupId>
-			<artifactId>craftbukkit</artifactId>
-			<version>1.2.5-R5.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
-	<version>1.0</version>
+	<version>1.4</version>
 </project>

src/main/assembly/package.xml

@@ -7,15 +7,7 @@
   <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>
+    	<outputDirectory>/dynmap</outputDirectory></fileSet>
     <fileSet>
     	<directory>${project.basedir}</directory>
     	<outputDirectory>/dynmap</outputDirectory>

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

@@ -0,0 +1,105 @@
+package org.dynmap.bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.dynmap.Log;
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public abstract class BukkitVersionHelper {
+
+    private static BukkitVersionHelper helper = null;
+    
+    public static final BukkitVersionHelper getHelper() {
+        if(helper == null) {
+            if(Bukkit.getServer().getVersion().contains("MCPC")) {
+                Log.info("Loader version helper for MCPC");
+                helper = new BukkitVersionHelperMCPC();
+            }
+            else {
+                helper = new BukkitVersionHelperCB();
+            }
+        }
+        return helper;
+    }
+    protected BukkitVersionHelper() {
+        
+    }
+    /**
+     * Get list of defined biomebase objects
+     */
+    public abstract Object[] getBiomeBaseList();
+    /** 
+     * Get temperature from biomebase
+     */
+    public abstract float getBiomeBaseTemperature(Object bb);
+    /** 
+     * Get humidity from biomebase
+     */
+    public abstract float getBiomeBaseHumidity(Object bb);
+    /**
+     * Get ID string from biomebase
+     */
+    public abstract String getBiomeBaseIDString(Object bb);
+    /** 
+     * Get ID from biomebase
+     */
+    public abstract int getBiomeBaseID(Object bb);
+    /** 
+     * Get net.minecraft.server.world for given world
+     */
+    public abstract Object getNMSWorld(World w);
+    /**
+     *  Get unload queue for given NMS world
+     */
+    public abstract Object getUnloadQueue(Object nmsworld);
+    /**
+     *  For testing unload queue for presence of givne chunk
+     */
+    public abstract boolean isInUnloadQueue(Object unloadqueue, int x, int z);
+    /**
+     * Read raw biome ID from snapshot
+     */
+    public abstract Object[] getBiomeBaseFromSnapshot(ChunkSnapshot css);
+    /**
+     * Test if normal chunk snapshot
+     */
+    public abstract boolean isCraftChunkSnapshot(ChunkSnapshot css);
+    /** 
+     * Remove entities from given chunk
+     */
+    public abstract void removeEntitiesFromChunk(Chunk c);
+    /** 
+     * Get tile entities map from chunk
+     */
+    public abstract Map getTileEntitiesForChunk(Chunk c);
+    /**
+     * Get X coordinate of tile entity
+     */
+    public abstract int getTileEntityX(Object te);
+    /**
+     * Get Y coordinate of tile entity
+     */
+    public abstract int getTileEntityY(Object te);
+    /**
+     * Get Z coordinate of tile entity
+     */
+    public abstract int getTileEntityZ(Object te);
+    /**
+     * Read tile entity NBT
+     */
+    public abstract Object readTileEntityNBT(Object te);
+    /**
+     * Get field value from NBT compound
+     */
+    public abstract Object getFieldValue(Object nbt, String field);
+}

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

@@ -0,0 +1,86 @@
+package org.dynmap.bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.dynmap.Log;
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
+
+    BukkitVersionHelperCB() {
+    }
+    @Override
+    protected String getNMSPackage() {
+        Server srv = Bukkit.getServer();
+        /* Get getHandle() method */
+        try {
+            Method m = srv.getClass().getMethod("getHandle");
+            Object scm = m.invoke(srv); /* And use it to get SCM (nms object) */
+            return scm.getClass().getPackage().getName();
+        } catch (Exception x) {
+            Log.severe("Error finding net.minecraft.server packages");
+            return null;
+        }
+    }
+    @Override
+    protected void loadNMS() {
+        /* Set up biomebase fields */
+        biomebase = getNMSClass("net.minecraft.server.BiomeBase");
+        biomebasearray =  getNMSClass("[Lnet.minecraft.server.BiomeBase;");
+        biomebaselist = getField(biomebase, new String[] { "biomes" }, biomebasearray);
+        biomebasetemp = getField(biomebase, new String[] { "temperature", "F" }, float.class);
+        biomebasehumi = getField(biomebase, new String[] { "humidity", "G" }, float.class);
+        biomebaseidstring = getField(biomebase, new String[] { "y" }, String.class);
+        biomebaseid = getField(biomebase, new String[] { "id" }, int.class);
+        /* n.m.s.World */
+        nmsworld = getNMSClass("net.minecraft.server.WorldServer");
+        chunkprovserver = getNMSClass("net.minecraft.server.ChunkProviderServer");
+        nmsw_chunkproviderserver = getField(nmsworld, new String[] { "chunkProviderServer" }, chunkprovserver);
+        cps_unloadqueue = getFieldNoFail(chunkprovserver, new String[] { "unloadQueue" }, longhashset); 
+        if(cps_unloadqueue == null) {
+            Log.info("Unload queue not found - default to unload all chunks");
+        }
+        /** n.m.s.Chunk */
+        nmschunk = getNMSClass("net.minecraft.server.Chunk");
+        nmsc_removeentities = getMethod(nmschunk, new String[] { "removeEntities" }, new Class[0]);
+        nmsc_tileentities = getField(nmschunk, new String[] { "tileEntities" }, Map.class); 
+        /** nbt classes */
+        nbttagcompound = getNMSClass("net.minecraft.server.NBTTagCompound");
+        nbttagbyte = getNMSClass("net.minecraft.server.NBTTagByte");
+        nbttagshort = getNMSClass("net.minecraft.server.NBTTagShort");
+        nbttagint = getNMSClass("net.minecraft.server.NBTTagInt");
+        nbttaglong = getNMSClass("net.minecraft.server.NBTTagLong");
+        nbttagfloat = getNMSClass("net.minecraft.server.NBTTagFloat");
+        nbttagdouble = getNMSClass("net.minecraft.server.NBTTagDouble");
+        nbttagbytearray = getNMSClass("net.minecraft.server.NBTTagByteArray");
+        nbttagstring = getNMSClass("net.minecraft.server.NBTTagString");
+        nbttagintarray = getNMSClass("net.minecraft.server.NBTTagIntArray");
+        compound_get = getMethod(nbttagcompound, new String[] { "get" }, new Class[] { String.class });
+        nbttagbyte_val = getField(nbttagbyte, new String[] { "data" }, byte.class);
+        nbttagshort_val = getField(nbttagshort, new String[] { "data" }, short.class);
+        nbttagint_val = getField(nbttagint, new String[] { "data" }, int.class);
+        nbttaglong_val = getField(nbttaglong, new String[] { "data" }, long.class);
+        nbttagfloat_val = getField(nbttagfloat, new String[] { "data" }, float.class);
+        nbttagdouble_val = getField(nbttagdouble, new String[] { "data" }, double.class);
+        nbttagbytearray_val = getField(nbttagbytearray, new String[] { "data" }, byte[].class);
+        nbttagstring_val = getField(nbttagstring, new String[] { "data" }, String.class);
+        nbttagintarray_val = getField(nbttagintarray, new String[] { "data" }, int[].class);
+
+        /** Tile entity */
+        nms_tileentity = getNMSClass("net.minecraft.server.TileEntity");
+        nmst_readnbt = getMethod(nms_tileentity, new String[] { "b" }, new Class[] { nbttagcompound });
+        nmst_x = getField(nms_tileentity, new String[] { "x" }, int.class); 
+        nmst_y = getField(nms_tileentity, new String[] { "y" }, int.class); 
+        nmst_z = getField(nms_tileentity, new String[] { "z" }, int.class); 
+    }
+}

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

@@ -0,0 +1,380 @@
+package org.dynmap.bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.dynmap.Log;
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
+    private String obc_package; // Package used for org.bukkit.craftbukkit
+    protected String nms_package; // Package used for net.minecraft.server
+    private boolean failed;
+    private static final Object[] nullargs = new Object[0];
+    private static final Map nullmap = Collections.emptyMap();
+    
+    /** CraftChunkSnapshot */
+    private Class<?> craftchunksnapshot;
+    private Field ccss_biome;
+    /** CraftChunk */
+    private Class<?> craftchunk;
+    private Method cc_gethandle;
+    /** CraftWorld */
+    private Class<?> craftworld;
+    private Method cw_gethandle;
+
+    /** BiomeBase related helpers */
+    protected Class<?> biomebase;
+    protected Class<?> biomebasearray;
+    protected Field biomebaselist;
+    protected Field biomebasetemp;
+    protected Field biomebasehumi;
+    protected Field biomebaseidstring;
+    protected Field biomebaseid;
+    /** n.m.s.World */
+    protected Class<?> nmsworld;
+    protected Class<?> chunkprovserver;
+    protected Class<?> longhashset;
+    protected Field nmsw_chunkproviderserver;
+    protected Field cps_unloadqueue;
+    protected Method lhs_containskey;
+    /** n.m.s.Chunk */
+    protected Class<?> nmschunk;
+    protected Method nmsc_removeentities;
+    protected Field nmsc_tileentities;
+    /** nbt classes */
+    protected Class<?> nbttagcompound;
+    protected Class<?> nbttagbyte;
+    protected Class<?> nbttagshort;
+    protected Class<?> nbttagint;
+    protected Class<?> nbttaglong;
+    protected Class<?> nbttagfloat;
+    protected Class<?> nbttagdouble;
+    protected Class<?> nbttagbytearray;
+    protected Class<?> nbttagstring;
+    protected Class<?> nbttagintarray;
+    protected Method compound_get;
+    protected Field nbttagbyte_val;
+    protected Field nbttagshort_val;
+    protected Field nbttagint_val;
+    protected Field nbttaglong_val;
+    protected Field nbttagfloat_val;
+    protected Field nbttagdouble_val;
+    protected Field nbttagbytearray_val;
+    protected Field nbttagstring_val;
+    protected Field nbttagintarray_val;
+    /** Tile entity */
+    protected Class<?> nms_tileentity;
+    protected Method nmst_readnbt;
+    protected Field nmst_x;
+    protected Field nmst_y;
+    protected Field nmst_z;
+
+    BukkitVersionHelperGeneric() {
+        failed = false;
+        Server srv = Bukkit.getServer();
+        /* Look up base classname for bukkit server - tells us OBC package */
+        obc_package = Bukkit.getServer().getClass().getPackage().getName();
+        /* Get NMS package */
+        nms_package = getNMSPackage();
+        if(nms_package == null) {
+            failed = true;
+        }
+        /* Craftworld fields */
+        craftworld = getOBCClass("org.bukkit.craftbukkit.CraftWorld");
+        cw_gethandle = getMethod(craftworld, new String[] { "getHandle" }, new Class[0]);
+        longhashset = getOBCClassNoFail("org.bukkit.craftbukkit.util.LongHashSet");
+        if(longhashset != null) {
+            lhs_containskey = getMethod(longhashset, new String[] { "contains" }, new Class[] { int.class, int.class });
+        }
+        else {
+            longhashset = getOBCClass("org.bukkit.craftbukkit.util.LongHashset");
+            lhs_containskey = getMethod(longhashset, new String[] { "containsKey" }, new Class[] { int.class, int.class });
+        }
+        /* CraftChunkSnapshot */
+        craftchunksnapshot = getOBCClass("org.bukkit.craftbukkit.CraftChunkSnapshot");
+        ccss_biome = getPrivateField(craftchunksnapshot, new String[] { "biome" }, biomebasearray);
+        /* CraftChunk */
+        craftchunk = getOBCClass("org.bukkit.craftbukkit.CraftChunk");
+        cc_gethandle = getMethod(craftchunk, new String[] { "getHandle" }, new Class[0]);
+        /* Get NMS classes and fields */
+        if(!failed)
+            loadNMS();
+
+        if(failed)
+            throw new IllegalArgumentException("Error initializing dynmap - bukkit version incompatible!");
+    }
+    
+    protected abstract void loadNMS();
+    
+    protected abstract String getNMSPackage();
+    
+    protected Class<?> getOBCClass(String classname) {
+        return getClassByName(classname, "org.bukkit.craftbukkit", obc_package, false);
+    }
+
+    protected Class<?> getOBCClassNoFail(String classname) {
+        return getClassByName(classname, "org.bukkit.craftbukkit", obc_package, true);
+    }
+
+    protected Class<?> getNMSClass(String classname) {
+        return getClassByName(classname, "net.minecraft.server", nms_package, false);
+    }
+    
+    protected Class<?> getClassByName(String classname, String base, String mapping, boolean nofail) {
+        String n = classname;
+        int idx = classname.indexOf(base);
+        if(idx >= 0) {
+            n = classname.substring(0, idx) + mapping + classname.substring(idx + base.length());
+        }
+        try {
+            return Class.forName(n);
+        } catch (ClassNotFoundException cnfx) {
+            try {
+                return Class.forName(classname);
+            } catch (ClassNotFoundException cnfx2) {
+                if(!nofail) {
+                    Log.severe("Cannot find " + classname);
+                    failed = true;
+                }
+                return null;
+            }
+        }
+    }
+    /**
+     * Get field
+     */
+    protected Field getField(Class<?> cls, String[] ids, Class<?> type) {
+        return getField(cls, ids, type, false);
+    }
+    protected Field getFieldNoFail(Class<?> cls, String[] ids, Class<?> type) {
+        return getField(cls, ids, type, true);
+    }
+    /**
+     * Get field
+     */
+    private Field getField(Class<?> cls, String[] ids, Class<?> type, boolean nofail) {
+        if((cls == null) || (type == null)) return null;
+        for(String id : ids) {
+            try {
+                Field f = cls.getField(id);
+                if(f.getType().isAssignableFrom(type)) {
+                    return f;
+                }
+            } catch (NoSuchFieldException nsfx) {
+            }
+        }
+        if(!nofail) {
+            Log.severe("Unable to find field " + ids[0] + " for " + cls.getName());
+            failed = true;
+        } 
+        return null;
+    }
+    /**
+     * Get private field
+     */
+    private Field getPrivateField(Class<?> cls, String[] ids, Class<?> type) {
+        if((cls == null) || (type == null)) return null;
+        for(String id : ids) {
+            try {
+                Field f = cls.getDeclaredField(id);
+                if(f.getType().isAssignableFrom(type)) {
+                    f.setAccessible(true);
+                    return f;
+                }
+            } catch (NoSuchFieldException nsfx) {
+            }
+        }
+        Log.severe("Unable to find field " + ids[0] + " for " + cls.getName());
+        failed = true;
+        return null;
+    }
+    private Object getFieldValue(Object obj, Field field, Object def) {
+        if((obj != null) && (field != null)) {
+            try {
+                return field.get(obj);
+            } catch (IllegalArgumentException e) {
+            } catch (IllegalAccessException e) {
+            }
+        }
+        return def;
+    }
+    /**
+     * Get method
+     */
+    protected Method getMethod(Class<?> cls, String[] ids, Class[] args) {
+        if(cls == null) return null;
+        for(String id : ids) {
+            try {
+                return cls.getMethod(id, args);
+            } catch (SecurityException e) {
+            } catch (NoSuchMethodException e) {
+            }
+        }
+        Log.severe("Unable to find method " + ids[0] + " for " + cls.getName());
+        failed = true;
+        return null;
+    }
+    private Object callMethod(Object obj, Method meth, Object[] args, Object def) {
+        if((obj == null) || (meth == null)) {
+            return def;
+        }
+        try {
+            return meth.invoke(obj, args);
+        } catch (IllegalArgumentException iax) {
+        } catch (IllegalAccessException e) {
+        } catch (InvocationTargetException e) {
+        }
+        return def;
+    }
+    
+
+    /**
+     * Get list of defined biomebase objects
+     */
+    public Object[] getBiomeBaseList() {
+        return (Object[]) getFieldValue(biomebase, biomebaselist, new Object[0]);
+    }
+    /** Get temperature from biomebase */
+    public float getBiomeBaseTemperature(Object bb) {
+        return (Float) getFieldValue(bb, biomebasetemp, 0.5F);
+    }
+    /** Get humidity from biomebase */
+    public float getBiomeBaseHumidity(Object bb) {
+        return (Float) getFieldValue(bb, biomebasehumi, 0.5F);
+    }
+    /** Get ID string from biomebase */
+    public String getBiomeBaseIDString(Object bb) {
+        return (String) getFieldValue(bb, biomebaseidstring, null);
+    }
+    /** Get ID from biomebase */
+    public int getBiomeBaseID(Object bb) {
+        return (Integer) getFieldValue(bb, biomebaseid, -1);
+    }
+
+    /* Get net.minecraft.server.world for given world */
+    public Object getNMSWorld(World w) {
+        return callMethod(w, cw_gethandle, nullargs, null);
+    }
+
+    /* Get unload queue for given NMS world */
+    public Object getUnloadQueue(Object nmsworld) {
+        Object cps = getFieldValue(nmsworld, nmsw_chunkproviderserver, null); // Get chunkproviderserver
+        if(cps != null) {
+            return getFieldValue(cps, cps_unloadqueue, null);
+        }
+        return null;
+    }
+
+    /* For testing unload queue for presence of givne chunk */
+    public boolean isInUnloadQueue(Object unloadqueue, int x, int z) {
+        if(unloadqueue != null) {
+            return (Boolean)callMethod(unloadqueue, lhs_containskey, new Object[] { x, z }, true);
+        }
+        return true;
+    }
+    
+    public Object[] getBiomeBaseFromSnapshot(ChunkSnapshot css) {
+        return (Object[])getFieldValue(css, ccss_biome, null);
+    }
+    public boolean isCraftChunkSnapshot(ChunkSnapshot css) {
+        if(craftchunksnapshot != null) {
+            return craftchunksnapshot.isAssignableFrom(css.getClass());
+        }
+        return false;
+    }
+    /** Remove entities from given chunk */
+    public void removeEntitiesFromChunk(Chunk c) {
+        Object omsc = callMethod(c, cc_gethandle, nullargs, null);
+        if(omsc != null) {
+            callMethod(omsc, nmsc_removeentities, nullargs, null);
+        }
+    }
+    /** Get tile entities map from chunk */
+    public Map getTileEntitiesForChunk(Chunk c) {
+        Object omsc = callMethod(c, cc_gethandle, nullargs, null);
+        if(omsc != null) {
+            return (Map)getFieldValue(omsc, nmsc_tileentities, nullmap);
+        }
+        return nullmap;
+    }
+    /**
+     * Get X coordinate of tile entity
+     */
+    public int getTileEntityX(Object te) {
+        return (Integer)getFieldValue(te, nmst_x, 0);
+    }
+    /**
+     * Get Y coordinate of tile entity
+     */
+    public int getTileEntityY(Object te) {
+        return (Integer)getFieldValue(te, nmst_y, 0);
+    }
+    /**
+     * Get Z coordinate of tile entity
+     */
+    public int getTileEntityZ(Object te) {
+        return (Integer)getFieldValue(te, nmst_z, 0);
+    }
+    /**
+     * Read tile entity NBT
+     */
+    public Object readTileEntityNBT(Object te) {
+        if(nbttagcompound == null) return null;
+        Object nbt = null;
+        try {
+            nbt = nbttagcompound.newInstance();
+        } catch (InstantiationException e) {
+        } catch (IllegalAccessException e) {
+        }
+        if(nbt != null) {
+            callMethod(te, nmst_readnbt, new Object[] { nbt }, null);
+        }
+        return nbt;
+    }
+    /**
+     * Get field value from NBT compound
+     */
+    public Object getFieldValue(Object nbt, String field) {
+        Object val = callMethod(nbt, compound_get, new Object[] { field }, null);
+        if(val == null) return null;
+        Class<?> valcls = val.getClass();
+        if(valcls.equals(nbttagbyte)) {
+            return getFieldValue(val, nbttagbyte_val, null);
+        }
+        else if(valcls.equals(nbttagshort)) {
+            return getFieldValue(val, nbttagshort_val, null);
+        }
+        else if(valcls.equals(nbttagint)) {
+            return getFieldValue(val, nbttagint_val, null);
+        }
+        else if(valcls.equals(nbttaglong)) {
+            return getFieldValue(val, nbttaglong_val, null);
+        }
+        else if(valcls.equals(nbttagfloat)) {
+            return getFieldValue(val, nbttagfloat_val, null);
+        }
+        else if(valcls.equals(nbttagdouble)) {
+            return getFieldValue(val, nbttagdouble_val, null);
+        }
+        else if(valcls.equals(nbttagbytearray)) {
+            return getFieldValue(val, nbttagbytearray_val, null);
+        }
+        else if(valcls.equals(nbttagstring)) {
+            return getFieldValue(val, nbttagstring_val, null);
+        }
+        else if(valcls.equals(nbttagintarray)) {
+            return getFieldValue(val, nbttagintarray_val, null);
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,81 @@
+package org.dynmap.bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.Map;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.dynmap.Log;
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public class BukkitVersionHelperMCPC extends BukkitVersionHelperGeneric {
+    BukkitVersionHelperMCPC() {
+    }
+    @Override
+    protected String getNMSPackage() {
+        return "";
+    }
+    @Override
+    protected void loadNMS() {
+        /* biomebase */
+        biomebase = getNMSClass("yy");
+        biomebasearray = getNMSClass("[Lyy;");
+        /* world */
+        nmsworld = getNMSClass("in");
+        /* chunk */
+        chunkprovserver = getNMSClass("im");
+        nmschunk = getNMSClass("zz");
+        /* nbt */
+        nbttagcompound = getNMSClass("bq");
+        nbttagbyte = getNMSClass("bp");
+        nbttagshort = getNMSClass("cb");
+        nbttagint = getNMSClass("bx");
+        nbttaglong = getNMSClass("bz");
+        nbttagfloat = getNMSClass("bv");
+        nbttagdouble = getNMSClass("bt");
+        nbttagbytearray = getNMSClass("bo");
+        nbttagstring = getNMSClass("cc");
+        nbttagintarray = getNMSClass("bw");
+        /* tileentity */
+        nms_tileentity = getNMSClass("any");
+        
+        /** Set up NMS fields **/
+        /* biomebase */
+        biomebaselist = getField(biomebase, new String[] { "a" }, biomebasearray);
+        biomebasetemp = getField(biomebase, new String[] { "F" }, float.class);
+        biomebasehumi = getField(biomebase, new String[] { "G" }, float.class);
+        biomebaseidstring = getField(biomebase, new String[] { "y" }, String.class);
+        biomebaseid = getField(biomebase, new String[] { "N" }, int.class);
+        /* chunk */
+        nmsw_chunkproviderserver = getField(nmsworld, new String[] { "b" }, chunkprovserver);
+        cps_unloadqueue = getFieldNoFail(chunkprovserver, new String[] { "b" }, longhashset);
+        if(cps_unloadqueue == null) {
+            Log.info("Unload queue not found - default to unload all chunks");
+        }
+        nmsc_removeentities = getMethod(nmschunk, new String[] { "d" }, new Class[0]);
+        nmsc_tileentities = getField(nmschunk, new String[] { "i" }, Map.class);
+        /* nbt */
+        compound_get = getMethod(nbttagcompound, new String[] { "a" }, new Class[] { String.class });
+        nbttagbyte_val = getField(nbttagbyte, new String[] { "a" }, byte.class);
+        nbttagshort_val = getField(nbttagshort, new String[] { "a" }, short.class);
+        nbttagint_val = getField(nbttagint, new String[] { "a" }, int.class);
+        nbttaglong_val = getField(nbttaglong, new String[] { "a" }, long.class);
+        nbttagfloat_val = getField(nbttagfloat, new String[] { "a" }, float.class);
+        nbttagdouble_val = getField(nbttagdouble, new String[] { "a" }, double.class);
+        nbttagbytearray_val = getField(nbttagbytearray, new String[] { "a" }, byte[].class);
+        nbttagstring_val = getField(nbttagstring, new String[] { "a" }, String.class);
+        nbttagintarray_val = getField(nbttagintarray, new String[] { "a" }, int[].class);
+        /* tileentity */
+        nmst_readnbt = getMethod(nms_tileentity, new String[] { "b" }, new Class[] { nbttagcompound });
+        nmst_x = getField(nms_tileentity, new String[] { "l" }, int.class);
+        nmst_y = getField(nms_tileentity, new String[] { "m" }, int.class);
+        nmst_z = getField(nms_tileentity, new String[] { "n" }, int.class);
+    }
+}

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

@@ -17,13 +17,36 @@ public class BukkitWorld extends DynmapWorld {
     private World world;
     private World.Environment env;
     private boolean skylight;
+    private DynmapLocation spawnloc = new DynmapLocation();
     
     public BukkitWorld(World w) {
-        super(w.getName(), w.getMaxHeight(), w.getSeaLevel());
+        this(w.getName(), w.getMaxHeight(), w.getSeaLevel(), w.getEnvironment());
+        setWorldLoaded(w);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    public BukkitWorld(String name, int height, int sealevel, World.Environment env) {
+        super(name, height, sealevel);
+        world = null;
+        this.env = env;
+        skylight = (env == World.Environment.NORMAL);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    /**
+     * Set world online
+     * @param w - loaded world
+     */
+    public void setWorldLoaded(World w) {
         world = w;
         env = world.getEnvironment();
         skylight = (env == World.Environment.NORMAL);
-        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    /**
+     * Set world unloaded
+     */
+    @Override
+    public void setWorldUnloaded() {
+        getSpawnLocation(); /* Remember spawn location before unload */
+        world = null;
     }
     /* Test if world is nether */
     @Override
@@ -33,26 +56,44 @@ public class BukkitWorld extends DynmapWorld {
     /* Get world spawn location */
     @Override
     public DynmapLocation getSpawnLocation() {
-        DynmapLocation dloc = new DynmapLocation();
-        Location sloc = world.getSpawnLocation();
-        dloc.x = sloc.getBlockX(); dloc.y = sloc.getBlockY();
-        dloc.z = sloc.getBlockZ(); dloc.world = normalizeWorldName(sloc.getWorld().getName());
-        return dloc;
+        if(world != null) {
+            Location sloc = world.getSpawnLocation();
+            spawnloc.x = sloc.getBlockX();
+            spawnloc.y = sloc.getBlockY();
+            spawnloc.z = sloc.getBlockZ(); 
+            spawnloc.world = normalizeWorldName(sloc.getWorld().getName());
+        }
+        return spawnloc;
     }
     /* Get world time */
     @Override
     public long getTime() {
-        return world.getTime();
+        if(world != null) {
+            return world.getTime();
+        }
+        else {
+            return -1;
+        }
     }
     /* World is storming */
     @Override
     public boolean hasStorm() {
-        return world.hasStorm();
+        if(world != null) {
+            return world.hasStorm();
+        }
+        else {
+            return false;
+        }
     }
     /* World is thundering */
     @Override
     public boolean isThundering() {
-        return world.isThundering();
+        if(world != null) {
+            return world.isThundering();
+        }
+        else {
+            return false;
+        }
     }
     /* World is loaded */
     @Override
@@ -62,22 +103,37 @@ public class BukkitWorld extends DynmapWorld {
     /* Get light level of block */
     @Override
     public int getLightLevel(int x, int y, int z) {
-        return world.getBlockAt(x, y, z).getLightLevel();
+        if(world != null) {
+            return world.getBlockAt(x, y, z).getLightLevel();
+        }
+        else {
+            return -1;
+        }
     }
     /* Get highest Y coord of given location */
     @Override
     public int getHighestBlockYAt(int x, int z) {
-        return world.getHighestBlockYAt(x, z);
+        if(world != null) {
+            return world.getHighestBlockYAt(x, z);
+        }
+        else {
+            return -1;
+        }
     }
     /* Test if sky light level is requestable */
     @Override
     public boolean canGetSkyLightLevel() {
-        return skylight;
+        return skylight && (world != null);
     }
     /* Return sky light level */
     @Override
     public int getSkyLightLevel(int x, int y, int z) {
-        return world.getBlockAt(x, y, z).getLightFromSky();
+        if(world != null) {
+            return world.getBlockAt(x, y, z).getLightFromSky();
+        }
+        else {
+            return -1;
+        }
     }
     /**
      * Get world environment ID (lower case - normal, the_end, nether)
@@ -91,9 +147,14 @@ public class BukkitWorld extends DynmapWorld {
      */
     @Override
     public MapChunkCache getChunkCache(List<DynmapChunk> chunks) {
-        NewMapChunkCache c = new NewMapChunkCache();
-        c.setChunks(this, chunks);
-        return c;
+        if(isLoaded()) {
+            NewMapChunkCache c = new NewMapChunkCache();
+            c.setChunks(this, chunks);
+            return c;
+        }
+        else {
+            return null;
+        }
     }
     
     public World getWorld() {

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

@@ -13,10 +13,12 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
@@ -57,14 +59,13 @@ import org.bukkit.event.world.SpawnChangeEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.event.world.WorldUnloadEvent;
-import org.bukkit.material.MaterialData;
-import org.bukkit.material.Tree;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.potion.PotionEffectType;
 import org.dynmap.DynmapAPI;
 import org.dynmap.DynmapChunk;
 import org.dynmap.DynmapCore;
@@ -106,10 +107,13 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     private BukkitEnableCoreCallback enabCoreCB = new BukkitEnableCoreCallback();
     private Method ismodloaded;
     private HashMap<String, BukkitWorld> world_by_name = new HashMap<String, BukkitWorld>();
+    private HashSet<String> modsused = new HashSet<String>();
     /* Lookup cache */
     private World last_world;
     private BukkitWorld last_bworld;
-
+    
+    private BukkitVersionHelper helper = BukkitVersionHelper.getHelper();
+    
     private final BukkitWorld getWorldByName(String name) {
         if((last_world != null) && (last_world.getName().equals(name))) {
             return last_bworld;
@@ -125,6 +129,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
             bw = new BukkitWorld(w);
             world_by_name.put(w.getName(), bw);
         }
+        else if(bw.isLoaded() == false) {
+            bw.setWorldLoaded(w);
+        }
         last_world = w;
         last_bworld = bw;
 
@@ -149,6 +156,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     if(spb == null) {
                         spb = new SpoutPluginBlocks(DynmapPlugin.this);
                     }
+                    modsused.add("SpoutPlugin");
                 }
                 else {
                     Log.info("Detected Spout - Support Disabled");
@@ -191,6 +199,15 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         private int chunks_in_cur_tick = 0;
         private long cur_tick;
 
+        @Override
+        public int getBlockIDAt(String wname, int x, int y, int z) {
+            World w = getServer().getWorld(wname);
+            if((w != null) && w.isChunkLoaded(x >> 4, z >> 4)) {
+                return w.getBlockTypeIdAt(x,  y,  z);
+            }
+            return -1;
+        }
+
         @Override
         public void scheduleServerTask(Runnable run, long delay) {
             getServer().getScheduler().scheduleSyncDelayedTask(DynmapPlugin.this, run, delay);
@@ -254,7 +271,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     pm.registerEvents(new Listener() {
                         @EventHandler(priority=EventPriority.MONITOR)
                         public void onSpawnChange(SpawnChangeEvent evt) {
-                            DynmapWorld w = getWorld(evt.getWorld());
+                            BukkitWorld w = getWorld(evt.getWorld());
                             core.listenerManager.processWorldEvent(EventType.WORLD_SPAWN_CHANGE, w);
                         }
                     }, DynmapPlugin.this);
@@ -397,7 +414,8 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
             OfflinePlayer p = getServer().getOfflinePlayer(player);
             if(p.isBanned())
                 return false;
-            return permissions.hasOfflinePermission(player, perm);
+            boolean rslt = permissions.hasOfflinePermission(player, perm);
+            return rslt;
         }
         /**
          * Render processor helper - used by code running on render threads to request chunk snapshot cache from server/sync thread
@@ -406,6 +424,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         public MapChunkCache createMapChunkCache(DynmapWorld w, List<DynmapChunk> chunks, 
                 boolean blockdata, boolean highesty, boolean biome, boolean rawbiome) {
             MapChunkCache c = w.getChunkCache(chunks);
+            if(c == null) { /* Can fail if not currently loaded */
+                return null;
+            }
             if(w.visibility_limits != null) {
                 for(MapChunkCache.VisibilityLimit limit: w.visibility_limits) {
                     c.setVisibleRange(limit);
@@ -442,8 +463,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     public Boolean call() throws Exception {
                         boolean exhausted;
                         synchronized(loadlock) {
-                            if(chunks_in_cur_tick > 0)
+                            if(chunks_in_cur_tick > 0) {
                                 chunks_in_cur_tick -= cc.loadChunks(chunks_in_cur_tick);
+                            }
                             exhausted = (chunks_in_cur_tick == 0);
                         }
                         return exhausted;
@@ -454,6 +476,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     delay = f.get();
                 } catch (CancellationException cx) {
                     return null;
+                } catch (ExecutionException ex) {
+                    Log.severe("Exception while fetching chunks: ", ex.getCause());
+                    return null;
                 } catch (Exception ix) {
                     Log.severe(ix);
                     return null;
@@ -462,6 +487,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     try { Thread.sleep(25); } catch (InterruptedException ix) {}
                 }
             }
+            /* If cancelled due to world unload return nothing */
+            if(w.isLoaded() == false)
+                return null;
             return c;
         }
         @Override
@@ -479,6 +507,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     Object rslt =ismodloaded.invoke(null,  name);
                     if(rslt instanceof Boolean) {
                         if(((Boolean)rslt).booleanValue()) {
+                            modsused.add(name);
                             return true;
                         }
                     }
@@ -585,6 +614,13 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         public long getFirstLoginTime() {
             return offplayer.getFirstPlayed();
         }
+        @Override
+        public boolean isInvisible() {
+            if(player != null) {
+                return player.hasPotionEffect(PotionEffectType.INVISIBILITY);
+            }
+            return false;
+        }
     }
     /* Handler for generic console command sender */
     public class BukkitCommandSender implements DynmapCommandSender {
@@ -622,6 +658,32 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         }
     }
     
+    public void loadExtraBiomes() {
+        int cnt = 0;
+        
+        /* Find array of biomes in biomebase */
+        Object[] biomelist = helper.getBiomeBaseList();
+        /* Loop through list, starting afer well known biomes */
+        for(int i = BiomeMap.LAST_WELL_KNOWN+1; i < biomelist.length; i++) {
+            Object bb = biomelist[i];
+            if(bb != null) {
+                String id =  helper.getBiomeBaseIDString(bb);
+                if(id == null) {
+                   id = "BIOME_" + i;
+                }
+                float tmp = helper.getBiomeBaseTemperature(bb);
+                float hum = helper.getBiomeBaseHumidity(bb);
+
+                BiomeMap m = new BiomeMap(i, id, tmp, hum);
+                Log.verboseinfo("Add custom biome [" + m.toString() + "] (" + i + ")");
+                cnt++;
+            }
+        }
+        if(cnt > 0) {
+            Log.info("Added " + cnt + " custom biome mappings");
+        }
+    }
+    
     @Override
     public void onEnable() {
         pm = this.getServer().getPluginManager();
@@ -629,6 +691,8 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         PluginDescriptionFile pdfFile = this.getDescription();
         version = pdfFile.getVersion();
 
+        /* Load extra biomes, if any */
+        loadExtraBiomes();
              
         /* Set up player login/quit event handler */
         registerPlayerLoginListener();
@@ -670,7 +734,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         if(core == null)
             core = new DynmapCore();
         /* Inject dependencies */
-        core.setPluginVersion(version);
+        core.setPluginVersion(version, "CraftBukkit");
         core.setMinecraftVersion(mcver);
         core.setDataFolder(dataDirectory);
         core.setServer(new BukkitServer());
@@ -1283,17 +1347,18 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         Listener worldTrigger = new Listener() {
             @EventHandler(priority=EventPriority.MONITOR)
             public void onWorldLoad(WorldLoadEvent event) {
-                core.updateConfigHashcode();
                 BukkitWorld w = getWorld(event.getWorld());
                 if(core.processWorldLoad(w))    /* Have core process load first - fire event listeners if good load after */
                     core.listenerManager.processWorldEvent(EventType.WORLD_LOAD, w);
             }
             @EventHandler(priority=EventPriority.MONITOR)
             public void onWorldUnload(WorldUnloadEvent event) {
-                core.updateConfigHashcode();
-                DynmapWorld w = getWorld(event.getWorld());
-                core.listenerManager.processWorldEvent(EventType.WORLD_UNLOAD, w);
-                removeWorld(event.getWorld());
+                BukkitWorld w = getWorld(event.getWorld());
+                if(w != null) {
+                    core.listenerManager.processWorldEvent(EventType.WORLD_UNLOAD, w);
+                    w.setWorldUnloaded();
+                    core.processWorldUnload(w);
+                }
             }
             @EventHandler(priority=EventPriority.MONITOR)
             public void onStructureGrow(StructureGrowEvent event) {
@@ -1332,10 +1397,17 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                 @EventHandler(priority=EventPriority.MONITOR)
                 public void onChunkPopulate(ChunkPopulateEvent event) {
                     Chunk c = event.getChunk();
+                    ChunkSnapshot cs = c.getChunkSnapshot();
+                    int ymax = 0;
+                    for(int i = 0; i < c.getWorld().getMaxHeight() / 16; i++) {
+                        if(!cs.isSectionEmpty(i)) {
+                            ymax = (i+1)*16;
+                        }
+                    }
                     /* Touch extreme corners */
                     int x = c.getX() << 4;
                     int z = c.getZ() << 4;
-                    mapManager.touchVolume(getWorld(event.getWorld()).getName(), x, 0, z, x+15, 128, z+16, "chunkpopulate");
+                    mapManager.touchVolume(getWorld(event.getWorld()).getName(), x, 0, z, x+15, ymax, z+16, "chunkpopulate");
                 }
             };
             pm.registerEvents(chunkTrigger, this);
@@ -1466,6 +1538,15 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     return cnt;
                 }
             });
+            for (String mod : modsused) {
+                features.addPlotter(new Metrics.Plotter(mod + " Blocks") {
+                    @Override
+                    public int getValue() {
+                        return 1;
+                    }
+                });
+            }
+            
             metrics.start();
         } catch (IOException e) {
             // Failed to submit the stats :-(

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

@@ -25,7 +25,6 @@
  * authors and contributors and should not be interpreted as representing official policies,
  * either expressed or implied, of anybody else.
  */
-
 package org.dynmap.bukkit;
 
 import org.bukkit.Bukkit;
@@ -33,6 +32,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.scheduler.BukkitTask;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -53,15 +53,11 @@ import java.util.UUID;
 import java.util.logging.Level;
 
 /**
- * <p>
- * The metrics class obtains data about a plugin and submits statistics about it to the metrics backend.
- * </p>
- * <p>
- * Public methods provided by this class:
- * </p>
+ * <p> The metrics class obtains data about a plugin and submits statistics about it to the metrics backend. </p> <p>
+ * Public methods provided by this class: </p>
  * <code>
  * Graph createGraph(String name); <br/>
- * void addCustomData(Metrics.Plotter plotter); <br/>
+ * void addCustomData(BukkitMetrics.Plotter plotter); <br/>
  * void start(); <br/>
  * </code>
  */
@@ -70,68 +66,60 @@ public class Metrics {
     /**
      * The current revision number
      */
-    private final static int REVISION = 5;
-
+    private final static int REVISION = 6;
     /**
      * The base url of the metrics domain
      */
     private static final String BASE_URL = "http://mcstats.org";
-
     /**
      * The url used to report a server's status
      */
     private static final String REPORT_URL = "/report/%s";
-
     /**
-     * The separator to use for custom data. This MUST NOT change unless you are hosting your own
-     * version of metrics and want to change it.
+     * The separator to use for custom data. This MUST NOT change unless you are hosting your own version of metrics and
+     * want to change it.
      */
     private static final String CUSTOM_DATA_SEPARATOR = "~~";
-
     /**
      * Interval of time to ping (in minutes)
      */
     private static final int PING_INTERVAL = 10;
-
     /**
      * The plugin this metrics submits for
      */
     private final Plugin plugin;
-
     /**
      * All of the custom graphs to submit to metrics
      */
     private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
-
     /**
      * The default graph, used for addCustomData when you don't want a specific graph
      */
     private final Graph defaultGraph = new Graph("Default");
-
     /**
      * The plugin configuration file
      */
     private final YamlConfiguration configuration;
-    
     /**
      * The plugin configuration file
      */
     private final File configurationFile;
-
     /**
      * Unique server id
      */
     private final String guid;
-
+    /**
+     * Debug mode
+     */
+    private final boolean debug;
     /**
      * Lock for synchronization
      */
     private final Object optOutLock = new Object();
-
     /**
-     * Id of the scheduled task
+     * The scheduled task
      */
-    private volatile int taskId = -1;
+    private volatile BukkitTask task = null;
 
     public Metrics(final Plugin plugin) throws IOException {
         if (plugin == null) {
@@ -147,6 +135,7 @@ public class Metrics {
         // add some defaults
         configuration.addDefault("opt-out", false);
         configuration.addDefault("guid", UUID.randomUUID().toString());
+        configuration.addDefault("debug", false);
 
         // Do we need to create the file?
         if (configuration.get("guid", null) == null) {
@@ -156,11 +145,12 @@ public class Metrics {
 
         // Load the guid then
         guid = configuration.getString("guid");
+        debug = configuration.getBoolean("debug", false);
     }
 
     /**
-     * Construct and create a Graph that can be used to separate specific plotters to their own graphs
-     * on the metrics website. Plotters can be added to the graph object returned.
+     * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
+     * website. Plotters can be added to the graph object returned.
      *
      * @param name The name of the graph
      * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
@@ -181,7 +171,7 @@ public class Metrics {
     }
 
     /**
-     * Add a Graph object to Metrics that represents data for the plugin that should be sent to the backend
+     * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
      *
      * @param graph The name of the graph
      */
@@ -211,9 +201,9 @@ public class Metrics {
     }
 
     /**
-     * Start measuring statistics. This will immediately create an async repeating task as the plugin and send
-     * the initial data to the metrics backend, and then after that it will post in increments of
-     * PING_INTERVAL * 1200 ticks.
+     * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
+     * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
+     * ticks.
      *
      * @return True if statistics measuring is running, otherwise false.
      */
@@ -225,12 +215,13 @@ public class Metrics {
             }
 
             // Is metrics already running?
-            if (taskId >= 0) {
+            if (task != null) {
                 return true;
             }
 
             // Begin hitting the server with glorious data
-            taskId = plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
+            try {
+                task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
 
                 private boolean firstPost = true;
 
@@ -239,11 +230,11 @@ public class Metrics {
                         // This has to be synchronized or it can collide with the disable method.
                         synchronized (optOutLock) {
                             // Disable Task, if it is running and the server owner decided to opt-out
-                            if (isOptOut() && taskId > 0) {
-                                plugin.getServer().getScheduler().cancelTask(taskId);
-                                taskId = -1;
+                            if (isOptOut() && task != null) {
+                                task.cancel();
+                                task = null;
                                 // Tell all plotters to stop gathering information.
-                                for (Graph graph : graphs){
+                                for (Graph graph : graphs) {
                                     graph.onOptOut();
                                 }
                             }
@@ -258,10 +249,16 @@ public class Metrics {
                         // Each post thereafter will be a ping
                         firstPost = false;
                     } catch (IOException e) {
-                        //Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
+                        if (debug) {
+                            Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
+                        }
                     }
                 }
-            }, 0, PING_INTERVAL * 1200);
+                }, 0, PING_INTERVAL * 1200);
+            } catch (NoSuchMethodError nsme) {
+                // Handle deprecated scheduler API stupidity
+                return false;
+            }
 
             return true;
         }
@@ -273,15 +270,19 @@ public class Metrics {
      * @return true if metrics should be opted out of it
      */
     public boolean isOptOut() {
-        synchronized(optOutLock) {
+        synchronized (optOutLock) {
             try {
                 // Reload the metrics file
                 configuration.load(getConfigFile());
             } catch (IOException ex) {
-                Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                if (debug) {
+                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                }
                 return true;
             } catch (InvalidConfigurationException ex) {
-                Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                if (debug) {
+                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                }
                 return true;
             }
             return configuration.getBoolean("opt-out", false);
@@ -289,30 +290,30 @@ public class Metrics {
     }
 
     /**
-    * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
-    *
-    * @throws IOException
-    */
+     * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
+     *
+     * @throws java.io.IOException
+     */
     public void enable() throws IOException {
         // This has to be synchronized or it can collide with the check in the task.
         synchronized (optOutLock) {
-        	// Check if the server owner has already set opt-out, if not, set it.
-        	if (isOptOut()) {
-        		configuration.set("opt-out", false);
-        		configuration.save(configurationFile);
-        	}
+            // Check if the server owner has already set opt-out, if not, set it.
+            if (isOptOut()) {
+                configuration.set("opt-out", false);
+                configuration.save(configurationFile);
+            }
 
-        	// Enable Task, if it is not running
-        	if (taskId < 0) {
-        		start();
-        	}
+            // Enable Task, if it is not running
+            if (task == null) {
+                start();
+            }
         }
     }
 
     /**
      * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
      *
-     * @throws IOException
+     * @throws java.io.IOException
      */
     public void disable() throws IOException {
         // This has to be synchronized or it can collide with the check in the task.
@@ -324,9 +325,9 @@ public class Metrics {
             }
 
             // Disable Task, if it is running
-            if (taskId > 0) {
-                this.plugin.getServer().getScheduler().cancelTask(taskId);
-                taskId = -1;
+            if (task != null) {
+                task.cancel();
+                task = null;
             }
         }
     }
@@ -352,17 +353,45 @@ public class Metrics {
      * Generic method that posts a plugin to the metrics website
      */
     private void postPlugin(final boolean isPing) throws IOException {
-        // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        final PluginDescriptionFile description = plugin.getDescription();
+        // Server software specific section
+        PluginDescriptionFile description = plugin.getDescription();
+        String pluginName = description.getName();
+        boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
+        String pluginVersion = description.getVersion();
+        String serverVersion = Bukkit.getVersion();
+        int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
+
+        // END server software specific section -- all code below does not use any code outside of this class / Java
 
         // Construct the post data
         final StringBuilder data = new StringBuilder();
+
+        // The plugin's description file containg all of the plugin data such as name, version, author, etc
         data.append(encode("guid")).append('=').append(encode(guid));
-        encodeDataPair(data, "version", description.getVersion());
-        encodeDataPair(data, "server", Bukkit.getVersion());
-        encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length));
+        encodeDataPair(data, "version", pluginVersion);
+        encodeDataPair(data, "server", serverVersion);
+        encodeDataPair(data, "players", Integer.toString(playersOnline));
         encodeDataPair(data, "revision", String.valueOf(REVISION));
 
+        // New data as of R6
+        String osname = System.getProperty("os.name");
+        String osarch = System.getProperty("os.arch");
+        String osversion = System.getProperty("os.version");
+        String java_version = System.getProperty("java.version");
+        int coreCount = Runtime.getRuntime().availableProcessors();
+
+        // normalize os arch .. amd64 -> x86_64
+        if (osarch.equals("amd64")) {
+            osarch = "x86_64";
+        }
+
+        encodeDataPair(data, "osname", osname);
+        encodeDataPair(data, "osarch", osarch);
+        encodeDataPair(data, "osversion", osversion);
+        encodeDataPair(data, "cores", Integer.toString(coreCount));
+        encodeDataPair(data, "online-mode", Boolean.toString(onlineMode));
+        encodeDataPair(data, "java_version", java_version);
+
         // If we're pinging, append it
         if (isPing) {
             encodeDataPair(data, "ping", "true");
@@ -393,7 +422,7 @@ public class Metrics {
         }
 
         // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, encode(plugin.getDescription().getName())));
+        URL url = new URL(BASE_URL + String.format(REPORT_URL, encode(pluginName)));
 
         // Connect to the website
         URLConnection connection;
@@ -456,8 +485,8 @@ public class Metrics {
     }
 
     /**
-     * <p>Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first
-     * key/value pair MUST be included manually, e.g:</p>
+     * <p>Encode a key/value data pair to be used in a HTTP post request. This INCLUDES a & so the first key/value pair
+     * MUST be included manually, e.g:</p>
      * <code>
      * StringBuffer data = new StringBuffer();
      * data.append(encode("guid")).append('=').append(encode(guid));
@@ -488,11 +517,10 @@ public class Metrics {
     public static class Graph {
 
         /**
-         * The graph's name, alphanumeric and spaces only :)
-         * If it does not comply to the above when submitted, it is rejected
+         * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
+         * rejected
          */
         private final String name;
-
         /**
          * The set of plotters that are contained within this graph
          */
@@ -532,7 +560,7 @@ public class Metrics {
         /**
          * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
          *
-         * @return an unmodifiable {@link Set} of the plotter objects
+         * @return an unmodifiable {@link java.util.Set} of the plotter objects
          */
         public Set<Plotter> getPlotters() {
             return Collections.unmodifiableSet(plotters);
@@ -554,11 +582,10 @@ public class Metrics {
         }
 
         /**
-         * Called when the server owner decides to opt-out of Metrics while the server is running.
+         * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
          */
         protected void onOptOut() {
         }
-
     }
 
     /**
@@ -588,10 +615,9 @@ public class Metrics {
         }
 
         /**
-         * Get the current value for the plotted point. Since this function defers to an external function
-         * it may or may not return immediately thus cannot be guaranteed to be thread friendly or safe.
-         * This function can be called from any thread so care should be taken when accessing resources
-         * that need to be synchronized.
+         * Get the current value for the plotted point. Since this function defers to an external function it may or may
+         * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
+         * from any thread so care should be taken when accessing resources that need to be synchronized.
          *
          * @return the current value for the point to be plotted.
          */
@@ -626,7 +652,5 @@ public class Metrics {
             final Plotter plotter = (Plotter) object;
             return plotter.name.equals(name) && plotter.getValue() == getValue();
         }
-
     }
-
 }

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

@@ -1,27 +1,23 @@
 package org.dynmap.bukkit;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
-
-import net.minecraft.server.ChunkProviderServer;
+import java.util.Map;
 
 import org.bukkit.World;
 import org.bukkit.Chunk;
 import org.bukkit.block.Biome;
-import org.bukkit.craftbukkit.CraftChunk;
-import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.util.LongHashset;
 import org.bukkit.ChunkSnapshot;
 import org.dynmap.DynmapChunk;
 import org.dynmap.DynmapCore;
 import org.dynmap.DynmapWorld;
 import org.dynmap.Log;
+import org.dynmap.bukkit.SnapshotCache.SnapshotRec;
 import org.dynmap.common.BiomeMap;
+import org.dynmap.hdmap.HDBlockModels;
+import org.dynmap.renderer.RenderPatchFactory;
+import org.dynmap.utils.DynIntHashMap;
 import org.dynmap.utils.MapChunkCache;
 import org.dynmap.utils.MapIterator;
 import org.dynmap.utils.BlockStep;
@@ -32,9 +28,7 @@ import org.getspout.spoutapi.block.SpoutChunk;
  */
 public class NewMapChunkCache implements MapChunkCache {
     private static boolean init = false;
-    private static boolean use_spout = false;
-    private static Field unloadqueue = null;
-    private static Method queuecontainskey = null;
+    private static boolean use_spout = false;    
 
     private World w;
     private DynmapWorld dw;
@@ -51,6 +45,7 @@ public class NewMapChunkCache implements MapChunkCache {
     private boolean do_save = false;
     private boolean isempty = true;
     private ChunkSnapshot[] snaparray; /* Index = (x-x_min) + ((z-z_min)*x_dim) */
+    private DynIntHashMap[] snaptile;
     private byte[][] sameneighborbiomecnt;
     private BiomeMap[][] biomemap;
     private boolean[][] isSectionNotEmpty; /* Indexed by snapshot index, then by section index */
@@ -61,11 +56,17 @@ public class NewMapChunkCache implements MapChunkCache {
     
     private long exceptions;
     
+    private static BukkitVersionHelper helper = BukkitVersionHelper.getHelper();
+    
     private static final BlockStep unstep[] = { BlockStep.X_MINUS, BlockStep.Y_MINUS, BlockStep.Z_MINUS,
         BlockStep.X_PLUS, BlockStep.Y_PLUS, BlockStep.Z_PLUS };
 
     private static BiomeMap[] biome_to_bmap;
-    
+
+    private static final int getIndexInChunk(int cx, int cy, int cz) {
+        return (cy << 8) | (cz << 4) | cx;
+    }
+
     /**
      * Iterator for traversing map chunk cache (base is for non-snapshot)
      */
@@ -145,15 +146,31 @@ public class NewMapChunkCache implements MapChunkCache {
                 sameneighborbiomecnt[i] = new byte[z_size];
                 biomemap[i] = new BiomeMap[z_size];
             }
+            Object[] biomebase = null;
+            ChunkSnapshot biome_css = null;
             for(int i = 0; i < x_size; i++) {
                 initialize(i + x_base, 64, z_base);
                 for(int j = 0; j < z_size; j++) {
-                    Biome bb = snap.getBiome(bx, bz);
                     BiomeMap bm;
-                    if(bb == null)
-                        bm = BiomeMap.NULL;
-                    else
-                        bm = biome_to_bmap[bb.ordinal()];
+                    
+                    if(snap != biome_css) {
+                        biomebase = null;
+                        biome_css = snap;
+                        if (biome_css instanceof SpoutChunkSnapshot) {
+                            biome_css = ((SpoutChunkSnapshot)biome_css).chunk;
+                        }
+                        biomebase = helper.getBiomeBaseFromSnapshot(biome_css);
+                    }
+                    if(biomebase != null) {
+                        bm = BiomeMap.byBiomeID(helper.getBiomeBaseID(biomebase[bz << 4 | bx]));
+                    }
+                    else {
+                        Biome bb = snap.getBiome(bx, bz);
+                        if(bb == null)
+                            bm = BiomeMap.NULL;
+                        else
+                            bm = biome_to_bmap[bb.ordinal()];
+                    }
                     biomemap[i][j] = bm;
                     int cnt = 0;
                     if(i > 0) {
@@ -517,6 +534,53 @@ public class NewMapChunkCache implements MapChunkCache {
                 return !isSectionNotEmpty[chunkindex][y >> 4];
             }
         }
+        @Override
+        public RenderPatchFactory getPatchFactory() {
+            return HDBlockModels.getPatchDefinitionFactory();
+        }
+        @Override
+        public Object getBlockTileEntityField(String fieldId) {
+            try {
+                int idx = getIndexInChunk(bx,y,bz);
+                Object[] vals = (Object[])snaptile[chunkindex].get(idx);
+                for (int i = 0; i < vals.length; i += 2) {
+                    if (vals[i].equals(fieldId)) {
+                        return vals[i+1];
+                    }
+                }
+            } catch (Exception x) {
+            }
+            return null;
+        }
+        @Override
+        public int getBlockTypeIDAt(int xoff, int yoff, int zoff) {
+            int xx = this.x + xoff;
+            int yy = this.y + yoff;
+            int zz = this.z + zoff;
+            int idx = ((xx >> 4) - x_min) + (((zz >> 4) - z_min) * x_dim);
+            try {
+                return snaparray[idx].getBlockTypeId(xx & 0xF, yy, zz & 0xF);
+            } catch (Exception x) {
+                return 0;
+            }
+        }
+        @Override
+        public int getBlockDataAt(int xoff, int yoff, int zoff) {
+            int xx = this.x + xoff;
+            int yy = this.y + yoff;
+            int zz = this.z + zoff;
+            int idx = ((xx >> 4) - x_min) + (((zz >> 4) - z_min) * x_dim);
+            try {
+                return snaparray[idx].getBlockData(xx & 0xF, yy, zz & 0xF);
+            } catch (Exception x) {
+                return 0;
+            }
+        }
+        @Override
+        public Object getBlockTileEntityFieldAt(String fieldId, int xoff,
+                int yoff, int zoff) {
+            return null;
+        }
      }
 
     private class OurEndMapIterator extends OurMapIterator {
@@ -666,27 +730,15 @@ public class NewMapChunkCache implements MapChunkCache {
         if(!init) {
             use_spout = DynmapPlugin.plugin.hasSpout();
             
-            try {
-                unloadqueue = ChunkProviderServer.class.getField("unloadQueue");
-                Class cls = unloadqueue.getType();
-                String nm = cls.getName();
-                if (nm.equals("org.bukkit.craftbukkit.util.LongHashset")) {
-                    queuecontainskey = unloadqueue.getType().getMethod("containsKey", new Class[] { int.class, int.class });
-                }
-                else {
-                    unloadqueue = null;
-                }
-            } catch (NoSuchFieldException nsfx) {
-                unloadqueue = null;
-            } catch (NoSuchMethodException nsmx) {
-                unloadqueue = null;
-            }
             init = true;
         }
     }
     public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) {
         this.dw = dw;
         this.w = dw.getWorld();
+        if(this.w == null) {
+            this.chunks = new ArrayList<DynmapChunk>();
+        }
         nsect = dw.worldheight >> 4;
         this.chunks = chunks;
         /* Compute range */
@@ -713,8 +765,10 @@ public class NewMapChunkCache implements MapChunkCache {
             x_dim = x_max - x_min + 1;            
         }
     
-        snaparray = new ChunkSnapshot[x_dim * (z_max-z_min+1)];
-        isSectionNotEmpty = new boolean[x_dim * (z_max-z_min+1)][];
+        int snapcnt = x_dim * (z_max-z_min+1);
+        snaparray = new ChunkSnapshot[snapcnt];
+        snaptile = new DynIntHashMap[snapcnt];
+        isSectionNotEmpty = new boolean[snapcnt][];
     }
     
     private ChunkSnapshot checkSpoutData(Chunk c, ChunkSnapshot ss) {
@@ -729,16 +783,11 @@ public class NewMapChunkCache implements MapChunkCache {
     }
 
     public int loadChunks(int max_to_load) {
+        if(dw.isLoaded() == false)
+            return 0;
         long t0 = System.nanoTime();
-        CraftWorld cw = (CraftWorld)w;
-        Object queue = null;
-        try {
-            if (unloadqueue != null) {
-                queue = unloadqueue.get(cw.getHandle().chunkProviderServer);
-            }
-        } catch (IllegalArgumentException iax) {
-        } catch (IllegalAccessException e) {
-        }
+        Object queue = helper.getUnloadQueue(helper.getNMSWorld(w));
+        
         int cnt = 0;
         if(iterator == null)
             iterator = chunks.listIterator();
@@ -767,8 +816,11 @@ public class NewMapChunkCache implements MapChunkCache {
                 }
             }
             /* Check if cached chunk snapshot found */
-            ChunkSnapshot ss = DynmapPlugin.plugin.sscache.getSnapshot(dw.getName(), chunk.x, chunk.z, blockdata, biome, biomeraw, highesty); 
-            if(ss != null) {
+            ChunkSnapshot ss = null;
+            DynIntHashMap tileData = null;
+            SnapshotRec ssr = DynmapPlugin.plugin.sscache.getSnapshot(dw.getName(), chunk.x, chunk.z, blockdata, biome, biomeraw, highesty); 
+            if(ssr != null) {
+                ss = ssr.ss;
                 if(!vis) {
                     if(hidestyle == HiddenChunkStyle.FILL_STONE_PLAIN)
                         ss = STONE;
@@ -777,7 +829,10 @@ public class NewMapChunkCache implements MapChunkCache {
                     else
                         ss = EMPTY;
                 }
-                snaparray[(chunk.x-x_min) + (chunk.z - z_min)*x_dim] = ss;
+                int idx = (chunk.x-x_min) + (chunk.z - z_min)*x_dim;
+                snaparray[idx] = ss;
+                snaptile[idx] = ssr.tileData;
+                
                 continue;
             }
             chunks_attempted++;
@@ -785,12 +840,7 @@ public class NewMapChunkCache implements MapChunkCache {
             boolean didload = false;
             boolean isunloadpending = false;
             if (queue != null) {
-                try {
-                    isunloadpending = (Boolean)queuecontainskey.invoke(queue, chunk.x, chunk.z);
-                } catch (IllegalAccessException iax) {
-                } catch (IllegalArgumentException e) {
-                } catch (InvocationTargetException e) {
-                }
+                isunloadpending = helper.isInUnloadQueue(queue, chunk.x, chunk.z);
             }
             if (isunloadpending) {  /* Workaround: can't be pending if not loaded */
                 wasLoaded = true;
@@ -814,6 +864,8 @@ public class NewMapChunkCache implements MapChunkCache {
                 didgenerate = didload = w.loadChunk(chunk.x, chunk.z, true);
             /* If it did load, make cache of it */
             if(didload) {
+                tileData = new DynIntHashMap();
+
                 Chunk c = w.getChunkAt(chunk.x, chunk.z);   /* Get the chunk */
                 /* Test if chunk isn't populated */
                 boolean populated = true;
@@ -842,22 +894,55 @@ public class NewMapChunkCache implements MapChunkCache {
                         if(use_spout) {
                             ss = checkSpoutData(c, ss);
                         }
+                        /* Get tile entity data */
+                        List<Object> vals = new ArrayList<Object>();
+                        Map tileents = helper.getTileEntitiesForChunk(c);
+                        for(Object t : tileents.values()) {
+                            int te_x = helper.getTileEntityX(t);
+                            int te_y = helper.getTileEntityY(t);
+                            int te_z = helper.getTileEntityZ(t);
+                            int cx = te_x & 0xF;
+                            int cz = te_z & 0xF;
+                            int blkid = ss.getBlockTypeId(cx, te_y, cz);
+                            int blkdat = ss.getBlockData(cx, te_y, cz);
+                            String[] te_fields = HDBlockModels.getTileEntityFieldsNeeded(blkid,  blkdat);
+                            if(te_fields != null) {
+                                Object nbtcompound = helper.readTileEntityNBT(t);
+                                
+                                vals.clear();
+                                for(String id: te_fields) {
+                                    Object val = helper.getFieldValue(nbtcompound, id);
+                                    if(val != null) {
+                                        vals.add(id);
+                                        vals.add(val);
+                                    }
+                                }
+                                if(vals.size() > 0) {
+                                    Object[] vlist = vals.toArray(new Object[vals.size()]);
+                                    tileData.put(getIndexInChunk(cx,te_y,cz), vlist);
+                                }
+                            }
+                        }
                     }
                     else
                         ss = w.getEmptyChunkSnapshot(chunk.x, chunk.z, biome, biomeraw);
                     if(ss != null) {
-                        DynmapPlugin.plugin.sscache.putSnapshot(dw.getName(), chunk.x, chunk.z, ss, blockdata, biome, biomeraw, highesty);
+                        ssr = new SnapshotRec();
+                        ssr.ss = ss;
+                        ssr.tileData = tileData;
+                        DynmapPlugin.plugin.sscache.putSnapshot(dw.getName(), chunk.x, chunk.z, ssr, blockdata, biome, biomeraw, highesty);
                     }
                 }
                 snaparray[(chunk.x-x_min) + (chunk.z - z_min)*x_dim] = ss;
+                snaptile[(chunk.x-x_min) + (chunk.z - z_min)*x_dim] = tileData;
+                
                 /* If wasn't loaded before, we need to do unload */
                 if (!wasLoaded) {
                     chunks_read++;
                     /* It looks like bukkit "leaks" entities - they don't get removed from the world-level table
                      * when chunks are unloaded but not saved - removing them seems to do the trick */
                     if(!(didgenerate && do_save)) {
-                        CraftChunk cc = (CraftChunk)c;
-                        cc.getHandle().removeEntities();
+                        helper.removeEntitiesFromChunk(c);
                     }
                     /* Since we only remember ones we loaded, and we're synchronous, no player has
                      * moved, so it must be safe (also prevent chunk leak, which appears to happen
@@ -893,6 +978,11 @@ public class NewMapChunkCache implements MapChunkCache {
      * Test if done loading
      */
     public boolean isDoneLoading() {
+        if(dw.isLoaded() == false) {
+            isempty = true;
+            unloadChunks();
+            return true;
+        }
         if(iterator != null)
             return !iterator.hasNext();
         return false;

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

@@ -8,15 +8,21 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.bukkit.ChunkSnapshot;
+import org.dynmap.utils.DynIntHashMap;
 
 public class SnapshotCache {
+    public static class SnapshotRec {
+        public ChunkSnapshot ss;
+        public DynIntHashMap tileData;
+    };
+
     private CacheHashMap snapcache;
-    private ReferenceQueue<ChunkSnapshot> refqueue;
+    private ReferenceQueue<SnapshotRec> refqueue;
     private long cache_attempts;
     private long cache_success;
 
     private static class CacheRec {
-        WeakReference<ChunkSnapshot> ref;
+        WeakReference<SnapshotRec> ref;
         boolean hasbiome;
         boolean hasrawbiome;
         boolean hasblockdata;
@@ -26,12 +32,12 @@ public class SnapshotCache {
     @SuppressWarnings("serial")
     public class CacheHashMap extends LinkedHashMap<String, CacheRec> {
         private int limit;
-        private IdentityHashMap<WeakReference<ChunkSnapshot>, String> reverselookup;
+        private IdentityHashMap<WeakReference<SnapshotRec>, String> reverselookup;
 
         public CacheHashMap(int lim) {
             super(16, (float)0.75, true);
             limit = lim;
-            reverselookup = new IdentityHashMap<WeakReference<ChunkSnapshot>, String>();
+            reverselookup = new IdentityHashMap<WeakReference<SnapshotRec>, String>();
         }
         protected boolean removeEldestEntry(Map.Entry<String, CacheRec> last) {
             boolean remove = (size() >= limit);
@@ -47,7 +53,7 @@ public class SnapshotCache {
      */
     public SnapshotCache(int max_size) {
         snapcache = new CacheHashMap(max_size);
-        refqueue = new ReferenceQueue<ChunkSnapshot>();
+        refqueue = new ReferenceQueue<SnapshotRec>();
     }
     private String getKey(String w, int cx, int cz) {
         return w + ":" + cx + ":" + cz;
@@ -83,11 +89,11 @@ public class SnapshotCache {
     /**
      * Look for chunk snapshot in cache
      */
-    public ChunkSnapshot getSnapshot(String w, int chunkx, int chunkz, 
+    public SnapshotRec getSnapshot(String w, int chunkx, int chunkz, 
             boolean blockdata, boolean biome, boolean biomeraw, boolean highesty) {
         String key = getKey(w, chunkx, chunkz);
         processRefQueue();
-        ChunkSnapshot ss = null;
+        SnapshotRec ss = null;
         CacheRec rec = snapcache.get(key);
         if(rec != null) {
             ss = rec.ref.get();
@@ -112,7 +118,7 @@ public class SnapshotCache {
     /**
      * Add chunk snapshot to cache
      */
-    public void putSnapshot(String w, int chunkx, int chunkz, ChunkSnapshot ss, 
+    public void putSnapshot(String w, int chunkx, int chunkz, SnapshotRec ss, 
             boolean blockdata, boolean biome, boolean biomeraw, boolean highesty) {
         String key = getKey(w, chunkx, chunkz);
         processRefQueue();
@@ -121,7 +127,7 @@ public class SnapshotCache {
         rec.hasbiome = biome;
         rec.hasrawbiome = biomeraw;
         rec.hashighesty = highesty;
-        rec.ref = new WeakReference<ChunkSnapshot>(ss, refqueue);
+        rec.ref = new WeakReference<SnapshotRec>(ss, refqueue);
         CacheRec prevrec = snapcache.put(key, rec);
         if(prevrec != null) {
             snapcache.reverselookup.remove(prevrec.ref);
@@ -132,7 +138,7 @@ public class SnapshotCache {
      * Process reference queue
      */
     private void processRefQueue() {
-        Reference<? extends ChunkSnapshot> ref;
+        Reference<? extends SnapshotRec> ref;
         while((ref = refqueue.poll()) != null) {
             String k = snapcache.reverselookup.remove(ref);
             if(k != null) {

src/main/resources/configuration.txt

@@ -42,11 +42,13 @@ components:
     hideifsneaking: false
     # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
     protected-player-info: false
+    # If true, hide players with invisibility potion effects active
+    hide-if-invisiblity-potion: true
   #- class: org.dynmap.JsonFileClientUpdateComponent
   #  writeinterval: 1
   #  sendhealth: true
   #  sendposition: true
-  #  allowwebchat: false
+  #  allowwebchat: true
   #  webchat-interval: 5
   #  hidewebchatip: false
   #  includehiddenplayers: false
@@ -62,6 +64,7 @@ components:
   #  webchat-permissions: false
   #  # Limit length of single chat messages
   #  chatlengthlimit: 256
+  #  hide-if-invisiblity-potion: true
    
   - class: org.dynmap.SimpleWebChatComponent
     allowchat: true
@@ -131,7 +134,7 @@ components:
   - class: org.dynmap.ClientComponent
     type: timeofdayclock
     showdigitalclock: true
-    #showweather: true
+    showweather: true
   # Mouse pointer world coordinate display
   - class: org.dynmap.ClientComponent
     type: coord
@@ -183,6 +186,11 @@ saverestorepending: true
 # Zoom-out tile update period - how often to scan for and process tile updates into zoom-out tiles (in seconds)
 zoomoutperiod: 30
 
+# Default delay on processing of updated tiles, in seconds.  This can reduce potentially expensive re-rendering
+# of frequently updated tiles (such as due to machines, pistons, quarries or other automation).  Values can
+# also be set on individual worlds and individual maps.
+tileupdatedelay: 30
+
 # Tile hashing is used to minimize tile file updates when no changes have occurred - set to false to disable
 enabletilehash: true
 
@@ -201,8 +209,10 @@ image-format: png
 
 #  use-generated-textures: if true, use generated textures (same as client); false is static water/lava textures
 #  correct-water-lighting: if true, use corrected water lighting (same as client); false is legacy water (darker)
+#  transparent-leaves: if true, leaves are transparent (lighting-wise): false is needed for some Spout versions that break lighting on leaf blocks
 use-generated-textures: true
 correct-water-lighting: true
+transparent-leaves: true
 
 # Control loading of player faces (if set to false, skins are never fetched)
 #fetchskins: false
@@ -299,6 +309,11 @@ grayplayerswhenhidden: true
 #    Access-Control-Allow-Origin: "my-domain.com"
 #    X-Custom-Header-Of-Mine: "MyHeaderValue"
 
+# Trusted proxies for web server - which proxy addresses are trusted to supply valid X-Forwarded-For fields
+trusted-proxies:
+  - "127.0.0.1"
+  - "0:0:0:0:0:0:0:1"
+  
 joinmessage: "%playername% joined"
 quitmessage: "%playername% quit"
 spammessage: "You may only chat once every %interval% seconds."
@@ -322,6 +337,9 @@ defaultmap: flat
 # If true, make persistent record of IP addresses used by player logins, to support web IP to player matching
 persist-ids-by-ip: true
 
+# If true, map text to cyrillic
+cyrillic-support: false
+
 # Messages to customize
 msg:
     maptypes: "Map Types"