Add current/max player count on player list

LICENSE

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dynmap</groupId>
 	<artifactId>dynmap</artifactId>
-	<version>0.31</version>
+	<version>0.60</version>
 	<name>dynmap</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -133,7 +133,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>[1.1-R1-SNAPSHOT,)</version>
+			<version>[1.2.5-R4.0,1.7)</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -144,21 +144,6 @@
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-server</artifactId>
-			<version>8.0.1.v20110908</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
-			<version>8.0.1.v20110908</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.dynmap</groupId>
@@ -173,5 +158,26 @@
 			<version>dev-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<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>
 	</dependencies>
 </project>

src/main/assembly/package.xml

@@ -16,6 +16,11 @@
     	<includes>
     		<include>version.js</include></includes>
     	<filtered>true</filtered></fileSet>
+    <fileSet>
+    	<directory>${project.basedir}</directory>
+    	<outputDirectory>/dynmap</outputDirectory>
+    	<includes>
+    		<include>LICENSE</include></includes></fileSet>
   </fileSets>
   <files>
   	<file>

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

@@ -1,80 +0,0 @@
-package org.dynmap.bukkit;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.bukkit.block.Block;
-import org.dynmap.Log;
-
-/**
- * Wrapper for accessing raw light levels for given block
- */
-public class BlockLightLevel {
-    private Method gethandle;
-    private Method getrawlight;
-    private Object enum_sky;
-    private Object enum_block;
-    private boolean ready;
-    
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public BlockLightLevel() {
-        /* Get CraftChunk.getChunkSnapshot(boolean,boolean,boolean) and CraftChunk.getHandle() */
-        try {
-            Class c = Class.forName("org.bukkit.craftbukkit.CraftChunk");
-            gethandle = c.getDeclaredMethod("getHandle", new Class[0]);
-            Class enumskyblock = Class.forName("net.minecraft.server.EnumSkyBlock");
-            Object[] enumvals = enumskyblock.getEnumConstants();
-            for(int i = 0; i < enumvals.length; i++) {
-                String ev = enumvals[i].toString();
-                if(ev.equals("Sky")) {
-                    enum_sky = enumvals[i]; 
-                }
-                else if(ev.equals("Block")) {
-                    enum_block = enumvals[i];
-                }
-            }
-            Class cc = Class.forName("net.minecraft.server.Chunk");
-            getrawlight = cc.getDeclaredMethod("a", new Class[] { enumskyblock, int.class, int.class, int.class });
-        } catch (ClassNotFoundException cnfx) {
-        } catch (NoSuchMethodException nsmx) {
-        }
-        if((gethandle != null) && (enum_sky != null) && (enum_block != null) && (getrawlight != null)) {
-            ready = true;
-        }
-        else {
-            Log.warning("Block raw light level API not available");
-        }
-    }
-    
-    public boolean isReady() {
-        return ready;
-    }
-
-    public int getSkyLightLevel(Block b) {
-        try {
-            Object hand = gethandle.invoke(b.getChunk());
-            if(hand != null) {
-                Integer v = (Integer)getrawlight.invoke(hand, enum_sky, b.getX() & 0xF, b.getY() & 0x7F, b.getZ() & 0xF);
-                return v;
-            }
-        } catch (InvocationTargetException itx) {
-        } catch (IllegalArgumentException e) {
-        } catch (IllegalAccessException e) {
-        }
-        return -1;
-    }
-
-    public int getBlockLightLevel(Block b) {
-        try {
-            Object hand = gethandle.invoke(b.getChunk());
-            if(hand != null) {
-                Integer v = (Integer)getrawlight.invoke(hand, enum_block, b.getX() & 0xF, b.getY() & 0x7F, b.getZ() & 0xF);
-                return v;
-            }
-        } catch (InvocationTargetException itx) {
-        } catch (IllegalArgumentException e) {
-        } catch (IllegalAccessException e) {
-        }
-        return -1;
-    }
-}

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

