Fix most of the errors, still some to go.

src/main/java/storagecraft/block/BlockBase.java

@@ -5,13 +5,13 @@ import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyDirection;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
@@ -41,9 +41,9 @@ public abstract class BlockBase extends Block
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 		});
@@ -115,7 +115,7 @@ public abstract class BlockBase extends Block
 
 		if (tile instanceof TileBase)
 		{
-			((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(world, pos, player));
+			((TileBase) tile).setDirection(BlockPistonBase.getFacingFromEntity(pos, player));
 		}
 	}
 

src/main/java/storagecraft/block/BlockCable.java

@@ -28,30 +28,6 @@ public class BlockCable extends BlockBase
 		return new TileCable();
 	}
 
-	@Override
-	public int getRenderType()
-	{
-		return -1;
-	}
-
-	@Override
-	public boolean isOpaqueCube()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isFullCube()
-	{
-		return false;
-	}
-
-	@Override
-	public boolean isNormalCube()
-	{
-		return false;
-	}
-
 	@Override
 	public boolean isVisuallyOpaque()
 	{

src/main/java/storagecraft/block/BlockConstructor.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockConstructor extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockController.java

@@ -4,15 +4,16 @@ import java.util.List;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
@@ -39,9 +40,9 @@ public class BlockController extends BlockBase
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 			TYPE,
@@ -81,7 +82,7 @@ public class BlockController extends BlockBase
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{
@@ -100,13 +101,13 @@ public class BlockController extends BlockBase
 	}
 
 	@Override
-	public boolean hasComparatorInputOverride()
+	public boolean hasComparatorInputOverride(IBlockState state)
 	{
 		return true;
 	}
 
 	@Override
-	public int getComparatorInputOverride(World world, BlockPos pos)
+	public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos)
 	{
 		return ((TileController) world.getTileEntity(pos)).getEnergyScaled(15);
 	}

src/main/java/storagecraft/block/BlockCrafter.java

@@ -2,9 +2,11 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +26,7 @@ public class BlockCrafter extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockDestructor.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockDestructor extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockDetector.java

@@ -2,12 +2,14 @@ package storagecraft.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
@@ -24,9 +26,9 @@ public class BlockDetector extends BlockMachine
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 			CONNECTED,
@@ -48,7 +50,7 @@ public class BlockDetector extends BlockMachine
 	}
 
 	@Override
-	public int getWeakPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side)
+	public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
 	{
 		TileDetector detector = (TileDetector) world.getTileEntity(pos);
 
@@ -61,9 +63,9 @@ public class BlockDetector extends BlockMachine
 	}
 
 	@Override
-	public int getStrongPower(IBlockAccess world, BlockPos pos, IBlockState state, EnumFacing side)
+	public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
 	{
-		return getWeakPower(world, pos, state, side);
+		return getWeakPower(state, world, pos, side);
 	}
 
 	public boolean canProvidePower()
@@ -72,7 +74,7 @@ public class BlockDetector extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockDrive.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockDrive extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockExporter.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockExporter extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockExternalStorage.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockExternalStorage extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockGrid.java

@@ -3,15 +3,16 @@ package storagecraft.block;
 import java.util.List;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -42,9 +43,9 @@ public class BlockGrid extends BlockMachine
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 			CONNECTED,
@@ -65,7 +66,7 @@ public class BlockGrid extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockImporter.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockImporter extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockMachine.java

@@ -2,9 +2,9 @@ package storagecraft.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import storagecraft.tile.TileMachine;
 
@@ -24,9 +24,9 @@ public abstract class BlockMachine extends BlockBase
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 			CONNECTED

src/main/java/storagecraft/block/BlockSolderer.java

@@ -2,9 +2,10 @@ package storagecraft.block;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -24,7 +25,7 @@ public class BlockSolderer extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/block/BlockStorage.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
@@ -13,8 +13,9 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
@@ -42,9 +43,9 @@ public class BlockStorage extends BlockMachine
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 			CONNECTED,
@@ -71,7 +72,7 @@ public class BlockStorage extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{
@@ -113,20 +114,20 @@ public class BlockStorage extends BlockMachine
 	}
 
 	@Override
