brush settings

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

@@ -1,27 +1,52 @@
 package com.sk89q.worldedit.command;
 
-import com.boydti.fawe.object.mask.*;
-import org.enginehub.piston.annotation.Command;
+import com.boydti.fawe.object.mask.AdjacentAnyMask;
+import com.boydti.fawe.object.mask.AdjacentMask;
+import com.boydti.fawe.object.mask.AngleMask;
+import com.boydti.fawe.object.mask.BiomeMask;
+import com.boydti.fawe.object.mask.BlockLightMask;
+import com.boydti.fawe.object.mask.BrightnessMask;
+import com.boydti.fawe.object.mask.DataMask;
+import com.boydti.fawe.object.mask.ExtremaMask;
+import com.boydti.fawe.object.mask.IdDataMask;
+import com.boydti.fawe.object.mask.IdMask;
+import com.boydti.fawe.object.mask.LightMask;
+import com.boydti.fawe.object.mask.OpacityMask;
+import com.boydti.fawe.object.mask.ROCAngleMask;
+import com.boydti.fawe.object.mask.RadiusMask;
+import com.boydti.fawe.object.mask.RandomMask;
+import com.boydti.fawe.object.mask.SimplexMask;
+import com.boydti.fawe.object.mask.SkyLightMask;
+import com.boydti.fawe.object.mask.SurfaceMask;
+import com.boydti.fawe.object.mask.WallMask;
+import com.boydti.fawe.object.mask.XAxisMask;
+import com.boydti.fawe.object.mask.YAxisMask;
+import com.boydti.fawe.object.mask.ZAxisMask;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
-
-import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.function.mask.*;
+import com.sk89q.worldedit.function.mask.BlockMaskBuilder;
+import com.sk89q.worldedit.function.mask.ExistingBlockMask;
+import com.sk89q.worldedit.function.mask.ExpressionMask;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.MaskIntersection;
+import com.sk89q.worldedit.function.mask.MaskUnion;
+import com.sk89q.worldedit.function.mask.Masks;
+import com.sk89q.worldedit.function.mask.OffsetMask;
+import com.sk89q.worldedit.function.mask.RegionMask;
+import com.sk89q.worldedit.function.mask.SolidBlockMask;
 import com.sk89q.worldedit.internal.expression.Expression;
 import com.sk89q.worldedit.internal.expression.ExpressionException;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.regions.shape.WorldEditExpressionEnvironment;
 import com.sk89q.worldedit.session.request.RequestSelection;
-import org.enginehub.piston.annotation.param.Switch;
-import com.sk89q.worldedit.util.command.parametric.Optional;
 import com.sk89q.worldedit.world.biome.BiomeType;
-import com.sk89q.worldedit.world.block.BlockType;
-
-import java.util.function.Predicate;
+import org.enginehub.piston.annotation.Command;
+import org.enginehub.piston.annotation.param.Arg;
+import org.enginehub.piston.annotation.param.Switch;
 
 @Command(aliases = {"masks"},
         desc = "Help for the various masks. [More Info](https://git.io/v9r4K)",
@@ -77,7 +102,7 @@ public class MaskCommands extends MethodCommands {
     @Command(
             name = "#skylight",
             desc = "Restrict to specific sky light levels"
-)
+    )
     public Mask skylight(Extent extent, double min, double max) {
         return new SkyLightMask(extent, (int) min, (int) max);
     }

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

@@ -12,7 +12,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public final class CommandQueuedConditionGenerator implements CommandConditionGenerator {
 
     public interface Registration {
-        Registration commandQueuedConditionGenerator(CommandPermissionsConditionGenerator generator);
+        Registration commandQueuedConditionGenerator(CommandQueuedConditionGenerator generator);
     }
 
     @Override

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

@@ -0,0 +1,83 @@
+package com.sk89q.worldedit.command.util;
+
+import com.google.common.collect.ImmutableSet;
+import org.enginehub.piston.Command;
+import org.enginehub.piston.CommandManager;
+import org.enginehub.piston.CommandParseResult;
+import org.enginehub.piston.converter.ArgumentConverter;
+import org.enginehub.piston.inject.InjectedValueAccess;
+import org.enginehub.piston.inject.Key;
+import org.enginehub.piston.suggestion.Suggestion;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+public class DelegateCommandManager implements CommandManager {
+    @Override
+    public Command.Builder newCommand(String s) {
+        return parent.newCommand(s);
+    }
+
+    @Override
+    public void register(Command command) {
+        parent.register(command);
+    }
+
+    @Override
+    public void register(String name, Consumer<Command.Builder> registrationProcess) {
+        parent.register(name, registrationProcess);
+    }
+
+    @Override
+    public void registerManager(CommandManager manager) {
+        parent.registerManager(manager);
+    }
+
+    @Override
+    public Stream<Command> getAllCommands() {
+        return parent.getAllCommands();
+    }
+
+    @Override
+    public boolean containsCommand(String name) {
+        return parent.containsCommand(name);
+    }
+
+    @Override
+    public Optional<Command> getCommand(String s) {
+        return parent.getCommand(s);
+    }
+
+    @Override
+    public ImmutableSet<Suggestion> getSuggestions(InjectedValueAccess injectedValueAccess, List<String> list) {
+        return parent.getSuggestions(injectedValueAccess, list);
+    }
+
+    @Override
+    public CommandParseResult parse(InjectedValueAccess injectedValueAccess, List<String> list) {
+        return parent.parse(injectedValueAccess, list);
+    }
+
+    @Override
+    public int execute(InjectedValueAccess context, List<String> args) {
+        return parent.execute(context, args);
+    }
+
+    @Override
+    public <T> void registerConverter(Key<T> key, ArgumentConverter<T> argumentConverter) {
+        parent.registerConverter(key, argumentConverter);
+    }
+
+    @Override
+    public <T> Optional<ArgumentConverter<T>> getConverter(Key<T> key) {
+        return parent.getConverter(key);
+    }
+
+    private final CommandManager parent;
+
+    public DelegateCommandManager(CommandManager parent) {
+        this.parent = parent;
+    }
+}