@@ -1,449 +0,0 @@
-package org.dynmap.bukkit;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.bukkit.event.CustomEventListener;
-import org.bukkit.event.Event;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockListener;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.EntityListener;
-import org.bukkit.event.player.PlayerBedLeaveEvent;
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.event.server.ServerListener;
-import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.ChunkPopulateEvent;
-import org.bukkit.event.world.SpawnChangeEvent;
-import org.bukkit.event.world.WorldListener;
-import org.bukkit.event.world.WorldLoadEvent;
-import org.bukkit.event.world.WorldUnloadEvent;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
-import org.dynmap.Log;
-
-public class BukkitEventProcessor {
-    private Plugin plugin;
-    private PluginManager pm;
-
-    private HashMap<Event.Type, List<Listener>> event_handlers = new HashMap<Event.Type, List<Listener>>();
-
-    public BukkitEventProcessor(Plugin plugin) {
-        this.plugin = plugin;
-        this.pm = plugin.getServer().getPluginManager();
-    }
-    
-    public void cleanup() {
-        /* Clean up all registered handlers */
-        for(Event.Type t : event_handlers.keySet()) {
-            List<Listener> ll = event_handlers.get(t);
-            ll.clear(); /* Empty list - we use presence of list to remember that we've registered with Bukkit */
-        }
-        if(plugin.getServer().getVersion().contains("(MC: 1.0") == false) {
-            event_handlers.clear();
-        }
-    }
-    
-    private BlockListener ourBlockEventHandler = new BlockListener() {
-        
-        @Override
-        public void onBlockPlace(BlockPlaceEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockPlace(event);
-                }
-            }
-        }
-
-        @Override
-        public void onBlockBreak(BlockBreakEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockBreak(event);
-                }
-            }
-        }
-
-        @Override
-        public void onLeavesDecay(LeavesDecayEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onLeavesDecay(event);
-                }
-            }
-        }
-        
-        @Override
-        public void onBlockBurn(BlockBurnEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockBurn(event);
-                }
-            }
-        }
-        
-        @Override
-        public void onBlockForm(BlockFormEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockForm(event);
-                }
-            }
-        }
-        @Override
-        public void onBlockFade(BlockFadeEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockFade(event);
-                }
-            }
-        }
-        @Override
-        public void onBlockSpread(BlockSpreadEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockSpread(event);
-                }
-            }
-        }
-        @Override
-        public void onBlockFromTo(BlockFromToEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockFromTo(event);
-                }
-            }
-        }
-        @Override
-        public void onBlockPhysics(BlockPhysicsEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockPhysics(event);
-                }
-            }
-        }
-        @Override
-        public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockPistonRetract(event);
-                }
-            }
-        }
-        @Override
-        public void onBlockPistonExtend(BlockPistonExtendEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onBlockPistonExtend(event);
-                }
-            }
-        }
-        @Override
-        public void onSignChange(SignChangeEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((BlockListener)l).onSignChange(event);
-                }
-            }
-        }
-    };
-    private PlayerListener ourPlayerEventHandler = new PlayerListener() {
-        @Override
-        public void onPlayerJoin(PlayerJoinEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((PlayerListener)l).onPlayerJoin(event);
-                }
-            }
-        }
-        @Override
-        public void onPlayerLogin(PlayerLoginEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((PlayerListener)l).onPlayerLogin(event);
-                }
-            }
-        }
-
-        @Override
-        public void onPlayerMove(PlayerMoveEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((PlayerListener)l).onPlayerMove(event);
-                }
-            }
-        }
-        
-        @Override
-        public void onPlayerQuit(PlayerQuitEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((PlayerListener)l).onPlayerQuit(event);
-                }
-            }
-        }
-
-        @Override
-        public void onPlayerBedLeave(PlayerBedLeaveEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((PlayerListener)l).onPlayerBedLeave(event);
-                }
-            }
-        }
-
-        @Override
-        public void onPlayerChat(PlayerChatEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((PlayerListener)l).onPlayerChat(event);
-                }
-            }
-        }
-    };
-
-    private WorldListener ourWorldEventHandler = new WorldListener() {
-        @Override
-        public void onWorldLoad(WorldLoadEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((WorldListener)l).onWorldLoad(event);
-                }
-            }
-        }
-        @Override
-        public void onWorldUnload(WorldUnloadEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((WorldListener)l).onWorldUnload(event);
-                }
-            }
-        }
-        @Override
-        public void onChunkLoad(ChunkLoadEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((WorldListener)l).onChunkLoad(event);
-                }
-            }
-        }
-        @Override
-        public void onChunkPopulate(ChunkPopulateEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((WorldListener)l).onChunkPopulate(event);
-                }
-            }
-        }
-        @Override
-        public void onSpawnChange(SpawnChangeEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((WorldListener)l).onSpawnChange(event);
-                }
-            }
-        }
-    };
-    
-    private CustomEventListener ourCustomEventHandler = new CustomEventListener() {
-        @Override
-        public void onCustomEvent(Event event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((CustomEventListener)l).onCustomEvent(event);
-                }
-            }
-        }
-    };
-    
-    private EntityListener ourEntityEventHandler = new EntityListener() {
-        @Override
-        public void onEntityExplode(EntityExplodeEvent event) {
-            if(event.isCancelled())
-                return;
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((EntityListener)l).onEntityExplode(event);
-                }
-            }
-        }
-    };
-    
-    private ServerListener ourServerEventHandler = new ServerListener() {
-    	@Override
-        public void onPluginEnable(PluginEnableEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((ServerListener)l).onPluginEnable(event);
-                }
-            }
-    	}
-    	@Override
-        public void onPluginDisable(PluginDisableEvent event) {
-            /* Call listeners */
-            List<Listener> ll = event_handlers.get(event.getType());
-            if(ll != null) {
-                for(Listener l : ll) {
-                    ((ServerListener)l).onPluginDisable(event);
-                }
-            }
-    	}
-    };
-    
-    /**
-     * Register event listener - this will be cleaned up properly on a /dynmap reload, unlike
-     * registering with Bukkit directly
-     */
-    public void registerEvent(Event.Type type, Listener listener) {
-        List<Listener> ll = event_handlers.get(type);
-        if(ll == null) {
-            switch(type) {  /* See if it is a type we're brokering */
-                case PLAYER_LOGIN:
-                case PLAYER_CHAT:
-                case PLAYER_JOIN:
-                case PLAYER_QUIT:
-                case PLAYER_MOVE:
-                case PLAYER_BED_LEAVE:
-                    pm.registerEvent(type, ourPlayerEventHandler, Event.Priority.Monitor, plugin);
-                    break;
-                case BLOCK_PLACE:
-                case BLOCK_BREAK:
-                case LEAVES_DECAY:
-                case BLOCK_BURN:
-                case BLOCK_FORM:
-                case BLOCK_FADE:
-                case BLOCK_SPREAD:
-                case BLOCK_FROMTO:
-                case BLOCK_PHYSICS:
-                case BLOCK_PISTON_EXTEND:
-                case BLOCK_PISTON_RETRACT:
-                    pm.registerEvent(type, ourBlockEventHandler, Event.Priority.Monitor, plugin);
-                    break;
-                case SIGN_CHANGE:
-                    pm.registerEvent(type, ourBlockEventHandler, Event.Priority.Low, plugin);
-                    break;
-                case WORLD_LOAD:
-                case WORLD_UNLOAD:
-                case CHUNK_LOAD:
-                case CHUNK_POPULATED:
-                case SPAWN_CHANGE:
-                    pm.registerEvent(type, ourWorldEventHandler, Event.Priority.Monitor, plugin);
-                    break;
-                case CUSTOM_EVENT:
-                    pm.registerEvent(type, ourCustomEventHandler, Event.Priority.Monitor, plugin);
-                    break;
-                case ENTITY_EXPLODE:
-                    pm.registerEvent(type, ourEntityEventHandler, Event.Priority.Monitor, plugin);
-                    break;
-                case PLUGIN_ENABLE:
-                case PLUGIN_DISABLE:
-                	pm.registerEvent(type, ourServerEventHandler, Event.Priority.Monitor, plugin);
-                	break;
-                default:
-                    Log.severe("registerEvent() in DynmapPlugin does not handle " + type);
-                    return;
-            }
-            ll = new ArrayList<Listener>();
-            event_handlers.put(type, ll);   /* Add list for this event */
-        }
-        ll.add(listener);
-    }
-}

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