-	public boolean removedByPlayer(World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
+	public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest)
 	{
 		if (willHarvest)
 		{
 			return true;
 		}
 
-		return super.removedByPlayer(world, pos, player, willHarvest);
+		return super.removedByPlayer(state, world, pos, player, willHarvest);
 	}
 
 	@Override
-	public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile)
+	public void harvestBlock(World world, EntityPlayer player, BlockPos pos, IBlockState state, TileEntity tile, ItemStack stack)
 	{
-		super.harvestBlock(world, player, pos, state, tile);
+		super.harvestBlock(world, player, pos, state, tile, stack);
 
 		world.setBlockToAir(pos);
 	}

src/main/java/storagecraft/block/BlockWirelessTransmitter.java

@@ -2,12 +2,14 @@ package storagecraft.block;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockState;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
@@ -24,9 +26,9 @@ public class BlockWirelessTransmitter extends BlockMachine
 	}
 
 	@Override
-	protected BlockState createBlockState()
+	protected BlockStateContainer createBlockState()
 	{
-		return new BlockState(this, new IProperty[]
+		return new BlockStateContainer(this, new IProperty[]
 		{
 			DIRECTION,
 			CONNECTED,
@@ -48,7 +50,7 @@ public class BlockWirelessTransmitter extends BlockMachine
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
+	public boolean onBlockActivated(World world, net.minecraft.util.math.BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
 	{
 		if (!world.isRemote)
 		{

src/main/java/storagecraft/container/ContainerBase.java

@@ -3,6 +3,7 @@ package storagecraft.container;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -56,7 +57,7 @@ public abstract class ContainerBase extends Container
 	}
 
 	@Override
-	public ItemStack slotClick(int id, int clickedButton, int mode, EntityPlayer player)
+	public ItemStack func_184996_a(int id, int clickedButton, ClickType clickType, EntityPlayer player)
 	{
 		Slot slot = id >= 0 ? getSlot(id) : null;
 
@@ -78,7 +79,7 @@ public abstract class ContainerBase extends Container
 			return null;
 		}
 
-		return super.slotClick(id, clickedButton, mode, player);
+		return super.func_184996_a(id, clickedButton, clickType, player);
 	}
 
 	@Override

src/main/java/storagecraft/container/ContainerGrid.java

@@ -1,6 +1,7 @@
 package storagecraft.container;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import storagecraft.StorageCraftItems;
@@ -71,13 +72,13 @@ public class ContainerGrid extends ContainerBase
 	}
 
 	@Override
-	public ItemStack slotClick(int id, int clickedButton, int mode, EntityPlayer player)
+	public ItemStack func_184996_a(int id, int clickedButton, ClickType mode, EntityPlayer player)
 	{
 		if (id >= 0 && getSlot(id) instanceof SlotDisabled)
 		{
 			grid.onPatternCreate();
 		}
 
-		return super.slotClick(id, clickedButton, mode, player);
+		return super.func_184996_a(id, clickedButton, mode, player);
 	}
 }

src/main/java/storagecraft/gui/GuiBase.java

@@ -10,7 +10,7 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import org.lwjgl.opengl.GL11;
 import storagecraft.StorageCraft;
 import storagecraft.gui.sidebutton.SideButton;
@@ -218,7 +218,7 @@ public abstract class GuiBase extends GuiContainer
 
 	public String t(String name, Object... format)
 	{
-		return StatCollector.translateToLocalFormatted(name, format);
+		return I18n.translateToLocalFormatted(name, format);
 	}
 
 	public abstract void init(int x, int y);

src/main/java/storagecraft/gui/GuiGrid.java

@@ -12,6 +12,7 @@ import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundEvent;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import storagecraft.StorageCraft;
@@ -350,7 +351,7 @@ public class GuiGrid extends GuiBase
 
 		if (clickedClear)
 		{
-			mc.getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
+			mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(new SoundEvent(new ResourceLocation("gui.button.press")), 1.0F));
 		}
 	}
 

src/main/java/storagecraft/gui/GuiHandler.java

@@ -3,7 +3,7 @@ package storagecraft.gui;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.network.IGuiHandler;
 import storagecraft.StorageCraftGUI;

src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java

@@ -1,6 +1,6 @@
 package storagecraft.gui.sidebutton;
 
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import storagecraft.StorageCraft;
 import storagecraft.gui.GuiBase;
 import storagecraft.network.MessageCompareUpdate;
@@ -23,7 +23,7 @@ public class SideButtonCompare extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(EnumChatFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:compare." + mask)).append(EnumChatFormatting.RESET).append("\n");
+		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:compare." + mask)).append(TextFormatting.RESET).append("\n");
 
 		if ((setting.getCompare() & mask) == mask)
 		{

src/main/java/storagecraft/gui/sidebutton/SideButtonDetectorMode.java

@@ -2,7 +2,7 @@ package storagecraft.gui.sidebutton;
 
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import storagecraft.StorageCraft;
 import storagecraft.gui.GuiBase;
 import storagecraft.network.MessageDetectorModeUpdate;
@@ -22,7 +22,7 @@ public class SideButtonDetectorMode extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(EnumChatFormatting.GREEN).append(gui.t("sidebutton.storagecraft:detector.mode")).append(EnumChatFormatting.RESET).append("\n");
+		builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.storagecraft:detector.mode")).append(TextFormatting.RESET).append("\n");
 
 		builder.append(gui.t("sidebutton.storagecraft:detector.mode." + detector.getMode()));
 

src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java

@@ -1,6 +1,6 @@
 package storagecraft.gui.sidebutton;
 
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import storagecraft.StorageCraft;
 import storagecraft.gui.GuiBase;
 import storagecraft.network.MessageGridSortingUpdate;
@@ -20,7 +20,7 @@ public class SideButtonGridSortingDirection extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(EnumChatFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.direction")).append(EnumChatFormatting.RESET).append("\n");
+		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.direction")).append(TextFormatting.RESET).append("\n");
 
 		builder.append(gui.t("sidebutton.storagecraft:sorting.direction." + grid.getSortingDirection()));
 

src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java

@@ -1,6 +1,6 @@
 package storagecraft.gui.sidebutton;
 
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import storagecraft.StorageCraft;
 import storagecraft.gui.GuiBase;
 import storagecraft.network.MessageGridSortingUpdate;
@@ -20,7 +20,7 @@ public class SideButtonGridSortingType extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(EnumChatFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.type")).append(EnumChatFormatting.RESET).append("\n");
+		builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.type")).append(TextFormatting.RESET).append("\n");
 
 		builder.append(gui.t("sidebutton.storagecraft:sorting.type." + grid.getSortingType()));
 

src/main/java/storagecraft/gui/sidebutton/SideButtonMode.java

@@ -1,6 +1,6 @@
 package storagecraft.gui.sidebutton;
 
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import storagecraft.StorageCraft;
 import storagecraft.gui.GuiBase;
 import storagecraft.network.MessageModeToggle;
@@ -20,7 +20,7 @@ public class SideButtonMode extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(EnumChatFormatting.GREEN).append(gui.t("sidebutton.storagecraft:mode")).append(EnumChatFormatting.RESET).append("\n");
+		builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.storagecraft:mode")).append(TextFormatting.RESET).append("\n");
 
 		builder.append(gui.t("sidebutton.storagecraft:mode." + (mode.isWhitelist() ? "whitelist" : "blacklist")));
 

src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java

@@ -1,6 +1,6 @@
 package storagecraft.gui.sidebutton;
 
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import storagecraft.StorageCraft;
 import storagecraft.gui.GuiBase;
 import storagecraft.network.MessageRedstoneModeUpdate;
@@ -20,7 +20,7 @@ public class SideButtonRedstoneMode extends SideButton
 	{
 		StringBuilder builder = new StringBuilder();
 
-		builder.append(EnumChatFormatting.RED).append(gui.t("sidebutton.storagecraft:redstone_mode")).append(EnumChatFormatting.RESET).append("\n");
+		builder.append(TextFormatting.RED).append(gui.t("sidebutton.storagecraft:redstone_mode")).append(TextFormatting.RESET).append("\n");
 
 		builder.append(gui.t("sidebutton.storagecraft:redstone_mode." + setting.getRedstoneMode().id));
 

src/main/java/storagecraft/inventory/InventorySimple.java

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 
 public class InventorySimple implements IInventory
 {
@@ -160,7 +160,7 @@ public class InventorySimple implements IInventory
 	}
 
 	@Override
-	public IChatComponent getDisplayName()
+	public ITextComponent getDisplayName()
 	{
 		return null;
 	}

src/main/java/storagecraft/item/ItemBlockStorage.java

@@ -5,7 +5,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 import storagecraft.block.EnumStorageType;
 import storagecraft.storage.NBTStorage;
@@ -29,11 +29,11 @@ public class ItemBlockStorage extends ItemBlockBase
 
 			if (type == EnumStorageType.TYPE_CREATIVE)
 			{
-				list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(tag)));
+				list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(tag)));
 			}
 			else
 			{
-				list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity()));
+				list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(tag), type.getCapacity()));
 			}
 		}
 	}

