Add some experimental brush commands.

/br set <shape> <radius> <pattern>
/br deform <shape> <expression>
/br scatter <shape> <density> <generator>
/br apply <shape> <generator>

<shape> can be: cuboid, cyl[inder], sphere

<density> is 0-100

<generator> can be:
forest|tree <type>
item <item>[:<data>] (ONLY WORKS ON FORGE)

Examples:

/br deform cuboid 5 y-=0.2
/br scatter sphere 5 100 minecraft:dye:15

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/DeformCommand.java

@@ -0,0 +1,63 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.minecraft.util.commands.WrappedCommandException;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.factory.Deform;
+import com.sk89q.worldedit.function.factory.Deform.Mode;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+public class DeformCommand extends CommandExecutor<Deform> {
+
+    @Override
+    public Deform call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        String expression = args.next();
+        boolean rawCoords = args.containsFlag('r');
+        boolean offset = args.containsFlag('o');
+
+        Deform deform = new Deform(expression);
+
+        if (rawCoords) {
+            deform.setMode(Mode.RAW_COORD);
+        } else if (offset) {
+            deform.setMode(Mode.OFFSET);
+            Player player = (Player) locals.get(Actor.class);
+            LocalSession session = WorldEdit.getInstance().getSessionManager().get(locals.get(Actor.class));
+            try {
+                deform.setOffset(session.getPlacementPosition(player));
+            } catch (IncompleteRegionException e) {
+                throw new WrappedCommandException(e);
+            }
+        } else {
+            deform.setMode(Mode.UNIT_CUBE);
+        }
+
+        return deform;
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/FillBrushCommand.java

@@ -0,0 +1,61 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.command.tool.BrushTool;
+import com.sk89q.worldedit.command.tool.InvalidToolBindException;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class FillBrushCommand<T> extends CommandExecutor<T> {
+
+    private final CommandExecutor<? extends T> delegate;
+
+    public FillBrushCommand(CommandExecutor<? extends T> delegate) {
+        checkNotNull(delegate, "delegate");
+        this.delegate = delegate;
+    }
+
+    @Override
+    public T call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        Pattern pattern = new PatternCommand().call(args, locals, parentCommands);
+
+        Player player = (Player) locals.get(Actor.class);
+        LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);
+
+        try {
+            BrushTool tool = session.getBrushTool(player.getItemInHand());
+            tool.setFill(pattern);
+        } catch (InvalidToolBindException e) {
+            WorldEdit.getInstance().getPlatformManager().getCommandManager().getExceptionConverter().convert(e);
+        }
+
+        return delegate.call(args, locals, parentCommands);
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ForestCommand.java

@@ -0,0 +1,23 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+public class ForestCommand {
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ItemCommand.java

@@ -0,0 +1,63 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extension.input.InputParseException;
+import com.sk89q.worldedit.extension.input.NoMatchException;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.world.World;
+
+public class ItemCommand extends CommandExecutor<BaseItem> {
+
+    @Override
+    public BaseItem call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        Actor actor = locals.get(Actor.class);
+        LocalSession session = WorldEdit.getInstance().getSessionManager().get(actor);
+
+        ParserContext parserContext = new ParserContext();
+        parserContext.setActor(actor);
+        if (actor instanceof Entity) {
+            Extent extent = ((Entity) actor).getExtent();
+            if (extent instanceof World) {
+                parserContext.setWorld((World) extent);
+            }
+        }
+        parserContext.setSession(session);
+
+        try {
+            return WorldEdit.getInstance().getItemFactory().parseFromInput(args.next(), parserContext);
+        } catch (NoMatchException e) {
+            throw new CommandException(e.getMessage(), e);
+        } catch (InputParseException e) {
+            throw new CommandException(e.getMessage(), e);
+        }
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ItemUseCommand.java

@@ -0,0 +1,81 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.google.common.base.Function;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.util.Direction;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.world.World;
+
+import javax.annotation.Nullable;
+
+public class ItemUseCommand extends CommandExecutor<Function<EditContext, RegionFunction>> {
+
+    @Override
+    public Function<EditContext, RegionFunction> call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        BaseItem item = new ItemCommand().call(args, locals, parentCommands);
+        return new ItemUseFactory(item);
+    }
+
+    private static final class ItemUseFactory implements Function<EditContext, RegionFunction> {
+        private final BaseItem item;
+
+        private ItemUseFactory(BaseItem item) {
+            this.item = item;
+        }
+
+        @Nullable
+        @Override
+        public RegionFunction apply(EditContext input) {
+            World world = ((EditSession) input.getDestination()).getWorld();
+            return new ItemUseFunction(world, item);
+        }
+
+        @Override
+        public String toString() {
+            return "application of the item " + item.getType() + ":" + item.getData();
+        }
+    }
+
+    private static final class ItemUseFunction implements RegionFunction {
+        private final World world;
+        private final BaseItem item;
+
+        private ItemUseFunction(World world, BaseItem item) {
+            this.world = world;
+            this.item = item;
+        }
+
+        @Override
+        public boolean apply(Vector position) throws WorldEditException {
+            return world.useItem(position, item, Direction.UP);
+        }
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/PatternCommand.java

@@ -0,0 +1,63 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extension.input.InputParseException;
+import com.sk89q.worldedit.extension.input.NoMatchException;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.world.World;
+
+public class PatternCommand extends CommandExecutor<Pattern> {
+
+    @Override
+    public Pattern call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        Actor actor = locals.get(Actor.class);
+        LocalSession session = WorldEdit.getInstance().getSessionManager().get(actor);
+
+        ParserContext parserContext = new ParserContext();
+        parserContext.setActor(actor);
+        if (actor instanceof Entity) {
+            Extent extent = ((Entity) actor).getExtent();
+            if (extent instanceof World) {
+                parserContext.setWorld((World) extent);
+            }
+        }
+        parserContext.setSession(session);
+
+        try {
+            return WorldEdit.getInstance().getPatternFactory().parseFromInput(args.next(), parserContext);
+        } catch (NoMatchException e) {
+            throw new CommandException(e.getMessage(), e);
+        } catch (InputParseException e) {
+            throw new CommandException(e.getMessage(), e);
+        }
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/PointGeneratorCommand.java

@@ -0,0 +1,45 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.google.common.base.Function;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+public class PointGeneratorCommand extends CommandExecutor<Function<EditContext, ? extends RegionFunction>> {
+
+    @Override
+    public Function<EditContext, ? extends RegionFunction> call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        String type = args.next();
+
+        if (type.equalsIgnoreCase("forest") || type.equalsIgnoreCase("tree")) {
+            return new TreeGeneratorCommand().call(args, locals, parentCommands);
+        } else if (type.equalsIgnoreCase("item") || type.equalsIgnoreCase("itemstack")) {
+            return new ItemUseCommand().call(args, locals, parentCommands);
+        } else {
+            throw new CommandException("Unknown type of generator: " + type);
+        }
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/RegionFactoryCommand.java

@@ -0,0 +1,48 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.regions.factory.CuboidRegionFactory;
+import com.sk89q.worldedit.regions.factory.CylinderRegionFactory;
+import com.sk89q.worldedit.regions.factory.RegionFactory;
+import com.sk89q.worldedit.regions.factory.SphereRegionFactory;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+public class RegionFactoryCommand extends CommandExecutor<RegionFactory> {
+
+    @Override
+    public RegionFactory call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        String type = args.next();
+
+        if (type.equals("cuboid")) {
+            return new CuboidRegionFactory();
+        } else if (type.equals("sphere")) {
+            return new SphereRegionFactory();
+        } else if (type.equals("cyl") || type.equals("cylinder")) {
+            return new CylinderRegionFactory(1); // TODO: Adjustable height
+        } else {
+            throw new CommandException("Unknown shape type: " + type);
+        }
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/RegionReplaceCommand.java

@@ -0,0 +1,35 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.function.factory.RegionReplace;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+public class RegionReplaceCommand extends CommandExecutor<RegionReplace> {
+
+    @Override
+    public RegionReplace call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        return new RegionReplace();
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ScatterCommand.java

@@ -0,0 +1,40 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.google.common.base.Function;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.function.factory.Scatter;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+public class ScatterCommand extends CommandExecutor<Scatter> {
+
+    @Override
+    public Scatter call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        double density = args.nextDouble() / 100.0;
+        Function<EditContext, ? extends RegionFunction> function = new PointGeneratorCommand().call(args, locals, parentCommands);
+        return new Scatter(function, density);
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ShapedBrushCommand.java

@@ -0,0 +1,114 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.google.common.collect.Lists;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.minecraft.util.commands.CommandPermissionsException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxBrushRadiusException;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.command.tool.BrushTool;
+import com.sk89q.worldedit.command.tool.InvalidToolBindException;
+import com.sk89q.worldedit.command.tool.brush.OperationFactoryBrush;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.factory.OperationFactory;
+import com.sk89q.worldedit.regions.factory.RegionFactory;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.Description;
+import com.sk89q.worldedit.util.command.Parameter;
+import com.sk89q.worldedit.util.command.SimpleDescription;
+import com.sk89q.worldedit.util.command.SimpleParameter;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class ShapedBrushCommand extends CommandExecutor<Object> {
+
+    private final CommandExecutor<? extends OperationFactory> delegate;
+    private final String permission;
+
+    public ShapedBrushCommand(CommandExecutor<? extends OperationFactory> delegate, String permission) {
+        checkNotNull(delegate, "delegate");
+        this.permission = permission;
+        this.delegate = delegate;
+    }
+
+    @Override
+    public Object call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        if (!testPermission(locals)) {
+            throw new CommandPermissionsException();
+        }
+
+        RegionFactory regionFactory = new RegionFactoryCommand().call(args, locals, parentCommands);
+        int radius = args.nextInt();
+        OperationFactory factory = delegate.call(args, locals, parentCommands);
+
+        args.requireAllConsumed();
+
+        Player player = (Player) locals.get(Actor.class);
+        LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);
+
+        try {
+            WorldEdit.getInstance().checkMaxBrushRadius(radius);
+            BrushTool tool = session.getBrushTool(player.getItemInHand());
+            tool.setSize(radius);
+            tool.setBrush(new OperationFactoryBrush(factory, regionFactory), permission);
+        } catch (MaxBrushRadiusException e) {
+            WorldEdit.getInstance().getPlatformManager().getCommandManager().getExceptionConverter().convert(e);
+        } catch (InvalidToolBindException e) {
+            WorldEdit.getInstance().getPlatformManager().getCommandManager().getExceptionConverter().convert(e);
+        }
+
+        player.print("Set brush to " + factory);
+
+        return true;
+    }
+
+    @Override
+    public Description getDescription() {
+        List<Parameter> parameters = Lists.newArrayList();
+        parameters.add(new SimpleParameter("radius"));
+        parameters.add(new SimpleParameter("shape"));
+        parameters.add(new SimpleParameter("...shapeArgs...").setOptional(true));
+        parameters.add(new SimpleParameter("...brushArgs...").setOptional(true));
+
+        SimpleDescription desc = new SimpleDescription();
+        desc.setDescription(delegate.getDescription().getDescription());
+        desc.setHelp(delegate.getDescription().getHelp());
+        desc.setPermissions(Lists.newArrayList(permission));
+        return desc;
+    }
+
+    @Override
+    public boolean testPermission(CommandLocals locals) {
+        Actor sender = locals.get(Actor.class);
+        if (sender == null) {
+            throw new RuntimeException("Uh oh! No 'Actor' specified so that we can check permissions");
+        } else {
+            return sender.hasPermission(permission);
+        }
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/TreeGeneratorCommand.java

@@ -0,0 +1,67 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.command.composition;
+
+import com.google.common.base.Function;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandLocals;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.generator.ForestGenerator;
+import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.util.TreeGenerator.TreeType;
+import com.sk89q.worldedit.util.command.CommandExecutor;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+
+public class TreeGeneratorCommand extends CommandExecutor<Function<EditContext, ForestGenerator>> {
+
+    @Override
+    public Function<EditContext, ForestGenerator> call(CommandArgs args, CommandLocals locals, String[] parentCommands) throws CommandException {
+        String input = args.next();
+        TreeType type = TreeGenerator.lookup(input);
+        if (type != null) {
+            return new GeneratorFactory(type);
+        } else {
+            throw new CommandException(String.format("Can't recognize tree type '%s' -- choose from: %s", input, Arrays.toString(TreeType.values())));
+        }
+    }
+
+    private static class GeneratorFactory implements Function<EditContext, ForestGenerator> {
+        private final TreeType type;
+
+        private GeneratorFactory(TreeType type) {
+            this.type = type;
+        }
+
+        @Nullable
+        @Override
+        public ForestGenerator apply(EditContext input) {
+            return new ForestGenerator((EditSession) input.getDestination(), new TreeGenerator(type));
+        }
+
+        @Override
+        public String toString() {
+            return "tree of type " + type;
+        }
+    }
+}