Changed instances of Pattern, Mask, etc. to newer versions.

Most affected is the brush code.

src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java

@@ -22,13 +22,15 @@ package com.sk89q.worldedit.command.tool;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
 
 /**
  * A super pickaxe mode that will remove blocks in an area.
- * 
- * @author sk89q
  */
 public class AreaPickaxe implements BlockTool {
+
     private static final BaseBlock air = new BaseBlock(0);
     private int range;
 
@@ -36,17 +38,17 @@ public class AreaPickaxe implements BlockTool {
         this.range = range;
     }
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.superpickaxe.area");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
-        LocalWorld world = clicked.getWorld();
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
         int ox = clicked.getBlockX();
         int oy = clicked.getBlockY();
         int oz = clicked.getBlockZ();
-        int initialType = world.getBlockType(clicked);
+        int initialType = clicked.getWorld().getBlockType(clicked.toVector());
 
         if (initialType == 0) {
             return true;
@@ -68,7 +70,7 @@ public class AreaPickaxe implements BlockTool {
                             continue;
                         }
 
-                        world.queueBlockBreakEffect(server, pos, initialType, clicked.distanceSq(pos));
+                        clicked.getWorld().queueBlockBreakEffect(server, pos, initialType, clicked.toVector().distanceSq(pos));
 
                         editSession.setBlock(pos, air);
                     }
@@ -83,4 +85,5 @@ public class AreaPickaxe implements BlockTool {
 
         return true;
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/BlockDataCyler.java

@@ -19,29 +19,34 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.World;
 
 /**
  * A mode that cycles the data values of supported blocks.
- * 
- * @author sk89q
  */
 public class BlockDataCyler implements DoubleActionBlockTool {
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.data-cycler");
     }
 
-    private boolean handleCycle(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked, boolean forward) {
+    private boolean handleCycle(Platform server, LocalConfiguration config,
+            Player player, LocalSession session, Location clicked, boolean forward) {
 
-        LocalWorld world = clicked.getWorld();
+        World world = clicked.getWorld();
 
-        int type = world.getBlockType(clicked);
-        int data = world.getBlockData(clicked);
+        int type = world.getBlockType(clicked.toVector());
+        int data = world.getBlockData(clicked.toVector());
 
-        if (config.allowedDataCycleBlocks.size() > 0
+        if (!config.allowedDataCycleBlocks.isEmpty()
                 && !player.hasPermission("worldedit.override.data-cycler")
                 && !config.allowedDataCycleBlocks.contains(type)) {
             player.printError("You are not permitted to cycle the data value of that block.");
@@ -54,20 +59,19 @@ public class BlockDataCyler implements DoubleActionBlockTool {
         if (data < 0) {
             player.printError("That block's data cannot be cycled!");
         } else {
-            world.setBlockData(clicked, data);
+            world.setBlockData(clicked.toVector(), data);
         }
 
         return true;
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
         return handleCycle(server, config, player, session, clicked, true);
     }
 
-    public boolean actSecondary(ServerInterface server,
-            LocalConfiguration config, LocalPlayer player,
-            LocalSession session, WorldVector clicked) {
+    @Override
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
         return handleCycle(server, config, player, session, clicked, false);
     }
 

src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

@@ -20,37 +20,40 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockType;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.world.World;
 
 /**
  * A mode that replaces one block.
- * 
- * @author sk89q
  */
 public class BlockReplacer implements DoubleActionBlockTool {
+
     private BaseBlock targetBlock;
 
     public BlockReplacer(BaseBlock targetBlock) {
         this.targetBlock = targetBlock;
     }
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.replacer");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
+BlockBag bag = session.getBlockBag(player);
 
-        BlockBag bag = session.getBlockBag(player);
-
-        LocalWorld world = clicked.getWorld();
+        World world = clicked.getWorld();
         EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, bag, player);
 
         try {
-            editSession.setBlock(clicked, targetBlock);
-        } catch (MaxChangedBlocksException e) {
+            editSession.setBlock(clicked.toVector(), targetBlock);
+        } catch (MaxChangedBlocksException ignored) {
         } finally {
             if (bag != null) {
                 bag.flushChanges();
@@ -61,13 +64,12 @@ public class BlockReplacer implements DoubleActionBlockTool {
         return true;
     }
 
-    public boolean actSecondary(ServerInterface server,
-            LocalConfiguration config, LocalPlayer player,
-            LocalSession session, WorldVector clicked) {
 
-        LocalWorld world = clicked.getWorld();
+    @Override
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
+        World world = clicked.getWorld();
         EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, player);
-        targetBlock = (editSession).getBlock(clicked);
+        targetBlock = (editSession).getBlock(clicked.toVector());
         BlockType type = BlockType.fromID(targetBlock.getType());
 
         if (type != null) {

src/main/java/com/sk89q/worldedit/command/tool/BlockTool.java

@@ -19,25 +19,13 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.util.Location;
 
-/**
- * Represents a tool that uses a block..
- * 
- * @author sk89q
- */
 public interface BlockTool extends Tool {
-    /**
-     * Perform the action. Should return true to deny the default
-     * action.
-     * 
-     * @param server 
-     * @param config 
-     * @param player
-     * @param session
-     * @param clicked
-     * @return true to deny
-     */
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked);
+
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked);
 }

src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java

@@ -20,28 +20,30 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.masks.CombinedMask;
-import com.sk89q.worldedit.masks.Mask;
-import com.sk89q.worldedit.patterns.Pattern;
-import com.sk89q.worldedit.patterns.SingleBlockPattern;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.command.tool.brush.SphereBrush;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.MaskIntersection;
+import com.sk89q.worldedit.function.pattern.BlockPattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.session.request.Request;
 
 /**
  * Builds a shape at the place being looked at.
- * 
- * @author sk89q
  */
 public class BrushTool implements TraceTool {
+
     protected static int MAX_RANGE = 500;
     protected int range = -1;
     private Mask mask = null;
     private Brush brush = new SphereBrush();
-    private Pattern material = new SingleBlockPattern(new BaseBlock(BlockID.COBBLESTONE));
+    private Pattern material = new BlockPattern(new BaseBlock(BlockID.COBBLESTONE));
     private double size = 1;
     private String permission;
 
@@ -54,14 +56,8 @@ public class BrushTool implements TraceTool {
         this.permission = permission;
     }
 
-    /**
-     * Checks to see if the player can still be using this tool (considering
-     * permissions and such).
-     * 
-     * @param player
-     * @return
-     */
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission(permission);
     }
 
@@ -151,22 +147,14 @@ public class BrushTool implements TraceTool {
     /**
      * Set the set brush range.
      * 
-     * @param size
+     * @param range
      */
     public void setRange(int range) {
         this.range = range;
     }
 
-    /**
-     * Perform the action. Should return true to deny the default
-     * action.
-     * 
-     * @param player
-     * @param session
-     * @return true to deny
-     */
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session) {
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
         WorldVector target = null;
         target = player.getBlockTrace(getRange(), true);
 
@@ -180,14 +168,14 @@ public class BrushTool implements TraceTool {
         EditSession editSession = session.createEditSession(player);
         Request.request().setEditSession(editSession);
         if (mask != null) {
-            mask.prepare(session, player, target);
             Mask existingMask = editSession.getMask();
+
             if (existingMask == null) {
                 editSession.setMask(mask);
-            } else if (existingMask instanceof CombinedMask) {
-                ((CombinedMask) existingMask).add(mask);
+            } else if (existingMask instanceof MaskIntersection) {
+                ((MaskIntersection) existingMask).add(mask);
             } else {
-                CombinedMask newMask = new CombinedMask(existingMask);
+                MaskIntersection newMask = new MaskIntersection(existingMask);
                 newMask.add(mask);
                 editSession.setMask(newMask);
             }

src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java

@@ -20,12 +20,13 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.regions.RegionSelector;
 
 /**
  * A wand that can be used at a distance.
- * 
- * @author wizjany
  */
 public class DistanceWand extends BrushTool implements DoubleActionTraceTool {
 
@@ -34,12 +35,12 @@ public class DistanceWand extends BrushTool implements DoubleActionTraceTool {
     }
 
     @Override
-    public boolean canUse(LocalPlayer player) {
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.wand");
     }
 
-    public boolean actSecondary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session) {
+    @Override
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
         if (session.isToolControlEnabled() && player.hasPermission("worldedit.selection.pos")) {
             WorldVector target = getTarget(player);
             if (target == null) return true;
@@ -56,8 +57,7 @@ public class DistanceWand extends BrushTool implements DoubleActionTraceTool {
     }
 
     @Override
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session) {
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
         if (session.isToolControlEnabled() && player.hasPermission("worldedit.selection.pos")) {
             WorldVector target = getTarget(player);
             if (target == null) return true;
@@ -72,7 +72,7 @@ public class DistanceWand extends BrushTool implements DoubleActionTraceTool {
         return false;
     }
 
-    public WorldVector getTarget(LocalPlayer player) {
+    public WorldVector getTarget(Player player) {
         WorldVector target = null;
         if (this.range > -1) {
             target = player.getBlockTrace(getRange(), true);

src/main/java/com/sk89q/worldedit/command/tool/DoubleActionBlockTool.java

@@ -20,28 +20,16 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.ServerInterface;
-import com.sk89q.worldedit.WorldVector;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.util.Location;
 
 /**
  * Represents a block tool that also has a secondary/primary function.
- *
- * @author sk89q
  */
 public interface DoubleActionBlockTool extends BlockTool {
-    /**
-     * Perform the secondary action. Should return true to deny the default
-     * action.
-     * 
-     * @param server 
-     * @param config 
-     * @param player
-     * @param session
-     * @param clicked
-     * @return true to deny
-     */
-    public boolean actSecondary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked);
+
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked);
+
 }

src/main/java/com/sk89q/worldedit/command/tool/DoubleActionTraceTool.java

@@ -20,24 +20,15 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.ServerInterface;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Platform;
 
 /**
  * Represents a trace tool that also has a secondary/primary function.
  */
 public interface DoubleActionTraceTool extends TraceTool {
-    /**
-     * Perform the secondary action. Should return true to deny the default
-     * action.
-     * 
-     * @param server 
-     * @param config 
-     * @param player
-     * @param session
-     * @return true to deny
-     */
-    public boolean actSecondary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session);
+
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session);
+
 }

src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java

@@ -19,18 +19,22 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Set;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.World;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Set;
 
 /**
  * A pickaxe mode that removes floating treetops (logs and leaves not connected
  * to anything else)
- *
- * @author Moo0
  */
 public class FloatingTreeRemover implements BlockTool {
     private static final BaseBlock AIR = new BaseBlock(BlockID.AIR);
@@ -40,16 +44,18 @@ public class FloatingTreeRemover implements BlockTool {
         rangeSq = 100*100;
     }
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.deltree");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config,
+            Player player, LocalSession session, Location clicked) {
 
-        final LocalWorld world = clicked.getWorld();
+        final World world = clicked.getWorld();
 
-        switch (world.getBlockType(clicked)) {
+        switch (world.getBlockType(clicked.toVector())) {
         case BlockID.LOG:
         case BlockID.LOG2:
         case BlockID.LEAVES:
@@ -67,7 +73,7 @@ public class FloatingTreeRemover implements BlockTool {
         final EditSession editSession = session.createEditSession(player);
 
         try {
-            final Set<Vector> blockSet = bfs(world, clicked);
+            final Set<Vector> blockSet = bfs(world, clicked.toVector());
             if (blockSet == null) {
                 player.printError("That's not a floating tree.");
                 return true;
@@ -111,7 +117,7 @@ public class FloatingTreeRemover implements BlockTool {
      * @param origin any point contained in the floating tree
      * @return a set containing all blocks in the tree/shroom or null if this is not a floating tree/shroom.
      */
-    private Set<Vector> bfs(LocalWorld world, Vector origin) throws MaxChangedBlocksException {
+    private Set<Vector> bfs(World world, Vector origin) throws MaxChangedBlocksException {
         final Set<Vector> visited = new HashSet<Vector>();
         final LinkedList<Vector> queue = new LinkedList<Vector>();
 

src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java

@@ -19,18 +19,23 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import java.util.HashSet;
-import java.util.Set;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.World;
+
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * A tool that flood fills blocks.
- * 
- * @author sk89q
  */
 public class FloodFillTool implements BlockTool {
+
     private int range;
     private Pattern pattern;
 
@@ -39,15 +44,16 @@ public class FloodFillTool implements BlockTool {
         this.pattern = pattern;
     }
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.flood-fill");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
-        LocalWorld world = clicked.getWorld();
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
+        World world = clicked.getWorld();
 
-        int initialType = world.getBlockType(clicked);
+        int initialType = world.getBlockType(clicked.toVector());
 
         if (initialType == BlockID.AIR) {
             return true;
@@ -60,8 +66,8 @@ public class FloodFillTool implements BlockTool {
         EditSession editSession = session.createEditSession(player);
 
         try {
-            recurse(server, editSession, world, clicked.toBlockVector(),
-                    clicked, range, initialType, new HashSet<BlockVector>());
+            recurse(server, editSession, world, clicked.toVector().toBlockVector(),
+                    clicked.toVector(), range, initialType, new HashSet<BlockVector>());
         } catch (MaxChangedBlocksException e) {
             player.printError("Max blocks change limit reached.");
         } finally {
@@ -71,23 +77,8 @@ public class FloodFillTool implements BlockTool {
         return true;
     }
 
-    /**
-     * Helper method.
-     * 
-     * @param server
-     * @param superPickaxeManyDrop
-     * @param world
-     * @param pos
-     * @param origin
-     * @param size
-     * @param initialType
-     * @param visited
-     */
-    private void recurse(ServerInterface server, EditSession editSession,
-            LocalWorld world, BlockVector pos,
-            Vector origin, int size, int initialType,
-            Set<BlockVector> visited)
-            throws MaxChangedBlocksException {
+    private void recurse(Platform server, EditSession editSession, World world, BlockVector pos, Vector origin, int size, int initialType,
+            Set<BlockVector> visited) throws MaxChangedBlocksException {
 
         if (origin.distance(pos) > size || visited.contains(pos)) {
             return;

src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

@@ -22,11 +22,12 @@ package com.sk89q.worldedit.command.tool;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
 
 /**
  * A tool that can place (or remove) blocks at a distance.
- *
- * @author wizjany
  */
 public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTool {
 
@@ -40,13 +41,12 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo
     }
 
     @Override
-    public boolean canUse(LocalPlayer player) {
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.lrbuild");
     }
 
-    public boolean actSecondary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session) {
-
+    @Override
+    public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
         WorldVectorFace pos = getTargetFace(player);
         if (pos == null) return false;
         EditSession eS = session.createEditSession(player);
@@ -65,9 +65,7 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo
     }
 
     @Override
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session) {
-
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
         WorldVectorFace pos = getTargetFace(player);
         if (pos == null) return false;
         EditSession eS = session.createEditSession(player);
@@ -84,7 +82,7 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo
         return false;
     }
 
-    public WorldVectorFace getTargetFace(LocalPlayer player) {
+    public WorldVectorFace getTargetFace(Player player) {
         WorldVectorFace target = null;
         target = player.getBlockTraceFace(getRange(), true);
 
@@ -95,4 +93,5 @@ public class LongRangeBuildTool extends BrushTool implements DoubleActionTraceTo
 
         return target;
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java

@@ -19,33 +19,39 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.*;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.world.World;
 
 /**
- * Plants a tree.
- * 
- * @author sk89q
+ * Looks up information about a block.
  */
 public class QueryTool implements BlockTool {
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.info");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
 
-        LocalWorld world = clicked.getWorld();
+        World world = clicked.getWorld();
         EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, 0, player);
-        BaseBlock block = (editSession).rawGetBlock(clicked);
+        BaseBlock block = (editSession).rawGetBlock(clicked.toVector());
         BlockType type = BlockType.fromID(block.getType());
 
-        player.print("\u00A79@" + clicked + ": " + "\u00A7e"
+        player.print("\u00A79@" + clicked.toVector() + ": " + "\u00A7e"
                 + "#" + block.getType() + "\u00A77" + " ("
                 + (type == null ? "Unknown" : type.getName()) + ") "
                 + "\u00A7f"
-                + "[" + block.getData() + "]" + " (" + world.getBlockLightLevel(clicked) + "/" + world.getBlockLightLevel(clicked.add(0, 1, 0)) + ")");
+                + "[" + block.getData() + "]" + " (" + world.getBlockLightLevel(clicked.toVector()) + "/" + world.getBlockLightLevel(clicked.toVector().add(0, 1, 0)) + ")");
 
         if (block instanceof MobSpawnerBlock) {
             player.printRaw("\u00A7e" + "Mob Type: "

src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java

@@ -22,6 +22,10 @@ package com.sk89q.worldedit.command.tool;
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.world.World;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -29,10 +33,9 @@ import java.util.Set;
 /**
  * A pickaxe mode that recursively finds adjacent blocks within range of
  * an initial block and of the same type.
- * 
- * @author sk89q
  */
 public class RecursivePickaxe implements BlockTool {
+
     private static final BaseBlock air = new BaseBlock(0);
     private double range;
 
@@ -40,15 +43,16 @@ public class RecursivePickaxe implements BlockTool {
         this.range = range;
     }
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.superpickaxe.recursive");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
-        LocalWorld world = clicked.getWorld();
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
+        World world = clicked.getWorld();
 
-        int initialType = world.getBlockType(clicked);
+        int initialType = world.getBlockType(clicked.toVector());
 
         if (initialType == BlockID.AIR) {
             return true;
@@ -62,8 +66,8 @@ public class RecursivePickaxe implements BlockTool {
         editSession.getSurvivalExtent().setToolUse(config.superPickaxeManyDrop);
 
         try {
-            recurse(server, editSession, world, clicked.toBlockVector(),
-                    clicked, range, initialType, new HashSet<BlockVector>());
+            recurse(server, editSession, world, clicked.toVector().toBlockVector(),
+                    clicked.toVector(), range, initialType, new HashSet<BlockVector>());
         } catch (MaxChangedBlocksException e) {
             player.printError("Max blocks change limit reached.");
         } finally {
@@ -74,22 +78,8 @@ public class RecursivePickaxe implements BlockTool {
         return true;
     }
 
-    /**
-     * Helper method.
-     * 
-     * @param server
-     * @param world
-     * @param pos
-     * @param origin
-     * @param size
-     * @param initialType
-     * @param visited
-     */
-    private static void recurse(ServerInterface server, EditSession editSession,
-            LocalWorld world, BlockVector pos,
-            Vector origin, double size, int initialType,
-            Set<BlockVector> visited)
-            throws MaxChangedBlocksException {
+    private static void recurse(Platform server, EditSession editSession, World world, BlockVector pos,
+            Vector origin, double size, int initialType, Set<BlockVector> visited) throws MaxChangedBlocksException {
 
         final double distanceSq = origin.distanceSq(pos);
         if (distanceSq > size*size || visited.contains(pos)) {

src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java

@@ -19,26 +19,31 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.world.World;
 
 /**
  * A super pickaxe mode that removes one block.
- * 
- * @author sk89q
  */
 public class SinglePickaxe implements BlockTool {
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.superpickaxe");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
-        LocalWorld world = clicked.getWorld();
-
-        final int blockType = world.getBlockType(clicked);
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
+        World world = clicked.getWorld();
+        final int blockType = world.getBlockType(clicked.toVector());
         if (blockType == BlockID.BEDROCK
                 && !player.canDestroyBedrock()) {
             return true;
@@ -48,14 +53,14 @@ public class SinglePickaxe implements BlockTool {
         editSession.getSurvivalExtent().setToolUse(config.superPickaxeDrop);
 
         try {
-            editSession.setBlock(clicked, new BaseBlock(BlockID.AIR));
+            editSession.setBlock(clicked.toVector(), new BaseBlock(BlockID.AIR));
         } catch (MaxChangedBlocksException e) {
             player.printError("Max blocks change limit reached.");
         } finally {
             editSession.flushQueue();
         }
 
-        world.playEffect(clicked, 2001, blockType);
+        world.playEffect(clicked.toVector(), 2001, blockType);
 
         return true;
     }

src/main/java/com/sk89q/worldedit/command/tool/Tool.java

@@ -19,23 +19,21 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.LocalPlayer;
+import com.sk89q.worldedit.extension.platform.Actor;
 
 /**
  * Represents a tool. This interface alone defines nothing. A tool also
  * has to implement <code>BlockTool</code> or <code>TraceTool</code>.
- *
- * @author sk89q
  */
-public abstract interface Tool {
+public interface Tool {
 
     /**
      * Checks to see if the player can still be using this tool (considering
      * permissions and such).
      * 
-     * @param player
-     * @return
+     * @param actor the actor
+     * @return true if use is permitted
      */
-    public boolean canUse(LocalPlayer player);
+    public boolean canUse(Actor actor);
 
 }

src/main/java/com/sk89q/worldedit/command/tool/TraceTool.java

@@ -20,26 +20,11 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.LocalPlayer;
 import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.ServerInterface;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Platform;
 
-/**
- * Represents a tool that does not require a block.
- *
- * @author sk89q
- */
 public interface TraceTool extends Tool {
-    /**
-     * Perform the action. Should return true to deny the default
-     * action.
-     * 
-     * @param server 
-     * @param config 
-     * @param player
-     * @param session
-     * @return true to deny
-     */
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session);
+
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session);
 }

src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java

@@ -20,26 +20,30 @@
 package com.sk89q.worldedit.command.tool;
 
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.util.*;
+import com.sk89q.worldedit.util.Location;
 
 /**
  * Plants a tree.
- * 
- * @author sk89q
  */
 public class TreePlanter implements BlockTool {
+
     private TreeGenerator gen;
 
     public TreePlanter(TreeGenerator gen) {
         this.gen = gen;
     }
 
-    public boolean canUse(LocalPlayer player) {
+    @Override
+    public boolean canUse(Actor player) {
         return player.hasPermission("worldedit.tool.tree");
     }
 
-    public boolean actPrimary(ServerInterface server, LocalConfiguration config,
-            LocalPlayer player, LocalSession session, WorldVector clicked) {
+    @Override
+    public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
 
         EditSession editSession = session.createEditSession(player);
 
@@ -47,7 +51,7 @@ public class TreePlanter implements BlockTool {
             boolean successful = false;
             
             for (int i = 0; i < 10; i++) {
-                if (gen.generate(editSession, clicked.add(0, 1, 0))) {
+                if (gen.generate(editSession, clicked.toVector().add(0, 1, 0))) {
                     successful = true;
                     break;
                 }

src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java

@@ -22,7 +22,7 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
 
 /**
  * Represents a brush.
@@ -39,6 +39,5 @@ public interface Brush {
      * @param size
      * @throws MaxChangedBlocksException 
      */
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException;
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException;
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/ButcherBrush.java

@@ -22,9 +22,10 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
 
 public class ButcherBrush implements Brush {
+
     private int flags;
 
     public ButcherBrush(int flags) {
@@ -32,8 +33,7 @@ public class ButcherBrush implements Brush {
     }
 
     @Override
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException {
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
         editSession.getWorld().killMobs(pos, size, flags);
     }
 

src/main/java/com/sk89q/worldedit/command/tool/brush/ClipboardBrush.java

@@ -23,9 +23,10 @@ import com.sk89q.worldedit.CuboidClipboard;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
 
 public class ClipboardBrush implements Brush {
+
     private CuboidClipboard clipboard;
     private boolean noAir;
 
@@ -34,8 +35,8 @@ public class ClipboardBrush implements Brush {
         this.noAir = noAir;
     }
 
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException {
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
         clipboard.place(editSession, pos.subtract(clipboard.getSize().divide(2)), noAir);
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/CylinderBrush.java

@@ -22,17 +22,19 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.function.pattern.Patterns;
 
 public class CylinderBrush implements Brush {
+
     private int height;
 
     public CylinderBrush(int height) {
         this.height = height;
     }
 
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException {
-        editSession.makeCylinder(pos, mat, size, size, height, true);
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
+        editSession.makeCylinder(pos, Patterns.wrap(mat), size, size, height, true);
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java

@@ -24,14 +24,12 @@ import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
 
 import java.util.*;
 
-/**
- * @author zml2008
- */
 public class GravityBrush implements Brush {
+
     private final boolean fullHeight;
     
     public GravityBrush(boolean fullHeight) {
@@ -65,4 +63,5 @@ public class GravityBrush implements Brush {
             }
         }
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/HollowCylinderBrush.java

@@ -22,17 +22,20 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.function.pattern.Patterns;
 
 public class HollowCylinderBrush implements Brush {
+
     private int height;
 
     public HollowCylinderBrush(int height) {
         this.height = height;
     }
 
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException {
-        editSession.makeCylinder(pos, mat, size, size, height, false);
+    @Override
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
+        editSession.makeCylinder(pos, Patterns.wrap(mat), size, size, height, false);
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/HollowSphereBrush.java

@@ -22,14 +22,13 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.function.pattern.Patterns;
 
 public class HollowSphereBrush implements Brush {
-    public HollowSphereBrush() {
-    }
 
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException {
-        editSession.makeSphere(pos, mat, size, size, size, false);
+    @Override
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
+        editSession.makeSphere(pos, Patterns.wrap(mat), size, size, size, false);
     }
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/SmoothBrush.java

@@ -20,6 +20,7 @@
 package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.internal.LocalWorldAdapter;
 import com.sk89q.worldedit.math.convolution.HeightMap;
 import com.sk89q.worldedit.MaxChangedBlocksException;
@@ -27,11 +28,11 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldVector;
 import com.sk89q.worldedit.math.convolution.GaussianKernel;
 import com.sk89q.worldedit.math.convolution.HeightMapFilter;
-import com.sk89q.worldedit.patterns.Pattern;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
 
 public class SmoothBrush implements Brush {
+
     private int iterations;
     private boolean naturalOnly;
 
@@ -53,4 +54,5 @@ public class SmoothBrush implements Brush {
         HeightMapFilter filter = new HeightMapFilter(new GaussianKernel(5, 1.0));
         heightMap.applyFilter(filter, iterations);
     }
+
 }

src/main/java/com/sk89q/worldedit/command/tool/brush/SphereBrush.java

@@ -22,14 +22,13 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.patterns.Pattern;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.function.pattern.Patterns;
 
 public class SphereBrush implements Brush {
-    public SphereBrush() {
-    }
 
-    public void build(EditSession editSession, Vector pos, Pattern mat, double size)
-            throws MaxChangedBlocksException {
-        editSession.makeSphere(pos, mat, size, size, size, true);
+    @Override
+    public void build(EditSession editSession, Vector pos, Pattern mat, double size) throws MaxChangedBlocksException {
+        editSession.makeSphere(pos, Patterns.wrap(mat), size, size, size, true);
     }
 }