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

worldedit-bukkit/build.gradle

@@ -11,7 +11,6 @@ dependencies {
     compile project(':worldedit-core')
     compile 'com.sk89q:dummypermscompat:1.8'
     compile 'org.bukkit:bukkit:1.13-pre7-R0.1-SNAPSHOT' // zzz
-//    compile 'org.bukkit:bukkit:1.9.4-R0.1-SNAPSHOT' // zzz
     testCompile 'org.mockito:mockito-core:1.9.0-rc1'
 }
 
@@ -36,10 +35,7 @@ jar {
 shadowJar {
     dependencies {
         include(dependency(':worldedit-core'))
-        include(dependency('com.google.code.gson:gson'))
     }
-
-    relocate('com.google.gson', 'com.sk89q.worldedit.internal.gson')
 }
 
 build.dependsOn(shadowJar)

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());
+    }
 }

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

@@ -22,7 +22,6 @@ package com.sk89q.worldedit.bukkit;
 import com.sk89q.worldedit.blocks.BlockMaterial;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.world.block.BlockType;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.registry.BundledBlockRegistry;
 import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial;
 import org.bukkit.Material;
@@ -39,7 +38,7 @@ public class BukkitBlockRegistry extends BundledBlockRegistry {
     @Nullable
     @Override
     public BlockMaterial getMaterial(BlockType blockType) {
-        return materialMap.computeIfAbsent(BukkitUtil.toMaterial(blockType),
+        return materialMap.computeIfAbsent(BukkitAdapter.adapt(blockType),
                 material -> new BukkitBlockMaterial(BukkitBlockRegistry.super.getMaterial(blockType), material));
     }
 

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

@@ -61,7 +61,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
         ItemStack itemStack = handSide == HandSide.MAIN_HAND
                 ? player.getInventory().getItemInMainHand()
                 : player.getInventory().getItemInOffHand();
-        return BukkitUtil.toBaseItemStack(itemStack);
+        return BukkitAdapter.adapt(itemStack);
     }
 
     @Override
@@ -69,7 +69,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
         ItemStack itemStack = handSide == HandSide.MAIN_HAND
                 ? player.getInventory().getItemInMainHand()
                 : player.getInventory().getItemInOffHand();
-        return new BaseBlock(BukkitUtil.toBlock(itemStack));
+        return new BaseBlock(BukkitAdapter.asBlockState(itemStack));
     }
 
     @Override
@@ -79,7 +79,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
 
     @Override
     public void giveItem(BaseItemStack itemStack) {
-        player.getInventory().addItem(BukkitUtil.toItemStack(itemStack));
+        player.getInventory().addItem(BukkitAdapter.adapt(itemStack));
     }
 
     @Override
@@ -135,7 +135,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
 
     @Override
     public World getWorld() {
-        return BukkitUtil.getWorld(player.getWorld());
+        return BukkitAdapter.adapt(player.getWorld());
     }
 
     @Override
