Cleanup the bukkit implementation, and update to the 1.13 release items/blocks.

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

@@ -19,22 +19,59 @@
 
 package com.sk89q.worldedit.bukkit;
 
+import com.google.common.base.Function;
 import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extension.input.InputParseException;
+import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.World;
+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.item.ItemType;
+import com.sk89q.worldedit.world.item.ItemTypes;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.inventory.ItemStack;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+
 /**
  * Adapts between Bukkit and WorldEdit equivalent objects.
  */
-final class BukkitAdapter {
+public class BukkitAdapter {
 
     private BukkitAdapter() {
     }
 
+    private static final ParserContext TO_BLOCK_CONTEXT = new ParserContext();
+
+    static {
+        TO_BLOCK_CONTEXT.setRestricted(false);
+    }
+
+    /**
+     * Checks equality between a WorldEdit BlockType and a Bukkit Material
+     *
+     * @param blockType The WorldEdit BlockType
+     * @param type The Bukkit Material
+     * @return If they are equal
+     */
+    public static boolean equals(BlockType blockType, Material type) {
+        return Objects.equals(blockType.getId(), type.getKey().toString());
+    }
+
     /**
      * Convert any WorldEdit world into an equivalent wrapped Bukkit world.
      *
@@ -95,7 +132,7 @@ final class BukkitAdapter {
      */
     public static Location adapt(org.bukkit.Location location) {
         checkNotNull(location);
-        Vector position = BukkitUtil.toVector(location);
+        Vector position = asVector(location);
         return new com.sk89q.worldedit.util.Location(
                 adapt(location.getWorld()),
                 position,
@@ -151,6 +188,17 @@ final class BukkitAdapter {
                 location.getPitch());
     }
 
+    /**
+     * Create a WorldEdit Vector from a Bukkit location.
+     *
+     * @param location The Bukkit location
+     * @return a WorldEdit vector
+     */
+    public static Vector asVector(org.bukkit.Location location) {
+        checkNotNull(location);
+        return new Vector(location.getX(), location.getY(), location.getZ());
+    }
+
     /**
      * Create a WorldEdit entity from a Bukkit entity.
      *
@@ -162,4 +210,103 @@ final class BukkitAdapter {
         return new BukkitEntity(entity);
     }
 
+    /**
+     * Create a Bukkit Material form a WorldEdit ItemType
+     *
+     * @param itemType The WorldEdit ItemType
+     * @return The Bukkit Material
+     */
+    public static Material adapt(ItemType itemType) {
+        checkNotNull(itemType);
+        if (!itemType.getId().startsWith("minecraft:")) {
+            throw new IllegalArgumentException("Bukkit only supports Minecraft items");
+        }
+        return Material.getMaterial(itemType.getId().replace("minecraft:", "").toUpperCase());
+    }
+
+    /**
+     * Create a Bukkit Material form a WorldEdit BlockType
+     *
+     * @param blockType The WorldEdit BlockType
+     * @return The Bukkit Material
+     */
+    public static Material adapt(BlockType blockType) {
+        checkNotNull(blockType);
+        if (!blockType.getId().startsWith("minecraft:")) {
+            throw new IllegalArgumentException("Bukkit only supports Minecraft blocks");
+        }
+        return Material.getMaterial(blockType.getId().replace("minecraft:", "").toUpperCase());
+    }
+
+    private static Map<String, BlockState> blockStateCache = new HashMap<>();
+
+    /**
+     * Create a WorldEdit BlockState from a Bukkit BlockData
+     *
+     * @param blockData The Bukkit BlockData
+     * @return The WorldEdit BlockState
+     */
+    public static BlockState adapt(BlockData blockData) {
+        checkNotNull(blockData);
+        return blockStateCache.computeIfAbsent(blockData.getAsString(), new Function<String, BlockState>() {
+            @Nullable
+            @Override
+            public BlockState apply(@Nullable String input) {
+                try {
+                    return WorldEdit.getInstance().getBlockFactory().parseFromInput(input, TO_BLOCK_CONTEXT).toImmutableState();
+                } catch (InputParseException e) {
+                    e.printStackTrace();
+                    return null;
+                }
+            }
+        });
+    }
+
+    /**
+     * Create a Bukkit BlockData from a WorldEdit BlockStateHolder
+     *
+     * @param block The WorldEdit BlockStateHolder
+     * @return The Bukkit BlockData
+     */
+    public static BlockData adapt(BlockStateHolder block) {
+        checkNotNull(block);
+        return Bukkit.createBlockData(block.getAsString());
+    }
+
+    /**
+     * Create a WorldEdit BlockState from a Bukkit ItemStack
+     *
+     * @param itemStack The Bukkit ItemStack
+     * @return The WorldEdit BlockState
+     */
+    public static BlockState asBlockState(ItemStack itemStack) {
+        checkNotNull(itemStack);
+        if (itemStack.getType().isBlock()) {
+            return adapt(itemStack.getType().createBlockData());
+        } else {
+            return BlockTypes.AIR.getDefaultState();
+        }
+    }
+
+    /**
+     * Create a WorldEdit BaseItemStack from a Bukkit ItemStack
+     *
+     * @param itemStack The Bukkit ItemStack
+     * @return The WorldEdit BaseItemStack
+     */
+    public static BaseItemStack adapt(ItemStack itemStack) {
+        checkNotNull(itemStack);
+        return new BaseItemStack(ItemTypes.get(itemStack.getType().getKey().toString()), itemStack.getAmount());
+    }
+
+    /**
+     * Create a Bukkit ItemStack from a WorldEdit BaseItemStack
+     *
+     * @param item The WorldEdit BaseItemStack
+     * @return The Bukkit ItemStack
+     */
+    public static ItemStack adapt(BaseItemStack item) {
+        checkNotNull(item);
+        return new ItemStack(adapt(item.getType()), item.getAmount());
+    }
 }