CraftBukkit 1.9 compatibility

Remove duplicate removeEntities - Fixes #1838

pom.xml

@@ -79,31 +79,10 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 
 		</plugins>
 	</build>
 	<repositories>
-		<repository>
-			<releases>
-			</releases>
-			<snapshots>
-			</snapshots>
-			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/content/repositories/releases/</url>
-		</repository>
 		<repository>
 			<releases>
 			</releases>
@@ -122,7 +101,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.4.7-R1.0</version>
+			<version>1.7.10-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>us.dynmap</groupId>
@@ -162,5 +141,5 @@
 			<version>2.10.1</version>
 		</dependency>
 	</dependencies>
-	<version>2.0.0</version>
+	<version>2.3-SNAPSHOT</version>
 </project>

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

@@ -13,6 +13,7 @@ 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
@@ -87,10 +88,6 @@ public abstract class BukkitVersionHelper {
      * Test if normal chunk snapshot
      */
 //    public abstract boolean isCraftChunkSnapshot(ChunkSnapshot css);
-    /** 
-     * Remove entities from given chunk
-     */
-    public abstract void removeEntitiesFromChunk(Chunk c);
     /**
      * Get inhabited ticks count from chunk
      */
@@ -142,5 +139,9 @@ public abstract class BukkitVersionHelper {
     /**
      * Get player health
      */
-    public abstract int getHealth(Player p);
+    public abstract double getHealth(Player p);
+    /**
+     * Get world border
+     */
+    public Polygon getWorldBorder(World world) { return null; }
 }

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

@@ -5,12 +5,15 @@ 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
@@ -23,6 +26,12 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
     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() {
     }
@@ -54,16 +63,23 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
 
         /* Set up biomebase fields */
         biomebase = getNMSClass("net.minecraft.server.BiomeBase");
-        biomebasearray =  getNMSClass("[Lnet.minecraft.server.BiomeBase;");
-        biomebaselist = getPrivateField(biomebase, new String[] { "biomes" }, biomebasearray);
-        biomebasetemp = getField(biomebase, new String[] { "temperature", "F" }, float.class);
-        biomebasehumi = getField(biomebase, new String[] { "humidity", "G" }, float.class);
-        biomebaseidstring = getField(biomebase, new String[] { "y", "af" }, String.class);
-        biomebaseid = getField(biomebase, new String[] { "id" }, int.class);
+        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 = getField(nmsworld, new String[] { "chunkProviderServer" }, chunkprovserver);
+        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) {
@@ -80,12 +96,20 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
         }
         /** n.m.s.Chunk */
         nmschunk = getNMSClass("net.minecraft.server.Chunk");
-        nmsc_removeentities = getMethod(nmschunk, new String[] { "removeEntities" }, new Class[0]);
         nmsc_tileentities = getField(nmschunk, new String[] { "tileEntities" }, Map.class);
-        nmsc_inhabitedticks = getFieldNoFail(nmschunk, new String[] { "s", "q" }, long.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");
@@ -110,14 +134,22 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
 
         /** Tile entity */
         nms_tileentity = getNMSClass("net.minecraft.server.TileEntity");
-        nmst_readnbt = getMethod(nms_tileentity, new String[] { "b" }, new Class[] { nbttagcompound });
-        nmst_x = getField(nms_tileentity, new String[] { "x" }, int.class); 
-        nmst_y = getField(nms_tileentity, new String[] { "y" }, int.class); 
-        nmst_z = getField(nms_tileentity, new String[] { "z" }, int.class); 
+        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) {
-        this.removeEntitiesFromChunk(c);
         w.unloadChunk(cx, cz, false, false);
     }
     /**
@@ -219,4 +251,28 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
         }
         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

@@ -7,6 +7,7 @@ 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;
@@ -23,7 +24,8 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     private String obc_package; // Package used for org.bukkit.craftbukkit
     protected String nms_package; // Package used for net.minecraft.server
     private boolean failed;
-    private static final Object[] nullargs = new Object[0];
+    protected static final Object[] nullargs = new Object[0];
+    protected static final Class[] nulltypes = new Class[0];
     private static final Map nullmap = Collections.emptyMap();
     
     /** CraftChunkSnapshot */
@@ -40,6 +42,7 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     protected Class<?> biomebase;
     protected Class<?> biomebasearray;
     protected Field biomebaselist;
+    protected Field biomebaseset;
     protected Field biomebasetemp;
     protected Field biomebasehumi;
     protected Field biomebaseidstring;
@@ -49,11 +52,11 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     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 Method nmsc_removeentities;
     protected Field nmsc_tileentities;
     protected Field nmsc_inhabitedticks;
     /** nbt classes */
