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;
+    }
+}

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

@@ -84,6 +84,7 @@ import com.sk89q.worldedit.command.argument.RegionFactoryConverter;
 import com.sk89q.worldedit.command.argument.RegistryConverter;
 import com.sk89q.worldedit.command.argument.VectorConverter;
 import com.sk89q.worldedit.command.argument.ZonedDateTimeConverter;
+import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.command.util.CommandQueued;
 import com.sk89q.worldedit.command.util.CommandQueuedCondition;
 import com.sk89q.worldedit.command.util.PermissionCondition;
@@ -114,6 +115,8 @@ import com.sk89q.worldedit.world.World;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -128,7 +131,9 @@ import javax.annotation.Nullable;
 import org.enginehub.piston.Command;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.TextConfig;
+import org.enginehub.piston.converter.ArgumentConverter;
 import org.enginehub.piston.converter.ArgumentConverters;
+import org.enginehub.piston.converter.ConversionResult;
 import org.enginehub.piston.exception.CommandException;
 import org.enginehub.piston.exception.CommandExecutionException;
 import org.enginehub.piston.exception.ConditionFailedException;
@@ -175,6 +180,11 @@ public final class PlatformCommandManager {
     private final CommandRegistrationHandler registration;
     private static PlatformCommandManager INSTANCE;
 
+    /*
+    Command types
+     */
+
+
     /**
      * Create a new instance.
      *
@@ -523,6 +533,18 @@ public final class PlatformCommandManager {
         return new CommandArgParser(CommandArgParser.spaceSplit(input.substring(1))).parseArgs();
     }
 
+    public <T> Collection<T> parse(Class<T> clazz, String arguments, @Nullable Actor actor) {
+        List<T> def = Collections.emptyList();
+        Optional<ArgumentConverter<T>> converterOptional = commandManager.getConverter(Key.of(clazz));
+        if (converterOptional.isPresent()) {
+            ArgumentConverter<T> converter = converterOptional.get();
+            MemoizingValueAccess injectedValues = initializeInjectedValues(() -> arguments, actor);
+            ConversionResult<T> result = converter.convert(arguments, injectedValues);
+            return result.orElse(def);
+        }
+        return def;
+    }
+
     @Subscribe
     public void handleCommand(CommandEvent event) {
         Request.reset();
@@ -571,8 +593,6 @@ public final class PlatformCommandManager {
                 Request.request().setWorld(((World) extent));
             }
         }
-        LocalConfiguration config = worldEdit.getConfiguration();
-
         MemoizingValueAccess context = initializeInjectedValues(event::getArguments, actor);
 
         final FawePlayer fp = FawePlayer.wrap(actor);

worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java

@@ -19,37 +19,26 @@
 
 package com.sk89q.worldedit.extent;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.boydti.fawe.Fawe;
-import com.boydti.fawe.jnbt.anvil.generator.GenBase;
-import com.boydti.fawe.jnbt.anvil.generator.Resource;
 import com.boydti.fawe.object.HistoryExtent;
 import com.boydti.fawe.object.changeset.FaweChangeSet;
 import com.boydti.fawe.object.exception.FaweException;
 import com.boydti.fawe.object.extent.LightingExtent;
 import com.boydti.fawe.util.ExtentTraverser;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.buffer.ForgetfulExtentBuffer;
-import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.function.operation.OperationQueue;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.MutableBlockVector3;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
-import java.util.List;
 
 import javax.annotation.Nullable;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * A base class for {@link Extent}s that merely passes extents onto another.
  */
@@ -206,6 +195,7 @@ public class AbstractDelegateExtent implements Extent, LightingExtent {
         return 0;
     }
 
+    @Override
     public int getBrightness(int x, int y, int z) {
         if (extent instanceof LightingExtent) {
             return ((LightingExtent) extent).getBrightness(x, y, z);
@@ -213,6 +203,15 @@ public class AbstractDelegateExtent implements Extent, LightingExtent {
         return getBlock(x, y, z).getBlockType().getMaterial().getLightValue();
     }
 
+    @Override
+    public void relightChunk(int chunkX, int chunkZ) {
+        if (extent instanceof LightingExtent) {
+            ((LightingExtent) extent).relightChunk(chunkX, chunkZ);
+        } else {
+            throw new UnsupportedOperationException("Cannot relight");
+        }
+    }
+
     /*
     Generic
      */

worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/CommandRegistrationHandler.java

@@ -21,6 +21,7 @@ package com.sk89q.worldedit.internal.command;
 
 import com.google.common.collect.ImmutableList;
 import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
+import com.sk89q.worldedit.command.util.CommandQueuedConditionGenerator;
 import org.enginehub.piston.CommandManager;
 import org.enginehub.piston.gen.CommandCallListener;
 import org.enginehub.piston.gen.CommandRegistration;
@@ -30,6 +31,8 @@ import java.util.List;
 public class CommandRegistrationHandler {
 
     private static final CommandPermissionsConditionGenerator PERM_GEN = new CommandPermissionsConditionGenerator();
+    private static final CommandQueuedConditionGenerator QUEUED_GEN = new CommandQueuedConditionGenerator();
+
 
     private final List<CommandCallListener> callListeners;
 
@@ -43,7 +46,12 @@ public class CommandRegistrationHandler {
             .listeners(callListeners);
         if (registration instanceof CommandPermissionsConditionGenerator.Registration) {
             ((CommandPermissionsConditionGenerator.Registration) registration).commandPermissionsConditionGenerator(
-                PERM_GEN
+                    PERM_GEN
+            );
+        }
+        if (registration instanceof CommandQueuedConditionGenerator.Registration) {
+            ((CommandQueuedConditionGenerator.Registration) registration).commandQueuedConditionGenerator(
+                    QUEUED_GEN
             );
         }
         registration.build();