Work on adding converters for some arguments

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

@@ -0,0 +1,109 @@
+/*
+ * 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.google.auto.value.AutoAnnotation;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.sk89q.worldedit.UnknownDirectionException;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.internal.annotation.Direction;
+import com.sk89q.worldedit.math.BlockVector3;
+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;
+
+import java.util.List;
+
+import static java.util.stream.Collectors.toList;
+
+public class DirectionConverter implements ArgumentConverter<BlockVector3> {
+
+    @AutoAnnotation
+    private static Direction direction(boolean includeDiagonals) {
+        return new AutoAnnotation_DirectionConverter_direction(includeDiagonals);
+    }
+
+    public static void register(WorldEdit worldEdit, CommandManager commandManager) {
+        commandManager.registerConverter(
+            Key.of(BlockVector3.class, direction(false)),
+            new DirectionConverter(worldEdit, false)
+        );
+        commandManager.registerConverter(
+            Key.of(BlockVector3.class, direction(true)),
+            new DirectionConverter(worldEdit, true)
+        );
+    }
+
+    private static final ImmutableSet<String> NON_DIAGONALS = ImmutableSet.of(
+        "north", "south", "east", "west", "up", "down"
+    );
+    private static final ImmutableSet<String> RELATIVE = ImmutableSet.of(
+        "me", "forward", "back", "left", "right"
+    );
+    private static final ImmutableSet<String> DIAGONALS = ImmutableSet.of(
+        "northeast", "northwest", "southeast", "southwest"
+    );
+
+    private final WorldEdit worldEdit;
+    private final boolean includeDiagonals;
+    private final ImmutableList<String> suggestions;
+
+    private DirectionConverter(WorldEdit worldEdit, boolean includeDiagonals) {
+        this.worldEdit = worldEdit;
+        this.includeDiagonals = includeDiagonals;
+        suggestions = ImmutableList.<String>builder()
+            .addAll(NON_DIAGONALS)
+            .addAll(RELATIVE)
+            .addAll(includeDiagonals ? DIAGONALS : ImmutableList.of())
+            .build();
+    }
+
+    @Override
+    public ConversionResult<BlockVector3> convert(String argument, InjectedValueAccess context) {
+        Player player = context.injectedValue(Key.of(Player.class))
+            .orElseThrow(() -> new IllegalStateException("No player available"));
+        try {
+            return SuccessfulConversion.fromSingle(includeDiagonals
+                ? worldEdit.getDiagonalDirection(player, argument)
+                : worldEdit.getDirection(player, argument));
+        } catch (UnknownDirectionException e) {
+            return FailedConversion.from(e);
+        }
+    }
+
+    @Override
+    public String describeAcceptableArguments() {
+        return "`me` to use facing direction, or any "
+            + (includeDiagonals ? "direction" : "non-diagonal direction");
+    }
+
+    @Override
+    public List<String> getSuggestions(String input) {
+        return suggestions.stream()
+            .filter(s -> s.startsWith(input))
+            .collect(toList());
+    }
+}

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

@@ -0,0 +1,58 @@
+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.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.mask.Mask;
+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 String describeAcceptableArguments() {
+        return "any mask";
+    }
+}

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

@@ -0,0 +1,21 @@
+/*
+ * 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/>.
+ */
+
+@org.enginehub.piston.util.NonnullByDefault
+package com.sk89q.worldedit.command.argument;