Add cyrillic setting back in to configuration.txt

to be reliable

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,6 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dynmap</groupId>
 	<artifactId>dynmap</artifactId>
-	<version>0.30.1</version>
 	<name>dynmap</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -128,12 +127,14 @@
 		<dependency>
 			<groupId>com.nijikokun.bukkit</groupId>
 			<artifactId>Permissions</artifactId>
-			<version>[2.5.4,)</version>
+			<version>3.1.6</version>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/Permissions.jar</systemPath>
 		</dependency>
 		<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 +145,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 +159,32 @@
 			<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>
+		<dependency>
+			<groupId>org.bukkit</groupId>
+			<artifactId>craftbukkit</artifactId>
+			<version>1.2.5-R5.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
+	<version>1.2</version>
 </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,416 +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.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 */
-        }
-        pm = null;
-        plugin = null;
-    }
-    
-    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) {
-            /* 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);
-                }
-            }
-        }
-    };
-    
-    /**
-     * 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;
-                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/BukkitVersionHelper.java

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

src/main/java/org/dynmap/bukkit/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,41 +15,85 @@ 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;
+    private DynmapLocation spawnloc = new DynmapLocation();
     
     public BukkitWorld(World w) {
-        super(w.getName());
-        
+        this(w.getName(), w.getMaxHeight(), w.getSeaLevel(), w.getEnvironment());
+        setWorldLoaded(w);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    public BukkitWorld(String name, int height, int sealevel, World.Environment env) {
+        super(name, height, sealevel);
+        world = null;
+        this.env = env;
+        skylight = (env == World.Environment.NORMAL);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    /**
+     * Set world online
+     * @param w - loaded world
+     */
+    public void setWorldLoaded(World w) {
         world = w;
+        env = world.getEnvironment();
+        skylight = (env == World.Environment.NORMAL);
+    }
+    /**
+     * Set world unloaded
+     */
+    @Override
+    public void setWorldUnloaded() {
+        getSpawnLocation(); /* Remember spawn location before unload */
+        world = null;
     }
     /* 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
     public DynmapLocation getSpawnLocation() {
-        DynmapLocation dloc = new DynmapLocation();
-        Location sloc = world.getSpawnLocation();
-        dloc.x = sloc.getBlockX(); dloc.y = sloc.getBlockY();
-        dloc.z = sloc.getBlockZ(); dloc.world = sloc.getWorld().getName();
-        return dloc;
+        if(world != null) {
+            Location sloc = world.getSpawnLocation();
+            spawnloc.x = sloc.getBlockX();
+            spawnloc.y = sloc.getBlockY();
+            spawnloc.z = sloc.getBlockZ(); 
+            spawnloc.world = normalizeWorldName(sloc.getWorld().getName());
+        }
+        return spawnloc;
     }
     /* Get world time */
     @Override
     public long getTime() {
-        return world.getTime();
+        if(world != null) {
+            return world.getTime();
+        }
+        else {
+            return -1;
+        }
     }
     /* World is storming */
     @Override
     public boolean hasStorm() {
-        return world.hasStorm();
+        if(world != null) {
+            return world.hasStorm();
+        }
+        else {
+            return false;
+        }
     }
     /* World is thundering */
     @Override
     public boolean isThundering() {
-        return world.isThundering();
+        if(world != null) {
+            return world.isThundering();
+        }
+        else {
+            return false;
+        }
     }
     /* World is loaded */
     @Override
@@ -57,38 +103,58 @@ public class BukkitWorld extends DynmapWorld {
     /* Get light level of block */
     @Override
     public int getLightLevel(int x, int y, int z) {
-        return world.getBlockAt(x, y, z).getLightLevel();
+        if(world != null) {
+            return world.getBlockAt(x, y, z).getLightLevel();
+        }
+        else {
+            return -1;
+        }
     }
     /* Get highest Y coord of given location */
     @Override
     public int getHighestBlockYAt(int x, int z) {
-        return world.getHighestBlockYAt(x, z);
+        if(world != null) {
+            return world.getHighestBlockYAt(x, z);
+        }
+        else {
+            return -1;
+        }
     }
     /* Test if sky light level is requestable */
     @Override
     public boolean canGetSkyLightLevel() {
-        return bll.isReady();
+        return skylight && (world != null);
     }
     /* Return sky light level */
     @Override
     public int getSkyLightLevel(int x, int y, int z) {
-        return bll.getSkyLightLevel(world.getBlockAt(x, y, z));
+        if(world != null) {
+            return world.getBlockAt(x, y, z).getLightFromSky();
+        }
+        else {
+            return -1;
+        }
     }
     /**
      * 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
      */
     @Override
     public MapChunkCache getChunkCache(List<DynmapChunk> chunks) {
-        NewMapChunkCache c = new NewMapChunkCache();
-        c.setChunks(this, chunks);
-        return c;
+        if(isLoaded()) {
+            NewMapChunkCache c = new NewMapChunkCache();
+            c.setChunks(this, chunks);
+            return c;
+        }
+        else {
+            return null;
+        }
     }
     
     public World getWorld() {

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

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

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

@@ -5,14 +5,23 @@ 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;
 
@@ -23,9 +32,78 @@ import org.getspout.spoutapi.material.MaterialData;
  * 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(File datadir) {
+    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)
@@ -37,69 +115,110 @@ public class SpoutPluginBlocks {
         /* Loop through blocks - try to freshen files, if needed */
         for(CustomBlock b : cb) {
             BlockDesign bd = b.getBlockDesign();
-            String blkid = bd.getTexturePlugin() + "." + b.getName();
-            File imgfile = new File(f, blkid + ".png");
-            BufferedImage img = null;
-            boolean urlloaded = false;
-            String txname = bd.getTexureURL();
+            String blkid = bd.getTexturePlugin() + "." + fixIDString(b.getName());
+            /* If not GenericCubiodBlockDesign, we don't handle it */
+            if((bd instanceof GenericCuboidBlockDesign) == false) {
+                Log.info("Block " + blkid + " not suppored - only cubiod blocks");
+                addDefaultBlock(sb, b);
+                continue;
+            }
+            /* Get texture info */
+            Texture txt = bd.getTexture();
+            int w = txt.getWidth();
+            int h = txt.getHeight();
+            int sz = txt.getSpriteSize();
+            GenericCuboidBlockDesign gbd = (GenericCuboidBlockDesign)bd;
+            int[] txtidx = new int[6];
+            /* Fetch quad fields - figure out which texture for which side */
             try {
-                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) {}
+                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]);
                     }
-                    if(tf.exists()) {
+                    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 {
-                            img = ImageIO.read(tf);
-                            urlloaded = true;
-                        } catch (IOException iox3) {
-                            
+                            if(urlloaded)
+                                ImageIO.write(img, "png", imgfile);
+                        } catch (IOException iox) {
+                            Log.severe("Error writing " + blkid + ".png");
+                        } finally {
+                            img.flush();
                         }
                     }
                 }
-                if(img == null) {
-                    Log.severe("Error loading texture for custom block '" + blkid + "' (" + b.getCustomId() + ") from " + bd.getTexureURL() + "(" + 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(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);
                 }
             }
-            if(img != null) {
-                try {
-                    if(urlloaded)
-                        ImageIO.write(img, "png", imgfile);
-                    blks.add(b);
-                    int w = img.getWidth();
-                    int h = img.getHeight();
-                    /* If width >= 6 times height, we're using custom for each side */
-                    sb.append("texturefile:id=" + blkid + ",filename=spout/" + blkid + ".png,xcount=" + w/h + ",ycount=1\n");
-                    if(w >= (6*h)) {
-                        sb.append("block:id=" + b.getCustomId() + ",data=*,bottom=0,north=1,south=2,east=3,west=4,top=5,txtid=" + blkid + "\n");
-                    }
-                    else {
-                        sb.append("block:id=" + b.getCustomId() + ",data=*,allfaces=0,txtid=" + blkid + "\n");
-                    }
-                    cnt++;
-                } catch (IOException iox) {
-                    Log.severe("Error writing " + blkid + ".png");
-                } finally {
-                    img.flush();
-                }
+            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();

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;
+    }
+}