@@ -6,6 +6,8 @@ import java.util.List;
 
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
 import org.dynmap.DynmapChunk;
 import org.dynmap.DynmapLocation;
 import org.dynmap.DynmapWorld;
@@ -13,17 +15,20 @@ import org.dynmap.utils.MapChunkCache;
 
 public class BukkitWorld extends DynmapWorld {
     private World world;
-    private static BlockLightLevel bll = new BlockLightLevel();
+    private World.Environment env;
+    private boolean skylight;
     
     public BukkitWorld(World w) {
-        super(w.getName(), w.getMaxHeight());
-        
+        super(w.getName(), w.getMaxHeight(), w.getSeaLevel());
         world = w;
+        env = world.getEnvironment();
+        skylight = (env == World.Environment.NORMAL);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
     }
     /* Test if world is nether */
     @Override
     public boolean isNether() {
-        return world.getEnvironment() == World.Environment.NETHER;
+        return env == World.Environment.NETHER;
     }
     /* Get world spawn location */
     @Override
@@ -31,7 +36,7 @@ public class BukkitWorld extends DynmapWorld {
         DynmapLocation dloc = new DynmapLocation();
         Location sloc = world.getSpawnLocation();
         dloc.x = sloc.getBlockX(); dloc.y = sloc.getBlockY();
-        dloc.z = sloc.getBlockZ(); dloc.world = sloc.getWorld().getName();
+        dloc.z = sloc.getBlockZ(); dloc.world = normalizeWorldName(sloc.getWorld().getName());
         return dloc;
     }
     /* Get world time */
@@ -67,19 +72,19 @@ public class BukkitWorld extends DynmapWorld {
     /* Test if sky light level is requestable */
     @Override
     public boolean canGetSkyLightLevel() {
-        return bll.isReady();
+        return skylight;
     }
     /* Return sky light level */
     @Override
     public int getSkyLightLevel(int x, int y, int z) {
-        return bll.getSkyLightLevel(world.getBlockAt(x, y, z));
+        return world.getBlockAt(x, y, z).getLightFromSky();
     }
     /**
      * Get world environment ID (lower case - normal, the_end, nether)
      */
     @Override
     public String getEnvironment() {
-        return world.getEnvironment().name().toLowerCase();
+        return env.name().toLowerCase();
     }
     /**
      * Get map chunk cache for world

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

@@ -9,11 +9,11 @@ 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.dynmap.Log;
 import org.getspout.spoutapi.block.design.BlockDesign;
 import org.getspout.spoutapi.block.design.GenericBlockDesign;
@@ -73,6 +73,7 @@ public class SpoutPluginBlocks {
         for(CustomBlock b : cb) {
             BlockDesign bd = b.getBlockDesign();
             String blkid = bd.getTexturePlugin() + "." + b.getName();
+            blkid = blkid.replace(' ', '_');
             /* If not GenericCubiodBlockDesign, we don't handle it */
             if((bd instanceof GenericCuboidBlockDesign) == false) {
                 Log.info("Block " + blkid + " not suppored - only cubiod blocks");
@@ -166,7 +167,7 @@ public class SpoutPluginBlocks {
                 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.isOpaque() == false)
+                if(b.getBlockId() == Material.GLASS.getId())
                     sb.append(",transparency=TRANSPARENT");
                 sb.append(",txtid=" + txfileid + "\n");
                 cnt++;

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

@@ -1,24 +1,33 @@
 package org.dynmap.bukkit.permissions;
 
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.dynmap.Log;
 
 public class BukkitPermissions implements PermissionProvider {
-    String name;
+    protected String name;
+    protected Map<String, Boolean> pd;
 
-    public static BukkitPermissions create(String name) {
+    public static BukkitPermissions create(String name, Map<String,Boolean> pd) {
         try {
             Class.forName("org.bukkit.permissions.PermissibleBase");    /* See if class exists */
         } catch (ClassNotFoundException cnfx) {
             return null;
         }
         Log.info("Using Bukkit Permissions (superperms) for access control");
-        return new BukkitPermissions(name);
+        Log.info("Web interface permissions only available for online users");
+        return new BukkitPermissions(name, pd);
     }
 
-    public BukkitPermissions(String name) {
+    public BukkitPermissions(String name, Map<String, Boolean> pd) {
         this.name = name;
+        this.pd = pd;
     }
 
     @Override
@@ -28,4 +37,33 @@ public class BukkitPermissions implements PermissionProvider {
                 ? player.hasPermission(name + "." + permission) || player.hasPermission(name + ".*")
                 : true;
     }
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        Player p = Bukkit.getPlayerExact(name);
+        HashSet<String> hasperms = null;
+        if (p != null) {
+            hasperms = new HashSet<String>();
+            for(String perm : perms) {
+                if (p.hasPermission(name + "." + perm)) {
+                    hasperms.add(perm);
+                }
+            }
+        }
+        return hasperms;
+    }
+
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        Player p = Bukkit.getPlayerExact(player);
+        if (p != null) {
+            return p.hasPermission(name + "." + perm);
+        }
+        else {
+            OfflinePlayer op = Bukkit.getOfflinePlayer(player);
+            if((op != null) && op.isOp()) {
+                return true;
+            }
+            return false;
+        }
+    }
 }

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

@@ -1,5 +1,9 @@
 package org.dynmap.bukkit.permissions;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -13,6 +17,7 @@ public class NijikokunPermissions implements PermissionProvider {
     String name;
     PermissionHandler permissions;
     Plugin plugin;
+    String defworld;
     
     public static NijikokunPermissions create(Server server, String name) {
         Plugin permissionsPlugin = server.getPluginManager().getPlugin("Permissions");
@@ -20,6 +25,9 @@ public class NijikokunPermissions implements PermissionProvider {
             return null;
         
         server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        
         Log.info("Using Permissions " + permissionsPlugin.getDescription().getVersion() + " for access control");
         return new NijikokunPermissions(permissionsPlugin, name);
     }
@@ -27,6 +35,7 @@ public class NijikokunPermissions implements PermissionProvider {
     public NijikokunPermissions(Plugin permissionsPlugin, String name) {
         this.name = name;
         plugin = permissionsPlugin;
+        defworld = Bukkit.getServer().getWorlds().get(0).getName();
     }
 
     @Override
@@ -38,4 +47,25 @@ public class NijikokunPermissions implements PermissionProvider {
                 ? permissions.has(player, name + "." + permission) || permissions.has(player, name + ".*")
                 : true;
     }
+    
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        if(permissions == null)
+            permissions = ((Permissions)plugin).getHandler();
+        HashSet<String> hasperms = new HashSet<String>();
+        for (String pp : perms) {
+            if (permissions.has(defworld, player, name + "." + pp)) {
+                hasperms.add(pp);
+            }
+        }
+        return hasperms;
+    }
+    
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        if(permissions == null)
+            permissions = ((Permissions)plugin).getHandler();
+        return permissions.has(defworld, player, name + "." + perm);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package org.dynmap.bukkit.permissions;
 
 import java.util.HashSet;
+import java.util.Set;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -24,4 +25,12 @@ public class OpPermissions implements PermissionProvider {
                 : true
             : true;
     }
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        return null;
+    }
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        return false;
+    }
 }

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

@@ -0,0 +1,65 @@
+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 ru.tehkode.permissions.PermissionManager;
+import ru.tehkode.permissions.PermissionUser;
+import ru.tehkode.permissions.bukkit.PermissionsEx;
+
+public class PEXPermissions implements PermissionProvider {
+    String name;
+    PermissionManager pm;
+
+    public static PEXPermissions create(Server server, String name) {
+        Plugin permissionsPlugin = server.getPluginManager().getPlugin("PermissionsEx");
+        if (permissionsPlugin == null)
+            return null;
+        server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        if(PermissionsEx.isAvailable() == false)
+            return null;
+        Log.info("Using PermissionsEx " + permissionsPlugin.getDescription().getVersion() + " for access control");
+        return new PEXPermissions(name);
+    }
+
+    public PEXPermissions(String name) {
+        this.name = name;
+        pm = PermissionsEx.getPermissionManager();
+    }
+
+    @Override
+    public boolean has(CommandSender sender, String permission) {
+        Player player = sender instanceof Player ? (Player) sender : null;
+        return (player != null) ? pm.has(player, name + "." + permission) : true;
+    }
+    
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        HashSet<String> hasperms = new HashSet<String>();
+        PermissionUser pu = pm.getUser(player);
+        if(pu != null) {
+            for (String pp : perms) {
+                if (pu.has(name + "." + pp)) {
+                    hasperms.add(pp);
+                }
+            }
+        }
+        return hasperms;
+    }
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        PermissionUser pu = pm.getUser(player);
+        if(pu != null) {
+            return pu.has(name + "." + perm);
+        }
+        return false;
+    }
+}

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