src/main/java/storagecraft/item/ItemPattern.java

@@ -7,7 +7,7 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 
 public class ItemPattern extends ItemBase
@@ -26,7 +26,7 @@ public class ItemPattern extends ItemBase
 		{
 			ItemStack result = getPatternResult(player.worldObj, stack);
 
-			list.add(StatCollector.translateToLocalFormatted("misc.storagecraft:pattern.tooltip", result.stackSize, result.getDisplayName()));
+			list.add(I18n.translateToLocalFormatted("misc.storagecraft:pattern.tooltip", result.stackSize, result.getDisplayName()));
 		}
 	}
 

src/main/java/storagecraft/item/ItemStorageCell.java

@@ -5,7 +5,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 import storagecraft.storage.CellStorage;
 import storagecraft.storage.NBTStorage;
@@ -41,11 +41,11 @@ public class ItemStorageCell extends ItemBase
 	{
 		if (CellStorage.getCapacity(cell) == -1)
 		{
-			list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(cell.getTagCompound())));
+			list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored"), NBTStorage.getStored(cell.getTagCompound())));
 		}
 		else
 		{
-			list.add(String.format(StatCollector.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell)));
+			list.add(String.format(I18n.translateToLocal("misc.storagecraft:storage.stored_capacity"), NBTStorage.getStored(cell.getTagCompound()), CellStorage.getCapacity(cell)));
 		}
 	}
 

