CraftBukkit 1.9 compatibility

Remove duplicate removeEntities - Fixes #1838

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

@@ -1,12 +1,14 @@
-<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">
+<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.dynmap</groupId>
+	<groupId>us.dynmap</groupId>
 	<artifactId>dynmap</artifactId>
-	<version>0.70</version>
 	<name>dynmap</name>
 	<properties>
+		<timestamp>${maven.build.timestamp}</timestamp>
+		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<BUILD_NUMBER>dev</BUILD_NUMBER>
+		<BUILD_NUMBER>Dev${timestamp}</BUILD_NUMBER>
 	</properties>
 	<url>http://github.com/webbukkit/dynmap/</url>
 	<issueManagement>
@@ -43,31 +45,6 @@
 				</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>
@@ -81,8 +58,8 @@
 						<configuration>
 							<artifactSet>
 								<includes>
-									<include>org.dynmap:dynmap-api:jar:*</include>
-									<include>org.dynmap:DynmapCore:jar:*</include>
+									<include>us.dynmap:dynmap-api:jar:*</include>
+									<include>us.dynmap:DynmapCore:jar:*</include>
 								</includes>
 							</artifactSet>
 						</configuration>
@@ -90,28 +67,19 @@
 				</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>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
 				<executions>
 					<execution>
-						<id>build</id>
-						<phase>package</phase>
+						<id>attach-sources</id>
 						<goals>
-							<goal>single</goal>
+							<goal>jar</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 	<repositories>
@@ -120,37 +88,31 @@
 			</releases>
 			<snapshots>
 			</snapshots>
-			<id>spout-repo</id>
-			<url>http://repo.spout.org</url>
+			<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.7.10-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.dynmap</groupId>
+			<groupId>us.dynmap</groupId>
 			<artifactId>dynmap-api</artifactId>
 			<version>${project.version}</version>
-			<type>jar</type>
-			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.dynmap</groupId>
+			<groupId>us.dynmap</groupId>
 			<artifactId>DynmapCore</artifactId>
 			<version>${project.version}</version>
-			<type>jar</type>
-			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.getspout</groupId>
@@ -162,22 +124,22 @@
 			<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.anjocaido</groupId>
+			<artifactId>EssentialsGroupManager</artifactId>
+			<version>2.10.1</version>
 		</dependency>
 	</dependencies>
+	<version>2.3-SNAPSHOT</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,147 @@
+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.bukkit.entity.Player;
+import org.dynmap.Log;
+import org.dynmap.utils.Polygon;
+
+/**
+ * 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) {
+            Log.info("version=" + Bukkit.getServer().getVersion());
+            if(Bukkit.getServer().getVersion().contains("MCPC")) {
+                Log.severe("*********************************************************************************");
+                Log.severe("* MCPC-Plus is no longer supported via the Bukkit version of Dynmap.            *");
+                Log.severe("* Install the appropriate Forge version of Dynmap.                              *");
+                Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
+                Log.severe("*********************************************************************************");
+            }
+            else if(Bukkit.getServer().getVersion().contains("BukkitForge")) {
+                Log.severe("*********************************************************************************");
+                Log.severe("* BukkitForge is not supported via the Bukkit version of Dynmap.                *");
+                Log.severe("* Install the appropriate Forge version of Dynmap.                              *"); 
+                Log.severe("* Add the DynmapCBBridge plugin to enable support for Dynmap-compatible plugins *");
+                Log.severe("*********************************************************************************");
+            }
+            else if(Bukkit.getServer().getClass().getName().contains("GlowServer")) {
+                Log.info("Loading Glowstone support");
+                helper = new BukkitVersionHelperGlowstone();
+            }
+            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 unload queue for given NMS world
+     */
+    public abstract Object getUnloadQueue(World world);
+    /**
+     *  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);
+    /**
+     * Get inhabited ticks count from chunk
+     */
+    public abstract long getInhabitedTicks(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);
+    /**
+     * Unload chunk no save needed
+     */
+    public abstract void unloadChunkNoSave(World w, Chunk c, int cx, int cz);
+    /**
+     * Get block short name list
+     */
+    public abstract String[] getBlockShortNames();
+    /**
+     * Get biome name list
+     */
+    public abstract String[] getBiomeNames();
+    /**
+     * Get block material index list
+     */
+    public abstract int[] getBlockMaterialMap();
+    /**
+     * Get list of online players
+     */
+    public abstract Player[] getOnlinePlayers();
+    /**
+     * Get player health
+     */
+    public abstract double getHealth(Player p);
+    /**
+     * Get world border
+     */
+    public Polygon getWorldBorder(World world) { return null; }
+}

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