@@ -0,0 +1,34 @@
+package org.dynmap.bukkit.permissions;
+
+import java.util.Map;
+
+import org.bukkit.Server;
+import org.bukkit.plugin.Plugin;
+import org.dynmap.Log;
+
+import com.platymuus.bukkit.permissions.PermissionsPlugin;
+
+public class PermBukkitPermissions extends BukkitPermissions {
+    PermissionsPlugin plugin;
+    Map<String, Boolean> pd;
+    
+    public static PermBukkitPermissions create(Server server, String name, Map<String, Boolean> pd) {
+        Plugin permissionsPlugin = server.getPluginManager().getPlugin("PermissionsBukkit");
+        if (permissionsPlugin == null)
+            return null;
+        
+        server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        
+        Log.info("Using PermissionsBukkit " + permissionsPlugin.getDescription().getVersion() + " for access control");
+        Log.info("Web interface permissions only available for online users");
+        return new PermBukkitPermissions(permissionsPlugin, name, pd);
+    }
+
+    public PermBukkitPermissions(Plugin permissionsPlugin, String name, Map<String, Boolean> pd) {
+        super(name, pd);
+        plugin = (PermissionsPlugin) permissionsPlugin;
+        this.pd = pd;
+    }
+}

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

@@ -1,7 +1,14 @@
 package org.dynmap.bukkit.permissions;
 
