Make distr operation based

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -25,6 +25,8 @@
 import static com.sk89q.worldedit.regions.Regions.maximumBlockY;
 import static com.sk89q.worldedit.regions.Regions.minimumBlockY;
 
+import com.sk89q.worldedit.function.block.BlockDistributionCounter;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
@@ -1652,115 +1654,11 @@ public int makeForest(Vector basePosition, int size, double density, TreeGenerat
      * @param region a region
      * @return the results
      */
-    public List<Countable<BlockType>> getBlockDistribution(Region region) {
-        List<Countable<BlockType>> distribution = new ArrayList<>();
-        Map<BlockType, Countable<BlockType>> map = new HashMap<>();
-
-        if (region instanceof CuboidRegion) {
-            // Doing this for speed
-            Vector min = region.getMinimumPoint();
-            Vector max = region.getMaximumPoint();
-
-            int minX = min.getBlockX();
-            int minY = min.getBlockY();
-            int minZ = min.getBlockZ();
-            int maxX = max.getBlockX();
-            int maxY = max.getBlockY();
-            int maxZ = max.getBlockZ();
-
-            for (int x = minX; x <= maxX; ++x) {
-                for (int y = minY; y <= maxY; ++y) {
-                    for (int z = minZ; z <= maxZ; ++z) {
-                        Vector pt = new Vector(x, y, z);
-
-                        BlockType type = getBlock(pt).getBlockType();
-
-                        if (map.containsKey(type)) {
-                            map.get(type).increment();
-                        } else {
-                            Countable<BlockType> c = new Countable<>(type, 1);
-                            map.put(type, c);
-                            distribution.add(c);
-                        }
-                    }
-                }
-            }
-        } else {
-            for (Vector pt : region) {
-                BlockType type = getBlock(pt).getBlockType();
-
-                if (map.containsKey(type)) {
-                    map.get(type).increment();
-                } else {
-                    Countable<BlockType> c = new Countable<>(type, 1);
-                    map.put(type, c);
-                }
-            }
-        }
-
-        Collections.sort(distribution);
-        // Collections.reverse(distribution);
-
-        return distribution;
-    }
-
-    /**
-     * Get the block distribution (with data values) inside a region.
-     *
-     * @param region a region
-     * @return the results
-     */
-    // TODO reduce code duplication - probably during ops-redux
-    public List<Countable<BlockStateHolder>> getBlockDistributionWithData(Region region) {
-        List<Countable<BlockStateHolder>> distribution = new ArrayList<>();
-        Map<BlockStateHolder, Countable<BlockStateHolder>> map = new HashMap<>();
-
-        if (region instanceof CuboidRegion) {
-            // Doing this for speed
-            Vector min = region.getMinimumPoint();
-            Vector max = region.getMaximumPoint();
-
-            int minX = min.getBlockX();
-            int minY = min.getBlockY();
-            int minZ = min.getBlockZ();
-            int maxX = max.getBlockX();
-            int maxY = max.getBlockY();
-            int maxZ = max.getBlockZ();
-
-            for (int x = minX; x <= maxX; ++x) {
-                for (int y = minY; y <= maxY; ++y) {
-                    for (int z = minZ; z <= maxZ; ++z) {
-                        Vector pt = new Vector(x, y, z);
-
-                        BlockStateHolder blk = getBlock(pt);
-
-                        if (map.containsKey(blk)) {
-                            map.get(blk).increment();
-                        } else {
-                            Countable<BlockStateHolder> c = new Countable<>(blk, 1);
-                            map.put(blk, c);
-                            distribution.add(c);
-                        }
-                    }
-                }
-            }
-        } else {
-            for (Vector pt : region) {
-                BlockStateHolder blk = getBlock(pt);
-
-                if (map.containsKey(blk)) {
-                    map.get(blk).increment();
-                } else {
-                    Countable<BlockStateHolder> c = new Countable<>(blk, 1);
-                    map.put(blk, c);
-                }
-            }
-        }
-
-        Collections.sort(distribution);
-        // Collections.reverse(distribution);
-
-        return distribution;
+    public List<Countable<BlockStateHolder>> getBlockDistribution(Region region, boolean fuzzy) {
+        BlockDistributionCounter count = new BlockDistributionCounter(this, fuzzy);
+        RegionVisitor visitor = new RegionVisitor(region, count);
+        Operations.completeBlindly(visitor);
+        return count.getDistribution();
     }
 
     public int makeShape(final Region region, final Vector zero, final Vector unit, final Pattern pattern, final String expressionString, final boolean hollow) throws ExpressionException, MaxChangedBlocksException {

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

@@ -662,49 +662,40 @@ public void distr(Player player, LocalSession session, EditSession editSession,
 
         int size;
         boolean useData = args.hasFlag('d');
-        List<Countable<BlockType>> distribution = null;
-        List<Countable<BlockStateHolder>> distributionData = null;
+        List<Countable<BlockStateHolder>> distribution;
 
         if (args.hasFlag('c')) {
             // TODO: Update for new clipboard
             throw new CommandException("Needs to be re-written again");
         } else {
-            if (useData) {
-                distributionData = editSession.getBlockDistributionWithData(session.getSelection(player.getWorld()));
-            } else {
-                distribution = editSession.getBlockDistribution(session.getSelection(player.getWorld()));
-            }
+            distribution = editSession.getBlockDistribution(session.getSelection(player.getWorld()), !useData);
             size = session.getSelection(player.getWorld()).getArea();
         }
 
-        if ((useData && distributionData.size() <= 0) || (!useData && distribution.size() <= 0)) {  // *Should* always be false
+        if (distribution.isEmpty()) {  // *Should* always be false
             player.printError("No blocks counted.");
             return;
         }
 
         player.print("# total blocks: " + size);
 
-        if (useData) {
-            for (Countable<BlockStateHolder> c : distributionData) {
-                String name = c.getID().getBlockType().getName();
-                String str = String.format("%-7s (%.3f%%) %s #%s%s",
+        for (Countable<BlockStateHolder> c : distribution) {
+            String name = c.getID().getBlockType().getName();
+            String str;
+            if (useData) {
+                str = String.format("%-7s (%.3f%%) %s #%s",
                         String.valueOf(c.getAmount()),
                         c.getAmount() / (double) size * 100,
                         name,
-                        c.getID().getBlockType().getId(),
-                        c.getID().getStates());
-                player.print(str);
-            }
-        } else {
-            for (Countable<BlockType> c : distribution) {
-                String name = c.getID().getName();
-                String str = String.format("%-7s (%.3f%%) %s #%s",
+                        c.getID().getAsString());
+            } else {
+                str = String.format("%-7s (%.3f%%) %s #%s",
                         String.valueOf(c.getAmount()),
                         c.getAmount() / (double) size * 100,
                         name,
-                        c.getID().getId());
-                player.print(str);
+                        c.getID().getBlockType().getId());
             }
+            player.print(str);
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/function/RegionFunction.java

@@ -34,6 +34,6 @@ public interface RegionFunction {
      * @return true if something was changed
      * @throws WorldEditException thrown on an error
      */
-    public boolean apply(Vector position) throws WorldEditException;
+    boolean apply(Vector position) throws WorldEditException;
 
 }

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.Vector;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.RegionFunction;
+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(Vector 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/world/block/BaseBlock.java

@@ -25,7 +25,6 @@
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.TileEntityBlock;
-import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.registry.state.Property;
 
 import java.util.Map;
@@ -140,7 +139,7 @@ public boolean equals(Object o) {
 
         final BaseBlock otherBlock = (BaseBlock) o;
 
-        return this.toImmutableState().equals(otherBlock.toImmutableState()) && Objects.equals(getNbtData(), otherBlock.getNbtData());
+        return this.toImmutableState().equalsFuzzy(otherBlock.toImmutableState()) && Objects.equals(getNbtData(), otherBlock.getNbtData());
 
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java

@@ -235,4 +235,18 @@ private BlockState setState(final Property<?> property, final Object value) {
     public String toString() {
         return getAsString();
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof BlockState)) {
+            return false;
+        }
+
+        return equalsFuzzy((BlockState) obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(blockType, values, fuzzy);
+    }
 }