@@ -0,0 +1,278 @@
+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.Map;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.dynmap.Log;
+import org.dynmap.common.BiomeMap;
+import org.dynmap.utils.Polygon;
+
+/**
+ * Helper for isolation of bukkit version specific issues
+ */
+public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
+    private Class<?> nmsblock;
+    private Class<?> nmsblockarray;
+    private Class<?> nmsmaterial;
+    private Field blockbyid;
+    private Field blockname;
+    private Field material;
+    private Method blockbyidfunc;   // 1.7+ method for getting block by id
+    private Method getworldborder;  // 1.8+ method for getting world border
+    private Class<?> nmsworldborder;
+    private Method worldborderminx;
+    private Method worldbordermaxx;
+    private Method worldborderminz;
+    private Method worldbordermaxz;
+    
+    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() {
+        // Get block fields
+        nmsblock = getNMSClass("net.minecraft.server.Block");
+        nmsblockarray = getNMSClass("[Lnet.minecraft.server.Block;");
+        nmsmaterial = getNMSClass("net.minecraft.server.Material");
+        blockbyid = getFieldNoFail(nmsblock, new String[] { "byId" }, nmsblockarray);
+        if (blockbyid == null) {
+            blockbyidfunc = getMethod(nmsblock, new String[] { "getById", "e" }, new Class[] { int.class });
+        }
+        blockname = getPrivateField(nmsblock, new String[] { "name", "b" }, String.class);
+        material = getPrivateField(nmsblock, new String[] { "material" }, nmsmaterial);
+
+        /* Set up biomebase fields */
+        biomebase = getNMSClass("net.minecraft.server.BiomeBase");
+        biomebasearray = getNMSClass("[Lnet.minecraft.server.BiomeBase;");
+        biomebaselist = getPrivateFieldNoFail(biomebase, new String[] { "biomes" }, biomebasearray);
+        if (biomebaselist == null) {
+            biomebaseset = getPrivateField(biomebase, new String[] { "i" }, Set.class); // 1.9
+        }
+        biomebasetemp = getPrivateField(biomebase, new String[] { "temperature", "C", "F" }, float.class);
+        biomebasehumi = getPrivateField(biomebase, new String[] { "humidity", "D", "G" }, float.class);
+        biomebaseidstring = getPrivateField(biomebase, new String[] { "z", "y", "af", "ah" }, String.class);
+        biomebaseid = getPrivateField(biomebase, new String[] { "id", "E" }, int.class);
+        /* n.m.s.World */
+        nmsworld = getNMSClass("net.minecraft.server.WorldServer");
+        chunkprovserver = getNMSClass("net.minecraft.server.ChunkProviderServer");
+        nmsw_chunkproviderserver = getFieldNoFail(nmsworld, new String[] { "chunkProviderServer" }, chunkprovserver);
+        if (nmsw_chunkproviderserver == null) {
+            nmsw_getchunkproviderserver = getMethod(nmsworld, new String[] { "getChunkProviderServer" }, nulltypes); // 1.9
+        }
+        getworldborder = getMethodNoFail(nmsworld, new String[] { "getWorldBorder", "af" }, nulltypes);
+        
+        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 });
+        }
+
+        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_tileentities = getField(nmschunk, new String[] { "tileEntities" }, Map.class);
+        nmsc_inhabitedticks = getPrivateFieldNoFail(nmschunk, new String[] { "v", "s", "q", "u" }, long.class);
+        if (nmsc_inhabitedticks == null) {
+            Log.info("inhabitedTicks field not found - inhabited shader not functional");
+        }
+        /** n.m.s.WorldBorder */
+        nmsworldborder = getNMSClassNoFail("net.minecraft.server.WorldBorder");
+        if (nmsworldborder != null) {
+            worldborderminx = getMethod(nmsworldborder, new String[] { "b" }, nulltypes);
+            worldborderminz = getMethod(nmsworldborder, new String[] { "c" }, nulltypes);
+            worldbordermaxx = getMethod(nmsworldborder, new String[] { "d" }, nulltypes);
+            worldbordermaxz = getMethod(nmsworldborder, new String[] { "e" }, nulltypes);
+        }
+        
+        /** 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 = getPrivateField(nbttagbyte, new String[] { "data" }, byte.class);
+        nbttagshort_val = getPrivateField(nbttagshort, new String[] { "data" }, short.class);
+        nbttagint_val = getPrivateField(nbttagint, new String[] { "data" }, int.class);
+        nbttaglong_val = getPrivateField(nbttaglong, new String[] { "data" }, long.class);
+        nbttagfloat_val = getPrivateField(nbttagfloat, new String[] { "data" }, float.class);
+        nbttagdouble_val = getPrivateField(nbttagdouble, new String[] { "data" }, double.class);
+        nbttagbytearray_val = getPrivateField(nbttagbytearray, new String[] { "data" }, byte[].class);
+        nbttagstring_val = getPrivateField(nbttagstring, new String[] { "data" }, String.class);
+        nbttagintarray_val = getPrivateField(nbttagintarray, new String[] { "data" }, int[].class);
+
+        /** Tile entity */
+        nms_tileentity = getNMSClass("net.minecraft.server.TileEntity");
+        nmst_readnbt = getMethod(nms_tileentity, new String[] { "a", "b" }, new Class[] { nbttagcompound });
+        nmst_getposition = getMethodNoFail(nms_tileentity, new String[] { "getPosition" }, new Class[0]); // Try 1.8 method
+        if (nmst_getposition == null) {
+            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); 
+        }
+        else {  /* BlockPosition */
+            nms_blockposition = getNMSClass("net.minecraft.server.BlockPosition");
+            nmsbp_getx = getMethod(nms_blockposition, new String[] { "getX" }, new Class[0]);
+            nmsbp_gety = getMethod(nms_blockposition, new String[] { "getY" }, new Class[0]);
+            nmsbp_getz = getMethod(nms_blockposition, new String[] { "getZ" }, new Class[0]);
+        }
+    }
+    @Override
+    public void unloadChunkNoSave(World w, Chunk c, int cx, int cz) {
+        w.unloadChunk(cx, cz, false, false);
+    }
+    /**
+     * Get block short name list
+     */
+    @Override
+    public String[] getBlockShortNames() {
+        try {
+            String[] names = new String[4096];
+            if (blockbyid != null)  {
+                Object[] byid = (Object[])blockbyid.get(nmsblock);
+                for (int i = 0; i < names.length; i++) {
+                    if (byid[i] != null) {
+                        names[i] = (String)blockname.get(byid[i]);
+                    }
+                }
+            }
+            else {
+                for (int i = 0; i < names.length; i++) {
+                    Object blk = blockbyidfunc.invoke(nmsblock, i);
+                    if (blk != null) {
+                        names[i] = (String)blockname.get(blk);
+                    }
+                }
+            }
+            return names;
+        } catch (IllegalArgumentException e) {
+        } catch (IllegalAccessException e) {
+        } catch (InvocationTargetException e) {
+        }
+        return new String[0];
+    }
+    /**
+     * Get biome name list
+     */
+    @Override
+    public String[] getBiomeNames() {
+        String[] names;
+        /* Find array of biomes in biomebase */
+        Object[] biomelist = getBiomeBaseList();
+        names = new String[biomelist.length];
+        /* Loop through list, starting afer well known biomes */
+        for(int i = 0; i < biomelist.length; i++) {
+            Object bb = biomelist[i];
+            if(bb != null) {
+                names[i] = getBiomeBaseIDString(bb);
+            }
+        }
+        return names;
+    }
+    /**
+     * Get block material index list
+     */
+    public int[] getBlockMaterialMap() {
+        try {
+            int[] map = new int[4096];
+            if (blockbyid != null) {
+                Object[] byid = (Object[])blockbyid.get(nmsblock);
+                ArrayList<Object> mats = new ArrayList<Object>();
+                for (int i = 0; i < map.length; i++) {
+                    if (byid[i] != null) {
+                        Object mat = (Object)material.get(byid[i]);
+                        if (mat != null) {
+                            map[i] = mats.indexOf(mat);
+                            if (map[i] < 0) {
+                                map[i] = mats.size();
+                                mats.add(mat);
+                            }
+                        }
+                        else {
+                            map[i] = -1;
+                        }
+                    }
+                }
+            }
+            else {
+                ArrayList<Object> mats = new ArrayList<Object>();
+                for (int i = 0; i < map.length; i++) {
+                    Object blk = blockbyidfunc.invoke(nmsblock, i);
+                    if (blk != null) {
+                        Object mat = (Object)material.get(blk);
+                        if (mat != null) {
+                            map[i] = mats.indexOf(mat);
+                            if (map[i] < 0) {
+                                map[i] = mats.size();
+                                mats.add(mat);
+                            }
+                        }
+                        else {
+                            map[i] = -1;
+                        }
+                    }
+                }
+            }
+            return map;
+        } catch (IllegalArgumentException e) {
+        } catch (IllegalAccessException e) {
+        } catch (InvocationTargetException e) {
+        }
+        return new int[0];
+    }
+    @Override
+    public Polygon getWorldBorder(World world) {
+        Polygon p = null;
+        if ((getworldborder == null) || (world == null)) {
+            return null;
+        }
+        Object cw = getNMSWorld(world);
+        if (cw == null) return null;
+        Object wb = callMethod(cw, getworldborder, nullargs, null);
+        if (wb != null) {
+            double minx = (Double) callMethod(wb, worldborderminx, nullargs, Double.MIN_VALUE);
+            double minz = (Double) callMethod(wb, worldborderminz, nullargs, Double.MIN_VALUE);
+            double maxx = (Double) callMethod(wb, worldbordermaxx, nullargs, Double.MAX_VALUE);
+            double maxz = (Double) callMethod(wb, worldbordermaxz, nullargs, Double.MAX_VALUE);
+            if (maxx < 1E7) {
+                p = new Polygon();
+                p.addVertex(minx, minz);
+                p.addVertex(minx, maxz);
+                p.addVertex(maxx, maxz);
+                p.addVertex(maxx, minz);
+            }
+        }
+        return p;
+    }
+}

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

