diff --git a/src/main/java/storagecraft/block/BlockCable.java b/src/main/java/storagecraft/block/BlockCable.java
old mode 100644
new mode 100755
index b953fcb0e..8004c6f22
--- a/src/main/java/storagecraft/block/BlockCable.java
+++ b/src/main/java/storagecraft/block/BlockCable.java
@@ -13,7 +13,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import storagecraft.tile.TileCable;
 
-public class BlockCable extends BlockBase implements ITileEntityProvider
+public class BlockCable extends BlockBase
 {
 	public static final PropertyBool SENSITIVE = PropertyBool.create("sensitive");
 
@@ -45,8 +45,13 @@ public class BlockCable extends BlockBase implements ITileEntityProvider
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
+	public boolean hasTileEntity(IBlockState state)
 	{
+		return true;
+	}
+
+	@Override
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileCable();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockConstructor.java b/src/main/java/storagecraft/block/BlockConstructor.java
index 4253b4fe4..b4c2a7169 100755
--- a/src/main/java/storagecraft/block/BlockConstructor.java
+++ b/src/main/java/storagecraft/block/BlockConstructor.java
@@ -18,8 +18,7 @@ public class BlockConstructor extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileConstructor();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockController.java b/src/main/java/storagecraft/block/BlockController.java
index ad39d2571..ca4752a47 100755
--- a/src/main/java/storagecraft/block/BlockController.java
+++ b/src/main/java/storagecraft/block/BlockController.java
@@ -1,6 +1,5 @@
 package storagecraft.block;
 
-import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockState;
@@ -15,7 +14,7 @@ import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
 import storagecraft.tile.TileController;
 
-public class BlockController extends BlockBase implements ITileEntityProvider
+public class BlockController extends BlockBase
 {
 	public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 15);
 
@@ -42,8 +41,13 @@ public class BlockController extends BlockBase implements ITileEntityProvider
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
+	public boolean hasTileEntity(IBlockState state)
 	{
+		return true;
+	}
+
+	@Override
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileController();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockDestructor.java b/src/main/java/storagecraft/block/BlockDestructor.java
index 2df3dc7b4..144ec52e6 100755
--- a/src/main/java/storagecraft/block/BlockDestructor.java
+++ b/src/main/java/storagecraft/block/BlockDestructor.java
@@ -18,8 +18,7 @@ public class BlockDestructor extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileDestructor();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockDetector.java b/src/main/java/storagecraft/block/BlockDetector.java
old mode 100644
new mode 100755
index 09d88b07a..582ba1030
--- a/src/main/java/storagecraft/block/BlockDetector.java
+++ b/src/main/java/storagecraft/block/BlockDetector.java
@@ -19,8 +19,7 @@ public class BlockDetector extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileDetector();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockDrive.java b/src/main/java/storagecraft/block/BlockDrive.java
old mode 100644
new mode 100755
index a9a8273fc..8cdbbfa64
--- a/src/main/java/storagecraft/block/BlockDrive.java
+++ b/src/main/java/storagecraft/block/BlockDrive.java
@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileDrive;
 
 public class BlockDrive extends BlockMachine
@@ -18,8 +19,7 @@ public class BlockDrive extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileDrive();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockExporter.java b/src/main/java/storagecraft/block/BlockExporter.java
old mode 100644
new mode 100755
index 77c2c59f6..30867c29e
--- a/src/main/java/storagecraft/block/BlockExporter.java
+++ b/src/main/java/storagecraft/block/BlockExporter.java
@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileExporter;
 
 public class BlockExporter extends BlockMachine
@@ -18,11 +19,11 @@ public class BlockExporter extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileExporter();
 	}
 
+
 	@Override
 	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
diff --git a/src/main/java/storagecraft/block/BlockExternalStorage.java b/src/main/java/storagecraft/block/BlockExternalStorage.java
index 7be48d5aa..f384da285 100755
--- a/src/main/java/storagecraft/block/BlockExternalStorage.java
+++ b/src/main/java/storagecraft/block/BlockExternalStorage.java
@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileExternalStorage;
 
 public class BlockExternalStorage extends BlockMachine
@@ -18,8 +19,7 @@ public class BlockExternalStorage extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileExternalStorage();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockGrid.java b/src/main/java/storagecraft/block/BlockGrid.java
index b45127d10..1e4acbd12 100755
--- a/src/main/java/storagecraft/block/BlockGrid.java
+++ b/src/main/java/storagecraft/block/BlockGrid.java
@@ -16,6 +16,8 @@ import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
 import static storagecraft.block.BlockMachine.CONNECTED;
+
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileGrid;
 
 public class BlockGrid extends BlockMachine
@@ -28,8 +30,7 @@ public class BlockGrid extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileGrid();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockImporter.java b/src/main/java/storagecraft/block/BlockImporter.java
old mode 100644
new mode 100755
index 00d8dd137..b2871e688
--- a/src/main/java/storagecraft/block/BlockImporter.java
+++ b/src/main/java/storagecraft/block/BlockImporter.java
@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileImporter;
 
 public class BlockImporter extends BlockMachine
@@ -18,11 +19,11 @@ public class BlockImporter extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileImporter();
 	}
 
+
 	@Override
 	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
diff --git a/src/main/java/storagecraft/block/BlockMachine.java b/src/main/java/storagecraft/block/BlockMachine.java
index e4120f331..cdee37f7b 100755
--- a/src/main/java/storagecraft/block/BlockMachine.java
+++ b/src/main/java/storagecraft/block/BlockMachine.java
@@ -1,6 +1,5 @@
 package storagecraft.block;
 
-import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.BlockState;
@@ -9,7 +8,7 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import storagecraft.tile.TileMachine;
 
-public abstract class BlockMachine extends BlockBase implements ITileEntityProvider
+public abstract class BlockMachine extends BlockBase
 {
 	public static final PropertyBool CONNECTED = PropertyBool.create("connected");
 
@@ -18,6 +17,12 @@ public abstract class BlockMachine extends BlockBase implements ITileEntityProvi
 		super(name);
 	}
 
+	@Override
+	public boolean hasTileEntity(IBlockState state)
+	{
+		return true;
+	}
+
 	@Override
 	protected BlockState createBlockState()
 	{
diff --git a/src/main/java/storagecraft/block/BlockSolderer.java b/src/main/java/storagecraft/block/BlockSolderer.java
index 1ed12037b..61443e827 100755
--- a/src/main/java/storagecraft/block/BlockSolderer.java
+++ b/src/main/java/storagecraft/block/BlockSolderer.java
@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileSolderer;
 
 public class BlockSolderer extends BlockMachine
@@ -18,8 +19,7 @@ public class BlockSolderer extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileSolderer();
 	}
 
diff --git a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java b/src/main/java/storagecraft/block/BlockWirelessTransmitter.java
index 08174173e..c6810bd78 100755
--- a/src/main/java/storagecraft/block/BlockWirelessTransmitter.java
+++ b/src/main/java/storagecraft/block/BlockWirelessTransmitter.java
@@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
+import storagecraft.tile.TileCable;
 import storagecraft.tile.TileWirelessTransmitter;
 
 // @TODO: This texture behaves differently
@@ -19,8 +20,7 @@ public class BlockWirelessTransmitter extends BlockMachine
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta)
-	{
+	public TileEntity createTileEntity(World world, IBlockState state) {
 		return new TileWirelessTransmitter();
 	}