Implement more masks

worldedit-core/src/main/java/com/boydti/fawe/FaweAPI.java

@@ -117,27 +117,6 @@ public class FaweAPI {
 //        return parser != null;
 //    }
 
-    public static <T> T getParser(Class<T> parserClass) {
-        try {
-            Field field = AbstractFactory.class.getDeclaredField("parsers");
-            field.setAccessible(true);
-            ArrayList<InputParser> parsers = new ArrayList<>();
-            parsers.addAll((List<InputParser>) field.get(WorldEdit.getInstance().getMaskFactory()));
-            parsers.addAll((List<InputParser>) field.get(WorldEdit.getInstance().getBlockFactory()));
-            parsers.addAll((List<InputParser>) field.get(WorldEdit.getInstance().getItemFactory()));
-            parsers.addAll((List<InputParser>) field.get(WorldEdit.getInstance().getPatternFactory()));
-            for (InputParser parser : parsers) {
-                if (parserClass.isAssignableFrom(parser.getClass())) {
-                    return (T) parser;
-                }
-            }
-            return null;
-        } catch (Throwable e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
     /**
      * You can either use a IQueueExtent or an EditSession to change blocks<br>
      * - The IQueueExtent skips a bit of overhead so it's marginally faster<br>

worldedit-core/src/main/java/com/boydti/fawe/function/mask/AirMask.java

@@ -1,22 +1,3 @@
-/*
- * 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.boydti.fawe.function.mask;
 
 import com.sk89q.worldedit.extent.Extent;

worldedit-core/src/main/java/com/boydti/fawe/function/mask/LiquidMask.java

@@ -1,22 +1,3 @@
-/*
- * 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.boydti.fawe.function.mask;
 
 import com.sk89q.worldedit.extent.Extent;

worldedit-core/src/main/java/com/boydti/fawe/function/mask/XAxisMask.java

@@ -9,6 +9,10 @@ public class XAxisMask extends AbstractMask implements ResettableMask {
 
     private transient int layer = -1;
 
+    public XAxisMask(Extent extent) {
+
+    }
+
     @Override
     public boolean test(Extent extent, BlockVector3 vector) {
         if (layer == -1) {

worldedit-core/src/main/java/com/boydti/fawe/function/mask/YAxisMask.java

@@ -9,6 +9,9 @@ public class YAxisMask extends AbstractMask implements ResettableMask {
 
     private transient int layer = -1;
 
+    public YAxisMask(Extent extent) {
+    }
+
     @Override
     public boolean test(Extent extent, BlockVector3 vector) {
         if (layer == -1) {

worldedit-core/src/main/java/com/boydti/fawe/function/mask/ZAxisMask.java

@@ -9,6 +9,9 @@ public class ZAxisMask extends AbstractMask implements ResettableMask {
 
     private transient int layer = -1;
 
+    public ZAxisMask(Extent extent) {
+    }
+
     @Override
     public boolean test(Extent extent, BlockVector3 vector) {
         if (layer == -1) {

worldedit-core/src/main/java/com/boydti/fawe/object/mask/AdjacentAnyMask.java

@@ -1,6 +1,7 @@
 package com.boydti.fawe.object.mask;
 
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.mask.AbstractExtentMask;
 import com.sk89q.worldedit.function.mask.AbstractMask;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -14,7 +15,7 @@ public class AdjacentAnyMask extends AbstractMask implements ResettableMask {
     private final CachedMask mask;
     private final MutableBlockVector3 mutable;
 
-    public AdjacentAnyMask(Mask mask) {
+    public AdjacentAnyMask(AbstractExtentMask mask) {
         this.mask = CachedMask.cache(mask);
         mutable = new MutableBlockVector3();
     }

worldedit-core/src/main/java/com/boydti/fawe/object/mask/SurfaceMask.java

@@ -1,6 +1,7 @@
 package com.boydti.fawe.object.mask;
 
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.mask.AbstractExtentMask;
 import com.sk89q.worldedit.function.mask.BlockMaskBuilder;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -11,7 +12,7 @@ public class SurfaceMask extends AdjacentAnyMask {
         super(getMask(extent));
     }
 
-    public static Mask getMask(Extent extent) {
+    public static AbstractExtentMask getMask(Extent extent) {
         return new BlockMaskBuilder()
         .addTypes(BlockTypes.AIR, BlockTypes.CAVE_AIR, BlockTypes.VOID_AIR)
         .addAll(b -> !b.getMaterial().isMovementBlocker())

worldedit-core/src/main/java/com/boydti/fawe/util/MaskTraverser.java

@@ -4,6 +4,8 @@ import com.boydti.fawe.object.mask.ResettableMask;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.mask.AbstractExtentMask;
 import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.MaskIntersection;
+
 import java.lang.reflect.Field;
 import java.util.Collection;
 
@@ -38,6 +40,18 @@ public class MaskTraverser {
                 } catch (NoSuchFieldException | IllegalAccessException ignored) {
                 }
             }
+            if (mask instanceof MaskIntersection) {
+                MaskIntersection mask1 = (MaskIntersection) mask;
+                try {
+                    Field field = mask1.getClass().getDeclaredField("masks");
+                    field.setAccessible(true);
+                    Collection<Mask> masks = (Collection<Mask>) field.get(mask);
+                    for (Mask next : masks) {
+                        reset(next, newExtent);
+                    }
+                } catch (NoSuchFieldException | IllegalAccessException ignored) {
+                }
+            }
             try {
                 Field field = current.getDeclaredField("mask");
                 field.setAccessible(true);

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

@@ -7,10 +7,7 @@
 //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;
@@ -171,22 +168,6 @@
 //    }
 //
 //    @Command(
-//            name = "#id",
-//            desc = "Restrict to initial id"
-//    )
-//    public Mask id(Extent extent) {
-//        return new IdMask(extent);
-//    }
-//
-//    @Command(
-//            name = "#data",
-//            desc = "Restrict to initial data"
-//    )
-//    public Mask data(Extent extent) {
-//        return new DataMask(extent);
-//    }
-//
-//    @Command(
 //            name = "#iddata",
 //            desc = "Restrict to initial block id and data"
 //    )

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/MaskFactory.java

@@ -20,22 +20,7 @@
 package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.extension.factory.parser.mask.AirMaskParser;
+import com.sk89q.worldedit.extension.factory.parser.mask.*;
-import com.sk89q.worldedit.extension.factory.parser.mask.BiomeMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.BlockCategoryMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.BlockStateMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.BlocksMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.ExistingMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.ExpressionMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.FalseMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.LazyRegionMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.LiquidMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.NegateMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.NoiseMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.OffsetMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.RegionMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.SolidMaskParser;
-import com.sk89q.worldedit.extension.factory.parser.mask.TrueMaskParser;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.NoMatchException;
 import com.sk89q.worldedit.extension.input.ParserContext;
@@ -81,6 +66,9 @@ public final class MaskFactory extends AbstractFactory<Mask> {
         register(new TrueMaskParser(worldEdit));
         register(new AirMaskParser(worldEdit));
         register(new LiquidMaskParser(worldEdit));
+        register(new XAxisMaskParser(worldEdit));
+        register(new YAxisMaskParser(worldEdit));
+        register(new ZAxisMaskParser(worldEdit));
 
 
     }

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/AirMaskParser.java

@@ -1,22 +1,3 @@
-/*
- * 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.extension.factory.parser.mask;
 
 import com.boydti.fawe.function.mask.AirMask;

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/LiquidMaskParser.java

@@ -1,22 +1,3 @@
-/*
- * 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.extension.factory.parser.mask;
 
 import com.boydti.fawe.function.mask.LiquidMask;

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/XAxisMaskParser.java

@@ -0,0 +1,48 @@
+/*
+ * 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.extension.factory.parser.mask;
+
+import com.boydti.fawe.function.mask.XAxisMask;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.internal.registry.SimpleInputParser;
+
+import java.util.List;
+
+public class XAxisMaskParser extends SimpleInputParser<Mask> {
+
+    private final List<String> aliases = ImmutableList.of("#xaxis");
+
+    public XAxisMaskParser(WorldEdit worldEdit) {
+        super(worldEdit);
+    }
+
+    @Override
+    public List<String> getMatchedAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Mask parseFromSimpleInput(String input, ParserContext context) {
+        return new XAxisMask(context.getExtent());
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/YAxisMaskParser.java

@@ -0,0 +1,49 @@
+/*
+ * 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.extension.factory.parser.mask;
+
+import com.boydti.fawe.function.mask.XAxisMask;
+import com.boydti.fawe.function.mask.YAxisMask;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.internal.registry.SimpleInputParser;
+
+import java.util.List;
+
+public class YAxisMaskParser extends SimpleInputParser<Mask> {
+
+    private final List<String> aliases = ImmutableList.of("#yaxis");
+
+    public YAxisMaskParser(WorldEdit worldEdit) {
+        super(worldEdit);
+    }
+
+    @Override
+    public List<String> getMatchedAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Mask parseFromSimpleInput(String input, ParserContext context) {
+        return new YAxisMask(context.getExtent());
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/ZAxisMaskParser.java

@@ -0,0 +1,49 @@
+/*
+ * 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.extension.factory.parser.mask;
+
+import com.boydti.fawe.function.mask.XAxisMask;
+import com.boydti.fawe.function.mask.ZAxisMask;
+import com.google.common.collect.ImmutableList;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.ParserContext;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.internal.registry.SimpleInputParser;
+
+import java.util.List;
+
+public class ZAxisMaskParser extends SimpleInputParser<Mask> {
+
+    private final List<String> aliases = ImmutableList.of("#zaxis");
+
+    public ZAxisMaskParser(WorldEdit worldEdit) {
+        super(worldEdit);
+    }
+
+    @Override
+    public List<String> getMatchedAliases() {
+        return aliases;
+    }
+
+    @Override
+    public Mask parseFromSimpleInput(String input, ParserContext context) {
+        return new ZAxisMask(context.getExtent());
+    }
+}