@@ -83,6 +86,13 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     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 */
@@ -136,7 +146,11 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     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);
@@ -190,6 +204,12 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
      * 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 {
@@ -201,8 +221,10 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
             } catch (NoSuchFieldException nsfx) {
             }
         }
-        Log.severe("Unable to find field " + ids[0] + " for " + cls.getName());
-        failed = true;
+        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) {
@@ -231,7 +253,18 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
         failed = true;
         return null;
     }
-    private Object callMethod(Object obj, Method meth, Object[] args, Object def) {
+    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;
         }
@@ -249,7 +282,11 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
      * Get list of defined biomebase objects
      */
     public Object[] getBiomeBaseList() {
-        return (Object[]) getFieldValue(biomebase, biomebaselist, new Object[0]);
+        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) {
@@ -275,7 +312,12 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
 
     /* Get unload queue for given NMS world */
     public Object getUnloadQueue(World world) {
-        Object cps = getFieldValue(getNMSWorld(world), nmsw_chunkproviderserver, null); // Get chunkproviderserver
+        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);
         }
@@ -299,13 +341,7 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
 //        }
 //        return false;
 //    }
-    /** Remove entities from given chunk */
-    public void removeEntitiesFromChunk(Chunk c) {
-        Object omsc = callMethod(c, cc_gethandle, nullargs, null);
-        if(omsc != null) {
-            callMethod(omsc, nmsc_removeentities, nullargs, null);
-        }
-    }
+
     /**
      * Get inhabited ticks count from chunk
      */
