Reorganize and further unify the new commands.

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

@@ -19,29 +19,45 @@
 
 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.command.argument.PointGeneratorArg;
-import com.sk89q.worldedit.function.EditContext;
+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.RegionApply;
+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<RegionApply> {
+import static com.google.common.base.Preconditions.checkNotNull;
 
-    private final PointGeneratorArg pointGeneratorArg = addParameter(new PointGeneratorArg());
+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 RegionApply call(CommandArgs args, CommandLocals locals) throws CommandException {
-        Function<EditContext, ? extends RegionFunction> function = pointGeneratorArg.call(args, locals);
-        return new RegionApply(function);
+    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 "Applies a point generator to an area";
+        return description;
     }
 
     @Override

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

@@ -0,0 +1,84 @@
+/*
+ * 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.command.argument.BooleanFlag;
+import com.sk89q.worldedit.command.argument.StringParser;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.Contextual;
+import com.sk89q.worldedit.function.factory.Deform;
+import com.sk89q.worldedit.function.factory.Deform.Mode;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.util.command.composition.FlagParser.Flag;
+import com.sk89q.worldedit.util.command.composition.FlagParser.FlagData;
+import com.sk89q.worldedit.util.command.composition.SimpleCommand;
+
+public class DeformCommand extends SimpleCommand<Contextual<? extends Operation>> {
+
+    private final Flag<Boolean> rawCoordsFlag = addFlag('r', new BooleanFlag("Raw coords mode"));
+    private final Flag<Boolean> offsetFlag = addFlag('o', new BooleanFlag("Offset mode"));
+    private final StringParser expressionParser = addParameter(new StringParser("expression", "Expression to apply", "y-=0.2"));
+
+    @Override
+    public Deform call(CommandArgs args, CommandLocals locals) throws CommandException {
+        FlagData flagData = getFlagParser().call(args, locals);
+        String expression = expressionParser.call(args, locals);
+        boolean rawCoords = rawCoordsFlag.get(flagData, false);
+        boolean offset = offsetFlag.get(flagData, false);
+
+        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;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Apply math expression to area";
+    }
+
+    @Override
+    protected boolean testPermission0(CommandLocals locals) {
+        return true;
+    }
+
+}

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

@@ -19,32 +19,41 @@
 
 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.command.argument.NumberArg;
-import com.sk89q.worldedit.command.argument.PointGeneratorArg;
-import com.sk89q.worldedit.function.EditContext;
+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.Scatter;
+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 ScatterCommand extends SimpleCommand<Scatter> {
+public class PaintCommand extends SimpleCommand<Paint> {
 
-    private final NumberArg densityCommand = addParameter(new NumberArg("density", "0-100", "20"));
-    private final PointGeneratorArg pointGeneratorArg = addParameter(new PointGeneratorArg());
+    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 Scatter call(CommandArgs args, CommandLocals locals) throws CommandException {
+    public Paint call(CommandArgs args, CommandLocals locals) throws CommandException {
         double density = densityCommand.call(args, locals).doubleValue() / 100.0;
-        Function<EditContext, ? extends RegionFunction> function = pointGeneratorArg.call(args, locals);
-        return new Scatter(function, density);
+        Contextual<? extends RegionFunction> function = functionParser.call(args, locals);
+        return new Paint(function, density);
     }
 
     @Override
     public String getDescription() {
-        return "Scatters a function over an area";
+        return "Applies a function to surfaces";
     }
 
     @Override

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

@@ -1,75 +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.LocalSession;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.command.argument.PatternArg;
-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.composition.CommandExecutor;
-import com.sk89q.worldedit.util.command.argument.CommandArgs;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public class ReplaceBrushCommand<T> extends SimpleCommand<T> {
-
-    private final PatternArg patternArg = addParameter(new PatternArg("fillPattern"));
-    private final CommandExecutor<? extends T> delegate;
-
-    public ReplaceBrushCommand(CommandExecutor<? extends T> delegate) {
-        checkNotNull(delegate, "delegate");
-        this.delegate = addParameter(delegate);
-    }
-
-    @Override
-    public T call(CommandArgs args, CommandLocals locals) throws CommandException {
-        Pattern pattern = patternArg.call(args, locals);
-
-        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);
-    }
-
-    @Override
-    public String getDescription() {
-        return "Replaces an area with a pattern";
-    }
-
-    @Override
-    protected boolean testPermission0(CommandLocals locals) {
-        return true;
-    }
-
-}

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/SelectionCommand.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.base.Joiner;
+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.EditSession;
+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.Contextual;
+import com.sk89q.worldedit.function.EditContext;
+import com.sk89q.worldedit.function.operation.Operation;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.util.command.composition.CommandExecutor;
+import com.sk89q.worldedit.util.command.composition.SimpleCommand;
+
+import java.util.List;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class SelectionCommand extends SimpleCommand<Operation> {
+
+    private final CommandExecutor<Contextual<? extends Operation>> delegate;
+    private final String permission;
+
+    public SelectionCommand(CommandExecutor<Contextual<? extends Operation>> delegate, String permission) {
+        checkNotNull(delegate, "delegate");
+        checkNotNull(permission, "permission");
+        this.delegate = delegate;
+        this.permission = permission;
+        addParameter(delegate);
+    }
+
+    @Override
+    public Operation call(CommandArgs args, CommandLocals locals) throws CommandException {
+        if (!testPermission(locals)) {
+            throw new CommandPermissionsException();
+        }
+
+        Contextual<? extends Operation> operationFactory = delegate.call(args, locals);
+
+        Actor actor = locals.get(Actor.class);
+        if (actor instanceof Player) {
+            try {
+                Player player = (Player) actor;
+                LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);
+                Region selection = session.getSelection(player.getWorld());
+
+                EditSession editSession = session.createEditSession(player);
+                editSession.enableQueue();
+                locals.put(EditSession.class, editSession);
+                session.tellVersion(player);
+
+                EditContext editContext = new EditContext();
+                editContext.setDestination(locals.get(EditSession.class));
+                editContext.setRegion(selection);
+
+                Operation operation = operationFactory.createFromContext(editContext);
+                Operations.completeBlindly(operation);
+
+                List<String> messages = Lists.newArrayList();
+                operation.addStatusMessages(messages);
+                if (messages.isEmpty()) {
+                    actor.print("Operation completed.");
+                } else {
+                    actor.print("Operation completed (" + Joiner.on(", ").join(messages) + ").");
+                }
+
+                return operation;
+            } catch (IncompleteRegionException e) {
+                WorldEdit.getInstance().getPlatformManager().getCommandManager().getExceptionConverter().convert(e);
+                return null;
+            }
+        } else {
+            throw new CommandException("This command can only be used by players.");
+        }
+    }
+
+    @Override
+    public String getDescription() {
+        return delegate.getDescription();
+    }
+
+    @Override
+    protected boolean testPermission0(CommandLocals locals) {
+        return locals.get(Actor.class).hasPermission(permission);
+    }
+
+}

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

@@ -25,30 +25,31 @@ 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.argument.NumberArg;
-import com.sk89q.worldedit.command.argument.RegionFactoryArg;
+import com.sk89q.worldedit.command.argument.NumberParser;
+import com.sk89q.worldedit.command.argument.RegionFactoryParser;
 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.function.Contextual;
+import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.regions.factory.RegionFactory;
-import com.sk89q.worldedit.util.command.composition.CommandExecutor;
 import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.util.command.composition.CommandExecutor;
 import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class ShapedBrushCommand extends SimpleCommand<Object> {
 
-    private final CommandExecutor<? extends OperationFactory> delegate;
+    private final CommandExecutor<? extends Contextual<? extends Operation>> delegate;
     private final String permission;
 
-    private final RegionFactoryArg regionFactoryArg = addParameter(new RegionFactoryArg());
-    private final NumberArg radiusCommand = addParameter(new NumberArg("size", "The size of the brush", "5"));
+    private final RegionFactoryParser regionFactoryParser = addParameter(new RegionFactoryParser());
+    private final NumberParser radiusCommand = addParameter(new NumberParser("size", "The size of the brush", "5"));
 
-    public ShapedBrushCommand(CommandExecutor<? extends OperationFactory> delegate, String permission) {
+    public ShapedBrushCommand(CommandExecutor<? extends Contextual<? extends Operation>> delegate, String permission) {
         checkNotNull(delegate, "delegate");
         this.permission = permission;
         this.delegate = delegate;
@@ -61,9 +62,9 @@ public class ShapedBrushCommand extends SimpleCommand<Object> {
             throw new CommandPermissionsException();
         }
 
-        RegionFactory regionFactory = regionFactoryArg.call(args, locals);
+        RegionFactory regionFactory = regionFactoryParser.call(args, locals);
         int radius = radiusCommand.call(args, locals).intValue();
-        OperationFactory factory = delegate.call(args, locals);
+        Contextual<? extends Operation> factory = delegate.call(args, locals);
 
         Player player = (Player) locals.get(Actor.class);
         LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);