@@ -0,0 +1,484 @@
+package org.dynmap.bukkit;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.ChunkSnapshot;
+import org.bukkit.Server;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+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;
+    protected static final Object[] nullargs = new Object[0];
+    protected static final Class[] nulltypes = new Class[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 biomebaseset;
+    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 Method nmsw_getchunkproviderserver;
+    protected Field cps_unloadqueue;
+    protected Method lhs_containskey;
+    /** n.m.s.Chunk */
+    protected Class<?> nmschunk;
+    protected Field nmsc_tileentities;
+    protected Field nmsc_inhabitedticks;
+    /** 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;
+    protected Method nmst_getposition;
+    /** BlockPosition */
+    protected Class<?> nms_blockposition;
+    protected Method nmsbp_getx;
+    protected Method nmsbp_gety;
+    protected Method nmsbp_getz;
+    
+    /** Server */
+    protected Method server_getonlineplayers;
+    /** Player */
+    protected Method player_gethealth;
+
+    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]);
+        /* 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]);
+        
+        /** Server */
+        server_getonlineplayers = getMethod(Server.class, new String[] { "getOnlinePlayers" }, new Class[0]);
+        /** Player */
+        player_gethealth = getMethod(Player.class, new String[] { "getHealth" }, 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<?> getNMSClassNoFail(String classname) {
+        return getClassByName(classname, "net.minecraft.server", nms_package, true);
+    }
+
+    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
+     */
+    protected Field getPrivateField(Class<?> cls, String[] ids, Class<?> type) {
+        return getPrivateField(cls, ids, type, false);
+    }
+    protected Field getPrivateFieldNoFail(Class<?> cls, String[] ids, Class<?> type) {
+        return getPrivateField(cls, ids, type, true);
+    }
+    private Field getPrivateField(Class<?> cls, String[] ids, Class<?> type, boolean nofail) {
+        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) {
+            }
+        }
+        if(!nofail) {
+            Log.severe("Unable to find field " + ids[0] + " for " + cls.getName());
+            failed = true;
+        }
+        return null;
+    }
+    protected 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;
+    }
+    protected Method getMethodNoFail(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) {
+            }
+        }
+        return null;
+    }
+    protected 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() {
+        if (biomebaselist != null) {
+            return (Object[]) getFieldValue(biomebase, biomebaselist, new Object[0]);
+        } else {
+            return ((Set) getFieldValue(biomebase, biomebaselist, Collections.emptySet())).toArray();
+        }
+    }
+    /** 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 */
+    protected Object getNMSWorld(World w) {
+        return callMethod(w, cw_gethandle, nullargs, null);
+    }
+
+    /* Get unload queue for given NMS world */
+    public Object getUnloadQueue(World world) {
+        Object cps = null;
+        if (nmsw_chunkproviderserver != null) {
+            cps = getFieldValue(getNMSWorld(world), nmsw_chunkproviderserver, null);
+        } else {
+            cps = callMethod(getNMSWorld(world), nmsw_getchunkproviderserver, nullargs, null);
+        }
+        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;
+//    }
+
+    /**
+     * Get inhabited ticks count from chunk
+     */
+    private static final Long zero = new Long(0);
+    public long getInhabitedTicks(Chunk c) {
+        if (nmsc_inhabitedticks == null) {
+            return 0;
+        }
+        Object omsc = callMethod(c, cc_gethandle, nullargs, null);
+        if(omsc != null) {
+            return (Long)getFieldValue(omsc, nmsc_inhabitedticks, zero);
+        }
+        return 0;
+    }
+
+    /** 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) {
+        if (nmst_getposition == null) {
+            return (Integer)getFieldValue(te, nmst_x, 0);
+        }
+        else {
+            Object pos = callMethod(te, nmst_getposition, nullargs, null);
+            return (Integer) callMethod(pos, nmsbp_getx, nullargs, null);
+        }
+    }
+    /**
+     * Get Y coordinate of tile entity
+     */
+    public int getTileEntityY(Object te) {
+        if (nmst_getposition == null) {
+            return (Integer)getFieldValue(te, nmst_y, 0);
+        }
+        else {
+            Object pos = callMethod(te, nmst_getposition, nullargs, null);
+            return (Integer) callMethod(pos, nmsbp_gety, nullargs, null);
+        }
+    }
+    /**
+     * Get Z coordinate of tile entity
+     */
+    public int getTileEntityZ(Object te) {
+        if (nmst_getposition == null) {
+            return (Integer)getFieldValue(te, nmst_z, 0);
+        }
+        else {
+            Object pos = callMethod(te, nmst_getposition, nullargs, null);
+            return (Integer) callMethod(pos, nmsbp_getz, nullargs, null);
+        }
+    }
+    /**
+     * 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;
+    }
+    /**
+     * Get list of online players
+     */
+    public Player[] getOnlinePlayers() {
+        Object players = callMethod(Bukkit.getServer(), server_getonlineplayers, nullargs, null);
+        if (players instanceof Player[]) {  /* Pre 1.7.10 */
+            return (Player[]) players;
+        }
+        else {
+            @SuppressWarnings("unchecked")
+            Collection<? extends Player> p = (Collection<? extends Player>) players;
+            return p.toArray(new Player[0]);
+        }
+    }
+    /**
+     * Get player health
+     */
+    @Override
+    public double getHealth(Player p) {
+        Object health = callMethod(p, player_gethealth, nullargs, null);
+        if (health instanceof Integer) {
+            return (Integer) health;
+        }
+        else {
+            return ((Double) health).intValue();
+        }
+    }
+
+}

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

