1.15 port

src/main/java/appeng/block/AEBaseBlock.java

@@ -25,26 +25,26 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.state.IProperty;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
@@ -101,20 +101,20 @@ public abstract class AEBaseBlock extends Block
 	}
 
 	@Override
-	public final boolean isNormalCube( IBlockState state )
+	public final boolean isNormalCube( BlockState state )
 	{
 		return this.isFullSize() && this.isOpaque();
 	}
 
 	@Override
-	public AxisAlignedBB getBoundingBox( IBlockState state, IBlockAccess source, BlockPos pos )
+	public AxisAlignedBB getBoundingBox( BlockState state, IBlockReader source, BlockPos pos )
 	{
 		return this.boundingBox;
 	}
 
 	@SuppressWarnings( "deprecation" )
 	@Override
-	public void addCollisionBoxToList( final IBlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, @Nullable final Entity e, boolean p_185477_7_ )
+	public void addCollisionBoxToList( final BlockState state, final World w, final BlockPos pos, final AxisAlignedBB bb, final List<AxisAlignedBB> out, @Nullable final Entity e, boolean p_185477_7_ )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
 
@@ -139,8 +139,8 @@ public abstract class AEBaseBlock extends Block
 
 	@SuppressWarnings( "deprecation" )
 	@Override
-	@SideOnly( Side.CLIENT )
-	public AxisAlignedBB getSelectedBoundingBox( IBlockState state, final World w, final BlockPos pos )
+	@OnlyIn( Dist.CLIENT )
+	public AxisAlignedBB getSelectedBoundingBox( BlockState state, final World w, final BlockPos pos )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
 
@@ -148,10 +148,10 @@ public abstract class AEBaseBlock extends Block
 		{
 			if( Platform.isClient() )
 			{
-				final EntityPlayer player = Minecraft.getMinecraft().player;
+				final PlayerEntity player = Minecraft.getInstance().player;
 				final LookDirection ld = Platform.getPlayerRay( player, Platform.getEyeOffset( player ) );
 
-				final Iterable<AxisAlignedBB> bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, Minecraft.getMinecraft().player, true );
+				final Iterable<AxisAlignedBB> bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, Minecraft.getInstance().player, true );
 				AxisAlignedBB br = null;
 
 				double lastDist = 0;
@@ -225,14 +225,14 @@ public abstract class AEBaseBlock extends Block
 	}
 
 	@Override
-	public final boolean isOpaqueCube( IBlockState state )
+	public final boolean isOpaqueCube( BlockState state )
 	{
 		return this.isOpaque();
 	}
 
 	@SuppressWarnings( "deprecation" )
 	@Override
-	public RayTraceResult collisionRayTrace( final IBlockState state, final World w, final BlockPos pos, final Vec3d a, final Vec3d b )
+	public RayTraceResult collisionRayTrace( final BlockState state, final World w, final BlockPos pos, final Vec3d a, final Vec3d b )
 	{
 		final ICustomCollision collisionHandler = this.getCustomCollision( w, pos );
 
@@ -279,25 +279,25 @@ public abstract class AEBaseBlock extends Block
 	}
 
 	@Override
-	public boolean hasComparatorInputOverride( IBlockState state )
+	public boolean hasComparatorInputOverride( BlockState state )
 	{
 		return this.isInventory();
 	}
 
 	@Override
-	public int getComparatorInputOverride( IBlockState state, final World worldIn, final BlockPos pos )
+	public int getComparatorInputOverride( BlockState state, final World worldIn, final BlockPos pos )
 	{
 		return 0;
 	}
 
 	@Override
-	public final boolean isNormalCube( IBlockState state, final IBlockAccess world, final BlockPos pos )
+	public final boolean isNormalCube( BlockState state, final IBlockReader world, final BlockPos pos )
 	{
 		return this.isFullSize();
 	}
 
 	@Override