@@ -176,7 +176,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
     @Override
     public com.sk89q.worldedit.util.Location getLocation() {
         Location nativeLocation = player.getLocation();
-        Vector position = BukkitUtil.toVector(nativeLocation);
+        Vector position = BukkitAdapter.asVector(nativeLocation);
         return new com.sk89q.worldedit.util.Location(
                 getWorld(),
                 position,

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

@@ -79,7 +79,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
                 continue;
             }
 
-            if (!BukkitUtil.equals(blockState.getBlockType(), bukkitItem.getType())) {
+            if (!BukkitAdapter.equals(blockState.getBlockType(), bukkitItem.getType())) {
                 // Type id doesn't fit
                 continue;
             }
@@ -132,7 +132,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
                 continue;
             }
 
-            if (!BukkitUtil.equals(blockState.getBlockType(), bukkitItem.getType())) {
+            if (!BukkitAdapter.equals(blockState.getBlockType(), bukkitItem.getType())) {
                 // Type id doesn't fit
                 continue;
             }
@@ -158,7 +158,7 @@ public class BukkitPlayerBlockBag extends BlockBag {
         }
 
         if (freeSlot > -1) {
-            items[freeSlot] = new ItemStack(BukkitUtil.toItemStack(new BaseItemStack(blockState.getBlockType().getItemType(), amount)));
+            items[freeSlot] = BukkitAdapter.adapt(new BaseItemStack(blockState.getBlockType().getItemType(), amount));
             return;
         }
 

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

@@ -87,7 +87,7 @@ public class BukkitServerInterface implements MultiUserPlatform {
         List<com.sk89q.worldedit.world.World> ret = new ArrayList<>(worlds.size());
 
         for (World world : worlds) {
-            ret.add(BukkitUtil.getWorld(world));
+            ret.add(BukkitAdapter.adapt(world));
         }
 
         return ret;

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

@@ -1,185 +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.bukkit;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.blocks.BaseItemStack;
-import com.sk89q.worldedit.extension.input.InputParseException;
-import com.sk89q.worldedit.extension.input.ParserContext;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.util.Location;
-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.Server;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.List;
-import java.util.Objects;
-
-public final class BukkitUtil {
-
-    private BukkitUtil() {
-    }
-
-    private static final ParserContext TO_BLOCK_CONTEXT = new ParserContext();
-
-    static {
-        TO_BLOCK_CONTEXT.setRestricted(false);
-    }
-
-    public static com.sk89q.worldedit.world.World getWorld(World w) {
-        return new BukkitWorld(w);
-    }
-
-    public static BlockVector toVector(Block block) {
-        return new BlockVector(block.getX(), block.getY(), block.getZ());
-    }
-
-    public static BlockVector toVector(BlockFace face) {
-        return new BlockVector(face.getModX(), face.getModY(), face.getModZ());
-    }
-
-    public static Vector toVector(org.bukkit.Location loc) {
-        return new Vector(loc.getX(), loc.getY(), loc.getZ());
-    }
-
-    public static Location toLocation(org.bukkit.Location loc) {
-        return new Location(
-            getWorld(loc.getWorld()),
-            new Vector(loc.getX(), loc.getY(), loc.getZ()),
-            loc.getYaw(), loc.getPitch()
-        );
-    }
-
-    public static Vector toVector(org.bukkit.util.Vector vector) {
-        return new Vector(vector.getX(), vector.getY(), vector.getZ());
-    }
-
-    public static org.bukkit.Location toLocation(World world, Vector pt) {
-        return new org.bukkit.Location(world, pt.getX(), pt.getY(), pt.getZ());
-    }
-
-    public static org.bukkit.Location center(org.bukkit.Location loc) {
-        return new org.bukkit.Location(
-                loc.getWorld(),
-                loc.getBlockX() + 0.5,
-                loc.getBlockY() + 0.5,
-                loc.getBlockZ() + 0.5,
-                loc.getPitch(),
-                loc.getYaw()
-        );
-    }
-
-    public static Player matchSinglePlayer(Server server, String name) {
-        List<Player> players = server.matchPlayer(name);
-        if (players.isEmpty()) {
-            return null;
-        }
-        return players.get(0);
-    }
-
-    /**
-     * Bukkit's Location class has serious problems with floating point
-     * precision.
-     */
-    @SuppressWarnings("RedundantIfStatement")
-    public static boolean equals(org.bukkit.Location a, org.bukkit.Location b) {
-        if (Math.abs(a.getX() - b.getX()) > EQUALS_PRECISION) return false;
-        if (Math.abs(a.getY() - b.getY()) > EQUALS_PRECISION) return false;
-        if (Math.abs(a.getZ() - b.getZ()) > EQUALS_PRECISION) return false;
-        return true;
-    }
-
-    public static boolean equals(BlockType blockType, Material type) {
-        return Objects.equals(blockType.getId(), type.getKey().toString());
-    }
-
-    public static final double EQUALS_PRECISION = 0.0001;
-
-    public static org.bukkit.Location toLocation(Location location) {
-        Vector pt = location.toVector();
-        return new org.bukkit.Location(
-            toWorld(location.getExtent()),
-            pt.getX(), pt.getY(), pt.getZ(),
-            location.getYaw(), location.getPitch()
-        );
-    }
-
-    public static World toWorld(final Extent world) {
-        return ((BukkitWorld) world).getWorld();
-    }
-
-    public static Material toMaterial(ItemType itemType) {
-        if (!itemType.getId().startsWith("minecraft:")) {
-            throw new IllegalArgumentException("Bukkit only supports Minecraft items");
-        }
-        return Material.getMaterial(itemType.getId().replace("minecraft:", "").toUpperCase());
-    }
-
-    public static Material toMaterial(BlockType blockType) {
-        if (!blockType.getId().startsWith("minecraft:")) {
-            throw new IllegalArgumentException("Bukkit only supports Minecraft blocks");
-        }
-        return Material.getMaterial(blockType.getId().replace("minecraft:", "").toUpperCase());
-    }
-
-    public static BlockState toBlock(BlockData blockData) {
-        try {
-            return WorldEdit.getInstance().getBlockFactory().parseFromInput(blockData.getAsString(), TO_BLOCK_CONTEXT).toImmutableState();
-        } catch (InputParseException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public static BlockData toBlock(BlockStateHolder block) {
-        return Bukkit.createBlockData(block.getAsString());
-    }
-
-    public static BlockState toBlock(ItemStack itemStack) throws WorldEditException {
-        if (itemStack.getType().isBlock()) {
-            return toBlock(itemStack.getType().createBlockData());
-        } else {
-            return BlockTypes.AIR.getDefaultState();
-        }
-    }
-
-    public static BaseItemStack toBaseItemStack(ItemStack itemStack) {
-        return new BaseItemStack(ItemTypes.get(itemStack.getType().getKey().toString()), itemStack.getAmount());
-    }
-
-    public static ItemStack toItemStack(BaseItemStack item) {
-        return new ItemStack(toMaterial(item.getType()), item.getAmount());
-    }
-}

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

@@ -89,7 +89,7 @@ public class BukkitWorld extends AbstractWorld {
         List<Entity> ents = world.getEntities();
         List<com.sk89q.worldedit.entity.Entity> entities = new ArrayList<>();
         for (Entity ent : ents) {
-            if (region.contains(BukkitUtil.toVector(ent.getLocation()))) {
+            if (region.contains(BukkitAdapter.asVector(ent.getLocation()))) {
                 entities.add(BukkitAdapter.adapt(ent));
             }
         }
@@ -284,14 +284,14 @@ public class BukkitWorld extends AbstractWorld {
     public boolean generateTree(TreeGenerator.TreeType type, EditSession editSession, Vector pt) {
         World world = getWorld();
         TreeType bukkitType = toBukkitTreeType(type);
-        return type != null && world.generateTree(BukkitUtil.toLocation(world, pt), bukkitType,
+        return type != null && world.generateTree(BukkitAdapter.adapt(world, pt), bukkitType,
                 new EditSessionBlockChangeDelegate(editSession));
     }
 
     @Override
     public void dropItem(Vector pt, BaseItemStack item) {
         World world = getWorld();
-        world.dropItemNaturally(BukkitUtil.toLocation(world, pt), BukkitUtil.toItemStack(item));
+        world.dropItemNaturally(BukkitAdapter.adapt(world, pt), BukkitAdapter.adapt(item));
     }
 
     @Override
@@ -343,7 +343,7 @@ public class BukkitWorld extends AbstractWorld {
             return false;
         }
 
-        world.playEffect(BukkitUtil.toLocation(world, position), effect, data);
+        world.playEffect(BukkitAdapter.adapt(world, position), effect, data);
 
         return true;
     }
@@ -356,7 +356,7 @@ public class BukkitWorld extends AbstractWorld {
     @Override
     public com.sk89q.worldedit.world.block.BlockState getBlock(Vector position) {
         Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
-        return BukkitUtil.toBlock(bukkitBlock.getBlockData());
+        return BukkitAdapter.adapt(bukkitBlock.getBlockData());
     }
 
     @Override
@@ -366,7 +366,7 @@ public class BukkitWorld extends AbstractWorld {
             return adapter.setBlock(BukkitAdapter.adapt(getWorld(), position), block, notifyAndLight);
         } else {
             Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
-            bukkitBlock.setBlockData(BukkitUtil.toBlock(block), notifyAndLight);
+            bukkitBlock.setBlockData(BukkitAdapter.adapt(block), notifyAndLight);
             return true;
         }
     }

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

@@ -40,7 +40,7 @@ public class EditSessionBlockChangeDelegate implements BlockChangeDelegate {
     @Override
     public boolean setBlockData(int x, int y, int z, BlockData blockData) {
         try {
-            editSession.setBlock(new Vector(x, y, z), BukkitUtil.toBlock(blockData));
+            editSession.setBlock(new Vector(x, y, z), BukkitAdapter.adapt(blockData));
         } catch (MaxChangedBlocksException e) {
             return false;
         }
@@ -49,7 +49,7 @@ public class EditSessionBlockChangeDelegate implements BlockChangeDelegate {
 
     @Override
     public BlockData getBlockData(int x, int y, int z) {
-        return BukkitUtil.toBlock(editSession.getBlock(new Vector(x, y, z)));
+        return BukkitAdapter.adapt(editSession.getBlock(new Vector(x, y, z)));
     }
 
     @Override

worldedit-bukkit/src/test/java/com/sk89q/worldedit/bukkit/BukkitWorldTest.java

@@ -28,7 +28,7 @@ public class BukkitWorldTest {
     @Test
     public void testTreeTypeMapping() {
         for (TreeGenerator.TreeType type : TreeGenerator.TreeType.values()) {
-//            Assert.assertNotNull("No mapping for: " + type, BukkitWorld.toBukkitTreeType(type)); // TODO
+            Assert.assertNotNull("No mapping for: " + type, BukkitWorld.toBukkitTreeType(type));
         }
     }
 

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

@@ -24,13 +24,6 @@ package com.sk89q.worldedit.blocks;
  */
 public interface BlockMaterial {
 
-    /**
-     * Get whether this block is rendered like a normal block.
-     *
-     * @return the value of the test
-     */
-    boolean isRenderedAsNormalBlock();
-
     /**
      * Get whether this block is a full sized cube.
      *
@@ -87,27 +80,6 @@ public interface BlockMaterial {
      */
     float getSlipperiness();
 
-    /**
-     * Get whether this block blocks grass from growing.
-     *
-     * @return whether this block blocks grass
-     */
-    boolean isGrassBlocking();
-
-    /**
-     * Get the ambient occlusion light value.
-     *
-     * @return the ambient occlusion light value
-     */
-    float getAmbientOcclusionLightValue();
-
-    /**
-     * Get the opacity of this block for light to pass through.
-     *
-     * @return the opacity
-     */
-    int getLightOpacity();
-
     /**
      * Get the light value for this block.
      *
@@ -129,13 +101,6 @@ public interface BlockMaterial {
      */
     boolean isUnpushable();
 
-    /**
-     * Get whether this block can be used in adventure mode.
-     *
-     * @return true if the block can be used in adventure mode
-     */
-    boolean isAdventureModeExempt();
-
     /**
      * Get whether this block is ticked randomly.
      *
@@ -143,13 +108,6 @@ public interface BlockMaterial {
      */
     boolean isTicksRandomly();
 
-    /**
-     * Gets whether this block uses a neighbor's light value.
-     *
-     * @return true if this block does
-     */
-    boolean isUsingNeighborLight();
-
     /**
      * Get whether this block prevents movement.
      *

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

@@ -88,7 +88,7 @@ public final class Blocks {
         shouldPlaceLast.add(BlockTypes.REDSTONE_TORCH);
         shouldPlaceLast.add(BlockTypes.REDSTONE_WALL_TORCH);
         shouldPlaceLast.add(BlockTypes.SNOW);
-        shouldPlaceLast.add(BlockTypes.PORTAL);
+        shouldPlaceLast.add(BlockTypes.NETHER_PORTAL);
         shouldPlaceLast.add(BlockTypes.END_PORTAL);
         shouldPlaceLast.add(BlockTypes.REPEATER);
         shouldPlaceLast.add(BlockTypes.VINE);

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

@@ -267,7 +267,7 @@ class DefaultBlockParser extends InputParser<BlockStateHolder> {
             text[2] = blockAndExtraData.length > 3 ? blockAndExtraData[3] : "";
             text[3] = blockAndExtraData.length > 4 ? blockAndExtraData[4] : "";
             return new SignBlock(state, text);
-        } else if (blockType == BlockTypes.MOB_SPAWNER) {
+        } else if (blockType == BlockTypes.SPAWNER) {
             // Allow setting mob spawn type
             if (blockAndExtraData.length > 1) {
                 String mobName = blockAndExtraData[1];

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

@@ -26,7 +26,6 @@ import javax.annotation.Nullable;
  */
 public final class BlockTypes {
 
-    public static final BlockType ACACIA_BARK = register("minecraft:acacia_bark");
     public static final BlockType ACACIA_BUTTON = register("minecraft:acacia_button");
     public static final BlockType ACACIA_DOOR = register("minecraft:acacia_door");
     public static final BlockType ACACIA_FENCE = register("minecraft:acacia_fence");
@@ -39,6 +38,7 @@ public final class BlockTypes {
     public static final BlockType ACACIA_SLAB = register("minecraft:acacia_slab");
     public static final BlockType ACACIA_STAIRS = register("minecraft:acacia_stairs");
     public static final BlockType ACACIA_TRAPDOOR = register("minecraft:acacia_trapdoor");
+    public static final BlockType ACACIA_WOOD = register("minecraft:acacia_wood");
     public static final BlockType ACTIVATOR_RAIL = register("minecraft:activator_rail");
     public static final BlockType AIR = register("minecraft:air");
     public static final BlockType ALLIUM = register("minecraft:allium");
@@ -51,7 +51,6 @@ public final class BlockTypes {
     public static final BlockType BEACON = register("minecraft:beacon");
     public static final BlockType BEDROCK = register("minecraft:bedrock");
     public static final BlockType BEETROOTS = register("minecraft:beetroots");
-    public static final BlockType BIRCH_BARK = register("minecraft:birch_bark");
     public static final BlockType BIRCH_BUTTON = register("minecraft:birch_button");
     public static final BlockType BIRCH_DOOR = register("minecraft:birch_door");
     public static final BlockType BIRCH_FENCE = register("minecraft:birch_fence");
@@ -64,6 +63,7 @@ public final class BlockTypes {
     public static final BlockType BIRCH_SLAB = register("minecraft:birch_slab");
     public static final BlockType BIRCH_STAIRS = register("minecraft:birch_stairs");
     public static final BlockType BIRCH_TRAPDOOR = register("minecraft:birch_trapdoor");
+    public static final BlockType BIRCH_WOOD = register("minecraft:birch_wood");
     public static final BlockType BLACK_BANNER = register("minecraft:black_banner");
     public static final BlockType BLACK_BED = register("minecraft:black_bed");
     public static final BlockType BLACK_CARPET = register("minecraft:black_carpet");
@@ -95,6 +95,7 @@ public final class BlockTypes {
     public static final BlockType BRAIN_CORAL = register("minecraft:brain_coral");
     public static final BlockType BRAIN_CORAL_BLOCK = register("minecraft:brain_coral_block");
     public static final BlockType BRAIN_CORAL_FAN = register("minecraft:brain_coral_fan");
+    public static final BlockType BRAIN_CORAL_WALL_FAN = register("minecraft:brain_coral_wall_fan");
     public static final BlockType BREWING_STAND = register("minecraft:brewing_stand");
     public static final BlockType BRICK_SLAB = register("minecraft:brick_slab");
     public static final BlockType BRICK_STAIRS = register("minecraft:brick_stairs");
@@ -117,6 +118,7 @@ public final class BlockTypes {
     public static final BlockType BUBBLE_CORAL = register("minecraft:bubble_coral");
     public static final BlockType BUBBLE_CORAL_BLOCK = register("minecraft:bubble_coral_block");
     public static final BlockType BUBBLE_CORAL_FAN = register("minecraft:bubble_coral_fan");
+    public static final BlockType BUBBLE_CORAL_WALL_FAN = register("minecraft:bubble_coral_wall_fan");
     public static final BlockType CACTUS = register("minecraft:cactus");
     public static final BlockType CAKE = register("minecraft:cake");
     public static final BlockType CARROTS = register("minecraft:carrots");
@@ -165,7 +167,6 @@ public final class BlockTypes {
     public static final BlockType CYAN_WOOL = register("minecraft:cyan_wool");
     public static final BlockType DAMAGED_ANVIL = register("minecraft:damaged_anvil");
     public static final BlockType DANDELION = register("minecraft:dandelion");
-    public static final BlockType DARK_OAK_BARK = register("minecraft:dark_oak_bark");
     public static final BlockType DARK_OAK_BUTTON = register("minecraft:dark_oak_button");
     public static final BlockType DARK_OAK_DOOR = register("minecraft:dark_oak_door");
     public static final BlockType DARK_OAK_FENCE = register("minecraft:dark_oak_fence");
@@ -178,16 +179,27 @@ public final class BlockTypes {
     public static final BlockType DARK_OAK_SLAB = register("minecraft:dark_oak_slab");
     public static final BlockType DARK_OAK_STAIRS = register("minecraft:dark_oak_stairs");
     public static final BlockType DARK_OAK_TRAPDOOR = register("minecraft:dark_oak_trapdoor");
+    public static final BlockType DARK_OAK_WOOD = register("minecraft:dark_oak_wood");
     public static final BlockType DARK_PRISMARINE = register("minecraft:dark_prismarine");
     public static final BlockType DARK_PRISMARINE_SLAB = register("minecraft:dark_prismarine_slab");
     public static final BlockType DARK_PRISMARINE_STAIRS = register("minecraft:dark_prismarine_stairs");
     public static final BlockType DAYLIGHT_DETECTOR = register("minecraft:daylight_detector");
     public static final BlockType DEAD_BRAIN_CORAL_BLOCK = register("minecraft:dead_brain_coral_block");
+    public static final BlockType DEAD_BRAIN_CORAL_FAN = register("minecraft:dead_brain_coral_fan");
+    public static final BlockType DEAD_BRAIN_CORAL_WALL_FAN = register("minecraft:dead_brain_coral_wall_fan");
     public static final BlockType DEAD_BUBBLE_CORAL_BLOCK = register("minecraft:dead_bubble_coral_block");
+    public static final BlockType DEAD_BUBBLE_CORAL_FAN = register("minecraft:dead_bubble_coral_fan");
+    public static final BlockType DEAD_BUBBLE_CORAL_WALL_FAN = register("minecraft:dead_bubble_coral_wall_fan");
     public static final BlockType DEAD_BUSH = register("minecraft:dead_bush");
     public static final BlockType DEAD_FIRE_CORAL_BLOCK = register("minecraft:dead_fire_coral_block");
+    public static final BlockType DEAD_FIRE_CORAL_FAN = register("minecraft:dead_fire_coral_fan");
+    public static final BlockType DEAD_FIRE_CORAL_WALL_FAN = register("minecraft:dead_fire_coral_wall_fan");
     public static final BlockType DEAD_HORN_CORAL_BLOCK = register("minecraft:dead_horn_coral_block");
+    public static final BlockType DEAD_HORN_CORAL_FAN = register("minecraft:dead_horn_coral_fan");
+    public static final BlockType DEAD_HORN_CORAL_WALL_FAN = register("minecraft:dead_horn_coral_wall_fan");
     public static final BlockType DEAD_TUBE_CORAL_BLOCK = register("minecraft:dead_tube_coral_block");
+    public static final BlockType DEAD_TUBE_CORAL_FAN = register("minecraft:dead_tube_coral_fan");
+    public static final BlockType DEAD_TUBE_CORAL_WALL_FAN = register("minecraft:dead_tube_coral_wall_fan");
     public static final BlockType DETECTOR_RAIL = register("minecraft:detector_rail");
     public static final BlockType DIAMOND_BLOCK = register("minecraft:diamond_block");
     public static final BlockType DIAMOND_ORE = register("minecraft:diamond_ore");
@@ -215,6 +227,7 @@ public final class BlockTypes {
     public static final BlockType FIRE_CORAL = register("minecraft:fire_coral");
     public static final BlockType FIRE_CORAL_BLOCK = register("minecraft:fire_coral_block");
     public static final BlockType FIRE_CORAL_FAN = register("minecraft:fire_coral_fan");
+    public static final BlockType FIRE_CORAL_WALL_FAN = register("minecraft:fire_coral_wall_fan");
     public static final BlockType FLOWER_POT = register("minecraft:flower_pot");
     public static final BlockType FROSTED_ICE = register("minecraft:frosted_ice");
     public static final BlockType FURNACE = register("minecraft:furnace");
@@ -258,6 +271,7 @@ public final class BlockTypes {
     public static final BlockType HORN_CORAL = register("minecraft:horn_coral");
     public static final BlockType HORN_CORAL_BLOCK = register("minecraft:horn_coral_block");
     public static final BlockType HORN_CORAL_FAN = register("minecraft:horn_coral_fan");
+    public static final BlockType HORN_CORAL_WALL_FAN = register("minecraft:horn_coral_wall_fan");
     public static final BlockType ICE = register("minecraft:ice");
     public static final BlockType INFESTED_CHISELED_STONE_BRICKS = register("minecraft:infested_chiseled_stone_bricks");
     public static final BlockType INFESTED_COBBLESTONE = register("minecraft:infested_cobblestone");
@@ -272,7 +286,6 @@ public final class BlockTypes {
     public static final BlockType IRON_TRAPDOOR = register("minecraft:iron_trapdoor");
     public static final BlockType JACK_O_LANTERN = register("minecraft:jack_o_lantern");
     public static final BlockType JUKEBOX = register("minecraft:jukebox");
-    public static final BlockType JUNGLE_BARK = register("minecraft:jungle_bark");
     public static final BlockType JUNGLE_BUTTON = register("minecraft:jungle_button");
     public static final BlockType JUNGLE_DOOR = register("minecraft:jungle_door");
     public static final BlockType JUNGLE_FENCE = register("minecraft:jungle_fence");
@@ -285,6 +298,7 @@ public final class BlockTypes {
     public static final BlockType JUNGLE_SLAB = register("minecraft:jungle_slab");
     public static final BlockType JUNGLE_STAIRS = register("minecraft:jungle_stairs");
     public static final BlockType JUNGLE_TRAPDOOR = register("minecraft:jungle_trapdoor");
+    public static final BlockType JUNGLE_WOOD = register("minecraft:jungle_wood");
     public static final BlockType KELP = register("minecraft:kelp");
     public static final BlockType KELP_PLANT = register("minecraft:kelp_plant");
     public static final BlockType LADDER = register("minecraft:ladder");
@@ -347,7 +361,6 @@ public final class BlockTypes {
     public static final BlockType MAGMA_BLOCK = register("minecraft:magma_block");
     public static final BlockType MELON = register("minecraft:melon");
     public static final BlockType MELON_STEM = register("minecraft:melon_stem");
-    public static final BlockType MOB_SPAWNER = register("minecraft:mob_spawner");
     public static final BlockType MOSSY_COBBLESTONE = register("minecraft:mossy_cobblestone");
     public static final BlockType MOSSY_COBBLESTONE_WALL = register("minecraft:mossy_cobblestone_wall");
     public static final BlockType MOSSY_STONE_BRICKS = register("minecraft:mossy_stone_bricks");
@@ -358,12 +371,12 @@ public final class BlockTypes {
     public static final BlockType NETHER_BRICK_SLAB = register("minecraft:nether_brick_slab");
     public static final BlockType NETHER_BRICK_STAIRS = register("minecraft:nether_brick_stairs");
     public static final BlockType NETHER_BRICKS = register("minecraft:nether_bricks");
+    public static final BlockType NETHER_PORTAL = register("minecraft:nether_portal");
     public static final BlockType NETHER_QUARTZ_ORE = register("minecraft:nether_quartz_ore");
     public static final BlockType NETHER_WART = register("minecraft:nether_wart");
     public static final BlockType NETHER_WART_BLOCK = register("minecraft:nether_wart_block");
     public static final BlockType NETHERRACK = register("minecraft:netherrack");
     public static final BlockType NOTE_BLOCK = register("minecraft:note_block");
-    public static final BlockType OAK_BARK = register("minecraft:oak_bark");
     public static final BlockType OAK_BUTTON = register("minecraft:oak_button");
     public static final BlockType OAK_DOOR = register("minecraft:oak_door");
     public static final BlockType OAK_FENCE = register("minecraft:oak_fence");
@@ -376,6 +389,7 @@ public final class BlockTypes {
     public static final BlockType OAK_SLAB = register("minecraft:oak_slab");
     public static final BlockType OAK_STAIRS = register("minecraft:oak_stairs");
     public static final BlockType OAK_TRAPDOOR = register("minecraft:oak_trapdoor");
+    public static final BlockType OAK_WOOD = register("minecraft:oak_wood");
     public static final BlockType OBSERVER = register("minecraft:observer");
     public static final BlockType OBSIDIAN = register("minecraft:obsidian");
     public static final BlockType ORANGE_BANNER = register("minecraft:orange_banner");
@@ -417,7 +431,6 @@ public final class BlockTypes {
     public static final BlockType POLISHED_DIORITE = register("minecraft:polished_diorite");
     public static final BlockType POLISHED_GRANITE = register("minecraft:polished_granite");
     public static final BlockType POPPY = register("minecraft:poppy");
-    public static final BlockType PORTAL = register("minecraft:portal");
     public static final BlockType POTATOES = register("minecraft:potatoes");
     public static final BlockType POTTED_ACACIA_SAPLING = register("minecraft:potted_acacia_sapling");
     public static final BlockType POTTED_ALLIUM = register("minecraft:potted_allium");
@@ -518,8 +531,8 @@ public final class BlockTypes {
     public static final BlockType SNOW = register("minecraft:snow");
     public static final BlockType SNOW_BLOCK = register("minecraft:snow_block");
     public static final BlockType SOUL_SAND = register("minecraft:soul_sand");
+    public static final BlockType SPAWNER = register("minecraft:spawner");
     public static final BlockType SPONGE = register("minecraft:sponge");
-    public static final BlockType SPRUCE_BARK = register("minecraft:spruce_bark");
     public static final BlockType SPRUCE_BUTTON = register("minecraft:spruce_button");
     public static final BlockType SPRUCE_DOOR = register("minecraft:spruce_door");
     public static final BlockType SPRUCE_FENCE = register("minecraft:spruce_fence");
@@ -532,6 +545,7 @@ public final class BlockTypes {
     public static final BlockType SPRUCE_SLAB = register("minecraft:spruce_slab");
     public static final BlockType SPRUCE_STAIRS = register("minecraft:spruce_stairs");
     public static final BlockType SPRUCE_TRAPDOOR = register("minecraft:spruce_trapdoor");
+    public static final BlockType SPRUCE_WOOD = register("minecraft:spruce_wood");
     public static final BlockType STICKY_PISTON = register("minecraft:sticky_piston");
     public static final BlockType STONE = register("minecraft:stone");
     public static final BlockType STONE_BRICK_SLAB = register("minecraft:stone_brick_slab");
@@ -541,11 +555,17 @@ public final class BlockTypes {
     public static final BlockType STONE_PRESSURE_PLATE = register("minecraft:stone_pressure_plate");
     public static final BlockType STONE_SLAB = register("minecraft:stone_slab");
     public static final BlockType STRIPPED_ACACIA_LOG = register("minecraft:stripped_acacia_log");
+    public static final BlockType STRIPPED_ACACIA_WOOD = register("minecraft:stripped_acacia_wood");
     public static final BlockType STRIPPED_BIRCH_LOG = register("minecraft:stripped_birch_log");
+    public static final BlockType STRIPPED_BIRCH_WOOD = register("minecraft:stripped_birch_wood");
     public static final BlockType STRIPPED_DARK_OAK_LOG = register("minecraft:stripped_dark_oak_log");
+    public static final BlockType STRIPPED_DARK_OAK_WOOD = register("minecraft:stripped_dark_oak_wood");
     public static final BlockType STRIPPED_JUNGLE_LOG = register("minecraft:stripped_jungle_log");
+    public static final BlockType STRIPPED_JUNGLE_WOOD = register("minecraft:stripped_jungle_wood");
     public static final BlockType STRIPPED_OAK_LOG = register("minecraft:stripped_oak_log");
+    public static final BlockType STRIPPED_OAK_WOOD = register("minecraft:stripped_oak_wood");
     public static final BlockType STRIPPED_SPRUCE_LOG = register("minecraft:stripped_spruce_log");
+    public static final BlockType STRIPPED_SPRUCE_WOOD = register("minecraft:stripped_spruce_wood");
     public static final BlockType STRUCTURE_BLOCK = register("minecraft:structure_block");
     public static final BlockType STRUCTURE_VOID = register("minecraft:structure_void");
     public static final BlockType SUGAR_CANE = register("minecraft:sugar_cane");
@@ -561,6 +581,7 @@ public final class BlockTypes {
     public static final BlockType TUBE_CORAL = register("minecraft:tube_coral");
     public static final BlockType TUBE_CORAL_BLOCK = register("minecraft:tube_coral_block");
     public static final BlockType TUBE_CORAL_FAN = register("minecraft:tube_coral_fan");
+    public static final BlockType TUBE_CORAL_WALL_FAN = register("minecraft:tube_coral_wall_fan");
     public static final BlockType TURTLE_EGG = register("minecraft:turtle_egg");
     public static final BlockType VINE = register("minecraft:vine");
     public static final BlockType VOID_AIR = register("minecraft:void_air");

worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemTypes.java

@@ -23,9 +23,9 @@ import javax.annotation.Nullable;
 
 public final class ItemTypes {
 
-    public static final ItemType ACACIA_BARK = register("minecraft:acacia_bark");
     public static final ItemType ACACIA_BOAT = register("minecraft:acacia_boat");
     public static final ItemType ACACIA_BUTTON = register("minecraft:acacia_button");
+    public static final ItemType ACACIA_DOOR = register("minecraft:acacia_door");
     public static final ItemType ACACIA_FENCE = register("minecraft:acacia_fence");
     public static final ItemType ACACIA_FENCE_GATE = register("minecraft:acacia_fence_gate");
     public static final ItemType ACACIA_LEAVES = register("minecraft:acacia_leaves");
@@ -36,6 +36,7 @@ public final class ItemTypes {
     public static final ItemType ACACIA_SLAB = register("minecraft:acacia_slab");
     public static final ItemType ACACIA_STAIRS = register("minecraft:acacia_stairs");
     public static final ItemType ACACIA_TRAPDOOR = register("minecraft:acacia_trapdoor");
+    public static final ItemType ACACIA_WOOD = register("minecraft:acacia_wood");
     public static final ItemType ACTIVATOR_RAIL = register("minecraft:activator_rail");
     public static final ItemType AIR = register("minecraft:air");
     public static final ItemType ALLIUM = register("minecraft:allium");
@@ -48,14 +49,15 @@ public final class ItemTypes {
     public static final ItemType BAKED_POTATO = register("minecraft:baked_potato");
     public static final ItemType BARRIER = register("minecraft:barrier");
     public static final ItemType BAT_SPAWN_EGG = register("minecraft:bat_spawn_egg");
+    public static final ItemType BEACON = register("minecraft:beacon");
     public static final ItemType BEDROCK = register("minecraft:bedrock");
     public static final ItemType BEEF = register("minecraft:beef");
     public static final ItemType BEETROOT = register("minecraft:beetroot");
     public static final ItemType BEETROOT_SEEDS = register("minecraft:beetroot_seeds");
     public static final ItemType BEETROOT_SOUP = register("minecraft:beetroot_soup");
-    public static final ItemType BIRCH_BARK = register("minecraft:birch_bark");
     public static final ItemType BIRCH_BOAT = register("minecraft:birch_boat");
     public static final ItemType BIRCH_BUTTON = register("minecraft:birch_button");
+    public static final ItemType BIRCH_DOOR = register("minecraft:birch_door");
     public static final ItemType BIRCH_FENCE = register("minecraft:birch_fence");
     public static final ItemType BIRCH_FENCE_GATE = register("minecraft:birch_fence_gate");
     public static final ItemType BIRCH_LEAVES = register("minecraft:birch_leaves");
@@ -66,11 +68,14 @@ public final class ItemTypes {
     public static final ItemType BIRCH_SLAB = register("minecraft:birch_slab");
     public static final ItemType BIRCH_STAIRS = register("minecraft:birch_stairs");
     public static final ItemType BIRCH_TRAPDOOR = register("minecraft:birch_trapdoor");
+    public static final ItemType BIRCH_WOOD = register("minecraft:birch_wood");
     public static final ItemType BLACK_BANNER = register("minecraft:black_banner");
+    public static final ItemType BLACK_BED = register("minecraft:black_bed");
     public static final ItemType BLACK_CARPET = register("minecraft:black_carpet");
     public static final ItemType BLACK_CONCRETE = register("minecraft:black_concrete");
     public static final ItemType BLACK_CONCRETE_POWDER = register("minecraft:black_concrete_powder");
     public static final ItemType BLACK_GLAZED_TERRACOTTA = register("minecraft:black_glazed_terracotta");
+    public static final ItemType BLACK_SHULKER_BOX = register("minecraft:black_shulker_box");
     public static final ItemType BLACK_STAINED_GLASS = register("minecraft:black_stained_glass");
     public static final ItemType BLACK_STAINED_GLASS_PANE = register("minecraft:black_stained_glass_pane");
     public static final ItemType BLACK_TERRACOTTA = register("minecraft:black_terracotta");
@@ -79,12 +84,14 @@ public final class ItemTypes {
     public static final ItemType BLAZE_ROD = register("minecraft:blaze_rod");
     public static final ItemType BLAZE_SPAWN_EGG = register("minecraft:blaze_spawn_egg");
     public static final ItemType BLUE_BANNER = register("minecraft:blue_banner");
+    public static final ItemType BLUE_BED = register("minecraft:blue_bed");
     public static final ItemType BLUE_CARPET = register("minecraft:blue_carpet");
     public static final ItemType BLUE_CONCRETE = register("minecraft:blue_concrete");
     public static final ItemType BLUE_CONCRETE_POWDER = register("minecraft:blue_concrete_powder");
     public static final ItemType BLUE_GLAZED_TERRACOTTA = register("minecraft:blue_glazed_terracotta");
     public static final ItemType BLUE_ICE = register("minecraft:blue_ice");
     public static final ItemType BLUE_ORCHID = register("minecraft:blue_orchid");
+    public static final ItemType BLUE_SHULKER_BOX = register("minecraft:blue_shulker_box");
     public static final ItemType BLUE_STAINED_GLASS = register("minecraft:blue_stained_glass");
     public static final ItemType BLUE_STAINED_GLASS_PANE = register("minecraft:blue_stained_glass_pane");
     public static final ItemType BLUE_TERRACOTTA = register("minecraft:blue_terracotta");
@@ -106,12 +113,14 @@ public final class ItemTypes {
     public static final ItemType BRICK_STAIRS = register("minecraft:brick_stairs");
     public static final ItemType BRICKS = register("minecraft:bricks");
     public static final ItemType BROWN_BANNER = register("minecraft:brown_banner");
+    public static final ItemType BROWN_BED = register("minecraft:brown_bed");
     public static final ItemType BROWN_CARPET = register("minecraft:brown_carpet");
     public static final ItemType BROWN_CONCRETE = register("minecraft:brown_concrete");
     public static final ItemType BROWN_CONCRETE_POWDER = register("minecraft:brown_concrete_powder");
     public static final ItemType BROWN_GLAZED_TERRACOTTA = register("minecraft:brown_glazed_terracotta");
     public static final ItemType BROWN_MUSHROOM = register("minecraft:brown_mushroom");
     public static final ItemType BROWN_MUSHROOM_BLOCK = register("minecraft:brown_mushroom_block");
+    public static final ItemType BROWN_SHULKER_BOX = register("minecraft:brown_shulker_box");
     public static final ItemType BROWN_STAINED_GLASS = register("minecraft:brown_stained_glass");
     public static final ItemType BROWN_STAINED_GLASS_PANE = register("minecraft:brown_stained_glass_pane");
     public static final ItemType BROWN_TERRACOTTA = register("minecraft:brown_terracotta");
@@ -122,11 +131,13 @@ public final class ItemTypes {
     public static final ItemType BUCKET = register("minecraft:bucket");
     public static final ItemType CACTUS = register("minecraft:cactus");
     public static final ItemType CACTUS_GREEN = register("minecraft:cactus_green");
+    public static final ItemType CAKE = register("minecraft:cake");
     public static final ItemType CARROT = register("minecraft:carrot");
     public static final ItemType CARROT_ON_A_STICK = register("minecraft:carrot_on_a_stick");
     public static final ItemType CARVED_PUMPKIN = register("minecraft:carved_pumpkin");
     public static final ItemType CAULDRON = register("minecraft:cauldron");
     public static final ItemType CAVE_SPIDER_SPAWN_EGG = register("minecraft:cave_spider_spawn_egg");
+    public static final ItemType CHAIN_COMMAND_BLOCK = register("minecraft:chain_command_block");
     public static final ItemType CHAINMAIL_BOOTS = register("minecraft:chainmail_boots");
     public static final ItemType CHAINMAIL_CHESTPLATE = register("minecraft:chainmail_chestplate");
     public static final ItemType CHAINMAIL_HELMET = register("minecraft:chainmail_helmet");
@@ -143,13 +154,10 @@ public final class ItemTypes {
     public static final ItemType CHISELED_STONE_BRICKS = register("minecraft:chiseled_stone_bricks");
     public static final ItemType CHORUS_FLOWER = register("minecraft:chorus_flower");
     public static final ItemType CHORUS_FRUIT = register("minecraft:chorus_fruit");
-    public static final ItemType CHORUS_FRUIT_POPPED = register("minecraft:chorus_fruit_popped");
     public static final ItemType CHORUS_PLANT = register("minecraft:chorus_plant");
     public static final ItemType CLAY = register("minecraft:clay");
     public static final ItemType CLAY_BALL = register("minecraft:clay_ball");
     public static final ItemType CLOCK = register("minecraft:clock");
-    public static final ItemType CLOWNFISH = register("minecraft:clownfish");
-    public static final ItemType CLOWNFISH_BUCKET = register("minecraft:clownfish_bucket");
     public static final ItemType COAL = register("minecraft:coal");
     public static final ItemType COAL_BLOCK = register("minecraft:coal_block");
     public static final ItemType COAL_ORE = register("minecraft:coal_ore");
@@ -163,9 +171,11 @@ public final class ItemTypes {
     public static final ItemType COD = register("minecraft:cod");
     public static final ItemType COD_BUCKET = register("minecraft:cod_bucket");
     public static final ItemType COD_SPAWN_EGG = register("minecraft:cod_spawn_egg");
+    public static final ItemType COMMAND_BLOCK = register("minecraft:command_block");
     public static final ItemType COMMAND_BLOCK_MINECART = register("minecraft:command_block_minecart");
     public static final ItemType COMPARATOR = register("minecraft:comparator");
     public static final ItemType COMPASS = register("minecraft:compass");
+    public static final ItemType CONDUIT = register("minecraft:conduit");
     public static final ItemType COOKED_BEEF = register("minecraft:cooked_beef");
     public static final ItemType COOKED_CHICKEN = register("minecraft:cooked_chicken");
     public static final ItemType COOKED_COD = register("minecraft:cooked_cod");
@@ -177,15 +187,18 @@ public final class ItemTypes {
     public static final ItemType COW_SPAWN_EGG = register("minecraft:cow_spawn_egg");
     public static final ItemType CRACKED_STONE_BRICKS = register("minecraft:cracked_stone_bricks");
     public static final ItemType CRAFTING_TABLE = register("minecraft:crafting_table");
+    public static final ItemType CREEPER_HEAD = register("minecraft:creeper_head");
     public static final ItemType CREEPER_SPAWN_EGG = register("minecraft:creeper_spawn_egg");
     public static final ItemType CUT_RED_SANDSTONE = register("minecraft:cut_red_sandstone");
     public static final ItemType CUT_SANDSTONE = register("minecraft:cut_sandstone");
     public static final ItemType CYAN_BANNER = register("minecraft:cyan_banner");
+    public static final ItemType CYAN_BED = register("minecraft:cyan_bed");
     public static final ItemType CYAN_CARPET = register("minecraft:cyan_carpet");
     public static final ItemType CYAN_CONCRETE = register("minecraft:cyan_concrete");
     public static final ItemType CYAN_CONCRETE_POWDER = register("minecraft:cyan_concrete_powder");
     public static final ItemType CYAN_DYE = register("minecraft:cyan_dye");
     public static final ItemType CYAN_GLAZED_TERRACOTTA = register("minecraft:cyan_glazed_terracotta");
+    public static final ItemType CYAN_SHULKER_BOX = register("minecraft:cyan_shulker_box");
     public static final ItemType CYAN_STAINED_GLASS = register("minecraft:cyan_stained_glass");
     public static final ItemType CYAN_STAINED_GLASS_PANE = register("minecraft:cyan_stained_glass_pane");
     public static final ItemType CYAN_TERRACOTTA = register("minecraft:cyan_terracotta");
@@ -193,9 +206,9 @@ public final class ItemTypes {
     public static final ItemType DAMAGED_ANVIL = register("minecraft:damaged_anvil");
     public static final ItemType DANDELION = register("minecraft:dandelion");
     public static final ItemType DANDELION_YELLOW = register("minecraft:dandelion_yellow");
-    public static final ItemType DARK_OAK_BARK = register("minecraft:dark_oak_bark");
     public static final ItemType DARK_OAK_BOAT = register("minecraft:dark_oak_boat");
     public static final ItemType DARK_OAK_BUTTON = register("minecraft:dark_oak_button");
+    public static final ItemType DARK_OAK_DOOR = register("minecraft:dark_oak_door");
     public static final ItemType DARK_OAK_FENCE = register("minecraft:dark_oak_fence");
     public static final ItemType DARK_OAK_FENCE_GATE = register("minecraft:dark_oak_fence_gate");
     public static final ItemType DARK_OAK_LEAVES = register("minecraft:dark_oak_leaves");
@@ -206,16 +219,22 @@ public final class ItemTypes {
     public static final ItemType DARK_OAK_SLAB = register("minecraft:dark_oak_slab");
     public static final ItemType DARK_OAK_STAIRS = register("minecraft:dark_oak_stairs");
     public static final ItemType DARK_OAK_TRAPDOOR = register("minecraft:dark_oak_trapdoor");
+    public static final ItemType DARK_OAK_WOOD = register("minecraft:dark_oak_wood");
     public static final ItemType DARK_PRISMARINE = register("minecraft:dark_prismarine");
     public static final ItemType DARK_PRISMARINE_SLAB = register("minecraft:dark_prismarine_slab");
     public static final ItemType DARK_PRISMARINE_STAIRS = register("minecraft:dark_prismarine_stairs");
     public static final ItemType DAYLIGHT_DETECTOR = register("minecraft:daylight_detector");
     public static final ItemType DEAD_BRAIN_CORAL_BLOCK = register("minecraft:dead_brain_coral_block");
+    public static final ItemType DEAD_BRAIN_CORAL_FAN = register("minecraft:dead_brain_coral_fan");
     public static final ItemType DEAD_BUBBLE_CORAL_BLOCK = register("minecraft:dead_bubble_coral_block");
+    public static final ItemType DEAD_BUBBLE_CORAL_FAN = register("minecraft:dead_bubble_coral_fan");
     public static final ItemType DEAD_BUSH = register("minecraft:dead_bush");
     public static final ItemType DEAD_FIRE_CORAL_BLOCK = register("minecraft:dead_fire_coral_block");
+    public static final ItemType DEAD_FIRE_CORAL_FAN = register("minecraft:dead_fire_coral_fan");
     public static final ItemType DEAD_HORN_CORAL_BLOCK = register("minecraft:dead_horn_coral_block");
+    public static final ItemType DEAD_HORN_CORAL_FAN = register("minecraft:dead_horn_coral_fan");
     public static final ItemType DEAD_TUBE_CORAL_BLOCK = register("minecraft:dead_tube_coral_block");
+    public static final ItemType DEAD_TUBE_CORAL_FAN = register("minecraft:dead_tube_coral_fan");
     public static final ItemType DEBUG_STICK = register("minecraft:debug_stick");
     public static final ItemType DETECTOR_RAIL = register("minecraft:detector_rail");
     public static final ItemType DIAMOND = register("minecraft:diamond");
@@ -237,6 +256,8 @@ public final class ItemTypes {
     public static final ItemType DOLPHIN_SPAWN_EGG = register("minecraft:dolphin_spawn_egg");
     public static final ItemType DONKEY_SPAWN_EGG = register("minecraft:donkey_spawn_egg");
     public static final ItemType DRAGON_BREATH = register("minecraft:dragon_breath");
+    public static final ItemType DRAGON_EGG = register("minecraft:dragon_egg");
+    public static final ItemType DRAGON_HEAD = register("minecraft:dragon_head");
     public static final ItemType DRIED_KELP = register("minecraft:dried_kelp");
     public static final ItemType DRIED_KELP_BLOCK = register("minecraft:dried_kelp_block");
     public static final ItemType DROPPER = register("minecraft:dropper");
@@ -260,7 +281,7 @@ public final class ItemTypes {
     public static final ItemType ENDER_PEARL = register("minecraft:ender_pearl");
     public static final ItemType ENDERMAN_SPAWN_EGG = register("minecraft:enderman_spawn_egg");
     public static final ItemType ENDERMITE_SPAWN_EGG = register("minecraft:endermite_spawn_egg");
-    public static final ItemType EVOCATION_ILLAGER_SPAWN_EGG = register("minecraft:evocation_illager_spawn_egg");
+    public static final ItemType EVOKER_SPAWN_EGG = register("minecraft:evoker_spawn_egg");
     public static final ItemType EXPERIENCE_BOTTLE = register("minecraft:experience_bottle");
     public static final ItemType FARMLAND = register("minecraft:farmland");
     public static final ItemType FEATHER = register("minecraft:feather");
@@ -309,20 +330,24 @@ public final class ItemTypes {
     public static final ItemType GRASS_PATH = register("minecraft:grass_path");
     public static final ItemType GRAVEL = register("minecraft:gravel");
     public static final ItemType GRAY_BANNER = register("minecraft:gray_banner");
+    public static final ItemType GRAY_BED = register("minecraft:gray_bed");
     public static final ItemType GRAY_CARPET = register("minecraft:gray_carpet");
     public static final ItemType GRAY_CONCRETE = register("minecraft:gray_concrete");
     public static final ItemType GRAY_CONCRETE_POWDER = register("minecraft:gray_concrete_powder");
     public static final ItemType GRAY_DYE = register("minecraft:gray_dye");
     public static final ItemType GRAY_GLAZED_TERRACOTTA = register("minecraft:gray_glazed_terracotta");
+    public static final ItemType GRAY_SHULKER_BOX = register("minecraft:gray_shulker_box");
     public static final ItemType GRAY_STAINED_GLASS = register("minecraft:gray_stained_glass");
     public static final ItemType GRAY_STAINED_GLASS_PANE = register("minecraft:gray_stained_glass_pane");
     public static final ItemType GRAY_TERRACOTTA = register("minecraft:gray_terracotta");
     public static final ItemType GRAY_WOOL = register("minecraft:gray_wool");
     public static final ItemType GREEN_BANNER = register("minecraft:green_banner");
+    public static final ItemType GREEN_BED = register("minecraft:green_bed");
     public static final ItemType GREEN_CARPET = register("minecraft:green_carpet");
     public static final ItemType GREEN_CONCRETE = register("minecraft:green_concrete");
     public static final ItemType GREEN_CONCRETE_POWDER = register("minecraft:green_concrete_powder");
     public static final ItemType GREEN_GLAZED_TERRACOTTA = register("minecraft:green_glazed_terracotta");
+    public static final ItemType GREEN_SHULKER_BOX = register("minecraft:green_shulker_box");
     public static final ItemType GREEN_STAINED_GLASS = register("minecraft:green_stained_glass");
     public static final ItemType GREEN_STAINED_GLASS_PANE = register("minecraft:green_stained_glass_pane");
     public static final ItemType GREEN_TERRACOTTA = register("minecraft:green_terracotta");
@@ -352,6 +377,7 @@ public final class ItemTypes {
     public static final ItemType IRON_BLOCK = register("minecraft:iron_block");
     public static final ItemType IRON_BOOTS = register("minecraft:iron_boots");
     public static final ItemType IRON_CHESTPLATE = register("minecraft:iron_chestplate");
+    public static final ItemType IRON_DOOR = register("minecraft:iron_door");
     public static final ItemType IRON_HELMET = register("minecraft:iron_helmet");
     public static final ItemType IRON_HOE = register("minecraft:iron_hoe");
     public static final ItemType IRON_HORSE_ARMOR = register("minecraft:iron_horse_armor");
@@ -366,9 +392,9 @@ public final class ItemTypes {
     public static final ItemType ITEM_FRAME = register("minecraft:item_frame");
     public static final ItemType JACK_O_LANTERN = register("minecraft:jack_o_lantern");
     public static final ItemType JUKEBOX = register("minecraft:jukebox");
-    public static final ItemType JUNGLE_BARK = register("minecraft:jungle_bark");
     public static final ItemType JUNGLE_BOAT = register("minecraft:jungle_boat");
     public static final ItemType JUNGLE_BUTTON = register("minecraft:jungle_button");
+    public static final ItemType JUNGLE_DOOR = register("minecraft:jungle_door");
     public static final ItemType JUNGLE_FENCE = register("minecraft:jungle_fence");
     public static final ItemType JUNGLE_FENCE_GATE = register("minecraft:jungle_fence_gate");
     public static final ItemType JUNGLE_LEAVES = register("minecraft:jungle_leaves");
@@ -379,12 +405,14 @@ public final class ItemTypes {
     public static final ItemType JUNGLE_SLAB = register("minecraft:jungle_slab");
     public static final ItemType JUNGLE_STAIRS = register("minecraft:jungle_stairs");
     public static final ItemType JUNGLE_TRAPDOOR = register("minecraft:jungle_trapdoor");
+    public static final ItemType JUNGLE_WOOD = register("minecraft:jungle_wood");
     public static final ItemType KELP = register("minecraft:kelp");
     public static final ItemType KNOWLEDGE_BOOK = register("minecraft:knowledge_book");
     public static final ItemType LADDER = register("minecraft:ladder");
     public static final ItemType LAPIS_BLOCK = register("minecraft:lapis_block");
     public static final ItemType LAPIS_LAZULI = register("minecraft:lapis_lazuli");
     public static final ItemType LAPIS_ORE = register("minecraft:lapis_ore");
+    public static final ItemType LARGE_FERN = register("minecraft:large_fern");
     public static final ItemType LAVA_BUCKET = register("minecraft:lava_bucket");
     public static final ItemType LEAD = register("minecraft:lead");
     public static final ItemType LEATHER = register("minecraft:leather");
@@ -394,32 +422,40 @@ public final class ItemTypes {
     public static final ItemType LEATHER_LEGGINGS = register("minecraft:leather_leggings");
     public static final ItemType LEVER = register("minecraft:lever");
     public static final ItemType LIGHT_BLUE_BANNER = register("minecraft:light_blue_banner");
+    public static final ItemType LIGHT_BLUE_BED = register("minecraft:light_blue_bed");
     public static final ItemType LIGHT_BLUE_CARPET = register("minecraft:light_blue_carpet");
     public static final ItemType LIGHT_BLUE_CONCRETE = register("minecraft:light_blue_concrete");
     public static final ItemType LIGHT_BLUE_CONCRETE_POWDER = register("minecraft:light_blue_concrete_powder");
     public static final ItemType LIGHT_BLUE_DYE = register("minecraft:light_blue_dye");
     public static final ItemType LIGHT_BLUE_GLAZED_TERRACOTTA = register("minecraft:light_blue_glazed_terracotta");
+    public static final ItemType LIGHT_BLUE_SHULKER_BOX = register("minecraft:light_blue_shulker_box");
     public static final ItemType LIGHT_BLUE_STAINED_GLASS = register("minecraft:light_blue_stained_glass");
     public static final ItemType LIGHT_BLUE_STAINED_GLASS_PANE = register("minecraft:light_blue_stained_glass_pane");
     public static final ItemType LIGHT_BLUE_TERRACOTTA = register("minecraft:light_blue_terracotta");
     public static final ItemType LIGHT_BLUE_WOOL = register("minecraft:light_blue_wool");
     public static final ItemType LIGHT_GRAY_BANNER = register("minecraft:light_gray_banner");
+    public static final ItemType LIGHT_GRAY_BED = register("minecraft:light_gray_bed");
     public static final ItemType LIGHT_GRAY_CARPET = register("minecraft:light_gray_carpet");
     public static final ItemType LIGHT_GRAY_CONCRETE = register("minecraft:light_gray_concrete");
     public static final ItemType LIGHT_GRAY_CONCRETE_POWDER = register("minecraft:light_gray_concrete_powder");
     public static final ItemType LIGHT_GRAY_DYE = register("minecraft:light_gray_dye");
     public static final ItemType LIGHT_GRAY_GLAZED_TERRACOTTA = register("minecraft:light_gray_glazed_terracotta");
+    public static final ItemType LIGHT_GRAY_SHULKER_BOX = register("minecraft:light_gray_shulker_box");
     public static final ItemType LIGHT_GRAY_STAINED_GLASS = register("minecraft:light_gray_stained_glass");
     public static final ItemType LIGHT_GRAY_STAINED_GLASS_PANE = register("minecraft:light_gray_stained_glass_pane");
     public static final ItemType LIGHT_GRAY_TERRACOTTA = register("minecraft:light_gray_terracotta");
     public static final ItemType LIGHT_GRAY_WOOL = register("minecraft:light_gray_wool");
     public static final ItemType LIGHT_WEIGHTED_PRESSURE_PLATE = register("minecraft:light_weighted_pressure_plate");
+    public static final ItemType LILAC = register("minecraft:lilac");
+    public static final ItemType LILY_PAD = register("minecraft:lily_pad");
     public static final ItemType LIME_BANNER = register("minecraft:lime_banner");
+    public static final ItemType LIME_BED = register("minecraft:lime_bed");
     public static final ItemType LIME_CARPET = register("minecraft:lime_carpet");
     public static final ItemType LIME_CONCRETE = register("minecraft:lime_concrete");
     public static final ItemType LIME_CONCRETE_POWDER = register("minecraft:lime_concrete_powder");
     public static final ItemType LIME_DYE = register("minecraft:lime_dye");
     public static final ItemType LIME_GLAZED_TERRACOTTA = register("minecraft:lime_glazed_terracotta");
+    public static final ItemType LIME_SHULKER_BOX = register("minecraft:lime_shulker_box");
     public static final ItemType LIME_STAINED_GLASS = register("minecraft:lime_stained_glass");
     public static final ItemType LIME_STAINED_GLASS_PANE = register("minecraft:lime_stained_glass_pane");
     public static final ItemType LIME_TERRACOTTA = register("minecraft:lime_terracotta");
@@ -427,11 +463,13 @@ public final class ItemTypes {
     public static final ItemType LINGERING_POTION = register("minecraft:lingering_potion");
     public static final ItemType LLAMA_SPAWN_EGG = register("minecraft:llama_spawn_egg");
     public static final ItemType MAGENTA_BANNER = register("minecraft:magenta_banner");
+    public static final ItemType MAGENTA_BED = register("minecraft:magenta_bed");
     public static final ItemType MAGENTA_CARPET = register("minecraft:magenta_carpet");
     public static final ItemType MAGENTA_CONCRETE = register("minecraft:magenta_concrete");
     public static final ItemType MAGENTA_CONCRETE_POWDER = register("minecraft:magenta_concrete_powder");
     public static final ItemType MAGENTA_DYE = register("minecraft:magenta_dye");
     public static final ItemType MAGENTA_GLAZED_TERRACOTTA = register("minecraft:magenta_glazed_terracotta");
+    public static final ItemType MAGENTA_SHULKER_BOX = register("minecraft:magenta_shulker_box");
     public static final ItemType MAGENTA_STAINED_GLASS = register("minecraft:magenta_stained_glass");
     public static final ItemType MAGENTA_STAINED_GLASS_PANE = register("minecraft:magenta_stained_glass_pane");
     public static final ItemType MAGENTA_TERRACOTTA = register("minecraft:magenta_terracotta");
@@ -445,7 +483,6 @@ public final class ItemTypes {
     public static final ItemType MELON_SLICE = register("minecraft:melon_slice");
     public static final ItemType MILK_BUCKET = register("minecraft:milk_bucket");
     public static final ItemType MINECART = register("minecraft:minecart");
-    public static final ItemType MOB_SPAWNER = register("minecraft:mob_spawner");
     public static final ItemType MOOSHROOM_SPAWN_EGG = register("minecraft:mooshroom_spawn_egg");
     public static final ItemType MOSSY_COBBLESTONE = register("minecraft:mossy_cobblestone");
     public static final ItemType MOSSY_COBBLESTONE_WALL = register("minecraft:mossy_cobblestone_wall");
@@ -480,9 +517,9 @@ public final class ItemTypes {
     public static final ItemType NETHER_WART_BLOCK = register("minecraft:nether_wart_block");
     public static final ItemType NETHERRACK = register("minecraft:netherrack");
     public static final ItemType NOTE_BLOCK = register("minecraft:note_block");
-    public static final ItemType OAK_BARK = register("minecraft:oak_bark");
     public static final ItemType OAK_BOAT = register("minecraft:oak_boat");
     public static final ItemType OAK_BUTTON = register("minecraft:oak_button");
+    public static final ItemType OAK_DOOR = register("minecraft:oak_door");
     public static final ItemType OAK_FENCE = register("minecraft:oak_fence");
     public static final ItemType OAK_FENCE_GATE = register("minecraft:oak_fence_gate");
     public static final ItemType OAK_LEAVES = register("minecraft:oak_leaves");
@@ -493,15 +530,18 @@ public final class ItemTypes {
     public static final ItemType OAK_SLAB = register("minecraft:oak_slab");
     public static final ItemType OAK_STAIRS = register("minecraft:oak_stairs");
     public static final ItemType OAK_TRAPDOOR = register("minecraft:oak_trapdoor");
+    public static final ItemType OAK_WOOD = register("minecraft:oak_wood");
     public static final ItemType OBSERVER = register("minecraft:observer");
     public static final ItemType OBSIDIAN = register("minecraft:obsidian");
     public static final ItemType OCELOT_SPAWN_EGG = register("minecraft:ocelot_spawn_egg");
     public static final ItemType ORANGE_BANNER = register("minecraft:orange_banner");
+    public static final ItemType ORANGE_BED = register("minecraft:orange_bed");
     public static final ItemType ORANGE_CARPET = register("minecraft:orange_carpet");
     public static final ItemType ORANGE_CONCRETE = register("minecraft:orange_concrete");
     public static final ItemType ORANGE_CONCRETE_POWDER = register("minecraft:orange_concrete_powder");
     public static final ItemType ORANGE_DYE = register("minecraft:orange_dye");
     public static final ItemType ORANGE_GLAZED_TERRACOTTA = register("minecraft:orange_glazed_terracotta");
+    public static final ItemType ORANGE_SHULKER_BOX = register("minecraft:orange_shulker_box");
     public static final ItemType ORANGE_STAINED_GLASS = register("minecraft:orange_stained_glass");
     public static final ItemType ORANGE_STAINED_GLASS_PANE = register("minecraft:orange_stained_glass_pane");
     public static final ItemType ORANGE_TERRACOTTA = register("minecraft:orange_terracotta");
@@ -512,28 +552,33 @@ public final class ItemTypes {
     public static final ItemType PAINTING = register("minecraft:painting");
     public static final ItemType PAPER = register("minecraft:paper");
     public static final ItemType PARROT_SPAWN_EGG = register("minecraft:parrot_spawn_egg");
+    public static final ItemType PEONY = register("minecraft:peony");
     public static final ItemType PETRIFIED_OAK_SLAB = register("minecraft:petrified_oak_slab");
     public static final ItemType PHANTOM_MEMBRANE = register("minecraft:phantom_membrane");
     public static final ItemType PHANTOM_SPAWN_EGG = register("minecraft:phantom_spawn_egg");
     public static final ItemType PIG_SPAWN_EGG = register("minecraft:pig_spawn_egg");
     public static final ItemType PINK_BANNER = register("minecraft:pink_banner");
+    public static final ItemType PINK_BED = register("minecraft:pink_bed");
     public static final ItemType PINK_CARPET = register("minecraft:pink_carpet");
     public static final ItemType PINK_CONCRETE = register("minecraft:pink_concrete");
     public static final ItemType PINK_CONCRETE_POWDER = register("minecraft:pink_concrete_powder");
     public static final ItemType PINK_DYE = register("minecraft:pink_dye");
     public static final ItemType PINK_GLAZED_TERRACOTTA = register("minecraft:pink_glazed_terracotta");
+    public static final ItemType PINK_SHULKER_BOX = register("minecraft:pink_shulker_box");
     public static final ItemType PINK_STAINED_GLASS = register("minecraft:pink_stained_glass");
     public static final ItemType PINK_STAINED_GLASS_PANE = register("minecraft:pink_stained_glass_pane");
     public static final ItemType PINK_TERRACOTTA = register("minecraft:pink_terracotta");
     public static final ItemType PINK_TULIP = register("minecraft:pink_tulip");
     public static final ItemType PINK_WOOL = register("minecraft:pink_wool");
     public static final ItemType PISTON = register("minecraft:piston");
+    public static final ItemType PLAYER_HEAD = register("minecraft:player_head");
     public static final ItemType PODZOL = register("minecraft:podzol");
     public static final ItemType POISONOUS_POTATO = register("minecraft:poisonous_potato");
     public static final ItemType POLAR_BEAR_SPAWN_EGG = register("minecraft:polar_bear_spawn_egg");
     public static final ItemType POLISHED_ANDESITE = register("minecraft:polished_andesite");
     public static final ItemType POLISHED_DIORITE = register("minecraft:polished_diorite");
     public static final ItemType POLISHED_GRANITE = register("minecraft:polished_granite");
+    public static final ItemType POPPED_CHORUS_FRUIT = register("minecraft:popped_chorus_fruit");
     public static final ItemType POPPY = register("minecraft:poppy");
     public static final ItemType PORKCHOP = register("minecraft:porkchop");
     public static final ItemType POTATO = register("minecraft:potato");
@@ -554,11 +599,13 @@ public final class ItemTypes {
     public static final ItemType PUMPKIN_PIE = register("minecraft:pumpkin_pie");
     public static final ItemType PUMPKIN_SEEDS = register("minecraft:pumpkin_seeds");
     public static final ItemType PURPLE_BANNER = register("minecraft:purple_banner");
+    public static final ItemType PURPLE_BED = register("minecraft:purple_bed");
     public static final ItemType PURPLE_CARPET = register("minecraft:purple_carpet");
     public static final ItemType PURPLE_CONCRETE = register("minecraft:purple_concrete");
     public static final ItemType PURPLE_CONCRETE_POWDER = register("minecraft:purple_concrete_powder");
     public static final ItemType PURPLE_DYE = register("minecraft:purple_dye");
     public static final ItemType PURPLE_GLAZED_TERRACOTTA = register("minecraft:purple_glazed_terracotta");
+    public static final ItemType PURPLE_SHULKER_BOX = register("minecraft:purple_shulker_box");
     public static final ItemType PURPLE_STAINED_GLASS = register("minecraft:purple_stained_glass");
     public static final ItemType PURPLE_STAINED_GLASS_PANE = register("minecraft:purple_stained_glass_pane");
     public static final ItemType PURPLE_TERRACOTTA = register("minecraft:purple_terracotta");
@@ -579,6 +626,7 @@ public final class ItemTypes {
     public static final ItemType RABBIT_STEW = register("minecraft:rabbit_stew");
     public static final ItemType RAIL = register("minecraft:rail");
     public static final ItemType RED_BANNER = register("minecraft:red_banner");
+    public static final ItemType RED_BED = register("minecraft:red_bed");
     public static final ItemType RED_CARPET = register("minecraft:red_carpet");
     public static final ItemType RED_CONCRETE = register("minecraft:red_concrete");
     public static final ItemType RED_CONCRETE_POWDER = register("minecraft:red_concrete_powder");
@@ -590,6 +638,7 @@ public final class ItemTypes {
     public static final ItemType RED_SANDSTONE = register("minecraft:red_sandstone");
     public static final ItemType RED_SANDSTONE_SLAB = register("minecraft:red_sandstone_slab");
     public static final ItemType RED_SANDSTONE_STAIRS = register("minecraft:red_sandstone_stairs");
+    public static final ItemType RED_SHULKER_BOX = register("minecraft:red_shulker_box");
     public static final ItemType RED_STAINED_GLASS = register("minecraft:red_stained_glass");
     public static final ItemType RED_STAINED_GLASS_PANE = register("minecraft:red_stained_glass_pane");
     public static final ItemType RED_TERRACOTTA = register("minecraft:red_terracotta");
@@ -599,7 +648,10 @@ public final class ItemTypes {
     public static final ItemType REDSTONE_BLOCK = register("minecraft:redstone_block");
     public static final ItemType REDSTONE_LAMP = register("minecraft:redstone_lamp");
     public static final ItemType REDSTONE_ORE = register("minecraft:redstone_ore");
+    public static final ItemType REDSTONE_TORCH = register("minecraft:redstone_torch");
     public static final ItemType REPEATER = register("minecraft:repeater");
+    public static final ItemType REPEATING_COMMAND_BLOCK = register("minecraft:repeating_command_block");
+    public static final ItemType ROSE_BUSH = register("minecraft:rose_bush");
     public static final ItemType ROSE_RED = register("minecraft:rose_red");
     public static final ItemType ROTTEN_FLESH = register("minecraft:rotten_flesh");
     public static final ItemType SADDLE = register("minecraft:saddle");
@@ -617,11 +669,13 @@ public final class ItemTypes {
     public static final ItemType SHEARS = register("minecraft:shears");
     public static final ItemType SHEEP_SPAWN_EGG = register("minecraft:sheep_spawn_egg");
     public static final ItemType SHIELD = register("minecraft:shield");
+    public static final ItemType SHULKER_BOX = register("minecraft:shulker_box");
     public static final ItemType SHULKER_SHELL = register("minecraft:shulker_shell");
     public static final ItemType SHULKER_SPAWN_EGG = register("minecraft:shulker_spawn_egg");
     public static final ItemType SIGN = register("minecraft:sign");
     public static final ItemType SILVERFISH_SPAWN_EGG = register("minecraft:silverfish_spawn_egg");
     public static final ItemType SKELETON_HORSE_SPAWN_EGG = register("minecraft:skeleton_horse_spawn_egg");
+    public static final ItemType SKELETON_SKULL = register("minecraft:skeleton_skull");
     public static final ItemType SKELETON_SPAWN_EGG = register("minecraft:skeleton_spawn_egg");
     public static final ItemType SLIME_BALL = register("minecraft:slime_ball");
     public static final ItemType SLIME_BLOCK = register("minecraft:slime_block");
@@ -634,14 +688,15 @@ public final class ItemTypes {
     public static final ItemType SNOW_BLOCK = register("minecraft:snow_block");
     public static final ItemType SNOWBALL = register("minecraft:snowball");
     public static final ItemType SOUL_SAND = register("minecraft:soul_sand");
+    public static final ItemType SPAWNER = register("minecraft:spawner");
     public static final ItemType SPECTRAL_ARROW = register("minecraft:spectral_arrow");
     public static final ItemType SPIDER_EYE = register("minecraft:spider_eye");
     public static final ItemType SPIDER_SPAWN_EGG = register("minecraft:spider_spawn_egg");
     public static final ItemType SPLASH_POTION = register("minecraft:splash_potion");
     public static final ItemType SPONGE = register("minecraft:sponge");
-    public static final ItemType SPRUCE_BARK = register("minecraft:spruce_bark");
     public static final ItemType SPRUCE_BOAT = register("minecraft:spruce_boat");
     public static final ItemType SPRUCE_BUTTON = register("minecraft:spruce_button");
+    public static final ItemType SPRUCE_DOOR = register("minecraft:spruce_door");
     public static final ItemType SPRUCE_FENCE = register("minecraft:spruce_fence");
     public static final ItemType SPRUCE_FENCE_GATE = register("minecraft:spruce_fence_gate");
     public static final ItemType SPRUCE_LEAVES = register("minecraft:spruce_leaves");
@@ -652,6 +707,7 @@ public final class ItemTypes {
     public static final ItemType SPRUCE_SLAB = register("minecraft:spruce_slab");
     public static final ItemType SPRUCE_STAIRS = register("minecraft:spruce_stairs");
     public static final ItemType SPRUCE_TRAPDOOR = register("minecraft:spruce_trapdoor");
+    public static final ItemType SPRUCE_WOOD = register("minecraft:spruce_wood");
     public static final ItemType SQUID_SPAWN_EGG = register("minecraft:squid_spawn_egg");
     public static final ItemType STICK = register("minecraft:stick");
     public static final ItemType STICKY_PISTON = register("minecraft:sticky_piston");
@@ -670,22 +726,34 @@ public final class ItemTypes {
     public static final ItemType STRAY_SPAWN_EGG = register("minecraft:stray_spawn_egg");
     public static final ItemType STRING = register("minecraft:string");
     public static final ItemType STRIPPED_ACACIA_LOG = register("minecraft:stripped_acacia_log");
+    public static final ItemType STRIPPED_ACACIA_WOOD = register("minecraft:stripped_acacia_wood");
     public static final ItemType STRIPPED_BIRCH_LOG = register("minecraft:stripped_birch_log");
+    public static final ItemType STRIPPED_BIRCH_WOOD = register("minecraft:stripped_birch_wood");
     public static final ItemType STRIPPED_DARK_OAK_LOG = register("minecraft:stripped_dark_oak_log");
+    public static final ItemType STRIPPED_DARK_OAK_WOOD = register("minecraft:stripped_dark_oak_wood");
     public static final ItemType STRIPPED_JUNGLE_LOG = register("minecraft:stripped_jungle_log");
+    public static final ItemType STRIPPED_JUNGLE_WOOD = register("minecraft:stripped_jungle_wood");
     public static final ItemType STRIPPED_OAK_LOG = register("minecraft:stripped_oak_log");
+    public static final ItemType STRIPPED_OAK_WOOD = register("minecraft:stripped_oak_wood");
     public static final ItemType STRIPPED_SPRUCE_LOG = register("minecraft:stripped_spruce_log");
+    public static final ItemType STRIPPED_SPRUCE_WOOD = register("minecraft:stripped_spruce_wood");
+    public static final ItemType STRUCTURE_BLOCK = register("minecraft:structure_block");
     public static final ItemType STRUCTURE_VOID = register("minecraft:structure_void");
     public static final ItemType SUGAR = register("minecraft:sugar");
     public static final ItemType SUGAR_CANE = register("minecraft:sugar_cane");
+    public static final ItemType SUNFLOWER = register("minecraft:sunflower");
+    public static final ItemType TALL_GRASS = register("minecraft:tall_grass");
     public static final ItemType TERRACOTTA = register("minecraft:terracotta");
     public static final ItemType TIPPED_ARROW = register("minecraft:tipped_arrow");
     public static final ItemType TNT = register("minecraft:tnt");
     public static final ItemType TNT_MINECART = register("minecraft:tnt_minecart");
+    public static final ItemType TORCH = register("minecraft:torch");
     public static final ItemType TOTEM_OF_UNDYING = register("minecraft:totem_of_undying");
     public static final ItemType TRAPPED_CHEST = register("minecraft:trapped_chest");
     public static final ItemType TRIDENT = register("minecraft:trident");
     public static final ItemType TRIPWIRE_HOOK = register("minecraft:tripwire_hook");
+    public static final ItemType TROPICAL_FISH = register("minecraft:tropical_fish");
+    public static final ItemType TROPICAL_FISH_BUCKET = register("minecraft:tropical_fish_bucket");
     public static final ItemType TROPICAL_FISH_SPAWN_EGG = register("minecraft:tropical_fish_spawn_egg");
     public static final ItemType TUBE_CORAL = register("minecraft:tube_coral");
     public static final ItemType TUBE_CORAL_BLOCK = register("minecraft:tube_coral_block");
@@ -695,23 +763,26 @@ public final class ItemTypes {
     public static final ItemType TURTLE_SPAWN_EGG = register("minecraft:turtle_spawn_egg");
     public static final ItemType VEX_SPAWN_EGG = register("minecraft:vex_spawn_egg");
     public static final ItemType VILLAGER_SPAWN_EGG = register("minecraft:villager_spawn_egg");
-    public static final ItemType VINDICATION_ILLAGER_SPAWN_EGG = register("minecraft:vindication_illager_spawn_egg");
+    public static final ItemType VINDICATOR_SPAWN_EGG = register("minecraft:vindicator_spawn_egg");
     public static final ItemType VINE = register("minecraft:vine");
     public static final ItemType WATER_BUCKET = register("minecraft:water_bucket");
     public static final ItemType WET_SPONGE = register("minecraft:wet_sponge");
     public static final ItemType WHEAT = register("minecraft:wheat");
     public static final ItemType WHEAT_SEEDS = register("minecraft:wheat_seeds");
     public static final ItemType WHITE_BANNER = register("minecraft:white_banner");
+    public static final ItemType WHITE_BED = register("minecraft:white_bed");
     public static final ItemType WHITE_CARPET = register("minecraft:white_carpet");
     public static final ItemType WHITE_CONCRETE = register("minecraft:white_concrete");
     public static final ItemType WHITE_CONCRETE_POWDER = register("minecraft:white_concrete_powder");
     public static final ItemType WHITE_GLAZED_TERRACOTTA = register("minecraft:white_glazed_terracotta");
+    public static final ItemType WHITE_SHULKER_BOX = register("minecraft:white_shulker_box");
     public static final ItemType WHITE_STAINED_GLASS = register("minecraft:white_stained_glass");
     public static final ItemType WHITE_STAINED_GLASS_PANE = register("minecraft:white_stained_glass_pane");
     public static final ItemType WHITE_TERRACOTTA = register("minecraft:white_terracotta");
     public static final ItemType WHITE_TULIP = register("minecraft:white_tulip");
     public static final ItemType WHITE_WOOL = register("minecraft:white_wool");
     public static final ItemType WITCH_SPAWN_EGG = register("minecraft:witch_spawn_egg");
+    public static final ItemType WITHER_SKELETON_SKULL = register("minecraft:wither_skeleton_skull");
     public static final ItemType WITHER_SKELETON_SPAWN_EGG = register("minecraft:wither_skeleton_spawn_egg");
     public static final ItemType WOLF_SPAWN_EGG = register("minecraft:wolf_spawn_egg");
     public static final ItemType WOODEN_AXE = register("minecraft:wooden_axe");
@@ -722,14 +793,17 @@ public final class ItemTypes {
     public static final ItemType WRITABLE_BOOK = register("minecraft:writable_book");
     public static final ItemType WRITTEN_BOOK = register("minecraft:written_book");
     public static final ItemType YELLOW_BANNER = register("minecraft:yellow_banner");
+    public static final ItemType YELLOW_BED = register("minecraft:yellow_bed");
     public static final ItemType YELLOW_CARPET = register("minecraft:yellow_carpet");
     public static final ItemType YELLOW_CONCRETE = register("minecraft:yellow_concrete");
     public static final ItemType YELLOW_CONCRETE_POWDER = register("minecraft:yellow_concrete_powder");
     public static final ItemType YELLOW_GLAZED_TERRACOTTA = register("minecraft:yellow_glazed_terracotta");
+    public static final ItemType YELLOW_SHULKER_BOX = register("minecraft:yellow_shulker_box");
     public static final ItemType YELLOW_STAINED_GLASS = register("minecraft:yellow_stained_glass");
     public static final ItemType YELLOW_STAINED_GLASS_PANE = register("minecraft:yellow_stained_glass_pane");
     public static final ItemType YELLOW_TERRACOTTA = register("minecraft:yellow_terracotta");
     public static final ItemType YELLOW_WOOL = register("minecraft:yellow_wool");
+    public static final ItemType ZOMBIE_HEAD = register("minecraft:zombie_head");
     public static final ItemType ZOMBIE_HORSE_SPAWN_EGG = register("minecraft:zombie_horse_spawn_egg");
     public static final ItemType ZOMBIE_PIGMAN_SPAWN_EGG = register("minecraft:zombie_pigman_spawn_egg");
     public static final ItemType ZOMBIE_SPAWN_EGG = register("minecraft:zombie_spawn_egg");

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java

@@ -31,15 +31,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
         this.blockMaterial = material;
     }
 
-    @Override
-    public boolean isRenderedAsNormalBlock() {
-        if (blockMaterial == null) {
-            return true;
-        } else {
-            return blockMaterial.isRenderedAsNormalBlock();
-        }
-    }
-
     @Override
     public boolean isFullCube() {
         if (blockMaterial == null) {
@@ -112,33 +103,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
         }
     }
 
-    @Override
-    public boolean isGrassBlocking() {
-        if (blockMaterial == null) {
-            return true;
-        } else {
-            return blockMaterial.isGrassBlocking();
-        }
-    }
-
-    @Override
-    public float getAmbientOcclusionLightValue() {
-        if (blockMaterial == null) {
-            return 0;
-        } else {
-            return blockMaterial.getAmbientOcclusionLightValue();
-        }
-    }
-
-    @Override
-    public int getLightOpacity() {
-        if (blockMaterial == null) {
-            return 0;
-        } else {
-            return blockMaterial.getLightOpacity();
-        }
-    }
-
     @Override
     public int getLightValue() {
         if (blockMaterial == null) {
@@ -166,15 +130,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
         }
     }
 
-    @Override
-    public boolean isAdventureModeExempt() {
-        if (blockMaterial == null) {
-            return false;
-        } else {
-            return blockMaterial.isAdventureModeExempt();
-        }
-    }
-
     @Override
     public boolean isTicksRandomly() {
         if (blockMaterial == null) {
@@ -184,15 +139,6 @@ public class PassthroughBlockMaterial implements BlockMaterial {
         }
     }
 
-    @Override
-    public boolean isUsingNeighborLight() {
-        if (blockMaterial == null) {
-            return false;
-        } else {
-            return blockMaterial.isUsingNeighborLight();
-        }
-    }
-
     @Override
     public boolean isMovementBlocker() {
         if (blockMaterial == null) {

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/SimpleBlockMaterial.java

@@ -23,7 +23,6 @@ import com.sk89q.worldedit.blocks.BlockMaterial;
 
 class SimpleBlockMaterial implements BlockMaterial {
 
-    private boolean renderedAsNormalBlock;
     private boolean fullCube;
     private boolean opaque;
     private boolean powerSource;
@@ -32,15 +31,10 @@ class SimpleBlockMaterial implements BlockMaterial {
     private float hardness;
     private float resistance;
     private float slipperiness;
-    private boolean grassBlocking;
-    private float ambientOcclusionLightValue;
-    private int lightOpacity;
     private int lightValue;
     private boolean fragileWhenPushed;
     private boolean unpushable;
-    private boolean adventureModeExempt;
     private boolean ticksRandomly;
-    private boolean usingNeighborLight;
     private boolean movementBlocker;
     private boolean burnable;
     private boolean toolRequired;
@@ -48,15 +42,6 @@ class SimpleBlockMaterial implements BlockMaterial {
     private boolean isTranslucent;
     private boolean hasContainer;
 
-    @Override
-    public boolean isRenderedAsNormalBlock() {
-        return renderedAsNormalBlock;
-    }
-
-    public void setRenderedAsNormalBlock(boolean renderedAsNormalBlock) {
-        this.renderedAsNormalBlock = renderedAsNormalBlock;
-    }
-
     @Override
     public boolean isFullCube() {
         return fullCube;
@@ -129,33 +114,6 @@ class SimpleBlockMaterial implements BlockMaterial {
         this.slipperiness = slipperiness;
     }
 
-    @Override
-    public boolean isGrassBlocking() {
-        return grassBlocking;
-    }
-
-    public void setGrassBlocking(boolean grassBlocking) {
-        this.grassBlocking = grassBlocking;
-    }
-
-    @Override
-    public float getAmbientOcclusionLightValue() {
-        return ambientOcclusionLightValue;
-    }
-
-    public void setAmbientOcclusionLightValue(float ambientOcclusionLightValue) {
-        this.ambientOcclusionLightValue = ambientOcclusionLightValue;
-    }
-
-    @Override
-    public int getLightOpacity() {
-        return lightOpacity;
-    }
-
-    public void setLightOpacity(int lightOpacity) {
-        this.lightOpacity = lightOpacity;
-    }
-
     @Override
     public int getLightValue() {
         return lightValue;
@@ -183,15 +141,6 @@ class SimpleBlockMaterial implements BlockMaterial {
         this.unpushable = unpushable;
     }
 
-    @Override
-    public boolean isAdventureModeExempt() {
-        return adventureModeExempt;
-    }
-
-    public void setAdventureModeExempt(boolean adventureModeExempt) {
-        this.adventureModeExempt = adventureModeExempt;
-    }
-
     @Override
     public boolean isTicksRandomly() {
         return ticksRandomly;
@@ -201,15 +150,6 @@ class SimpleBlockMaterial implements BlockMaterial {
         this.ticksRandomly = ticksRandomly;
     }
 
-    @Override
-    public boolean isUsingNeighborLight() {
-        return usingNeighborLight;
-    }
-
-    public void setUsingNeighborLight(boolean usingNeighborLight) {
-        this.usingNeighborLight = usingNeighborLight;
-    }
-
     @Override
     public boolean isMovementBlocker() {
         return movementBlocker;