Don't construct new BaseBlock

worldedit-core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java

@@ -379,8 +379,7 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable {
                                 trio.set(x, y, z);
                                 CompoundTag nbt = nbtMap.get(trio);
                                 if (nbt != null) {
-                                    BaseBlock block = new BaseBlock(state, nbt);
-                                    task.run(x, y, z, block);
+                                    task.run(x, y, z, state.toBaseBlock(nbt));
                                     continue;
                                 }
                             }
@@ -411,8 +410,7 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable {
                                 trio.set(x, y, z);
                                 CompoundTag nbt = nbtMap.get(trio);
                                 if (nbt != null) {
-                                    BaseBlock block = new BaseBlock(state, nbt);
-                                    task.run(x, y, z, block);
+                                    task.run(x, y, z, state.toBaseBlock(nbt));
                                     continue;
                                 }
                             }

worldedit-core/src/main/java/com/boydti/fawe/object/pattern/IdDataMaskPattern.java

@@ -12,7 +12,6 @@ import com.sk89q.worldedit.world.block.BlockTypes;
 public class IdDataMaskPattern extends AbstractExtentPattern {
     private final Pattern pattern;
     private final int bitMask;
-    private final BaseBlock mutable = new BaseBlock(BlockTypes.AIR);
 
     public IdDataMaskPattern(Extent extent, Pattern parent, int bitMask) {
         super(extent);

worldedit-core/src/main/java/com/boydti/fawe/object/pattern/PropertyPattern.java

@@ -205,7 +205,7 @@ public class PropertyPattern extends AbstractExtentPattern {
         if (newOrdinal != ordinal) {
             CompoundTag nbt = block.getNbtData();
             BlockState newState = BlockState.getFromOrdinal(newOrdinal);
-            return nbt != null ? new BaseBlock(newState, nbt) : newState.toBaseBlock();
+            return newState.toBaseBlock(nbt);
         }
         return orDefault;
     }

worldedit-core/src/main/java/com/boydti/fawe/object/schematic/StructureFormat.java

@@ -122,7 +122,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
                     if (state.getBlockType().getMaterial().hasContainer()) {
                         CompoundTag nbt = (CompoundTag) blockMap.get("nbt");
                         if (nbt != null) {
-                            BaseBlock block = new BaseBlock(state, nbt);
+                            BaseBlock block = state.toBaseBlock(nbt);
                             clipboard.setBlock(x, y, z, block);
                             continue;
                         }

worldedit-core/src/main/java/com/boydti/fawe/wrappers/FakePlayer.java

@@ -153,7 +153,7 @@ public class FakePlayer extends AbstractPlayerActor {
 
     @Override
     public BaseBlock getBlockInHand(HandSide ignore) {
-        return new BaseBlock(BlockTypes.AIR.getDefaultState());
+        return BlockTypes.AIR.getDefaultState().toBaseBlock();
     }
 
     @Override

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

@@ -341,7 +341,7 @@ public class CuboidClipboard {
     public BaseBlock getPoint(BlockVector3 position) throws ArrayIndexOutOfBoundsException {
         final BaseBlock block = getBlock(position);
         if (block == null) {
-            return new BaseBlock(BlockTypes.AIR);
+            return BlockTypes.AIR.getDefaultState().toBaseBlock();
         }
 
         return block;

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

@@ -271,7 +271,7 @@ public class DefaultBlockParser extends InputParser<BaseBlock> {
             }
         }
 
-        if (nbt != null) return new BaseBlock(state, nbt);
+        if (nbt != null) return state.toBaseBlock(nbt);
 
         if (blockType == BlockTypes.SIGN || blockType == BlockTypes.WALL_SIGN) {
             // Allow special sign text syntax

worldedit-core/src/main/java/com/sk89q/worldedit/internal/command/WorldEditBinding.java

@@ -203,8 +203,8 @@ public class WorldEditBinding {
     @BindingMatch(type = {BaseBlock.class, BlockState.class, BlockStateHolder.class},
             behavior = BindingBehavior.CONSUMES,
             consumedCount = 1)
-public BaseBlock getBaseBlock(ArgumentStack context) throws ParameterException, WorldEditException {
-        return new BaseBlock(getBlockState(context));
+    public BaseBlock getBaseBlock(ArgumentStack context) throws ParameterException, WorldEditException {
+        return getBlockState(context).toBaseBlock();
     }
 
     /**

worldedit-core/src/main/java/com/sk89q/worldedit/internal/cui/ServerCUIHandler.java

@@ -153,6 +153,6 @@ public class ServerCUIHandler {
         structureTag.put("id", new StringTag(BlockTypes.STRUCTURE_BLOCK.getId()));
 
 //        return BlockTypes.STRUCTURE_BLOCK.getDefaultState().toBaseBlock(new CompoundTag(structureTag));
-        return new BaseBlock(BlockTypes.STRUCTURE_BLOCK.getDefaultState(), new CompoundTag(structureTag));
+        return BlockTypes.STRUCTURE_BLOCK.getDefaultState().toBaseBlock(new CompoundTag(structureTag));
     }
 }

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

@@ -111,7 +111,7 @@ public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock {
         this(getState(id, data));
     }
 
-    private static final BlockState getState(int id, int data) {
+    public static final BlockState getState(int id, int data) {
         BlockState blockState = LegacyMapper.getInstance().getBlockFromLegacy(id, data);
         if (blockState == null) {
             blockState = BlockTypes.AIR.getDefaultState();
@@ -124,8 +124,8 @@ public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock {
     }
 
     @Deprecated
-    public static BaseBlock getFromInternalId(int id, CompoundTag nbtData) {
-        return new BaseBlock(id, nbtData);
+    public static BaseBlock getFromInternalId(int internalId, CompoundTag nbtData) {
+        return BlockState.getFromInternalId(internalId).toBaseBlock(nbtData);
     }
 
     /**

worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk13.java

@@ -245,7 +245,7 @@ public class AnvilChunk13 implements Chunk {
         BlockState state = sectionBlocks != null ? sectionBlocks[(yIndex << 8) | (z << 4) | x] : BlockTypes.AIR.getDefaultState();
         if (state.getMaterial().hasContainer()) {
             CompoundTag tileEntity = getBlockTileEntity(position);
-            if (tileEntity != null) return new BaseBlock(state, tileEntity);
+            return state.toBaseBlock(tileEntity);
         }
 
         return state.toBaseBlock();

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

@@ -238,7 +238,7 @@ public class LegacyMapper {
     		}
     	}else if(plotBlock instanceof LegacyPlotBlock) {
     		try {
-    			return new BaseBlock(((LegacyPlotBlock)plotBlock).getId(), ((LegacyPlotBlock)plotBlock).getData());
+    			return BaseBlock.getState(((LegacyPlotBlock)plotBlock).getId(), ((LegacyPlotBlock)plotBlock).getData()).toBaseBlock();
     		}catch(Throwable failed) {
     			log.error("Unable to convert LegacyPlotBlock " + plotBlock + " to BaseBlock!");
     			failed.printStackTrace();