Finish porting commands

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditListener.java

@@ -91,7 +91,7 @@ public class WorldEditListener implements Listener {
 
         if (split.length > 0) {
             split[0] = split[0].substring(1);
-            split = plugin.getWorldEdit().getPlatformManager().getPlatformCommandMananger().commandDetection(split);
+            split = plugin.getWorldEdit().getPlatformManager().getPlatformCommandManager().commandDetection(split);
         }
 
         final String newMessage = "/" + StringUtil.joinString(split, " ");
@@ -118,7 +118,7 @@ public class WorldEditListener implements Listener {
         CommandParameters parameters = NoInputCommandParameters.builder()
             .injectedValues(MemoizingValueAccess.wrap(store))
             .build();
-        CommandManager commandManager = plugin.getWorldEdit().getPlatformManager().getPlatformCommandMananger().getCommandManager();
+        CommandManager commandManager = plugin.getWorldEdit().getPlatformManager().getPlatformCommandManager().getCommandManager();
         event.getCommands().removeIf(name ->
             // remove if in the manager and not satisfied
             commandManager.getCommand(name)

worldedit-core/src/main/java/com/sk89q/worldedit/command/ApplyBrushCommands.java

@@ -0,0 +1,113 @@
+package com.sk89q.worldedit.command;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.command.factory.TreeGeneratorFactory;
+import com.sk89q.worldedit.command.factory.ItemUseFactory;
+import com.sk89q.worldedit.command.factory.ReplaceFactory;
+import com.sk89q.worldedit.command.util.PermissionCondition;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.function.factory.Apply;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.regions.factory.RegionFactory;
+import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.util.command.CommandUtil;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.CommandParameters;
+import org.enginehub.piston.DefaultCommandManagerService;
+import org.enginehub.piston.annotation.Command;
+import org.enginehub.piston.annotation.CommandContainer;
+import org.enginehub.piston.annotation.param.Arg;
+import org.enginehub.piston.inject.Key;
+import org.enginehub.piston.part.CommandArgument;
+import org.enginehub.piston.part.SubCommandPart;
+
+import java.util.stream.Collectors;
+
+import static java.util.Objects.requireNonNull;
+import static org.enginehub.piston.part.CommandParts.arg;
+
+@CommandContainer
+public class ApplyBrushCommands {
+
+    private static final CommandArgument REGION_FACTORY = arg(TranslatableComponent.of("regionFactory"), TextComponent.of("The shape of the region"))
+        .defaultsTo(ImmutableList.of())
+        .ofTypes(ImmutableList.of(Key.of(RegionFactory.class)))
+        .build();
+
+    private static final CommandArgument RADIUS = arg(TranslatableComponent.of("radius"), TextComponent.of("The size of the brush"))
+        .defaultsTo(ImmutableList.of("5"))
+        .ofTypes(ImmutableList.of(Key.of(double.class)))
+        .build();
+
+    public static void register(CommandManager commandManager) {
+        commandManager.register("apply", builder -> {
+            builder.description(TextComponent.of("Apply brush, apply a function to every block"));
+            builder.action(org.enginehub.piston.Command.Action.NULL_ACTION);
+
+            CommandManager manager = DefaultCommandManagerService.getInstance()
+                .newCommandManager();
+            CommandUtil.register(
+                manager,
+                ApplyBrushCommandsRegistration.builder(),
+                new ApplyBrushCommands()
+            );
+
+            builder.condition(new PermissionCondition(ImmutableSet.of("worldedit.brush.apply")));
+
+            builder.addParts(REGION_FACTORY, RADIUS);
+            builder.addPart(SubCommandPart.builder(TranslatableComponent.of("type"), TextComponent.of("Type of brush to use"))
+                .withCommands(manager.getAllCommands().collect(Collectors.toList()))
+                .build());
+        });
+    }
+
+    private void setApplyBrush(CommandParameters parameters, Player player, LocalSession localSession,
+                               Contextual<? extends RegionFunction> generatorFactory) throws WorldEditException {
+        double radius = requireNonNull(RADIUS.value(parameters).asSingle(double.class));
+        RegionFactory regionFactory = REGION_FACTORY.value(parameters).asSingle(RegionFactory.class);
+        BrushCommands.setOperationBasedBrush(player, localSession, radius,
+            new Apply(generatorFactory), regionFactory, "worldedit.brush.apply");
+    }
+
+    @Command(
+        name = "forest",
+        desc = "Plant trees"
+    )
+    public void forest(CommandParameters parameters,
+                       Player player, LocalSession localSession,
+                       @Arg(desc = "The type of tree to plant")
+                           TreeGenerator.TreeType type) throws WorldEditException {
+        setApplyBrush(parameters, player, localSession, new TreeGeneratorFactory(type));
+    }
+
+    @Command(
+        name = "item",
+        desc = "Use an item"
+    )
+    public void item(CommandParameters parameters,
+                     Player player, LocalSession localSession,
+                     @Arg(desc = "The type of item to use")
+                         BaseItem item) throws WorldEditException {
+        setApplyBrush(parameters, player, localSession, new ItemUseFactory(item));
+    }
+
+    @Command(
+        name = "set",
+        desc = "Place a block"
+    )
+    public void set(CommandParameters parameters,
+                    Player player, LocalSession localSession,
+                    @Arg(desc = "The pattern of blocks to use")
+                        Pattern pattern) throws WorldEditException {
+        setApplyBrush(parameters, player, localSession, new ReplaceFactory(pattern));
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java

@@ -23,6 +23,8 @@ import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.command.factory.ReplaceFactory;
+import com.sk89q.worldedit.command.factory.TreeGeneratorFactory;
 import com.sk89q.worldedit.command.tool.BrushTool;
 import com.sk89q.worldedit.command.tool.brush.ButcherBrush;
 import com.sk89q.worldedit.command.tool.brush.ClipboardBrush;
@@ -30,6 +32,7 @@ import com.sk89q.worldedit.command.tool.brush.CylinderBrush;
 import com.sk89q.worldedit.command.tool.brush.GravityBrush;
 import com.sk89q.worldedit.command.tool.brush.HollowCylinderBrush;
 import com.sk89q.worldedit.command.tool.brush.HollowSphereBrush;
+import com.sk89q.worldedit.command.tool.brush.OperationFactoryBrush;
 import com.sk89q.worldedit.command.tool.brush.SmoothBrush;
 import com.sk89q.worldedit.command.tool.brush.SphereBrush;
 import com.sk89q.worldedit.command.util.CommandPermissions;
@@ -37,14 +40,21 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.CreatureButcher;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.factory.Apply;
+import com.sk89q.worldedit.function.factory.Deform;
+import com.sk89q.worldedit.function.factory.Paint;
 import com.sk89q.worldedit.function.mask.BlockTypeMask;
 import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.factory.RegionFactory;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.session.request.RequestExtent;
 import com.sk89q.worldedit.util.HandSide;
+import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import org.enginehub.piston.annotation.Command;
 import org.enginehub.piston.annotation.CommandContainer;
@@ -275,4 +285,106 @@ public class BrushCommands {
 
         player.print(String.format("Butcher brush equipped (%.0f).", radius));
     }
+
+    @Command(
+        name = "deform",
+        desc = "Deform brush, applies an expression to an area"
+    )
+    @CommandPermissions("worldedit.brush.deform")
+    public void deform(Player player, LocalSession localSession,
+                       @Arg(desc = "The shape of the region")
+                           RegionFactory regionFactory,
+                       @Arg(desc = "The size of the brush", def = "5")
+                           double radius,
+                       @Arg(desc = "Expression to apply", def = "y-=0.2")
+                           String expression,
+                       @Switch(name = 'r', desc = "Use the game's coordinate origin")
+                           boolean useRawCoords,
+                       @Switch(name = 'o', desc = "Use the placement position as the origin")
+                           boolean usePlacement) throws WorldEditException {
+        Deform deform = new Deform(expression);
+        if (useRawCoords) {
+            deform.setMode(Deform.Mode.RAW_COORD);
+        } else if (usePlacement) {
+            deform.setMode(Deform.Mode.OFFSET);
+            deform.setOffset(localSession.getPlacementPosition(player).toVector3());
+        }
+        setOperationBasedBrush(player, localSession, radius,
+            deform, regionFactory, "worldedit.brush.deform");
+    }
+
+    @Command(
+        name = "set",
+        desc = "Set brush, sets all blocks in the area"
+    )
+    @CommandPermissions("worldedit.brush.set")
+    public void set(Player player, LocalSession localSession,
+                    @Arg(desc = "The shape of the region")
+                        RegionFactory regionFactory,
+                    @Arg(desc = "The size of the brush", def = "5")
+                        double radius,
+                    @Arg(desc = "The pattern of blocks to set")
+                        Pattern pattern) throws WorldEditException {
+        setOperationBasedBrush(player, localSession, radius,
+            new Apply(new ReplaceFactory(pattern)), regionFactory, "worldedit.brush.set");
+    }
+
+    @Command(
+        name = "forest",
+        desc = "Forest brush, creates a forest in the area"
+    )
+    @CommandPermissions("worldedit.brush.forest")
+    public void forest(Player player, LocalSession localSession,
+                       @Arg(desc = "The shape of the region")
+                           RegionFactory regionFactory,
+                       @Arg(desc = "The size of the brush", def = "5")
+                           double radius,
+                       @Arg(desc = "The density of the brush", def = "20")
+                           double density,
+                       @Arg(desc = "The type of tree to use")
+                           TreeGenerator.TreeType type) throws WorldEditException {
+        setOperationBasedBrush(player, localSession, radius,
+            new Paint(new TreeGeneratorFactory(type), density / 100), regionFactory, "worldedit.brush.forest");
+    }
+
+    @Command(
+        name = "raise",
+        desc = "Raise brush, raise all blocks by one"
+    )
+    @CommandPermissions("worldedit.brush.raise")
+    public void raise(Player player, LocalSession localSession,
+                      @Arg(desc = "The shape of the region")
+                          RegionFactory regionFactory,
+                      @Arg(desc = "The size of the brush", def = "5")
+                          double radius) throws WorldEditException {
+        setOperationBasedBrush(player, localSession, radius,
+            new Deform("y-=1"), regionFactory, "worldedit.brush.raise");
+    }
+
+    @Command(
+        name = "lower",
+        desc = "Lower brush, lower all blocks by one"
+    )
+    @CommandPermissions("worldedit.brush.lower")
+    public void lower(Player player, LocalSession localSession,
+                      @Arg(desc = "The shape of the region")
+                          RegionFactory regionFactory,
+                      @Arg(desc = "The size of the brush", def = "5")
+                          double radius) throws WorldEditException {
+        setOperationBasedBrush(player, localSession, radius,
+            new Deform("y+=1"), regionFactory, "worldedit.brush.lower");
+    }
+
+    static void setOperationBasedBrush(Player player, LocalSession session, double radius,
+                                        Contextual<? extends Operation> factory,
+                                        RegionFactory regionFactory,
+                                        String permission) throws WorldEditException {
+        WorldEdit.getInstance().checkMaxBrushRadius(radius);
+        BrushTool tool = session.getBrushTool(player.getItemInHand(HandSide.MAIN_HAND).getType());
+        tool.setSize(radius);
+        tool.setFill(null);
+        tool.setBrush(new OperationFactoryBrush(factory, regionFactory, session), permission);
+
+        player.print("Set brush to " + factory);
+    }
 }

worldedit-core/src/main/java/com/sk89q/worldedit/command/PaintBrushCommands.java

@@ -0,0 +1,119 @@
+package com.sk89q.worldedit.command;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.command.factory.TreeGeneratorFactory;
+import com.sk89q.worldedit.command.factory.ItemUseFactory;
+import com.sk89q.worldedit.command.factory.ReplaceFactory;
+import com.sk89q.worldedit.command.util.PermissionCondition;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.function.factory.Paint;
+import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.regions.factory.RegionFactory;
+import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.util.command.CommandUtil;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.CommandParameters;
+import org.enginehub.piston.DefaultCommandManagerService;
+import org.enginehub.piston.annotation.Command;
+import org.enginehub.piston.annotation.CommandContainer;
+import org.enginehub.piston.annotation.param.Arg;
+import org.enginehub.piston.inject.Key;
+import org.enginehub.piston.part.CommandArgument;
+import org.enginehub.piston.part.SubCommandPart;
+
+import java.util.stream.Collectors;
+
+import static java.util.Objects.requireNonNull;
+import static org.enginehub.piston.part.CommandParts.arg;
+
+@CommandContainer
+public class PaintBrushCommands {
+
+    private static final CommandArgument REGION_FACTORY = arg(TranslatableComponent.of("regionFactory"), TextComponent.of("The shape of the region"))
+        .defaultsTo(ImmutableList.of())
+        .ofTypes(ImmutableList.of(Key.of(RegionFactory.class)))
+        .build();
+
+    private static final CommandArgument RADIUS = arg(TranslatableComponent.of("radius"), TextComponent.of("The size of the brush"))
+        .defaultsTo(ImmutableList.of("5"))
+        .ofTypes(ImmutableList.of(Key.of(double.class)))
+        .build();
+
+    private static final CommandArgument DENSITY = arg(TranslatableComponent.of("density"), TextComponent.of("The density of the brush"))
+        .defaultsTo(ImmutableList.of("20"))
+        .ofTypes(ImmutableList.of(Key.of(double.class)))
+        .build();
+
+    public static void register(CommandManager commandManager) {
+        commandManager.register("paint", builder -> {
+            builder.description(TextComponent.of("Paint brush, apply a function to a surface"));
+            builder.action(org.enginehub.piston.Command.Action.NULL_ACTION);
+
+            CommandManager manager = DefaultCommandManagerService.getInstance()
+                .newCommandManager();
+            CommandUtil.register(
+                manager,
+                PaintBrushCommandsRegistration.builder(),
+                new PaintBrushCommands()
+            );
+
+            builder.condition(new PermissionCondition(ImmutableSet.of("worldedit.brush.paint")));
+
+            builder.addParts(REGION_FACTORY, RADIUS, DENSITY);
+            builder.addPart(SubCommandPart.builder(TranslatableComponent.of("type"), TextComponent.of("Type of brush to use"))
+                .withCommands(manager.getAllCommands().collect(Collectors.toList()))
+                .build());
+        });
+    }
+
+    private void setPaintBrush(CommandParameters parameters, Player player, LocalSession localSession,
+                               Contextual<? extends RegionFunction> generatorFactory) throws WorldEditException {
+        double radius = requireNonNull(RADIUS.value(parameters).asSingle(double.class));
+        double density = requireNonNull(DENSITY.value(parameters).asSingle(double.class)) / 100;
+        RegionFactory regionFactory = REGION_FACTORY.value(parameters).asSingle(RegionFactory.class);
+        BrushCommands.setOperationBasedBrush(player, localSession, radius,
+            new Paint(generatorFactory, density), regionFactory, "worldedit.brush.paint");
+    }
+
+    @Command(
+        name = "forest",
+        desc = "Plant trees"
+    )
+    public void forest(CommandParameters parameters,
+                       Player player, LocalSession localSession,
+                       @Arg(desc = "The type of tree to plant")
+                           TreeGenerator.TreeType type) throws WorldEditException {
+        setPaintBrush(parameters, player, localSession, new TreeGeneratorFactory(type));
+    }
+
+    @Command(
+        name = "item",
+        desc = "Use an item"
+    )
+    public void item(CommandParameters parameters,
+                     Player player, LocalSession localSession,
+                     @Arg(desc = "The type of item to use")
+                         BaseItem item) throws WorldEditException {
+        setPaintBrush(parameters, player, localSession, new ItemUseFactory(item));
+    }
+
+    @Command(
+        name = "set",
+        desc = "Place a block"
+    )
+    public void set(CommandParameters parameters,
+                    Player player, LocalSession localSession,
+                    @Arg(desc = "The pattern of blocks to use")
+                        Pattern pattern) throws WorldEditException {
+        setPaintBrush(parameters, player, localSession, new ReplaceFactory(pattern));
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java

@@ -120,7 +120,7 @@ public class WorldEditCommands {
             actor.checkPermission("worldedit.report.pastebin");
             ActorCallbackPaste.pastebin(
                     we.getSupervisor(), actor, result, "WorldEdit report: %s.report",
-                    WorldEdit.getInstance().getPlatformManager().getPlatformCommandMananger().getExceptionConverter()
+                    WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().getExceptionConverter()
             );
         }
     }

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/FactoryConverter.java

@@ -21,12 +21,15 @@ package com.sk89q.worldedit.command.argument;
 
 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.ParserContext;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.internal.registry.AbstractFactory;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.world.World;
@@ -37,20 +40,33 @@ import org.enginehub.piston.converter.SuccessfulConversion;
 import org.enginehub.piston.inject.InjectedValueAccess;
 import org.enginehub.piston.inject.Key;
 
-public class PatternConverter implements ArgumentConverter<Pattern> {
+import java.util.function.Function;
+
+public class FactoryConverter<T> implements ArgumentConverter<T> {
 
     public static void register(WorldEdit worldEdit, CommandManager commandManager) {
-        commandManager.registerConverter(Key.of(Pattern.class), new PatternConverter(worldEdit));
+        commandManager.registerConverter(Key.of(Pattern.class),
+            new FactoryConverter<>(worldEdit, WorldEdit::getPatternFactory, "pattern"));
+        commandManager.registerConverter(Key.of(Mask.class),
+            new FactoryConverter<>(worldEdit, WorldEdit::getMaskFactory, "mask"));
+        commandManager.registerConverter(Key.of(BaseItem.class),
+            new FactoryConverter<>(worldEdit, WorldEdit::getItemFactory, "item"));
     }
 
     private final WorldEdit worldEdit;
+    private final Function<WorldEdit, AbstractFactory<T>> factoryExtractor;
+    private final String description;
 
-    private PatternConverter(WorldEdit worldEdit) {
+    private FactoryConverter(WorldEdit worldEdit,
+                             Function<WorldEdit, AbstractFactory<T>> factoryExtractor,
+                             String description) {
         this.worldEdit = worldEdit;
+        this.factoryExtractor = factoryExtractor;
+        this.description = description;
     }
 
     @Override
-    public ConversionResult<Pattern> convert(String argument, InjectedValueAccess context) {
+    public ConversionResult<T> convert(String argument, InjectedValueAccess context) {
         Actor actor = context.injectedValue(Key.of(Actor.class))
             .orElseThrow(() -> new IllegalStateException("No actor"));
         LocalSession session = WorldEdit.getInstance().getSessionManager().get(actor);
@@ -67,7 +83,7 @@ public class PatternConverter implements ArgumentConverter<Pattern> {
 
         try {
             return SuccessfulConversion.fromSingle(
-                worldEdit.getPatternFactory().parseFromInput(argument, parserContext)
+                factoryExtractor.apply(worldEdit).parseFromInput(argument, parserContext)
             );
         } catch (InputParseException e) {
             throw new IllegalArgumentException(e);
@@ -76,6 +92,6 @@ public class PatternConverter implements ArgumentConverter<Pattern> {
 
     @Override
     public Component describeAcceptableArguments() {
-        return TextComponent.of("any pattern");
+        return TextComponent.of("any " + description);
     }
 }

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ItemParser.java

@@ -1,82 +0,0 @@
-/*
- * 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.argument;
-
-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.ParserContext;
-import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
-import com.sk89q.worldedit.world.World;
-
-public class ItemParser extends SimpleCommand<BaseItem> {
-
-    private final StringParser stringParser;
-
-    public ItemParser(String name) {
-        stringParser = addParameter(new StringParser(name, "The item name", null));
-    }
-
-    public ItemParser(String name, String defaultSuggestion) {
-        stringParser = addParameter(new StringParser(name, "The item name", defaultSuggestion));
-    }
-
-    @Override
-    public BaseItem call(CommandArgs args, CommandLocals locals) throws CommandException {
-        String itemString = stringParser.call(args, locals);
-
-        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(itemString, parserContext);
-        } catch (InputParseException e) {
-            throw new CommandException(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public String getDescription() {
-        return "Match an item";
-    }
-
-    @Override
-    protected boolean testPermission0(CommandLocals locals) {
-        return true;
-    }
-
-}

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ItemUseParser.java

@@ -1,90 +0,0 @@
-/*
- * 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.argument;
-
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandLocals;
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseItem;
-import com.sk89q.worldedit.function.Contextual;
-import com.sk89q.worldedit.function.EditContext;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.util.Direction;
-import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
-import com.sk89q.worldedit.world.World;
-
-public class ItemUseParser extends SimpleCommand<Contextual<RegionFunction>> {
-
-    private final ItemParser itemParser = addParameter(new ItemParser("item", "minecraft:bone_meal"));
-
-    @Override
-    public Contextual<RegionFunction> call(CommandArgs args, CommandLocals locals) throws CommandException {
-        BaseItem item = itemParser.call(args, locals);
-        return new ItemUseFactory(item);
-    }
-
-    @Override
-    public String getDescription() {
-        return "Applies an item";
-    }
-
-    @Override
-    protected boolean testPermission0(CommandLocals locals) {
-        return true;
-    }
-
-    private static final class ItemUseFactory implements Contextual<RegionFunction> {
-        private final BaseItem item;
-
-        private ItemUseFactory(BaseItem item) {
-            this.item = item;
-        }
-
-        @Override
-        public RegionFunction createFromContext(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.getNbtData();
-        }
-    }
-
-    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(BlockVector3 position) throws WorldEditException {
-            return world.useItem(position, item, Direction.UP);
-        }
-    }
-
-}

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/MaskConverter.java

@@ -1,78 +0,0 @@
-/*
- * 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.argument;
-
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extension.input.InputParseException;
-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.mask.Mask;
-import com.sk89q.worldedit.util.formatting.text.Component;
-import com.sk89q.worldedit.util.formatting.text.TextComponent;
-import com.sk89q.worldedit.world.World;
-import org.enginehub.piston.CommandManager;
-import org.enginehub.piston.converter.ArgumentConverter;
-import org.enginehub.piston.converter.ConversionResult;
-import org.enginehub.piston.converter.FailedConversion;
-import org.enginehub.piston.converter.SuccessfulConversion;
-import org.enginehub.piston.inject.InjectedValueAccess;
-import org.enginehub.piston.inject.Key;
-
-public class MaskConverter implements ArgumentConverter<Mask> {
-
-    public static void register(WorldEdit worldEdit, CommandManager commandManager) {
-        commandManager.registerConverter(Key.of(Mask.class), new MaskConverter(worldEdit));
-    }
-
-    private final WorldEdit worldEdit;
-
-    private MaskConverter(WorldEdit worldEdit) {
-        this.worldEdit = worldEdit;
-    }
-
-    @Override
-    public ConversionResult<Mask> convert(String argument, InjectedValueAccess context) {
-        Actor actor = context.injectedValue(Key.of(Actor.class))
-            .orElseThrow(() -> new IllegalStateException("No 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(worldEdit.getSessionManager().get(actor));
-        try {
-            return SuccessfulConversion.fromSingle(
-                worldEdit.getMaskFactory().parseFromInput(argument, parserContext)
-            );
-        } catch (InputParseException e) {
-            return FailedConversion.from(e);
-        }
-    }
-
-    @Override
-    public Component describeAcceptableArguments() {
-        return TextComponent.of("any mask");
-    }
-}

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/RegionFactoryConverter.java

@@ -0,0 +1,72 @@
+/*
+ * 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.argument;
+
+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.formatting.text.Component;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.converter.ArgumentConverter;
+import org.enginehub.piston.converter.ConversionResult;
+import org.enginehub.piston.converter.FailedConversion;
+import org.enginehub.piston.converter.SuccessfulConversion;
+import org.enginehub.piston.inject.InjectedValueAccess;
+import org.enginehub.piston.inject.Key;
+
+public class RegionFactoryConverter implements ArgumentConverter<RegionFactory> {
+
+    public static void register(CommandManager commandManager) {
+        commandManager.registerConverter(Key.of(RegionFactory.class), new RegionFactoryConverter());
+    }
+
+    private RegionFactoryConverter() {
+    }
+
+    @Override
+    public Component describeAcceptableArguments() {
+        return TextComponent.of("cuboid|sphere|cyl");
+    }
+
+    @Override
+    public ConversionResult<RegionFactory> convert(String argument, InjectedValueAccess context) {
+        try {
+            return SuccessfulConversion.fromSingle(parse(argument));
+        } catch (Exception e) {
+            return FailedConversion.from(e);
+        }
+    }
+
+    private RegionFactory parse(String argument) {
+        switch (argument) {
+            case "cuboid":
+                return new CuboidRegionFactory();
+            case "sphere":
+                return new SphereRegionFactory();
+            case "cyl":
+            case "cylinder":
+                return new CylinderRegionFactory(1); // TODO: Adjustable height
+            default:
+                throw new IllegalArgumentException("Not a known region type: " + argument);
+        }
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/RegionFunctionParser.java

@@ -1,40 +0,0 @@
-/*
- * 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.argument;
-
-import com.sk89q.worldedit.function.Contextual;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.util.command.composition.BranchingCommand;
-
-public class RegionFunctionParser extends BranchingCommand<Contextual<? extends RegionFunction>> {
-
-    public RegionFunctionParser() {
-        super("functionTpe");
-        putOption(new TreeGeneratorParser("treeType"), "forest");
-        putOption(new ItemUseParser(), "item");
-        putOption(new ReplaceParser(), "set");
-    }
-
-    @Override
-    public String getDescription() {
-        return "Choose a block function";
-    }
-
-}

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ReplaceParser.java

@@ -1,78 +0,0 @@
-/*
- * 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.argument;
-
-import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
-
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandLocals;
-import com.sk89q.worldedit.extent.NullExtent;
-import com.sk89q.worldedit.function.Contextual;
-import com.sk89q.worldedit.function.EditContext;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.function.block.BlockReplace;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
-
-
-public class ReplaceParser extends SimpleCommand<Contextual<? extends RegionFunction>> {
-
-    // TODO rewrite for new system
-//    private final PatternParser fillArg = addParameter(new PatternParser("fillPattern"));
-
-    @Override
-    public Contextual<RegionFunction> call(CommandArgs args, CommandLocals locals) throws CommandException {
-//        Pattern fill = fillArg.call(args, locals);
-//        return new ReplaceFactory(fill);
-        return null;
-    }
-
-    @Override
-    public String getDescription() {
-        return "Replaces blocks";
-    }
-
-    @Override
-    protected boolean testPermission0(CommandLocals locals) {
-        return true;
-    }
-
-    private static class ReplaceFactory implements Contextual<RegionFunction> {
-        private final Pattern fill;
-
-        private ReplaceFactory(Pattern fill) {
-            this.fill = fill;
-        }
-
-        @Override
-        public RegionFunction createFromContext(EditContext context) {
-            return new BlockReplace(
-                    firstNonNull(context.getDestination(), new NullExtent()),
-                    firstNonNull(context.getFill(), fill));
-        }
-
-        @Override
-        public String toString() {
-            return "replace blocks";
-        }
-    }
-
-}

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

@@ -1,68 +0,0 @@
-/*
- * 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 static com.google.common.base.Preconditions.checkNotNull;
-
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandLocals;
-import com.sk89q.worldedit.command.argument.RegionFunctionParser;
-import com.sk89q.worldedit.function.Contextual;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.function.factory.Apply;
-import com.sk89q.worldedit.function.operation.Operation;
-import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.CommandExecutor;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
-
-public class ApplyCommand extends SimpleCommand<Contextual<? extends Operation>> {
-
-    private final CommandExecutor<Contextual<? extends RegionFunction>> functionParser;
-    private final String description;
-
-    public ApplyCommand() {
-        this(new RegionFunctionParser(), "Applies a function to every block");
-    }
-
-    public ApplyCommand(CommandExecutor<Contextual<? extends RegionFunction>> functionParser, String description) {
-        checkNotNull(functionParser, "functionParser");
-        checkNotNull(description, "description");
-        this.functionParser = functionParser;
-        this.description = description;
-        addParameter(functionParser);
-    }
-
-    @Override
-    public Apply call(CommandArgs args, CommandLocals locals) throws CommandException {
-        Contextual<? extends RegionFunction> function = functionParser.call(args, locals);
-        return new Apply(function);
-    }
-
-    @Override
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    protected boolean testPermission0(CommandLocals locals) {
-        return true;
-    }
-
-}

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

@@ -1,64 +0,0 @@
-/*
- * 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.command.argument.NumberParser;
-import com.sk89q.worldedit.command.argument.RegionFunctionParser;
-import com.sk89q.worldedit.function.Contextual;
-import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.function.factory.Paint;
-import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.CommandExecutor;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
-
-public class PaintCommand extends SimpleCommand<Paint> {
-
-    private final NumberParser densityCommand = addParameter(new NumberParser("density", "0-100", "20"));
-    private final CommandExecutor<? extends Contextual<? extends RegionFunction>> functionParser;
-
-    public PaintCommand() {
-        this(new RegionFunctionParser());
-    }
-
-    public PaintCommand(CommandExecutor<? extends Contextual<? extends RegionFunction>> functionParser) {
-        this.functionParser = functionParser;
-        addParameter(functionParser);
-    }
-
-    @Override
-    public Paint call(CommandArgs args, CommandLocals locals) throws CommandException {
-        double density = densityCommand.call(args, locals).doubleValue() / 100.0;
-        Contextual<? extends RegionFunction> function = functionParser.call(args, locals);
-        return new Paint(function, density);
-    }
-
-    @Override
-    public String getDescription() {
-        return "Applies a function to surfaces";
-    }
-
-    @Override
-    protected boolean testPermission0(CommandLocals locals) {
-        return true;
-    }
-
-}

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

@@ -94,7 +94,7 @@ public class SelectionCommand extends SimpleCommand<Operation> {
 
                 return operation;
             } catch (IncompleteRegionException e) {
-                WorldEdit.getInstance().getPlatformManager().getPlatformCommandMananger().getExceptionConverter().convert(e);
+                WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().getExceptionConverter().convert(e);
                 return null;
             }
         } else {

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

@@ -77,7 +77,7 @@ public class ShapedBrushCommand extends SimpleCommand<Object> {
             tool.setFill(null);
             tool.setBrush(new OperationFactoryBrush(factory, regionFactory, session), permission);
         } catch (MaxBrushRadiusException | InvalidToolBindException e) {
-            WorldEdit.getInstance().getPlatformManager().getPlatformCommandMananger().getExceptionConverter().convert(e);
+            WorldEdit.getInstance().getPlatformManager().getPlatformCommandManager().getExceptionConverter().convert(e);
         }
 
         player.print("Set brush to " + factory);

worldedit-core/src/main/java/com/sk89q/worldedit/command/factory/ItemUseFactory.java

@@ -0,0 +1,28 @@
+package com.sk89q.worldedit.command.factory;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.function.ItemUseFunction;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.world.World;
+
+public final class ItemUseFactory implements Contextual<RegionFunction> {
+    private final BaseItem item;
+
+    public ItemUseFactory(BaseItem item) {
+        this.item = item;
+    }
+
+    @Override
+    public RegionFunction createFromContext(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.getNbtData();
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/factory/ReplaceFactory.java

@@ -0,0 +1,30 @@
+package com.sk89q.worldedit.command.factory;
+
+import com.sk89q.worldedit.extent.NullExtent;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.function.block.BlockReplace;
+import com.sk89q.worldedit.function.pattern.Pattern;
+
+import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
+
+public class ReplaceFactory implements Contextual<RegionFunction> {
+    private final Pattern fill;
+
+    public ReplaceFactory(Pattern fill) {
+        this.fill = fill;
+    }
+
+    @Override
+    public RegionFunction createFromContext(EditContext context) {
+        return new BlockReplace(
+            firstNonNull(context.getDestination(), new NullExtent()),
+            firstNonNull(context.getFill(), fill));
+    }
+
+    @Override
+    public String toString() {
+        return "replace blocks";
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/factory/TreeGeneratorFactory.java

@@ -0,0 +1,25 @@
+package com.sk89q.worldedit.command.factory;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.generator.ForestGenerator;
+import com.sk89q.worldedit.util.TreeGenerator;
+
+public final class TreeGeneratorFactory implements Contextual<ForestGenerator> {
+    private final TreeGenerator.TreeType type;
+
+    public TreeGeneratorFactory(TreeGenerator.TreeType type) {
+        this.type = type;
+    }
+
+    @Override
+    public ForestGenerator createFromContext(EditContext input) {
+        return new ForestGenerator((EditSession) input.getDestination(), type);
+    }
+
+    @Override
+    public String toString() {
+        return "tree of type " + type;
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PermissionCondition.java

@@ -32,7 +32,7 @@ public final class PermissionCondition implements Command.Condition {
 
     private final Set<String> permissions;
 
-    PermissionCondition(Set<String> permissions) {
+    public PermissionCondition(Set<String> permissions) {
         this.permissions = permissions;
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/util/PrintCommandHelp.java

@@ -74,7 +74,7 @@ public class PrintCommandHelp {
             actor.printError("Page must be >= 1.");
             return;
         }
-        CommandManager manager = we.getPlatformManager().getPlatformCommandMananger().getCommandManager();
+        CommandManager manager = we.getPlatformManager().getPlatformCommandManager().getCommandManager();
 
         final int perPage = actor instanceof Player ? 8 : 20; // More pages for console
 

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Capability.java

@@ -50,12 +50,12 @@ public enum Capability {
     USER_COMMANDS {
         @Override
         void initialize(PlatformManager platformManager, Platform platform) {
-            platformManager.getPlatformCommandMananger().register(platform);
+            platformManager.getPlatformCommandManager().registerCommandsWith(platform);
         }
 
         @Override
         void unload(PlatformManager platformManager, Platform platform) {
-            platformManager.getPlatformCommandMananger().unregister();
+            platformManager.getPlatformCommandManager().removeCommands();
         }
     },
 

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java

@@ -26,6 +26,7 @@ import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.command.ApplyBrushCommands;
 import com.sk89q.worldedit.command.BiomeCommands;
 import com.sk89q.worldedit.command.BiomeCommandsRegistration;
 import com.sk89q.worldedit.command.BrushCommands;
@@ -42,6 +43,7 @@ import com.sk89q.worldedit.command.HistoryCommands;
 import com.sk89q.worldedit.command.HistoryCommandsRegistration;
 import com.sk89q.worldedit.command.NavigationCommands;
 import com.sk89q.worldedit.command.NavigationCommandsRegistration;
+import com.sk89q.worldedit.command.PaintBrushCommands;
 import com.sk89q.worldedit.command.RegionCommands;
 import com.sk89q.worldedit.command.RegionCommandsRegistration;
 import com.sk89q.worldedit.command.SchematicCommands;
@@ -71,11 +73,10 @@ import com.sk89q.worldedit.command.argument.DirectionConverter;
 import com.sk89q.worldedit.command.argument.EntityRemoverConverter;
 import com.sk89q.worldedit.command.argument.EnumConverter;
 import com.sk89q.worldedit.command.argument.ExpandAmountConverter;
-import com.sk89q.worldedit.command.argument.MaskConverter;
+import com.sk89q.worldedit.command.argument.FactoryConverter;
-import com.sk89q.worldedit.command.argument.PatternConverter;
+import com.sk89q.worldedit.command.argument.RegionFactoryConverter;
 import com.sk89q.worldedit.command.argument.VectorConverter;
 import com.sk89q.worldedit.command.argument.ZonedDateTimeConverter;
-import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.PermissionCondition;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.entity.Player;
@@ -83,7 +84,6 @@ import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.event.platform.CommandSuggestionEvent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.internal.annotation.Selection;
-import com.sk89q.worldedit.internal.command.CommandLoggingHandler;
 import com.sk89q.worldedit.internal.command.WorldEditExceptionConverter;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.session.request.Request;
@@ -102,7 +102,6 @@ import org.enginehub.piston.exception.CommandException;
 import org.enginehub.piston.exception.CommandExecutionException;
 import org.enginehub.piston.exception.ConditionFailedException;
 import org.enginehub.piston.exception.UsageException;
-import org.enginehub.piston.gen.CommandCallListener;
 import org.enginehub.piston.gen.CommandRegistration;
 import org.enginehub.piston.inject.InjectedValueStore;
 import org.enginehub.piston.inject.Key;
@@ -116,29 +115,28 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.util.command.CommandUtil.COMMAND_LOG;
+import static com.sk89q.worldedit.util.command.CommandUtil.register;
 
 /**
  * Handles the registration and invocation of commands.
  *
  * <p>This class is primarily for internal usage.</p>
  */
-public final class PlatformCommandMananger {
+public final class PlatformCommandManager {
 
     public static final Pattern COMMAND_CLEAN_PATTERN = Pattern.compile("^[/]+");
-    private static final Logger log = LoggerFactory.getLogger(PlatformCommandMananger.class);
+    private static final Logger log = LoggerFactory.getLogger(PlatformCommandManager.class);
-    private static final java.util.logging.Logger commandLog =
-        java.util.logging.Logger.getLogger(PlatformCommandMananger.class.getCanonicalName() + ".CommandLog");
     private static final Pattern numberFormatExceptionPattern = Pattern.compile("^For input string: \"(.*)\"$");
-    private static final CommandPermissionsConditionGenerator PERM_GEN = new CommandPermissionsConditionGenerator();
 
     private final WorldEdit worldEdit;
     private final PlatformManager platformManager;
@@ -146,14 +144,13 @@ public final class PlatformCommandMananger {
     private final InjectedValueStore globalInjectedValues;
     private final DynamicStreamHandler dynamicHandler = new DynamicStreamHandler();
     private final WorldEditExceptionConverter exceptionConverter;
-    private final List<CommandCallListener> callListeners;
 
     /**
      * Create a new instance.
      *
      * @param worldEdit the WorldEdit instance
      */
-    PlatformCommandMananger(final WorldEdit worldEdit, PlatformManager platformManager) {
+    PlatformCommandManager(final WorldEdit worldEdit, PlatformManager platformManager) {
         checkNotNull(worldEdit);
         checkNotNull(platformManager);
         this.worldEdit = worldEdit;
@@ -162,32 +159,17 @@ public final class PlatformCommandMananger {
         this.commandManager = DefaultCommandManagerService.getInstance()
             .newCommandManager();
         this.globalInjectedValues = MapBackedValueStore.create();
-        this.callListeners = Collections.singletonList(
-            new CommandLoggingHandler(worldEdit, commandLog)
-        );
         // setup separate from main constructor
         // ensures that everything is definitely assigned
         initialize();
     }
 
-    private <CI> void register(CommandManager manager, CommandRegistration<CI> registration, CI instance) {
-        registration.containerInstance(instance)
-            .commandManager(manager)
-            .listeners(callListeners);
-        if (registration instanceof CommandPermissionsConditionGenerator.Registration) {
-            ((CommandPermissionsConditionGenerator.Registration) registration).commandPermissionsConditionGenerator(
-                PERM_GEN
-            );
-        }
-        registration.build();
-    }
-
     private void initialize() {
         // Register this instance for command events
         worldEdit.getEventBus().register(this);
 
         // Setup the logger
-        commandLog.addHandler(dynamicHandler);
+        COMMAND_LOG.addHandler(dynamicHandler);
 
         // Set up the commands manager
         registerAlwaysInjectedValues();
@@ -197,8 +179,7 @@ public final class PlatformCommandMananger {
 
     private void registerArgumentConverters() {
         DirectionConverter.register(worldEdit, commandManager);
-        MaskConverter.register(worldEdit, commandManager);
+        FactoryConverter.register(worldEdit, commandManager);
-        PatternConverter.register(worldEdit, commandManager);
         for (int count = 2; count <= 3; count++) {
             commandManager.registerConverter(Key.of(double.class, Annotations.radii(count)),
                 CommaSeparatedValuesConverter.wrapAndLimit(ArgumentConverters.get(
@@ -212,6 +193,7 @@ public final class PlatformCommandMananger {
         ZonedDateTimeConverter.register(commandManager);
         BooleanConverter.register(commandManager);
         EntityRemoverConverter.register(commandManager);
+        RegionFactoryConverter.register(commandManager);
     }
 
     private void registerAlwaysInjectedValues() {
@@ -244,6 +226,12 @@ public final class PlatformCommandMananger {
 
     private <CI> void registerSubCommands(String name, List<String> aliases, String desc,
                                       CommandRegistration<CI> registration, CI instance) {
+        registerSubCommands(name, aliases, desc, registration, instance, m -> {});
+    }
+
+    private <CI> void registerSubCommands(String name, List<String> aliases, String desc,
+                                          CommandRegistration<CI> registration, CI instance,
+                                          Consumer<CommandManager> additionalConfig) {
         commandManager.register(name, cmd -> {
             cmd.aliases(aliases);
             cmd.description(TextComponent.of(desc));
@@ -292,7 +280,11 @@ public final class PlatformCommandMananger {
             ImmutableList.of("br"),
             "Brushing commands",
             BrushCommandsRegistration.builder(),
-            new BrushCommands(worldEdit)
+            new BrushCommands(worldEdit),
+            manager -> {
+                PaintBrushCommands.register(manager);
+                ApplyBrushCommands.register(manager);
+            }
         );
         registerSubCommands(
             "worldedit",
@@ -371,31 +363,13 @@ public final class PlatformCommandMananger {
             UtilityCommandsRegistration.builder(),
             new UtilityCommands(worldEdit)
         );
-
-        // Unported commands are below. Delete once they're added to the main manager above.
-        /*
-        dispatcher = new CommandGraph()
-                .builder(builder)
-                    .commands()
-                        .group("brush", "br")
-                            .describeAs("Brushing commands")
-                            .register(adapt(new ShapedBrushCommand(new DeformCommand(), "worldedit.brush.deform")), "deform")
-                            .register(adapt(new ShapedBrushCommand(new ApplyCommand(new ReplaceParser(), "Set all blocks within region"), "worldedit.brush.set")), "set")
-                            .register(adapt(new ShapedBrushCommand(new PaintCommand(), "worldedit.brush.paint")), "paint")
-                            .register(adapt(new ShapedBrushCommand(new ApplyCommand(), "worldedit.brush.apply")), "apply")
-                            .register(adapt(new ShapedBrushCommand(new PaintCommand(new TreeGeneratorParser("treeType")), "worldedit.brush.forest")), "forest")
-                            .register(adapt(new ShapedBrushCommand(ProvidedValue.create(new Deform("y-=1", Mode.RAW_COORD), "Raise one block"), "worldedit.brush.raise")), "raise")
-                            .register(adapt(new ShapedBrushCommand(ProvidedValue.create(new Deform("y+=1", Mode.RAW_COORD), "Lower one block"), "worldedit.brush.lower")), "lower")
-                        .parent()
-                .getDispatcher();
-         */
     }
 
     public ExceptionConverter getExceptionConverter() {
         return exceptionConverter;
     }
 
-    void register(Platform platform) {
+    void registerCommandsWith(Platform platform) {
         log.info("Registering commands with " + platform.getClass().getCanonicalName());
 
         LocalConfiguration config = platform.getConfiguration();
@@ -405,10 +379,10 @@ public final class PlatformCommandMananger {
         // Register log
         if (!logging || path.isEmpty()) {
             dynamicHandler.setHandler(null);
-            commandLog.setLevel(Level.OFF);
+            COMMAND_LOG.setLevel(Level.OFF);
         } else {
             File file = new File(config.getWorkingDirectory(), path);
-            commandLog.setLevel(Level.ALL);
+            COMMAND_LOG.setLevel(Level.ALL);
 
             log.info("Logging WorldEdit commands to " + file.getAbsolutePath());
 
@@ -424,7 +398,7 @@ public final class PlatformCommandMananger {
         platform.registerCommands(commandManager);
     }
 
-    void unregister() {
+    void removeCommands() {
         dynamicHandler.setHandler(null);
     }
 
@@ -581,8 +555,4 @@ public final class PlatformCommandMananger {
         return commandManager;
     }
 
-    public static java.util.logging.Logger getLogger() {
-        return commandLog;
-    }
-
 }

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java

@@ -68,7 +68,7 @@ public class PlatformManager {
     private static final Logger logger = LoggerFactory.getLogger(PlatformManager.class);
 
     private final WorldEdit worldEdit;
-    private final PlatformCommandMananger platformCommandMananger;
+    private final PlatformCommandManager platformCommandManager;
     private final List<Platform> platforms = new ArrayList<>();
     private final Map<Capability, Platform> preferences = new EnumMap<>(Capability.class);
     private @Nullable String firstSeenVersion;
@@ -83,7 +83,7 @@ public class PlatformManager {
     public PlatformManager(WorldEdit worldEdit) {
         checkNotNull(worldEdit);
         this.worldEdit = worldEdit;
-        this.platformCommandMananger = new PlatformCommandMananger(worldEdit, this);
+        this.platformCommandManager = new PlatformCommandManager(worldEdit, this);
 
         // Register this instance for events
         worldEdit.getEventBus().register(this);
@@ -277,8 +277,8 @@ public class PlatformManager {
      *
      * @return the command manager
      */
-    public PlatformCommandMananger getPlatformCommandMananger() {
+    public PlatformCommandManager getPlatformCommandManager() {
-        return platformCommandMananger;
+        return platformCommandManager;
     }
 
     /**

worldedit-core/src/main/java/com/sk89q/worldedit/function/ItemUseFunction.java

@@ -0,0 +1,23 @@
+package com.sk89q.worldedit.function;
+
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.blocks.BaseItem;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Direction;
+import com.sk89q.worldedit.world.World;
+
+public final class ItemUseFunction implements RegionFunction {
+    private final World world;
+    private final BaseItem item;
+
+    public ItemUseFunction(World world, BaseItem item) {
+        this.world = world;
+        this.item = item;
+    }
+
+    @Override
+    public boolean apply(BlockVector3 position) throws WorldEditException {
+        return world.useItem(position, item, Direction.UP);
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/util/command/CommandUtil.java

@@ -19,13 +19,22 @@
 
 package com.sk89q.worldedit.util.command;
 
-import com.sk89q.worldedit.extension.platform.PlatformCommandMananger;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
+import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
+import com.sk89q.worldedit.internal.command.CommandLoggingHandler;
 import org.enginehub.piston.Command;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.gen.CommandCallListener;
+import org.enginehub.piston.gen.CommandRegistration;
 import org.enginehub.piston.part.SubCommandPart;
 
 import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 public class CommandUtil {
@@ -38,7 +47,7 @@ public class CommandUtil {
     }
 
     private static String clean(String input) {
-        return PlatformCommandMananger.COMMAND_CLEAN_PATTERN.matcher(input).replaceAll("");
+        return PlatformCommandManager.COMMAND_CLEAN_PATTERN.matcher(input).replaceAll("");
     }
 
     private static final Comparator<Command> BY_CLEAN_NAME =
@@ -48,6 +57,26 @@ public class CommandUtil {
         return BY_CLEAN_NAME;
     }
 
+    private static final CommandPermissionsConditionGenerator PERM_GEN = new CommandPermissionsConditionGenerator();
+
+    public static final Logger COMMAND_LOG =
+        Logger.getLogger("com.sk89q.worldedit.CommandLog");
+    private static final List<CommandCallListener> CALL_LISTENERS = ImmutableList.of(
+        new CommandLoggingHandler(WorldEdit.getInstance(), COMMAND_LOG)
+    );
+
+    public static <CI> void register(CommandManager manager, CommandRegistration<CI> registration, CI instance) {
+        registration.containerInstance(instance)
+            .commandManager(manager)
+            .listeners(CALL_LISTENERS);
+        if (registration instanceof CommandPermissionsConditionGenerator.Registration) {
+            ((CommandPermissionsConditionGenerator.Registration) registration).commandPermissionsConditionGenerator(
+                PERM_GEN
+            );
+        }
+        registration.build();
+    }
+
     private CommandUtil() {
     }
 }