.

2025-07-01 02:46:41 +00:00 · 2019-07-18 04:30:02 +10:00
parent ff94a1e5ed ae9efc3df1
commit dd38cbe750
280 changed files with 13872 additions and 8497 deletions
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java
@ -81,12 +81,12 @@ public class NullWorld extends AbstractWorld {
    }

    @Override
-    public BiomeType getBiome(BlockVector2 position) {
+    public BiomeType getBiomeType(int x, int z) {
        return BiomeTypes.THE_VOID;
    }

    @Override
-    public boolean setBiome(BlockVector2 position, BiomeType biome) {
+    public boolean setBiome(int x, int y, int z, BiomeType biome) {
        return false;
    }

@ -132,13 +132,18 @@ public class NullWorld extends AbstractWorld {
    }

    @Override
-    public BlockState getBlock(BlockVector3 position) {
+    public BlockState getBlock(int x, int y, int z) {
        return BlockTypes.AIR.getDefaultState();
    }

    @Override
-    public BlockState getLazyBlock(BlockVector3 position) {
-        return getBlock(position);
+    public BaseBlock getFullBlock(int x, int y, int z) {
+        return BlockTypes.AIR.getDefaultState().toBaseBlock();
+    }
+
+    @Override
+    public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block) throws WorldEditException {
+        return false;
    }

    @Override
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java
@ -67,6 +67,7 @@ public interface World extends Extent {
     *
     * @return the maximum Y
     */
+    @Override
    int getMaxY();

    /**
@ -106,7 +107,9 @@ public interface World extends Extent {
     * @param notifyAndLight true to to notify and light
     * @return true if the block was successfully set (return value may not be accurate)
     */
-    <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block, boolean notifyAndLight) throws WorldEditException;
+    default <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block, boolean notifyAndLight) throws WorldEditException {
+        return setBlock(position, block);
+    }

    /**
     * Notifies the simulation that the block at the given location has
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockID.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockID.java
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
@ -19,6 +19,7 @@

 package com.sk89q.worldedit.world.block;

+import com.boydti.fawe.beta.FilterBlock;
 import com.boydti.fawe.command.SuggestInputParseException;
 import com.boydti.fawe.object.string.MutableCharSequence;
 import com.boydti.fawe.util.StringMan;
@ -49,6 +50,7 @@ import java.util.stream.Stream;
 public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
    private final int internalId;
    private final int ordinal;
+    private final char ordinalChar;
    private final BlockType blockType;
    private BlockMaterial material;
    private BaseBlock emptyBaseBlock;
@ -57,7 +59,8 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
        this.blockType = blockType;
        this.internalId = internalId;
        this.ordinal = ordinal;
-        this.emptyBaseBlock = new BaseBlock(this);
+        this.ordinalChar = (char) ordinal;
+        this.emptyBaseBlock = new ImmutableBaseBlock(this);
    }

    /**
@ -214,7 +217,7 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
    }
    @Override
    public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
-        return extent.setBlock(set, this);
+        return set.setBlock(extent, this);
    }

    @Override
@ -270,6 +273,24 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
        }
    }

+    public <V> BlockState withProperties(final BlockState other) {
+        BlockType ot = other.getBlockType();
+        if (ot == blockType) {
+            return other;
+        }
+        if (ot.getProperties().isEmpty() || blockType.getProperties().isEmpty()) {
+            return this;
+        }
+        BlockState newState = this;
+        for (Property<?> prop: ot.getProperties()) {
+            PropertyKey key = prop.getKey();
+            if (blockType.hasProperty(key)) {
+                newState = newState.with(key, other.getState(key));
+            }
+        }
+        return this;
+    }
+
    @Override
    public Map<Property<?>, Object> getStates() {
        BlockType type = this.getBlockType();
@ -333,10 +354,15 @@ public class BlockState implements BlockStateHolder<BlockState>, FawePattern {
        return material;
 	}

-	@Override
-	public int getOrdinal() {
-		return this.ordinal;
-	}
+    @Override
+    public final int getOrdinal() {
+        return this.ordinal;
+    }
+
+    @Override
+    public final char getOrdinalChar() {
+        return this.ordinalChar;
+    }

    @Override
    public String toString() {
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockStateHolder.java
@ -64,6 +64,9 @@ public interface BlockStateHolder<B extends BlockStateHolder<B>> extends FawePat
    @Deprecated
    int getOrdinal();

+    @Deprecated
+    char getOrdinalChar();
+
    BlockMaterial getMaterial();
    /**
     * Get type id (legacy uses)
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
@ -41,7 +41,9 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@ -61,22 +63,31 @@ public final class BlockTypes {
    @Nullable public static final BlockType ACACIA_PLANKS = null;
    @Nullable public static final BlockType ACACIA_PRESSURE_PLATE = null;
    @Nullable public static final BlockType ACACIA_SAPLING = null;
+    @Nullable public static final BlockType ACACIA_SIGN = null;
    @Nullable public static final BlockType ACACIA_SLAB = null;
    @Nullable public static final BlockType ACACIA_STAIRS = null;
    @Nullable public static final BlockType ACACIA_TRAPDOOR = null;
+    @Nullable public static final BlockType ACACIA_WALL_SIGN = null;
    @Nullable public static final BlockType ACACIA_WOOD = null;
    @Nullable public static final BlockType ACTIVATOR_RAIL = null;
    @Nullable public static final BlockType AIR = null;
    @Nullable public static final BlockType ALLIUM = null;
    @Nullable public static final BlockType ANDESITE = null;
+    @Nullable public static final BlockType ANDESITE_SLAB = null;
+    @Nullable public static final BlockType ANDESITE_STAIRS = null;
+    @Nullable public static final BlockType ANDESITE_WALL = null;
    @Nullable public static final BlockType ANVIL = null;
    @Nullable public static final BlockType ATTACHED_MELON_STEM = null;
    @Nullable public static final BlockType ATTACHED_PUMPKIN_STEM = null;
    @Nullable public static final BlockType AZURE_BLUET = null;
+    @Nullable public static final BlockType BAMBOO = null;
+    @Nullable public static final BlockType BAMBOO_SAPLING = null;
+    @Nullable public static final BlockType BARREL = null;
    @Nullable public static final BlockType BARRIER = null;
    @Nullable public static final BlockType BEACON = null;
    @Nullable public static final BlockType BEDROCK = null;
    @Nullable public static final BlockType BEETROOTS = null;
+    @Nullable public static final BlockType BELL = null;
    @Nullable public static final BlockType BIRCH_BUTTON = null;
    @Nullable public static final BlockType BIRCH_DOOR = null;
    @Nullable public static final BlockType BIRCH_FENCE = null;
@ -86,9 +97,11 @@ public final class BlockTypes {
    @Nullable public static final BlockType BIRCH_PLANKS = null;
    @Nullable public static final BlockType BIRCH_PRESSURE_PLATE = null;
    @Nullable public static final BlockType BIRCH_SAPLING = null;
+    @Nullable public static final BlockType BIRCH_SIGN = null;
    @Nullable public static final BlockType BIRCH_SLAB = null;
    @Nullable public static final BlockType BIRCH_STAIRS = null;
    @Nullable public static final BlockType BIRCH_TRAPDOOR = null;
+    @Nullable public static final BlockType BIRCH_WALL_SIGN = null;
    @Nullable public static final BlockType BIRCH_WOOD = null;
    @Nullable public static final BlockType BLACK_BANNER = null;
    @Nullable public static final BlockType BLACK_BED = null;
@ -102,6 +115,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType BLACK_TERRACOTTA = null;
    @Nullable public static final BlockType BLACK_WALL_BANNER = null;
    @Nullable public static final BlockType BLACK_WOOL = null;
+    @Nullable public static final BlockType BLAST_FURNACE = null;
    @Nullable public static final BlockType BLUE_BANNER = null;
    @Nullable public static final BlockType BLUE_BED = null;
    @Nullable public static final BlockType BLUE_CARPET = null;
@ -125,6 +139,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType BREWING_STAND = null;
    @Nullable public static final BlockType BRICK_SLAB = null;
    @Nullable public static final BlockType BRICK_STAIRS = null;
+    @Nullable public static final BlockType BRICK_WALL = null;
    @Nullable public static final BlockType BRICKS = null;
    @Nullable public static final BlockType BROWN_BANNER = null;
    @Nullable public static final BlockType BROWN_BED = null;
@ -147,7 +162,9 @@ public final class BlockTypes {
    @Nullable public static final BlockType BUBBLE_CORAL_WALL_FAN = null;
    @Nullable public static final BlockType CACTUS = null;
    @Nullable public static final BlockType CAKE = null;
+    @Nullable public static final BlockType CAMPFIRE = null;
    @Nullable public static final BlockType CARROTS = null;
+    @Nullable public static final BlockType CARTOGRAPHY_TABLE = null;
    @Nullable public static final BlockType CARVED_PUMPKIN = null;
    @Nullable public static final BlockType CAULDRON = null;
    @Nullable public static final BlockType CAVE_AIR = null;
@ -172,13 +189,17 @@ public final class BlockTypes {
    @Nullable public static final BlockType COCOA = null;
    @Nullable public static final BlockType COMMAND_BLOCK = null;
    @Nullable public static final BlockType COMPARATOR = null;
+    @Nullable public static final BlockType COMPOSTER = null;
    @Nullable public static final BlockType CONDUIT = null;
+    @Nullable public static final BlockType CORNFLOWER = null;
    @Nullable public static final BlockType CRACKED_STONE_BRICKS = null;
    @Nullable public static final BlockType CRAFTING_TABLE = null;
    @Nullable public static final BlockType CREEPER_HEAD = null;
    @Nullable public static final BlockType CREEPER_WALL_HEAD = null;
    @Nullable public static final BlockType CUT_RED_SANDSTONE = null;
+    @Nullable public static final BlockType CUT_RED_SANDSTONE_SLAB = null;
    @Nullable public static final BlockType CUT_SANDSTONE = null;
+    @Nullable public static final BlockType CUT_SANDSTONE_SLAB = null;
    @Nullable public static final BlockType CYAN_BANNER = null;
    @Nullable public static final BlockType CYAN_BED = null;
    @Nullable public static final BlockType CYAN_CARPET = null;
@ -202,9 +223,11 @@ public final class BlockTypes {
    @Nullable public static final BlockType DARK_OAK_PLANKS = null;
    @Nullable public static final BlockType DARK_OAK_PRESSURE_PLATE = null;
    @Nullable public static final BlockType DARK_OAK_SAPLING = null;
+    @Nullable public static final BlockType DARK_OAK_SIGN = null;
    @Nullable public static final BlockType DARK_OAK_SLAB = null;
    @Nullable public static final BlockType DARK_OAK_STAIRS = null;
    @Nullable public static final BlockType DARK_OAK_TRAPDOOR = null;
+    @Nullable public static final BlockType DARK_OAK_WALL_SIGN = null;
    @Nullable public static final BlockType DARK_OAK_WOOD = null;
    @Nullable public static final BlockType DARK_PRISMARINE = null;
    @Nullable public static final BlockType DARK_PRISMARINE_SLAB = null;
@ -235,6 +258,9 @@ public final class BlockTypes {
    @Nullable public static final BlockType DIAMOND_BLOCK = null;
    @Nullable public static final BlockType DIAMOND_ORE = null;
    @Nullable public static final BlockType DIORITE = null;
+    @Nullable public static final BlockType DIORITE_SLAB = null;
+    @Nullable public static final BlockType DIORITE_STAIRS = null;
+    @Nullable public static final BlockType DIORITE_WALL = null;
    @Nullable public static final BlockType DIRT = null;
    @Nullable public static final BlockType DISPENSER = null;
    @Nullable public static final BlockType DRAGON_EGG = null;
@ -250,6 +276,9 @@ public final class BlockTypes {
    @Nullable public static final BlockType END_PORTAL_FRAME = null;
    @Nullable public static final BlockType END_ROD = null;
    @Nullable public static final BlockType END_STONE = null;
+    @Nullable public static final BlockType END_STONE_BRICK_SLAB = null;
+    @Nullable public static final BlockType END_STONE_BRICK_STAIRS = null;
+    @Nullable public static final BlockType END_STONE_BRICK_WALL = null;
    @Nullable public static final BlockType END_STONE_BRICKS = null;
    @Nullable public static final BlockType ENDER_CHEST = null;
    @Nullable public static final BlockType FARMLAND = null;
@ -259,6 +288,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType FIRE_CORAL_BLOCK = null;
    @Nullable public static final BlockType FIRE_CORAL_FAN = null;
    @Nullable public static final BlockType FIRE_CORAL_WALL_FAN = null;
+    @Nullable public static final BlockType FLETCHING_TABLE = null;
    @Nullable public static final BlockType FLOWER_POT = null;
    @Nullable public static final BlockType FROSTED_ICE = null;
    @Nullable public static final BlockType FURNACE = null;
@ -268,6 +298,9 @@ public final class BlockTypes {
    @Nullable public static final BlockType GOLD_BLOCK = null;
    @Nullable public static final BlockType GOLD_ORE = null;
    @Nullable public static final BlockType GRANITE = null;
+    @Nullable public static final BlockType GRANITE_SLAB = null;
+    @Nullable public static final BlockType GRANITE_STAIRS = null;
+    @Nullable public static final BlockType GRANITE_WALL = null;
    @Nullable public static final BlockType GRASS = null;
    @Nullable public static final BlockType GRASS_BLOCK = null;
    @Nullable public static final BlockType GRASS_PATH = null;
@ -296,6 +329,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType GREEN_TERRACOTTA = null;
    @Nullable public static final BlockType GREEN_WALL_BANNER = null;
    @Nullable public static final BlockType GREEN_WOOL = null;
+    @Nullable public static final BlockType GRINDSTONE = null;
    @Nullable public static final BlockType HAY_BLOCK = null;
    @Nullable public static final BlockType HEAVY_WEIGHTED_PRESSURE_PLATE = null;
    @Nullable public static final BlockType HOPPER = null;
@ -316,6 +350,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType IRON_ORE = null;
    @Nullable public static final BlockType IRON_TRAPDOOR = null;
    @Nullable public static final BlockType JACK_O_LANTERN = null;
+    @Nullable public static final BlockType JIGSAW = null;
    @Nullable public static final BlockType JUKEBOX = null;
    @Nullable public static final BlockType JUNGLE_BUTTON = null;
    @Nullable public static final BlockType JUNGLE_DOOR = null;
@ -326,17 +361,21 @@ public final class BlockTypes {
    @Nullable public static final BlockType JUNGLE_PLANKS = null;
    @Nullable public static final BlockType JUNGLE_PRESSURE_PLATE = null;
    @Nullable public static final BlockType JUNGLE_SAPLING = null;
+    @Nullable public static final BlockType JUNGLE_SIGN = null;
    @Nullable public static final BlockType JUNGLE_SLAB = null;
    @Nullable public static final BlockType JUNGLE_STAIRS = null;
    @Nullable public static final BlockType JUNGLE_TRAPDOOR = null;
+    @Nullable public static final BlockType JUNGLE_WALL_SIGN = null;
    @Nullable public static final BlockType JUNGLE_WOOD = null;
    @Nullable public static final BlockType KELP = null;
    @Nullable public static final BlockType KELP_PLANT = null;
    @Nullable public static final BlockType LADDER = null;
+    @Nullable public static final BlockType LANTERN = null;
    @Nullable public static final BlockType LAPIS_BLOCK = null;
    @Nullable public static final BlockType LAPIS_ORE = null;
    @Nullable public static final BlockType LARGE_FERN = null;
    @Nullable public static final BlockType LAVA = null;
+    @Nullable public static final BlockType LECTERN = null;
    @Nullable public static final BlockType LEVER = null;
    @Nullable public static final BlockType LIGHT_BLUE_BANNER = null;
    @Nullable public static final BlockType LIGHT_BLUE_BED = null;
@ -364,6 +403,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType LIGHT_GRAY_WOOL = null;
    @Nullable public static final BlockType LIGHT_WEIGHTED_PRESSURE_PLATE = null;
    @Nullable public static final BlockType LILAC = null;
+    @Nullable public static final BlockType LILY_OF_THE_VALLEY = null;
    @Nullable public static final BlockType LILY_PAD = null;
    @Nullable public static final BlockType LIME_BANNER = null;
    @Nullable public static final BlockType LIME_BED = null;
@ -377,6 +417,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType LIME_TERRACOTTA = null;
    @Nullable public static final BlockType LIME_WALL_BANNER = null;
    @Nullable public static final BlockType LIME_WOOL = null;
+    @Nullable public static final BlockType LOOM = null;
    @Nullable public static final BlockType MAGENTA_BANNER = null;
    @Nullable public static final BlockType MAGENTA_BED = null;
    @Nullable public static final BlockType MAGENTA_CARPET = null;
@ -393,7 +434,12 @@ public final class BlockTypes {
    @Nullable public static final BlockType MELON = null;
    @Nullable public static final BlockType MELON_STEM = null;
    @Nullable public static final BlockType MOSSY_COBBLESTONE = null;
+    @Nullable public static final BlockType MOSSY_COBBLESTONE_SLAB = null;
+    @Nullable public static final BlockType MOSSY_COBBLESTONE_STAIRS = null;
    @Nullable public static final BlockType MOSSY_COBBLESTONE_WALL = null;
+    @Nullable public static final BlockType MOSSY_STONE_BRICK_SLAB = null;
+    @Nullable public static final BlockType MOSSY_STONE_BRICK_STAIRS = null;
+    @Nullable public static final BlockType MOSSY_STONE_BRICK_WALL = null;
    @Nullable public static final BlockType MOSSY_STONE_BRICKS = null;
    @Nullable public static final BlockType MOVING_PISTON = null;
    @Nullable public static final BlockType MUSHROOM_STEM = null;
@ -401,6 +447,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType NETHER_BRICK_FENCE = null;
    @Nullable public static final BlockType NETHER_BRICK_SLAB = null;
    @Nullable public static final BlockType NETHER_BRICK_STAIRS = null;
+    @Nullable public static final BlockType NETHER_BRICK_WALL = null;
    @Nullable public static final BlockType NETHER_BRICKS = null;
    @Nullable public static final BlockType NETHER_PORTAL = null;
    @Nullable public static final BlockType NETHER_QUARTZ_ORE = null;
@ -417,9 +464,11 @@ public final class BlockTypes {
    @Nullable public static final BlockType OAK_PLANKS = null;
    @Nullable public static final BlockType OAK_PRESSURE_PLATE = null;
    @Nullable public static final BlockType OAK_SAPLING = null;
+    @Nullable public static final BlockType OAK_SIGN = null;
    @Nullable public static final BlockType OAK_SLAB = null;
    @Nullable public static final BlockType OAK_STAIRS = null;
    @Nullable public static final BlockType OAK_TRAPDOOR = null;
+    @Nullable public static final BlockType OAK_WALL_SIGN = null;
    @Nullable public static final BlockType OAK_WOOD = null;
    @Nullable public static final BlockType OBSERVER = null;
    @Nullable public static final BlockType OBSIDIAN = null;
@ -459,22 +508,31 @@ public final class BlockTypes {
    @Nullable public static final BlockType PLAYER_WALL_HEAD = null;
    @Nullable public static final BlockType PODZOL = null;
    @Nullable public static final BlockType POLISHED_ANDESITE = null;
+    @Nullable public static final BlockType POLISHED_ANDESITE_SLAB = null;
+    @Nullable public static final BlockType POLISHED_ANDESITE_STAIRS = null;
    @Nullable public static final BlockType POLISHED_DIORITE = null;
+    @Nullable public static final BlockType POLISHED_DIORITE_SLAB = null;
+    @Nullable public static final BlockType POLISHED_DIORITE_STAIRS = null;
    @Nullable public static final BlockType POLISHED_GRANITE = null;
+    @Nullable public static final BlockType POLISHED_GRANITE_SLAB = null;
+    @Nullable public static final BlockType POLISHED_GRANITE_STAIRS = null;
    @Nullable public static final BlockType POPPY = null;
    @Nullable public static final BlockType POTATOES = null;
    @Nullable public static final BlockType POTTED_ACACIA_SAPLING = null;
    @Nullable public static final BlockType POTTED_ALLIUM = null;
    @Nullable public static final BlockType POTTED_AZURE_BLUET = null;
+    @Nullable public static final BlockType POTTED_BAMBOO = null;
    @Nullable public static final BlockType POTTED_BIRCH_SAPLING = null;
    @Nullable public static final BlockType POTTED_BLUE_ORCHID = null;
    @Nullable public static final BlockType POTTED_BROWN_MUSHROOM = null;
    @Nullable public static final BlockType POTTED_CACTUS = null;
+    @Nullable public static final BlockType POTTED_CORNFLOWER = null;
    @Nullable public static final BlockType POTTED_DANDELION = null;
    @Nullable public static final BlockType POTTED_DARK_OAK_SAPLING = null;
    @Nullable public static final BlockType POTTED_DEAD_BUSH = null;
    @Nullable public static final BlockType POTTED_FERN = null;
    @Nullable public static final BlockType POTTED_JUNGLE_SAPLING = null;
+    @Nullable public static final BlockType POTTED_LILY_OF_THE_VALLEY = null;
    @Nullable public static final BlockType POTTED_OAK_SAPLING = null;
    @Nullable public static final BlockType POTTED_ORANGE_TULIP = null;
    @Nullable public static final BlockType POTTED_OXEYE_DAISY = null;
@ -484,6 +542,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType POTTED_RED_TULIP = null;
    @Nullable public static final BlockType POTTED_SPRUCE_SAPLING = null;
    @Nullable public static final BlockType POTTED_WHITE_TULIP = null;
+    @Nullable public static final BlockType POTTED_WITHER_ROSE = null;
    @Nullable public static final BlockType POWERED_RAIL = null;
    @Nullable public static final BlockType PRISMARINE = null;
    @Nullable public static final BlockType PRISMARINE_BRICK_SLAB = null;
@ -491,6 +550,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType PRISMARINE_BRICKS = null;
    @Nullable public static final BlockType PRISMARINE_SLAB = null;
    @Nullable public static final BlockType PRISMARINE_STAIRS = null;
+    @Nullable public static final BlockType PRISMARINE_WALL = null;
    @Nullable public static final BlockType PUMPKIN = null;
    @Nullable public static final BlockType PUMPKIN_STEM = null;
    @Nullable public static final BlockType PURPLE_BANNER = null;
@ -522,11 +582,15 @@ public final class BlockTypes {
    @Nullable public static final BlockType RED_GLAZED_TERRACOTTA = null;
    @Nullable public static final BlockType RED_MUSHROOM = null;
    @Nullable public static final BlockType RED_MUSHROOM_BLOCK = null;
+    @Nullable public static final BlockType RED_NETHER_BRICK_SLAB = null;
+    @Nullable public static final BlockType RED_NETHER_BRICK_STAIRS = null;
+    @Nullable public static final BlockType RED_NETHER_BRICK_WALL = null;
    @Nullable public static final BlockType RED_NETHER_BRICKS = null;
    @Nullable public static final BlockType RED_SAND = null;
    @Nullable public static final BlockType RED_SANDSTONE = null;
    @Nullable public static final BlockType RED_SANDSTONE_SLAB = null;
    @Nullable public static final BlockType RED_SANDSTONE_STAIRS = null;
+    @Nullable public static final BlockType RED_SANDSTONE_WALL = null;
    @Nullable public static final BlockType RED_SHULKER_BOX = null;
    @Nullable public static final BlockType RED_STAINED_GLASS = null;
    @Nullable public static final BlockType RED_STAINED_GLASS_PANE = null;
@ -547,18 +611,28 @@ public final class BlockTypes {
    @Nullable public static final BlockType SANDSTONE = null;
    @Nullable public static final BlockType SANDSTONE_SLAB = null;
    @Nullable public static final BlockType SANDSTONE_STAIRS = null;
+    @Nullable public static final BlockType SANDSTONE_WALL = null;
+    @Nullable public static final BlockType SCAFFOLDING = null;
    @Nullable public static final BlockType SEA_LANTERN = null;
    @Nullable public static final BlockType SEA_PICKLE = null;
    @Nullable public static final BlockType SEAGRASS = null;
    @Nullable public static final BlockType SHULKER_BOX = null;
-    @Nullable public static final BlockType SIGN = null;
    @Nullable public static final BlockType SKELETON_SKULL = null;
    @Nullable public static final BlockType SKELETON_WALL_SKULL = null;
    @Nullable public static final BlockType SLIME_BLOCK = null;
+    @Nullable public static final BlockType SMITHING_TABLE = null;
+    @Nullable public static final BlockType SMOKER = null;
    @Nullable public static final BlockType SMOOTH_QUARTZ = null;
+    @Nullable public static final BlockType SMOOTH_QUARTZ_SLAB = null;
+    @Nullable public static final BlockType SMOOTH_QUARTZ_STAIRS = null;
    @Nullable public static final BlockType SMOOTH_RED_SANDSTONE = null;
+    @Nullable public static final BlockType SMOOTH_RED_SANDSTONE_SLAB = null;
+    @Nullable public static final BlockType SMOOTH_RED_SANDSTONE_STAIRS = null;
    @Nullable public static final BlockType SMOOTH_SANDSTONE = null;
+    @Nullable public static final BlockType SMOOTH_SANDSTONE_SLAB = null;
+    @Nullable public static final BlockType SMOOTH_SANDSTONE_STAIRS = null;
    @Nullable public static final BlockType SMOOTH_STONE = null;
+    @Nullable public static final BlockType SMOOTH_STONE_SLAB = null;
    @Nullable public static final BlockType SNOW = null;
    @Nullable public static final BlockType SNOW_BLOCK = null;
    @Nullable public static final BlockType SOUL_SAND = null;
@ -573,18 +647,23 @@ public final class BlockTypes {
    @Nullable public static final BlockType SPRUCE_PLANKS = null;
    @Nullable public static final BlockType SPRUCE_PRESSURE_PLATE = null;
    @Nullable public static final BlockType SPRUCE_SAPLING = null;
+    @Nullable public static final BlockType SPRUCE_SIGN = null;
    @Nullable public static final BlockType SPRUCE_SLAB = null;
    @Nullable public static final BlockType SPRUCE_STAIRS = null;
    @Nullable public static final BlockType SPRUCE_TRAPDOOR = null;
+    @Nullable public static final BlockType SPRUCE_WALL_SIGN = null;
    @Nullable public static final BlockType SPRUCE_WOOD = null;
    @Nullable public static final BlockType STICKY_PISTON = null;
    @Nullable public static final BlockType STONE = null;
    @Nullable public static final BlockType STONE_BRICK_SLAB = null;
    @Nullable public static final BlockType STONE_BRICK_STAIRS = null;
+    @Nullable public static final BlockType STONE_BRICK_WALL = null;
    @Nullable public static final BlockType STONE_BRICKS = null;
    @Nullable public static final BlockType STONE_BUTTON = null;
    @Nullable public static final BlockType STONE_PRESSURE_PLATE = null;
    @Nullable public static final BlockType STONE_SLAB = null;
+    @Nullable public static final BlockType STONE_STAIRS = null;
+    @Nullable public static final BlockType STONECUTTER = null;
    @Nullable public static final BlockType STRIPPED_ACACIA_LOG = null;
    @Nullable public static final BlockType STRIPPED_ACACIA_WOOD = null;
    @Nullable public static final BlockType STRIPPED_BIRCH_LOG = null;
@ -601,6 +680,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType STRUCTURE_VOID = null;
    @Nullable public static final BlockType SUGAR_CANE = null;
    @Nullable public static final BlockType SUNFLOWER = null;
+    @Nullable public static final BlockType SWEET_BERRY_BUSH = null;
    @Nullable public static final BlockType TALL_GRASS = null;
    @Nullable public static final BlockType TALL_SEAGRASS = null;
    @Nullable public static final BlockType TERRACOTTA = null;
@ -616,7 +696,6 @@ public final class BlockTypes {
    @Nullable public static final BlockType TURTLE_EGG = null;
    @Nullable public static final BlockType VINE = null;
    @Nullable public static final BlockType VOID_AIR = null;
-    @Nullable public static final BlockType WALL_SIGN = null;
    @Nullable public static final BlockType WALL_TORCH = null;
    @Nullable public static final BlockType WATER = null;
    @Nullable public static final BlockType WET_SPONGE = null;
@ -634,6 +713,7 @@ public final class BlockTypes {
    @Nullable public static final BlockType WHITE_TULIP = null;
    @Nullable public static final BlockType WHITE_WALL_BANNER = null;
    @Nullable public static final BlockType WHITE_WOOL = null;
+    @Nullable public static final BlockType WITHER_ROSE = null;
    @Nullable public static final BlockType WITHER_SKELETON_SKULL = null;
    @Nullable public static final BlockType WITHER_SKELETON_WALL_SKULL = null;
    @Nullable public static final BlockType YELLOW_BANNER = null;
@ -651,6 +731,10 @@ public final class BlockTypes {
    @Nullable public static final BlockType ZOMBIE_HEAD = null;
    @Nullable public static final BlockType ZOMBIE_WALL_HEAD = null;

+    // deprecated
+    @Deprecated @Nullable public static BlockType SIGN;
+    @Deprecated @Nullable public static BlockType WALL_SIGN;
+
    /*
     -----------------------------------------------------
                    Settings
@ -812,7 +896,7 @@ public final class BlockTypes {
            for (Field field : oldFields) {
                if (field.getType() == int.class) {
                    int internalId = field.getInt(null);
-                    String id = "minecraft:" + field.getName().toLowerCase();
+                    String id = "minecraft:" + field.getName().toLowerCase(Locale.ROOT);
                    String defaultState = blockMap.remove(id);
                    if (defaultState == null) {
                        if (internalId != 0) {
@ -844,10 +928,14 @@ public final class BlockTypes {

            // Add to $Registry
            for (BlockType type : values) {
-                $REGISTRY.put(type.getId().toLowerCase(), type);
+                $REGISTRY.put(type.getId().toLowerCase(Locale.ROOT), type);
            }
            states = stateList.toArray(new BlockState[stateList.size()]);

+
+            // Init deprecated
+            SIGN = OAK_SIGN;
+            WALL_SIGN = OAK_WALL_SIGN;
        } catch (Throwable e) {
            e.printStackTrace();
            throw new RuntimeException(e);
@ -858,7 +946,7 @@ public final class BlockTypes {
        // Get the enum name (remove namespace if minecraft:)
        int propStart = id.indexOf('[');
        String typeName = id.substring(0, propStart == -1 ? id.length() : propStart);
-        String enumName = (typeName.startsWith("minecraft:") ? typeName.substring(10) : typeName).toUpperCase();
+        String enumName = (typeName.startsWith("minecraft:") ? typeName.substring(10) : typeName).toUpperCase(Locale.ROOT);
        BlockType existing = new BlockType(id, internalId, states);


@ -888,7 +976,7 @@ public final class BlockTypes {
     */

    public static BlockType parse(final String type) throws InputParseException {
-        final String inputLower = type.toLowerCase();
+        final String inputLower = type.toLowerCase(Locale.ROOT);
        String input = inputLower;

        if (!input.split("\\[", 2)[0].contains(":")) input = "minecraft:" + input;
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/ImmutableBaseBlock.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/ImmutableBaseBlock.java
@ -0,0 +1,50 @@
+package com.sk89q.worldedit.world.block;
+
+import com.boydti.fawe.beta.FilterBlock;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.registry.state.Property;
+
+import javax.annotation.Nullable;
+
+public final class ImmutableBaseBlock extends BaseBlock {
+    public ImmutableBaseBlock(BlockState blockState) {
+        super(blockState);
+    }
+
+    @Nullable
+    @Override
+    public CompoundTag getNbtData() {
+        return null;
+    }
+
+    @Override
+    public boolean hasNbtData() {
+        return false;
+    }
+
+    @Override
+    public String getNbtId() {
+        return "";
+    }
+
+    @Override
+    public boolean apply(Extent extent, BlockVector3 get, BlockVector3 set) throws WorldEditException {
+        return set.setBlock(extent, toBlockState());
+    }
+
+    @Override
+    public <V> BaseBlock with(Property<V> property, V value) {
+        return toImmutableState().with(property, value).toBaseBlock();
+    }
+
+    @Override
+    public BaseBlock toBaseBlock(CompoundTag compoundTag) {
+        if (compoundTag != null) {
+            return new BaseBlock(this.toImmutableState(), compoundTag);
+        }
+        return this;
+    }
+}