@@ -333,19 +369,37 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
      * Get X coordinate of tile entity
      */
     public int getTileEntityX(Object te) {
-        return (Integer)getFieldValue(te, nmst_x, 0);
+        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) {
-        return (Integer)getFieldValue(te, nmst_y, 0);
+        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) {
-        return (Integer)getFieldValue(te, nmst_z, 0);
+        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
@@ -416,7 +470,8 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
     /**
      * Get player health
      */
-    public int getHealth(Player p) {
+    @Override
+    public double getHealth(Player p) {
         Object health = callMethod(p, player_gethealth, nullargs, null);
         if (health instanceof Integer) {
             return (Integer) health;

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

@@ -91,12 +91,6 @@ public class BukkitVersionHelperGlowstone extends BukkitVersionHelper {
         return b;
     }
 
-    @Override
-    public void removeEntitiesFromChunk(Chunk c) {
-        // TODO Auto-generated method stub
-
-    }
-
     @Override
     public long getInhabitedTicks(Chunk c) {
         // TODO Auto-generated method stub
@@ -444,7 +438,7 @@ public class BukkitVersionHelperGlowstone extends BukkitVersionHelper {
     }
 
     @Override
-    public int getHealth(Player p) {
+    public double getHealth(Player p) {
         return p.getHealth();
     }
 

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

@@ -11,12 +11,14 @@ 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 {
@@ -124,7 +126,10 @@ public class BukkitWorld extends DynmapWorld {
     @Override
     public int getLightLevel(int x, int y, int z) {
         if(world != null) {
-            return world.getBlockAt(x, y, z).getLightLevel();
+            if ((y >= 0) && (y < this.worldheight)) {
+                return world.getBlockAt(x, y, z).getLightLevel();
+            }
+            return 0;
         }
         else {
             return -1;
@@ -149,7 +154,12 @@ public class BukkitWorld extends DynmapWorld {
     @Override
     public int getSkyLightLevel(int x, int y, int z) {
         if(world != null) {
-            return world.getBlockAt(x, y, z).getLightFromSky();
+            if ((y >= 0) && (y < this.worldheight)) {
+                return world.getBlockAt(x, y, z).getLightFromSky();
+            }
+            else {
+                return 15;
+            }
         }
         else {
             return -1;
@@ -233,5 +243,8 @@ public class BukkitWorld extends DynmapWorld {
         }
         return cnt;
     }
-
+    @Override
+    public Polygon getWorldBorder() {
+        return DynmapPlugin.plugin.getWorldBorder(world);
+    }
 }

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

@@ -2,11 +2,9 @@ package org.dynmap.bukkit;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -96,6 +94,7 @@ import org.dynmap.hdmap.HDMap;
 import org.dynmap.markers.MarkerAPI;
 import org.dynmap.modsupport.ModSupportImpl;
 import org.dynmap.utils.MapChunkCache;
+import org.dynmap.utils.Polygon;
 import org.dynmap.utils.VisibilityLimit;
 
 public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
@@ -103,11 +102,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     private PermissionProvider permissions;
     private String version;
     public SnapshotCache sscache;
-    private boolean has_spout = false;
     public PlayerList playerList;
     private MapManager mapManager;
     public static DynmapPlugin plugin;
-    public SpoutPluginBlocks spb;
     public PluginManager pm;
     private Metrics metrics;
     private BukkitEnableCoreCallback enabCoreCB = new BukkitEnableCoreCallback();
@@ -169,26 +166,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     private class BukkitEnableCoreCallback extends DynmapCore.EnableCoreCallbacks {
         @Override
         public void configurationLoaded() {
-            /* Check for Spout */
-            if(detectSpout()) {
-                if(core.configuration.getBoolean("spout/enabled", true)) {
-                    has_spout = true;
-                    Log.info("Detected Spout");
-                    if(spb == null) {
-                        spb = new SpoutPluginBlocks(DynmapPlugin.this);
-                    }
-                    modsused.add("SpoutPlugin");
-                }
-                else {
-                    Log.info("Detected Spout - Support Disabled");
-                }
+            File st = new File(core.getDataFolder(), "renderdata/spout-texture.txt");
+            if(st.exists()) {
+                st.delete();
             }
-            if(!has_spout) {    /* If not, clean up old spout texture, if needed */
-                File st = new File(core.getDataFolder(), "renderdata/spout-texture.txt");
-                if(st.exists())
-                    st.delete();
-            }
-            
         }
     }
     
@@ -276,6 +257,11 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                 return true;
             return false;
         }
+        @Override
+        public boolean isServerThread() {
+            return Bukkit.getServer().isPrimaryThread();
+        }
+
         @Override
         public String stripChatColor(String s) {
             return ChatColor.stripColor(s);
@@ -634,7 +620,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
             return false;
         }
         @Override
-        public int getHealth() {
+        public double getHealth() {
             if(player != null)
                 return helper.getHealth(player);
             else
@@ -738,19 +724,24 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         Object[] biomelist = helper.getBiomeBaseList();
         /* Loop through list, skipping well known biomes */
         for(int i = 0; i < biomelist.length; i++) {
-            if (!BiomeMap.byBiomeID(i).isDefault()) continue;
             Object bb = biomelist[i];
             if(bb != null) {
-                String id =  helper.getBiomeBaseIDString(bb);
-                if(id == null) {
-                   id = "BIOME_" + i;
-                }
                 float tmp = helper.getBiomeBaseTemperature(bb);
                 float hum = helper.getBiomeBaseHumidity(bb);
-
-                BiomeMap m = new BiomeMap(i, id, tmp, hum);
-                Log.verboseinfo("Add custom biome [" + m.toString() + "] (" + i + ")");
-                cnt++;
+                BiomeMap bmap = BiomeMap.byBiomeID(i);
+                if (bmap.isDefault()) {
+                    String id =  helper.getBiomeBaseIDString(bb);
+                    if(id == null) {
+                        id = "BIOME_" + i;
+                    }
+                    BiomeMap m = new BiomeMap(i, id, tmp, hum);
+                    Log.verboseinfo("Add custom biome [" + m.toString() + "] (" + i + ")");
+                    cnt++;
+                }
+                else {
+                    bmap.setTemperature(tmp);
+                    bmap.setRainfall(hum);
+                }
             }
         }
         if(cnt > 0) {
@@ -842,7 +833,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                 @EventHandler(priority=EventPriority.MONITOR, ignoreCancelled=true)
                 public void onPluginEnabled(PluginEnableEvent evt) {
                     if (!readyToEnable()) {
-                        spb.markPluginEnabled(evt.getPlugin());
                         if (readyToEnable()) { /* If we;re ready now, finish enable */
                             doEnable();   /* Finish enable */
                         }
@@ -867,18 +857,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     }
     
     private boolean readyToEnable() {
-        if (spb != null) {
-            return spb.isReady();
-        }
         return true;
     }
     
     private void doEnable() {
-        /* Prep spout support, if needed */
-        if(spb != null) {
-            spb.processSpoutBlocks(this, core);
-        }
-        
         /* Enable core */
         if(!core.enableCore(enabCoreCB)) {
             this.setEnabled(false);
@@ -974,11 +956,13 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     @Override
     public final int triggerRenderOfVolume(String wid, int minx, int miny, int minz,
             int maxx, int maxy, int maxz) {
+    	sscache.invalidateSnapshot(wid, minx, miny, minz, maxx, maxy, maxz);
         return core.triggerRenderOfVolume(wid, minx, miny, minz, maxx, maxy, maxz);
     }
 
     @Override
     public final int triggerRenderOfBlock(String wid, int x, int y, int z) {
+    	sscache.invalidateSnapshot(wid, x, y, z);
         return core.triggerRenderOfBlock(wid, x, y, z);
     }
 
@@ -1515,18 +1499,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         }
     }
 
-    private boolean detectSpout() {
-        Plugin p = this.getServer().getPluginManager().getPlugin("Spout");
-        if(p != null) {
-            return p.isEnabled();
-        }
-        return false;
-    }
-    
-    public boolean hasSpout() {
-        return has_spout;
-    }
-
     @Override
     public void assertPlayerInvisibility(String player, boolean is_invisible,
             String plugin_id) {
@@ -1577,14 +1549,6 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                     return 0;
                 }
             });
-            features.addPlotter(new Metrics.Plotter("Spout") {
-                @Override
-                public int getValue() {
-                    if(plugin.has_spout)
-                        return 1;
-                    return 0;
-                }
-            });
             features.addPlotter(new Metrics.Plotter("Login Security") {
                 @Override
                 public int getValue() {
@@ -1658,4 +1622,8 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
             String[] lines, String playerid) {
         core.processSignChange(blkid, world, x, y, z, lines, playerid);
     }
+    
+    Polygon getWorldBorder(World w) {
+        return helper.getWorldBorder(w);
+    }
 }

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

@@ -22,14 +22,12 @@ import org.dynmap.utils.MapChunkCache;
 import org.dynmap.utils.MapIterator;
 import org.dynmap.utils.BlockStep;
 import org.dynmap.utils.VisibilityLimit;
-import org.getspout.spoutapi.block.SpoutChunk;
 
 /**
  * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
  */
 public class NewMapChunkCache extends MapChunkCache {
     private static boolean init = false;
-    private static boolean use_spout = false;    
 
     private World w;
     private DynmapWorld dw;
@@ -737,8 +735,6 @@ public class NewMapChunkCache extends MapChunkCache {
      */
     public NewMapChunkCache() {
         if(!init) {
-            use_spout = DynmapPlugin.plugin.hasSpout();
-            
             init = true;
         }
     }
@@ -781,17 +777,6 @@ public class NewMapChunkCache extends MapChunkCache {
         isSectionNotEmpty = new boolean[snapcnt][];
     }
     
-    private ChunkSnapshot checkSpoutData(Chunk c, ChunkSnapshot ss) {
-        if(c instanceof SpoutChunk) {
-            SpoutChunk sc = (SpoutChunk)c;
-            short[] custids = sc.getCustomBlockIds();
-            if(custids != null) {
-                return new SpoutChunkSnapshot(ss, custids, c.getWorld().getMaxHeight());
-            }
-        }
-        return ss;
-    }
-
     public int loadChunks(int max_to_load) {
         if(dw.isLoaded() == false)
             return 0;
@@ -884,9 +869,6 @@ public class NewMapChunkCache extends MapChunkCache {
                 else {
                     if(blockdata || highesty) {
                         ss = c.getChunkSnapshot(highesty, biome, biomeraw);
-                        if(use_spout) {
-                            ss = checkSpoutData(c, ss);
-                        }
                         /* Get tile entity data */
                         List<Object> vals = new ArrayList<Object>();
                         Map<?,?> tileents = helper.getTileEntitiesForChunk(c);

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

@@ -1,268 +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.HashSet;
-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 HashSet<String> plugins_pending = new HashSet<String>();
-    
-    public SpoutPluginBlocks(Plugin plugin) {
-        /* 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) {
-                    plugins_pending.add(p.getName());
-                }
-            }
-        }
-    }
-    
-    public boolean isReady() {
-        return plugins_pending.isEmpty();
-    }
-    
-    public void markPluginEnabled(Plugin p) {
-        plugins_pending.remove(p.getName());
-    }
-    
-    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) {
-        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();
-            if(bd == null) continue;
-            String txtplug = bd.getTexturePlugin();
-            if(txtplug == null) continue;
-            String blkname = b.getName();
-            if(blkname == null) continue;
-            String blkid = txtplug + "." + fixIDString(blkname);
-            /* 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 renderdata = new File(datadir, "renderdata");
-        if (renderdata.exists() == false)
-            renderdata.mkdirs();
-        File st = new File(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/resources/configuration.txt

@@ -15,7 +15,7 @@
 #   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 uncommoent one 'type' value
+# 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
@@ -125,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
@@ -274,7 +276,7 @@ custom-colors-support: 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)
@@ -473,4 +475,4 @@ verbose: false
 #debuggers:
 #  - class: org.dynmap.debug.LogDebugger
 # Debug: dump blocks missing render data
-dump-missing-blocks: false
+dump-missing-blocks: false