src/main/java/storagecraft/item/ItemWirelessGrid.java

@@ -6,9 +6,12 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.ActionResult;
-import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 import storagecraft.StorageCraft;
 import storagecraft.StorageCraftGUI;
@@ -43,12 +46,12 @@ public class ItemWirelessGrid extends ItemBase
 	{
 		if (isValid(stack))
 		{
-			list.add(StatCollector.translateToLocalFormatted("misc.storagecraft:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack)));
+			list.add(I18n.translateToLocalFormatted("misc.storagecraft:wireless_grid.tooltip", getX(stack), getY(stack), getZ(stack)));
 		}
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
+	public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand)
 	{
 		if (!world.isRemote)
 		{
@@ -72,35 +75,41 @@ public class ItemWirelessGrid extends ItemBase
 
 							if (grid == null)
 							{
-								player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage())));
+								player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.no_grid." + stack.getItemDamage())));
 							}
 							else
 							{
 								player.openGui(StorageCraft.INSTANCE, StorageCraftGUI.GRID, world, grid.getPos().getX(), grid.getPos().getY(), grid.getPos().getZ());
+
+								return new ActionResult(EnumActionResult.SUCCESS, stack);
 							}
 						}
 						else
 						{
-							player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_working")));
+							player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_working")));
 						}
 					}
 					else
 					{
-						player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_found")));
+						player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_found")));
 					}
 				}
 				else
 				{
-					player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.out_of_range")));
+					player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.out_of_range")));
 				}
 			}
 			else
 			{
-				player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage())));
+				player.addChatComponentMessage(new TextComponentString(I18n.translateToLocal("misc.storagecraft:wireless_grid.not_set." + stack.getItemDamage())));
 			}
