Back to 1.1 for patch

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.34</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-R5-SNAPSHOT,1.7)</version>
+			<version>[1.2.5-R4.0,1.7)</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -158,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.1</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/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,40 +15,85 @@ import org.dynmap.utils.MapChunkCache;
 
 public class BukkitWorld extends DynmapWorld {
     private World world;
+    private World.Environment env;
+    private boolean skylight;
+    private DynmapLocation spawnloc = new DynmapLocation();
     
     public BukkitWorld(World w) {
-        super(normalizeWorldName(w.getName()), w.getMaxHeight(), w.getSeaLevel());
-        
+        this(w.getName(), w.getMaxHeight(), w.getSeaLevel(), w.getEnvironment());
+        setWorldLoaded(w);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    public BukkitWorld(String name, int height, int sealevel, World.Environment env) {
+        super(name, height, sealevel);
+        world = null;
+        this.env = env;
+        skylight = (env == World.Environment.NORMAL);
+        new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
+    }
+    /**
+     * 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 = normalizeWorldName(sloc.getWorld().getName());
-        return dloc;
+        if(world != null) {
+            Location sloc = world.getSpawnLocation();
+            spawnloc.x = sloc.getBlockX();
+            spawnloc.y = sloc.getBlockY();
+            spawnloc.z = sloc.getBlockZ(); 
+            spawnloc.world = normalizeWorldName(sloc.getWorld().getName());
+        }
+        return spawnloc;
     }
     /* Get world time */
     @Override
     public long getTime() {
-        return world.getTime();
+        if(world != null) {
+            return world.getTime();
+        }
+        else {
+            return -1;
+        }
     }
     /* World is storming */
     @Override
     public boolean hasStorm() {
-        return world.hasStorm();
+        if(world != null) {
+            return world.hasStorm();
+        }
+        else {
+            return false;
+        }
     }
     /* World is thundering */
     @Override
     public boolean isThundering() {
-        return world.isThundering();
+        if(world != null) {
+            return world.isThundering();
+        }
+        else {
+            return false;
+        }
     }
     /* World is loaded */
     @Override
@@ -56,45 +103,61 @@ 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 true;
+        return skylight && (world != null);
     }
     /* Return sky light level */
     @Override
     public int getSkyLightLevel(int x, int y, int z) {
-        return world.getBlockAt(x, y, z).getLightFromSky();
+        if(world != null) {
+            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() {
         return world;
     }
-    
-    public static String normalizeWorldName(String n) {
-        return n.replace('/', '-');
-    }
 }

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

@@ -14,6 +14,9 @@ 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;
@@ -31,7 +34,29 @@ import org.getspout.spoutapi.material.MaterialData;
 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 {
@@ -53,13 +78,31 @@ public class SpoutPluginBlocks {
             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");
@@ -72,7 +115,7 @@ 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();
+            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");
@@ -109,53 +152,59 @@ public class SpoutPluginBlocks {
             String txtid = texturelist.get(txname);    /* Get texture */
             if(txtid == null) { /* Not found yet */
                 File imgfile = new File(f, blkid + ".png");
-                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 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(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) {
-                        Log.severe("Error loading texture for custom block '" + blkid + "' (" + b.getCustomId() + ") from " + txname + "(" + iox.getMessage() + ")");
-                        if(imgfile.exists()) {
-                            try {
-                                img = ImageIO.read(imgfile);    /* Load existing */
-                                Log.info("Loaded cached texture file for " + blkid);
-                            } catch (IOException iox2) {
-                                Log.severe("Error loading cached texture file for " + blkid + " - " + iox2.getMessage());
-                            }
+                    if(img != null) {
+                        try {
+                            if(urlloaded)
+                                ImageIO.write(img, "png", imgfile);
+                        } catch (IOException iox) {
+                            Log.severe("Error writing " + blkid + ".png");
+                        } finally {
+                            img.flush();
                         }
                     }
                 }
-                if(img != null) {
-                    try {
-                        if(urlloaded)
-                            ImageIO.write(img, "png", imgfile);
-                    } catch (IOException iox) {
-                        Log.severe("Error writing " + blkid + ".png");
-                    } finally {
-                        img.flush();
-                    }
+                if(imgfile.exists()) {  /* If exists now, log it */
                     String tfid = "txtid" + texturelist.size();
                     sb.append("texturefile:id=" + tfid + ",filename=spout/" + blkid + ".png,xcount=" + w/sz + ",ycount=" + h/sz + "\n");                                   
                     texturelist.put(txname, tfid);
@@ -166,7 +215,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/resources/configuration.txt

@@ -28,12 +28,20 @@ components:
     require-player-login-ip: false
     # (optional) block player login IDs that are banned from chatting
     block-banned-player-chat: true
+    # Require login for web-to-server chat (requires login-enabled: true)
+    webchat-requires-login: false
+    # If set to true, users must have dynmap.webchat permission in order to chat
+    webchat-permissions: false
+    # Limit length of single chat messages
+    chatlengthlimit: 256
   #  # Optional - make players hidden when they are inside/underground/in shadows (#=light level: 0=full shadow,15=sky)
   #  hideifshadow: 4
   #  # Optional - make player hidden when they are under cover (#=sky light level,0=underground,15=open to sky)
   #  hideifundercover: 14
   #  # (Optional) if true, players that are crouching/sneaking will be hidden 
-  #  hideifsneaking: false
+    hideifsneaking: false
+    # If true, player positions/status is protected (login with ID with dynmap.playermarkers.seeall permission required for info other than self)
+    protected-player-info: false
   #- class: org.dynmap.JsonFileClientUpdateComponent
   #  writeinterval: 1
   #  sendhealth: true
@@ -48,6 +56,12 @@ components:
   #  hideifshadow: 0
   #  hideifundercover: 0
   #  hideifsneaking: false
+  #  # Require login for web-to-server chat (requires login-enabled: true)
+  #  webchat-requires-login: false
+  #  # If set to true, users must have dynmap.webchat permission in order to chat
+  #  webchat-permissions: false
+  #  # Limit length of single chat messages
+  #  chatlengthlimit: 256
    
   - class: org.dynmap.SimpleWebChatComponent
     allowchat: true
@@ -90,6 +104,8 @@ components:
     messagettl: 5
     # Optional: set number of lines in scrollable message history: if set, messagettl is not used to age out messages
     #scrollback: 100
+    # Optiona; set maximum number of lines visible for chatbox
+    #visiblelines: 10
     # Optional: send push button
     sendbutton: false
   - class: org.dynmap.ClientComponent
@@ -123,11 +139,14 @@ components:
     hidey: false
     show-mcr: false
     
+  # Note: more than one logo component can be defined
   #- class: org.dynmap.ClientComponent
   #  type: logo
   #  text: "Dynmap"
   #  #logourl: "images/block_surface.png"
   #  linkurl: "http://forums.bukkit.org/threads/dynmap.489/"
+  #  # Valid positions: top-left, top-right, bottom-left, bottom-right
+  #  position: bottom-right
 
   #- class: org.dynmap.ClientComponent
   #  type: inactive
@@ -167,17 +186,9 @@ zoomoutperiod: 30
 # Tile hashing is used to minimize tile file updates when no changes have occurred - set to false to disable
 enabletilehash: true
 
-# Optional - control darkening of biome-shaded colors in swamp biomes (1.9+) - default is true for 1.9+, false for 1.8.x
-#swampshaded: false
-# Optional - control biome shading of water (1.9+) - default is true for 1.9+, false for 1.8.x
-#waterbiomeshaded: false
-
 # Optional - hide ores: render as normal stone (so that they aren't revealed by maps)
 #hideores: true
 
-# Optional - control rendering of fences (joining to blocks, as in 1.9+) - default is true for 1.9+, false for 1.8.x
-#fence-to-block-join: true
-
 # Optional - enabled BetterGrass style rendering of grass and snow block sides
 #better-grass: true
 
@@ -188,15 +199,10 @@ smooth-lighting: false
 # Has no effect on maps with explicit format settings
 image-format: png
 
-# Pre 0.29 render options - set all three to false if you want same results as 0.28 (i.e. you have existing maps and don't want to render)
-#  use-generated-textures: if true, use generated textures (same as client); false is static, pre 0.29 textures
-#  correct-water-lighting: if true, use corrected water lighting (same as client); false is legacy, pre 0.29 water (darker)
-#  correct-biome-shading: if true, use fixed color mappings for birch, pine, lily, and proper water shading (same as client); false is pre 0.29
+#  use-generated-textures: if true, use generated textures (same as client); false is static water/lava textures
+#  correct-water-lighting: if true, use corrected water lighting (same as client); false is legacy water (darker)
 use-generated-textures: true
 correct-water-lighting: true
-correct-biome-shading: true
-# To enable smooth biome shading (as done in MC 1.1.0+), set this to true (this does increase render processing about 10%)
-smooth-biome-shading: true
 
 # Control loading of player faces (if set to false, skins are never fetched)
 #fetchskins: false
@@ -204,35 +210,14 @@ smooth-biome-shading: true
 # Control updating of player faces, once loaded (if faces are being managed by other apps or manually)
 #refreshskins: false
 
-# Control behavior for new (1.9+) compass orientation (sunrise moved 90 degrees: east is now what used to be south)
-#   default is 'pre19' for 1.8 server (existing orientation), 'newrose' for 1.9+ (preserve maps, rotate rose)
+# Customize URL used for fetching player skins (%player% is macro for name)
+skin-url: "http://s3.amazonaws.com/MinecraftSkins/%player%.png"
+
+# Control behavior for new (1.0+) compass orientation (sunrise moved 90 degrees: east is now what used to be south)
+#   default is 'newrose' (preserve pre-1.0 maps, rotate rose)
 #   'newnorth' is used to rotate maps and rose (requires fullrender of any HDMap map - same as 'newrose' for FlatMap or KzedMap)
 compass-mode: newnorth
 
-# Enable Industrial Craft 2 block rendering support (core, Advanced Machines, Charging Bench, Power Converters)
-#ic2-support: true
-#ic2-advancesmachines-support: true
-#ic2-chargingbench-support: true
-#ic2-powerconverters-support: true
-
-# Enable BuildCraft block rendering support
-#buildcraft-support: true
-
-# Enable RedPower2 block rendering support
-#redpower2-support: true
-
-# Enable NetherOres block rendering support
-#netherores-support: true
-
-# Enable RailCraft block rendering support
-#railcraft-support: true
-
-# Enable Kaevator's Superslopes block rendering support
-#superslopes-support: true
-
-# Enabled ComputerCraft block rendering support
-#computercraft-support: true
-
 render-triggers:
   #- playermove
   #- playerjoin
@@ -246,10 +231,11 @@ render-triggers:
   - blockspread
   - pistonmoved
   - explosion
-  - blockfromto
-  - blockphysics
+  #- blockfromto
+  #- blockphysics
   - structuregrow
   - blockgrow
+  #- blockredstone
 
 # Title for the web page - if not specified, defaults to the server's name (unless it is the default of 'Unknown Server')
 #webpage-title: "My Awesome Server Map"
@@ -275,6 +261,11 @@ disable-webserver: false
 # Enable/disable having the web server allow symbolic links (true=compatible with existing code, false=more secure (default))
 allow-symlinks: true
 
+# Enable login support
+login-enabled: false
+# Require login to access website (requires login-enabled: true)
+login-required: false
+
 # Period between tile renders for fullrender, in seconds (non-zero to pace fullrenders, lessen CPU load)
 timesliceinterval: 0.0
 
@@ -328,9 +319,6 @@ defaultmap: flat
 #followzoom: 3
 #followmap: surface
 
-# Option to enable workaround for incorrectly encoded unicode in Cyrillic MC/Bukkit (not good for other code pages)
-cyrillic-support: false
-
 # If true, make persistent record of IP addresses used by player logins, to support web IP to player matching
 persist-ids-by-ip: true
 
@@ -338,7 +326,35 @@ persist-ids-by-ip: true
 msg:
     maptypes: "Map Types"
     players: "Players"
+    chatrequireslogin: "Chat Requires Login"
+    chatnotallowed: "You are not permitted to send chat messages"
 
+# URL for client configuration (only need to be tailored for proxies or other non-standard configurations)
+url:
+    # configuration URL
+    #configuration: "up/configuration"
+    # update URL
+    #update: "up/world/{world}/{timestamp}"
+    # sendmessage URL
+    #sendmessage: "up/sendmessage"
+    # login URL
+    #login: "up/login"
+    # register URL
+    #register: "up/register"
+    # tiles base URL
+    #tiles: "tiles/"
+    # markers base URL
+    #markers: "tiles/"
+    
+# Spout support controls
+spout:
+    # If false, ignore spout even if detected
+    enabled: true
+    # If true, previously loaded textures will be assumed to still be valid (faster startup, but
+    # can result in stale textures if originals are updated - delete files in texturepacks/standard/spoout
+    # to clean cached textures and force reload on next startup)
+    use-existing-textures: true
+    
 # Set to true to enable verbose startup messages - can help with debugging map configuration problems
 # Set to false for a much quieter startup log
 verbose: false