Current progress with update

worldedit-core/src/main/java/com/sk89q/worldedit/function/block/BlockDistributionCounter.java

@@ -0,0 +1,77 @@
+/*
+ * 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.function.block;
+
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Countable;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class BlockDistributionCounter implements RegionFunction {
+
+    private Extent extent;
+    private boolean fuzzy;
+
+    private List<Countable<BlockStateHolder>> distribution = new ArrayList<>();
+    private Map<BlockStateHolder, Countable<BlockStateHolder>> map = new HashMap<>();
+
+    public BlockDistributionCounter(Extent extent, boolean fuzzy) {
+        this.extent = extent;
+        this.fuzzy = fuzzy;
+    }
+
+    @Override
+    public boolean apply(BlockVector3 position) throws WorldEditException {
+        BlockStateHolder blk = extent.getBlock(position);
+        if (fuzzy) {
+            blk = ((BlockState) blk).toFuzzy();
+        }
+
+        if (map.containsKey(blk)) {
+            map.get(blk).increment();
+        } else {
+            Countable<BlockStateHolder> c = new Countable<>(blk, 1);
+            map.put(blk, c);
+            distribution.add(c);
+        }
+
+        return true;
+    }
+
+    /**
+     * Gets the distribution list.
+     *
+     * @return The distribution
+     */
+    public List<Countable<BlockStateHolder>> getDistribution() {
+        Collections.sort(distribution);
+        Collections.reverse(distribution);
+        return this.distribution;
+    }
+}

worldedit-core/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java

@@ -19,11 +19,17 @@
 
 package com.sk89q.worldedit.function.block;
 
+<<<<<<< HEAD
 import com.sk89q.worldedit.Vector;
+=======
+import static com.google.common.base.Preconditions.checkNotNull;
+
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.math.BlockVector3;
 
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -50,8 +56,13 @@ public class BlockReplace implements RegionFunction {
     }
 
     @Override
+<<<<<<< HEAD
     public boolean apply(Vector position) throws WorldEditException {
         return pattern.apply(extent, position, position);
+=======
+    public boolean apply(BlockVector3 position) throws WorldEditException {
+        return extent.setBlock(position, pattern.apply(position));
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
     }
 
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/block/Counter.java

@@ -19,17 +19,18 @@
 
 package com.sk89q.worldedit.function.block;
 
-import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.RegionFunction;
+import com.sk89q.worldedit.math.BlockVector3;
 
 /**
- * Keeps a count of the number of times that {@link #apply(Vector)} is called.
+ * Keeps a count of the number of times that {@link #apply(BlockVector3)} is
+ * called.
  */
- public class Counter implements RegionFunction {
+public class Counter implements RegionFunction {
 
     private int count;
-    
+
     /**
      * Returns the number of blocks that have been counted.
      *
@@ -40,7 +41,7 @@ import com.sk89q.worldedit.function.RegionFunction;
     }
 
     @Override
-    public boolean apply(Vector position) throws WorldEditException {
+    public boolean apply(BlockVector3 position) throws WorldEditException {
         count++;
         return false;
     }

worldedit-core/src/main/java/com/sk89q/worldedit/function/block/ExtentBlockCopy.java

@@ -22,23 +22,34 @@ package com.sk89q.worldedit.function.block;
 import com.boydti.fawe.util.ReflectionUtils;
 import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
+<<<<<<< HEAD
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
+=======
+import com.sk89q.jnbt.CompoundTagBuilder;
+import com.sk89q.worldedit.WorldEditException;
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.RegionFunction;
 import com.sk89q.worldedit.internal.helper.MCDirections;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Direction.Flag;
+<<<<<<< HEAD
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import java.util.Map;
 
 
 import static com.google.common.base.Preconditions.checkNotNull;
+=======
+import com.sk89q.worldedit.world.block.BaseBlock;
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
 
 /**
  * Copies blocks from one extent to another.
@@ -47,8 +58,8 @@ public class ExtentBlockCopy implements RegionFunction {
 
     private final Extent source;
     private final Extent destination;
-    private final Vector from;
-    private final Vector to;
+    private final BlockVector3 from;
+    private final BlockVector3 to;
     private final Transform transform;
 
     /**
@@ -60,7 +71,7 @@ public class ExtentBlockCopy implements RegionFunction {
      * @param to          the destination offset
      * @param transform   a transform to apply to positions (after source offset, before destination offset)
      */
-    public ExtentBlockCopy(Extent source, Vector from, Extent destination, Vector to, Transform transform) {
+    public ExtentBlockCopy(Extent source, BlockVector3 from, Extent destination, BlockVector3 to, Transform transform) {
         checkNotNull(source);
         checkNotNull(from);
         checkNotNull(destination);
@@ -74,9 +85,16 @@ public class ExtentBlockCopy implements RegionFunction {
     }
 
     @Override
+<<<<<<< HEAD
     public boolean apply(Vector position) throws WorldEditException {
         Vector orig = position.subtract(from);
         Vector transformed = transform.apply(orig);
+=======
+    public boolean apply(BlockVector3 position) throws WorldEditException {
+        BaseBlock block = source.getFullBlock(position);
+        BlockVector3 orig = position.subtract(from);
+        BlockVector3 transformed = transform.apply(orig.toVector3()).toBlockPoint();
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
 
         // Apply transformations to NBT data if necessary
         BlockStateHolder block = transformNbtData(source.getBlock(position));
@@ -101,11 +119,16 @@ public class ExtentBlockCopy implements RegionFunction {
                 Direction direction = MCDirections.fromRotation(rot);
 
                 if (direction != null) {
+<<<<<<< HEAD
                     Vector applyAbsolute = transform.apply(direction.toVector());
                     Vector applyOrigin = transform.apply(Vector.ZERO);
                     applyAbsolute.mutX(applyAbsolute.getX() - applyOrigin.getX());
                     applyAbsolute.mutY(applyAbsolute.getY() - applyOrigin.getY());
                     applyAbsolute.mutZ(applyAbsolute.getZ() - applyOrigin.getZ());
+=======
+                    Vector3 vector = transform.apply(direction.toVector()).subtract(transform.apply(Vector3.ZERO)).normalize();
+                    Direction newDirection = Direction.findClosest(vector, Flag.CARDINAL | Flag.ORDINAL | Flag.SECONDARY_ORDINAL);
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
 
                     Direction newDirection = Direction.findClosest(applyAbsolute, Flag.CARDINAL | Flag.ORDINAL | Flag.SECONDARY_ORDINAL);
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/block/Naturalizer.java

@@ -21,7 +21,6 @@ package com.sk89q.worldedit.function.block;
 
 import com.google.common.collect.Sets;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.mask.BlockTypeMask;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -30,8 +29,13 @@ import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.LayerFunction;
 import com.sk89q.worldedit.function.mask.BlockTypeMask;
 import com.sk89q.worldedit.function.mask.Mask;
+<<<<<<< HEAD
 
 import static com.google.common.base.Preconditions.checkNotNull;
+=======
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BlockTypes;
+>>>>>>> 399e0ad5... Refactor vector system to be cleaner
 
 /**
  * Makes a layer of grass on top, three layers of dirt below, and smooth stone
@@ -65,12 +69,12 @@ public class Naturalizer implements LayerFunction {
     }
 
     @Override
-    public boolean isGround(Vector position) {
+    public boolean isGround(BlockVector3 position) {
         return mask.test(position);
     }
 
     @Override
-    public boolean apply(Vector position, int depth) throws WorldEditException {
+    public boolean apply(BlockVector3 position, int depth) throws WorldEditException {
         if (mask.test(position)) {
             affected++;
             switch (depth) {