-		}
 
-		return stack;
+			return new ActionResult(EnumActionResult.FAIL, stack);
+		}
+		else
+		{
+			return new ActionResult(EnumActionResult.PASS, stack);
+		}
 	}
 
 	public static int getX(ItemStack stack)

src/main/java/storagecraft/jei/PluginStorageCraft.java

@@ -1,10 +1,7 @@
 package storagecraft.jei;
 
-import mezz.jei.api.IItemRegistry;
+import mezz.jei.api.BlankModPlugin;
-import mezz.jei.api.IJeiHelpers;
-import mezz.jei.api.IModPlugin;
 import mezz.jei.api.IModRegistry;
-import mezz.jei.api.IRecipeRegistry;
 import mezz.jei.api.JEIPlugin;
 import net.minecraft.item.Item;
 import storagecraft.StorageCraftBlocks;
@@ -13,38 +10,18 @@ import storagecraft.storage.CellStorage;
 import storagecraft.tile.TileStorage;
 
 @JEIPlugin
-public class PluginStorageCraft implements IModPlugin
+public class PluginStorageCraft extends BlankModPlugin
 {
-	private IItemRegistry itemRegistry;
-	private IJeiHelpers jeiHelpers;
-
-	@Override
-	public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers)
-	{
-		this.jeiHelpers = jeiHelpers;
-	}
-
-	@Override
-	public void onItemRegistryAvailable(IItemRegistry itemRegistry)
-	{
-		this.itemRegistry = itemRegistry;
-	}
-
 	@Override
 	public void register(IModRegistry registry)
 	{
-		registry.addRecipeCategories(new SoldererRecipeCategory(jeiHelpers.getGuiHelper()));
+		registry.addRecipeCategories(new SoldererRecipeCategory(registry.getJeiHelpers().getGuiHelper()));
 
 		registry.addRecipeHandlers(new SoldererRecipeHandler());
 
 		registry.addRecipes(SoldererRecipeMaker.getRecipes());
 
-		jeiHelpers.getNbtIgnoreList().ignoreNbtTagNames(StorageCraftItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED);
+		registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(StorageCraftItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED);
-		jeiHelpers.getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), TileStorage.NBT_STORAGE);
+		registry.getJeiHelpers().getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), TileStorage.NBT_STORAGE);
-	}
-
-	@Override
-	public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry)
-	{
 	}
 }

src/main/java/storagecraft/jei/SoldererRecipeCategory.java