@@ -0,0 +1,445 @@
+package org.dynmap.bukkit;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+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.bukkit.entity.Player;
+
+public class BukkitVersionHelperGlowstone extends BukkitVersionHelper {
+    private Method rawbiome;
+    private Method server_getonlineplayers;
+    
+    public BukkitVersionHelperGlowstone() {
+        try {
+            Class<?> c = Class.forName("net.glowstone.GlowChunkSnapshot");
+            rawbiome = c.getMethod("getRawBiomes", new Class[0]);
+
+            /** Server */
+            server_getonlineplayers = Server.class.getMethod("getOnlinePlayers", new Class[0]);
+        } catch (SecurityException e) {
+        } catch (NoSuchMethodException e) {
+        } catch (ClassNotFoundException e) {
+        }
+        if ((rawbiome == null) && (server_getonlineplayers == null)) {
+            throw new IllegalArgumentException("Error initializing dynmap - Glowstone version incompatible!");
+        }
+    }
+    
+    @Override
+    public Object[] getBiomeBaseList() {
+        return new Object[0];
+    }
+
+    @Override
+    public float getBiomeBaseTemperature(Object bb) {
+        return 0;
+    }
+
+    @Override
+    public float getBiomeBaseHumidity(Object bb) {
+        return 0;
+    }
+
+    @Override
+    public String getBiomeBaseIDString(Object bb) {
+        return "";
+    }
+
+    @Override
+    public int getBiomeBaseID(Object bb) {
+        if (bb != null) 
+            return (Integer) bb;
+        else
+            return 0;
+    }
+
+    @Override
+    public Object getUnloadQueue(World world) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean isInUnloadQueue(Object unloadqueue, int x, int z) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public Object[] getBiomeBaseFromSnapshot(ChunkSnapshot css) {
+        Integer b[] = new Integer[256];
+        byte[] rb = null;
+        try {
+            rb = (byte[]) rawbiome.invoke(css, new Object[0]);
+        } catch (IllegalArgumentException e) {
+        } catch (IllegalAccessException e) {
+        } catch (InvocationTargetException e) {
+        }
+        if (rb != null) {
+            for (int i = 0; i < 256; i++) {
+                b[i] = Integer.valueOf(255 & (int)rb[i]);
+            }
+        }
+        return b;
+    }
+
+    @Override
+    public long getInhabitedTicks(Chunk c) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public Map getTileEntitiesForChunk(Chunk c) {
+        // TODO Auto-generated method stub
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public int getTileEntityX(Object te) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getTileEntityY(Object te) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public int getTileEntityZ(Object te) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public Object readTileEntityNBT(Object te) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Object getFieldValue(Object nbt, String field) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void unloadChunkNoSave(World w, Chunk c, int cx, int cz) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public String[] getBlockShortNames() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    private static final String[] bnames = {
+       "Ocean",
+       "Plains",
+       "Desert",
+       "Extreme Hills",
+       "Forest",
+       "Taiga",
+       "Swampland",
+       "River",
+       "Hell",
+       "Sky",
+       "FrozenOcean",
+       "FrozenRiver",
+       "Ice Plains",
+       "Ice Mountains",
+       "MushroomIsland",
+       "MushroomIslandShore",
+       "Beach",
+       "DesertHills",
+       "ForestHills",
+       "TaigaHills",
+       "Extreme Hills Edge",
+       "Jungle",
+       "JungleHills",
+       "JungleEdge",
+       "Deep Ocean",
+       "Stone Beach",
+       "Cold Beach",
+       "Birch Forest",
+       "Birch Forest Hills",
+       "Roofed Forest",
+       "Cold Taiga",
+       "Cold Taiga Hills",
+       "Mega Taiga",
+       "Mega Taiga Hills",
+       "Extreme Hills+",
+       "Savanna",
+       "Savanna Plateau",
+       "Mesa",
+       "Mesa Plateau F",
+       "Mesa Plateau",
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       "Sunflower Plains",
+       "Desert M",
+       "Extreme Hills M",
+       "Flower Forest",
+       "Taiga M",
+       "Swampland M",
+       null,
+       null,
+       null,
+       null,
+       null,
+       "Ice Plains Spikes",
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       "Jungle M",
+       null,
+       "JungleEdge M",
+       null,
+       null,
+       null,
+       "Birch Forest M",
+       "Birch Forest Hills M",
+       "Roofed Forest M",
+       "Cold Taiga M",
+       null,
+       "Mega Spruce Taiga",
+       "Mega Spruce Taiga",
+       "Extreme Hills+ M",
+       "Savanna M",
+       "Savanna Plateau M",
+       "Mesa (Bryce)",
+       "Mesa Plateau F M",
+       "Mesa Plateau M",
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null,
+       null
+    };
+
+    @Override
+    public String[] getBiomeNames() {
+        return bnames;
+    }
+
+    @Override
+    public int[] getBlockMaterialMap() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /**
+     * Get list of online players
+     */
+    public Player[] getOnlinePlayers() {
+        Object players;
+        try {
+            players = server_getonlineplayers.invoke(Bukkit.getServer(), new Object[0]);
+            if (players instanceof Player[]) {  /* Pre 1.7.10 */
+                return (Player[]) players;
+            }
+            else {
+                @SuppressWarnings("unchecked")
+                Collection<? extends Player> p = (Collection<? extends Player>) players;
+                return p.toArray(new Player[0]);
+            }
+        } catch (IllegalArgumentException e) {
+        } catch (IllegalAccessException e) {
+        } catch (InvocationTargetException e) {
+        }
+        return new Player[0];
+    }
+
+    @Override
+    public double getHealth(Player p) {
+        return p.getHealth();
+    }
+
+}

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

@@ -2,28 +2,73 @@ package org.dynmap.bukkit;
 /**
  * Bukkit specific implementation of DynmapWorld
  */
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.Arrays;
 import java.util.List;
 
+import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.dynmap.DynmapChunk;
 import org.dynmap.DynmapLocation;
 import org.dynmap.DynmapWorld;
 import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.Polygon;
+import org.dynmap.utils.TileFlags;
 
 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);