-	public boolean rotateBlock( final World w, final BlockPos pos, final EnumFacing axis )
+	public boolean rotateBlock( final World w, final BlockPos pos, final Direction axis )
 	{
 		final IOrientable rotatable = this.getOrientable( w, pos );
 
@@ -310,8 +310,8 @@ public abstract class AEBaseBlock extends Block
 			}
 			else
 			{
-				EnumFacing forward = rotatable.getForward();
-				EnumFacing up = rotatable.getUp();
+				Direction forward = rotatable.getForward();
+				Direction up = rotatable.getUp();
 
 				for( int rs = 0; rs < 4; rs++ )
 				{
@@ -331,24 +331,24 @@ public abstract class AEBaseBlock extends Block
 	}
 
 	@Override
-	public EnumFacing[] getValidRotations( final World w, final BlockPos pos )
+	public Direction[] getValidRotations( final World w, final BlockPos pos )
 	{
-		return new EnumFacing[0];
+		return new Direction[0];
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public void addInformation( final ItemStack is, final World world, final List<String> lines, final ITooltipFlag advancedItemTooltips )
 	{
 
 	}
 
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		return false;
 	}
 
-	public final EnumFacing mapRotation( final IOrientable ori, final EnumFacing dir )
+	public final Direction mapRotation( final IOrientable ori, final Direction dir )
 	{
 		// case DOWN: return bottomIcon;
 		// case UP: return blockIcon;
@@ -357,8 +357,8 @@ public abstract class AEBaseBlock extends Block
 		// case WEST: return sideIcon;
 		// case EAST: return sideIcon;
 
-		final EnumFacing forward = ori.getForward();
-		final EnumFacing up = ori.getUp();
+		final Direction forward = ori.getForward();
+		final Direction up = ori.getUp();
 
 		if( forward == null || up == null )
 		{
@@ -369,8 +369,8 @@ public abstract class AEBaseBlock extends Block
 		final int west_y = forward.getFrontOffsetZ() * up.getFrontOffsetX() - forward.getFrontOffsetX() * up.getFrontOffsetZ();
 		final int west_z = forward.getFrontOffsetX() * up.getFrontOffsetY() - forward.getFrontOffsetY() * up.getFrontOffsetX();
 
-		EnumFacing west = null;
-		for( final EnumFacing dx : EnumFacing.VALUES )
+		Direction west = null;
+		for( final Direction dx : Direction.VALUES )
 		{
 			if( dx.getFrontOffsetX() == west_x && dx.getFrontOffsetY() == west_y && dx.getFrontOffsetZ() == west_z )
 			{
@@ -385,29 +385,29 @@ public abstract class AEBaseBlock extends Block
 
 		if( dir == forward )
 		{
-			return EnumFacing.SOUTH;
+			return Direction.SOUTH;
 		}
 		if( dir == forward.getOpposite() )
 		{
-			return EnumFacing.NORTH;
+			return Direction.NORTH;
 		}
 
 		if( dir == up )
 		{
-			return EnumFacing.UP;
+			return Direction.UP;
 		}
 		if( dir == up.getOpposite() )
 		{
-			return EnumFacing.DOWN;
+			return Direction.DOWN;
 		}
 
 		if( dir == west )
 		{
-			return EnumFacing.WEST;
+			return Direction.WEST;
 		}
 		if( dir == west.getOpposite() )
 		{
-			return EnumFacing.EAST;
+			return Direction.EAST;
 		}
 
 		return null;
@@ -420,9 +420,9 @@ public abstract class AEBaseBlock extends Block
 		return this.getClass().getSimpleName() + "[" + regName + "]";
 	}
 
-	protected String getUnlocalizedName( final ItemStack is )
+	protected String getTranslationKey( final ItemStack is )
 	{
-		return this.getUnlocalizedName();
+		return this.getTranslationKey();
 	}
 
 	protected boolean hasCustomRotation()
@@ -430,12 +430,12 @@ public abstract class AEBaseBlock extends Block
 		return false;
 	}
 
-	protected void customRotateBlock( final IOrientable rotatable, final EnumFacing axis )
+	protected void customRotateBlock( final IOrientable rotatable, final Direction axis )
 	{
 
 	}
 
-	protected IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
+	protected IOrientable getOrientable( final IBlockReader w, final BlockPos pos )
 	{
 		if( this instanceof IOrientableBlock )
 		{
@@ -445,7 +445,7 @@ public abstract class AEBaseBlock extends Block
 		return null;
 	}
 
-	protected boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
+	protected boolean isValidOrientation( final World w, final BlockPos pos, final Direction forward, final Direction up )
 	{
 		return true;
 	}

src/main/java/appeng/block/AEBaseItemBlock.java

@@ -22,17 +22,17 @@ package appeng.block;
 import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
@@ -43,12 +43,12 @@ import appeng.me.helpers.IGridProxyable;
 import appeng.tile.AEBaseTile;
 
 
-public class AEBaseItemBlock extends ItemBlock
+public class AEBaseBlockItem extends BlockItem
 {
 
 	private final AEBaseBlock blockType;
 
-	public AEBaseItemBlock( final Block id )
+	public AEBaseBlockItem( final Block id )
 	{
 		super( id );
 		this.blockType = (AEBaseBlock) id;
@@ -66,13 +66,13 @@ public class AEBaseItemBlock extends ItemBlock
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public final void addInformation( final ItemStack itemStack, final World world, final List<String> toolTip, final ITooltipFlag advancedTooltips )
 	{
 		this.addCheckedInformation( itemStack, world, toolTip, advancedTooltips );
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void addCheckedInformation( final ItemStack itemStack, final World world, final List<String> toolTip, final ITooltipFlag advancedTooltips )
 	{
 		this.blockType.addInformation( itemStack, world, toolTip, advancedTooltips );
@@ -85,46 +85,46 @@ public class AEBaseItemBlock extends ItemBlock
 	}
 
 	@Override
-	public String getUnlocalizedName( final ItemStack is )
+	public String getTranslationKey( final ItemStack is )
 	{
-		return this.blockType.getUnlocalizedName( is );
+		return this.blockType.getTranslationKey( is );
 	}
 
 	@Override
-	public boolean placeBlockAt( final ItemStack stack, final EntityPlayer player, final World w, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final IBlockState newState )
+	public boolean placeBlockAt( final ItemStack stack, final PlayerEntity player, final World w, final BlockPos pos, final Direction side, final float hitX, final float hitY, final float hitZ, final BlockState newState )
 	{
-		EnumFacing up = null;
-		EnumFacing forward = null;
+		Direction up = null;
+		Direction forward = null;
 
 		if( this.blockType instanceof AEBaseTileBlock )
 		{
 			if( this.blockType instanceof BlockLightDetector )
 			{
 				up = side;
-				if( up == EnumFacing.UP || up == EnumFacing.DOWN )
+				if( up == Direction.UP || up == Direction.DOWN )
 				{
-					forward = EnumFacing.SOUTH;
+					forward = Direction.SOUTH;
 				}
 				else
 				{
-					forward = EnumFacing.UP;
+					forward = Direction.UP;
 				}
 			}
 			else if( this.blockType instanceof BlockWireless || this.blockType instanceof BlockSkyCompass )
 			{
 				forward = side;
-				if( forward == EnumFacing.UP || forward == EnumFacing.DOWN )
+				if( forward == Direction.UP || forward == Direction.DOWN )
 				{
-					up = EnumFacing.SOUTH;
+					up = Direction.SOUTH;
 				}
 				else
 				{
-					up = EnumFacing.UP;
+					up = Direction.UP;
 				}
 			}
 			else
 			{
-				up = EnumFacing.UP;
+				up = Direction.UP;
 
 				final byte rotation = (byte) ( MathHelper.floor( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
 
@@ -132,28 +132,28 @@ public class AEBaseItemBlock extends ItemBlock
 				{
 					default:
 					case 0:
-						forward = EnumFacing.SOUTH;
+						forward = Direction.SOUTH;
 						break;
 					case 1:
-						forward = EnumFacing.WEST;
+						forward = Direction.WEST;
 						break;
 					case 2:
-						forward = EnumFacing.NORTH;
+						forward = Direction.NORTH;
 						break;
 					case 3:
-						forward = EnumFacing.EAST;
+						forward = Direction.EAST;
 						break;
 				}
 
 				if( player.rotationPitch > 65 )
 				{
 					up = forward.getOpposite();
-					forward = EnumFacing.UP;
+					forward = Direction.UP;
 				}
 				else if( player.rotationPitch < -65 )
 				{
 					up = forward.getOpposite();
-					forward = EnumFacing.DOWN;
+					forward = Direction.DOWN;
 				}
 			}
 		}
@@ -163,10 +163,10 @@ public class AEBaseItemBlock extends ItemBlock
 		{
 			ori = ( (IOrientableBlock) this.blockType ).getOrientable( w, pos );
 			up = side;
-			forward = EnumFacing.SOUTH;
+			forward = Direction.SOUTH;
 			if( up.getFrontOffsetY() == 0 )
 			{
-				forward = EnumFacing.UP;
+				forward = Direction.UP;
 			}
 		}
 

src/main/java/appeng/block/AEBaseItemBlockChargeable.java

@@ -25,10 +25,10 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
@@ -40,19 +40,19 @@ import appeng.core.localization.GuiText;
 import appeng.util.Platform;
 
 
-public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEItemPowerStorage
+public class AEBaseBlockItemChargeable extends AEBaseBlockItem implements IAEItemPowerStorage
 {
 
-	public AEBaseItemBlockChargeable( final Block id )
+	public AEBaseBlockItemChargeable( final Block id )
 	{
 		super( id );
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void addCheckedInformation( final ItemStack stack, final World world, final List<String> lines, final ITooltipFlag advancedTooltips )
 	{
-		final NBTTagCompound tag = stack.getTagCompound();
+		final CompoundNBT tag = stack.getTagCompound();
 		double internalCurrentPower = 0;
 		final double internalMaxPower = this.getMaxEnergyCapacity();
 
@@ -143,13 +143,13 @@ public class AEBaseItemBlockChargeable extends AEBaseItemBlock implements IAEIte
 
 	private double getInternal( final ItemStack is )
 	{
-		final NBTTagCompound nbt = Platform.openNbtData( is );
+		final CompoundNBT nbt = Platform.openNbtData( is );
 		return nbt.getDouble( "internalCurrentPower" );
 	}
 
 	private void setInternal( final ItemStack is, final double amt )
 	{
-		final NBTTagCompound nbt = Platform.openNbtData( is );
+		final CompoundNBT nbt = Platform.openNbtData( is );
 		nbt.setDouble( "internalCurrentPower", amt );
 	}
 }

src/main/java/appeng/block/AEBaseTileBlock.java

@@ -28,20 +28,23 @@ import javax.annotation.Nullable;
 import com.google.common.collect.Lists;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockStateContainer;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.EnumDyeColor;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.DyeColor;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
@@ -78,7 +81,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	public static final UnlistedDirection UP = new UnlistedDirection( "up" );
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		// A subclass may decide it doesn't want extended block state for whatever reason
 		if( !( state instanceof IExtendedBlockState ) )
@@ -106,7 +109,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public int getMetaFromState( IBlockState state )
+	public int getMetaFromState( BlockState state )
 	{
 		return 0;
 	}
@@ -119,7 +122,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public boolean hasTileEntity( IBlockState state )
+	public boolean hasTileEntity( BlockState state )
 	{
 		return this.hasBlockTileEntity();
 	}
@@ -135,13 +138,13 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Nullable
-	public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final int x, final int y, final int z )
+	public <T extends AEBaseTile> T getTileEntity( final IBlockReader w, final int x, final int y, final int z )
 	{
 		return this.getTileEntity( w, new BlockPos( x, y, z ) );
 	}
 
 	@Nullable
-	public <T extends AEBaseTile> T getTileEntity( final IBlockAccess w, final BlockPos pos )
+	public <T extends AEBaseTile> T getTileEntity( final IBlockReader w, final BlockPos pos )
 	{
 		if( !this.hasBlockTileEntity() )
 		{
@@ -158,7 +161,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public final TileEntity createNewTileEntity( final World var1, final int var2 )
+	public final TileEntity createTileEntity( BlockState state, IBlockReader world )
 	{
 		if( this.hasBlockTileEntity() )
 		{
@@ -180,7 +183,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public void breakBlock( final World w, final BlockPos pos, final IBlockState state )
+	public void breakBlock( final World w, final BlockPos pos, final BlockState state )
 	{
 		final AEBaseTile te = this.getTileEntity( w, pos );
 		if( te != null )
@@ -204,19 +207,19 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public final EnumFacing[] getValidRotations( final World w, final BlockPos pos )
+	public final Direction[] getValidRotations( final World w, final BlockPos pos )
 	{
 		final AEBaseTile obj = this.getTileEntity( w, pos );
 		if( obj != null && obj.canBeRotated() )
 		{
-			return EnumFacing.VALUES;
+			return Direction.values();
 		}
 
 		return super.getValidRotations( w, pos );
 	}
 
 	@Override
-	public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color )
+	public boolean recolorBlock( BlockState state, final IWorld world, final BlockPos pos, final Direction side, final DyeColor color )
 	{
 		final TileEntity te = this.getTileEntity( world, pos );
 
@@ -224,7 +227,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 		{
 			final IColorableTile ct = (IColorableTile) te;
 			final AEColor c = ct.getColor();
-			final AEColor newColor = AEColor.values()[color.getMetadata()];
+			final AEColor newColor = AEColor.values()[color.ordinal()];
 
 			if( c != newColor )
 			{
@@ -234,11 +237,11 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 			return false;
 		}
 
-		return super.recolorBlock( world, pos, side, color );
+		return super.recolorBlock( state, world, pos, side, color );
 	}
 
 	@Override
-	public int getComparatorInputOverride( IBlockState state, final World w, final BlockPos pos )
+	public int getComparatorInputOverride( BlockState state, final World w, final BlockPos pos )
 	{
 		final TileEntity te = this.getTileEntity( w, pos );
 		if( te instanceof AEBaseInvTile )
@@ -253,7 +256,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public boolean eventReceived( final IBlockState state, final World worldIn, final BlockPos pos, final int eventID, final int eventParam )
+	public boolean eventReceived( final BlockState state, final World worldIn, final BlockPos pos, final int eventID, final int eventParam )
 	{
 		super.eventReceived( state, worldIn, pos, eventID, eventParam );
 		final TileEntity tileentity = worldIn.getTileEntity( pos );
@@ -261,7 +264,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public void onBlockPlacedBy( final World w, final BlockPos pos, final IBlockState state, final EntityLivingBase placer, final ItemStack is )
+	public void onBlockPlacedBy( final World w, final BlockPos pos, final BlockState state, final LivingEntity placer, final ItemStack is )
 	{
 		if( is.hasDisplayName() )
 		{
@@ -274,16 +277,16 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public boolean onBlockActivated( World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ )
+	public ActionResultType onBlockActivated( BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit )
 	{
 		ItemStack heldItem;
 		if( player != null && !player.getHeldItem( hand ).isEmpty() )
 		{
 			heldItem = player.getHeldItem( hand );
 
-			if( Platform.isWrench( player, heldItem, pos ) && player.isSneaking() )
+			if( Platform.isWrench( player, heldItem, pos ) && player.isShiftKeyDown() )
 			{
-				final IBlockState blockState = world.getBlockState( pos );
+				final BlockState blockState = world.getBlockState( pos );
 				final Block block = blockState.getBlock();
 
 				if( block == null )
@@ -310,10 +313,10 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 				{
 					if( Platform.itemComparisons().isEqualItemType( ol, op ) )
 					{
-						final NBTTagCompound tag = tile.downloadSettings( SettingsFrom.DISMANTLE_ITEM );
+						final CompoundNBT tag = tile.downloadSettings( SettingsFrom.DISMANTLE_ITEM );
 						if( tag != null )
 						{
-							ol.setTagCompound( tag );
+							ol.setTag( tag );
 						}
 					}
 				}
@@ -338,11 +341,11 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					return false;
 				}
 
-				final String name = this.getUnlocalizedName();
+				final String name = this.getTranslationKey();
 
-				if( player.isSneaking() )
+				if( player.isShiftKeyDown() )
 				{
-					final NBTTagCompound data = tileEntity.downloadSettings( SettingsFrom.MEMORY_CARD );
+					final CompoundNBT data = tileEntity.downloadSettings( SettingsFrom.MEMORY_CARD );
 					if( data != null )
 					{
 						memoryCard.setMemoryCardContents( heldItem, name, data );
@@ -352,9 +355,9 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 				else
 				{
 					final String savedName = memoryCard.getSettingsName( heldItem );
-					final NBTTagCompound data = memoryCard.getData( heldItem );
+					final CompoundNBT data = memoryCard.getData( heldItem );
 
-					if( this.getUnlocalizedName().equals( savedName ) )
+					if( this.getTranslationKey().equals( savedName ) )
 					{
 						tileEntity.uploadSettings( SettingsFrom.MEMORY_CARD, data );
 						memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
@@ -373,7 +376,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
+	public IOrientable getOrientable( final IBlockReader w, final BlockPos pos )
 	{
 		return this.getTileEntity( w, pos );
 	}

src/main/java/appeng/block/UnlistedBlockAccess.java

@@ -19,11 +19,11 @@
 package appeng.block;
 
 
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraftforge.common.property.IUnlistedProperty;
 
 
-public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess>
+public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockReader>
 {
 	@Override
 	public String getName()
@@ -32,19 +32,19 @@ public final class UnlistedBlockAccess implements IUnlistedProperty<IBlockAccess
 	}
 
 	@Override
-	public boolean isValid( final IBlockAccess value )
+	public boolean isValid( final IBlockReader value )
 	{
 		return true;
 	}
 
 	@Override
-	public Class<IBlockAccess> getType()
+	public Class<IBlockReader> getType()
 	{
-		return IBlockAccess.class;
+		return IBlockReader.class;
 	}
 
 	@Override
-	public String valueToString( final IBlockAccess value )
+	public String valueToString( final IBlockReader value )
 	{
 		return null;
 	}

src/main/java/appeng/block/UnlistedDirection.java

@@ -19,11 +19,11 @@
 package appeng.block;
 
 
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.property.IUnlistedProperty;
 
 
-public class UnlistedDirection implements IUnlistedProperty<EnumFacing>
+public class UnlistedDirection implements IUnlistedProperty<Direction>
 {
 
 	private final String name;
@@ -40,19 +40,19 @@ public class UnlistedDirection implements IUnlistedProperty<EnumFacing>
 	}
 
 	@Override
-	public boolean isValid( EnumFacing value )
+	public boolean isValid( Direction value )
 	{
 		return value != null;
 	}
 
 	@Override
-	public Class<EnumFacing> getType()
+	public Class<Direction> getType()
 	{
-		return EnumFacing.class;
+		return Direction.class;
 	}
 
 	@Override
-	public String valueToString( EnumFacing value )
+	public String valueToString( Direction value )
 	{
 		return value.getName();
 	}

src/main/java/appeng/block/crafting/BlockCraftingMonitor.java

@@ -19,19 +19,19 @@
 package appeng.block.crafting;
 
 
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEColor;
 import appeng.client.UnlistedProperty;
@@ -60,11 +60,11 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 	}
 
 	@Override
-	public IExtendedBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public IExtendedBlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		AEColor color = AEColor.TRANSPARENT;
-		EnumFacing forward = EnumFacing.NORTH;
-		EnumFacing up = EnumFacing.UP;
+		Direction forward = Direction.NORTH;
+		Direction up = Direction.UP;
 
 		TileCraftingMonitorTile te = this.getTileEntity( world, pos );
 		if( te != null )
@@ -81,7 +81,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		itemStacks.add( new ItemStack( this, 1, 0 ) );

src/main/java/appeng/block/crafting/BlockCraftingUnit.java

@@ -22,17 +22,17 @@ package appeng.block.crafting;
 import java.util.EnumSet;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockStateContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.state.IProperty;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
@@ -69,12 +69,12 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}
 
 	@Override
-	public IExtendedBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public IExtendedBlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 
-		EnumSet<EnumFacing> connections = EnumSet.noneOf( EnumFacing.class );
+		EnumSet<Direction> connections = EnumSet.noneOf( Direction.class );
 
-		for( EnumFacing facing : EnumFacing.values() )
+		for( Direction facing : Direction.values() )
 		{
 			if( this.isConnected( world, pos, facing ) )
 			{
@@ -87,7 +87,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 		return extState.withProperty( STATE, new CraftingCubeState( connections ) );
 	}
 
-	private boolean isConnected( IBlockAccess world, BlockPos pos, EnumFacing side )
+	private boolean isConnected( IBlockReader world, BlockPos pos, Direction side )
 	{
 		BlockPos adjacentPos = pos.offset( side );
 		return world.getBlockState( adjacentPos ).getBlock() instanceof BlockCraftingUnit;
@@ -100,13 +100,13 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getStateFromMeta( final int meta )
+	public BlockState getStateFromMeta( final int meta )
 	{
 		return this.getDefaultState().withProperty( POWERED, ( meta & 1 ) == 1 ).withProperty( FORMED, ( meta & 2 ) == 2 );
 	}
 
 	@Override
-	public int getMetaFromState( final IBlockState state )
+	public int getMetaFromState( final BlockState state )
 	{
 		boolean p = state.getValue( POWERED );
 		boolean f = state.getValue( FORMED );
@@ -114,7 +114,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World worldIn, final BlockPos pos, final Block blockIn, final BlockPos fromPos )
+	public void neighborChanged( final BlockState state, final World worldIn, final BlockPos pos, final Block blockIn, final BlockPos fromPos )
 	{
 		final TileCraftingTile cp = this.getTileEntity( worldIn, pos );
 		if( cp != null )
@@ -130,7 +130,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}
 
 	@Override
-	public void breakBlock( final World w, final BlockPos pos, final IBlockState state )
+	public void breakBlock( final World w, final BlockPos pos, final BlockState state )
 	{
 		final TileCraftingTile cp = this.getTileEntity( w, pos );
 		if( cp != null )
@@ -142,11 +142,11 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onBlockActivated( final World w, final BlockPos pos, final BlockState state, final PlayerEntity p, final Hand hand, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileCraftingTile tg = this.getTileEntity( w, pos );
 
-		if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() )
+		if( tg != null && !p.isShiftKeyDown() && tg.isFormed() && tg.isActive() )
 		{
 			if( Platform.isClient() )
 			{

src/main/java/appeng/block/crafting/BlockMolecularAssembler.java

@@ -22,16 +22,16 @@ package appeng.block.crafting;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEPartLocation;
 import appeng.block.AEBaseTileBlock;
@@ -60,7 +60,7 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader worldIn, BlockPos pos )
 	{
 		boolean powered = false;
 		TileMolecularAssembler te = this.getTileEntity( worldIn, pos );
@@ -76,31 +76,31 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 	 * NOTE: This is only used to determine how to render an item being held in hand.
 	 * For determining block rendering, the method below is used (canRenderInLayer).
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public BlockRenderLayer getBlockLayer()
 	{
 		return BlockRenderLayer.CUTOUT;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
-	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
+	public boolean canRenderInLayer( BlockState state, BlockRenderLayer layer )
 	{
 		return layer == BlockRenderLayer.CUTOUT || layer == BlockRenderLayer.TRANSLUCENT;
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}
 
 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onBlockActivated( final World w, final BlockPos pos, final BlockState state, final PlayerEntity p, final Hand hand, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileMolecularAssembler tg = this.getTileEntity( w, pos );
-		if( tg != null && !p.isSneaking() )
+		if( tg != null && !p.isShiftKeyDown() )
 		{
 			Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_MAC );
 			return true;

src/main/java/appeng/block/crafting/ItemCraftingStorage.java

@@ -23,12 +23,12 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;
-import appeng.block.AEBaseItemBlock;
+import appeng.block.AEBaseBlockItem;
 import appeng.core.AEConfig;
 import appeng.core.features.AEFeature;
 
 
-public class ItemCraftingStorage extends AEBaseItemBlock
+public class ItemCraftingStorage extends AEBaseBlockItem
 {
 
 	public ItemCraftingStorage( final Block id )

src/main/java/appeng/block/grindstone/BlockCrank.java

@@ -24,16 +24,16 @@ import javax.annotation.Nullable;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockFaceShape;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
 
@@ -57,7 +57,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		if( player instanceof FakePlayer || player == null )
 		{
@@ -84,16 +84,16 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public void onBlockPlacedBy( final World world, final BlockPos pos, final IBlockState state, final EntityLivingBase placer, final ItemStack stack )
+	public void onBlockPlacedBy( final World world, final BlockPos pos, final BlockState state, final LivingEntity placer, final ItemStack stack )
 	{
 		final AEBaseTile tile = this.getTileEntity( world, pos );
 		if( tile != null )
 		{
-			final EnumFacing mnt = this.findCrankable( world, pos );
-			EnumFacing forward = EnumFacing.UP;
-			if( mnt == EnumFacing.UP || mnt == EnumFacing.DOWN )
+			final Direction mnt = this.findCrankable( world, pos );
+			Direction forward = Direction.UP;
+			if( mnt == Direction.UP || mnt == Direction.DOWN )
 			{
-				forward = EnumFacing.SOUTH;
+				forward = Direction.SOUTH;
 			}
 			tile.setOrientation( forward, mnt.getOpposite() );
 		}
@@ -104,15 +104,15 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
+	public boolean isValidOrientation( final World w, final BlockPos pos, final Direction forward, final Direction up )
 	{
 		final TileEntity te = w.getTileEntity( pos );
 		return !( te instanceof TileCrank ) || this.isCrankable( w, pos, up.getOpposite() );
 	}
 
-	private EnumFacing findCrankable( final World world, final BlockPos pos )
+	private Direction findCrankable( final World world, final BlockPos pos )
 	{
-		for( final EnumFacing dir : EnumFacing.VALUES )
+		for( final Direction dir : Direction.VALUES )
 		{
 			if( this.isCrankable( world, pos, dir ) )
 			{
@@ -122,7 +122,7 @@ public class BlockCrank extends AEBaseTileBlock
 		return null;
 	}
 
-	private boolean isCrankable( final World world, final BlockPos pos, final EnumFacing offset )
+	private boolean isCrankable( final World world, final BlockPos pos, final Direction offset )
 	{
 		final BlockPos o = pos.offset( offset );
 		final TileEntity te = world.getTileEntity( o );
@@ -131,13 +131,13 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public EnumBlockRenderType getRenderType( IBlockState state )
+	public EnumBlockRenderType getRenderType( BlockState state )
 	{
 		return EnumBlockRenderType.ENTITYBLOCK_ANIMATED;
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 
 		final AEBaseTile tile = this.getTileEntity( world, pos );
@@ -161,19 +161,19 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}
 
 	@Override
-	public boolean canPlaceTorchOnTop( IBlockState state, IBlockAccess world, BlockPos pos )
+	public boolean canPlaceTorchOnTop( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		return false;
 	}
 
 	@Override
-	public BlockFaceShape getBlockFaceShape( IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face )
+	public BlockFaceShape getBlockFaceShape( IBlockReader worldIn, BlockState state, BlockPos pos, Direction face )
 	{
 		return BlockFaceShape.UNDEFINED;
 	}

src/main/java/appeng/block/grindstone/BlockGrinder.java

@@ -22,10 +22,10 @@ package appeng.block.grindstone;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -47,10 +47,10 @@ public class BlockGrinder extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileGrinder tg = this.getTileEntity( w, pos );
-		if( tg != null && !p.isSneaking() )
+		if( tg != null && !p.isShiftKeyDown() )
 		{
 			Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_GRINDER );
 			return true;

src/main/java/appeng/block/grindstone/CrankRendering.java

@@ -19,8 +19,8 @@
 package appeng.block.grindstone;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -32,7 +32,7 @@ public class CrankRendering extends BlockRenderingCustomizer
 {
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.tesr( new CrankTESR() );

src/main/java/appeng/block/misc/BlockCellWorkbench.java

@@ -22,10 +22,10 @@ package appeng.block.misc;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -45,9 +45,9 @@ public class BlockCellWorkbench extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}

src/main/java/appeng/block/misc/BlockCharger.java

@@ -27,23 +27,23 @@ import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.lwjgl.util.vector.Matrix4f;
-import org.lwjgl.util.vector.Vector3f;
 
+import net.minecraft.block.BlockState;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.renderer.Matrix4f;
+import net.minecraft.client.renderer.Vector3f;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.AEApi;
 import appeng.api.util.AEAxisAlignedBB;
@@ -71,9 +71,9 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( player.isSneaking() )
+		if( player.isShiftKeyDown() )
 		{
 			return false;
 		}
@@ -91,8 +91,8 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
-	public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r )
+	@OnlyIn( Dist.CLIENT )
+	public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random r )
 	{
 		if( !AEConfig.instance().isEnableEffects() )
 		{
@@ -121,7 +121,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 					{
 						final LightningFX fx = new LightningFX( w, xOff + 0.5 + pos.getX(), yOff + 0.5 + pos.getY(), zOff + 0.5 + pos
 								.getZ(), 0.0D, 0.0D, 0.0D );
-						Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+						Minecraft.getInstance().effectRenderer.addEffect( fx );
 					}
 				}
 			}
@@ -135,8 +135,8 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 		if( tile != null )
 		{
 			final double twoPixels = 2.0 / 16.0;
-			final EnumFacing up = tile.getUp();
-			final EnumFacing forward = tile.getForward();
+			final Direction up = tile.getUp();
+			final Direction forward = tile.getForward();
 			final AEAxisAlignedBB bb = new AEAxisAlignedBB( twoPixels, twoPixels, twoPixels, 1.0 - twoPixels, 1.0 - twoPixels, 1.0 - twoPixels );
 
 			if( up.getFrontOffsetX() != 0 )
@@ -190,13 +190,13 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 		out.add( new AxisAlignedBB( 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ) );
 	}
 
-	@SideOnly( Side.CLIENT )
-	public static TileEntitySpecialRenderer<TileCharger> createTesr()
+	@OnlyIn( Dist.CLIENT )
+	public static TileEntityRenderer<TileCharger> createTesr()
 	{
 		return new ModularTESR<>( new ItemRenderable<>( BlockCharger::getRenderedItem ) );
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private static Pair<ItemStack, Matrix4f> getRenderedItem( TileCharger tile )
 	{
 		Matrix4f transform = new Matrix4f();

src/main/java/appeng/block/misc/BlockCondenser.java

@@ -22,10 +22,10 @@ package appeng.block.misc;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -45,9 +45,9 @@ public class BlockCondenser extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( player.isSneaking() )
+		if( player.isShiftKeyDown() )
 		{
 			return false;
 		}
@@ -55,7 +55,7 @@ public class BlockCondenser extends AEBaseTileBlock
 		if( Platform.isServer() )
 		{
 			final TileCondenser tc = this.getTileEntity( w, pos );
-			if( tc != null && !player.isSneaking() )
+			if( tc != null && !player.isShiftKeyDown() )
 			{
 				Platform.openGUI( player, tc, AEPartLocation.fromFacing( side ), GuiBridge.GUI_CONDENSER );
 				return true;

src/main/java/appeng/block/misc/BlockInscriber.java

@@ -22,12 +22,12 @@ package appeng.block.misc;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -50,9 +50,9 @@ public class BlockInscriber extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}
@@ -70,14 +70,14 @@ public class BlockInscriber extends AEBaseTileBlock
 	}
 
 	@Override
-	public EnumBlockRenderType getRenderType( IBlockState state )
+	public EnumBlockRenderType getRenderType( BlockState state )
 	{
 		return EnumBlockRenderType.MODEL;
 	}
 
 	@Override
-	public String getUnlocalizedName( final ItemStack is )
+	public String getTranslationKey( final ItemStack is )
 	{
-		return super.getUnlocalizedName( is );
+		return super.getTranslationKey( is );
 	}
 }

src/main/java/appeng/block/misc/BlockInterface.java

@@ -24,13 +24,13 @@ import javax.annotation.Nullable;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
@@ -58,7 +58,7 @@ public class BlockInterface extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		// Determine whether the interface is omni-directional or not
 		TileInterface te = this.getTileEntity( world, pos );
@@ -73,9 +73,9 @@ public class BlockInterface extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}
@@ -99,7 +99,7 @@ public class BlockInterface extends AEBaseTileBlock
 	}
 
 	@Override
-	protected void customRotateBlock( final IOrientable rotatable, final EnumFacing axis )
+	protected void customRotateBlock( final IOrientable rotatable, final Direction axis )
 	{
 		if( rotatable instanceof TileInterface )
 		{

src/main/java/appeng/block/misc/BlockLightDetector.java

@@ -28,16 +28,16 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.properties.PropertyDirection;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
@@ -60,22 +60,22 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	{
 		super( Material.CIRCUITS );
 
-		this.setDefaultState( this.blockState.getBaseState().withProperty( FACING, EnumFacing.UP ).withProperty( ODD, false ) );
+		this.setDefaultState( this.blockState.getBaseState().withProperty( FACING, Direction.UP ).withProperty( ODD, false ) );
 		this.setLightOpacity( 0 );
 		this.setFullSize( false );
 		this.setOpaque( false );
 	}
 
 	@Override
-	public int getMetaFromState( final IBlockState state )
+	public int getMetaFromState( final BlockState state )
 	{
 		return state.getValue( FACING ).ordinal();
 	}
 
 	@Override
-	public IBlockState getStateFromMeta( final int meta )
+	public BlockState getStateFromMeta( final int meta )
 	{
-		EnumFacing facing = EnumFacing.values()[meta];
+		Direction facing = Direction.values()[meta];
 		return this.getDefaultState().withProperty( FACING, facing );
 	}
 
@@ -86,7 +86,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public int getWeakPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side )
+	public int getWeakPower( final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side )
 	{
 		if( w instanceof World && ( (TileLightDetector) this.getTileEntity( w, pos ) ).isReady() )
 		{
@@ -97,7 +97,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void onNeighborChange( final IBlockAccess world, final BlockPos pos, final BlockPos neighbor )
+	public void onNeighborChange( final IBlockReader world, final BlockPos pos, final BlockPos neighbor )
 	{
 		super.onNeighborChange( world, pos, neighbor );
 
@@ -109,18 +109,18 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void randomDisplayTick( final IBlockState state, final World worldIn, final BlockPos pos, final Random rand )
+	public void randomDisplayTick( final BlockState state, final World worldIn, final BlockPos pos, final Random rand )
 	{
 		// cancel out lightning
 	}
 
 	@Override
-	public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
+	public boolean isValidOrientation( final World w, final BlockPos pos, final Direction forward, final Direction up )
 	{
 		return this.canPlaceAt( w, pos, up.getOpposite() );
 	}
 
-	private boolean canPlaceAt( final World w, final BlockPos pos, final EnumFacing dir )
+	private boolean canPlaceAt( final World w, final BlockPos pos, final Direction dir )
 	{
 		return w.isSideSolid( pos.offset( dir ), dir.getOpposite(), false );
 	}
@@ -128,7 +128,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	@Override
 	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity thePlayer, final boolean b )
 	{
-		final EnumFacing up = this.getOrientable( w, pos ).getUp();
+		final Direction up = this.getOrientable( w, pos ).getUp();
 		final double xOff = -0.3 * up.getFrontOffsetX();
 		final double yOff = -0.3 * up.getFrontOffsetY();
 		final double zOff = -0.3 * up.getFrontOffsetZ();
@@ -147,9 +147,9 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final EnumFacing up = this.getOrientable( world, pos ).getUp();
+		final Direction up = this.getOrientable( world, pos ).getUp();
 		if( !this.canPlaceAt( world, pos, up.getOpposite() ) )
 		{
 			this.dropTorch( world, pos );
@@ -158,7 +158,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 
 	private void dropTorch( final World w, final BlockPos pos )
 	{
-		final IBlockState prev = w.getBlockState( pos );
+		final BlockState prev = w.getBlockState( pos );
 		w.destroyBlock( pos, true );
 		w.notifyBlockUpdate( pos, prev, w.getBlockState( pos ), 3 );
 	}
@@ -166,7 +166,7 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	@Override
 	public boolean canPlaceBlockAt( final World w, final BlockPos pos )
 	{
-		for( final EnumFacing dir : EnumFacing.VALUES )
+		for( final Direction dir : Direction.VALUES )
 		{
 			if( this.canPlaceAt( w, pos, dir ) )
 			{
@@ -183,20 +183,20 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public BlockRenderLayer getBlockLayer()
 	{
 		return BlockRenderLayer.CUTOUT;
 	}
 
 	@Override
-	public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
+	public IOrientable getOrientable( final IBlockReader w, final BlockPos pos )
 	{
 		return new MetaRotation( w, pos, FACING );
 	}

src/main/java/appeng/block/misc/BlockQuartzFixture.java

@@ -28,17 +28,17 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.properties.PropertyDirection;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.IOrientable;
 import appeng.api.util.IOrientableBlock;
@@ -63,7 +63,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	{
 		super( Material.CIRCUITS );
 
-		this.setDefaultState( this.blockState.getBaseState().withProperty( FACING, EnumFacing.UP ).withProperty( ODD, false ) );
+		this.setDefaultState( this.blockState.getBaseState().withProperty( FACING, Direction.UP ).withProperty( ODD, false ) );
 		this.setLightLevel( 0.9375F );
 		this.setLightOpacity( 0 );
 		this.setFullSize( false );
@@ -74,7 +74,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	 * Sets the "ODD" property of the block state according to the placement of the block.
 	 */
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader worldIn, BlockPos pos )
 	{
 		boolean oddPlacement = ( ( pos.getX() + pos.getY() + pos.getZ() ) % 2 ) != 0;
 
@@ -83,15 +83,15 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	}
 
 	@Override
-	public int getMetaFromState( final IBlockState state )
+	public int getMetaFromState( final BlockState state )
 	{
 		return state.getValue( FACING ).ordinal();
 	}
 
 	@Override
-	public IBlockState getStateFromMeta( final int meta )
+	public BlockState getStateFromMeta( final int meta )
 	{
-		EnumFacing facing = EnumFacing.values()[meta];
+		Direction facing = Direction.values()[meta];
 		return this.getDefaultState().withProperty( FACING, facing );
 	}
 
@@ -102,12 +102,12 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	}
 
 	@Override
-	public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
+	public boolean isValidOrientation( final World w, final BlockPos pos, final Direction forward, final Direction up )
 	{
 		return this.canPlaceAt( w, pos, up.getOpposite() );
 	}
 
-	private boolean canPlaceAt( final World w, final BlockPos pos, final EnumFacing dir )
+	private boolean canPlaceAt( final World w, final BlockPos pos, final Direction dir )
 	{
 		final BlockPos test = pos.offset( dir );
 		return w.isSideSolid( test, dir.getOpposite(), false );
@@ -116,7 +116,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	@Override
 	public Iterable<AxisAlignedBB> getSelectedBoundingBoxesFromPool( final World w, final BlockPos pos, final Entity e, final boolean isVisual )
 	{
-		final EnumFacing up = this.getOrientable( w, pos ).getUp();
+		final Direction up = this.getOrientable( w, pos ).getUp();
 		final double xOff = -0.3 * up.getFrontOffsetX();
 		final double yOff = -0.3 * up.getFrontOffsetY();
 		final double zOff = -0.3 * up.getFrontOffsetZ();
@@ -134,8 +134,8 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
-	public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r )
+	@OnlyIn( Dist.CLIENT )
+	public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random r )
 	{
 		if( !AEConfig.instance().isEnableEffects() )
 		{
@@ -147,7 +147,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 			return;
 		}
 
-		final EnumFacing up = this.getOrientable( w, pos ).getUp();
+		final Direction up = this.getOrientable( w, pos ).getUp();
 		final double xOff = -0.3 * up.getFrontOffsetX();
 		final double yOff = -0.3 * up.getFrontOffsetY();
 		final double zOff = -0.3 * up.getFrontOffsetZ();
@@ -157,15 +157,15 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 			{
 				final LightningFX fx = new LightningFX( w, xOff + 0.5 + pos.getX(), yOff + 0.5 + pos.getY(), zOff + 0.5 + pos.getZ(), 0.0D, 0.0D, 0.0D );
 
-				Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+				Minecraft.getInstance().effectRenderer.addEffect( fx );
 			}
 		}
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final EnumFacing up = this.getOrientable( world, pos ).getUp();
+		final Direction up = this.getOrientable( world, pos ).getUp();
 		if( !this.canPlaceAt( world, pos, up.getOpposite() ) )
 		{
 			this.dropTorch( world, pos );
@@ -174,7 +174,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 
 	private void dropTorch( final World w, final BlockPos pos )
 	{
-		final IBlockState prev = w.getBlockState( pos );
+		final BlockState prev = w.getBlockState( pos );
 		w.destroyBlock( pos, true );
 		w.notifyBlockUpdate( pos, prev, w.getBlockState( pos ), 3 );
 	}
@@ -182,7 +182,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	@Override
 	public boolean canPlaceBlockAt( final World w, final BlockPos pos )
 	{
-		for( final EnumFacing dir : EnumFacing.VALUES )
+		for( final Direction dir : Direction.VALUES )
 		{
 			if( this.canPlaceAt( w, pos, dir ) )
 			{
@@ -199,7 +199,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	}
 
 	@Override
-	public IOrientable getOrientable( final IBlockAccess w, final BlockPos pos )
+	public IOrientable getOrientable( final IBlockReader w, final BlockPos pos )
 	{
 		return new MetaRotation( w, pos, FACING );
 	}
@@ -211,13 +211,13 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public BlockRenderLayer getBlockLayer()
 	{
 		return BlockRenderLayer.CUTOUT;

src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java

@@ -25,14 +25,14 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.IOrientableBlock;
 import appeng.block.AEBaseTileBlock;
@@ -56,7 +56,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		TileQuartzGrowthAccelerator te = this.getTileEntity( world, pos );
 		boolean powered = te != null && te.isPowered();
@@ -71,9 +71,9 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
 		return new IProperty[] { POWERED };
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
-	public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r )
+	public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random r )
 	{
 		if( !AEConfig.instance().isEnableEffects() )
 		{
@@ -87,9 +87,9 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
 			final double d0 = r.nextFloat() - 0.5F;
 			final double d1 = r.nextFloat() - 0.5F;
 
-			final EnumFacing up = cga.getUp();
-			final EnumFacing forward = cga.getForward();
-			final EnumFacing west = Platform.crossProduct( forward, up );
+			final Direction up = cga.getUp();
+			final Direction forward = cga.getForward();
+			final Direction west = Platform.crossProduct( forward, up );
 
 			double rx = 0.5 + pos.getX();
 			double ry = 0.5 + pos.getY();
@@ -149,7 +149,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
 			rz += dz * forward.getFrontOffsetZ();
 
 			final LightningFX fx = new LightningFX( w, rx, ry, rz, 0.0D, 0.0D, 0.0D );
-			Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+			Minecraft.getInstance().effectRenderer.addEffect( fx );
 		}
 	}
 

src/main/java/appeng/block/misc/BlockSecurityStation.java

@@ -24,14 +24,14 @@ import javax.annotation.Nullable;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
@@ -66,7 +66,7 @@ public class BlockSecurityStation extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		boolean powered = false;
 		TileSecurityStation te = this.getTileEntity( world, pos );
@@ -80,9 +80,9 @@ public class BlockSecurityStation extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}

src/main/java/appeng/block/misc/BlockSkyCompass.java

@@ -24,11 +24,11 @@ import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -62,7 +62,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean isValidOrientation( final World w, final BlockPos pos, final EnumFacing forward, final EnumFacing up )
+	public boolean isValidOrientation( final World w, final BlockPos pos, final Direction forward, final Direction up )
 	{
 		final TileSkyCompass sc = this.getTileEntity( w, pos );
 		if( sc != null )
@@ -72,16 +72,16 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 		return this.canPlaceAt( w, pos, forward.getOpposite() );
 	}
 
-	private boolean canPlaceAt( final World w, final BlockPos pos, final EnumFacing dir )
+	private boolean canPlaceAt( final World w, final BlockPos pos, final Direction dir )
 	{
 		return w.isSideSolid( pos.offset( dir ), dir.getOpposite(), false );
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TileSkyCompass sc = this.getTileEntity( world, pos );
-		final EnumFacing forward = sc.getForward();
+		final Direction forward = sc.getForward();
 		if( !this.canPlaceAt( world, pos, forward.getOpposite() ) )
 		{
 			this.dropTorch( world, pos );
@@ -90,7 +90,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 
 	private void dropTorch( final World w, final BlockPos pos )
 	{
-		final IBlockState prev = w.getBlockState( pos );
+		final BlockState prev = w.getBlockState( pos );
 		w.destroyBlock( pos, true );
 		w.notifyBlockUpdate( pos, prev, w.getBlockState( pos ), 3 );
 	}
@@ -98,7 +98,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	@Override
 	public boolean canPlaceBlockAt( final World w, final BlockPos pos )
 	{
-		for( final EnumFacing dir : EnumFacing.VALUES )
+		for( final Direction dir : Direction.VALUES )
 		{
 			if( this.canPlaceAt( w, pos, dir ) )
 			{
@@ -114,7 +114,7 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 		final TileSkyCompass tile = this.getTileEntity( w, pos );
 		if( tile != null )
 		{
-			final EnumFacing forward = tile.getForward();
+			final Direction forward = tile.getForward();
 
 			double minX = 0;
 			double minY = 0;
@@ -177,13 +177,13 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public EnumBlockRenderType getRenderType( IBlockState state )
+	public EnumBlockRenderType getRenderType( BlockState state )
 	{
 		return EnumBlockRenderType.ENTITYBLOCK_ANIMATED;
 	}
 
 	@Override
-	public boolean isFullBlock( IBlockState state )
+	public boolean isFullBlock( BlockState state )
 	{
 		return false;
 	}

src/main/java/appeng/block/misc/BlockTinyTNT.java

@@ -27,16 +27,16 @@ import javax.annotation.Nullable;
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.init.Items;
+import net.minecraft.item.Items;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
@@ -66,13 +66,13 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		if( heldItem != null && heldItem.getItem() == Items.FLINT_AND_STEEL )
 		{
@@ -87,7 +87,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 		}
 	}
 
-	public void startFuse( final World w, final BlockPos pos, final EntityLivingBase igniter )
+	public void startFuse( final World w, final BlockPos pos, final LivingEntity igniter )
 	{
 		if( !w.isRemote )
 		{
@@ -99,7 +99,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		if( world.isBlockIndirectlyGettingPowered( pos ) > 0 )
 		{
@@ -109,7 +109,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public void onBlockAdded( final World w, final BlockPos pos, final IBlockState state )
+	public void onBlockAdded( final World w, final BlockPos pos, final BlockState state )
 	{
 		super.onBlockAdded( w, pos, state );
 
@@ -129,7 +129,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 
 			if( entityarrow.isBurning() )
 			{
-				this.startFuse( w, pos, entityarrow.shootingEntity instanceof EntityLivingBase ? (EntityLivingBase) entityarrow.shootingEntity : null );
+				this.startFuse( w, pos, entityarrow.shootingEntity instanceof LivingEntity ? (LivingEntity) entityarrow.shootingEntity : null );
 				w.setBlockToAir( pos );
 			}
 		}

src/main/java/appeng/block/misc/BlockVibrationChamber.java

@@ -26,14 +26,14 @@ import javax.annotation.Nullable;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
@@ -59,7 +59,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		TileVibrationChamber te = this.getTileEntity( world, pos );
 		boolean active = te != null && te.isOn;
@@ -75,9 +75,9 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( player.isSneaking() )
+		if( player.isShiftKeyDown() )
 		{
 			return false;
 		}
@@ -85,7 +85,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 		if( Platform.isServer() )
 		{
 			final TileVibrationChamber tc = this.getTileEntity( w, pos );
-			if( tc != null && !player.isSneaking() )
+			if( tc != null && !player.isShiftKeyDown() )
 			{
 				Platform.openGUI( player, tc, AEPartLocation.fromFacing( side ), GuiBridge.GUI_VIBRATION_CHAMBER );
 				return true;
@@ -96,7 +96,7 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 	}
 
 	@Override
-	public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random r )
+	public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random r )
 	{
 		if( !AEConfig.instance().isEnableEffects() )
 		{
@@ -113,8 +113,8 @@ public final class BlockVibrationChamber extends AEBaseTileBlock
 				float f2 = pos.getY() + 0.5F;
 				float f3 = pos.getZ() + 0.5F;
 
-				final EnumFacing forward = tc.getForward();
-				final EnumFacing up = tc.getUp();
+				final Direction forward = tc.getForward();
+				final Direction up = tc.getUp();
 
 				final int west_x = forward.getFrontOffsetY() * up.getFrontOffsetZ() - forward.getFrontOffsetZ() * up.getFrontOffsetY();
 				final int west_y = forward.getFrontOffsetZ() * up.getFrontOffsetX() - forward.getFrontOffsetX() * up.getFrontOffsetZ();

src/main/java/appeng/block/misc/InscriberRendering.java

@@ -2,8 +2,8 @@
 package appeng.block.misc;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -14,7 +14,7 @@ import appeng.client.render.tesr.InscriberTESR;
 public class InscriberRendering extends BlockRenderingCustomizer
 {
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{

src/main/java/appeng/block/misc/SecurityStationRendering.java

@@ -19,8 +19,8 @@
 package appeng.block.misc;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEColor;
 import appeng.bootstrap.BlockRenderingCustomizer;
@@ -34,7 +34,7 @@ public class SecurityStationRendering extends BlockRenderingCustomizer
 {
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.blockColor( ColorableTileBlockColor.INSTANCE );

src/main/java/appeng/block/misc/SkyCompassRendering.java

@@ -20,8 +20,8 @@ package appeng.block.misc;
 
 
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -36,7 +36,7 @@ public class SkyCompassRendering extends BlockRenderingCustomizer
 	private static final ModelResourceLocation ITEM_MODEL = new ModelResourceLocation( "appliedenergistics2:sky_compass", "normal" );
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.tesr( new SkyCompassTESR() );

src/main/java/appeng/block/networking/BlockCableBus.java

@@ -26,40 +26,40 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.BlockStateContainer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.ParticleDigging;
 import net.minecraft.client.particle.ParticleManager;
-import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.state.IProperty;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.RayTraceResult.Type;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.parts.IFacadeContainer;
 import appeng.api.parts.IFacadePart;
@@ -71,7 +71,6 @@ import appeng.block.AEBaseTileBlock;
 import appeng.client.UnlistedProperty;
 import appeng.client.render.cablebus.CableBusBakedModel;
 import appeng.client.render.cablebus.CableBusRenderState;
-import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketClick;
@@ -110,7 +109,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}
@@ -122,7 +121,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		CableBusRenderState renderState = this.cb( world, pos ).getRenderState();
 		renderState.setWorld( world );
@@ -131,25 +130,25 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public void randomDisplayTick( final IBlockState state, final World worldIn, final BlockPos pos, final Random rand )
+	public void randomDisplayTick( final BlockState state, final World worldIn, final BlockPos pos, final Random rand )
 	{
 		this.cb( worldIn, pos ).randomDisplayTick( worldIn, pos, rand );
 	}
 
 	@Override
-	public void onNeighborChange( final IBlockAccess w, final BlockPos pos, final BlockPos neighbor )
+	public void onNeighborChange( final IBlockReader w, final BlockPos pos, final BlockPos neighbor )
 	{
 		this.cb( w, pos ).onNeighborChanged( w, pos, neighbor );
 	}
 
 	@Override
-	public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
+	public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
 	{
 		return null;
 	}
 
 	@Override
-	public int getWeakPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side )
+	public int getWeakPower( final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side )
 	{
 		return this.cb( w, pos ).isProvidingWeakPower( side.getOpposite() ); // TODO:
 		// IS
@@ -157,19 +156,19 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public boolean canProvidePower( final IBlockState state )
+	public boolean canProvidePower( final BlockState state )
 	{
 		return true;
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock( final World w, final BlockPos pos, final IBlockState state, final Entity entityIn )
+	public void onEntityCollidedWithBlock( final World w, final BlockPos pos, final BlockState state, final Entity entityIn )
 	{
 		this.cb( w, pos ).onEntityCollision( entityIn );
 	}
 
 	@Override
-	public int getStrongPower( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side )
+	public int getStrongPower( final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side )
 	{
 		return this.cb( w, pos ).isProvidingStrongPower( side.getOpposite() ); // TODO:
 		// IS
@@ -177,7 +176,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public int getLightValue( final IBlockState state, final IBlockAccess world, final BlockPos pos )
+	public int getLightValue( final BlockState state, final IBlockReader world, final BlockPos pos )
 	{
 		if( state.getBlock() != this )
 		{
@@ -187,25 +186,25 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public boolean isLadder( final IBlockState state, final IBlockAccess world, final BlockPos pos, final EntityLivingBase entity )
+	public boolean isLadder( final BlockState state, final IBlockReader world, final BlockPos pos, final LivingEntity entity )
 	{
 		return this.cb( world, pos ).isLadder( entity );
 	}
 
 	@Override
-	public boolean isSideSolid( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side )
+	public boolean isSideSolid( final BlockState state, final IBlockReader w, final BlockPos pos, final Direction side )
 	{
 		return this.cb( w, pos ).isSolidOnSide( side );
 	}
 
 	@Override
-	public boolean isReplaceable( final IBlockAccess w, final BlockPos pos )
+	public boolean isReplaceable( final IBlockReader w, final BlockPos pos )
 	{
 		return this.cb( w, pos ).isEmpty();
 	}
 
 	@Override
-	public boolean removedByPlayer( final IBlockState state, final World world, final BlockPos pos, final EntityPlayer player, final boolean willHarvest )
+	public boolean removedByPlayer( final BlockState state, final World world, final BlockPos pos, final PlayerEntity player, final boolean willHarvest )
 	{
 		if( player.capabilities.isCreativeMode )
 		{
@@ -220,18 +219,18 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public boolean canConnectRedstone( final IBlockState state, final IBlockAccess w, final BlockPos pos, EnumFacing side )
+	public boolean canConnectRedstone( final BlockState state, final IBlockReader w, final BlockPos pos, Direction side )
 	{
 		if( side == null )
 		{
-			side = EnumFacing.UP;
+			side = Direction.UP;
 		}
 
 		return this.cb( w, pos ).canConnectRedstone( EnumSet.of( side ) );
 	}
 
 	@Override
-	public ItemStack getPickBlock( final IBlockState state, final RayTraceResult target, final World world, final BlockPos pos, final EntityPlayer player )
+	public ItemStack getPickBlock( final BlockState state, final RayTraceResult target, final World world, final BlockPos pos, final PlayerEntity player )
 	{
 		final Vec3d v3 = target.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() );
 		final SelectedPart sp = this.cb( world, pos ).selectPart( v3 );
@@ -249,8 +248,8 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
-	public boolean addHitEffects( final IBlockState state, final World world, final RayTraceResult target, final ParticleManager effectRenderer )
+	@OnlyIn( Dist.CLIENT )
+	public boolean addHitEffects( final BlockState state, final World world, final RayTraceResult target, final ParticleManager effectRenderer )
 	{
 
 		// Half the particle rate. Since we're spawning concentrated on a specific spot,
@@ -263,7 +262,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 		ICableBusContainer cb = this.cb( world, target.getBlockPos() );
 
 		// Our built-in model has the actual baked sprites we need
-		IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( this.getDefaultState() );
+		IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState( this.getDefaultState() );
 
 		// We cannot add the effect if we don't have the model
 		if( !( model instanceof CableBusBakedModel ) )
@@ -292,13 +291,13 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public boolean addDestroyEffects( final World world, final BlockPos pos, final ParticleManager effectRenderer )
 	{
 		ICableBusContainer cb = this.cb( world, pos );
 
 		// Our built-in model has the actual baked sprites we need
-		IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelForState( this.getDefaultState() );
+		IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState( this.getDefaultState() );
 
 		// We cannot add the effect if we dont have the model
 		if( !( model instanceof CableBusBakedModel ) )
@@ -341,7 +340,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		if( Platform.isServer() )
 		{
@@ -349,7 +348,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 		}
 	}
 
-	private ICableBusContainer cb( final IBlockAccess w, final BlockPos pos )
+	private ICableBusContainer cb( final IBlockReader w, final BlockPos pos )
 	{
 		final TileEntity te = w.getTileEntity( pos );
 		ICableBusContainer out = null;
@@ -363,7 +362,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Nullable
-	private IFacadeContainer fc( final IBlockAccess w, final BlockPos pos )
+	private IFacadeContainer fc( final IBlockReader w, final BlockPos pos )
 	{
 		final TileEntity te = w.getTileEntity( pos );
 		IFacadeContainer out = null;
@@ -377,43 +376,43 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	public void onBlockClicked( World worldIn, BlockPos pos, EntityPlayer playerIn )
+	public void onBlockClicked( World worldIn, BlockPos pos, PlayerEntity playerIn )
 	{
 		if( Platform.isClient() )
 		{
-			final RayTraceResult rtr = Minecraft.getMinecraft().objectMouseOver;
+			final RayTraceResult rtr = Minecraft.getInstance().objectMouseOver;
 			if( rtr != null && rtr.typeOfHit == Type.BLOCK && pos.equals( rtr.getBlockPos() ) )
 			{
 				final Vec3d hitVec = rtr.hitVec.subtract( new Vec3d( pos ) );
 
-				if( this.cb( worldIn, pos ).clicked( playerIn, EnumHand.MAIN_HAND, hitVec ) )
+				if( this.cb( worldIn, pos ).clicked( playerIn, Hand.MAIN_HAND, hitVec ) )
 				{
 					NetworkHandler.instance()
 							.sendToServer(
-									new PacketClick( pos, rtr.sideHit, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, EnumHand.MAIN_HAND, true ) );
+									new PacketClick( pos, rtr.sideHit, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, Hand.MAIN_HAND, true ) );
 				}
 			}
 		}
 	}
 
-	public void onBlockClickPacket( World worldIn, BlockPos pos, EntityPlayer playerIn, EnumHand hand, Vec3d hitVec )
+	public void onBlockClickPacket( World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, Vec3d hitVec )
 	{
 		this.cb( worldIn, pos ).clicked( playerIn, hand, hitVec );
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		return this.cb( w, pos ).activate( player, hand, new Vec3d( hitX, hitY, hitZ ) );
 	}
 
 	@Override
-	public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color )
+	public boolean recolorBlock( final World world, final BlockPos pos, final Direction side, final EnumDyeColor color )
 	{
 		return this.recolorBlock( world, pos, side, color, null );
 	}
 
-	public boolean recolorBlock( final World world, final BlockPos pos, final EnumFacing side, final EnumDyeColor color, final EntityPlayer who )
+	public boolean recolorBlock( final World world, final BlockPos pos, final Direction side, final EnumDyeColor color, final PlayerEntity who )
 	{
 		try
 		{
@@ -426,7 +425,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		// do nothing
@@ -434,7 +433,7 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 
 	public void setupTile()
 	{
-		noTesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBus.class );
+		noTesrTile = TileCableBus.class;
 		this.setTileEntity( noTesrTile );
 
 		GameRegistry.registerTileEntity( noTesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "BlockCableBus" );
@@ -445,22 +444,22 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 		}
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private static void setupTesr()
 	{
-		tesrTile = Api.INSTANCE.partHelper().getCombinedInstance( TileCableBusTESR.class );
+		tesrTile = TileCableBusTESR.class;
 		GameRegistry.registerTileEntity( tesrTile, AppEng.MOD_ID.toLowerCase() + ":" + "ClientOnly_TESR_CableBus" );
 		ClientRegistry.bindTileEntitySpecialRenderer( BlockCableBus.getTesrTile(), new CableBusTESR() );
 	}
 
 	@Override
-	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
+	public boolean canRenderInLayer( BlockState state, BlockRenderLayer layer )
 	{
 		return true;
 	}
 
 	@Override
-	public IBlockState getFacadeState( IBlockAccess world, BlockPos pos, EnumFacing side )
+	public BlockState getFacadeState( IBlockReader world, BlockPos pos, Direction side )
 	{
 		if( side != null )
 		{
@@ -488,10 +487,10 @@ public class BlockCableBus extends AEBaseTileBlock implements IAEFacade
 	}
 
 	// Helper to get access to the protected constructor
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private static class DestroyFX extends ParticleDigging
 	{
-		DestroyFX( World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, IBlockState state )
+		DestroyFX( World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, BlockState state )
 		{
 			super( worldIn, xCoordIn, yCoordIn, zCoordIn, xSpeedIn, ySpeedIn, zSpeedIn, state );
 		}

src/main/java/appeng/block/networking/BlockController.java

@@ -23,12 +23,12 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.block.AEBaseTileBlock;
@@ -98,7 +98,7 @@ public class BlockController extends AEBaseTileBlock
 	 * get a rudimentary connected texture feel for the controller based on how it is placed.
 	 */
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 
 		// Only used for columns, really
@@ -148,19 +148,19 @@ public class BlockController extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		return state;
 	}
 
 	@Override
-	public int getMetaFromState( final IBlockState state )
+	public int getMetaFromState( final BlockState state )
 	{
 		return state.getValue( CONTROLLER_STATE ).ordinal();
 	}
 
 	@Override
-	public IBlockState getStateFromMeta( final int meta )
+	public BlockState getStateFromMeta( final int meta )
 	{
 		ControllerBlockState state = ControllerBlockState.values()[meta];
 		return this.getDefaultState().withProperty( CONTROLLER_STATE, state );
@@ -173,7 +173,7 @@ public class BlockController extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TileController tc = this.getTileEntity( world, pos );
 		if( tc != null )

src/main/java/appeng/block/networking/BlockEnergyCell.java

@@ -21,13 +21,13 @@ package appeng.block.networking;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.NonNullList;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.block.AEBaseTileBlock;
 import appeng.helpers.AEGlassMaterial;
@@ -40,13 +40,13 @@ public class BlockEnergyCell extends AEBaseTileBlock
 	public static final PropertyInteger ENERGY_STORAGE = PropertyInteger.create( "fullness", 0, 7 );
 
 	@Override
-	public int getMetaFromState( final IBlockState state )
+	public int getMetaFromState( final BlockState state )
 	{
 		return state.getValue( ENERGY_STORAGE );
 	}
 
 	@Override
-	public IBlockState getStateFromMeta( final int meta )
+	public BlockState getStateFromMeta( final int meta )
 	{
 		return this.getDefaultState().withProperty( ENERGY_STORAGE, Math.min( 7, Math.max( 0, meta ) ) );
 	}
@@ -57,13 +57,13 @@ public class BlockEnergyCell extends AEBaseTileBlock
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		super.getSubBlocks( tabs, itemStacks );
 
 		final ItemStack charged = new ItemStack( this, 1 );
-		final NBTTagCompound tag = Platform.openNbtData( charged );
+		final CompoundNBT tag = Platform.openNbtData( charged );
 		tag.setDouble( "internalCurrentPower", this.getMaxPower() );
 		tag.setDouble( "internalMaxPower", this.getMaxPower() );
 

src/main/java/appeng/block/networking/BlockEnergyCellRendering.java

@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 import appeng.api.implementations.items.IAEItemPowerStorage;
-import appeng.block.AEBaseItemBlockChargeable;
+import appeng.block.AEBaseBlockItemChargeable;
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
 import appeng.bootstrap.IItemRendering;
@@ -71,7 +71,7 @@ public class BlockEnergyCellRendering extends BlockRenderingCustomizer
 			return 0;
 		}
 
-		AEBaseItemBlockChargeable itemChargeable = (AEBaseItemBlockChargeable) is.getItem();
+		AEBaseBlockItemChargeable itemChargeable = (AEBaseBlockItemChargeable) is.getItem();
 		double curPower = itemChargeable.getAECurrentPower( is );
 		double maxPower = itemChargeable.getAEMaxPower( is );
 

src/main/java/appeng/block/networking/BlockWireless.java

@@ -24,16 +24,16 @@ import java.util.List;
 
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
@@ -79,7 +79,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader worldIn, BlockPos pos )
 	{
 		State teState = State.OFF;
 
@@ -107,11 +107,11 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onBlockActivated( final World w, final BlockPos pos, final BlockState state, final PlayerEntity player, final Hand hand, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileWireless tg = this.getTileEntity( w, pos );
 
-		if( tg != null && !player.isSneaking() )
+		if( tg != null && !player.isShiftKeyDown() )
 		{
 			if( Platform.isServer() )
 			{
@@ -129,7 +129,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 		final TileWireless tile = this.getTileEntity( w, pos );
 		if( tile != null )
 		{
-			final EnumFacing forward = tile.getForward();
+			final Direction forward = tile.getForward();
 
 			double minX = 0;
 			double minY = 0;
@@ -191,7 +191,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 		final TileWireless tile = this.getTileEntity( w, pos );
 		if( tile != null )
 		{
-			final EnumFacing forward = tile.getForward();
+			final Direction forward = tile.getForward();
 
 			double minX = 0;
 			double minY = 0;
@@ -251,7 +251,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}

src/main/java/appeng/block/networking/CableBusColor.java

@@ -19,13 +19,13 @@
 package appeng.block.networking;
 
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.color.IBlockColor;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraftforge.common.property.IExtendedBlockState;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEColor;
 import appeng.client.render.cablebus.CableBusRenderState;
@@ -34,12 +34,12 @@ import appeng.client.render.cablebus.CableBusRenderState;
 /**
  * Exposes the cable bus color as tint indices 0 (dark variant), 1 (medium variant) and 2 (bright variant).
  */
-@SideOnly( Side.CLIENT )
+@OnlyIn( Dist.CLIENT )
 public class CableBusColor implements IBlockColor
 {
 
 	@Override
-	public int colorMultiplier( IBlockState state, IBlockAccess worldIn, BlockPos pos, int color )
+	public int colorMultiplier( BlockState state, IBlockReader worldIn, BlockPos pos, int color )
 	{
 
 		AEColor busColor = AEColor.TRANSPARENT;

src/main/java/appeng/block/networking/CableBusRendering.java

@@ -19,8 +19,8 @@
 package appeng.block.networking;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -42,7 +42,7 @@ public class CableBusRendering extends BlockRenderingCustomizer
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.builtInModel( "models/block/builtin/cable_bus", new CableBusModel( this.partModels ) );

src/main/java/appeng/block/networking/WirelessRendering.java

@@ -2,8 +2,8 @@
 package appeng.block.networking;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEColor;
 import appeng.bootstrap.BlockRenderingCustomizer;
@@ -15,7 +15,7 @@ import appeng.client.render.StaticBlockColor;
 public class WirelessRendering extends BlockRenderingCustomizer
 {
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.blockColor( new StaticBlockColor( AEColor.TRANSPARENT ) );

src/main/java/appeng/block/paint/BlockPaint.java

@@ -27,8 +27,8 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.MaterialLiquid;
 import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -36,13 +36,13 @@ import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.block.AEBaseTileBlock;
 import appeng.helpers.Splotch;
@@ -71,7 +71,7 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		IExtendedBlockState extState = (IExtendedBlockState) state;
 
@@ -93,26 +93,26 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		// do nothing
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBox( IBlockState blockState, IBlockAccess worldIn, BlockPos pos )
+	public AxisAlignedBB getCollisionBoundingBox( BlockState blockState, IBlockReader worldIn, BlockPos pos )
 	{
 		return null;
 	}
 
 	@Override
-	public boolean canCollideCheck( final IBlockState state, final boolean hitIfLiquid )
+	public boolean canCollideCheck( final BlockState state, final boolean hitIfLiquid )
 	{
 		return false;
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TilePaint tp = this.getTileEntity( world, pos );
 
@@ -123,13 +123,13 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
+	public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
 	{
 		return null;
 	}
 
 	@Override
-	public void dropBlockAsItemWithChance( final World worldIn, final BlockPos pos, final IBlockState state, final float chance, final int fortune )
+	public void dropBlockAsItemWithChance( final World worldIn, final BlockPos pos, final BlockState state, final float chance, final int fortune )
 	{
 
 	}
@@ -144,7 +144,7 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public int getLightValue( final IBlockState state, final IBlockAccess w, final BlockPos pos )
+	public int getLightValue( final BlockState state, final IBlockReader w, final BlockPos pos )
 	{
 		final TilePaint tp = this.getTileEntity( w, pos );
 
@@ -157,13 +157,13 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean isAir( final IBlockState state, final IBlockAccess world, final BlockPos pos )
+	public boolean isAir( final BlockState state, final IBlockReader world, final BlockPos pos )
 	{
 		return true;
 	}
 
 	@Override
-	public boolean isReplaceable( final IBlockAccess worldIn, final BlockPos pos )
+	public boolean isReplaceable( final IBlockReader worldIn, final BlockPos pos )
 	{
 		return true;
 	}

src/main/java/appeng/block/paint/PaintBakedModel.java

@@ -11,14 +11,14 @@ import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableList;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.property.IExtendedBlockState;
 
@@ -54,7 +54,7 @@ class PaintBakedModel implements IBakedModel
 	}
 
 	@Override
-	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
+	public List<BakedQuad> getQuads( @Nullable BlockState state, @Nullable Direction side, long rand )
 	{
 		if( side != null )
 		{
@@ -117,34 +117,34 @@ class PaintBakedModel implements IBakedModel
 			{
 				case UP:
 					offset = 1.0f - offset;
-					builder.addQuad( EnumFacing.DOWN, pos_x - buffer, offset, pos_y - buffer,
+					builder.addQuad( Direction.DOWN, pos_x - buffer, offset, pos_y - buffer,
 							pos_x + buffer, offset, pos_y + buffer );
 					break;
 
 				case DOWN:
-					builder.addQuad( EnumFacing.UP, pos_x - buffer, offset, pos_y - buffer,
+					builder.addQuad( Direction.UP, pos_x - buffer, offset, pos_y - buffer,
 							pos_x + buffer, offset, pos_y + buffer );
 					break;
 
 				case EAST:
 					offset = 1.0f - offset;
-					builder.addQuad( EnumFacing.WEST, offset, pos_x - buffer, pos_y - buffer,
+					builder.addQuad( Direction.WEST, offset, pos_x - buffer, pos_y - buffer,
 							offset, pos_x + buffer, pos_y + buffer );
 					break;
 
 				case WEST:
-					builder.addQuad( EnumFacing.EAST, offset, pos_x - buffer, pos_y - buffer,
+					builder.addQuad( Direction.EAST, offset, pos_x - buffer, pos_y - buffer,
 							offset, pos_x + buffer, pos_y + buffer );
 					break;
 
 				case SOUTH:
 					offset = 1.0f - offset;
-					builder.addQuad( EnumFacing.NORTH, pos_x - buffer, pos_y - buffer, offset,
+					builder.addQuad( Direction.NORTH, pos_x - buffer, pos_y - buffer, offset,
 							pos_x + buffer, pos_y + buffer, offset );
 					break;
 
 				case NORTH:
-					builder.addQuad( EnumFacing.SOUTH, pos_x - buffer, pos_y - buffer, offset,
+					builder.addQuad( Direction.SOUTH, pos_x - buffer, pos_y - buffer, offset,
 							pos_x + buffer, pos_y + buffer, offset );
 					break;
 

src/main/java/appeng/block/paint/PaintRendering.java

@@ -2,8 +2,8 @@
 package appeng.block.paint;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -14,7 +14,7 @@ public class PaintRendering extends BlockRenderingCustomizer
 {
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.builtInModel( "models/block/paint", new PaintModel() );

src/main/java/appeng/block/qnb/BlockQuantumBase.java

@@ -23,12 +23,12 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
@@ -69,7 +69,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		IExtendedBlockState extState = (IExtendedBlockState) state;
 
@@ -84,7 +84,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader worldIn, BlockPos pos )
 	{
 		TileQuantumBridge bridge = this.getTileEntity( worldIn, pos );
 		if( bridge != null )
@@ -101,7 +101,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TileQuantumBridge bridge = this.getTileEntity( world, pos );
 		if( bridge != null )
@@ -111,7 +111,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public void breakBlock( final World w, final BlockPos pos, final IBlockState state )
+	public void breakBlock( final World w, final BlockPos pos, final BlockState state )
 	{
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
 		if( bridge != null )
@@ -123,7 +123,7 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public boolean isFullCube( IBlockState state )
+	public boolean isFullCube( BlockState state )
 	{
 		return false;
 	}

src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java

@@ -25,12 +25,12 @@ import java.util.Random;
 
 import javax.annotation.Nullable;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -53,7 +53,7 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
 	}
 
 	@Override
-	public void randomDisplayTick( final IBlockState state, final World w, final BlockPos pos, final Random rand )
+	public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random rand )
 	{
 		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
 		if( bridge != null )
@@ -69,9 +69,9 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}

src/main/java/appeng/block/qnb/QnbFormedBakedModel.java

@@ -12,14 +12,14 @@ import javax.annotation.Nullable;
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.property.IExtendedBlockState;
 
@@ -74,7 +74,7 @@ class QnbFormedBakedModel implements IBakedModel
 	}
 
 	@Override
-	public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
+	public List<BakedQuad> getQuads( @Nullable BlockState state, @Nullable Direction side, long rand )
 	{
 		// Get the correct base model
 		if( !( state instanceof IExtendedBlockState ) )
@@ -88,13 +88,13 @@ class QnbFormedBakedModel implements IBakedModel
 		return this.getQuads( formedState, state, side, rand );
 	}
 
-	private List<BakedQuad> getQuads( QnbFormedState formedState, IBlockState state, EnumFacing side, long rand )
+	private List<BakedQuad> getQuads( QnbFormedState formedState, BlockState state, Direction side, long rand )
 	{
 		CubeBuilder builder = new CubeBuilder( this.vertexFormat );
 
 		if( state.getBlock() == this.linkBlock )
 		{
-			Set<EnumFacing> sides = formedState.getAdjacentQuantumBridges();
+			Set<Direction> sides = formedState.getAdjacentQuantumBridges();
 
 			this.renderCableAt( builder, 0.11f * 16, this.glassCableTexture, 0.141f * 16, sides );
 
@@ -116,7 +116,7 @@ class QnbFormedBakedModel implements IBakedModel
 				{
 					builder.setTexture( this.lightCornerTexture );
 					builder.setRenderFullBright( true );
-					for( EnumFacing facing : EnumFacing.values() )
+					for( Direction facing : Direction.values() )
 					{
 						// Offset the face by a slight amount so that it is drawn over the already drawn ring texture
 						// (avoids z-fighting)
@@ -145,7 +145,7 @@ class QnbFormedBakedModel implements IBakedModel
 				{
 					builder.setTexture( this.lightTexture );
 					builder.setRenderFullBright( true );
-					for( EnumFacing facing : EnumFacing.values() )
+					for( Direction facing : Direction.values() )
 					{
 						// Offset the face by a slight amount so that it is drawn over the already drawn ring texture
 						// (avoids z-fighting)
@@ -165,36 +165,36 @@ class QnbFormedBakedModel implements IBakedModel
 		return builder.getOutput();
 	}
 
-	private void renderCableAt( CubeBuilder builder, float thickness, TextureAtlasSprite texture, float pull, Set<EnumFacing> connections )
+	private void renderCableAt( CubeBuilder builder, float thickness, TextureAtlasSprite texture, float pull, Set<Direction> connections )
 	{
 		builder.setTexture( texture );
 
-		if( connections.contains( EnumFacing.WEST ) )
+		if( connections.contains( Direction.WEST ) )
 		{
 			builder.addCube( 0, 8 - thickness, 8 - thickness, 8 - thickness - pull, 8 + thickness, 8 + thickness );
 		}
 
-		if( connections.contains( EnumFacing.EAST ) )
+		if( connections.contains( Direction.EAST ) )
 		{
 			builder.addCube( 8 + thickness + pull, 8 - thickness, 8 - thickness, 16, 8 + thickness, 8 + thickness );
 		}
 
-		if( connections.contains( EnumFacing.NORTH ) )
+		if( connections.contains( Direction.NORTH ) )
 		{
 			builder.addCube( 8 - thickness, 8 - thickness, 0, 8 + thickness, 8 + thickness, 8 - thickness - pull );
 		}
 
-		if( connections.contains( EnumFacing.SOUTH ) )
+		if( connections.contains( Direction.SOUTH ) )
 		{
 			builder.addCube( 8 - thickness, 8 - thickness, 8 + thickness + pull, 8 + thickness, 8 + thickness, 16 );
 		}
 
-		if( connections.contains( EnumFacing.DOWN ) )
+		if( connections.contains( Direction.DOWN ) )
 		{
 			builder.addCube( 8 - thickness, 0, 8 - thickness, 8 + thickness, 8 - thickness - pull, 8 + thickness );
 		}
 
-		if( connections.contains( EnumFacing.UP ) )
+		if( connections.contains( Direction.UP ) )
 		{
 			builder.addCube( 8 - thickness, 8 + thickness + pull, 8 - thickness, 8 + thickness, 16, 8 + thickness );
 		}

src/main/java/appeng/block/qnb/QnbFormedState.java

@@ -4,26 +4,26 @@ package appeng.block.qnb;
 
 import java.util.Set;
 
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 
 public class QnbFormedState
 {
 
-	private final Set<EnumFacing> adjacentQuantumBridges;
+	private final Set<Direction> adjacentQuantumBridges;
 
 	private final boolean corner;
 
 	private final boolean powered;
 
-	public QnbFormedState( Set<EnumFacing> adjacentQuantumBridges, boolean corner, boolean powered )
+	public QnbFormedState( Set<Direction> adjacentQuantumBridges, boolean corner, boolean powered )
 	{
 		this.adjacentQuantumBridges = adjacentQuantumBridges;
 		this.corner = corner;
 		this.powered = powered;
 	}
 
-	public Set<EnumFacing> getAdjacentQuantumBridges()
+	public Set<Direction> getAdjacentQuantumBridges()
 	{
 		return this.adjacentQuantumBridges;
 	}

src/main/java/appeng/block/qnb/QuantumBridgeRendering.java

@@ -2,8 +2,8 @@
 package appeng.block.qnb;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -14,7 +14,7 @@ public class QuantumBridgeRendering extends BlockRenderingCustomizer
 {
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		rendering.builtInModel( "models/block/qnb/qnb_formed", new QnbFormedModel() );

src/main/java/appeng/block/spatial/BlockMatrixFrame.java

@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
@@ -31,10 +31,10 @@ import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Explosion;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.block.AEBaseBlock;
 import appeng.helpers.ICustomCollision;
@@ -53,7 +53,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		// do nothing
@@ -85,7 +85,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public boolean canEntityDestroy( final IBlockState state, final IBlockAccess world, final BlockPos pos, final Entity entity )
+	public boolean canEntityDestroy( final BlockState state, final IBlockReader world, final BlockPos pos, final Entity entity )
 	{
 		return false;
 	}

src/main/java/appeng/block/spatial/BlockSpatialIOPort.java

@@ -23,11 +23,11 @@ import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -47,7 +47,7 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TileSpatialIOPort te = this.getTileEntity( world, pos );
 		if( te != null )
@@ -57,9 +57,9 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}

src/main/java/appeng/block/spatial/BlockSpatialPylon.java

@@ -20,11 +20,11 @@ package appeng.block.spatial;
 
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
@@ -53,7 +53,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		IExtendedBlockState extState = (IExtendedBlockState) state;
 
@@ -61,7 +61,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TileSpatialPylon tsp = this.getTileEntity( world, pos );
 		if( tsp != null )
@@ -71,7 +71,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 	}
 
 	@Override
-	public int getLightValue( final IBlockState state, final IBlockAccess w, final BlockPos pos )
+	public int getLightValue( final BlockState state, final IBlockReader w, final BlockPos pos )
 	{
 		final TileSpatialPylon tsp = this.getTileEntity( w, pos );
 		if( tsp != null )
@@ -81,7 +81,7 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 		return super.getLightValue( state, w, pos );
 	}
 
-	private int getDisplayState( IBlockAccess world, BlockPos pos )
+	private int getDisplayState( IBlockReader world, BlockPos pos )
 	{
 		TileSpatialPylon te = this.getTileEntity( world, pos );
 

src/main/java/appeng/block/storage/BlockChest.java

@@ -24,14 +24,14 @@ import javax.annotation.Nullable;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
@@ -66,7 +66,7 @@ public class BlockChest extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getActualState( IBlockState state, IBlockAccess worldIn, BlockPos pos )
+	public BlockState getActualState( BlockState state, IBlockReader worldIn, BlockPos pos )
 	{
 		DriveSlotState slotState = DriveSlotState.EMPTY;
 
@@ -90,10 +90,10 @@ public class BlockChest extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		final TileChest tg = this.getTileEntity( w, pos );
-		if( tg != null && !p.isSneaking() )
+		if( tg != null && !p.isShiftKeyDown() )
 		{
 			if( Platform.isClient() )
 			{

src/main/java/appeng/block/storage/BlockDrive.java

@@ -22,15 +22,15 @@ package appeng.block.storage;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockStateContainer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
@@ -71,7 +71,7 @@ public class BlockDrive extends AEBaseTileBlock
 	}
 
 	@Override
-	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	public BlockState getExtendedState( BlockState state, IBlockReader world, BlockPos pos )
 	{
 		TileDrive te = this.getTileEntity( world, pos );
 		IExtendedBlockState extState = (IExtendedBlockState) super.getExtendedState( state, world, pos );
@@ -79,9 +79,9 @@ public class BlockDrive extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}

src/main/java/appeng/block/storage/BlockIOPort.java

@@ -23,11 +23,11 @@ import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -47,7 +47,7 @@ public class BlockIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
+	public void neighborChanged( BlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		final TileIOPort te = this.getTileEntity( world, pos );
 		if( te != null )
@@ -57,9 +57,9 @@ public class BlockIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity p, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
-		if( p.isSneaking() )
+		if( p.isShiftKeyDown() )
 		{
 			return false;
 		}

src/main/java/appeng/block/storage/BlockSkyChest.java

@@ -25,13 +25,13 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumBlockRenderType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -69,13 +69,13 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public EnumBlockRenderType getRenderType( IBlockState state )
+	public EnumBlockRenderType getRenderType( BlockState state )
 	{
 		return EnumBlockRenderType.ENTITYBLOCK_ANIMATED;
 	}
 
 	@Override
-	public boolean onActivated( final World w, final BlockPos pos, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onActivated( final World w, final BlockPos pos, final PlayerEntity player, final Hand hand, final @Nullable ItemStack heldItem, final Direction side, final float hitX, final float hitY, final float hitZ )
 	{
 		if( Platform.isServer() )
 		{
@@ -104,7 +104,7 @@ public class BlockSkyChest extends AEBaseTileBlock implements ICustomCollision
 	private AxisAlignedBB computeAABB( final World w, final BlockPos pos )
 	{
 		final TileSkyChest sk = this.getTileEntity( w, pos );
-		EnumFacing o = EnumFacing.UP;
+		Direction o = Direction.UP;
 
 		if( sk != null )
 		{

src/main/java/appeng/block/storage/ChestRendering.java

@@ -19,8 +19,8 @@
 package appeng.block.storage;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.util.AEColor;
 import appeng.bootstrap.BlockRenderingCustomizer;
@@ -34,7 +34,7 @@ public class ChestRendering extends BlockRenderingCustomizer
 {
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{
 		// I checked, the ME chest doesn't keep its color in item form

src/main/java/appeng/block/storage/SkyChestRenderingCustomizer.java

@@ -20,8 +20,8 @@ package appeng.block.storage;
 
 
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
@@ -39,7 +39,7 @@ public class SkyChestRenderingCustomizer extends BlockRenderingCustomizer
 		this.type = type;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 	{

src/main/java/appeng/bootstrap/BlockDefinitionBuilder.java

@@ -30,17 +30,17 @@ import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemGroup;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.definitions.IBlockDefinition;
 import appeng.block.AEBaseBlock;
-import appeng.block.AEBaseItemBlock;
+import appeng.block.AEBaseBlockItem;
 import appeng.block.AEBaseTileBlock;
 import appeng.bootstrap.components.IBlockRegistrationComponent;
 import appeng.bootstrap.components.IItemRegistrationComponent;
@@ -71,18 +71,18 @@ class BlockDefinitionBuilder implements IBlockBuilder
 
 	private final EnumSet<AEFeature> features = EnumSet.noneOf( AEFeature.class );
 
-	private CreativeTabs creativeTab = CreativeTab.instance;
+	private ItemGroup itemGroup = CreativeTab.instance;
 
 	private TileEntityDefinition tileEntityDefinition;
 
 	private boolean disableItem = false;
 
-	private Function<Block, ItemBlock> itemFactory;
+	private Function<Block, BlockItem> itemFactory;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private BlockRendering blockRendering;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private ItemRendering itemRendering;
 
 	BlockDefinitionBuilder( FeatureFactory factory, String id, Supplier<? extends Block> blockSupplier )
@@ -144,7 +144,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
 		this.rendering( new BlockRenderingCustomizer()
 		{
 			@Override
-			@SideOnly( Side.CLIENT )
+			@OnlyIn( Dist.CLIENT )
 			public void customize( IBlockRendering rendering, IItemRendering itemRendering )
 			{
 				ModelResourceLocation model = new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, BlockDefinitionBuilder.this.registryName ), "inventory" );
@@ -156,7 +156,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
 	}
 
 	@Override
-	public IBlockBuilder item( Function<Block, ItemBlock> factory )
+	public IBlockBuilder item( Function<Block, BlockItem> factory )
 	{
 		this.itemFactory = factory;
 		return this;
@@ -169,7 +169,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
 		return this;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private void customizeForClient( BlockRenderingCustomizer callback )
 	{
 		callback.customize( this.blockRendering, this.itemRendering );
@@ -187,9 +187,8 @@ class BlockDefinitionBuilder implements IBlockBuilder
 		// Create block and matching item, and set factory name of both
 		Block block = this.blockSupplier.get();
 		block.setRegistryName( AppEng.MOD_ID, this.registryName );
-		block.setUnlocalizedName( "appliedenergistics2." + this.registryName );
 
-		ItemBlock item = this.constructItemFromBlock( block );
+		BlockItem item = this.constructItemFromBlock( block );
 		if( item != null )
 		{
 			item.setRegistryName( AppEng.MOD_ID, this.registryName );
@@ -202,8 +201,6 @@ class BlockDefinitionBuilder implements IBlockBuilder
 			this.factory.addBootstrapComponent( (IItemRegistrationComponent) ( side, registry ) -> registry.register( item ) );
 		}
 
-		block.setCreativeTab( this.creativeTab );
-
 		// Register all extra handlers
 		this.bootstrapComponents.forEach( component -> this.factory.addBootstrapComponent( component.apply( block, item ) ) );
 
@@ -241,7 +238,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
 			{
 				AEBaseTile.registerTileItem(
 						this.tileEntityDefinition == null ? ( (AEBaseTileBlock) block ).getTileEntityClass() : this.tileEntityDefinition.getTileEntityClass(),
-						new BlockStackSrc( block, 0, ActivityState.Enabled ) );
+						new BlockStackSrc( block, ActivityState.Enabled ) );
 			} );
 
 			if( this.tileEntityDefinition != null )
@@ -258,7 +255,7 @@ class BlockDefinitionBuilder implements IBlockBuilder
 	}
 
 	@Nullable
-	private ItemBlock constructItemFromBlock( Block block )
+	private BlockItem constructItemFromBlock( Block block )
 	{
 		if( this.disableItem )
 		{
@@ -271,11 +268,11 @@ class BlockDefinitionBuilder implements IBlockBuilder
 		}
 		else if( block instanceof AEBaseBlock )
 		{
-			return new AEBaseItemBlock( block );
+			return new AEBaseBlockItem( block );
 		}
 		else
 		{
-			return new ItemBlock( block );
+			return new BlockItem( block, null );
 		}
 	}
 }

src/main/java/appeng/bootstrap/BlockRendering.java

@@ -30,8 +30,8 @@ import net.minecraft.client.renderer.block.statemap.IStateMapper;
 import net.minecraft.client.renderer.color.IBlockColor;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.block.AEBaseTileBlock;
 import appeng.bootstrap.components.BlockColorComponent;
@@ -43,30 +43,30 @@ import appeng.client.render.model.AutoRotatingModel;
 class BlockRendering implements IBlockRendering
 {
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private BiFunction<ModelResourceLocation, IBakedModel, IBakedModel> modelCustomizer;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private IBlockColor blockColor;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private TileEntitySpecialRenderer<?> tesr;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private IStateMapper stateMapper;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private Map<String, IModel> builtInModels = new HashMap<>();
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public IBlockRendering modelCustomizer( BiFunction<ModelResourceLocation, IBakedModel, IBakedModel> customizer )
 	{
 		this.modelCustomizer = customizer;
 		return this;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public IBlockRendering blockColor( IBlockColor blockColor )
 	{
@@ -74,7 +74,7 @@ class BlockRendering implements IBlockRendering
 		return this;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public IBlockRendering tesr( TileEntitySpecialRenderer<?> tesr )
 	{
@@ -89,7 +89,7 @@ class BlockRendering implements IBlockRendering
 		return this;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	@Override
 	public IBlockRendering stateMapper( IStateMapper mapper )
 	{

src/main/java/appeng/bootstrap/BlockRenderingCustomizer.java

@@ -19,19 +19,19 @@
 package appeng.bootstrap;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 
 /**
  * A callback that allows the rendering of a block to be customized. Sadly this class is required and no lambdas can be
  * used
- * due to them not being able to be annotated with @SideOnly(CLIENT).
+ * due to them not being able to be annotated with @OnlyIn(CLIENT).
  */
 public abstract class BlockRenderingCustomizer
 {
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public abstract void customize( IBlockRendering rendering, IItemRendering itemRendering );
 
 }

src/main/java/appeng/bootstrap/FeatureFactory.java

@@ -30,12 +30,12 @@ import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 import net.minecraft.block.Block;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.model.IUnbakedModel;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.Item;
-import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.definitions.IItemDefinition;
 import appeng.api.util.AEColor;
@@ -57,10 +57,10 @@ public class FeatureFactory
 
 	private final Map<Class<? extends IBootstrapComponent>, List<IBootstrapComponent>> bootstrapComponents;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private ModelOverrideComponent modelOverrideComponent;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private BuiltInModelComponent builtInModelComponent;
 
 	public final TileEntityComponent tileEntityComponent;
@@ -115,7 +115,7 @@ public class FeatureFactory
 			{
 				final ActivityState state = ActivityState.from( target.isEnabled() );
 
-				definition.add( color, new ItemStackSrc( targetItem, offset + color.ordinal(), state ) );
+				definition.add( color, new ItemStackSrc( targetItem, state ) );
 			}
 		} );
 
@@ -139,13 +139,13 @@ public class FeatureFactory
 		this.bootstrapComponents.computeIfAbsent( eventType, c -> new ArrayList<IBootstrapComponent>() ).add( component );
 	}
 
-	@SideOnly( Side.CLIENT )
-	void addBuiltInModel( String path, IModel model )
+	@OnlyIn( Dist.CLIENT )
+	void addBuiltInModel( String path, IUnbakedModel model )
 	{
 		this.builtInModelComponent.addModel( path, model );
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	void addModelOverride( String resourcePath, BiFunction<ModelResourceLocation, IBakedModel, IBakedModel> customizer )
 	{
 		this.modelOverrideComponent.addOverride( resourcePath, customizer );

src/main/java/appeng/bootstrap/IBlockBuilder.java

@@ -23,8 +23,8 @@ import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import net.minecraft.block.Block;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 
 import appeng.api.definitions.IBlockDefinition;
 import appeng.bootstrap.definitions.TileEntityDefinition;
@@ -54,7 +54,7 @@ public interface IBlockBuilder
 	 */
 	IBlockBuilder useCustomItemModel();
 
-	IBlockBuilder item( Function<Block, ItemBlock> factory );
+	IBlockBuilder item( Function<Block, BlockItem> factory );
 
 	<T extends IBlockDefinition> T build();
 }

src/main/java/appeng/bootstrap/IBlockRendering.java

@@ -21,14 +21,13 @@ package appeng.bootstrap;
 
 import java.util.function.BiFunction;
 
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.block.statemap.IStateMapper;
 import net.minecraft.client.renderer.color.IBlockColor;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.model.IUnbakedModel;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 
 /**
@@ -37,22 +36,22 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 public interface IBlockRendering
 {
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IBlockRendering modelCustomizer( BiFunction<ModelResourceLocation, IBakedModel, IBakedModel> customizer );
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IBlockRendering blockColor( IBlockColor blockColor );
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IBlockRendering stateMapper( IStateMapper mapper );
 
-	@SideOnly( Side.CLIENT )
-	IBlockRendering tesr( TileEntitySpecialRenderer<?> tesr );
+	@OnlyIn( Dist.CLIENT )
+	IBlockRendering tesr( TileEntityRenderer<?> ter );
 
 	/**
 	 * Registers a built-in model under the given resource path.
 	 */
-	@SideOnly( Side.CLIENT )
-	IBlockRendering builtInModel( String name, IModel model );
+	@OnlyIn( Dist.CLIENT )
+	IBlockRendering builtInModel( String name, IUnbakedModel model );
 
 }

src/main/java/appeng/bootstrap/IItemBuilder.java

@@ -22,9 +22,9 @@ package appeng.bootstrap;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.dispenser.IDispenseItemBehavior;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
 
 import appeng.core.features.AEFeature;
 import appeng.core.features.ItemDefinition;
@@ -42,14 +42,14 @@ public interface IItemBuilder
 
 	IItemBuilder addFeatures( AEFeature... features );
 
-	IItemBuilder creativeTab( CreativeTabs tab );
+	IItemBuilder itemGroup( ItemGroup tab );
 
 	IItemBuilder rendering( ItemRenderingCustomizer callback );
 
 	/**
 	 * Registers a custom dispenser behavior for this item.
 	 */
-	IItemBuilder dispenserBehavior( Supplier<IBehaviorDispenseItem> behavior );
+	IItemBuilder dispenserBehavior( Supplier<IDispenseItemBehavior> behavior );
 
 	ItemDefinition build();
 }

src/main/java/appeng/bootstrap/IItemRendering.java

@@ -23,12 +23,12 @@ import java.util.Arrays;
 import java.util.Collection;
 
 import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.color.IItemColor;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 
 /**
@@ -42,31 +42,31 @@ public interface IItemRendering
 	 * item model to be used for rendering by inspecting the item stack (i.e. for NBT data).
 	 * Please
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IItemRendering meshDefinition( ItemMeshDefinition meshDefinition );
 
 	/**
 	 * Registers an item model for meta=0, see {@link #model(int, ModelResourceLocation)}.
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	default IItemRendering model( ModelResourceLocation model )
 	{
-		return model( 0, model );
+		return this.model( 0, model );
 	}
 
 	/**
 	 * Registers an item model for a given meta.
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IItemRendering model( int meta, ModelResourceLocation model );
 
 	/**
 	 * Convenient override for {@link #variants(Collection)}.
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	default IItemRendering variants( ResourceLocation... resources )
 	{
-		return variants( Arrays.asList( resources ) );
+		return this.variants( Arrays.asList( resources ) );
 	}
 
 	/**
@@ -76,20 +76,20 @@ public interface IItemRendering
 	 *
 	 * Models registered via {@link #model(int, ModelResourceLocation)} are automatically added here.
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IItemRendering variants( Collection<ResourceLocation> resources );
 
 	/**
 	 * Registers a custom item color definition that inspects an item stack and tint and
 	 * returns a color multiplier.
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IItemRendering color( IItemColor itemColor );
 
 	/**
 	 * Registers a built-in model under the given resource path.
 	 */
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	IItemRendering builtInModel( String name, IModel model );
 
 }

src/main/java/appeng/bootstrap/IModelRegistry.java

@@ -20,9 +20,7 @@ package appeng.bootstrap;
 
 
 import net.minecraft.block.Block;
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.block.statemap.IStateMapper;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
 

src/main/java/appeng/bootstrap/ItemDefinitionBuilder.java

@@ -26,12 +26,12 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import net.minecraft.block.BlockDispenser;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.dispenser.IBehaviorDispenseItem;
+import net.minecraft.block.DispenserBlock;
+import net.minecraft.dispenser.IDispenseItemBehavior;
 import net.minecraft.item.Item;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraft.item.ItemGroup;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.bootstrap.components.IItemRegistrationComponent;
 import appeng.bootstrap.components.IPostInitComponent;
@@ -56,12 +56,12 @@ class ItemDefinitionBuilder implements IItemBuilder
 
 	private final List<Function<Item, IBootstrapComponent>> boostrapComponents = new ArrayList<>();
 
-	private Supplier<IBehaviorDispenseItem> dispenserBehaviorSupplier;
+	private Supplier<IDispenseItemBehavior> dispenserBehaviorSupplier;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private ItemRendering itemRendering;
 
-	private CreativeTabs creativeTab = CreativeTab.instance;
+	private ItemGroup itemGroup = CreativeTab.instance;
 
 	ItemDefinitionBuilder( FeatureFactory factory, String registryName, Supplier<Item> itemSupplier )
 	{
@@ -97,9 +97,9 @@ class ItemDefinitionBuilder implements IItemBuilder
 	}
 
 	@Override
-	public IItemBuilder creativeTab( CreativeTabs tab )
+	public IItemBuilder itemGroup( ItemGroup itemGroup )
 	{
-		this.creativeTab = tab;
+		this.itemGroup = itemGroup;
 		return this;
 	}
 
@@ -115,13 +115,13 @@ class ItemDefinitionBuilder implements IItemBuilder
 	}
 
 	@Override
-	public IItemBuilder dispenserBehavior( Supplier<IBehaviorDispenseItem> behavior )
+	public IItemBuilder dispenserBehavior( Supplier<IDispenseItemBehavior> behavior )
 	{
 		this.dispenserBehaviorSupplier = behavior;
 		return this;
 	}
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private void customizeForClient( ItemRenderingCustomizer callback )
 	{
 		callback.customize( this.itemRendering );
@@ -140,9 +140,6 @@ class ItemDefinitionBuilder implements IItemBuilder
 
 		ItemDefinition definition = new ItemDefinition( this.registryName, item );
 
-		item.setUnlocalizedName( "appliedenergistics2." + this.registryName );
-		item.setCreativeTab( this.creativeTab );
-
 		// Register all extra handlers
 		this.boostrapComponents.forEach( component -> this.factory.addBootstrapComponent( component.apply( item ) ) );
 
@@ -151,8 +148,8 @@ class ItemDefinitionBuilder implements IItemBuilder
 		{
 			this.factory.addBootstrapComponent( (IPostInitComponent) side ->
 			{
-				IBehaviorDispenseItem behavior = this.dispenserBehaviorSupplier.get();
-				BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject( item, behavior );
+				IDispenseItemBehavior behavior = this.dispenserBehaviorSupplier.get();
+				DispenserBlock.registerDispenseBehavior( item, behavior );
 			} );
 		}
 

src/main/java/appeng/bootstrap/ItemRendering.java

@@ -29,17 +29,17 @@ import java.util.Set;
 import com.google.common.collect.ImmutableMap;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.block.statemap.StateMapperBase;
 import net.minecraft.client.renderer.color.IItemColor;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.bootstrap.components.ItemColorComponent;
 import appeng.bootstrap.components.ItemMeshDefinitionComponent;
@@ -50,23 +50,23 @@ import appeng.bootstrap.components.ItemVariantsComponent;
 class ItemRendering implements IItemRendering
 {
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private IItemColor itemColor;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private ItemMeshDefinition itemMeshDefinition;
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private Map<Integer, ModelResourceLocation> itemModels = new HashMap<>();
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private Set<ResourceLocation> variants = new HashSet<>();
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	private Map<String, IModel> builtInModels = new HashMap<>();
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public IItemRendering meshDefinition( ItemMeshDefinition meshDefinition )
 	{
 		this.itemMeshDefinition = meshDefinition;
@@ -74,7 +74,7 @@ class ItemRendering implements IItemRendering
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public IItemRendering model( int meta, ModelResourceLocation model )
 	{
 		this.itemModels.put( meta, model );
@@ -89,7 +89,7 @@ class ItemRendering implements IItemRendering
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public IItemRendering color( IItemColor itemColor )
 	{
 		this.itemColor = itemColor;
@@ -123,9 +123,9 @@ class ItemRendering implements IItemRendering
 			ModelResourceLocation model;
 
 			// For block items, the default will try to use the default state of the associated block
-			if( item instanceof ItemBlock )
+			if( item instanceof BlockItem )
 			{
-				Block block = ( (ItemBlock) item ).getBlock();
+				Block block = ( (BlockItem) item ).getBlock();
 
 				// We can only do this once the blocks are actually registered...
 				StateMapperHelper helper = new StateMapperHelper( item.getRegistryName() );
@@ -169,7 +169,7 @@ class ItemRendering implements IItemRendering
 		}
 
 		@Override
-		protected ModelResourceLocation getModelResourceLocation( IBlockState state )
+		protected ModelResourceLocation getModelResourceLocation( BlockState state )
 		{
 			return new ModelResourceLocation( this.registryName, this.getPropertyString( state.getProperties() ) );
 		}

src/main/java/appeng/bootstrap/ItemRenderingCustomizer.java

@@ -19,18 +19,18 @@
 package appeng.bootstrap;
 
 
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 
 /**
  * A callback that allows the rendering of a item to be customized. Sadly this class is required and no lambdas can be
  * used
- * due to them not being able to be annotated with @SideOnly(CLIENT).
+ * due to them not being able to be annotated with @OnlyIn(CLIENT).
  */
 public abstract class ItemRenderingCustomizer
 {
 
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public abstract void customize( IItemRendering rendering );
 }

src/main/java/appeng/bootstrap/components/BlockColorComponent.java

@@ -22,7 +22,7 @@ package appeng.bootstrap.components;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.color.IBlockColor;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 
 public class BlockColorComponent implements IInitComponent
@@ -39,9 +39,9 @@ public class BlockColorComponent implements IInitComponent
 	}
 
 	@Override
-	public void initialize( Side side )
+	public void initialize( Dist dist )
 	{
-		Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler( this.blockColor, this.block );
+		Minecraft.getInstance().getBlockColors().register( this.blockColor, this.block );
 	}
 
 }

src/main/java/appeng/bootstrap/components/BuiltInModelComponent.java

@@ -24,30 +24,30 @@ import java.util.Map;
 
 import com.google.common.base.Preconditions;
 
-import net.minecraftforge.client.model.IModel;
+import net.minecraft.client.renderer.model.IUnbakedModel;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.client.render.model.BuiltInModelLoader;
 
 
-@SideOnly( Side.CLIENT )
+@OnlyIn( Dist.CLIENT )
 public class BuiltInModelComponent implements IPreInitComponent
 {
 
-	private final Map<String, IModel> builtInModels = new HashMap<>();
+	private final Map<String, IUnbakedModel> builtInModels = new HashMap<>();
 
 	private boolean hasInitialized = false;
 
-	public void addModel( String path, IModel model )
+	public void addModel( String path, IUnbakedModel model )
 	{
 		Preconditions.checkState( !this.hasInitialized );
 		this.builtInModels.put( path, model );
 	}
 
 	@Override
-	public void preInitialize( Side side )
+	public void preInitialize( Dist dist )
 	{
 		this.hasInitialized = true;
 

src/main/java/appeng/bootstrap/components/IBlockRegistrationComponent.java

@@ -3,7 +3,7 @@ package appeng.bootstrap.components;
 
 
 import net.minecraft.block.Block;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.bootstrap.IBootstrapComponent;
@@ -12,5 +12,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IBlockRegistrationComponent extends IBootstrapComponent
 {
-	void blockRegistration( Side side, IForgeRegistry<Block> blockRegistry );
+	void blockRegistration( Dist dist, IForgeRegistry<Block> blockRegistry );
 }

src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java

@@ -2,7 +2,8 @@
 package appeng.bootstrap.components;
 
 
-import net.minecraftforge.fml.common.registry.EntityEntry;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
 import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.bootstrap.IBootstrapComponent;
@@ -11,5 +12,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IEntityRegistrationComponent extends IBootstrapComponent
 {
-	void entityRegistration( IForgeRegistry<EntityEntry> entityRegistry );
+	void entityRegistration( IForgeRegistry<EntityType<? extends Entity>> entityRegistry );
 }

src/main/java/appeng/bootstrap/components/IInitComponent.java

@@ -19,7 +19,7 @@
 package appeng.bootstrap.components;
 
 
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IBootstrapComponent;
 
@@ -27,5 +27,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IInitComponent extends IBootstrapComponent
 {
-	void initialize( Side side );
+	void initialize( Dist dist );
 }

src/main/java/appeng/bootstrap/components/IItemRegistrationComponent.java

@@ -3,7 +3,7 @@ package appeng.bootstrap.components;
 
 
 import net.minecraft.item.Item;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.bootstrap.IBootstrapComponent;
@@ -12,5 +12,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IItemRegistrationComponent extends IBootstrapComponent
 {
-	void itemRegistration( Side side, IForgeRegistry<Item> itemRegistry );
+	void itemRegistration( Dist dist, IForgeRegistry<Item> itemRegistry );
 }

src/main/java/appeng/bootstrap/components/IModelRegistrationComponent.java

@@ -19,7 +19,7 @@
 package appeng.bootstrap.components;
 
 
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IBootstrapComponent;
 import appeng.bootstrap.IModelRegistry;
@@ -32,5 +32,5 @@ import appeng.bootstrap.IModelRegistry;
 @FunctionalInterface
 public interface IModelRegistrationComponent extends IBootstrapComponent
 {
-	void modelRegistration( Side side, IModelRegistry registry );
+	void modelRegistration( Dist dist, IModelRegistry registry );
 }

src/main/java/appeng/bootstrap/components/IOreDictComponent.java

@@ -1,31 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.bootstrap.components;
-
-
-import net.minecraftforge.fml.relauncher.Side;
-
-import appeng.bootstrap.IBootstrapComponent;
-
-
-@FunctionalInterface
-public interface IOreDictComponent extends IBootstrapComponent
-{
-	void oreRegistration( Side side );
-}

src/main/java/appeng/bootstrap/components/IPostInitComponent.java

@@ -19,7 +19,7 @@
 package appeng.bootstrap.components;
 
 
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IBootstrapComponent;
 
@@ -27,5 +27,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IPostInitComponent extends IBootstrapComponent
 {
-	void postInitialize( Side side );
+	void postInitialize( Dist dist );
 }

src/main/java/appeng/bootstrap/components/IPreInitComponent.java

@@ -19,7 +19,7 @@
 package appeng.bootstrap.components;
 
 
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IBootstrapComponent;
 
@@ -27,5 +27,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IPreInitComponent extends IBootstrapComponent
 {
-	void preInitialize( Side side );
+	void preInitialize( Dist dist );
 }

src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java

@@ -3,7 +3,7 @@ package appeng.bootstrap.components;
 
 
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.registries.IForgeRegistry;
 
 import appeng.bootstrap.IBootstrapComponent;
@@ -12,5 +12,5 @@ import appeng.bootstrap.IBootstrapComponent;
 @FunctionalInterface
 public interface IRecipeRegistrationComponent extends IBootstrapComponent
 {
-	void recipeRegistration( Side side, IForgeRegistry<IRecipe> recipeRegistry );
+	void recipeRegistration( Dist dist, IForgeRegistry<IRecipe> recipeRegistry );
 }

src/main/java/appeng/bootstrap/components/ItemColorComponent.java

@@ -22,7 +22,7 @@ package appeng.bootstrap.components;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.Item;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 
 public class ItemColorComponent implements IInitComponent
@@ -39,8 +39,8 @@ public class ItemColorComponent implements IInitComponent
 	}
 
 	@Override
-	public void initialize( Side side )
+	public void initialize( Dist dist )
 	{
-		Minecraft.getMinecraft().getItemColors().registerItemColorHandler( this.itemColor, this.item );
+		Minecraft.getInstance().getItemColors().register( this.itemColor, this.item );
 	}
 }

src/main/java/appeng/bootstrap/components/ItemMeshDefinitionComponent.java

@@ -23,7 +23,7 @@ import javax.annotation.Nonnull;
 
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.item.Item;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IModelRegistry;
 
@@ -46,7 +46,7 @@ public class ItemMeshDefinitionComponent implements IModelRegistrationComponent
 	}
 
 	@Override
-	public void modelRegistration( Side side, IModelRegistry registry )
+	public void modelRegistration( Dist dist, IModelRegistry registry )
 	{
 		registry.setCustomMeshDefinition( this.item, this.meshDefinition );
 	}

src/main/java/appeng/bootstrap/components/ItemModelComponent.java

@@ -23,9 +23,9 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.Item;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IModelRegistry;
 
@@ -48,7 +48,7 @@ public class ItemModelComponent implements IModelRegistrationComponent
 	}
 
 	@Override
-	public void modelRegistration( Side side, IModelRegistry registry )
+	public void modelRegistration( Dist dist, IModelRegistry registry )
 	{
 		this.modelsByMeta.forEach( ( meta, model ) ->
 		{

src/main/java/appeng/bootstrap/components/ItemVariantsComponent.java

@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IModelRegistry;
 
@@ -42,7 +42,7 @@ public class ItemVariantsComponent implements IModelRegistrationComponent
 	}
 
 	@Override
-	public void modelRegistration( Side side, IModelRegistry registry )
+	public void modelRegistration( Dist dist, IModelRegistry registry )
 	{
 		ResourceLocation[] resourceArr = this.resources.toArray( new ResourceLocation[0] );
 		registry.registerItemVariants( this.item, resourceArr );

src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java

@@ -26,15 +26,15 @@ import java.util.function.BiFunction;
 
 import com.google.common.collect.Sets;
 
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.util.registry.IRegistry;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.model.IModel;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import appeng.core.AppEng;
 
@@ -53,7 +53,7 @@ public class ModelOverrideComponent implements IPreInitComponent
 	}
 
 	@Override
-	public void preInitialize( Side side )
+	public void preInitialize( Dist dist )
 	{
 		MinecraftForge.EVENT_BUS.register( this );
 	}

src/main/java/appeng/bootstrap/components/StateMapperComponent.java

@@ -24,7 +24,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.statemap.IStateMapper;
 import net.minecraft.client.resources.IReloadableResourceManager;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.Dist;
 
 import appeng.bootstrap.IModelRegistry;
 
@@ -46,12 +46,12 @@ public class StateMapperComponent implements IModelRegistrationComponent
 	}
 
 	@Override
-	public void modelRegistration( Side side, IModelRegistry registry )
+	public void modelRegistration( Dist dist, IModelRegistry registry )
 	{
 		registry.setCustomStateMapper( this.block, this.stateMapper );
 		if( this.stateMapper instanceof IResourceManagerReloadListener )
 		{
-			( (IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager() )
+			( (IReloadableResourceManager) Minecraft.getInstance().getResourceManager() )
 					.registerReloadListener( (IResourceManagerReloadListener) this.stateMapper );
 		}
 	}

src/main/java/appeng/bootstrap/components/TesrComponent.java

@@ -19,9 +19,13 @@
 package appeng.bootstrap.components;
 
 
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import java.util.function.Function;
+
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.tileentity.TileEntityType;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.relauncher.Side;
 
 import appeng.tile.AEBaseTile;
 
@@ -31,24 +35,23 @@ import appeng.tile.AEBaseTile;
  *
  * @param <T>
  */
-// public class TesrComponent<T extends AEBaseTile> implements ModelRegComponent
 public class TesrComponent<T extends AEBaseTile> implements IPreInitComponent
 {
 
-	private final Class<T> tileEntityClass;
+	private final TileEntityType<T> tileEntityClass;
 
-	private final TileEntitySpecialRenderer<? super T> tesr;
+	private final Function<? super TileEntityRendererDispatcher, ? extends TileEntityRenderer<? super T>> ter;
 
-	public TesrComponent( Class<T> tileEntityClass, TileEntitySpecialRenderer<? super T> tesr )
+	public TesrComponent( TileEntityType<T> tileEntityClass, Function<? super TileEntityRendererDispatcher, ? extends TileEntityRenderer<? super T>> ter )
 	{
 		this.tileEntityClass = tileEntityClass;
-		this.tesr = tesr;
+		this.ter = ter;
 	}
 
 	@Override
-	// public void modelReg( Side side )
-	public void preInitialize( Side side )
+	// public void modelReg( Dist dist )
+	public void preInitialize( Dist dist )
 	{
-		ClientRegistry.bindTileEntitySpecialRenderer( this.tileEntityClass, this.tesr );
+		ClientRegistry.bindTileEntityRenderer( this.tileEntityClass, this.ter );
 	}
 }

src/main/java/appeng/bootstrap/components/TileEntityComponent.java

@@ -5,8 +5,8 @@ package appeng.bootstrap.components;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
 
 import appeng.bootstrap.definitions.TileEntityDefinition;
 import appeng.core.AppEng;
@@ -32,7 +32,7 @@ public class TileEntityComponent implements IPreInitComponent
 	}
 
 	@Override
-	public void preInitialize( Side side )
+	public void preInitialize( Dist dist )
 	{
 		for( TileEntityDefinition tileEntityDefinition : this.tileEntityDefinitions )
 		{

src/main/java/appeng/capabilities/Capabilities.java

@@ -19,10 +19,8 @@
 package appeng.capabilities;
 
 
-import net.darkhax.tesla.api.ITeslaConsumer;
-import net.darkhax.tesla.api.ITeslaHolder;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.nbt.INBT;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -30,8 +28,6 @@ import net.minecraftforge.energy.IEnergyStorage;
 
 import appeng.api.storage.ISpatialDimension;
 import appeng.api.storage.IStorageMonitorableAccessor;
-import appeng.integration.IntegrationRegistry;
-import appeng.integration.IntegrationType;
 
 
 /**
@@ -48,10 +44,6 @@ public final class Capabilities
 
 	public static Capability<ISpatialDimension> SPATIAL_DIMENSION;
 
-	public static Capability<ITeslaConsumer> TESLA_CONSUMER;
-
-	public static Capability<ITeslaHolder> TESLA_HOLDER;
-
 	public static Capability<IEnergyStorage> FORGE_ENERGY;
 
 	/**
@@ -75,24 +67,6 @@ public final class Capabilities
 		SPATIAL_DIMENSION = cap;
 	}
 
-	@CapabilityInject( ITeslaConsumer.class )
-	private static void capITeslaConsumerRegistered( Capability<ITeslaConsumer> cap )
-	{
-		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.TESLA ) )
-		{
-			TESLA_CONSUMER = cap;
-		}
-	}
-
-	@CapabilityInject( ITeslaHolder.class )
-	private static void capITeslaHolderRegistered( Capability<ITeslaHolder> cap )
-	{
-		if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.TESLA ) )
-		{
-			TESLA_HOLDER = cap;
-		}
-	}
-
 	@CapabilityInject( IEnergyStorage.class )
 	private static void capIEnergyStorageRegistered( Capability<IEnergyStorage> cap )
 	{
@@ -105,13 +79,13 @@ public final class Capabilities
 		return new Capability.IStorage<T>()
 		{
 			@Override
-			public NBTBase writeNBT( Capability<T> capability, T instance, EnumFacing side )
+			public INBT writeNBT( Capability<T> capability, T instance, Direction side )
 			{
 				return null;
 			}
 
 			@Override
-			public void readNBT( Capability<T> capability, T instance, EnumFacing side, NBTBase nbt )
+			public void readNBT( Capability<T> capability, T instance, Direction side, INBT nbt )
 			{
 
 			}

src/main/java/appeng/client/ClientHelper.java

@@ -28,10 +28,10 @@ import java.util.Random;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Items;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -111,7 +111,7 @@ public class ClientHelper extends ServerHelper
 	{
 		if( Platform.isClient() )
 		{
-			return Minecraft.getMinecraft().world;
+			return Minecraft.getInstance().world;
 		}
 		else
 		{
@@ -126,12 +126,12 @@ public class ClientHelper extends ServerHelper
 	}
 
 	@Override
-	public List<EntityPlayer> getPlayers()
+	public List<PlayerEntity> getPlayers()
 	{
 		if( Platform.isClient() )
 		{
-			final List<EntityPlayer> o = new ArrayList<>();
-			o.add( Minecraft.getMinecraft().player );
+			final List<PlayerEntity> o = new ArrayList<>();
+			o.add( Minecraft.getInstance().player );
 			return o;
 		}
 		else
@@ -173,7 +173,7 @@ public class ClientHelper extends ServerHelper
 	@Override
 	public boolean shouldAddParticles( final Random r )
 	{
-		final int setting = Minecraft.getMinecraft().gameSettings.particleSetting;
+		final int setting = Minecraft.getInstance().gameSettings.particleSetting;
 		if( setting == 2 )
 		{
 			return false;
@@ -188,7 +188,7 @@ public class ClientHelper extends ServerHelper
 	@Override
 	public RayTraceResult getRTR()
 	{
-		return Minecraft.getMinecraft().objectMouseOver;
+		return Minecraft.getInstance().objectMouseOver;
 	}
 
 	@Override
@@ -204,8 +204,8 @@ public class ClientHelper extends ServerHelper
 			return super.getRenderMode();
 		}
 
-		final Minecraft mc = Minecraft.getMinecraft();
-		final EntityPlayer player = mc.player;
+		final Minecraft mc = Minecraft.getInstance();
+		final PlayerEntity player = mc.player;
 
 		return this.renderModeForPlayer( player );
 	}
@@ -213,13 +213,13 @@ public class ClientHelper extends ServerHelper
 	@Override
 	public void triggerUpdates()
 	{
-		final Minecraft mc = Minecraft.getMinecraft();
+		final Minecraft mc = Minecraft.getInstance();
 		if( mc == null || mc.player == null || mc.world == null )
 		{
 			return;
 		}
 
-		final EntityPlayer player = mc.player;
+		final PlayerEntity player = mc.player;
 
 		final int x = (int) player.posX;
 		final int y = (int) player.posY;
@@ -250,7 +250,7 @@ public class ClientHelper extends ServerHelper
 		final PacketAssemblerAnimation paa = (PacketAssemblerAnimation) o;
 
 		final AssemblerFX fx = new AssemblerFX( world, posX, posY, posZ, 0.0D, 0.0D, 0.0D, paa.rate, paa.is );
-		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+		Minecraft.getInstance().effectRenderer.addEffect( fx );
 	}
 
 	private void spawnVibrant( final World w, final double x, final double y, final double z )
@@ -262,7 +262,7 @@ public class ClientHelper extends ServerHelper
 			final double d2 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
 
 			final VibrantFX fx = new VibrantFX( w, x + d0, y + d1, z + d2, 0.0D, 0.0D, 0.0D );
-			Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+			Minecraft.getInstance().effectRenderer.addEffect( fx );
 		}
 	}
 
@@ -278,7 +278,7 @@ public class ClientHelper extends ServerHelper
 		fx.setMotionY( -y * 0.2f );
 		fx.setMotionZ( -z * 0.2f );
 
-		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+		Minecraft.getInstance().effectRenderer.addEffect( fx );
 	}
 
 	private void spawnEnergy( final World w, final double posX, final double posY, final double posZ )
@@ -293,19 +293,19 @@ public class ClientHelper extends ServerHelper
 		fx.setMotionY( -y * 0.1f );
 		fx.setMotionZ( -z * 0.1f );
 
-		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+		Minecraft.getInstance().effectRenderer.addEffect( fx );
 	}
 
 	private void spawnLightning( final World world, final double posX, final double posY, final double posZ )
 	{
 		final LightningFX fx = new LightningFX( world, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
-		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+		Minecraft.getInstance().effectRenderer.addEffect( fx );
 	}
 
 	private void spawnLightningArc( final World world, final double posX, final double posY, final double posZ, final Vec3d second )
 	{
 		final LightningFX fx = new LightningArcFX( world, posX, posY, posZ, second.x, second.y, second.z, 0.0f, 0.0f, 0.0f );
-		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
+		Minecraft.getInstance().effectRenderer.addEffect( fx );
 	}
 
 	@SubscribeEvent
@@ -316,12 +316,12 @@ public class ClientHelper extends ServerHelper
 			return;
 		}
 
-		final Minecraft mc = Minecraft.getMinecraft();
-		final EntityPlayer player = mc.player;
-		if( player.isSneaking() )
+		final Minecraft mc = Minecraft.getInstance();
+		final PlayerEntity player = mc.player;
+		if( player.isShiftKeyDown() )
 		{
-			final boolean mainHand = player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem;
-			final boolean offHand = player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem;
+			final boolean mainHand = player.getHeldItem( Hand.MAIN_HAND ).getItem() instanceof IMouseWheelItem;
+			final boolean offHand = player.getHeldItem( Hand.OFF_HAND ).getItem() instanceof IMouseWheelItem;
 
 			if( mainHand || offHand )
 			{

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -49,7 +49,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.ClickType;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -385,7 +385,7 @@ public abstract class AEBaseGui extends GuiContainer
 	@Override
 	protected void handleMouseClick( final Slot slot, final int slotIdx, final int mouseButton, final ClickType clickType )
 	{
-		final EntityPlayer player = Minecraft.getMinecraft().player;
+		final PlayerEntity player = Minecraft.getInstance().player;
 
 		if( slot instanceof SlotFake )
 		{
@@ -793,8 +793,8 @@ public abstract class AEBaseGui extends GuiContainer
 				GlStateManager.disableLighting();
 				GlStateManager.disableBlend();
 				final Fluid fluid = fs.getFluid();
-				Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-				final TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( fluid.getStill().toString() );
+				Minecraft.getInstance().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
+				final TextureAtlasSprite sprite = Minecraft.getInstance().getTextureMapBlocks().getAtlasSprite( fluid.getStill().toString() );
 
 				// Set color for dynamic fluids
 				// Convert int color to RGB

src/main/java/appeng/client/gui/Size1Slot.java

@@ -6,13 +6,13 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.items.SlotItemHandler;
 
 
@@ -72,34 +72,34 @@ class Size1Slot extends SlotItemHandler
 
 	@Override
 	@Nullable
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public String getSlotTexture()
 	{
 		return this.delegate.getSlotTexture();
 	}
 
 	@Override
-	public boolean canTakeStack( EntityPlayer playerIn )
+	public boolean canTakeStack( PlayerEntity playerIn )
 	{
 		return this.delegate.canTakeStack( playerIn );
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public boolean isEnabled()
 	{
 		return this.delegate.isEnabled();
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public ResourceLocation getBackgroundLocation()
 	{
 		return this.delegate.getBackgroundLocation();
 	}
 
 	@Override
-	@SideOnly( Side.CLIENT )
+	@OnlyIn( Dist.CLIENT )
 	public TextureAtlasSprite getBackgroundSprite()
 	{
 		return this.delegate.getBackgroundSprite();

src/main/java/appeng/client/gui/implementations/GuiCellWorkbench.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 
@@ -53,9 +53,9 @@ public class GuiCellWorkbench extends GuiUpgradeable
 	private GuiImgButton partition;
 	private GuiToggleButton copyMode;
 
-	public GuiCellWorkbench( final InventoryPlayer inventoryPlayer, final TileCellWorkbench te )
+	public GuiCellWorkbench( final PlayerInventory PlayerInventory, final TileCellWorkbench te )
 	{
-		super( new ContainerCellWorkbench( inventoryPlayer, te ) );
+		super( new ContainerCellWorkbench( PlayerInventory, te ) );
 		this.workbench = (ContainerCellWorkbench) this.inventorySlots;
 		this.ySize = 251;
 	}

src/main/java/appeng/client/gui/implementations/GuiChest.java

@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiTabButton;
@@ -39,9 +39,9 @@ public class GuiChest extends AEBaseGui
 
 	private GuiTabButton priority;
 
-	public GuiChest( final InventoryPlayer inventoryPlayer, final TileChest te )
+	public GuiChest( final PlayerInventory PlayerInventory, final TileChest te )
 	{
-		super( new ContainerChest( inventoryPlayer, te ) );
+		super( new ContainerChest( PlayerInventory, te ) );
 		this.ySize = 166;
 	}
 

src/main/java/appeng/client/gui/implementations/GuiCondenser.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.api.config.Settings;
 import appeng.client.gui.AEBaseGui;
@@ -45,9 +45,9 @@ public class GuiCondenser extends AEBaseGui
 	private GuiProgressBar pb;
 	private GuiImgButton mode;
 
-	public GuiCondenser( final InventoryPlayer inventoryPlayer, final TileCondenser te )
+	public GuiCondenser( final PlayerInventory PlayerInventory, final TileCondenser te )
 	{
-		super( new ContainerCondenser( inventoryPlayer, te ) );
+		super( new ContainerCondenser( PlayerInventory, te ) );
 		this.cvc = (ContainerCondenser) this.inventorySlots;
 		this.ySize = 197;
 	}

src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java

@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;
@@ -66,9 +66,9 @@ public class GuiCraftAmount extends AEBaseGui
 	private GuiBridge originalGui;
 
 	@Reflected
-	public GuiCraftAmount( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
+	public GuiCraftAmount( final PlayerInventory PlayerInventory, final ITerminalHost te )
 	{
-		super( new ContainerCraftAmount( inventoryPlayer, te ) );
+		super( new ContainerCraftAmount( PlayerInventory, te ) );
 	}
 
 	@Override

src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java

@@ -31,7 +31,7 @@ import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;
@@ -74,9 +74,9 @@ public class GuiCraftConfirm extends AEBaseGui
 	private GuiButton selectCPU;
 	private int tooltip = -1;
 
-	public GuiCraftConfirm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
+	public GuiCraftConfirm( final PlayerInventory PlayerInventory, final ITerminalHost te )
 	{
-		super( new ContainerCraftConfirm( inventoryPlayer, te ) );
+		super( new ContainerCraftConfirm( PlayerInventory, te ) );
 		this.xSize = 238;
 		this.ySize = 206;
 

src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java

@@ -31,7 +31,7 @@ import org.apache.commons.lang3.time.DurationFormatUtils;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;
@@ -92,9 +92,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	private GuiButton cancel;
 	private int tooltip = -1;
 
-	public GuiCraftingCPU( final InventoryPlayer inventoryPlayer, final Object te )
+	public GuiCraftingCPU( final PlayerInventory PlayerInventory, final Object te )
 	{
-		this( new ContainerCraftingCPU( inventoryPlayer, te ) );
+		this( new ContainerCraftingCPU( PlayerInventory, te ) );
 	}
 
 	protected GuiCraftingCPU( final ContainerCraftingCPU container )

src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java

@@ -28,7 +28,7 @@ import java.io.IOException;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;
@@ -59,9 +59,9 @@ public class GuiCraftingStatus extends GuiCraftingCPU
 	private GuiBridge originalGui;
 	private ItemStack myIcon = ItemStack.EMPTY;
 
-	public GuiCraftingStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
+	public GuiCraftingStatus( final PlayerInventory PlayerInventory, final ITerminalHost te )
 	{
-		super( new ContainerCraftingStatus( inventoryPlayer, te ) );
+		super( new ContainerCraftingStatus( PlayerInventory, te ) );
 
 		this.status = (ContainerCraftingStatus) this.inventorySlots;
 		final Object target = this.status.getTarget();

src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java

@@ -20,7 +20,7 @@ package appeng.client.gui.implementations;
 
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 
@@ -41,9 +41,9 @@ public class GuiCraftingTerm extends GuiMEMonitorable
 
 	private GuiImgButton clearBtn;
 
-	public GuiCraftingTerm( final InventoryPlayer inventoryPlayer, final ITerminalHost te )
+	public GuiCraftingTerm( final PlayerInventory PlayerInventory, final ITerminalHost te )
 	{
-		super( inventoryPlayer, te, new ContainerCraftingTerm( inventoryPlayer, te ) );
+		super( PlayerInventory, te, new ContainerCraftingTerm( PlayerInventory, te ) );
 		this.setReservedSpace( 73 );
 	}
 

src/main/java/appeng/client/gui/implementations/GuiDrive.java

@@ -22,7 +22,7 @@ package appeng.client.gui.implementations;
 import java.io.IOException;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.client.gui.AEBaseGui;
 import appeng.client.gui.widgets.GuiTabButton;
@@ -39,9 +39,9 @@ public class GuiDrive extends AEBaseGui
 
 	private GuiTabButton priority;
 
-	public GuiDrive( final InventoryPlayer inventoryPlayer, final TileDrive te )
+	public GuiDrive( final PlayerInventory PlayerInventory, final TileDrive te )
 	{
-		super( new ContainerDrive( inventoryPlayer, te ) );
+		super( new ContainerDrive( PlayerInventory, te ) );
 		this.ySize = 199;
 	}
 

src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Settings;
@@ -46,9 +46,9 @@ public class GuiFormationPlane extends GuiUpgradeable
 	private GuiTabButton priority;
 	private GuiImgButton placeMode;
 
-	public GuiFormationPlane( final InventoryPlayer inventoryPlayer, final PartFormationPlane te )
+	public GuiFormationPlane( final PlayerInventory PlayerInventory, final PartFormationPlane te )
 	{
-		super( new ContainerFormationPlane( inventoryPlayer, te ) );
+		super( new ContainerFormationPlane( PlayerInventory, te ) );
 		this.ySize = 251;
 	}
 

src/main/java/appeng/client/gui/implementations/GuiGrinder.java

@@ -19,7 +19,7 @@
 package appeng.client.gui.implementations;
 
 
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.client.gui.AEBaseGui;
 import appeng.container.implementations.ContainerGrinder;
@@ -30,9 +30,9 @@ import appeng.tile.grindstone.TileGrinder;
 public class GuiGrinder extends AEBaseGui
 {
 
-	public GuiGrinder( final InventoryPlayer inventoryPlayer, final TileGrinder te )
+	public GuiGrinder( final PlayerInventory PlayerInventory, final TileGrinder te )
 	{
-		super( new ContainerGrinder( inventoryPlayer, te ) );
+		super( new ContainerGrinder( PlayerInventory, te ) );
 		this.ySize = 176;
 	}
 

src/main/java/appeng/client/gui/implementations/GuiIOPort.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 import org.lwjgl.input.Mouse;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.entity.player.PlayerInventory;
 
 import appeng.api.AEApi;
 import appeng.api.config.FullnessMode;
@@ -46,9 +46,9 @@ public class GuiIOPort extends GuiUpgradeable
 	private GuiImgButton fullMode;
 	private GuiImgButton operationMode;
 
-	public GuiIOPort( final InventoryPlayer inventoryPlayer, final TileIOPort te )
+	public GuiIOPort( final PlayerInventory PlayerInventory, final TileIOPort te )
 	{
-		super( new ContainerIOPort( inventoryPlayer, te ) );
+		super( new ContainerIOPort( PlayerInventory, te ) );
 		this.ySize = 166;
 	}