@@ -9,7 +9,7 @@ import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 
 public class SoldererRecipeCategory implements IRecipeCategory
 {
@@ -29,7 +29,7 @@ public class SoldererRecipeCategory implements IRecipeCategory
 	@Override
 	public String getTitle()
 	{
-		return StatCollector.translateToLocal("gui.storagecraft:solderer");
+		return I18n.translateToLocal("gui.storagecraft:solderer");
 	}
 
 	@Override

src/main/java/storagecraft/network/MessageCompareUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.settings.ICompareSetting;
 

src/main/java/storagecraft/network/MessageDetectorAmountUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.TileDetector;
 

src/main/java/storagecraft/network/MessageDetectorModeUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.TileDetector;
 

src/main/java/storagecraft/network/MessageGridCraftingClear.java

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.block.EnumGridType;
 import storagecraft.tile.TileGrid;

src/main/java/storagecraft/network/MessageGridCraftingUpdate.java

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;

src/main/java/storagecraft/network/MessageGridSortingUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.TileGrid;
 

src/main/java/storagecraft/network/MessageModeToggle.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.settings.IModeSetting;
 

src/main/java/storagecraft/network/MessagePriorityUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.TileDrive;
 import storagecraft.tile.TileExternalStorage;

src/main/java/storagecraft/network/MessageRedstoneModeUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.settings.IRedstoneModeSetting;
 

src/main/java/storagecraft/network/MessageStoragePull.java

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.storage.StorageItem;
 import storagecraft.tile.TileController;

src/main/java/storagecraft/network/MessageStoragePush.java

@@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import storagecraft.tile.TileController;
 

src/main/java/storagecraft/network/MessageTileUpdate.java

@@ -3,7 +3,7 @@ package storagecraft.network;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;

src/main/java/storagecraft/proxy/ClientProxy.java

@@ -1,9 +1,9 @@
 package storagecraft.proxy;
 
 import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.block.model.ModelBakery;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.block.statemap.StateMap;
-import net.minecraft.client.resources.model.ModelBakery;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;

src/main/java/storagecraft/tile/INetworkTile.java

@@ -1,7 +1,7 @@
 package storagecraft.tile;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public interface INetworkTile
 {

src/main/java/storagecraft/tile/TileBase.java

@@ -5,11 +5,11 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
+import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ITickable;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint;
 import storagecraft.StorageCraft;
@@ -34,7 +34,7 @@ public abstract class TileBase extends TileEntity implements ITickable
 		{
 			if (this instanceof INetworkTile)
 			{
-				TargetPoint target = new TargetPoint(worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE);
+				TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE);
 
 				StorageCraft.NETWORK.sendToAllAround(new MessageTileUpdate(this), target);
 			}
@@ -74,11 +74,11 @@ public abstract class TileBase extends TileEntity implements ITickable
 
 		nbt.setInteger(NBT_DIRECTION, direction.ordinal());
 
-		return new S35PacketUpdateTileEntity(pos, 1, nbt);
+		return new SPacketUpdateTileEntity(pos, 1, nbt);
 	}
 
 	@Override
-	public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet)
+	public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet)
 	{
 		direction = EnumFacing.getFront(packet.getNbtCompound().getInteger(NBT_DIRECTION));
 	}

src/main/java/storagecraft/tile/TileCable.java

@@ -2,8 +2,8 @@ package storagecraft.tile;
 
 import java.util.List;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import storagecraft.block.BlockCable;
 

src/main/java/storagecraft/tile/TileConstructor.java

@@ -5,7 +5,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import storagecraft.inventory.InventorySimple;
 import storagecraft.tile.settings.ICompareSetting;
 import storagecraft.util.InventoryUtils;
