Bump to 0.38

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dynmap</groupId>
 	<artifactId>dynmap</artifactId>
-	<version>0.36</version>
+	<version>0.38</version>
 	<name>dynmap</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -133,7 +133,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>[1.1-R5-SNAPSHOT,1.7)</version>
+			<version>[1.2.5-R1.0,1.7)</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>

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,11 +15,12 @@ import org.dynmap.utils.MapChunkCache;
 
 public class BukkitWorld extends DynmapWorld {
     private World world;
+    private Permission perm;
     
     public BukkitWorld(World w) {
         super(w.getName(), w.getMaxHeight(), w.getSeaLevel());
-        
         world = w;
+        perm = new Permission("dynmap.world." + getName(), "Dynmap access for world " + getName(), PermissionDefault.OP);
     }
     /* Test if world is nether */
     @Override

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

@@ -2,9 +2,11 @@ package org.dynmap.bukkit;
 
 import java.io.File;
 import java.net.InetSocketAddress;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -48,6 +50,8 @@ import org.bukkit.event.world.SpawnChangeEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.event.world.WorldLoadEvent;
 import org.bukkit.event.world.WorldUnloadEvent;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
@@ -73,6 +77,7 @@ import org.dynmap.common.DynmapPlayer;
 import org.dynmap.common.DynmapServerInterface;
 import org.dynmap.common.DynmapListenerManager.EventType;
 import org.dynmap.markers.MarkerAPI;
+import org.getspout.spoutapi.plugin.SpoutPlugin;
 
 public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
     private DynmapCore core;
@@ -441,15 +446,22 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         /* Set up player login/quit event handler */
         registerPlayerLoginListener();
 
+        /* Build default permissions from our plugin */
+        Map<String, Boolean> perdefs = new HashMap<String, Boolean>();
+        List<Permission> pd = plugin.getDescription().getPermissions();
+        for(Permission p : pd) {
+            perdefs.put(p.getName(), p.getDefault() == PermissionDefault.TRUE);
+        }
+        
         permissions = PEXPermissions.create(getServer(), "dynmap");
         if (permissions == null)
-            permissions = bPermPermissions.create(getServer(), "dynmap");
+            permissions = bPermPermissions.create(getServer(), "dynmap", perdefs);
         if (permissions == null)
-            permissions = PermBukkitPermissions.create(getServer(), "dynmap");
+            permissions = PermBukkitPermissions.create(getServer(), "dynmap", perdefs);
         if (permissions == null)
             permissions = NijikokunPermissions.create(getServer(), "dynmap");
         if (permissions == null)
-            permissions = BukkitPermissions.create("dynmap");
+            permissions = BukkitPermissions.create("dynmap", perdefs);
         if (permissions == null)
             permissions = new OpPermissions(new String[] { "fullrender", "cancelrender", "radiusrender", "resetstats", "reload", "purgequeue", "pause", "ips-for-id", "ids-for-ip", "add-id-for-ip", "del-id-for-ip" });
         /* Get and initialize data folder */
@@ -813,6 +825,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                         return;
                     Block b = event.getBlock();
                     Material m = b.getType();
+                    if(m == null) return;
                     switch(m) {
                         case STATIONARY_WATER:
                         case WATER:
@@ -820,7 +833,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                         case LAVA:
                         case GRAVEL:
                         case SAND:
-                            checkBlock(event.getBlock(), "blockphysics");
+                            checkBlock(b, "blockphysics");
                             break;
                     }
                 }
@@ -835,12 +848,14 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
                 public void onBlockFromTo(BlockFromToEvent event) {
                     if(event.isCancelled())
                         return;
-                    Material m = event.getBlock().getType();
-                    if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE)) 
-                        checkBlock(event.getBlock(), "blockfromto");
-                    m = event.getToBlock().getType();
-                    if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE)) 
-                        checkBlock(event.getToBlock(), "blockfromto");
+                    Block b = event.getBlock();
+                    Material m = b.getType();
+                    if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE) && (m != null)) 
+                        checkBlock(b, "blockfromto");
+                    b = event.getToBlock();
+                    m = b.getType();
+                    if((m != Material.WOOD_PLATE) && (m != Material.STONE_PLATE) && (m != null)) 
+                        checkBlock(b, "blockfromto");
                 }
             };
             pm.registerEvents(fromtolistener, this);