+        // Generate non-default environment lighting table
+        switch (env) {
+            case NETHER:
+                {
+                    float f = 0.1F;
+                    for (int i = 0; i <= 15; ++i) {
+                        float f1 = 1.0F - (float)i / 15.0F;
+                        this.setBrightnessTableEntry(i,  (1.0F - f1) / (f1 * 3.0F + 1.0F) * (1.0F - f) + f);
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    /**
+     * 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 +78,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 +125,45 @@ 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) {
+            if ((y >= 0) && (y < this.worldheight)) {
+                return world.getBlockAt(x, y, z).getLightLevel();
+            }
+            return 0;
+        }
+        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) {
+            if ((y >= 0) && (y < this.worldheight)) {
+                return world.getBlockAt(x, y, z).getLightFromSky();
+            }
+            else {
+                return 15;
+            }
+        }
+        else {
+            return -1;
+        }
     }
     /**
      * Get world environment ID (lower case - normal, the_end, nether)
@@ -91,12 +177,74 @@ 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() {
         return world;
     }
+    
+    // Return false if unimplemented
+    @Override
+    public int getChunkMap(TileFlags map) {
+        map.clear();
+        if (world == null) return -1;
+        int cnt = 0;
+        // Mark loaded chunks
+        for(Chunk c : world.getLoadedChunks()) {
+            map.setFlag(c.getX(), c.getZ(), true);
+            cnt++;
+        }
+        File f = world.getWorldFolder();
+        File regiondir = new File(f, "region");
+        File[] lst = regiondir.listFiles();
+        if(lst != null) {
+            byte[] hdr = new byte[4096];
+            for(File rf : lst) {
+                if(!rf.getName().endsWith(".mca")) {
+                    continue;
+                }
+                String[] parts = rf.getName().split("\\.");
+                if((!parts[0].equals("r")) && (parts.length != 4)) continue;
+                
+                RandomAccessFile rfile = null;
+                int x = 0, z = 0;
+                try {
+                    x = Integer.parseInt(parts[1]);
+                    z = Integer.parseInt(parts[2]);
+                    rfile = new RandomAccessFile(rf, "r");
+                    rfile.read(hdr, 0, hdr.length);
+                } catch (IOException iox) {
+                    Arrays.fill(hdr,  (byte)0);
+                } catch (NumberFormatException nfx) {
+                    Arrays.fill(hdr,  (byte)0);
+                } finally {
+                    if(rfile != null) {
+                        try { rfile.close(); } catch (IOException iox) {}
+                    }
+                }
+                for (int i = 0; i < 1024; i++) {
+                    int v = hdr[4*i] | hdr[4*i + 1] | hdr[4*i + 2] | hdr[4*i + 3];
+                    if (v == 0) continue;
+                    int xx = (x << 5) | (i & 0x1F);
+                    int zz = (z << 5) | ((i >> 5) & 0x1F);
+                    if (!map.setFlag(xx, zz, true)) {
+                        cnt++;
+                    }
+                }
+            }
+        }
+        return cnt;
+    }
+    @Override
+    public Polygon getWorldBorder() {
+        return DynmapPlugin.plugin.getWorldBorder(world);
+    }
 }

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

@@ -3,20 +3,29 @@ package org.dynmap.bukkit;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
+import java.lang.ref.SoftReference;
 import java.util.IdentityHashMap;
 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 long inhabitedTicks;
+        public DynIntHashMap tileData;
+    };
+
     private CacheHashMap snapcache;
-    private ReferenceQueue<ChunkSnapshot> refqueue;
+    private ReferenceQueue<SnapshotRec> refqueue;
     private long cache_attempts;
     private long cache_success;
-
+    private boolean softref;
+    
     private static class CacheRec {
-        WeakReference<ChunkSnapshot> ref;
+        Reference<SnapshotRec> ref;
         boolean hasbiome;
         boolean hasrawbiome;
         boolean hasblockdata;
@@ -26,12 +35,12 @@ public class SnapshotCache {
     @SuppressWarnings("serial")
     public class CacheHashMap extends LinkedHashMap<String, CacheRec> {
         private int limit;
-        private IdentityHashMap<WeakReference<ChunkSnapshot>, String> reverselookup;
+        private IdentityHashMap<Reference<SnapshotRec>, String> reverselookup;
 
         public CacheHashMap(int lim) {
             super(16, (float)0.75, true);
             limit = lim;
-            reverselookup = new IdentityHashMap<WeakReference<ChunkSnapshot>, String>();
+            reverselookup = new IdentityHashMap<Reference<SnapshotRec>, String>();
         }
         protected boolean removeEldestEntry(Map.Entry<String, CacheRec> last) {
             boolean remove = (size() >= limit);
@@ -45,9 +54,10 @@ public class SnapshotCache {
     /**
      * Create snapshot cache
      */
-    public SnapshotCache(int max_size) {
+    public SnapshotCache(int max_size, boolean softref) {
         snapcache = new CacheHashMap(max_size);
-        refqueue = new ReferenceQueue<ChunkSnapshot>();
+        refqueue = new ReferenceQueue<SnapshotRec>();
+        this.softref = softref;
     }
     private String getKey(String w, int cx, int cz) {
         return w + ":" + cx + ":" + cz;
@@ -83,11 +93,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 +122,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 +131,10 @@ public class SnapshotCache {
         rec.hasbiome = biome;
         rec.hasrawbiome = biomeraw;
         rec.hashighesty = highesty;
-        rec.ref = new WeakReference<ChunkSnapshot>(ss, refqueue);
+        if (softref)
+            rec.ref = new SoftReference<SnapshotRec>(ss, refqueue);
+        else
+            rec.ref = new WeakReference<SnapshotRec>(ss, refqueue);
         CacheRec prevrec = snapcache.put(key, rec);
         if(prevrec != null) {
             snapcache.reverselookup.remove(prevrec.ref);
@@ -132,7 +145,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/java/org/dynmap/bukkit/SpoutPluginBlocks.java

@@ -1,248 +0,0 @@
-package org.dynmap.bukkit;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-
-import org.bukkit.Material;
-import org.bukkit.plugin.Plugin;
-import org.dynmap.DynmapCore;
-import org.dynmap.Log;
-import org.getspout.spoutapi.block.design.BlockDesign;
-import org.getspout.spoutapi.block.design.GenericBlockDesign;
-import org.getspout.spoutapi.block.design.GenericCuboidBlockDesign;
-import org.getspout.spoutapi.block.design.Texture;
-import org.getspout.spoutapi.material.CustomBlock;
-import org.getspout.spoutapi.material.MaterialData;
-
-/**
- * Handler for pulling spout-defined custom blocks into dynmap
- * 
- * Generates and maintains custom render data file (renderdata/spout-texture.txt) and
- * directory of downloaded image files (texturepacks/standard/spout/plugin.blockid.png)
- */
-public class SpoutPluginBlocks {
-    private Field textXPosField;    /* float[][] textXPos */
-    private Field textYPosField;    /* float[][] textYPos */
-
-    private boolean initSpoutAccess() {
-        boolean success = false;
-        try {
-            textXPosField = GenericBlockDesign.class.getDeclaredField("textXPos");
-            textXPosField.setAccessible(true);
-            textYPosField = GenericBlockDesign.class.getDeclaredField("textYPos");
-            textYPosField.setAccessible(true);
-            success = true;
-        } catch (NoSuchFieldException nsfx) {
-            Log.severe("Cannot access needed Spout custom block fields!");
-            Log.severe(nsfx);
-        }
-        return success;
-    }
-    private void addDefaultBlock(StringBuilder sb, CustomBlock blk) {
-        if(blk.isOpaque())
-            sb.append("block:id=" + blk.getCustomId() + ",data=*,allfaces=1\n");
-        else
-            sb.append("block:id=" + blk.getCustomId() + ",allfaces=12049,transparency=TRANSPARENT\n");
-    }
-    
-    private static String fixIDString(String id) {
-        StringBuilder sb = new StringBuilder();
-        int len = id.length();
-        sb.setLength(len);
-        for(int i = 0; i < len; i++) {
-            char c = id.charAt(i);
-            if(Character.isJavaIdentifierStart(c)) {
-                sb.setCharAt(i, c);
-            }
-            else {
-                sb.setCharAt(i, '_');
-            }
-        }
-        return sb.toString();
-    }
-    
-    /* Process spout blocks - return true if something changed */
-    public boolean processSpoutBlocks(DynmapPlugin plugin, DynmapCore core) {
-        /* First, see if any spout plugins that need to be enabled */
-        for(Plugin p : plugin.getServer().getPluginManager().getPlugins()) {
-            List<String> dep = p.getDescription().getDepend();
-            if((dep != null) && (dep.contains("Spout"))) {
-                Log.info("Found Spout plugin: " + p.getName());
-                if(p.isEnabled() == false) {
-                    plugin.getPluginLoader().enablePlugin(p);
-                }
-            }
-        }
-        
-        File datadir = core.getDataFolder();
-        if(textYPosField == null) {
-            if(initSpoutAccess() == false)
-                return false;
-        }
-        HashMap<String, String> texturelist = new HashMap<String, String>();
-        boolean use_existing_texture = core.configuration.getBoolean("spout/use-existing-textures", true);
-        
-        int cnt = 0;
-        File f = new File(datadir, "texturepacks/standard/spout");
-        if(f.exists() == false)
-            f.mkdirs();
-        List<CustomBlock> blks = new ArrayList<CustomBlock>();
-        CustomBlock[] cb = MaterialData.getCustomBlocks();
-        /* Build new texture file as string */
-        StringBuilder sb = new StringBuilder();
-        /* Loop through blocks - try to freshen files, if needed */
-        for(CustomBlock b : cb) {
-            BlockDesign bd = b.getBlockDesign();
-            String blkid = bd.getTexturePlugin() + "." + fixIDString(b.getName());
-            /* If not GenericCubiodBlockDesign, we don't handle it */
-            if((bd instanceof GenericCuboidBlockDesign) == false) {
-                Log.info("Block " + blkid + " not suppored - only cubiod blocks");
-                addDefaultBlock(sb, b);
-                continue;
-            }
-            /* Get texture info */
-            Texture txt = bd.getTexture();
-            int w = txt.getWidth();
-            int h = txt.getHeight();
-            int sz = txt.getSpriteSize();
-            GenericCuboidBlockDesign gbd = (GenericCuboidBlockDesign)bd;
-            int[] txtidx = new int[6];
-            /* Fetch quad fields - figure out which texture for which side */
-            try {
-                float[][] textXPos = (float[][])textXPosField.get(gbd);
-                float[][] textYPos = (float[][])textYPosField.get(gbd);
-                /* Quads on cuboid are bottom, west, south, east, north, top */
-                for(int i = 0; i < 6; i++) {
-                    float minx = 1.0F;
-                    float miny = 1.0F;
-                    for(int j = 0; j < 4; j++) {
-                        minx = Math.min(minx, textXPos[i][j]);
-                        miny = Math.min(miny, textYPos[i][j]);
-                    }
-                    txtidx[i] = (int)((minx * w)/sz) + (w/sz)*(int)((miny * h)/sz); 
-                }
-            } catch (Exception iax) {
-                addDefaultBlock(sb, b);
-                continue;
-            }
-            String txname = bd.getTexureURL();
-            
-            String txtid = texturelist.get(txname);    /* Get texture */
-            if(txtid == null) { /* Not found yet */
-                File imgfile = new File(f, blkid + ".png");
-                
-                /* If not reusing loaded textures OR not previously loaded */
-                if((!use_existing_texture) || (!imgfile.exists())) {
-                    BufferedImage img = null;
-                    boolean urlloaded = false;
-                    try {
-                        URL url = new URL(txname);
-                        img = ImageIO.read(url);    /* Load skin for player */
-                        urlloaded = true;
-                    } catch (IOException iox) {
-                        if(txname.startsWith("http") == false) {   /* Not URL - try file */
-                            File tf = new File(txname);
-                            if(tf.exists() == false) {
-                                /* Horrible hack - try to find temp file (some SpoutMaterials versions) */
-                                try {
-                                    File tmpf = File.createTempFile("dynmap", "test");
-
-                                    tf = new File(tmpf.getParent(), txname);
-                                    tmpf.delete();
-                                } catch (IOException iox2) {}
-                            }
-                            if(tf.exists()) {
-                                try {
-                                    img = ImageIO.read(tf);
-                                    urlloaded = true;
-                                } catch (IOException iox3) {
-                                }
-                            }
-                        }
-                        if(img == null) {
-                            Log.severe("Error loading texture for custom block '" + blkid + "' (" + b.getCustomId() + ") from " + txname + "(" + iox.getMessage() + ")");
-                            if(imgfile.exists()) {
-                                try {
-                                    img = ImageIO.read(imgfile);    /* Load existing */
-                                    Log.info("Loaded cached texture file for " + blkid);
-                                } catch (IOException iox2) {
-                                    Log.severe("Error loading cached texture file for " + blkid + " - " + iox2.getMessage());
-                                }
-                            }
-                        }
-                    }
-                    if(img != null) {
-                        try {
-                            if(urlloaded)
-                                ImageIO.write(img, "png", imgfile);
-                        } catch (IOException iox) {
-                            Log.severe("Error writing " + blkid + ".png");
-                        } finally {
-                            img.flush();
-                        }
-                    }
-                }
-                if(imgfile.exists()) {  /* If exists now, log it */
-                    String tfid = "txtid" + texturelist.size();
-                    sb.append("texturefile:id=" + tfid + ",filename=spout/" + blkid + ".png,xcount=" + w/sz + ",ycount=" + h/sz + "\n");                                   
-                    texturelist.put(txname, tfid);
-                }
-            }
-            String txfileid = texturelist.get(txname);
-            if(txfileid != null) {
-                blks.add(b);
-                    
-                sb.append("block:id=" + b.getCustomId() + ",data=*,bottom=" + txtidx[0] + ",west=" +txtidx[1] + ",south=" + txtidx[2] + ",east=" + txtidx[3] + ",north="+txtidx[4]+",top="+txtidx[5]);
-                if(b.getBlockId() == Material.GLASS.getId())
-                    sb.append(",transparency=TRANSPARENT");
-                sb.append(",txtid=" + txfileid + "\n");
-                cnt++;
-            }
-        }
-        String rslt = sb.toString();
-        /* Now, generate spout texture file - see if changed */
-        File st = new File(datadir, "renderdata/spout-texture.txt");
-        if(st.exists()) {
-            FileReader fr = null;
-            StringBuilder sbold = new StringBuilder();
-            try {
-                fr = new FileReader(st);
-                int len;
-                char[] buf = new char[512];
-                while((len = fr.read(buf)) > 0) {
-                    sbold.append(buf, 0, len);
-                }
-            } catch (IOException iox) {
-            } finally {
-                if(fr != null) { try { fr.close(); } catch (IOException iox) {} }
-            }
-            /* If same, no changes */
-            if(sbold.equals(rslt)) {
-                Log.info("Loaded " + cnt + " Spout custom blocks");
-                return false;
-            }
-        }
-        FileWriter fw = null;
-        try {
-            fw = new FileWriter(st);
-            fw.write(rslt);
-        } catch (IOException iox) {
-            Log.severe("Error opening spout texture file - " + st.getPath());
-            return false;
-        } finally {
-            if(fw != null) { try { fw.close(); } catch (IOException iox) {} }
-        }
-        Log.info("Loaded " + cnt + " Spout custom blocks");
-        return false;
-    }
-}

src/main/java/org/dynmap/bukkit/permissions/BukkitPermissions.java

@@ -39,7 +39,7 @@ public class BukkitPermissions implements PermissionProvider {
     }
     @Override
     public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
-        Player p = Bukkit.getPlayerExact(name);
+        Player p = Bukkit.getPlayerExact(player);
         HashSet<String> hasperms = null;
         if (p != null) {
             hasperms = new HashSet<String>();

src/main/java/org/dynmap/bukkit/permissions/GroupManagerPermissions.java

@@ -0,0 +1,66 @@
+package org.dynmap.bukkit.permissions;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Server;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.dynmap.Log;
+import org.anjocaido.groupmanager.GroupManager;
+import org.anjocaido.groupmanager.dataholder.worlds.WorldsHolder;
+import org.anjocaido.groupmanager.permissions.AnjoPermissionsHandler;
+
+public class GroupManagerPermissions implements PermissionProvider {
+    String name;
+    GroupManager gm;
+    WorldsHolder wh;
+
+    public static GroupManagerPermissions create(Server server, String name) {
+        Plugin permissionsPlugin = server.getPluginManager().getPlugin("GroupManager");
+        if (permissionsPlugin == null)
+            return null;
+        server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        Log.info("Using GroupManager " + permissionsPlugin.getDescription().getVersion() + " for access control");
+        return new GroupManagerPermissions(name, permissionsPlugin);
+    }
+
+    public GroupManagerPermissions(String name, Plugin permissionsPlugin) {
+        this.name = name;
+        gm = (GroupManager)permissionsPlugin;
+        wh = gm.getWorldsHolder();
+    }
+
+    @Override
+    public boolean has(CommandSender sender, String permission) {        
+        Player player = sender instanceof Player ? (Player) sender : null;
+        boolean rslt = (player != null) ? gm.getWorldsHolder().getDefaultWorld().getPermissionsHandler().permission(player, name + "." + permission) : true;
+        return rslt;
+    }
+    
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        HashSet<String> hasperms = new HashSet<String>();
+        AnjoPermissionsHandler apm = gm.getWorldsHolder().getDefaultWorld().getPermissionsHandler();
+        if (apm != null) {
+            for (String pp : perms) {
+                if (apm.permission(player, name + "." + pp)) {
+                    hasperms.add(pp);
+                }
+            }
+        }
+        return hasperms;
+    }
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        AnjoPermissionsHandler apm = gm.getWorldsHolder().getDefaultWorld().getPermissionsHandler();
+        boolean rslt = false;
+        if(apm != null) {
+            rslt = apm.permission(player, name + "." + perm);
+        }
+        return rslt;
+    }
+}

src/main/java/org/dynmap/bukkit/permissions/PEXPermissions.java

@@ -24,8 +24,9 @@ public class PEXPermissions implements PermissionProvider {
         server.getPluginManager().enablePlugin(permissionsPlugin);
         if(permissionsPlugin.isEnabled() == false)
             return null;
-        if(PermissionsEx.isAvailable() == false)
-            return null;
+        //Broken in new dev builds, apparently
+        //if(PermissionsEx.isAvailable() == false)
+        //    return null;
         Log.info("Using PermissionsEx " + permissionsPlugin.getDescription().getVersion() + " for access control");
         return new PEXPermissions(name);
     }

src/main/resources/configuration.txt

@@ -1,16 +1,39 @@
 # All paths in this configuration file are relative to Dynmap's data-folder: minecraft_server/plugins/dynmap/
 
 # All map templates are defined in the templates directory
-# The 'classic' FlatMap and KzedMap templates are used, which can be found in normal.txt, nether.txt, and skylands.txt
-#  To use these, do not set deftemplatesuffix (make sure deftemplatesuffix is commented, below)
-# To use the HDMap very-low-res map templates as world defaults (normal-vlowres, nether-vlowres and skylands-vlowres), set value to vlowres
-#   The definitions of these templates are in normal-vlowres.txt, nether-vlowres.txt, and skylands-vlowres.txt
-# To use the HDMap low-res map templates as world defaults (normal-lowres, nether-lowres and skylands-lowres), set value to lowres
-#   The definitions of these templates are in normal-lowres.txt, nether-lowres.txt, and skylands-lowres.txt
-# To use the HDMap hi-res map templates (these can take a VERY long time for initial fullrender), set value to hires
-#   The definitions of these templates are in normal-hires.txt, nether-hires.txt, and skylands-hires.txt
-deftemplatesuffix: vlowres
+# To use the HDMap very-low-res (2 ppb) map templates as world defaults, set value to vlowres
+#   The definitions of these templates are in normal-vlowres.txt, nether-vlowres.txt, and the_end-vlowres.txt
+# To use the HDMap low-res (4 ppb) map templates as world defaults, set value to lowres
+#   The definitions of these templates are in normal-lowres.txt, nether-lowres.txt, and the_end-lowres.txt
+# To use the HDMap hi-res (16 ppb) map templates (these can take a VERY long time for initial fullrender), set value to hires
+#   The definitions of these templates are in normal-hires.txt, nether-hires.txt, and the_end-hires.txt
+# To use the HDMap low-res (4 ppb) map templates, with support for boosting resolution selectively to hi-res (16 ppb), set value to low_boost_hi
+#   The definitions of these templates are in normal-low_boost_hi.txt, nether-low_boost_hi.txt, and the_end-low_boost_hi.txt
+# To use the HDMap hi-res (16 ppb) map templates, with support for boosting resolution selectively to vhi-res (32 ppb), set value to hi_boost_vhi
+#   The definitions of these templates are in normal-hi_boost_vhi.txt, nether-hi_boost_vhi.txt, and the_end-hi_boost_vhi.txt
+# To use the HDMap hi-res (16 ppb) map templates, with support for boosting resolution selectively to xhi-res (64 ppb), set value to hi_boost_xhi
+#   The definitions of these templates are in normal-hi_boost_xhi.txt, nether-hi_boost_xhi.txt, and the_end-hi_boost_xhi.txt
+deftemplatesuffix: hires
 
+# Map storage scheme: only uncomment one 'type' value
+#  filetree: classic and default scheme: tree of files, with all map data under the directory indicated by 'tilespath' setting
+#  sqlite: single SQLite database file (this can get VERY BIG), located at 'dbfile' setting (default is file dynmap.db in data directory)
+#  mysql: MySQL database, at hostname:port in database, accessed via userid with password
+storage:
+  # Filetree storage (standard tree of image files for maps)
+  type: filetree
+  # SQLite db for map storage (uses dbfile as storage location)
+  #type: sqlite
+  #dbfile: dynmap.db
+  # MySQL DB for map storage (at 'hostname':'port' in database 'database' using user 'userid' password 'password' and table prefix 'prefix'
+  #type: mysql
+  #hostname: localhost
+  #port: 3306
+  #database: dynmap
+  #userid: dynmap
+  #password: dynmap
+  #prefix: ""
+  
 components:
   - class: org.dynmap.ClientConfigurationComponent
   
@@ -22,6 +45,8 @@ components:
     hidewebchatip: false
     trustclientname: false
     includehiddenplayers: false
+    # (optional) if true, color codes in player display names are used
+    use-name-colors: false
     # (optional) if true, player login IDs will be used for web chat when their IPs match
     use-player-login-ip: true
     # (optional) if use-player-login-ip is true, setting this to true will cause chat messages not matching a known player IP to be ignored
@@ -42,14 +67,19 @@ 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
+    # If true, player names are not shown on map, chat, list
+    hidenames: false
   #- class: org.dynmap.JsonFileClientUpdateComponent
   #  writeinterval: 1
   #  sendhealth: true
   #  sendposition: true
-  #  allowwebchat: false
+  #  allowwebchat: true
   #  webchat-interval: 5
   #  hidewebchatip: false
   #  includehiddenplayers: false
+  #  use-name-colors: false
   #  use-player-login-ip: false
   #  require-player-login-ip: false
   #  block-banned-player-chat: true
@@ -62,6 +92,8 @@ components:
   #  webchat-permissions: false
   #  # Limit length of single chat messages
   #  chatlengthlimit: 256
+  #  hide-if-invisiblity-potion: true
+  #  hidenames: false
    
   - class: org.dynmap.SimpleWebChatComponent
     allowchat: true
@@ -73,6 +105,8 @@ components:
     type: markers
     showlabel: false
     enablesigns: false
+    # Default marker set for sign markers
+    default-sign-set: markers
     # (optional) add spawn point markers to standard marker layer
     showspawn: true
     spawnicon: world
@@ -91,6 +125,8 @@ components:
     spawnbedhidebydefault: true
     spawnbedminzoom: 0
     spawnbedformat: "%name%'s bed"
+    # (optional) show world border (vanilla 1.8+)
+    showworldborder: true
     
   - class: org.dynmap.ClientComponent
     type: chat
@@ -131,7 +167,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
@@ -180,9 +216,20 @@ usenormalthreadpriority: true
 # Save and restore pending tile renders - prevents their loss on server shutdown or /reload
 saverestorepending: true
 
+# Save period for pending jobs (in seconds): periodic saving for crash recovery of jobs
+save-pending-period: 900
+
 # Zoom-out tile update period - how often to scan for and process tile updates into zoom-out tiles (in seconds)
 zoomoutperiod: 30
 
+# Control whether zoom out tiles are validated on startup (can be needed if zoomout processing is interrupted, but can be expensive on large maps)
+initial-zoomout-validate: true
+
+# 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
 
@@ -193,16 +240,34 @@ enabletilehash: true
 #better-grass: true
 
 # Optional - enable smooth lighting by default on all maps supporting it (can be set per map as lighting option)
-smooth-lighting: false
+smooth-lighting: true
 
+# Optional - use world provider lighting table (good for custom worlds with custom lighting curves, like nether)
+#   false=classic Dynmap lighting curve
+use-brightness-table: true
+
+# Optional - render specific block IDs using the texures and models of another block ID: can be used to hide/disguise specific
+#  blocks (e.g. make ores look like stone, hide chests) or to provide simple support for rendering unsupported custom blocks
+block-id-alias:
+#    "14": 1
+#    "15": 1
+#    "16": 1
+  
 # Default image format for HDMaps (png, jpg, jpg-q75, jpg-q80, jpg-q85, jpg-q90, jpg-q95, jpg-q100)
 # Has no effect on maps with explicit format settings
 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
+
+# ctm-support: if true, Connected Texture Mod (CTM) in texture packs is enabled (default)
+ctm-support: true
+# custom-colors-support: if true, Custom Colors in texture packs is enabled (default)
+custom-colors-support: true
 
 # Control loading of player faces (if set to false, skins are never fetched)
 #fetchskins: false
@@ -211,44 +276,13 @@ correct-water-lighting: true
 #refreshskins: false
 
 # Customize URL used for fetching player skins (%player% is macro for name)
-skin-url: "http://s3.amazonaws.com/MinecraftSkins/%player%.png"
+skin-url: "http://skins.minecraft.net/MinecraftSkins/%player%.png"
 
 # Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south)
 #   default is 'newrose' (preserve pre-1.0 maps, rotate rose)
 #   'newnorth' is used to rotate maps and rose (requires fullrender of any HDMap map - same as 'newrose' for FlatMap or KzedMap)
 compass-mode: newnorth
 
-### Mod block support ###
-# Enable Industrial Craft 2 block rendering support (core, Advanced Machines, Charging Bench, Power Converters, Compact Solars, Nuclear Control)
-#ic2-support: true
-#ic2-advancesmachines-support: true
-#ic2-chargingbench-support: true
-#ic2-powerconverters-support: true
-#ic2-compactsolars-support: true
-#ic2-nuclearcontrol-support: true
-# Enable BuildCraft block rendering support
-#buildcraft-support: true
-# Enable RedPower2 block rendering support
-#redpower2-support: true
-# Enable NetherOres block rendering support
-#netherores-support: true
-# Enable RailCraft block rendering support
-#railcraft-support: true
-# Enable Kaevator's Superslopes block rendering support
-#superslopes-support: true
-# Enabled ComputerCraft block rendering support
-#computercraft-support: true
-# Enabled LC Trees++ block rendering support
-#lctrees-support: true
-# Enable Forestry block rending support
-#forestry-support: true
-# Enable IronCheck block rendering support
-#ironchest-support: true
-# Enable TubeCraft block rendering support
-#tubecraft-support: true
-# Enable Ender Storage block rendering support
-#enderstorage-support: true
-
 render-triggers:
   #- playermove
   #- playerjoin
@@ -277,8 +311,12 @@ tilespath: web/tiles
 # The path where the web-files are located.
 webpath: web
 
+# The path were the /dynmapexp command exports OBJ ZIP files
+exportpath: export
+
 # 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
+# If not set, uses same setting as server in server.properties (or 0.0.0.0 if not specified)
+#webserver-bindaddress: 0.0.0.0
 
 # The TCP-port the webserver will listen on.
 webserver-port: 8123
@@ -314,14 +352,29 @@ progressloginterval: 100
 # Interval the browser should poll for updates.
 updaterate: 2000
 
-# If nonzero, server will pause fullrender/radiusrender processing when 'fullrenderplayerlimit' or more user's are logged in
+# If nonzero, server will pause fullrender/radiusrender processing when 'fullrenderplayerlimit' or more users are logged in
 fullrenderplayerlimit: 0
+# If nonzero, server will pause update render processing when 'updateplayerlimit' or more users are logged in
+updateplayerlimit: 0
+# Target limit on server thread use - msec per tick
+per-tick-time-limit: 50
+# If TPS of server is below this setting, update renders processing is paused
+update-min-tps: 18.0
+# If TPS of server is below this setting, full/radius renders processing is paused
+fullrender-min-tps: 18.0
+# If TPS of server is below this setting, zoom out processing is paused
+zoomout-min-tps: 18.0
 
 showplayerfacesinmenu: true
 
 # Control whether players that are hidden or not on current map are grayed out (true=yes)
 grayplayerswhenhidden: true
 
+# Use player permissions to order player list: first to last, players are ordered by first permission listed that they have
+# That is, anyone with first listed permission goes before anyone with second, etc, with users with none of the nodes going last
+player-sort-permission-nodes:
+  - bukkit.command.op
+  
 # Set sidebaropened: 'true' to pin menu sidebar opened permanently, 'pinned' to default the sidebar to pinned, but allow it to unpin
 #sidebaropened: true
 
@@ -330,8 +383,15 @@ 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"
+  
+# Join/quit message format for web chat: set to "" to disable notice on web UI
 joinmessage: "%playername% joined"
 quitmessage: "%playername% quit"
+
 spammessage: "You may only chat once every %interval% seconds."
 # format for messages from web: %playername% substitutes sender ID (typically IP), %message% includes text
 webmsgformat: "&color;2[WEB] %playername%: &color;f%message%"
@@ -353,12 +413,20 @@ 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
+
+# If true, coordinates will be rounded
+round-coordinates: true
+
 # Messages to customize
 msg:
     maptypes: "Map Types"
     players: "Players"
     chatrequireslogin: "Chat Requires Login"
     chatnotallowed: "You are not permitted to send chat messages"
+    hiddennamejoin: "Player joined"
+    hiddennamequit: "Player quit"
 
 # URL for client configuration (only need to be tailored for proxies or other non-standard configurations)
 url:
@@ -386,6 +454,19 @@ spout:
     # to clean cached textures and force reload on next startup)
     use-existing-textures: true
     
+# Customization commands - allows scripts to be run before/after certain events
+custom-commands:
+    image-updates:
+        # Command run just before any image file is written or updated: run with single parameter with fully qualified file name
+        preupdatecommand: ""
+        # Command run just after any image file is written or updated: run with single parameter with fully qualified file name
+        postupdatecommand: ""
+
+# Snapshot cache size, in chunks
+snapshotcachesize: 500
+# Snapshot cache uses soft references (true), else weak references (false)
+soft-ref-cache: true
+        
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false
@@ -393,3 +474,5 @@ verbose: false
 # Enables debugging.
 #debuggers:
 #  - class: org.dynmap.debug.LogDebugger
+# Debug: dump blocks missing render data
+dump-missing-blocks: false