+import java.util.Set;
+
 import org.bukkit.command.CommandSender;
 
 public interface PermissionProvider {
     boolean has(CommandSender sender, String permission);
+    
+    Set<String> hasOfflinePermissions(String player, Set<String> perms);
+
+    boolean hasOfflinePermission(String player, String perm);
+
 }

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

@@ -0,0 +1,82 @@
+package org.dynmap.bukkit.permissions;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.bukkit.Server;
+import org.bukkit.plugin.Plugin;
+import org.dynmap.Log;
+
+import de.bananaco.bpermissions.api.User;
+import de.bananaco.bpermissions.api.WorldManager;
+
+public class bPermPermissions extends BukkitPermissions {
+    WorldManager wm;
+
+    public static bPermPermissions create(Server server, String name, Map<String,Boolean> pd) {
+        Plugin permissionsPlugin = server.getPluginManager().getPlugin("bPermissions");
+        if (permissionsPlugin == null)
+            return null;
+        server.getPluginManager().enablePlugin(permissionsPlugin);
+        if(permissionsPlugin.isEnabled() == false)
+            return null;
+        
+        Log.info("Using bPermissions " + permissionsPlugin.getDescription().getVersion() + " for access control");
+        return new bPermPermissions(name, pd);
+    }
+
+    public bPermPermissions(String name, Map<String,Boolean> pd) {
+        super(name, pd);
+        wm = WorldManager.getInstance();
+    }
+
+    @Override
+    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
+        HashSet<String> hasperms = new HashSet<String>();
+        User usr = wm.getDefaultWorld().getUser(player);
+        if(usr != null) {
+            try { usr.calculateEffectivePermissions(); } catch (Exception x) {}
+            Map<String,Boolean> p = usr.getMappedPermissions();
+            for (String pp : perms) {
+                String permval = name + "." + pp;
+                Boolean v = p.get(permval);
+                if (v != null) {
+                    if(v.booleanValue())
+                        hasperms.add(permval);
+                }
+                else {
+                    v = pd.get(permval);
+                    if((v != null) && v.booleanValue())
+                        hasperms.add(permval);
+                }
+            }
+        }
+        return hasperms;
+    }
+
+    @Override
+    public boolean hasOfflinePermission(String player, String perm) {
+        boolean rslt;
+        String permval = name + "." + perm;
+        User usr = wm.getDefaultWorld().getUser(player);
+        if(usr != null) {
+            try { usr.calculateEffectivePermissions(); } catch (Exception x) {}
+            if(usr.getMappedPermissions().containsKey(permval)) {
+                rslt = usr.hasPermission(permval);
+            }
+            else {
+                Boolean v = pd.get(permval);
+                if(v != null)
+                    rslt = v;
+                else
+                    rslt = false;
+            }
+        }
+        else {
+            rslt = false;
+        }
+        return rslt;
+    }
+
+}

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

