Cleanup.

- Fixed a few warnings
- Unified the formatting of the command prologue
- Put down why it was deprecated in the javadoc of a deprecated method.
- Gave //none a better usage line
- Switchcaseified some elseifs

src/main/java/com/sk89q/worldedit/LocalWorld.java

@@ -22,9 +22,7 @@ package com.sk89q.worldedit;
 import java.util.Random;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldedit.blocks.ItemType;
 import com.sk89q.worldedit.regions.Region;
 
 /**

src/main/java/com/sk89q/worldedit/blocks/BlockType.java

@@ -728,6 +728,7 @@ public enum BlockType {
      * 
      * @param id
      * @return
+     * @deprecated This function ignores the data value.
      */
     @Deprecated
     public static int getDroppedBlock(int id) {

src/main/java/com/sk89q/worldedit/commands/BrushCommands.java

@@ -57,7 +57,7 @@ public class BrushCommands {
         min = 1,
         max = 2
     )
-    @CommandPermissions({"worldedit.brush.sphere"})
+    @CommandPermissions("worldedit.brush.sphere")
     public static void sphereBrush(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -94,7 +94,7 @@ public class BrushCommands {
         min = 1,
         max = 3
     )
-    @CommandPermissions({"worldedit.brush.cylinder"})
+    @CommandPermissions("worldedit.brush.cylinder")
     public static void cylinderBrush(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -138,7 +138,7 @@ public class BrushCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.brush.clipboard"})
+    @CommandPermissions("worldedit.brush.clipboard")
     public static void clipboardBrush(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -176,7 +176,7 @@ public class BrushCommands {
         min = 0,
         max = 2
     )
-    @CommandPermissions({"worldedit.brush.smooth"})
+    @CommandPermissions("worldedit.brush.smooth")
     public static void smoothBrush(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -207,7 +207,7 @@ public class BrushCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.brush.ex"})
+    @CommandPermissions("worldedit.brush.ex")
     public static void extinguishBrush(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/ChunkCommands.java

@@ -43,7 +43,7 @@ public class ChunkCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.chunkinfo"})
+    @CommandPermissions("worldedit.chunkinfo")
     public static void chunkInfo(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -70,7 +70,7 @@ public class ChunkCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.listchunks"})
+    @CommandPermissions("worldedit.listchunks")
     public static void listChunks(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -89,7 +89,7 @@ public class ChunkCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.delchunks"})
+    @CommandPermissions("worldedit.delchunks")
     @Logging(REGION)
     public static void deleteChunks(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)

src/main/java/com/sk89q/worldedit/commands/ClipboardCommands.java

@@ -45,7 +45,7 @@ public class ClipboardCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.clipboard.copy"})
+    @CommandPermissions("worldedit.clipboard.copy")
     public static void copy(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -71,7 +71,7 @@ public class ClipboardCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.clipboard.cut"})
+    @CommandPermissions("worldedit.clipboard.cut")
     @Logging(REGION)
     public static void cut(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -106,7 +106,7 @@ public class ClipboardCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.clipboard.paste"})
+    @CommandPermissions("worldedit.clipboard.paste")
     @Logging(PLACEMENT)
     public static void paste(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -135,7 +135,7 @@ public class ClipboardCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.clipboard.rotate"})
+    @CommandPermissions("worldedit.clipboard.rotate")
     public static void rotate(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -159,7 +159,7 @@ public class ClipboardCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.clipboard.flip"})
+    @CommandPermissions("worldedit.clipboard.flip")
     public static void flip(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -179,7 +179,7 @@ public class ClipboardCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.clipboard.load"})
+    @CommandPermissions("worldedit.clipboard.load")
     public static void load(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -216,7 +216,7 @@ public class ClipboardCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.clipboard.save"})
+    @CommandPermissions("worldedit.clipboard.save")
     public static void save(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -260,7 +260,7 @@ public class ClipboardCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.clipboard.clear"})
+    @CommandPermissions("worldedit.clipboard.clear")
     public static void clearClipboard(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/GeneralCommands.java

@@ -40,7 +40,7 @@ public class GeneralCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.limit"})
+    @CommandPermissions("worldedit.limit")
     public static void limit(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -68,7 +68,7 @@ public class GeneralCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.fast"})
+    @CommandPermissions("worldedit.fast")
     public static void fast(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -89,7 +89,7 @@ public class GeneralCommands {
         min = 0,
         max = -1
     )
-    @CommandPermissions({"worldedit.global-mask"})
+    @CommandPermissions("worldedit.global-mask")
     public static void mask(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -202,7 +202,7 @@ public class GeneralCommands {
         aliases = { "we", "worldedit" },
         desc = "WorldEdit commands"
     )
-    @NestedCommand({WorldEditCommands.class})
+    @NestedCommand(WorldEditCommands.class)
     public static void we(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/GenerationCommands.java

@@ -41,7 +41,7 @@ public class GenerationCommands {
         min = 2,
         max = 3
     )
-    @CommandPermissions({"worldedit.generation.cylinder"})
+    @CommandPermissions("worldedit.generation.cylinder")
     @Logging(PLACEMENT)
     public static void hcyl(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -63,7 +63,7 @@ public class GenerationCommands {
         min = 2,
         max = 3
     )
-    @CommandPermissions({"worldedit.generation.cylinder"})
+    @CommandPermissions("worldedit.generation.cylinder")
     @Logging(PLACEMENT)
     public static void cyl(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -86,7 +86,7 @@ public class GenerationCommands {
         min = 2,
         max = 3
     )
-    @CommandPermissions({"worldedit.generation.sphere"})
+    @CommandPermissions("worldedit.generation.sphere")
     @Logging(PLACEMENT)
     public static void hsphere(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -158,7 +158,7 @@ public class GenerationCommands {
         min = 2,
         max = 3
     )
-    @CommandPermissions({"worldedit.generation.sphere"})
+    @CommandPermissions("worldedit.generation.sphere")
     @Logging(PLACEMENT)
     public static void sphere(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -229,7 +229,7 @@ public class GenerationCommands {
         min = 0,
         max = 3
     )
-    @CommandPermissions({"worldedit.generation.forest"})
+    @CommandPermissions("worldedit.generation.forest")
     @Logging(POSITION)
     public static void forestGen(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -258,7 +258,7 @@ public class GenerationCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.generation.pumpkins"})
+    @CommandPermissions("worldedit.generation.pumpkins")
     @Logging(POSITION)
     public static void pumpkins(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -277,7 +277,7 @@ public class GenerationCommands {
         min = 2,
         max = 2
     )
-    @CommandPermissions({"worldedit.generation.pyramid"})
+    @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
     public static void pyramid(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -300,7 +300,7 @@ public class GenerationCommands {
         min = 2,
         max = 2
     )
-    @CommandPermissions({"worldedit.generation.pyramid"})
+    @CommandPermissions("worldedit.generation.pyramid")
     @Logging(PLACEMENT)
     public static void hpyramid(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)

src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java

@@ -37,7 +37,7 @@ public class HistoryCommands {
         min = 0,
         max = 2
     )
-    @CommandPermissions({"worldedit.history.undo"})
+    @CommandPermissions("worldedit.history.undo")
     public static void undo(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -73,7 +73,7 @@ public class HistoryCommands {
         min = 0,
         max = 2
     )
-    @CommandPermissions({"worldedit.history.redo"})
+    @CommandPermissions("worldedit.history.redo")
     public static void redo(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -109,7 +109,7 @@ public class HistoryCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.history.clear"})
+    @CommandPermissions("worldedit.history.clear")
     public static void clearHistory(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java

@@ -39,7 +39,7 @@ public class NavigationCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.navigation.unstuck"})
+    @CommandPermissions("worldedit.navigation.unstuck")
     public static void unstuck(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -55,7 +55,7 @@ public class NavigationCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.navigation.ascend"})
+    @CommandPermissions("worldedit.navigation.ascend")
     public static void ascend(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -84,7 +84,7 @@ public class NavigationCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.navigation.descend"})
+    @CommandPermissions("worldedit.navigation.descend")
     public static void descend(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -113,7 +113,7 @@ public class NavigationCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.navigation.ceiling"})
+    @CommandPermissions("worldedit.navigation.ceiling")
     @Logging(POSITION)
     public static void ceiling(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -136,7 +136,7 @@ public class NavigationCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.navigation.thru"})
+    @CommandPermissions("worldedit.navigation.thru")
     public static void thru(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -155,7 +155,7 @@ public class NavigationCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.navigation.jumpto"})
+    @CommandPermissions("worldedit.navigation.jumpto")
     public static void jumpTo(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -176,7 +176,7 @@ public class NavigationCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.navigation.up"})
+    @CommandPermissions("worldedit.navigation.up")
     @Logging(POSITION)
     public static void up(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)

src/main/java/com/sk89q/worldedit/commands/RegionCommands.java

@@ -49,7 +49,7 @@ public class RegionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.region.set"})
+    @CommandPermissions("worldedit.region.set")
     @Logging(REGION)
     public static void set(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -77,7 +77,7 @@ public class RegionCommands {
         min = 1,
         max = 2
     )
-    @CommandPermissions({"worldedit.region.replace"})
+    @CommandPermissions("worldedit.region.replace")
     @Logging(REGION)
     public static void replace(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -111,7 +111,7 @@ public class RegionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.region.overlay"})
+    @CommandPermissions("worldedit.region.overlay")
     @Logging(REGION)
     public static void overlay(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -137,7 +137,7 @@ public class RegionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.region.naturalize"})
+    @CommandPermissions("worldedit.region.naturalize")
     @Logging(REGION)
     public static void naturalize(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -155,7 +155,7 @@ public class RegionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.region.walls"})
+    @CommandPermissions("worldedit.region.walls")
     @Logging(REGION)
     public static void walls(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -179,7 +179,7 @@ public class RegionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.region.faces"})
+    @CommandPermissions("worldedit.region.faces")
     @Logging(REGION)
     public static void faces(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -204,7 +204,7 @@ public class RegionCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.region.smooth"})
+    @CommandPermissions("worldedit.region.smooth")
     @Logging(REGION)
     public static void smooth(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -230,7 +230,7 @@ public class RegionCommands {
         min = 0,
         max = 3
     )
-    @CommandPermissions({"worldedit.region.move"})
+    @CommandPermissions("worldedit.region.move")
     @Logging(ORIENTATION_REGION)
     public static void move(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -276,7 +276,7 @@ public class RegionCommands {
         min = 0,
         max = 2
     )
-    @CommandPermissions({"worldedit.region.stack"})
+    @CommandPermissions("worldedit.region.stack")
     @Logging(ORIENTATION_REGION)
     public static void stack(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -312,7 +312,7 @@ public class RegionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.regen"})
+    @CommandPermissions("worldedit.regen")
     @Logging(REGION)
     public static void regenerateChunk(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)

src/main/java/com/sk89q/worldedit/commands/ScriptingCommands.java

@@ -40,7 +40,7 @@ public class ScriptingCommands {
         min = 1,
         max = -1
     )
-    @CommandPermissions({"worldedit.scripting.execute"})
+    @CommandPermissions("worldedit.scripting.execute")
     @Logging(ALL)
     public static void execute(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -65,7 +65,7 @@ public class ScriptingCommands {
         min = 0,
         max = -1
     )
-    @CommandPermissions({"worldedit.scripting.execute"})
+    @CommandPermissions("worldedit.scripting.execute")
     @Logging(ALL)
     public static void executeLast(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -86,6 +86,5 @@ public class ScriptingCommands {
                 new String[] {"js"});
         
         we.runScript(player, f, scriptArgs);
-        
     }
 }

src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java

@@ -46,7 +46,7 @@ public class SelectionCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.selection.pos"})
+    @CommandPermissions("worldedit.selection.pos")
     public static void pos1(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -81,7 +81,7 @@ public class SelectionCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.selection.pos"})
+    @CommandPermissions("worldedit.selection.pos")
     public static void pos2(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -118,7 +118,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.selection.hpos"})
+    @CommandPermissions("worldedit.selection.hpos")
     public static void hpos1(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -146,7 +146,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.selection.hpos"})
+    @CommandPermissions("worldedit.selection.hpos")
     public static void hpos2(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -175,7 +175,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.selection.chunk"})
+    @CommandPermissions("worldedit.selection.chunk")
     public static void chunk(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -221,7 +221,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.wand"})
+    @CommandPermissions("worldedit.wand")
     public static void wand(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -237,7 +237,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.wand.toggle"})
+    @CommandPermissions("worldedit.wand.toggle")
     public static void toggleWand(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -258,7 +258,7 @@ public class SelectionCommands {
         min = 1,
         max = 3
     )
-    @CommandPermissions({"worldedit.selection.expand"})
+    @CommandPermissions("worldedit.selection.expand")
     public static void expand(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -289,8 +289,9 @@ public class SelectionCommands {
         int change = args.getInteger(0);
         int reverseChange = 0;
         
-        // Specifying a direction
-        if (args.argsLength() == 2) {
+        switch (args.argsLength()) {
+        case 2:
+            // Either a reverse amount or a direction
             try {
                 reverseChange = args.getInteger(1) * -1;
                 dir = we.getDirection(player, "me");
@@ -298,12 +299,15 @@ public class SelectionCommands {
                 dir = we.getDirection(player,
                         args.getString(1).toLowerCase());
             }
-        // Specifying a direction and a reverse amount
-        } else if (args.argsLength() == 3) {
+            break;
+
+        case 3: 
+            // Both reverse amount and direction
             reverseChange = args.getInteger(1) * -1;
             dir = we.getDirection(player,
                     args.getString(2).toLowerCase());
-        } else {
+            break;
+        default:
             dir = we.getDirection(player, "me");
         }
 
@@ -330,7 +334,7 @@ public class SelectionCommands {
         min = 1,
         max = 3
     )
-    @CommandPermissions({"worldedit.selection.contract"})
+    @CommandPermissions("worldedit.selection.contract")
     public static void contract(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -339,8 +343,9 @@ public class SelectionCommands {
         int change = args.getInteger(0);
         int reverseChange = 0;
 
+        switch (args.argsLength()) {
+        case 2:
             // Either a reverse amount or a direction
-        if (args.argsLength() == 2) {
             try {
                 reverseChange = args.getInteger(1) * -1;
                 dir = we.getDirection(player, "me");
@@ -348,12 +353,15 @@ public class SelectionCommands {
                 dir = we.getDirection(player,
                         args.getString(1).toLowerCase());
             }
+            break;
+
+        case 3: 
             // Both reverse amount and direction
-        } else if (args.argsLength() == 3) {
             reverseChange = args.getInteger(1) * -1;
             dir = we.getDirection(player,
                     args.getString(2).toLowerCase());
-        } else {
+            break;
+        default:
             dir = we.getDirection(player, "me");
         }
 
@@ -382,7 +390,7 @@ public class SelectionCommands {
         min = 1,
         max = 2
     )
-    @CommandPermissions({"worldedit.selection.shift"})
+    @CommandPermissions("worldedit.selection.shift")
     public static void shift(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -418,7 +426,7 @@ public class SelectionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.selection.outset"})
+    @CommandPermissions("worldedit.selection.outset")
     public static void outset(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -457,7 +465,7 @@ public class SelectionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.selection.inset"})
+    @CommandPermissions("worldedit.selection.inset")
     public static void inset(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -491,7 +499,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.selection.size"})
+    @CommandPermissions("worldedit.selection.size")
     public static void size(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -519,7 +527,7 @@ public class SelectionCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.analysis.count"})
+    @CommandPermissions("worldedit.analysis.count")
     public static void count(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -538,7 +546,7 @@ public class SelectionCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.analysis.distr"})
+    @CommandPermissions("worldedit.analysis.distr")
     public static void distr(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/SnapshotCommands.java

@@ -42,12 +42,14 @@ public class SnapshotCommands {
     private static Logger logger = Logger.getLogger("Minecraft.WorldEdit");
     private static DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss z");
 
-    @Command(aliases = {"list"},
+    @Command(
+            aliases = { "list" },
             usage = "[num]",
             desc = "List snapshots",
             min = 0,
-    max = 1)
-    @CommandPermissions({"worldedit.snapshots.list"})
+            max = 1
+    )
+    @CommandPermissions("worldedit.snapshots.list")
     public static void list(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -92,12 +94,14 @@ public class SnapshotCommands {
         }
     }
 
-    @Command(aliases = {"use"},
+    @Command(
+            aliases = { "use" },
             usage = "<snapshot>",
             desc = "Choose a snapshot to use",
             min = 1,
-    max = 1)
-    @CommandPermissions({"worldedit.snapshots.restore"})
+            max = 1
+    )
+    @CommandPermissions("worldedit.snapshots.restore")
     public static void use(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -135,12 +139,14 @@ public class SnapshotCommands {
         }
     }
 
-    @Command(aliases = {"before"},
+    @Command(
+            aliases = { "before" },
             usage = "<date>",
             desc = "Choose the nearest snapshot before a date",
             min = 1,
-    max = -1)
-    @CommandPermissions({"worldedit.snapshots.restore"})
+            max = -1
+    )
+    @CommandPermissions("worldedit.snapshots.restore")
     public static void before(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -174,12 +180,14 @@ public class SnapshotCommands {
         }
     }
 
-    @Command(aliases = {"after"},
+    @Command(
+            aliases = { "after" },
             usage = "<date>",
             desc = "Choose the nearest snapshot after a date",
             min = 1,
-    max = -1)
-    @CommandPermissions({"worldedit.snapshots.restore"})
+            max = -1
+    )
+    @CommandPermissions("worldedit.snapshots.restore")
     public static void after(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/SnapshotUtilCommands.java

@@ -44,20 +44,24 @@ public class SnapshotUtilCommands {
 
     private static Logger logger = Logger.getLogger("Minecraft.WorldEdit");
 
-    @Command(aliases = {"snapshot", "snap"},
-    desc = "Snapshot commands")
-    @NestedCommand({SnapshotCommands.class})
+    @Command(
+            aliases = { "snapshot", "snap" },
+            desc = "Snapshot commands"
+    )
+    @NestedCommand(SnapshotCommands.class)
     public static void snapshot(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
     }
 
-    @Command(aliases = {"restore", "/restore"},
+    @Command(
+            aliases = { "restore", "/restore" },
             usage = "[snapshot]",
             desc = "Restore the selection from a snapshot",
             min = 0,
-    max = 1)
-    @CommandPermissions({"worldedit.snapshots.restore"})
+            max = 1
+    )
+    @CommandPermissions("worldedit.snapshots.restore")
     public static void restore(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/SuperPickaxeCommands.java

@@ -40,7 +40,7 @@ public class SuperPickaxeCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.superpickaxe"})
+    @CommandPermissions("worldedit.superpickaxe")
     public static void single(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -57,7 +57,7 @@ public class SuperPickaxeCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.superpickaxe.area"})
+    @CommandPermissions("worldedit.superpickaxe.area")
     public static void area(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -82,7 +82,7 @@ public class SuperPickaxeCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.superpickaxe.recursive"})
+    @CommandPermissions("worldedit.superpickaxe.recursive")
     public static void recursive(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/ToolCommands.java

@@ -34,7 +34,7 @@ public class ToolCommands {
     @Command(
         aliases = { "none" },
         usage = "",
-        desc = "Turn off all superpickaxe alternate modes",
+        desc = "Unbind all bound tools",
         min = 0,
         max = 0
     )
@@ -53,7 +53,7 @@ public class ToolCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.tool.info"})
+    @CommandPermissions("worldedit.tool.info")
     public static void info(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -70,7 +70,7 @@ public class ToolCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.tool.tree"})
+    @CommandPermissions("worldedit.tool.tree")
     public static void tree(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -96,7 +96,7 @@ public class ToolCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.tool.replacer"})
+    @CommandPermissions("worldedit.tool.replacer")
     public static void repl(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -114,7 +114,7 @@ public class ToolCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.tool.data-cycler"})
+    @CommandPermissions("worldedit.tool.data-cycler")
     public static void cycler(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -131,7 +131,7 @@ public class ToolCommands {
         min = 2,
         max = 2
     )
-    @CommandPermissions({"worldedit.tool.flood-fill"})
+    @CommandPermissions("worldedit.tool.flood-fill")
     public static void floodFill(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -154,7 +154,7 @@ public class ToolCommands {
         aliases = { "brush", "br" },
         desc = "Brush tool"
     )
-    @NestedCommand({BrushCommands.class})
+    @NestedCommand(BrushCommands.class)
     public static void brush(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -167,7 +167,7 @@ public class ToolCommands {
             min = 0,
             max = 0
     )
-    @CommandPermissions({"worldedit.tool.deltree"})
+    @CommandPermissions("worldedit.tool.deltree")
     public static void deltree(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -184,7 +184,7 @@ public class ToolCommands {
             min = 0,
             max = 0
     )
-    @CommandPermissions({"worldedit.tool.farwand"})
+    @CommandPermissions("worldedit.tool.farwand")
     public static void farwand(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -200,7 +200,7 @@ public class ToolCommands {
             min = 2,
             max = 2
     )
-    @CommandPermissions({"worldedit.tool.lrbuild"})
+    @CommandPermissions("worldedit.tool.lrbuild")
     public static void longrangebuildtool(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/ToolUtilCommands.java

@@ -40,7 +40,7 @@ public class ToolUtilCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.superpickaxe"})
+    @CommandPermissions("worldedit.superpickaxe")
     public static void togglePickaxe(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -70,7 +70,7 @@ public class ToolUtilCommands {
         aliases = { "superpickaxe", "pickaxe", "sp" },
         desc = "Select super pickaxe mode"
     )
-    @NestedCommand({SuperPickaxeCommands.class})
+    @NestedCommand(SuperPickaxeCommands.class)
     public static void pickaxe(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -80,7 +80,7 @@ public class ToolUtilCommands {
         aliases = {"tool"},
         desc = "Select a tool to bind"
     )
-    @NestedCommand({ToolCommands.class})
+    @NestedCommand(ToolCommands.class)
     public static void tool(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -93,7 +93,7 @@ public class ToolUtilCommands {
         min = 0,
         max = -1
     )
-    @CommandPermissions({"worldedit.brush.options.mask"})
+    @CommandPermissions("worldedit.brush.options.mask")
     public static void mask(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -114,7 +114,7 @@ public class ToolUtilCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.brush.options.material"})
+    @CommandPermissions("worldedit.brush.options.material")
     public static void material(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -130,7 +130,7 @@ public class ToolUtilCommands {
             min = 1,
             max = 1
         )
-    @CommandPermissions({"worldedit.brush.options.range"})
+    @CommandPermissions("worldedit.brush.options.range")
     public static void range(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
@@ -146,7 +146,7 @@ public class ToolUtilCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.brush.options.size"})
+    @CommandPermissions("worldedit.brush.options.size")
     public static void size(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/commands/UtilityCommands.java

@@ -45,7 +45,7 @@ public class UtilityCommands {
         min = 2,
         max = 3
     )
-    @CommandPermissions({"worldedit.fill"})
+    @CommandPermissions("worldedit.fill")
     @Logging(PLACEMENT)
     public static void fill(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -75,7 +75,7 @@ public class UtilityCommands {
         min = 2,
         max = 3
     )
-    @CommandPermissions({"worldedit.fill.recursive"})
+    @CommandPermissions("worldedit.fill.recursive")
     @Logging(PLACEMENT)
     public static void fillr(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -105,7 +105,7 @@ public class UtilityCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.drain"})
+    @CommandPermissions("worldedit.drain")
     @Logging(PLACEMENT)
     public static void drain(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -125,7 +125,7 @@ public class UtilityCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.fixlava"})
+    @CommandPermissions("worldedit.fixlava")
     @Logging(PLACEMENT)
     public static void fixLava(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -145,7 +145,7 @@ public class UtilityCommands {
         min = 1,
         max = 1
     )
-    @CommandPermissions({"worldedit.fixwater"})
+    @CommandPermissions("worldedit.fixwater")
     @Logging(PLACEMENT)
     public static void fixWater(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -165,7 +165,7 @@ public class UtilityCommands {
         min = 0,
         max = 2
     )
-    @CommandPermissions({"worldedit.removeabove"})
+    @CommandPermissions("worldedit.removeabove")
     @Logging(PLACEMENT)
     public static void removeAbove(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -187,7 +187,7 @@ public class UtilityCommands {
         min = 0,
         max = 2
     )
-    @CommandPermissions({"worldedit.removebelow"})
+    @CommandPermissions("worldedit.removebelow")
     @Logging(PLACEMENT)
     public static void removeBelow(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -209,7 +209,7 @@ public class UtilityCommands {
         min = 1,
         max = 2
     )
-    @CommandPermissions({"worldedit.removenear"})
+    @CommandPermissions("worldedit.removenear")
     @Logging(PLACEMENT)
     public static void removeNear(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -232,7 +232,7 @@ public class UtilityCommands {
         min = 3,
         max = 3
     )
-    @CommandPermissions({"worldedit.replacenear"})
+    @CommandPermissions("worldedit.replacenear")
     @Logging(PLACEMENT)
     public static void replaceNear(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -270,7 +270,7 @@ public class UtilityCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.snow"})
+    @CommandPermissions("worldedit.snow")
     @Logging(PLACEMENT)
     public static void snow(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -289,7 +289,7 @@ public class UtilityCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.thaw"})
+    @CommandPermissions("worldedit.thaw")
     @Logging(PLACEMENT)
     public static void thaw(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -308,7 +308,7 @@ public class UtilityCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.green"})
+    @CommandPermissions("worldedit.green")
     @Logging(PLACEMENT)
     public static void green(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -327,7 +327,7 @@ public class UtilityCommands {
             min = 0,
             max = 1
         )
-    @CommandPermissions({"worldedit.extinguish"})
+    @CommandPermissions("worldedit.extinguish")
     @Logging(PLACEMENT)
     public static void extinguish(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -353,7 +353,7 @@ public class UtilityCommands {
         min = 0,
         max = 1
     )
-    @CommandPermissions({"worldedit.butcher"})
+    @CommandPermissions("worldedit.butcher")
     @Logging(PLACEMENT)
     public static void butcher(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
@@ -374,7 +374,7 @@ public class UtilityCommands {
         min = 2,
         max = 2
     )
-    @CommandPermissions({"worldedit.remove"})
+    @CommandPermissions("worldedit.remove")
     @Logging(PLACEMENT)
     public static void remove(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)

src/main/java/com/sk89q/worldedit/commands/WorldEditCommands.java

@@ -57,7 +57,7 @@ public class WorldEditCommands {
         min = 0,
         max = 0
     )
-    @CommandPermissions({"worldedit.reload"})
+    @CommandPermissions("worldedit.reload")
     public static void reload(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {

src/main/java/com/sk89q/worldedit/tools/FloatingTreeRemover.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldedit.tools;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;