Fixed a few more issues found looking over the changeset.

worldedit-bukkit/src/main/java/com/sk89q/wepif/ConfigurationPermissionsResolver.java

@@ -19,16 +19,16 @@
 
 package com.sk89q.wepif;
 
+import com.sk89q.util.yaml.YAMLNode;
+import com.sk89q.util.yaml.YAMLProcessor;
+import org.bukkit.OfflinePlayer;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.sk89q.util.yaml.YAMLNode;
-import com.sk89q.util.yaml.YAMLProcessor;
-import org.bukkit.OfflinePlayer;
-
 public class ConfigurationPermissionsResolver implements PermissionsResolver {
     private YAMLProcessor config;
     private Map<String, Set<String>> userPermissionsCache;

worldedit-bukkit/src/main/java/com/sk89q/wepif/NijiPermissionsResolver.java

@@ -19,6 +19,7 @@
 
 package com.sk89q.wepif;
 
+import com.nijikokun.bukkit.Permissions.Permissions;
 import com.sk89q.util.yaml.YAMLProcessor;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -27,7 +28,6 @@ import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
-import com.nijikokun.bukkit.Permissions.Permissions;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java

@@ -25,11 +25,12 @@ import com.sk89q.worldedit.world.biome.BiomeData;
 import com.sk89q.worldedit.world.registry.BiomeRegistry;
 import org.bukkit.block.Biome;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 /**
  * A biome registry for Bukkit.
  */

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandInspector.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.bukkit;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.bukkit.util.CommandInspector;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -30,8 +32,6 @@ import org.bukkit.command.CommandSender;
 
 import java.util.logging.Logger;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 class BukkitCommandInspector implements CommandInspector {
 
     private static final Logger logger = Logger.getLogger(BukkitCommandInspector.class.getCanonicalName());

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitCommandSender.java

@@ -19,19 +19,20 @@
 
 package com.sk89q.worldedit.bukkit;
 
-import com.sk89q.worldedit.session.SessionKey;
+import static com.google.common.base.Preconditions.checkArgument;
-import com.sk89q.worldedit.util.auth.AuthorizationException;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.internal.cui.CUIEvent;
+import com.sk89q.worldedit.session.SessionKey;
+import com.sk89q.worldedit.util.auth.AuthorizationException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.UUID;
 
-import static com.google.common.base.Preconditions.checkArgument;
+import javax.annotation.Nullable;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 public class BukkitCommandSender implements Actor {
 

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.bukkit;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
@@ -28,10 +30,9 @@ import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.NullWorld;
 
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 /**
  * An adapter to adapt a Bukkit entity into a WorldEdit one.

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntityProperties.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.bukkit;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.entity.metadata.EntityProperties;
 import com.sk89q.worldedit.util.Enums;
 import org.bukkit.entity.Ambient;
@@ -42,8 +44,6 @@ import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.minecart.ExplosiveMinecart;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 class BukkitEntityProperties implements EntityProperties {
 
     private static final org.bukkit.entity.EntityType armorStandType =

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayerBlockBag.java

@@ -20,13 +20,13 @@
 package com.sk89q.worldedit.bukkit;
 
 import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.extent.inventory.BlockBagException;
 import com.sk89q.worldedit.extent.inventory.OutOfBlocksException;
 import com.sk89q.worldedit.extent.inventory.OutOfSpaceException;
 import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockTypes;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -29,7 +29,6 @@ import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.blocks.LazyBlock;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.history.change.BlockChange;
@@ -418,11 +417,6 @@ public class BukkitWorld extends AbstractWorld {
         }
     }
 
-    @Override
-    public LazyBlock getLazyBlock(Vector position) {
-        return new LazyBlock(getBlock(position), this, position);
-    }
-
     @Override
     public BaseBlock getFullBlock(Vector position) {
         BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java

@@ -20,9 +20,9 @@
 package com.sk89q.worldedit.bukkit.adapter;
 
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.world.block.BlockType;
 import org.bukkit.Location;
 import org.bukkit.block.Biome;

worldedit-bukkit/src/test/java/com/sk89q/wepif/DinnerPermsResolverTest.java

@@ -19,13 +19,15 @@
 
 package com.sk89q.wepif;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.bukkit.Server;
 import org.bukkit.plugin.PluginManager;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
-
-import static org.mockito.Mockito.*;
 
 public class DinnerPermsResolverTest {
     private DinnerPermsResolver resolver;

worldedit-bukkit/src/test/java/com/sk89q/wepif/TestOfflinePermissible.java

@@ -28,7 +28,11 @@ import org.bukkit.permissions.PermissionAttachment;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.Plugin;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 public class TestOfflinePermissible implements OfflinePlayer, Permissible {
     private boolean op;

worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/LazyBlock.java

@@ -1,92 +0,0 @@
-/*
- * 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.blocks;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.extent.Extent;
-
-/**
- * A implementation of a lazy block for {@link Extent#getLazyBlock(Vector)}
- * that takes the block's ID and metadata, but will defer loading of NBT
- * data until time of access.
- *
- * <p>NBT data is later loaded using a call to {@link Extent#getBlock(Vector)}
- * with a stored {@link Extent} and location.</p>
- *
- * <p>All mutators on this object will throw an
- * {@link UnsupportedOperationException}.</p>
- */
-public class LazyBlock extends BaseBlock {
-
-    private final Extent extent;
-    private final Vector position;
-    private boolean loaded = false;
-
-    /**
-     * Create a new lazy block.
-     *
-     * @param type the block type
-     * @param extent the extent to later load the full block data from
-     * @param position the position to later load the full block data from
-     */
-    public LazyBlock(BlockType type, Extent extent, Vector position) {
-        super(type);
-        checkNotNull(extent);
-        checkNotNull(position);
-        this.extent = extent;
-        this.position = position;
-    }
-
-    /**
-     * Create a new lazy block.
-     *
-     * @param state the block state
-     * @param extent the extent to later load the full block data from
-     * @param position the position to later load the full block data from
-     */
-    public LazyBlock(BlockState state, Extent extent, Vector position) {
-        super(state);
-        checkNotNull(extent);
-        checkNotNull(position);
-        this.extent = extent;
-        this.position = position;
-    }
-
-    @Override
-    public CompoundTag getNbtData() {
-        if (!loaded) {
-            BaseBlock loadedBlock = extent.getFullBlock(position);
-            this.nbtData = loadedBlock.getNbtData();
-            loaded = true;
-        }
-        return super.getNbtData();
-    }
-
-    @Override
-    public void setNbtData(CompoundTag nbtData) {
-        throw new UnsupportedOperationException("This object is immutable");
-    }
-
-}

worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java

@@ -22,8 +22,8 @@ package com.sk89q.worldedit.blocks;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.util.gson.GsonUtil;
+import com.sk89q.worldedit.world.block.BlockState;
 
 import java.util.HashMap;
 import java.util.Map;

worldedit-core/src/main/java/com/sk89q/jnbt/CompoundTagBuilder.java

@@ -19,11 +19,11 @@
 
 package com.sk89q.jnbt;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Helps create compound tags.
  */

worldedit-core/src/main/java/com/sk89q/jnbt/ListTag.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.jnbt;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.Collections;
 import java.util.List;
-import java.util.NoSuchElementException;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 /**
  * The {@code TAG_List} tag.

worldedit-core/src/main/java/com/sk89q/jnbt/ListTagBuilder.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.jnbt;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Helps create list tags.
  */

worldedit-core/src/main/java/com/sk89q/jnbt/NBTOutputStream.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.jnbt;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.io.Closeable;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -26,8 +28,6 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * This class writes <strong>NBT</strong>, or <strong>Named Binary Tag</strong>
  * {@code Tag} objects to an underlying {@code OutputStream}.

worldedit-core/src/main/java/com/sk89q/jnbt/NBTUtils.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.jnbt;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.world.storage.InvalidFormatException;
 
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * A class which contains NBT-related utility methods.
  *

worldedit-core/src/main/java/com/sk89q/minecraft/util/commands/CommandException.java

@@ -19,12 +19,13 @@
 
 package com.sk89q.minecraft.util.commands;
 
-import javax.annotation.Nullable;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 public class CommandException extends Exception {
 

worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLNode.java

@@ -23,12 +23,13 @@ import com.sk89q.worldedit.BlockVector2D;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 /**
  * Represents a configuration node.
  */

worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java

@@ -24,15 +24,22 @@ import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.emitter.ScalarAnalysis;
-import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.nodes.Tag;
 import org.yaml.snakeyaml.reader.UnicodeReader;
-import org.yaml.snakeyaml.representer.Represent;
 import org.yaml.snakeyaml.representer.Representer;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.Map.Entry;
 
 /**

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

@@ -26,7 +26,6 @@ import static com.sk89q.worldedit.regions.Regions.maximumBlockY;
 import static com.sk89q.worldedit.regions.Regions.minimumBlockY;
 
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
@@ -399,11 +398,6 @@ public class EditSession implements Extent {
         return bypassNone.setBiome(position, biome);
     }
 
-    @Override
-    public LazyBlock getLazyBlock(Vector position) {
-        return world.getLazyBlock(position);
-    }
-
     @Override
     public BlockState getBlock(Vector position) {
         return world.getBlock(position);
@@ -1146,7 +1140,7 @@ public class EditSession implements Extent {
         checkArgument(radius >= 0, "radius >= 0 required");
 
         // Our origins can only be liquids
-        BlockMask liquidMask = new BlockMask(this, new BlockState(fluid, new HashMap<>()));
+        BlockMask liquidMask = new BlockMask(this, fluid.getDefaultState().toFuzzy());
 
         // But we will also visit air blocks
         MaskIntersection blockMask = new MaskUnion(liquidMask, new BlockMask(this, BlockTypes.AIR.getDefaultState()));
@@ -1508,7 +1502,7 @@ public class EditSession implements Extent {
                     // Snow should not cover these blocks
                     if (id.getMaterial().isTranslucent()) {
                         // Add snow on leaves
-                        if (BlockCategories.LEAVES.contains(id)) {
+                        if (!BlockCategories.LEAVES.contains(id)) {
                             break;
                         }
                     }
@@ -1678,7 +1672,7 @@ public class EditSession implements Extent {
                     for (int z = minZ; z <= maxZ; ++z) {
                         Vector pt = new Vector(x, y, z);
 
-                        BlockType type = getLazyBlock(pt).getBlockType();
+                        BlockType type = getBlock(pt).getBlockType();
 
                         if (map.containsKey(type)) {
                             map.get(type).increment();
@@ -1692,7 +1686,7 @@ public class EditSession implements Extent {
             }
         } else {
             for (Vector pt : region) {
-                BlockType type = getLazyBlock(pt).getBlockType();
+                BlockType type = getBlock(pt).getBlockType();
 
                 if (map.containsKey(type)) {
                     map.get(type).increment();

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

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.util.eventbus.EventBus;
 import com.sk89q.worldedit.world.World;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Creates new {@link EditSession}s. To get an instance of this factory,
  * use {@link WorldEdit#getEditSessionFactory()}.

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

@@ -19,9 +19,9 @@
 
 package com.sk89q.worldedit;
 
+import com.sk89q.worldedit.util.logging.LogFormat;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.item.ItemTypes;
-import com.sk89q.worldedit.util.logging.LogFormat;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 import com.sk89q.worldedit.world.snapshot.SnapshotRepository;
 

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

@@ -25,8 +25,6 @@ import com.sk89q.jchronic.Chronic;
 import com.sk89q.jchronic.Options;
 import com.sk89q.jchronic.utils.Span;
 import com.sk89q.jchronic.utils.Time;
-import com.sk89q.worldedit.world.item.ItemType;
-import com.sk89q.worldedit.world.item.ItemTypes;
 import com.sk89q.worldedit.command.tool.BlockTool;
 import com.sk89q.worldedit.command.tool.BrushTool;
 import com.sk89q.worldedit.command.tool.InvalidToolBindException;
@@ -46,6 +44,8 @@ import com.sk89q.worldedit.regions.selector.RegionSelectorType;
 import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.item.ItemType;
+import com.sk89q.worldedit.world.item.ItemTypes;
 import com.sk89q.worldedit.world.snapshot.Snapshot;
 
 import java.util.Calendar;

worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java

@@ -22,12 +22,12 @@ package com.sk89q.worldedit.blocks;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 
 import java.util.Map;

worldedit-core/src/main/java/com/sk89q/worldedit/blocks/ClothColor.java

@@ -19,10 +19,11 @@
 
 package com.sk89q.worldedit.blocks;
 
-import javax.annotation.Nullable;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
 
 /**
  * The colors for wool.

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

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
@@ -53,9 +56,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
-
 /**
  * Implements biome-related commands such as "/biomelist".
  */

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

@@ -30,7 +30,6 @@ import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.command.tool.BrushTool;
 import com.sk89q.worldedit.command.tool.brush.ButcherBrush;
 import com.sk89q.worldedit.command.tool.brush.ClipboardBrush;
@@ -50,6 +49,7 @@ import com.sk89q.worldedit.session.ClipboardHolder;
 import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.command.binding.Switch;
 import com.sk89q.worldedit.util.command.parametric.Optional;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 /**
  * Commands to set brush shape.

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

@@ -19,11 +19,19 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector2D;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.math.MathUtils;
 import com.sk89q.worldedit.util.Location;
@@ -35,9 +43,6 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.util.Set;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
-
 /**
  * Commands for working with chunks.
  */

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

@@ -19,19 +19,23 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.collect.Sets;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.world.item.ItemType;
+import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.world.item.ItemTypes;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.util.command.parametric.Optional;
-
+import com.sk89q.worldedit.world.item.ItemType;
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.sk89q.worldedit.world.item.ItemTypes;
 
 /**
  * General WorldEdit commands.

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

@@ -19,6 +19,11 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.ALL;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.PLACEMENT;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.Logging;
@@ -32,7 +37,6 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.internal.annotation.Selection;
 import com.sk89q.worldedit.internal.expression.ExpressionException;
 import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.util.TreeGenerator.TreeType;
 import com.sk89q.worldedit.util.command.binding.Range;
 import com.sk89q.worldedit.util.command.binding.Switch;
@@ -40,9 +44,6 @@ import com.sk89q.worldedit.util.command.binding.Text;
 import com.sk89q.worldedit.util.command.parametric.Optional;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.*;
-
 /**
  * Commands for the generation of shapes and other objects.
  */

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

@@ -19,14 +19,17 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Commands to undo, redo, and clear history.
  */

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

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
@@ -32,9 +35,6 @@ import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.command.parametric.Optional;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.POSITION;
-
 /**
  * Commands for moving the player around.
  */

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

@@ -19,10 +19,22 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.ALL;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.ORIENTATION_REGION;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
+import static com.sk89q.worldedit.regions.Regions.asFlatRegion;
+import static com.sk89q.worldedit.regions.Regions.maximumBlockY;
+import static com.sk89q.worldedit.regions.Regions.minimumBlockY;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.function.GroundFunction;
@@ -45,7 +57,6 @@ import com.sk89q.worldedit.regions.ConvexPolyhedralRegion;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionOperationException;
-import com.sk89q.worldedit.util.TreeGenerator;
 import com.sk89q.worldedit.util.TreeGenerator.TreeType;
 import com.sk89q.worldedit.util.command.binding.Range;
 import com.sk89q.worldedit.util.command.binding.Switch;
@@ -55,10 +66,6 @@ import com.sk89q.worldedit.util.command.parametric.Optional;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.*;
-import static com.sk89q.worldedit.regions.Regions.*;
-
 /**
  * Commands that operate on regions.
  */

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

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.ALL;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
@@ -31,9 +34,6 @@ import com.sk89q.worldedit.entity.Player;
 
 import java.io.File;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.ALL;
-
 /**
  * Commands related to scripting.
  */

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

@@ -34,8 +34,6 @@ import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.item.ItemTypes;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.platform.permission.ActorSelectorLimits;
@@ -59,6 +57,9 @@ import com.sk89q.worldedit.util.formatting.Style;
 import com.sk89q.worldedit.util.formatting.StyledFragment;
 import com.sk89q.worldedit.util.formatting.component.CommandListBox;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.item.ItemTypes;
 import com.sk89q.worldedit.world.storage.ChunkStore;
 
 import java.util.ArrayList;
@@ -651,7 +652,7 @@ public class SelectionCommands {
         help =
             "Gets the distribution of blocks in the selection.\n" +
             "The -c flag gets the distribution of your clipboard.\n" +
-            "The -d flag separates blocks by data",
+            "The -d flag separates blocks by state",
         flags = "cd",
         min = 0,
         max = 0
@@ -660,23 +661,30 @@ public class SelectionCommands {
     public void distr(Player player, LocalSession session, EditSession editSession, CommandContext args) throws WorldEditException, CommandException {
 
         int size;
-        List<Countable<BlockStateHolder>> distributionData;
+        boolean useData = args.hasFlag('d');
+        List<Countable<BlockType>> distribution = null;
+        List<Countable<BlockStateHolder>> distributionData = null;
 
         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()));
+            }
             size = session.getSelection(player.getWorld()).getArea();
         }
 
-        if (distributionData.size() <= 0) {  // *Should* always be false
+        if ((useData && distributionData.size() <= 0) || (!useData && distribution.size() <= 0)) {  // *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",
@@ -687,6 +695,17 @@ public class SelectionCommands {
                         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",
+                        String.valueOf(c.getAmount()),
+                        c.getAmount() / (double) size * 100,
+                        name,
+                        c.getID().getId());
+                player.print(str);
+            }
+        }
     }
 
     @Command(

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

@@ -24,7 +24,11 @@ package com.sk89q.worldedit.command;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.world.snapshot.InvalidSnapshotException;
 import com.sk89q.worldedit.world.snapshot.Snapshot;

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

@@ -19,11 +19,17 @@
 
 package com.sk89q.worldedit.command;
 
+import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
+
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.Logging;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.world.DataException;
@@ -37,8 +43,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import static com.sk89q.minecraft.util.commands.Logging.LogMode.REGION;
-
 public class SnapshotUtilCommands {
 
     private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");

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

@@ -22,7 +22,11 @@ package com.sk89q.worldedit.command;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.command.tool.AreaPickaxe;
 import com.sk89q.worldedit.command.tool.RecursivePickaxe;
 import com.sk89q.worldedit.command.tool.SinglePickaxe;

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

@@ -22,15 +22,26 @@ package com.sk89q.worldedit.command;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.command.tool.BlockDataCyler;
+import com.sk89q.worldedit.command.tool.BlockReplacer;
+import com.sk89q.worldedit.command.tool.DistanceWand;
+import com.sk89q.worldedit.command.tool.FloatingTreeRemover;
+import com.sk89q.worldedit.command.tool.FloodFillTool;
+import com.sk89q.worldedit.command.tool.LongRangeBuildTool;
+import com.sk89q.worldedit.command.tool.QueryTool;
+import com.sk89q.worldedit.command.tool.TreePlanter;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.input.ParserContext;
-import com.sk89q.worldedit.command.tool.*;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.TreeGenerator;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 public class ToolCommands {
     private final WorldEdit we;

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

@@ -22,7 +22,10 @@ package com.sk89q.worldedit.command;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.Pattern;

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

@@ -33,8 +33,6 @@ import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.command.util.CreatureButcher;
 import com.sk89q.worldedit.command.util.EntityRemover;
 import com.sk89q.worldedit.entity.Entity;
@@ -66,6 +64,8 @@ import com.sk89q.worldedit.util.formatting.component.Code;
 import com.sk89q.worldedit.util.formatting.component.CommandListBox;
 import com.sk89q.worldedit.util.formatting.component.CommandUsageBox;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -22,7 +22,10 @@ package com.sk89q.worldedit.command;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent;
 import com.sk89q.worldedit.extension.platform.Actor;

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ItemParser.java

@@ -24,13 +24,13 @@ import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.BaseItem;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 import com.sk89q.worldedit.world.World;
 
 public class ItemParser extends SimpleCommand<BaseItem> {

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/PatternParser.java

@@ -23,15 +23,14 @@ import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extension.input.InputParseException;
-import com.sk89q.worldedit.extension.input.NoMatchException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.util.command.argument.CommandArgs;
+import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 import com.sk89q.worldedit.world.World;
 
 public class PatternParser extends SimpleCommand<Pattern> {

worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ReplaceParser.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.command.argument;
 
+import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
+
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.extent.NullExtent;
@@ -30,8 +32,6 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.util.command.argument.CommandArgs;
 import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 
-import static com.sk89q.worldedit.util.GuavaUtil.firstNonNull;
-
 
 public class ReplaceParser extends SimpleCommand<Contextual<? extends RegionFunction>> {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ApplyCommand.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.command.composition;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.command.argument.RegionFunctionParser;
@@ -30,8 +32,6 @@ import com.sk89q.worldedit.util.command.argument.CommandArgs;
 import com.sk89q.worldedit.util.command.composition.CommandExecutor;
 import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class ApplyCommand extends SimpleCommand<Contextual<? extends Operation>> {
 
     private final CommandExecutor<Contextual<? extends RegionFunction>> functionParser;

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/SelectionCommand.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.command.composition;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.sk89q.minecraft.util.commands.CommandException;
@@ -41,8 +43,6 @@ import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class SelectionCommand extends SimpleCommand<Operation> {
 
     private final CommandExecutor<Contextual<? extends Operation>> delegate;

worldedit-core/src/main/java/com/sk89q/worldedit/command/composition/ShapedBrushCommand.java

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.command.composition;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.minecraft.util.commands.CommandPermissionsException;
@@ -40,8 +42,6 @@ import com.sk89q.worldedit.util.command.argument.CommandArgs;
 import com.sk89q.worldedit.util.command.composition.CommandExecutor;
 import com.sk89q.worldedit.util.command.composition.SimpleCommand;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class ShapedBrushCommand extends SimpleCommand<Object> {
 
     private final CommandExecutor<? extends Contextual<? extends Operation>> delegate;

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/AreaPickaxe.java

@@ -24,20 +24,18 @@ import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 /**
  * A super pickaxe mode that will remove blocks in an area.
  */
 public class AreaPickaxe implements BlockTool {
 
-    private static final BlockState air = BlockTypes.AIR.getDefaultState();
     private int range;
 
     public AreaPickaxe(int range) {
@@ -78,7 +76,7 @@ public class AreaPickaxe implements BlockTool {
 
                         ((World) clicked.getExtent()).queueBlockBreakEffect(server, pos, initialType, clicked.toVector().distanceSq(pos));
 
-                        editSession.setBlock(pos, air);
+                        editSession.setBlock(pos, BlockTypes.AIR.getDefaultState());
                     }
                 }
             }

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java

@@ -19,13 +19,16 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockType;
 
 /**
  * A mode that replaces one block.

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/DistanceWand.java

@@ -19,7 +19,8 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java

@@ -24,16 +24,16 @@ import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockCategories;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockCategories;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -44,7 +44,6 @@ import java.util.Set;
  * to anything else)
  */
 public class FloatingTreeRemover implements BlockTool {
-    private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
     private int rangeSq;
 
     public FloatingTreeRemover() {
@@ -89,7 +88,7 @@ public class FloatingTreeRemover implements BlockTool {
             for (Vector blockVector : blockSet) {
                 final BlockState otherState = editSession.getBlock(blockVector);
                 if (isTreeBlock(otherState.getBlockType())) {
-                    editSession.setBlock(blockVector, AIR);
+                    editSession.setBlock(blockVector, BlockTypes.AIR.getDefaultState());
                 }
             }
         } catch (MaxChangedBlocksException e) {

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloodFillTool.java

@@ -19,15 +19,20 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -54,7 +59,7 @@ public class FloodFillTool implements BlockTool {
     public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, Location clicked) {
         World world = (World) clicked.getExtent();
 
-        BlockType initialType = world.getLazyBlock(clicked.toVector()).getBlockType();
+        BlockType initialType = world.getBlock(clicked.toVector()).getBlockType();
 
         if (initialType == BlockTypes.AIR) {
             return true;

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java

@@ -23,12 +23,12 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 /**
  * A tool that can place (or remove) blocks at a distance.

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java

@@ -23,11 +23,11 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.blocks.MobSpawnerBlock;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 /**
  * Looks up information about a block.

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java

@@ -19,14 +19,18 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.LocalConfiguration;
-import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -37,7 +41,6 @@ import java.util.Set;
  */
 public class RecursivePickaxe implements BlockTool {
 
-    private static final BlockState air = BlockTypes.AIR.getDefaultState();
     private double range;
 
     public RecursivePickaxe(double range) {
@@ -95,7 +98,7 @@ public class RecursivePickaxe implements BlockTool {
 
         world.queueBlockBreakEffect(server, pos, initialType, distanceSq);
 
-        editSession.setBlock(pos, air);
+        editSession.setBlock(pos, BlockTypes.AIR.getDefaultState());
 
         recurse(server, editSession, world, pos.add(1, 0, 0).toBlockVector(),
                 origin, size, initialType, visited);

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SinglePickaxe.java

@@ -23,12 +23,12 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 /**
  * A super pickaxe mode that removes one block.
@@ -43,7 +43,7 @@ public class SinglePickaxe implements BlockTool {
     @Override
     public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session, com.sk89q.worldedit.util.Location clicked) {
         World world = (World) clicked.getExtent();
-        final BlockType blockType = world.getLazyBlock(clicked.toVector()).getBlockType();
+        final BlockType blockType = world.getBlock(clicked.toVector()).getBlockType();
         if (blockType == BlockTypes.BEDROCK
                 && !player.canDestroyBedrock()) {
             return true;

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java

@@ -19,11 +19,15 @@
 
 package com.sk89q.worldedit.command.tool;
 
-import com.sk89q.worldedit.*;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
-import com.sk89q.worldedit.util.*;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.util.TreeGenerator;
 
 /**
  * Plants a tree.

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/CylinderBrush.java

@@ -22,9 +22,9 @@ package com.sk89q.worldedit.command.tool.brush;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class CylinderBrush implements Brush {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java

@@ -23,11 +23,13 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.function.pattern.Pattern;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class GravityBrush implements Brush {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/HollowCylinderBrush.java

@@ -23,9 +23,9 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class HollowCylinderBrush implements Brush {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/HollowSphereBrush.java

@@ -23,9 +23,9 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class HollowSphereBrush implements Brush {
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/SmoothBrush.java

@@ -20,11 +20,11 @@
 package com.sk89q.worldedit.command.tool.brush;
 
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.convolution.HeightMap;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.convolution.GaussianKernel;
+import com.sk89q.worldedit.math.convolution.HeightMap;
 import com.sk89q.worldedit.math.convolution.HeightMapFilter;
 import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Region;

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/SphereBrush.java

@@ -23,9 +23,9 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 public class SphereBrush implements Brush {
 

worldedit-core/src/main/java/com/sk89q/worldedit/entity/BaseEntity.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.entity;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.world.NbtValued;
 import com.sk89q.worldedit.world.entity.EntityType;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Represents a mutable "snapshot" of an entity.
  *

worldedit-core/src/main/java/com/sk89q/worldedit/event/extent/EditSessionEvent.java

@@ -19,19 +19,19 @@
 
 package com.sk89q.worldedit.event.extent;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.EditSession.Stage;
+
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.event.Event;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.world.World;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import javax.annotation.Nullable;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.worldedit.EditSession.Stage;
-
 /**
  * Raised (several times) when a new {@link EditSession} is being instantiated.
  *

worldedit-core/src/main/java/com/sk89q/worldedit/event/platform/BlockInteractEvent.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.worldedit.event.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.event.Cancellable;
 import com.sk89q.worldedit.event.Event;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.util.Location;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Called when a block is interacted with.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/event/platform/CommandEvent.java

@@ -19,11 +19,11 @@
 
 package com.sk89q.worldedit.event.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.event.AbstractCancellable;
 import com.sk89q.worldedit.extension.platform.Actor;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * This class is currently only for internal use. Do not post or catch this event.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/event/platform/CommandSuggestionEvent.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.event.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.event.Event;
 import com.sk89q.worldedit.extension.platform.Actor;
 
 import java.util.Collections;
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Posted when suggestions for auto-completion are requested for command input.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/event/platform/ConfigurationLoadEvent.java

@@ -19,11 +19,11 @@
 
 package com.sk89q.worldedit.event.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.event.Event;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Raised when the configuration has been loaded or re-loaded.
  */

worldedit-core/src/main/java/com/sk89q/worldedit/event/platform/PlayerInputEvent.java

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.event.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.Cancellable;
 import com.sk89q.worldedit.event.Event;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * Raised whenever a player sends input.
  */

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

@@ -21,10 +21,10 @@ package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.input.InputParseException;
+import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.internal.registry.AbstractFactory;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import java.util.HashSet;
 import java.util.Set;

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

@@ -22,12 +22,12 @@ package com.sk89q.worldedit.extension.factory;
 import com.sk89q.worldedit.EmptyClipboardException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.function.pattern.ClipboardPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.internal.registry.InputParser;
-import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.session.ClipboardHolder;
 
 class HashTagPatternParser extends InputParser<Pattern> {

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

@@ -20,13 +20,13 @@
 package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.extension.input.InputParseException;
+import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.function.pattern.RandomPattern;
 import com.sk89q.worldedit.internal.registry.InputParser;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 class RandomPatternParser extends InputParser<Pattern> {
 

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

@@ -20,11 +20,11 @@
 package com.sk89q.worldedit.extension.factory;
 
 import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.internal.registry.InputParser;
-import com.sk89q.worldedit.extension.input.InputParseException;
 
 class SingleBlockPatternParser extends InputParser<Pattern> {
 

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

@@ -24,13 +24,6 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.world.gamemode.GameMode;
-import com.sk89q.worldedit.world.gamemode.GameModes;
-import com.sk89q.worldedit.world.item.ItemType;
-import com.sk89q.worldedit.world.item.ItemTypes;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.internal.cui.CUIEvent;
@@ -38,6 +31,13 @@ import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.TargetBlock;
 import com.sk89q.worldedit.util.auth.AuthorizationException;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.world.gamemode.GameMode;
+import com.sk89q.worldedit.world.gamemode.GameModes;
+import com.sk89q.worldedit.world.item.ItemType;
+import com.sk89q.worldedit.world.item.ItemTypes;
 
 import java.io.File;
 
@@ -103,7 +103,7 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable {
 
         byte free = 0;
 
-        while (y <= world.getMinimumPoint().getBlockY() + 2) {
+        while (y <= world.getMaximumPoint().getBlockY() + 2) {
             if (!world.getBlock(new Vector(x, y, z)).getBlockType().getMaterial().isMovementBlocker()) {
                 ++free;
             } else {
@@ -310,12 +310,12 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable {
 
     @Override
     public Location getBlockIn() {
-        return getLocation();
+        return getLocation().setPosition(getLocation().toVector().toBlockVector());
     }
 
     @Override
     public Location getBlockOn() {
-        return getLocation().setY(getLocation().getY() - 1);
+        return getLocation().setPosition(getLocation().setY(getLocation().getY() - 1).toVector().toBlockVector());
     }
 
     @Override

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

@@ -19,6 +19,9 @@
 
 package com.sk89q.worldedit.extension.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.sk89q.worldedit.util.command.composition.LegacyCommandAdapter.adapt;
+
 import com.google.common.base.Joiner;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
@@ -28,15 +31,41 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.command.*;
+import com.sk89q.worldedit.command.BiomeCommands;
+import com.sk89q.worldedit.command.BrushCommands;
+import com.sk89q.worldedit.command.ChunkCommands;
+import com.sk89q.worldedit.command.ClipboardCommands;
+import com.sk89q.worldedit.command.GeneralCommands;
+import com.sk89q.worldedit.command.GenerationCommands;
+import com.sk89q.worldedit.command.HistoryCommands;
+import com.sk89q.worldedit.command.NavigationCommands;
+import com.sk89q.worldedit.command.RegionCommands;
+import com.sk89q.worldedit.command.SchematicCommands;
+import com.sk89q.worldedit.command.ScriptingCommands;
+import com.sk89q.worldedit.command.SelectionCommands;
+import com.sk89q.worldedit.command.SnapshotCommands;
+import com.sk89q.worldedit.command.SnapshotUtilCommands;
+import com.sk89q.worldedit.command.SuperPickaxeCommands;
+import com.sk89q.worldedit.command.ToolCommands;
+import com.sk89q.worldedit.command.ToolUtilCommands;
+import com.sk89q.worldedit.command.UtilityCommands;
+import com.sk89q.worldedit.command.WorldEditCommands;
 import com.sk89q.worldedit.command.argument.ReplaceParser;
 import com.sk89q.worldedit.command.argument.TreeGeneratorParser;
-import com.sk89q.worldedit.command.composition.*;
+import com.sk89q.worldedit.command.composition.ApplyCommand;
+import com.sk89q.worldedit.command.composition.DeformCommand;
+import com.sk89q.worldedit.command.composition.PaintCommand;
+import com.sk89q.worldedit.command.composition.SelectionCommand;
+import com.sk89q.worldedit.command.composition.ShapedBrushCommand;
 import com.sk89q.worldedit.event.platform.CommandEvent;
 import com.sk89q.worldedit.event.platform.CommandSuggestionEvent;
 import com.sk89q.worldedit.function.factory.Deform;
 import com.sk89q.worldedit.function.factory.Deform.Mode;
-import com.sk89q.worldedit.internal.command.*;
+import com.sk89q.worldedit.internal.command.ActorAuthorizer;
+import com.sk89q.worldedit.internal.command.CommandLoggingHandler;
+import com.sk89q.worldedit.internal.command.UserCommandCompleter;
+import com.sk89q.worldedit.internal.command.WorldEditBinding;
+import com.sk89q.worldedit.internal.command.WorldEditExceptionConverter;
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.util.command.Dispatcher;
 import com.sk89q.worldedit.util.command.InvalidUsageException;
@@ -58,9 +87,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.sk89q.worldedit.util.command.composition.LegacyCommandAdapter.adapt;
-
 /**
  * Handles the registration and invocation of commands.
  *

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

@@ -25,10 +25,11 @@ import com.sk89q.worldedit.util.command.Dispatcher;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.registry.Registries;
 
-import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+
 /**
  * Represents a platform that WorldEdit has been implemented for.
  *

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

@@ -19,6 +19,8 @@
 
 package com.sk89q.worldedit.extension.platform;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.entity.BaseEntity;
@@ -31,11 +33,9 @@ import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.gamemode.GameMode;
 
-import javax.annotation.Nullable;
-
 import java.util.UUID;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 class PlayerProxy extends AbstractPlayerActor {
 

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

@@ -19,26 +19,25 @@
 
 package com.sk89q.worldedit.extent;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.function.operation.OperationQueue;
-import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
-
+import com.sk89q.worldedit.world.block.BlockState;
-import javax.annotation.Nullable;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 /**
  * A base class for {@link Extent}s that merely passes extents onto another.
@@ -71,11 +70,6 @@ public abstract class AbstractDelegateExtent implements Extent {
         return extent.getBlock(position);
     }
 
-    @Override
-    public LazyBlock getLazyBlock(Vector position) {
-        return extent.getLazyBlock(position);
-    }
-
     @Override
     public BaseBlock getFullBlock(Vector position) {
         return extent.getFullBlock(position);

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

@@ -19,10 +19,11 @@
 
 package com.sk89q.worldedit.extent;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.history.change.BlockChange;
@@ -31,13 +32,12 @@ import com.sk89q.worldedit.history.change.EntityRemove;
 import com.sk89q.worldedit.history.changeset.ChangeSet;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Location;
-
+import com.sk89q.worldedit.world.block.BlockStateHolder;
-import javax.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 /**
  * Stores changes to a {@link ChangeSet}.

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

@@ -22,11 +22,12 @@ package com.sk89q.worldedit.extent;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.util.Location;
+
+import java.util.List;
 
 import javax.annotation.Nullable;
-import java.util.List;
 
 /**
  * A world, portion of a world, clipboard, or other object that can have blocks

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

@@ -22,10 +22,9 @@ package com.sk89q.worldedit.extent;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
-import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BlockState;
 
 /**
  * Provides the current state of blocks, entities, and so on.
@@ -48,29 +47,6 @@ public interface InputExtent {
      */
     BlockState getBlock(Vector position);
 
-    /**
-     * Get a lazy, immutable snapshot of the block at the given location that only
-     * immediately contains information about the block's type (and metadata).
-     *
-     * <p>Further information (such as NBT data) will be available <strong>by the
-     * time of access</strong>. Therefore, it is not recommended that
-     * this method is used if the world is being simulated at the time of
-     * call. If the block needs to be stored for future use, then this method should
-     * definitely not be used. Moreover, the block that is returned is immutable (or
-     * should be), and therefore modifications should not be attempted on it. If a
-     * modifiable copy is required, then the block should be cloned.</p>
-     *
-     * <p>This method exists because it is sometimes important to inspect the block
-     * at a given location, but {@link #getBlock(Vector)} may be too expensive in
-     * the underlying implementation. It is also not possible to implement
-     * caching if the returned object is mutable, so this methods allows caching
-     * implementations to be used.</p>
-     *
-     * @param position position of the block
-     * @return the block
-     */
-    LazyBlock getLazyBlock(Vector position);
-
     /**
      * Get a immutable snapshot of the block at the given location.
      *

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

@@ -19,12 +19,12 @@
 
 package com.sk89q.worldedit.extent;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.function.mask.Mask;
-
+import com.sk89q.worldedit.world.block.BlockStateHolder;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Requires that all mutating methods pass a given {@link Mask}.

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

@@ -23,21 +23,21 @@ import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.function.operation.Operation;
-import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
-import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
 /**
  * An extent that returns air blocks for all blocks and does not
  * pass on any changes.
@@ -77,11 +77,6 @@ public class NullExtent implements Extent {
         return BlockTypes.AIR.getDefaultState();
     }
 
-    @Override
-    public LazyBlock getLazyBlock(Vector position) {
-        return new LazyBlock(BlockTypes.AIR, this, position);
-    }
-
     @Override
     public BaseBlock getFullBlock(Vector position) {
         return new BaseBlock(getBlock(position));

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

@@ -22,9 +22,9 @@ package com.sk89q.worldedit.extent;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import javax.annotation.Nullable;
 

worldedit-core/src/main/java/com/sk89q/worldedit/extent/buffer/ForgetfulExtentBuffer.java

@@ -24,9 +24,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.mask.Mask;
@@ -35,6 +32,8 @@ import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.regions.AbstractRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionOperationException;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -49,8 +48,6 @@ import java.util.Map;
  */
 public class ForgetfulExtentBuffer extends AbstractDelegateExtent implements Pattern {
 
-    private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
-
     private final Map<BlockVector, BlockStateHolder> buffer = new LinkedHashMap<>();
     private final Mask mask;
     private Vector min = null;
@@ -110,7 +107,7 @@ public class ForgetfulExtentBuffer extends AbstractDelegateExtent implements Pat
         if (block != null) {
             return block;
         } else {
-            return AIR;
+            return BlockTypes.AIR.getDefaultState();
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/extent/cache/LastAccessExtentCache.java

@@ -21,14 +21,13 @@ package com.sk89q.worldedit.extent.cache;
 
 import com.sk89q.worldedit.BlockVector;
 import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.world.block.BlockState;
 
 /**
- * Returns the same cached {@link BaseBlock} for repeated calls to
+ * Returns the same cached {@link BlockState} for repeated calls to
- * {@link #getLazyBlock(Vector)} with the same position.
+ * {@link #getBlock(Vector)} with the same position.
  */
 public class LastAccessExtentCache extends AbstractDelegateExtent {
 
@@ -44,13 +43,13 @@ public class LastAccessExtentCache extends AbstractDelegateExtent {
     }
 
     @Override
-    public LazyBlock getLazyBlock(Vector position) {
+    public BlockState getBlock(Vector position) {
         BlockVector blockVector = position.toBlockVector();
         CachedBlock lastBlock = this.lastBlock;
         if (lastBlock != null && lastBlock.position.equals(blockVector)) {
             return lastBlock.block;
         } else {
-            LazyBlock block = super.getLazyBlock(position);
+            BlockState block = super.getBlock(position);
             this.lastBlock = new CachedBlock(blockVector, block);
             return block;
         }
@@ -58,9 +57,9 @@ public class LastAccessExtentCache extends AbstractDelegateExtent {
 
     private static class CachedBlock {
         private final BlockVector position;
-        private final LazyBlock block;
+        private final BlockState block;
 
-        private CachedBlock(BlockVector position, LazyBlock block) {
+        private CachedBlock(BlockVector position, BlockState block) {
             this.position = position;
             this.block = block;
         }

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java

@@ -19,27 +19,27 @@
 
 package com.sk89q.worldedit.extent.clipboard;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.Vector2D;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.function.operation.Operation;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import javax.annotation.Nullable;
 
 /**
  * Stores block data as a multi-dimensional array of {@link BaseBlock}s and
@@ -135,11 +135,6 @@ public class BlockArrayClipboard implements Clipboard {
         return BlockTypes.AIR.getDefaultState();
     }
 
-    @Override
-    public LazyBlock getLazyBlock(Vector position) {
-        return new LazyBlock(getBlock(position), null, position);
-    }
-
     @Override
     public BaseBlock getFullBlock(Vector position) {
         if (region.contains(position)) {

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/StoredEntity.java

@@ -19,13 +19,13 @@
 
 package com.sk89q.worldedit.extent.clipboard;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.util.Location;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 /**
  * An implementation of {@link Entity} that stores a {@link BaseEntity} with it.
  *

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/ClipboardReader.java

@@ -20,7 +20,6 @@
 package com.sk89q.worldedit.extent.clipboard.io;
 
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.world.registry.Registries;
 
 import java.io.Closeable;
 import java.io.IOException;

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/NBTCompatibilityHandler.java

@@ -20,7 +20,6 @@
 package com.sk89q.worldedit.extent.clipboard.io.legacycompat;
 
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import java.util.Map;

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/legacycompat/SignCompatibilityHandler.java

@@ -26,7 +26,6 @@ import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockTypes;
 

worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBag.java

@@ -19,9 +19,9 @@
 
 package com.sk89q.worldedit.extent.inventory;
 
+import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.util.Location;
 
 /**
  * Represents a source to get blocks from and store removed ones.

worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java

@@ -21,12 +21,12 @@ package com.sk89q.worldedit.extent.inventory;
 
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.extent.AbstractDelegateExtent;
+import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
-import com.sk89q.worldedit.extent.AbstractDelegateExtent;
-import com.sk89q.worldedit.extent.Extent;
 
 import java.util.HashMap;
 import java.util.Map;

worldedit-core/src/main/java/com/sk89q/worldedit/extent/transform/BlockTransformExtent.java

@@ -24,7 +24,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.LazyBlock;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.transform.Transform;
@@ -82,11 +81,6 @@ public class BlockTransformExtent extends AbstractDelegateExtent {
         return transformBlock(super.getBlock(position), false);
     }
 
-    @Override
-    public LazyBlock getLazyBlock(Vector position) {
-        return transformBlock(super.getLazyBlock(position), false);
-    }
-
     @Override
     public BaseBlock getFullBlock(Vector position) {
         return transformBlock(super.getFullBlock(position), false);

worldedit-core/src/main/java/com/sk89q/worldedit/extent/validation/BlockChangeLimiter.java

@@ -19,14 +19,14 @@
 
 package com.sk89q.worldedit.extent.validation;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
-
+import com.sk89q.worldedit.world.block.BlockStateHolder;
-import static com.google.common.base.Preconditions.checkArgument;
 
 /**
  * Limits the number of blocks that can be changed before a