@@ -31,7 +31,7 @@ public class TileConstructor extends TileMachine implements ICompareSetting
 		{
 			BlockPos front = pos.offset(getDirection());
 
-			if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial().isLiquid()) && inventory.getStackInSlot(0) != null)
+			if ((worldObj.isAirBlock(front) || worldObj.getBlockState(front).getBlock().getMaterial(worldObj.getBlockState(front)).isLiquid()) && inventory.getStackInSlot(0) != null)
 			{
 				ItemStack took = getController().take(inventory.getStackInSlot(0).copy(), compare);
 

src/main/java/storagecraft/tile/TileController.java

@@ -9,8 +9,8 @@ import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.common.network.ByteBufUtils;
 import storagecraft.StorageCraftBlocks;
 import storagecraft.block.BlockController;

src/main/java/storagecraft/tile/TileDestructor.java

@@ -2,8 +2,9 @@ package storagecraft.tile;
 
 import java.util.List;
 import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import storagecraft.util.InventoryUtils;
 
 public class TileDestructor extends TileMachine
@@ -21,9 +22,10 @@ public class TileDestructor extends TileMachine
 		{
 			BlockPos front = pos.offset(getDirection());
 
-			Block frontBlock = worldObj.getBlockState(front).getBlock();
+			IBlockState frontBlockState = worldObj.getBlockState(front);
+			Block frontBlock = frontBlockState.getBlock();
 
-			if (!frontBlock.isAir(worldObj, front))
+			if (!frontBlock.isAir(frontBlockState, worldObj, front))
 			{
 				List<ItemStack> drops = frontBlock.getDrops(worldObj, front, worldObj.getBlockState(front), 0);
 

src/main/java/storagecraft/tile/TileDrive.java

@@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import storagecraft.inventory.InventorySimple;
 import storagecraft.storage.CellStorage;
 import storagecraft.storage.IStorage;
@@ -202,7 +202,7 @@ public class TileDrive extends TileMachine implements IInventory, IStorageProvid
 	}
 
 	@Override
-	public IChatComponent getDisplayName()
+	public ITextComponent getDisplayName()
 	{
 		return inventory.getDisplayName();
 	}

src/main/java/storagecraft/tile/TileGrid.java

@@ -126,7 +126,7 @@ public class TileGrid extends TileMachine
 			onCraftingMatrixChanged();
 
 			// @TODO: HACK!
-			TargetPoint target = new TargetPoint(worldObj.provider.getDimensionId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE);
+			TargetPoint target = new TargetPoint(worldObj.provider.getDimensionType().getId(), pos.getX(), pos.getY(), pos.getZ(), UPDATE_RANGE);
 
 			StorageCraft.NETWORK.sendToAllAround(new MessageGridCraftingUpdate(this), target);
 		}

src/main/java/storagecraft/tile/TileMachine.java

@@ -3,7 +3,7 @@ package storagecraft.tile;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import storagecraft.block.BlockMachine;
 import storagecraft.tile.settings.IRedstoneModeSetting;
 import storagecraft.tile.settings.RedstoneMode;

src/main/java/storagecraft/tile/TileSolderer.java

@@ -7,7 +7,7 @@ import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import storagecraft.inventory.InventorySimple;
@@ -266,7 +266,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven
 	}
 
 	@Override
-	public IChatComponent getDisplayName()
+	public ITextComponent getDisplayName()
 	{
 		return inventory.getDisplayName();
 	}

src/main/java/storagecraft/tile/TileWirelessTransmitter.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import storagecraft.block.EnumGridType;
 import storagecraft.inventory.InventorySimple;
 import storagecraft.item.ItemWirelessGrid;
@@ -270,7 +270,7 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory
 	}
 
 	@Override
-	public IChatComponent getDisplayName()
+	public ITextComponent getDisplayName()
 	{
 		return inventory.getDisplayName();
 	}

src/main/java/storagecraft/tile/crafting/TileCrafter.java

@@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.ITextComponent;
 import storagecraft.inventory.InventorySimple;
 import storagecraft.tile.TileMachine;
 import storagecraft.util.InventoryUtils;
@@ -137,7 +137,7 @@ public class TileCrafter extends TileMachine implements IInventory
 	}
 
 	@Override
-	public IChatComponent getDisplayName()
+	public ITextComponent getDisplayName()
 	{
 		return inventory.getDisplayName();
 	}

src/main/java/storagecraft/tile/settings/ICompareSetting.java

@@ -1,6 +1,6 @@
 package storagecraft.tile.settings;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public interface ICompareSetting
 {

src/main/java/storagecraft/tile/settings/IModeSetting.java

@@ -1,6 +1,6 @@
 package storagecraft.tile.settings;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public interface IModeSetting
 {

src/main/java/storagecraft/tile/settings/IRedstoneModeSetting.java

@@ -1,6 +1,6 @@
 package storagecraft.tile.settings;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 public interface IRedstoneModeSetting
 {

src/main/java/storagecraft/tile/settings/RedstoneMode.java

@@ -1,6 +1,6 @@
 package storagecraft.tile.settings;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public enum RedstoneMode