@@ -1107,7 +1122,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
 
     private boolean detectSpout() {
         Plugin p = this.getServer().getPluginManager().getPlugin("Spout");
-        return (p != null);
+        if(p != null) {
+            return p.isEnabled();
+        }
+        return false;
     }
     
     public boolean hasSpout() {

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

@@ -590,11 +590,22 @@ public class NewMapChunkCache implements MapChunkCache {
     
     private static class SpoutChunkSnapshot implements ChunkSnapshot {
         private ChunkSnapshot chunk;
-        private short[] customids; /* (X << 11) | (Z << 7) | Y */ 
+        private short[] customids; 
+        private final int shiftx;
+        private final int shiftz;
         
-        SpoutChunkSnapshot(ChunkSnapshot chunk, short[] customids) {
+        SpoutChunkSnapshot(ChunkSnapshot chunk, short[] customids, int height) {
             this.chunk = chunk;
             this.customids = customids.clone();
+            int sx = 11;
+            int sz = 7; /* 128 high values */
+            while(height > 128) {
+                sx++;
+                sz++;
+                height = (height >> 1);
+            }
+            shiftx = sx;
+            shiftz = sz;
         }
         /* Need these for interface, but not used */
         public final int getX() { return chunk.getX(); }
@@ -606,7 +617,7 @@ public class NewMapChunkCache implements MapChunkCache {
         public final long getCaptureFullTime() { return chunk.getCaptureFullTime(); }
         
         public final int getBlockTypeId(int x, int y, int z) {
-            int id = customids[(x << 11) | (z << 7) | y];
+            int id = customids[(x << shiftx) | (z << shiftz) | y];
             if(id != 0) return id;
             return chunk.getBlockTypeId(x, y, z);
         }
@@ -716,7 +727,7 @@ public class NewMapChunkCache implements MapChunkCache {
             SpoutChunk sc = (SpoutChunk)c;
             short[] custids = sc.getCustomBlockIds();
             if(custids != null) {
-                return new SpoutChunkSnapshot(ss, custids);
+                return new SpoutChunkSnapshot(ss, custids, c.getWorld().getMaxHeight());
             }
         }
         return ss;
@@ -1049,6 +1060,9 @@ public class NewMapChunkCache implements MapChunkCache {
         Biome[] b = Biome.values();
         BiomeMap[] bm = BiomeMap.values();
         biome_to_bmap = new BiomeMap[b.length];
+        for(int i = 0; i < b.length; i++) {
+            biome_to_bmap[i] = BiomeMap.NULL;
+        }
         for(int i = 0; i < b.length; i++) {
             String bs = b[i].toString();
             for(int j = 0; j < bm.length; j++) {

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

@@ -14,6 +14,7 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 
+import org.bukkit.Material;
 import org.dynmap.Log;
 import org.getspout.spoutapi.block.design.BlockDesign;
 import org.getspout.spoutapi.block.design.GenericBlockDesign;
@@ -73,6 +74,7 @@ public class SpoutPluginBlocks {
         for(CustomBlock b : cb) {
             BlockDesign bd = b.getBlockDesign();
             String blkid = bd.getTexturePlugin() + "." + b.getName();
+            blkid = blkid.replace(' ', '_');
             /* If not GenericCubiodBlockDesign, we don't handle it */
             if((bd instanceof GenericCuboidBlockDesign) == false) {
                 Log.info("Block " + blkid + " not suppored - only cubiod blocks");
@@ -166,7 +168,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,6 +1,7 @@
 package org.dynmap.bukkit.permissions;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
@@ -10,20 +11,23 @@ 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
@@ -50,10 +54,16 @@ public class BukkitPermissions implements PermissionProvider {
 
     @Override
     public boolean hasOfflinePermission(String player, String perm) {
-        Player p = Bukkit.getPlayerExact(name);
-        if (p != null)
+        Player p = Bukkit.getPlayerExact(player);
+        if (p != null) {
             return p.hasPermission(name + "." + perm);
-        else
+        }
+        else {
+            OfflinePlayer op = Bukkit.getOfflinePlayer(player);
+            if((op != null) && op.isOp()) {
+                return true;
+            }
             return false;
+        }
     }
 }

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

@@ -25,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);
     }
@@ -47,6 +50,8 @@ public class NijikokunPermissions implements PermissionProvider {
     
     @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)) {
@@ -58,6 +63,8 @@ public class NijikokunPermissions implements PermissionProvider {
     
     @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/PEXPermissions.java

@@ -22,6 +22,8 @@ public class PEXPermissions implements PermissionProvider {
         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");

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

@@ -11,55 +11,34 @@ import org.bukkit.plugin.Plugin;
 import org.dynmap.Log;
 
 import com.nijiko.permissions.PermissionHandler;
+import com.platymuus.bukkit.permissions.PermissionInfo;
 import com.platymuus.bukkit.permissions.PermissionsPlugin;
 
 import de.bananaco.bpermissions.api.ApiLayer;
 import de.bananaco.bpermissions.api.util.CalculableType;
 import de.bananaco.bpermissions.api.util.Permission;
 
-public class PermBukkitPermissions implements PermissionProvider {
-    String name;
+public class PermBukkitPermissions extends BukkitPermissions {
     PermissionsPlugin plugin;
+    Map<String, Boolean> pd;
     
-    public static PermBukkitPermissions create(Server server, String name) {
+    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");
-        return new PermBukkitPermissions(permissionsPlugin, name);
+        Log.info("Web interface permissions only available for online users");
+        return new PermBukkitPermissions(permissionsPlugin, name, pd);
     }
 
-    public PermBukkitPermissions(Plugin permissionsPlugin, String name) {
-        this.name = name;
+    public PermBukkitPermissions(Plugin permissionsPlugin, String name, Map<String, Boolean> pd) {
+        super(name, pd);
         plugin = (PermissionsPlugin) permissionsPlugin;
-    }
-
-    @Override
-    public boolean has(CommandSender sender, String permission) {
-        Player player = sender instanceof Player ? (Player) sender : null;
-        return (player != null) ? plugin.getPlayerInfo(player.getName()).getPermissions().containsKey(name + "." + permission) : true;
-    }
-
-    @Override
-    public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
-        Map<String, Boolean> prm = plugin.getPlayerInfo(player).getPermissions();
-        HashSet<String> hasperms = new HashSet<String>();
-        for (String pp : perms) {
-            Boolean pb = prm.get(name + "." + pp);
-            if ((pb != null) && pb.booleanValue()) {
-                hasperms.add(pp);
-            }
-        }
-        return hasperms;
-    }
-    @Override
-    public boolean hasOfflinePermission(String player, String perm) {
-        Boolean b = plugin.getPlayerInfo(player).getPermissions().get(name + "." + perm);
-        if (b != null)
-            return b;
-        else
-            return false;
+        this.pd = pd;
     }
 }

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

@@ -1,51 +1,64 @@
 package org.dynmap.bukkit.permissions;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.Plugin;
 import org.dynmap.Log;
 
 import ru.tehkode.permissions.bukkit.PermissionsEx;
 
 import de.bananaco.bpermissions.api.ApiLayer;
+import de.bananaco.bpermissions.api.User;
+import de.bananaco.bpermissions.api.WorldManager;
 import de.bananaco.bpermissions.api.util.CalculableType;
 import de.bananaco.bpermissions.api.util.Permission;
 
-public class bPermPermissions implements PermissionProvider {
-    String name;
-    String defworld;
+public class bPermPermissions extends BukkitPermissions {
+    WorldManager wm;
 
-    public static bPermPermissions create(Server server, String name) {
+    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);
+        return new bPermPermissions(name, pd);
     }
 
-    public bPermPermissions(String name) {
-        this.name = name;
-        defworld = Bukkit.getServer().getWorlds().get(0).getName();
+    public bPermPermissions(String name, Map<String,Boolean> pd) {
+        super(name, pd);
+        wm = WorldManager.getInstance();
     }
 
-    @Override
-    public boolean has(CommandSender sender, String permission) {
-        Player player = sender instanceof Player ? (Player) sender : null;
-        return (player != null) ? ApiLayer.hasPermission(defworld, CalculableType.USER, player.getName(), name + "." + permission) : true;
-    }
-    
     @Override
     public Set<String> hasOfflinePermissions(String player, Set<String> perms) {
         HashSet<String> hasperms = new HashSet<String>();
-        for (String pp : perms) {
-            if(ApiLayer.hasPermission(defworld, CalculableType.USER, player, name + "." + pp)) {
-                hasperms.add(pp);
+        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;
@@ -53,7 +66,26 @@ public class bPermPermissions implements PermissionProvider {
 
     @Override
     public boolean hasOfflinePermission(String player, String perm) {
-        return ApiLayer.hasPermission(defworld, CalculableType.USER, player, name + "." + 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

@@ -30,13 +30,18 @@ components:
     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
@@ -53,6 +58,10 @@ components:
   #  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
@@ -227,6 +236,9 @@ compass-mode: newnorth
 # Enabled ComputerCraft block rendering support
 #computercraft-support: true
 
+# Enabled LC Trees++ block rendering support
+#lctrees-support: true
+
 render-triggers:
   #- playermove
   #- playerjoin
@@ -240,8 +252,8 @@ render-triggers:
   - blockspread
   - pistonmoved
   - explosion
-  - blockfromto
-  - blockphysics
+  #- blockfromto
+  #- blockphysics
   - structuregrow
   - blockgrow
 

src/main/resources/plugin.yml

@@ -155,6 +155,7 @@ permissions:
       dynmap.dmap.perspectivelist: true
       dynmap.dmap.shaderlist: true
       dynmap.dmap.lightinglist: true
+      dynmap.playermarkers.seeall: true
   dynmap.render:
     description: Allows /dynmap render command
     default: true
@@ -320,3 +321,6 @@ permissions:
   dynmap.webchat:
     description: Allows web chat (if login required for webchat)
     default: true
+  dynmap.playermarkers.seeall:
+    description: Allow all players to be seen by user on web UI
+    default: op