Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.

2024-11-07 12:00:07 +01:00 · 2018-08-10 20:29:06 +10:00 · 2018-08-10 20:29:06 +10:00 · 628c9cc0b7
Commit 628c9cc0b7
--- a/build.gradle
+++ b/build.gradle
@ -69,7 +69,7 @@ subprojects {

    repositories {
        mavenCentral()
-        //maven { url "http://ci.athion.net/job/FAWE-WorldGuard-1.13/ws/mvn/" }
+        maven { url "http://ci.athion.net/job/FAWE-WorldGuard-1.13/ws/mvn/" }
        maven { url "http://repo.bukkit.org/content/groups/public" }
        maven { url "http://maven.sk89q.com/repo/" }
        maven { url "http://repo.maven.apache.org/maven2" }
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/BlockMaterial_1_13.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/BlockMaterial_1_13.java
@ -1,7 +1,8 @@
 package com.boydti.fawe.bukkit.adapter.v1_13_1;

 import com.sk89q.util.ReflectionUtil;
-import com.sk89q.worldedit.blocks.BlockMaterial;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
+
 import net.minecraft.server.v1_13_R2.*;
 import org.bukkit.craftbukkit.v1_13_R2.block.data.CraftBlockData;

--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/v1_13_1/Spigot_v1_13_R2.java
@ -24,8 +24,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.sk89q.jnbt.*;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.blocks.TileEntityBlock;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
@ -36,10 +34,13 @@ import com.sk89q.worldedit.internal.Constants;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.registry.state.*;
 import com.sk89q.worldedit.util.Direction;
+import com.sk89q.worldedit.world.block.BaseBlock;
 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.world.registry.BlockMaterial;
+
 import net.minecraft.server.v1_13_R2.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/CFIPacketListener.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/listener/CFIPacketListener.java
@ -24,7 +24,6 @@ import com.comphenix.protocol.wrappers.WrappedBlockData;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.event.platform.BlockInteractEvent;
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitChunk_All.java
@ -13,7 +13,6 @@ import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.LongTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.entity.BaseEntity;
@ -23,6 +22,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;

+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
@ -20,9 +20,9 @@
 package com.sk89q.worldedit.bukkit;

 import com.bekvon.bukkit.residence.commands.material;
-import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.command.tool.BlockDataCyler;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java
@ -24,7 +24,7 @@ import com.boydti.fawe.util.TaskManager;
 import com.sk89q.util.StringUtil;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
 import com.sk89q.worldedit.entity.BaseEntity;
@ -80,11 +80,11 @@ public class BukkitPlayer extends AbstractPlayerActor {
    }

    @Override
-    public BlockState getBlockInHand(HandSide handSide) throws WorldEditException {
+    public BaseBlock getBlockInHand(HandSide handSide) throws WorldEditException {
        ItemStack itemStack = handSide == HandSide.MAIN_HAND
                ? player.getInventory().getItemInMainHand()
                : player.getInventory().getItemInOffHand();
-        return BukkitAdapter.asBlockState(itemStack);
+        return BukkitAdapter.asBlockState(itemStack).toBaseBlock();
    }

    @Override
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
@ -21,12 +21,12 @@ package com.sk89q.worldedit.bukkit;

 import com.boydti.fawe.Fawe;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import static com.google.common.base.Preconditions.checkNotNull;

 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.blocks.LazyBlock;
 import com.sk89q.worldedit.bukkit.adapter.BukkitImplAdapter;
@ -483,7 +483,7 @@ public class BukkitWorld extends AbstractWorld {
        if (adapter != null) {
            return adapter.getBlock(BukkitAdapter.adapt(getWorld(), position));
        } else {
-            return getBlock(position);
+            return getBlock(position).toBaseBlock();
        }
    }

--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
@ -20,10 +20,9 @@
 package com.sk89q.worldedit.bukkit.adapter;

 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
-import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.math.BlockVector3;
@ -32,6 +31,8 @@ import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
+
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.block.Biome;
--- a/worldedit-bukkit/src/main/resources/com/sk89q/worldedit/bukkit/adapter/impl/Spigot_v1_13_R1.class
+++ b/worldedit-bukkit/src/main/resources/com/sk89q/worldedit/bukkit/adapter/impl/Spigot_v1_13_R1.class
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/LazyBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/LazyBlock.java
@ -22,6 +22,7 @@ package com.sk89q.worldedit.blocks;
 import static com.google.common.base.Preconditions.checkNotNull;

 import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java
@ -25,6 +25,7 @@ import com.sk89q.jnbt.NBTUtils;
 import com.sk89q.jnbt.ShortTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.storage.InvalidFormatException;
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java
@ -22,6 +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.util.gson.GsonUtil;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.util.gson.GsonUtil;
--- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java
+++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java
@ -22,6 +22,7 @@ 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.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;

--- a/worldedit-core/src/main/java/com/boydti/fawe/command/AnvilCommands.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/command/AnvilCommands.java
@ -21,7 +21,6 @@ import com.boydti.fawe.util.StringMan;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.entity.Player;
--- a/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java
@ -30,7 +30,6 @@ import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.command.MethodCommands;
 import com.sk89q.worldedit.entity.Player;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/SchematicStreamer.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/SchematicStreamer.java
@ -14,7 +14,6 @@ import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.NBTInputStream;
 import com.sk89q.jnbt.StringTag;
-import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
@ -27,6 +26,7 @@ import com.sk89q.worldedit.world.block.*;
 import com.sk89q.worldedit.world.entity.EntityType;
 import com.sk89q.worldedit.world.entity.EntityTypes;
 import com.sk89q.worldedit.world.item.ItemTypes;
+import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 import net.jpountz.lz4.LZ4BlockInputStream;
 import net.jpountz.lz4.LZ4BlockOutputStream;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAFilter.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.jnbt.anvil;

 import com.boydti.fawe.object.collection.IterableThreadLocal;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAWorld.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAWorld.java
@ -7,7 +7,6 @@ import com.sk89q.jnbt.ListTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.entity.BaseEntity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MutableMCABackedBaseBlock.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MutableMCABackedBaseBlock.java
@ -2,7 +2,7 @@ package com.boydti.fawe.jnbt.anvil;

 import com.boydti.fawe.FaweCache;
 import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import javax.annotation.Nullable;

--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/CountFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/CountFilter.java
@ -4,7 +4,7 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.jnbt.anvil.MCAChunk;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.number.MutableLong;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;

 // TODO FIXME
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/CountIdFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/CountIdFilter.java
@ -4,7 +4,6 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.jnbt.anvil.MCAChunk;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.number.MutableLong;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/DelegateMCAFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/DelegateMCAFilter.java
@ -4,7 +4,7 @@ import com.boydti.fawe.jnbt.anvil.MCAChunk;
 import com.boydti.fawe.jnbt.anvil.MCAFile;
 import com.boydti.fawe.jnbt.anvil.MCAFilter;
 import com.boydti.fawe.jnbt.anvil.MCAQueue;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/MappedReplacePatternFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/MappedReplacePatternFilter.java
@ -4,7 +4,7 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.number.MutableLong;
 import com.boydti.fawe.util.StringMan;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.function.pattern.Pattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/RemapFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/RemapFilter.java
@ -13,7 +13,7 @@ import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.IntTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import java.io.File;
 import java.util.ArrayList;
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/ReplacePatternFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/ReplacePatternFilter.java
@ -4,7 +4,7 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.mask.FaweBlockMatcher;
 import com.boydti.fawe.object.number.MutableLong;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.function.pattern.Pattern;

--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/ReplaceSimpleFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/ReplaceSimpleFilter.java
@ -3,7 +3,7 @@ package com.boydti.fawe.jnbt.anvil.filters;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.mask.FaweBlockMatcher;
 import com.boydti.fawe.object.number.MutableLong;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;

 public class ReplaceSimpleFilter extends MCAFilterCounter {
--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/SetPatternFilter.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/SetPatternFilter.java
@ -3,7 +3,7 @@ package com.boydti.fawe.jnbt.anvil.filters;
 import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.number.MutableLong;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.function.pattern.Pattern;

--- a/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/generator/CavesGen.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/generator/CavesGen.java
@ -4,7 +4,6 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.object.PseudoRandom;
 import com.boydti.fawe.util.MathMan;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/DataAnglePattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/DataAnglePattern.java
@ -3,7 +3,6 @@ package com.boydti.fawe.object;
 import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.object.extent.ExtentHeightCacher;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/FaweChunk.java
@ -3,7 +3,7 @@ package com.boydti.fawe.object;
 import com.boydti.fawe.object.visitor.FaweChunkVisitor;
 import com.boydti.fawe.util.MainUtil;
 import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/FaweLimit.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/FaweLimit.java
@ -1,6 +1,5 @@
 package com.boydti.fawe.object;

-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;

 import java.util.Collections;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/FaweQueue.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/FaweQueue.java
@ -13,7 +13,7 @@ import com.boydti.fawe.util.SetQueue;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
@ -5,7 +5,6 @@ import com.boydti.fawe.object.changeset.FaweChangeSet;
 import com.boydti.fawe.object.exception.FaweException;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/MaskedFaweQueue.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/MaskedFaweQueue.java
@ -7,7 +7,6 @@ import com.boydti.fawe.object.extent.SingleRegionExtent;
 import com.boydti.fawe.object.queue.DelegateFaweQueue;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BlockState;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/CopyPastaBrush.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/CopyPastaBrush.java
@ -10,7 +10,6 @@ import com.boydti.fawe.object.function.mask.AbstractDelegateMask;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.entity.Player;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ErodeBrush.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ErodeBrush.java
@ -7,7 +7,6 @@ import com.boydti.fawe.object.clipboard.FaweClipboard;
 import com.boydti.fawe.object.clipboard.OffsetFaweClipboard;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.blocks.Blocks;
 import com.sk89q.worldedit.command.tool.brush.Brush;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ImageBrush.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ImageBrush.java
@ -6,7 +6,6 @@ import com.boydti.fawe.util.TextureUtil;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/RecurseBrush.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/RecurseBrush.java
@ -4,7 +4,6 @@ import com.boydti.fawe.object.mask.RadiusMask;
 import com.boydti.fawe.object.visitor.DFSRecursiveVisitor;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.command.tool.brush.Brush;
 import com.sk89q.worldedit.function.block.BlockReplace;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/heightmap/ScalableHeightMap.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/heightmap/ScalableHeightMap.java
@ -3,7 +3,6 @@ package com.boydti.fawe.object.brush.heightmap;
 import com.boydti.fawe.object.IntegerPair;
 import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.MathMan;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.math.BlockVector3;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/ImmutableVirtualWorld.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/ImmutableVirtualWorld.java
@ -9,7 +9,6 @@ import com.boydti.fawe.object.exception.FaweException;
 import com.boydti.fawe.util.SetQueue;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.*;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.function.operation.Operation;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualExtent.java
@ -8,7 +8,6 @@ import com.boydti.fawe.object.FaweQueue;
 import com.boydti.fawe.object.visitor.FaweChunkVisitor;
 import com.boydti.fawe.util.MathMan;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractDelegateChangeSet.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/AbstractDelegateChangeSet.java
@ -4,7 +4,7 @@ import com.boydti.fawe.object.FawePlayer;
 import com.boydti.fawe.object.FaweQueue;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.history.change.BlockChange;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/BlockBagChangeSet.java
@ -5,7 +5,6 @@ import com.boydti.fawe.object.exception.FaweException;
 import com.boydti.fawe.util.ReflectionUtils;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.extent.inventory.BlockBagException;
 import com.sk89q.worldedit.extent.inventory.UnplaceableBlockException;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweChangeSet.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweChangeSet.java
@ -14,7 +14,7 @@ import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.TaskManager;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.history.change.BlockChange;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/AbstractDelegateFaweClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/AbstractDelegateFaweClipboard.java
@ -2,7 +2,6 @@ package com.boydti.fawe.object.clipboard;

 import com.boydti.fawe.jnbt.NBTStreamer;
 import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java
@ -8,7 +8,7 @@ import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.IntTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java
@ -11,7 +11,7 @@ import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.IntTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/EmptyClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/EmptyClipboard.java
@ -2,7 +2,6 @@ package com.boydti.fawe.object.clipboard;

 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/FaweClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/FaweClipboard.java
@ -5,7 +5,6 @@ import com.boydti.fawe.util.ReflectionUtils;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.IntTag;
 import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java
@ -10,7 +10,7 @@ import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.IntTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/ReadOnlyClipboard.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/ReadOnlyClipboard.java
@ -3,7 +3,6 @@ package com.boydti.fawe.object.clipboard;
 import com.boydti.fawe.jnbt.NBTStreamer;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/remap/ClipboardRemapper.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/remap/ClipboardRemapper.java
@ -8,7 +8,7 @@ import com.google.gson.JsonParser;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.blocks.BaseItem;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/BlockTranslateExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/BlockTranslateExtent.java
@ -1,7 +1,6 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/EmptyExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/EmptyExtent.java
@ -2,7 +2,6 @@ package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FastWorldEditExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FastWorldEditExtent.java
@ -7,7 +7,7 @@ import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.ReflectionUtils;
 import com.sk89q.jnbt.*;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FaweRegionExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FaweRegionExtent.java
@ -5,7 +5,6 @@ import com.boydti.fawe.object.FaweLimit;
 import com.boydti.fawe.util.WEManager;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/MemoryCheckingExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/MemoryCheckingExtent.java
@ -6,7 +6,6 @@ import com.boydti.fawe.util.MemUtil;
 import com.boydti.fawe.util.Perm;
 import com.boydti.fawe.util.WEManager;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/MultiTransform.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/MultiTransform.java
@ -1,7 +1,6 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/NullExtent.java
@ -4,7 +4,7 @@ import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.object.FaweLimit;
 import com.boydti.fawe.object.exception.FaweException;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/OffsetExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/OffsetExtent.java
@ -1,7 +1,6 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/PatternTransform.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/PatternTransform.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.Pattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/PositionTransformExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/PositionTransformExtent.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/ProcessedWEExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/ProcessedWEExtent.java
@ -6,7 +6,7 @@ import com.boydti.fawe.util.WEManager;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/RandomOffsetTransform.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/RandomOffsetTransform.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/ScaleTransform.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/ScaleTransform.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/SelectTransform.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/SelectTransform.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/SlowExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/SlowExtent.java
@ -2,7 +2,7 @@ package com.boydti.fawe.object.extent;

 import com.boydti.fawe.Fawe;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/SourceMaskExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/SourceMaskExtent.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.mask.Mask;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/StripNBTExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/StripNBTExtent.java
@ -4,7 +4,7 @@ import com.boydti.fawe.util.ReflectionUtils;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/TemporalExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/TemporalExtent.java
@ -1,9 +1,8 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/TransformExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/TransformExtent.java
@ -1,7 +1,6 @@
 package com.boydti.fawe.object.extent;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/function/block/CombinedBlockCopy.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/function/block/CombinedBlockCopy.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.function.block;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.RegionFunction;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/mask/FaweBlockMatcher.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/mask/FaweBlockMatcher.java
@ -2,7 +2,7 @@ package com.boydti.fawe.object.mask;

 import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.object.PseudoRandom;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import java.util.Set;

--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/AngleColorPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/AngleColorPattern.java
@ -5,7 +5,7 @@ import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.object.DataAnglePattern;
 import com.boydti.fawe.util.TextureHolder;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/AverageColorPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/AverageColorPattern.java
@ -4,7 +4,7 @@ import com.boydti.fawe.Fawe;
 import com.boydti.fawe.util.TextureHolder;
 import com.boydti.fawe.util.TextureUtil;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/BiomePattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/BiomePattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/BufferedPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/BufferedPattern.java
@ -5,7 +5,7 @@ import com.boydti.fawe.object.FawePlayer;
 import com.boydti.fawe.object.collection.LocalBlockVectorSet;
 import com.boydti.fawe.util.FaweTimer;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/DataPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/DataPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.boydti.fawe.FaweCache;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.Pattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/DesaturatePattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/DesaturatePattern.java
@ -4,7 +4,7 @@ import com.boydti.fawe.Fawe;
 import com.boydti.fawe.util.TextureHolder;
 import com.boydti.fawe.util.TextureUtil;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/ExistingPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/ExistingPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/FullClipboardPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/FullClipboardPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/IdDataMaskPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/IdDataMaskPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.boydti.fawe.FaweCache;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.Pattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/Linear2DBlockPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/Linear2DBlockPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/Linear3DBlockPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/Linear3DBlockPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/LinearBlockPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/LinearBlockPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/MaskedPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/MaskedPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.mask.Mask;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/NoXPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/NoXPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/NoYPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/NoYPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/NoZPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/NoZPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/OffsetPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/OffsetPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/PatternExtent.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/PatternExtent.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/PropertyPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/PropertyPattern.java
@ -5,13 +5,14 @@ import com.boydti.fawe.util.MathMan;
 import com.boydti.fawe.util.StringMan;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.registry.state.AbstractProperty;
 import com.sk89q.worldedit.registry.state.IntegerProperty;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.registry.state.PropertyKey;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/RandomFullClipboardPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/RandomFullClipboardPattern.java
@ -3,7 +3,7 @@ package com.boydti.fawe.object.pattern;
 import com.boydti.fawe.object.PseudoRandom;
 import com.boydti.fawe.object.schematic.Schematic;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/RandomOffsetPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/RandomOffsetPattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/RelativePattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/RelativePattern.java
@ -1,7 +1,7 @@
 package com.boydti.fawe.object.pattern;

 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/SaturatePattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/SaturatePattern.java
@ -4,7 +4,7 @@ import com.boydti.fawe.Fawe;
 import com.boydti.fawe.util.TextureHolder;
 import com.boydti.fawe.util.TextureUtil;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/ShadePattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/ShadePattern.java
@ -2,7 +2,7 @@ package com.boydti.fawe.object.pattern;

 import com.boydti.fawe.Fawe;
 import com.boydti.fawe.util.TextureUtil;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/SolidRandomOffsetPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/SolidRandomOffsetPattern.java
@ -2,7 +2,7 @@ package com.boydti.fawe.object.pattern;

 import com.boydti.fawe.FaweCache;
 import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.extent.Extent;
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/SurfaceRandomOffsetPattern.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/pattern/SurfaceRandomOffsetPattern.java
@ -2,7 +2,7 @@ package com.boydti.fawe.object.pattern;

 import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.object.PseudoRandom;
-import com.sk89q.worldedit.blocks.BaseBlock;
+
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.function.pattern.AbstractPattern;
 import com.sk89q.worldedit.function.pattern.Pattern;
--- a/Mehr anzeigen
+++ b/Mehr anzeigen