@@ -1,302 +0,0 @@
-package org.dynmap.herochat;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
-import org.bukkit.event.CustomEventListener;
-import org.bukkit.event.Event;
-import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.event.server.ServerListener;
-import org.bukkit.plugin.Plugin;
-import org.dynmap.Client;
-import org.dynmap.ConfigurationNode;
-import org.dynmap.DynmapCore;
-import org.dynmap.Log;
-import org.dynmap.bukkit.DynmapPlugin;
-
-/**
- * Bukkit specific module - alternate chat handler for interfacing with HeroChat
- */
-public class HeroChatHandler {
-    private static final String DEF_CHANNEL = "Global";
-    private static final List<String> DEF_CHANNELS = Collections
-            .singletonList(DEF_CHANNEL);
-
-    private List<String> hcchannels;
-    private String hcwebinputchannel;
-    private DynmapCore core;
-    private HeroChatChannel hcwebinputchan;
-
-    private class OurPluginListener extends ServerListener {
-        @Override
-        public void onPluginEnable(PluginEnableEvent event) {
-            Plugin plugin = event.getPlugin();
-            String name = plugin.getDescription().getName();
-
-            if (name.equals("HeroChat")) {
-                activateHeroChat(plugin);
-            }
-        }
-    }
-
-    /* Reflection-based access wrapper for ChannelChatEvent from HeroChat */
-    private static class HeroChatChannelChatEvent {
-        @SuppressWarnings("rawtypes")
-        private static Class channelchatevent;
-        private static Method getsource;
-        private static Method getmessage;
-        private static Method issentbyplayer;
-        private static boolean isgood = false;
-        private Event evt;
-
-        @SuppressWarnings("unchecked")
-        public static boolean initialize() {
-            try {
-                channelchatevent = Class
-                        .forName("com.herocraftonline.dthielke.herochat.event.ChannelChatEvent");
-                getsource = channelchatevent.getMethod("getSource", new Class[0]);
-                getmessage = channelchatevent.getMethod("getMessage", new Class[0]);
-                issentbyplayer = channelchatevent.getMethod("isSentByPlayer", new Class[0]);
-                isgood = true;
-            } catch (ClassNotFoundException cnfx) {
-            } catch (NoSuchMethodException nsmx) {
-            }
-            return isgood;
-        }
-
-        public HeroChatChannelChatEvent(Event evt) {
-            this.evt = evt;
-        }
-
-        public static boolean isInstance(Event evt) {
-            return channelchatevent.isInstance(evt);
-        }
-
-        public String getSource() {
-            try {
-                return (String) getsource.invoke(evt);
-            } catch (Exception x) {
-                return null;
-            }
-        }
-
-        public String getMessage() {
-            try {
-                return (String) getmessage.invoke(evt);
-            } catch (Exception x) {
-                return null;
-            }
-        }
-        
-        public boolean isSentByPlayer() {
-            try {
-                return (Boolean) issentbyplayer.invoke(evt);
-            } catch (Exception x) {
-                return true;
-            }
-        }
-    }
-
-    /* Reflection-based access wrapper for ChannelEvent from HeroChat */
-    private static class HeroChatChannelEvent {
-        @SuppressWarnings("rawtypes")
-        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 {
-                return (Boolean) iscancelled.invoke(evt);
-            } catch (Exception x) {
-                return true;
-            }
-        }
-    }
-
-    /* Reflection-based access wrapper for Channel from HeroChat */
-    private static class HeroChatChannel {
-        @SuppressWarnings("rawtypes")
-        private static Class channel;
-        private static Method getname;
-        private static Method getnick;
-        private static Method sendmessage;
-        private static boolean isgood = false;
-        private Object chan;
-
-        @SuppressWarnings("unchecked")
-        public static boolean initialize() {
-            try {
-                channel = Class
-                        .forName("com.herocraftonline.dthielke.herochat.channels.Channel");
-                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) {
-                Log.severe(nsmx);
-            }
-            return isgood;
-        }
-
-        public HeroChatChannel(Object chan) {
-            this.chan = chan;
-        }
-
-        public String getName() {
-            try {
-                return (String) getname.invoke(chan);
-            } catch (Exception x) {
-                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 {
-        /**
-         * Handle custom events
-         */
-        @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 (ce.isCancelled())
-                    return;
-                if((hcwebinputchannel != null) && ((hcwebinputchannel.equals(c.getName())) ||
-                        (hcwebinputchannel.equals(c.getNick())))) {
-                    hcwebinputchan = c;
-                }                
-                if (HeroChatChannelChatEvent.isInstance(event)) {
-                    HeroChatChannelChatEvent cce = new HeroChatChannelChatEvent(
-                        event);
-                    /* Match on name or nickname of channel */
-                    if (hcchannels.contains(c.getName()) ||
-                            hcchannels.contains(c.getNick())) {
-                        if(cce.isSentByPlayer()) {  /* Player message? */
-                            org.bukkit.entity.Player p = DynmapPlugin.plugin.getServer().getPlayer(cce.getSource());
-                            if((p != null) && (core.mapManager != null)) {
-                                core.mapManager.pushUpdate(new Client.ChatMessage("player", 
-                                                                                    c.getNick(),
-                                                                                    p.getDisplayName(),
-                                                                                    cce.getMessage(),
-                                                                                    p.getName()));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public HeroChatHandler(ConfigurationNode cfg, DynmapCore core) {
-        /* If we're enabling hero chat support */
-        Log.verboseinfo("HeroChat support configured");
-        this.core = core;
-        /* Now, get the monitored channel list */
-        hcchannels = cfg.getStrings("herochatchannels", DEF_CHANNELS);
-        /* And get channel to send web messages */
-        hcwebinputchannel = cfg.getString("herochatwebchannel", DEF_CHANNEL);
-        Plugin hc = DynmapPlugin.plugin.getServer().getPluginManager().getPlugin("HeroChat");
-        if(hc != null) {
-            activateHeroChat(hc);
-        }
-        else {
-            /* Set up to hear when HeroChat is enabled */
-            DynmapPlugin.plugin.bep.registerEvent(Event.Type.PLUGIN_ENABLE, new OurPluginListener());
-        }
-    }
-
-    private void activateHeroChat(Plugin herochat) {
-        if (HeroChatChannelChatEvent.initialize() == false) {
-            Log.severe("Cannot load HeroChat chat event class!");
-            return;
-        }
-        if (HeroChatChannel.initialize() == false) {
-            Log.severe("Cannot load HeroChat channel class!");
-            return;
-        }
-        if (HeroChatChannelEvent.initialize() == false) {
-            Log.severe("Cannot load HeroChat channel event class!");
-            return;
-        }
-        /* Register event handler */
-        DynmapPlugin.plugin.bep.registerEvent(Event.Type.CUSTOM_EVENT, new OurEventListener());
-        Log.verboseinfo("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;
-    }
-}