Merge pull request #143 from mikeprimm/master

Remerged - nether render updates, and rest of HeroChat

configuration.txt

@@ -75,7 +75,7 @@ worlds:
         renderers:
           - class: org.dynmap.kzedmap.DefaultTileRenderer
             prefix: nt
-            maximumheight: 64
+            maximumheight: 127
             colorscheme: default
 
 web:

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

@@ -115,6 +115,10 @@ public class DynmapPlugin extends JavaPlugin {
         }
 
         registerEvents();
+        
+        /* Print version info */
+        PluginDescriptionFile pdfFile = this.getDescription();
+        log.info("[dynmap] version " + pdfFile.getVersion() + " is enabled" );
     }
 
     public void loadWebserver() {
@@ -157,9 +161,7 @@ public class DynmapPlugin extends JavaPlugin {
         } catch (IOException e) {
             log.severe("Failed to start WebServer on " + bindAddress + ":" + port + "!");
         }
-        /* Print version info */
+
-        PluginDescriptionFile pdfFile = this.getDescription();
-        log.info("[dynmap] version " + pdfFile.getVersion() + " is enabled" );
     }
 
     public void onDisable() {
@@ -405,6 +407,8 @@ public class DynmapPlugin extends JavaPlugin {
     public void webChat(String name, String message) {
         mapManager.pushUpdate(new Client.ChatMessage("web", name, message));
         log.info("[WEB]" + name + ": " + message);
+        /* Let HeroChat take a look - only broadcast to players if it doesn't handle it */
+        if(hchand.sendWebMessageToHeroChat(name, message) == false) 
             getServer().broadcastMessage("[WEB]" + name + ": " + message);
     }
 }

src/main/java/org/dynmap/HeroChatHandler.java

@@ -22,6 +22,7 @@ public class HeroChatHandler {
 
     private List<String> hcchannels;
     private String hcwebinputchannel;
+    private HeroChatChannel hcwebinputchan;
     private DynmapPlugin plugin;
 
     private class OurPluginListener extends ServerListener {
@@ -39,10 +40,8 @@ public class HeroChatHandler {
     /* Reflection-based access wrapper for ChannelChatEvent from HeroChat */
     private static class HeroChatChannelChatEvent {
         private static Class channelchatevent;
-        private static Method getchannel;
         private static Method getsource;
         private static Method getmessage;
-        private static Method iscancelled;
         private static boolean isgood = false;
         private Event evt;
 
@@ -51,14 +50,8 @@ public class HeroChatHandler {
             try {
                 channelchatevent = Class
                         .forName("com.herocraftonline.dthielke.herochat.event.ChannelChatEvent");
-                getchannel = channelchatevent.getMethod("getChannel",
+                getsource = channelchatevent.getMethod("getSource", new Class[0]);
-                        new Class[0]);
+                getmessage = channelchatevent.getMethod("getMessage", new Class[0]);
-                getsource = channelchatevent.getMethod("getSource",
-                        new Class[0]);
-                getmessage = channelchatevent.getMethod("getMessage",
-                        new Class[0]);
-                iscancelled = channelchatevent.getMethod("isCancelled",
-                        new Class[0]);
                 isgood = true;
             } catch (ClassNotFoundException cnfx) {
             } catch (NoSuchMethodException nsmx) {
@@ -74,18 +67,6 @@ public class HeroChatHandler {
             return channelchatevent.isInstance(evt);
         }
 
-        public HeroChatChannel getChannel() {
-            try {
-                Object o;
-                o = getchannel.invoke(evt);
-                if (o != null) {
-                    return new HeroChatChannel(o);
-                }
-            } catch (Exception x) {
-            }
-            return null;
-        }
-
         public String getSource() {
             try {
                 return (String) getsource.invoke(evt);
@@ -101,6 +82,49 @@ public class HeroChatHandler {
                 return null;
             }
         }
+    }
+
+    /* Reflection-based access wrapper for ChannelEvent from HeroChat */
+    private static class HeroChatChannelEvent {
+        private static Class channelevent;
+        private static Method getchannel;
+        private static Method iscancelled;
+        private static boolean isgood = false;
+        private Event evt;
+
+        @SuppressWarnings("unchecked")
+        public static boolean initialize() {
+            try {
+                channelevent = Class
+                        .forName("com.herocraftonline.dthielke.herochat.event.ChannelEvent");
+                getchannel = channelevent.getMethod("getChannel", new Class[0]);
+                iscancelled = channelevent.getMethod("isCancelled", new Class[0]);
+                isgood = true;
+            } catch (ClassNotFoundException cnfx) {
+            } catch (NoSuchMethodException nsmx) {
+            }
+            return isgood;
+        }
+
+        public HeroChatChannelEvent(Event evt) {
+            this.evt = evt;
+        }
+
+        public static boolean isInstance(Event evt) {
+            return channelevent.isInstance(evt);
+        }
+
+        public HeroChatChannel getChannel() {
+            try {
+                Object o;
+                o = getchannel.invoke(evt);
+                if (o != null) {
+                    return new HeroChatChannel(o);
+                }
+            } catch (Exception x) {
+            }
+            return null;
+        }
 
         public boolean isCancelled() {
             try {
@@ -115,6 +139,8 @@ public class HeroChatHandler {
     private static class HeroChatChannel {
         private static Class channel;
         private static Method getname;
+        private static Method getnick;
+        private static Method sendmessage;
         private static boolean isgood = false;
         private Object chan;
 
@@ -123,10 +149,14 @@ public class HeroChatHandler {
             try {
                 channel = Class
                         .forName("com.herocraftonline.dthielke.herochat.channels.Channel");
-                getname = channel.getMethod("getName", new Class[0]);
+                getname = channel.getMethod("getName");
+                getnick = channel.getMethod("getNick", new Class[0]);
+                sendmessage = channel.getMethod("sendMessage", new Class[] { 
+                    String.class, String.class, String.class, boolean.class } );
                 isgood = true;
             } catch (ClassNotFoundException cnfx) {
             } catch (NoSuchMethodException nsmx) {
+                System.out.println(nsmx);
             }
             return isgood;
         }
@@ -135,10 +165,6 @@ public class HeroChatHandler {
             this.chan = chan;
         }
 
-        public static boolean isInstance(Object obj) {
-            return channel.isInstance(obj);
-        }
-
         public String getName() {
             try {
                 return (String) getname.invoke(chan);
@@ -146,6 +172,21 @@ public class HeroChatHandler {
                 return null;
             }
         }
+
+        public String getNick() {
+            try {
+                return (String) getnick.invoke(chan);
+            } catch (Exception x) {
+                return null;
+            }
+        }
+
+        public void sendMessage(String source, String msg, String format, boolean sentByPlayer) {
+            try {
+                sendmessage.invoke(chan, source, msg, format, sentByPlayer);
+            } catch (Exception x) {
+            }
+        }
     }
 
     private class OurEventListener extends CustomEventListener {
@@ -154,20 +195,36 @@ public class HeroChatHandler {
          */
         @Override
         public void onCustomEvent(Event event) {
+            if (HeroChatChannelEvent.isInstance(event)) {
+                HeroChatChannelEvent ce = new HeroChatChannelEvent(event);
+                /* Snoop for our web channel - we'll need it, and we'll see it before it matters,
+                 * since anyone that joins the channel will give us an event (and reflection on
+                 * the plugin class to get the manager didn't work, due to a dependency on the IRC
+                 * plugin that may not be present....)
+                 */
+                HeroChatChannel c = ce.getChannel();
+                /* If channel name or nickname matches out web channel, remember it */
+                if((c != null) && (hcwebinputchannel != null) &&
+                        ((c.getName().equals(hcwebinputchannel)) ||
+                        c.getNick().equals(hcwebinputchannel))) {
+                    hcwebinputchan = c;
+                }
+                if (ce.isCancelled())
+                    return;
                 if (HeroChatChannelChatEvent.isInstance(event)) {
                     HeroChatChannelChatEvent cce = new HeroChatChannelChatEvent(
                         event);
-                if (cce.isCancelled())
+                    /* Match on name or nickname of channel */
-                    return;
+                    if (hcchannels.contains(c.getName()) ||
-                HeroChatChannel c = cce.getChannel();
+                            hcchannels.contains(c.getNick())) {
-                if (hcchannels.contains(c.getName())) {
                         plugin.mapManager.pushUpdate(new Client.ChatMessage(
-                            "player", "[" + c.getName() + "] "
+                            "player", "[" + c.getNick() + "] "
                                     + cce.getSource(), cce.getMessage()));
                     }
                 }
             }
         }
+    }
 
     public HeroChatHandler(Configuration cfg, DynmapPlugin plugin, Server server) {
         /* If we're enabling hero chat support */
@@ -188,16 +245,38 @@ public class HeroChatHandler {
 
     private void activateHeroChat(Plugin herochat) {
         if (HeroChatChannelChatEvent.initialize() == false) {
-            log.severe("[dynmap] Cannot load HeroChat event class!");
+            log.severe("[dynmap] Cannot load HeroChat chat event class!");
             return;
         }
         if (HeroChatChannel.initialize() == false) {
             log.severe("[dynmap] Cannot load HeroChat channel class!");
             return;
         }
+        if (HeroChatChannelEvent.initialize() == false) {
+            log.severe("[dynmap] Cannot load HeroChat channel event class!");
+            return;
+        }
+        
         /* Register event handler */
         plugin.getServer().getPluginManager().registerEvent(Event.Type.CUSTOM_EVENT,
                 new OurEventListener(), Event.Priority.Monitor, plugin);
         log.info("[dynmap] HeroChat integration active");
     }
+    /**
+     * Send message from web to appropriate HeroChat channel
+     * @param sender - sender ID
+     * @param message - message
+     * @return true if herochat is handling this, false if not
+     */
+    public boolean sendWebMessageToHeroChat(String sender, String message) {
+        if(hcwebinputchannel != null) { /* Are we handling them? */
+            if(hcwebinputchan != null) {    /* Have we seen it yet?  Maybe no if nobody has logged on or
+                                             * joined it, but then who would see it anyway?
+                                             */
+                hcwebinputchan.sendMessage(sender, message, "{default}", false);
+            }
+            return true;
+        }
+        return false;
+    }
 }

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

@@ -11,10 +11,11 @@ public class UpdateQueue {
 
     private static final int maxUpdateAge = 120000;
 
-    public synchronized void pushUpdate(Object obj) {
+    public void pushUpdate(Object obj) {
+        synchronized (lock) {
+        	/* Do inside lock - prevent delay between time and actual work */
             long now = System.currentTimeMillis();
             long deadline = now - maxUpdateAge;
-        synchronized (lock) {
             ListIterator<Update> i = updateQueue.listIterator(0);
             while (i.hasNext()) {
                 Update u = i.next();
@@ -27,11 +28,11 @@ public class UpdateQueue {
 
     private ArrayList<Object> tmpupdates = new ArrayList<Object>();
 
-    public synchronized Object[] getUpdatedObjects(long since) {
+    public Object[] getUpdatedObjects(long since) {
-        long now = System.currentTimeMillis();
-        long deadline = now - maxUpdateAge;
         Object[] updates;
         synchronized (lock) {
+            long now = System.currentTimeMillis();
+            long deadline = now - maxUpdateAge;
             tmpupdates.clear();
             Iterator<Update> it = updateQueue.descendingIterator();
             while (it.hasNext()) {

src/main/java/org/dynmap/flat/FlatMap.java

@@ -11,6 +11,7 @@ import javax.imageio.ImageIO;
 
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.dynmap.Client;
 import org.dynmap.ColorScheme;
 import org.dynmap.DynmapChunk;
@@ -22,10 +23,17 @@ import org.dynmap.debug.Debug;
 public class FlatMap extends MapType {
     private String prefix;
     private ColorScheme colorScheme;
+    private int maximumHeight = 127;
     
     public FlatMap(Map<String, Object> configuration) {
         prefix = (String) configuration.get("prefix");
         colorScheme = ColorScheme.getScheme((String) configuration.get("colorscheme"));
+        Object o = configuration.get("maximumheight");
+        if (o != null) {
+            maximumHeight = Integer.parseInt(String.valueOf(o));
+            if (maximumHeight > 127)
+                maximumHeight = 127;
+        }
     }
 
     @Override
@@ -68,6 +76,7 @@ public class FlatMap extends MapType {
     public boolean render(MapTile tile, File outputFile) {
         FlatMapTile t = (FlatMapTile) tile;
         World w = t.getWorld();
+        boolean isnether = (w.getEnvironment() == Environment.NETHER) && (maximumHeight == 127);
 
         boolean rendered = false;
         BufferedImage im = new BufferedImage(t.size, t.size, BufferedImage.TYPE_INT_RGB);
@@ -79,17 +88,40 @@ public class FlatMap extends MapType {
             for (int y = 0; y < t.size; y++) {
                 int mx = x + t.x * t.size;
                 int mz = y + t.y * t.size;
-                int my = w.getHighestBlockYAt(mx, mz) - 1;
+                int my;
-                int blockType = w.getBlockTypeIdAt(mx, my, mz);
+                int blockType;
-                byte data = 0;
+                if(isnether) {
-                if(colorScheme.datacolors[blockType] != null) { /* If data colored */
+                	/* Scan until we hit air */
-                    data = w.getBlockAt(mx, my, mz).getData();
+                	my = 127;
+                	while((blockType = w.getBlockTypeIdAt(mx, my, mz)) != 0) {
+                		my--;
+                		if(my < 0) {	/* Solid - use top */
+                			my = 127;
+                			blockType = w.getBlockTypeIdAt(mx, my, mz);
+                			break;
                 		}
-                Color[] colors;
+                	}
-                if(data != 0)
+                	if(blockType == 0) {	/* Hit air - now find non-air */
+                    	while((blockType = w.getBlockTypeIdAt(mx, my, mz)) == 0) {
+                    		my--;
+                    		if(my < 0) {
+                    			my = 0;
+                    			break;
+                    		}
+                    	}
+                	}
+                }
+                else {
+                	my = w.getHighestBlockYAt(mx, mz) - 1;
+                	if(my > maximumHeight) my = maximumHeight;
+                	blockType = w.getBlockTypeIdAt(mx, my, mz);
+                }
+                byte data = 0;
+                Color[] colors = colorScheme.colors[blockType];
+                if(colorScheme.datacolors[blockType] != null) {
+            		data = w.getBlockAt(mx, my, mz).getData();
             		colors = colorScheme.datacolors[blockType][data];
-                else
+                }
-                    colors = colorScheme.colors[blockType];
                 if (colors == null)
                     continue;
                 Color c = colors[0];

src/main/java/org/dynmap/kzedmap/CaveTileRenderer.java

@@ -12,7 +12,7 @@ public class CaveTileRenderer extends DefaultTileRenderer {
     }
 
     @Override
-    protected Color scan(World world, int x, int y, int z, int seq) {
+    protected Color scan(World world, int x, int y, int z, int seq, boolean isnether) {
         boolean air = true;
         
         for (;;) {
@@ -20,6 +20,12 @@ public class CaveTileRenderer extends DefaultTileRenderer {
                 return translucent;
 
             int id = world.getBlockTypeIdAt(x, y, z);
+            if(isnether) {	/* Make ceiling into air in nether */
+            	if(id != 0)
+            		id = 0;
+            	else
+            		isnether = false;
+            }
 
             switch (seq) {
             case 0:

src/main/java/org/dynmap/kzedmap/DefaultTileRenderer.java

@@ -12,7 +12,9 @@ import java.util.Map;
 
 import javax.imageio.ImageIO;
 
+import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.World.Environment;
 import org.dynmap.Client;
 import org.dynmap.ColorScheme;
 import org.dynmap.MapManager;
@@ -28,25 +30,6 @@ public class DefaultTileRenderer implements MapTileRenderer {
     protected HashSet<Integer> highlightBlocks = new HashSet<Integer>();
     protected Color highlightColor = new Color(255, 0, 0);
     
-    private static final Color[] woolshades = {
-        Color.WHITE,
-        Color.ORANGE,
-        Color.MAGENTA,
-        new Color(51,204,255),
-        Color.YELLOW,
-        new Color(102,255,102),
-        Color.PINK,
-        Color.GRAY,
-        Color.LIGHT_GRAY,
-        Color.CYAN,
-        new Color(255,0,255),
-        Color.BLUE,
-        new Color(102,51,51),
-        Color.GREEN,
-        Color.RED,
-        Color.BLACK
-    };
-
     @Override
     public String getName() {
         return name;
@@ -65,6 +48,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
 
     public boolean render(KzedMapTile tile, File outputFile) {
         World world = tile.getWorld();
+        boolean isnether = (world.getEnvironment() == Environment.NETHER);
         BufferedImage im = new BufferedImage(KzedMap.tileWidth, KzedMap.tileHeight, BufferedImage.TYPE_INT_RGB);
 
         WritableRaster r = im.getRaster();
@@ -74,6 +58,10 @@ public class DefaultTileRenderer implements MapTileRenderer {
         int iy = maximumHeight;
         int iz = KzedMap.anchorz + tile.px / 2 - tile.py / 2 + ((127-maximumHeight)/2);
 
+        /* Don't mess with existing height-clipped renders */
+        if(maximumHeight < 127)
+        	isnether = false;
+        
         int jx, jz;
         
         int x, y;
@@ -84,8 +72,8 @@ public class DefaultTileRenderer implements MapTileRenderer {
             jz = iz;
 
             for (x = KzedMap.tileWidth - 1; x >= 0; x -= 2) {
-                Color c1 = scan(world, jx, iy, jz, 0);
+                Color c1 = scan(world, jx, iy, jz, 0, isnether);
-                Color c2 = scan(world, jx, iy, jz, 2);
+                Color c2 = scan(world, jx, iy, jz, 2, isnether);
                 isempty = isempty && c1 == translucent && c2 == translucent;
                 r.setPixel(x, y, new int[] {
                     c1.getRed(),
@@ -107,10 +95,10 @@ public class DefaultTileRenderer implements MapTileRenderer {
             jz = iz - 1;
 
             for (x = KzedMap.tileWidth - 1; x >= 0; x -= 2) {
-                Color c1 = scan(world, jx, iy, jz, 2);
+                Color c1 = scan(world, jx, iy, jz, 2, isnether);
                 jx++;
                 jz++;
-                Color c2 = scan(world, jx, iy, jz, 0);
+                Color c2 = scan(world, jx, iy, jz, 0, isnether);
                 isempty = isempty && c1 == translucent && c2 == translucent;
                 r.setPixel(x, y, new int[] {
                     c1.getRed(),
@@ -217,13 +205,25 @@ public class DefaultTileRenderer implements MapTileRenderer {
     }
     
 
-    protected Color scan(World world, int x, int y, int z, int seq) {
+    protected Color scan(World world, int x, int y, int z, int seq, boolean isnether) {
+        Color result = translucent;
         for (;;) {
-            if (y < 0)
+            if (y < 0) {
-                return translucent;
+                return result;
-
+            }
             int id = world.getBlockTypeIdAt(x, y, z);
             byte data = 0;
+            if(isnether) {	/* Make bedrock ceiling into air in nether */
+            	if(id != 0) {
+            		/* Remember first color we see, in case we wind up solid */
+            		if(result == translucent) 
+            			if(colorScheme.colors[id] != null)
+            				result = colorScheme.colors[id][seq];
+        			id = 0;
+            	}
+            	else
+        			isnether = false;
+            }
             if(colorScheme.datacolors[id] != null) {	/* If data colored */
             	data = world.getBlockAt(x, y, z).getData();
             }
@@ -263,7 +263,7 @@ public class DefaultTileRenderer implements MapTileRenderer {
                         }
 
                         /* this block is transparent, so recurse */
-                        Color bg = scan(world, x, y, z, seq);
+                        Color bg = scan(world, x, y, z, seq, isnether);
 
                         int cr = c.getRed();
                         int cg = c.getGreen();

src/main/java/org/dynmap/kzedmap/HighlightTileRenderer.java

@@ -23,14 +23,26 @@ public class HighlightTileRenderer extends DefaultTileRenderer {
     }
     
     @Override
-    protected Color scan(World world, int x, int y, int z, int seq) {
+    protected Color scan(World world, int x, int y, int z, int seq, boolean isnether) {
         Color result = translucent;
+    	int top_nether_id = 0;
         for (;;) {
             if (y < 0) {
                 break;
             }
 
             int id = world.getBlockTypeIdAt(x, y, z);
+            if(isnether) {	/* Make bedrock ceiling into air in nether */
+            	if(id != 0) {
+            		/* Remember first color we see, in case we wind up solid */
+            		if(result == translucent) 
+            			if(colorScheme.colors[id] != null)
+            				result = colorScheme.colors[id][seq];
+        			id = 0;
+            	}
+            	else
+        			isnether = false;
+            }
             byte data = 0;
             if(colorScheme.datacolors[id] != null) {	/* If data colored */
             	data = world.getBlockAt(x, y, z).getData();

src/main/java/org/dynmap/kzedmap/ZoomedTileRenderer.java

@@ -1,18 +1,8 @@
 package org.dynmap.kzedmap;
 
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.IOException;
 import java.util.Map;
 
-import javax.imageio.ImageIO;
-
-import org.dynmap.Client;
-import org.dynmap.MapManager;
-import org.dynmap.debug.Debug;
-
 public class ZoomedTileRenderer {
     public ZoomedTileRenderer(Map<String, Object> configuration) {
     }

web/js/map.js

@@ -386,7 +386,7 @@ DynMap.prototype = {
 						
 						swtch(update.type, {
 							tile: function() {
-								me.onTileUpdated(update.name);
+								me.onTileUpdated(update.name,update.timestamp);
 							},
 							playerjoin: function() {
 								$(me).trigger('playerjoin', [ update.playerName ]);
@@ -436,12 +436,12 @@ DynMap.prototype = {
 	unregisterTile: function(mapType, tileName) {
 		delete this.registeredTiles[tileName];
 	},
-	onTileUpdated: function(tileName) {
+	onTileUpdated: function(tileName,timestamp) {
 		var me = this;
 		var tile = this.registeredTiles[tileName];
 		
 		if (tile) {
-			tile.lastseen = this.lasttimestamp;
+			tile.lastseen = timestamp;
 			tile.mapType.onTileUpdated(tile.tileElement, tileName);
 		}
 	},