Changed to Null ItemStack instead of null.

gradle.properties

@@ -1,4 +1,4 @@
-aeversion=rv4
+aeversion=rv5
 aechannel=alpha
 aebuild=0
 aegroup=appeng
@@ -7,9 +7,9 @@ aebasename=appliedenergistics2
 #########################################################
 # Versions                                              #
 #########################################################
-minecraft_version=1.10.2
-mcp_mappings=snapshot_20161111
-forge_version=12.18.3.2185
+minecraft_version=1.11
+mcp_mappings=snapshot_20161206
+forge_version=13.19.1.2189
 
 #########################################################
 # Installable                                           #
@@ -19,7 +19,7 @@ waila_version=1.7.0-B3_1.9.4
 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_version=3.13.6.391
-tesla_version=1.10.2-1.2.1.50
+jei_version=4.0.4.199
+tesla_version=1.11-1.3.0.51
 ic2_version=2.6.99-ex110
-top_version=1.10-1.3.3-41
+top_version=1.11-1.3.3-46

gradle/scripts/dependencies.gradle

@@ -51,15 +51,15 @@ configurations {
 
 dependencies {
     // installable runtime dependencies
-    mods "mcp.mobius.waila:Waila:${waila_version}"
-    mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
+    //mods "mcp.mobius.waila:Waila:${waila_version}"
+    //mods "net.industrial-craft:industrialcraft-2:${ic2_version}:dev"
     mods "mcjty.theoneprobe:TheOneProbe:${top_version}"
 
     // compile against provided APIs
     compileOnly "mezz.jei:jei_${minecraft_version}:${jei_version}:api"
-    compileOnly "mcp.mobius.waila:Waila:${waila_version}"
+    //compileOnly "mcp.mobius.waila:Waila:${waila_version}"
     compileOnly "net.darkhax.tesla:Tesla:${tesla_version}"
-    compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
+    //compileOnly "net.industrial-craft:industrialcraft-2:${ic2_version}:api"
     compileOnly "mcjty.theoneprobe:TheOneProbe:${top_version}:api"
 
     // at runtime, use the full JEI jar

src/api/java/appeng/api/definitions/IParts.java

@@ -76,9 +76,9 @@ public interface IParts
 
 	IItemDefinition p2PTunnelItems();
 
-	IItemDefinition p2PTunnelFluids();
+	//IItemDefinition p2PTunnelLiquids();
 
-	IItemDefinition p2PTunnelEU();
+	//IItemDefinition p2PTunnelEU();
 
 	// IItemDefinition p2PTunnelRF();
 

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

@@ -93,12 +93,6 @@ public abstract class AEBaseBlock extends Block
 		this.fullBlock = this.isFullSize();
 	}
 
-	@Override
-	public final boolean isVisuallyOpaque()
-	{
-		return this.isOpaque() && this.isFullSize();
-	}
-
 	@Override
 	protected BlockStateContainer createBlockState()
 	{
@@ -151,10 +145,10 @@ public abstract class AEBaseBlock extends Block
 		{
 			if( Platform.isClient() )
 			{
-				final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+				final EntityPlayer player = Minecraft.getMinecraft().player;
 				final LookDirection ld = Platform.getPlayerRay( player, Platform.getEyeOffset( player ) );
 
-				final Iterable<AxisAlignedBB> bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, Minecraft.getMinecraft().thePlayer, true );
+				final Iterable<AxisAlignedBB> bbs = collisionHandler.getSelectedBoundingBoxesFromPool( w, pos, Minecraft.getMinecraft().player, true );
 				AxisAlignedBB br = null;
 
 				double lastDist = 0;

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

@@ -126,7 +126,7 @@ public class AEBaseItemBlock extends ItemBlock
 			{
 				up = EnumFacing.UP;
 
-				final byte rotation = (byte) ( MathHelper.floor_double( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
+				final byte rotation = (byte) ( MathHelper.floor( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
 
 				switch( rotation )
 				{

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

@@ -269,13 +269,16 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 	}
 
 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer player, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	public boolean onBlockActivated( World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ )
 	{
-		if( player != null && heldItem != null )
+		ItemStack heldItem;
+		if( player != null && player.getHeldItemMainhand() != null )
 		{
+			heldItem = player.getHeldItemMainhand();
+			
 			if( Platform.isWrench( player, heldItem, pos ) && player.isSneaking() )
 			{
-				final IBlockState blockState = w.getBlockState( pos );
+				final IBlockState blockState = world.getBlockState( pos );
 				final Block block = blockState.getBlock();
 
 				if( block == null )
@@ -283,7 +286,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					return false;
 				}
 
-				final AEBaseTile tile = this.getTileEntity( w, pos );
+				final AEBaseTile tile = this.getTileEntity( world, pos );
 
 				if( tile == null )
 				{
@@ -295,7 +298,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					return false;
 				}
 
-				final ItemStack[] itemDropCandidates = Platform.getBlockDrops( w, pos );
+				final ItemStack[] itemDropCandidates = Platform.getBlockDrops( world, pos );
 				final ItemStack op = new ItemStack( this );
 
 				for( final ItemStack ol : itemDropCandidates )
@@ -310,11 +313,11 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 					}
 				}
 
-				if( block.removedByPlayer( blockState, w, pos, player, false ) )
+				if( block.removedByPlayer( blockState, world, pos, player, false ) )
 				{
 					final List<ItemStack> itemsToDrop = Lists.newArrayList( itemDropCandidates );
-					Platform.spawnDrops( w, pos, itemsToDrop );
-					w.setBlockToAir( pos );
+					Platform.spawnDrops( world, pos, itemsToDrop );
+					world.setBlockToAir( pos );
 				}
 
 				return false;
@@ -323,7 +326,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 			if( heldItem.getItem() instanceof IMemoryCard && !( this instanceof BlockCableBus ) )
 			{
 				final IMemoryCard memoryCard = (IMemoryCard) heldItem.getItem();
-				final AEBaseTile tileEntity = this.getTileEntity( w, pos );
+				final AEBaseTile tileEntity = this.getTileEntity( world, pos );
 
 				if( tileEntity == null )
 				{
@@ -361,7 +364,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity
 			}
 		}
 
-		return this.onActivated( w, pos, player, hand, heldItem, side, hitX, hitY, hitZ );
+		return this.onActivated( world, pos, player, hand, player.getHeldItemMainhand(), facing, hitX, hitY, hitZ );
 	}
 
 	@Override

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

@@ -19,14 +19,13 @@
 package appeng.block.crafting;
 
 
-import java.util.List;
-
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.property.ExtendedBlockState;
@@ -85,7 +84,7 @@ public class BlockCraftingMonitor extends BlockCraftingUnit
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
+	public void getSubBlocks( final Item item, final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		itemStacks.add( new ItemStack( this, 1, 0 ) );
 	}

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

@@ -21,8 +21,6 @@ package appeng.block.crafting;
 
 import java.util.EnumSet;
 
-import javax.annotation.Nullable;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
@@ -30,7 +28,6 @@ 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.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -118,7 +115,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World worldIn, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( final IBlockState state, final World worldIn, final BlockPos pos, final Block blockIn, final BlockPos fromPos )
 	{
 		final TileCraftingTile cp = this.getTileEntity( worldIn, pos );
 		if( cp != null )
@@ -146,10 +143,9 @@ 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 @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	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 )
 	{
 		final TileCraftingTile tg = this.getTileEntity( w, pos );
-
 		if( tg != null && !p.isSneaking() && tg.isFormed() && tg.isActive() )
 		{
 			if( Platform.isClient() )
@@ -161,7 +157,7 @@ public class BlockCraftingUnit extends AEBaseTileBlock
 			return true;
 		}
 
-		return super.onBlockActivated( w, pos, state, p, hand, heldItem, side, hitX, hitY, hitZ );
+		return false;
 	}
 
 	public enum CraftingUnitType

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

@@ -19,14 +19,11 @@
 package appeng.block.crafting;
 
 
-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.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -42,6 +39,7 @@ import appeng.core.sync.GuiBridge;
 import appeng.tile.crafting.TileMolecularAssembler;
 import appeng.util.Platform;
 
+
 public class BlockMolecularAssembler extends AEBaseTileBlock
 {
 
@@ -88,18 +86,18 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 
 	@SideOnly( Side.CLIENT )
 	@Override
-	public boolean canRenderInLayer( BlockRenderLayer layer )
+	public boolean canRenderInLayer( IBlockState state, BlockRenderLayer layer )
 	{
 		return layer == BlockRenderLayer.TRANSLUCENT;
 	}
 
-	public boolean isFullCube(IBlockState state)
+	public boolean isFullCube( IBlockState state )
 	{
 		return false;
 	}
 
 	@Override
-	public boolean onBlockActivated( final World w, final BlockPos pos, final IBlockState state, final EntityPlayer p, final EnumHand hand, final @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	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 )
 	{
 		final TileMolecularAssembler tg = this.getTileEntity( w, pos );
 		if( tg != null && !p.isSneaking() )
@@ -107,7 +105,6 @@ public class BlockMolecularAssembler extends AEBaseTileBlock
 			Platform.openGUI( p, tg, AEPartLocation.fromFacing( side ), GuiBridge.GUI_MAC );
 			return true;
 		}
-		
-		return super.onBlockActivated( w, pos, state, p, hand, heldItem, side, hitX, hitY, hitZ );
+		return false;
 	}
 }

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

@@ -135,7 +135,7 @@ public class BlockCrank extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World world, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 
 		final AEBaseTile tile = this.getTileEntity( world, pos );

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

@@ -52,7 +52,7 @@ import appeng.client.render.effects.LightningFX;
 import appeng.client.render.renderable.ItemRenderable;
 import appeng.client.render.tesr.ModularTESR;
 import appeng.core.AEConfig;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.helpers.ICustomCollision;
 import appeng.tile.AEBaseTile;
 import appeng.tile.misc.TileCharger;
@@ -118,7 +118,7 @@ public class BlockCharger extends AEBaseTileBlock implements ICustomCollision
 
 				for( int bolts = 0; bolts < 3; bolts++ )
 				{
-					if( CommonHelper.proxy.shouldAddParticles( r ) )
+					if( AppEng.proxy.shouldAddParticles( r ) )
 					{
 						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 );

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

@@ -148,12 +148,12 @@ public class BlockLightDetector extends AEBaseTileBlock implements IOrientableBl
 	}
 	
 	@Override
-	public void neighborChanged( IBlockState state, World w, BlockPos pos, Block blockIn )
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final EnumFacing up = this.getOrientable( w, pos ).getUp();
-		if( !this.canPlaceAt( (World) w, pos, up.getOpposite() ) )
+		final EnumFacing up = this.getOrientable( world, pos ).getUp();
+		if( !this.canPlaceAt( (World) world, pos, up.getOpposite() ) )
 		{
-			this.dropTorch( (World) w, pos );
+			this.dropTorch( (World) world, pos );
 		}
 	}
 

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

@@ -45,7 +45,7 @@ import appeng.api.util.IOrientableBlock;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.effects.LightningFX;
 import appeng.core.AEConfig;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.helpers.ICustomCollision;
 import appeng.helpers.MetaRotation;
 
@@ -151,7 +151,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 		final double zOff = -0.3 * up.getFrontOffsetZ();
 		for( int bolts = 0; bolts < 3; bolts++ )
 		{
-			if( CommonHelper.proxy.shouldAddParticles( r ) )
+			if( AppEng.proxy.shouldAddParticles( r ) )
 			{
 				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 );
 
@@ -161,12 +161,12 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock,
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos,final Block neighborBlock )
+	public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos)
 	{
-		final EnumFacing up = this.getOrientable( w, pos ).getUp();
-		if( !this.canPlaceAt( w, pos, up.getOpposite() ) )
+		final EnumFacing up = this.getOrientable( world, pos ).getUp();
+		if( !this.canPlaceAt( world, pos, up.getOpposite() ) )
 		{
-			this.dropTorch( w, pos );
+			this.dropTorch( world, pos );
 		}
 	}
 

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

@@ -38,7 +38,7 @@ import appeng.api.util.IOrientableBlock;
 import appeng.block.AEBaseTileBlock;
 import appeng.client.render.effects.LightningFX;
 import appeng.core.AEConfig;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.tile.misc.TileQuartzGrowthAccelerator;
 import appeng.util.Platform;
 
@@ -83,7 +83,7 @@ public class BlockQuartzGrowthAccelerator extends AEBaseTileBlock implements IOr
 
 		final TileQuartzGrowthAccelerator cga = this.getTileEntity( w, pos );
 
-		if( cga != null && cga.isPowered() && CommonHelper.proxy.shouldAddParticles( r ) )
+		if( cga != null && cga.isPowered() && AppEng.proxy.shouldAddParticles( r ) )
 		{
 			final double d0 = r.nextFloat() - 0.5F;
 			final double d1 = r.nextFloat() - 0.5F;

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

@@ -78,13 +78,13 @@ public class BlockSkyCompass extends AEBaseTileBlock implements ICustomCollision
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TileSkyCompass sc = this.getTileEntity( w, pos );
+		final TileSkyCompass sc = this.getTileEntity( world, pos );
 		final EnumFacing forward = sc.getForward();
-		if( !this.canPlaceAt( w, pos, forward.getOpposite() ) )
+		if( !this.canPlaceAt( world, pos, forward.getOpposite() ) )
 		{
-			this.dropTorch( w, pos );
+			this.dropTorch( world, pos );
 		}
 	}
 

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

@@ -42,11 +42,8 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.registry.EntityRegistry;
 
 import appeng.block.AEBaseBlock;
-import appeng.core.AppEng;
-import appeng.entity.EntityIds;
 import appeng.entity.EntityTinyTNTPrimed;
 import appeng.helpers.ICustomCollision;
 
@@ -62,7 +59,8 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 		this.setSoundType( SoundType.GROUND );
 		this.setHardness( 0F );
 
-		EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.get( EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true );
+		// TODO: 1.11
+		//EntityRegistry.registerModEntity( EntityTinyTNTPrimed.class, "EntityTinyTNTPrimed", EntityIds.get( EntityTinyTNTPrimed.class ), AppEng.instance(), 16, 4, true );
 	}
 
 	@Override
@@ -86,18 +84,18 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 		if( !w.isRemote )
 		{
 			final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, igniter );
-			w.spawnEntityInWorld( primedTinyTNTEntity );
+			w.spawnEntity( primedTinyTNTEntity );
 			w.playSound( null, primedTinyTNTEntity.posX, primedTinyTNTEntity.posY, primedTinyTNTEntity.posZ, SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1, 1 );
 		}
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		if( w.isBlockIndirectlyGettingPowered( pos ) > 0 )
+		if( world.isBlockIndirectlyGettingPowered( pos ) > 0 )
 		{
-			this.startFuse( w, pos, null );
-			w.setBlockToAir( pos );
+			this.startFuse( world, pos, null );
+			world.setBlockToAir( pos );
 		}
 	}
 
@@ -142,7 +140,7 @@ public class BlockTinyTNT extends AEBaseBlock implements ICustomCollision
 		{
 			final EntityTinyTNTPrimed primedTinyTNTEntity = new EntityTinyTNTPrimed( w, pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy() );
 			primedTinyTNTEntity.setFuse( w.rand.nextInt( primedTinyTNTEntity.getFuse() / 4 ) + primedTinyTNTEntity.getFuse() / 8 );
-			w.spawnEntityInWorld( primedTinyTNTEntity );
+			w.spawnEntity( primedTinyTNTEntity );
 		}
 	}
 

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

@@ -46,6 +46,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
@@ -236,7 +237,7 @@ public class BlockCableBus extends AEBaseTileBlock
 			return sp.facade.getItemStack();
 		}
 
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
@@ -330,11 +331,11 @@ public class BlockCableBus extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
 		if( Platform.isServer() )
 		{
-			this.cb( w, pos ).onNeighborChanged();
+			this.cb( world, pos ).onNeighborChanged();
 		}
 	}
 
@@ -377,7 +378,7 @@ public class BlockCableBus extends AEBaseTileBlock
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
+	public void getSubBlocks( final Item item, final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		// do nothing
 	}

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

@@ -170,9 +170,9 @@ public class BlockController extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TileController tc = this.getTileEntity( w, pos );
+		final TileController tc = this.getTileEntity( world, pos );
 		if( tc != null )
 		{
 			tc.onNeighborChange( false );

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

@@ -19,8 +19,6 @@
 package appeng.block.networking;
 
 
-import java.util.List;
-
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
@@ -28,6 +26,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.NonNullList;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -63,7 +62,7 @@ public class BlockEnergyCell extends AEBaseTileBlock
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
+	public void getSubBlocks( final Item item, final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		super.getSubBlocks( item, tabs, itemStacks );
 

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

@@ -22,14 +22,11 @@ package appeng.block.networking;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
@@ -111,11 +108,15 @@ 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 @Nullable ItemStack heldItem, final EnumFacing side, final float hitX, final float hitY, final float hitZ )
+	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 )
 	{
-		final TileWireless tg = this.getTileEntity( w, pos );
+		if( player.isSneaking() )
+		{
+			return false;
+		}
 
-		if( tg != null && !player.isSneaking() )
+		final TileWireless tg = this.getTileEntity( w, pos );
+		if( tg != null )
 		{
 			if( Platform.isServer() )
 			{
@@ -123,8 +124,7 @@ public class BlockWireless extends AEBaseTileBlock implements ICustomCollision
 			}
 			return true;
 		}
-
-		return super.onBlockActivated( w, pos, state, player, hand, heldItem, side, hitX, hitY, hitZ );
+		return false;
 	}
 
 	@Override

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

@@ -21,7 +21,6 @@ package appeng.block.paint;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Random;
 
 import net.minecraft.block.Block;
@@ -34,6 +33,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 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;
@@ -94,13 +94,13 @@ public class BlockPaint extends AEBaseTileBlock
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
+	public void getSubBlocks( final Item item, final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		// do nothing
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBox( final IBlockState state, final World worldIn, final BlockPos pos )
+	public AxisAlignedBB getCollisionBoundingBox( IBlockState blockState, IBlockAccess worldIn, BlockPos pos )
 	{
 		return null;
 	}
@@ -112,9 +112,9 @@ public class BlockPaint extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TilePaint tp = this.getTileEntity( w, pos );
+		final TilePaint tp = this.getTileEntity( world, pos );
 
 		if( tp != null )
 		{

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

@@ -101,9 +101,9 @@ public abstract class BlockQuantumBase extends AEBaseTileBlock implements ICusto
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TileQuantumBridge bridge = this.getTileEntity( w, pos );
+		final TileQuantumBridge bridge = this.getTileEntity( world, pos );
 		if( bridge != null )
 		{
 			bridge.neighborUpdate();

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

@@ -37,7 +37,7 @@ import net.minecraft.world.World;
 
 import appeng.api.util.AEPartLocation;
 import appeng.client.EffectType;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.core.sync.GuiBridge;
 import appeng.helpers.AEGlassMaterial;
 import appeng.tile.qnb.TileQuantumBridge;
@@ -60,9 +60,9 @@ public class BlockQuantumLinkChamber extends BlockQuantumBase
 		{
 			if( bridge.hasQES() )
 			{
-				if( CommonHelper.proxy.shouldAddParticles( rand ) )
+				if( AppEng.proxy.shouldAddParticles( rand ) )
 				{
-					CommonHelper.proxy.spawnEffect( EffectType.Energy, w, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, null );
+					AppEng.proxy.spawnEffect( EffectType.Energy, w, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, null );
 				}
 			}
 		}

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

@@ -28,6 +28,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Explosion;
@@ -53,7 +54,7 @@ public class BlockMatrixFrame extends AEBaseBlock implements ICustomCollision
 
 	@Override
 	@SideOnly( Side.CLIENT )
-	public void getSubBlocks( final Item item, final CreativeTabs tabs, final List<ItemStack> itemStacks )
+	public void getSubBlocks( final Item item, final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
 	{
 		// do nothing
 	}

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

@@ -47,9 +47,9 @@ public class BlockSpatialIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TileSpatialIOPort te = this.getTileEntity( w, pos );
+		final TileSpatialIOPort te = this.getTileEntity( world, pos );
 		if( te != null )
 		{
 			te.updateRedstoneState();

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

@@ -62,9 +62,9 @@ public class BlockSpatialPylon extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TileSpatialPylon tsp = this.getTileEntity( w, pos );
+		final TileSpatialPylon tsp = this.getTileEntity( world, pos );
 		if( tsp != null )
 		{
 			tsp.neighborChanged();

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

@@ -118,7 +118,7 @@ public class BlockChest extends AEBaseTileBlock
 				}
 				else
 				{
-					p.addChatMessage( PlayerMessages.ChestCannotReadStorageCell.get() );
+					p.sendMessage( PlayerMessages.ChestCannotReadStorageCell.get() );
 				}
 			}
 

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

@@ -48,9 +48,9 @@ public class BlockIOPort extends AEBaseTileBlock
 	}
 
 	@Override
-	public void neighborChanged( final IBlockState state, final World w, final BlockPos pos, final Block neighborBlock )
+	public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
 	{
-		final TileIOPort te = this.getTileEntity( w, pos );
+		final TileIOPort te = this.getTileEntity( world, pos );
 		if( te != null )
 		{
 			te.updateRedstoneState();

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

@@ -242,9 +242,6 @@ class BlockDefinitionBuilder implements IBlockBuilder
 			factory.addPreInit( side -> {
 				Class<? extends AEBaseTile> tileEntityClass = tileBlock.getTileEntityClass();
 				AEBaseTile.registerTileItem( tileEntityClass, new BlockStackSrc( block, 0, ActivityState.Enabled ) );
-
-				// TODO: Change after transition phase
-				GameRegistry.registerTileEntityWithAlternatives( tileEntityClass, AppEng.MOD_ID.toLowerCase() + ":" + registryName, registryName );
 			} );
 
 			return (T) new TileDefinition( registryName, (AEBaseTileBlock) block, item );

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

@@ -43,10 +43,10 @@ public final class Capabilities
 	@CapabilityInject( IStorageMonitorableAccessor.class )
 	public static Capability<IStorageMonitorableAccessor> STORAGE_MONITORABLE_ACCESSOR;
 
-	@CapabilityInject(ITeslaConsumer.class)
+	@CapabilityInject( ITeslaConsumer.class )
 	public static Capability<ITeslaConsumer> TESLA_CONSUMER;
 
-	@CapabilityInject(ITeslaHolder.class)
+	@CapabilityInject( ITeslaHolder.class )
 	public static Capability<ITeslaHolder> TESLA_HOLDER;
 
 	/**

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

@@ -58,7 +58,7 @@ import appeng.client.render.tesr.InscriberTESR;
 import appeng.client.render.textures.ParticleTextures;
 import appeng.core.AEConfig;
 import appeng.core.AELog;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketAssemblerAnimation;
 import appeng.core.sync.packets.PacketValueConfig;
@@ -117,7 +117,7 @@ public class ClientHelper extends ServerHelper
 	{
 		if( Platform.isClient() )
 		{
-			return Minecraft.getMinecraft().theWorld;
+			return Minecraft.getMinecraft().world;
 		}
 		else
 		{
@@ -137,7 +137,7 @@ public class ClientHelper extends ServerHelper
 		if( Platform.isClient() )
 		{
 			final List<EntityPlayer> o = new ArrayList<>();
-			o.add( Minecraft.getMinecraft().thePlayer );
+			o.add( Minecraft.getMinecraft().player );
 			return o;
 		}
 		else
@@ -147,29 +147,29 @@ public class ClientHelper extends ServerHelper
 	}
 
 	@Override
-	public void spawnEffect( final EffectType effect, final World worldObj, final double posX, final double posY, final double posZ, final Object o )
+	public void spawnEffect( final EffectType effect, final World world, final double posX, final double posY, final double posZ, final Object o )
 	{
 		if( AEConfig.instance().isEnableEffects() )
 		{
 			switch( effect )
 			{
 				case Assembler:
-					this.spawnAssembler( worldObj, posX, posY, posZ, o );
+					this.spawnAssembler( world, posX, posY, posZ, o );
 					return;
 				case Vibrant:
-					this.spawnVibrant( worldObj, posX, posY, posZ );
+					this.spawnVibrant( world, posX, posY, posZ );
 					return;
 				case Crafting:
-					this.spawnCrafting( worldObj, posX, posY, posZ );
+					this.spawnCrafting( world, posX, posY, posZ );
 					return;
 				case Energy:
-					this.spawnEnergy( worldObj, posX, posY, posZ );
+					this.spawnEnergy( world, posX, posY, posZ );
 					return;
 				case Lightning:
-					this.spawnLightning( worldObj, posX, posY, posZ );
+					this.spawnLightning( world, posX, posY, posZ );
 					return;
 				case LightningArc:
-					this.spawnLightningArc( worldObj, posX, posY, posZ, (Vec3d) o );
+					this.spawnLightningArc( world, posX, posY, posZ, (Vec3d) o );
 					return;
 				default:
 			}
@@ -216,7 +216,7 @@ public class ClientHelper extends ServerHelper
 		}
 
 		final Minecraft mc = Minecraft.getMinecraft();
-		final EntityPlayer player = mc.thePlayer;
+		final EntityPlayer player = mc.player;
 
 		return this.renderModeForPlayer( player );
 	}
@@ -225,12 +225,12 @@ public class ClientHelper extends ServerHelper
 	public void triggerUpdates()
 	{
 		final Minecraft mc = Minecraft.getMinecraft();
-		if( mc == null || mc.thePlayer == null || mc.theWorld == null )
+		if( mc == null || mc.player == null || mc.world == null )
 		{
 			return;
 		}
 
-		final EntityPlayer player = mc.thePlayer;
+		final EntityPlayer player = mc.player;
 
 		final int x = (int) player.posX;
 		final int y = (int) player.posY;
@@ -238,7 +238,7 @@ public class ClientHelper extends ServerHelper
 
 		final int range = 16 * 16;
 
-		mc.theWorld.markBlockRangeForRenderUpdate( x - range, y - range, z - range, x + range, y + range, z + range );
+		mc.world.markBlockRangeForRenderUpdate( x - range, y - range, z - range, x + range, y + range, z + range );
 	}
 
 	@Override
@@ -262,17 +262,17 @@ public class ClientHelper extends ServerHelper
 		}
 	}
 
-	private void spawnAssembler( final World worldObj, final double posX, final double posY, final double posZ, final Object o )
+	private void spawnAssembler( final World world, final double posX, final double posY, final double posZ, final Object o )
 	{
 		final PacketAssemblerAnimation paa = (PacketAssemblerAnimation) o;
 
-		final AssemblerFX fx = new AssemblerFX( worldObj, posX, posY, posZ, 0.0D, 0.0D, 0.0D, paa.rate, paa.is );
+		final AssemblerFX fx = new AssemblerFX( world, posX, posY, posZ, 0.0D, 0.0D, 0.0D, paa.rate, paa.is );
 		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 	}
 
 	private void spawnVibrant( final World w, final double x, final double y, final double z )
 	{
-		if( CommonHelper.proxy.shouldAddParticles( Platform.getRandom() ) )
+		if( AppEng.proxy.shouldAddParticles( Platform.getRandom() ) )
 		{
 			final double d0 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
 			final double d1 = ( Platform.getRandomFloat() - 0.5F ) * 0.26D;
@@ -313,15 +313,15 @@ public class ClientHelper extends ServerHelper
 		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 	}
 
-	private void spawnLightning( final World worldObj, final double posX, final double posY, final double posZ )
+	private void spawnLightning( final World world, final double posX, final double posY, final double posZ )
 	{
-		final LightningFX fx = new LightningFX( worldObj, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
+		final LightningFX fx = new LightningFX( world, posX, posY + 0.3f, posZ, 0.0f, 0.0f, 0.0f );
 		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 	}
 
-	private void spawnLightningArc( final World worldObj, final double posX, final double posY, final double posZ, final Vec3d second )
+	private void spawnLightningArc( final World world, final double posX, final double posY, final double posZ, final Vec3d second )
 	{
-		final LightningFX fx = new LightningArcFX( worldObj, posX, posY, posZ, second.xCoord, second.yCoord, second.zCoord, 0.0f, 0.0f, 0.0f );
+		final LightningFX fx = new LightningArcFX( world, posX, posY, posZ, second.xCoord, second.yCoord, second.zCoord, 0.0f, 0.0f, 0.0f );
 		Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 	}
 
@@ -334,7 +334,7 @@ public class ClientHelper extends ServerHelper
 		}
 
 		final Minecraft mc = Minecraft.getMinecraft();
-		final EntityPlayer player = mc.thePlayer;
+		final EntityPlayer player = mc.player;
 		if( player.isSneaking() )
 		{
 			final EnumHand hand;

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

@@ -251,14 +251,14 @@ public abstract class AEBaseGui extends GuiContainer
 				{
 					if( fs.isEnabled() )
 					{
-						this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
+						this.drawTexturedModalRect( ox + fs.xPos - 1, oy + fs.yPos - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
 								18 );
 					}
 					else
 					{
 						GlStateManager.color( 1.0F, 1.0F, 1.0F, 0.4F );
 						GlStateManager.enableBlend();
-						this.drawTexturedModalRect( ox + fs.xDisplayPosition - 1, oy + fs.yDisplayPosition - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
+						this.drawTexturedModalRect( ox + fs.xPos - 1, oy + fs.yPos - 1, fs.getSourceX() - 1, fs.getSourceY() - 1, 18,
 								18 );
 						GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
 					}
@@ -297,7 +297,7 @@ public abstract class AEBaseGui extends GuiContainer
 	protected void mouseClickMove( final int x, final int y, final int c, final long d )
 	{
 		final Slot slot = this.getSlot( x, y );
-		final ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
+		final ItemStack itemstack = this.mc.player.inventory.getItemStack();
 
 		if( this.getScrollBar() != null )
 		{
@@ -326,7 +326,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().thePlayer;
+		final EntityPlayer player = Minecraft.getMinecraft().player;
 
 		if( slot instanceof SlotFake )
 		{
@@ -521,7 +521,7 @@ public abstract class AEBaseGui extends GuiContainer
 				for( final Slot inventorySlot : slots )
 				{
 					if( inventorySlot != null && inventorySlot.canTakeStack(
-							this.mc.thePlayer ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.canAddItemToSlot(
+							this.mc.player ) && inventorySlot.getHasStack() && inventorySlot.inventory == slot.inventory && Container.canAddItemToSlot(
 									inventorySlot, this.dbl_whichItem, true ) )
 					{
 						this.handleMouseClick( inventorySlot, inventorySlot.slotNumber, 1, clickType );
@@ -540,7 +540,7 @@ public abstract class AEBaseGui extends GuiContainer
 	{
 		final Slot theSlot = this.getSlotUnderMouse();
 
-		if( this.mc.thePlayer.inventory.getItemStack() == null && theSlot != null )
+		if( this.mc.player.inventory.getItemStack() == null && theSlot != null )
 		{
 			for( int j = 0; j < 9; ++j )
 			{
@@ -594,7 +594,7 @@ public abstract class AEBaseGui extends GuiContainer
 		for( final Slot slot : slots )
 		{
 			// isPointInRegion
-			if( this.isPointInRegion( slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, mouseX, mouseY ) )
+			if( this.isPointInRegion( slot.xPos, slot.yPos, 16, 16, mouseX, mouseY ) )
 			{
 				return slot;
 			}
@@ -704,7 +704,7 @@ public abstract class AEBaseGui extends GuiContainer
 
 				if( !this.isPowered() )
 				{
-					drawRect( s.xDisplayPosition, s.yDisplayPosition, 16 + s.xDisplayPosition, 16 + s.yDisplayPosition, 0x66111111 );
+					drawRect( s.xPos, s.yPos, 16 + s.xPos, 16 + s.yPos, 0x66111111 );
 				}
 
 				this.zLevel = 0.0F;
@@ -713,7 +713,7 @@ public abstract class AEBaseGui extends GuiContainer
 				// Annoying but easier than trying to splice into render item
 				super.drawSlot( new Size1Slot( s ) );
 
-				stackSizeRenderer.renderStackSize( fontRendererObj, ( (SlotME) s ).getAEStack(), s.getStack(), s.xDisplayPosition, s.yDisplayPosition );
+				stackSizeRenderer.renderStackSize( fontRendererObj, ( (SlotME) s ).getAEStack(), s.getStack(), s.xPos, s.yPos );
 
 			}
 			catch( final Exception err )
@@ -745,8 +745,8 @@ public abstract class AEBaseGui extends GuiContainer
 							GlStateManager.enableTexture2D();
 							GlStateManager.blendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
 							GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
-							final float par1 = aes.xDisplayPosition;
-							final float par2 = aes.yDisplayPosition;
+							final float par1 = aes.xPos;
+							final float par2 = aes.yPos;
 							final float par3 = uv_x * 16;
 							final float par4 = uv_y * 16;
 
@@ -786,7 +786,7 @@ public abstract class AEBaseGui extends GuiContainer
 						{
 							try
 							{
-								isValid = ( (SlotRestrictedInput) s ).isValid( is, this.mc.theWorld );
+								isValid = ( (SlotRestrictedInput) s ).isValid( is, this.mc.world );
 							}
 							catch( final Exception err )
 							{
@@ -802,7 +802,7 @@ public abstract class AEBaseGui extends GuiContainer
 						this.itemRender.zLevel = 100.0F;
 
 						GlStateManager.disableLighting();
-						drawRect( s.xDisplayPosition, s.yDisplayPosition, 16 + s.xDisplayPosition, 16 + s.yDisplayPosition, 0x66ff6666 );
+						drawRect( s.xPos, s.yPos, 16 + s.xPos, 16 + s.yPos, 0x66ff6666 );
 						GlStateManager.enableLighting();
 
 						this.zLevel = 0.0F;

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

@@ -82,10 +82,10 @@ public abstract class AEBaseMEGui extends AEBaseGui
 						currentToolTip.add( TextFormatting.GRAY + format );
 					}
 				}
-				else if( stack.stackSize > BigNumber || ( stack.stackSize > 1 && stack.isItemDamaged() ) )
+				else if( stack.getCount() > BigNumber || ( stack.getCount() > 1 && stack.isItemDamaged() ) )
 				{
 					final String local = ButtonToolTips.ItemsStored.getLocal();
-					final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize );
+					final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( stack.getCount() );
 					final String format = String.format( local, formattedAmount );
 
 					currentToolTip.add( TextFormatting.GRAY + format );
@@ -119,7 +119,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
 			if( myStack != null )
 			{
 				@SuppressWarnings( "unchecked" )
-				final List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
+				final List<String> currentToolTip = stack.getTooltip( this.mc.player, this.mc.gameSettings.advancedItemTooltips );
 
 				if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
 				{
@@ -134,10 +134,10 @@ public abstract class AEBaseMEGui extends AEBaseGui
 				this.drawTooltip( x, y, currentToolTip );
 				return;
 			}
-			else if( stack.stackSize > BigNumber )
+			else if( stack.getCount() > BigNumber )
 			{
-				List<String> var4 = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
-				var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.stackSize ) );
+				List<String> var4 = stack.getTooltip( this.mc.player, this.mc.gameSettings.advancedItemTooltips );
+				var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.getCount() ) );
 				this.drawTooltip( x, y, var4 );
 				return;
 			}

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

@@ -24,7 +24,7 @@ class Size1Slot extends Slot
 
 	public Size1Slot( Slot delegate )
 	{
-		super( delegate.inventory, delegate.getSlotIndex(), delegate.xDisplayPosition, delegate.yDisplayPosition );
+		super( delegate.inventory, delegate.getSlotIndex(), delegate.xPos, delegate.yPos );
 		this.delegate = delegate;
 	}
 
@@ -36,11 +36,11 @@ class Size1Slot extends Slot
 		if( orgStack != null )
 		{
 			ItemStack modifiedStack = orgStack.copy();
-			modifiedStack.stackSize = 1;
+			modifiedStack.setCount( 1 );
 			return modifiedStack;
 		}
 
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override

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

@@ -232,7 +232,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 						final String which = Integer.toString( x );
 						if( invData.hasKey( which ) )
 						{
-							current.getInventory().setInventorySlotContents( x, ItemStack.loadItemStackFromNBT( invData.getCompoundTag( which ) ) );
+							current.getInventory().setInventorySlotContents( x, new ItemStack( invData.getCompoundTag( which ) ) );
 						}
 					}
 				}
@@ -344,7 +344,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		for( int i = 0; i < outTag.tagCount(); i++ )
 		{
 
-			final ItemStack parsedItemStack = ItemStack.loadItemStackFromNBT( outTag.getCompoundTagAt( i ) );
+			final ItemStack parsedItemStack = new ItemStack( outTag.getCompoundTagAt( i ) );
 			if( parsedItemStack != null )
 			{
 				final String displayName = Platform.getItemDisplayName( AEApi.instance().storage().createItemStack( parsedItemStack ) ).toLowerCase();

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

@@ -323,7 +323,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 		{
 			if( s instanceof AppEngSlot )
 			{
-				if( ( (Slot) s ).xDisplayPosition < 197 )
+				if( ( (Slot) s ).xPos < 197 )
 				{
 					this.repositionSlot( (AppEngSlot) s );
 				}
@@ -332,10 +332,10 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 			if( s instanceof SlotCraftingMatrix || s instanceof SlotFakeCraftingMatrix )
 			{
 				final Slot g = (Slot) s;
-				if( g.xDisplayPosition > 0 && g.yDisplayPosition > 0 )
+				if( g.xPos > 0 && g.yPos > 0 )
 				{
-					craftingGridOffsetX = Math.min( craftingGridOffsetX, g.xDisplayPosition );
-					craftingGridOffsetY = Math.min( craftingGridOffsetY, g.yDisplayPosition );
+					craftingGridOffsetX = Math.min( craftingGridOffsetX, g.xPos );
+					craftingGridOffsetY = Math.min( craftingGridOffsetY, g.yPos );
 				}
 			}
 		}
@@ -443,7 +443,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
 
 	protected void repositionSlot( final AppEngSlot s )
 	{
-		s.yDisplayPosition = s.getY() + this.ySize - 78 - 5;
+		s.yPos = s.getY() + this.ySize - 78 - 5;
 	}
 
 	@Override

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

@@ -253,7 +253,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
 
 			if( myStack != null )
 			{
-				List<String> currentToolTip = stack.getTooltip( this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips );
+				List<String> currentToolTip = stack.getTooltip( this.mc.player, this.mc.gameSettings.advancedItemTooltips );
 
 				while( currentToolTip.size() > 1 )
 				{

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

@@ -176,6 +176,6 @@ public class GuiPatternTerm extends GuiMEMonitorable
 	{
 		final int offsetPlayerSide = s.isPlayerSide() ? 5 : 3;
 
-		s.yDisplayPosition = s.getY() + this.ySize - 78 - offsetPlayerSide;
+		s.yPos = s.getY() + this.ySize - 78 - offsetPlayerSide;
 	}
 }

src/main/java/appeng/client/me/SlotDisconnected.java

@@ -76,11 +76,6 @@ public class SlotDisconnected extends AppEngSlot
 		return super.getStack();
 	}
 
-	@Override
-	public void onPickupFromSlot( final EntityPlayer par1EntityPlayer, final ItemStack par2ItemStack )
-	{
-	}
-
 	@Override
 	public boolean getHasStack()
 	{
@@ -96,7 +91,7 @@ public class SlotDisconnected extends AppEngSlot
 	@Override
 	public ItemStack decrStackSize( final int par1 )
 	{
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override

src/main/java/appeng/client/me/SlotME.java

@@ -47,11 +47,6 @@ public class SlotME extends Slot
 		return null;
 	}
 
-	@Override
-	public void onPickupFromSlot( final EntityPlayer par1EntityPlayer, final ItemStack par2ItemStack )
-	{
-	}
-
 	@Override
 	public boolean isItemValid( final ItemStack par1ItemStack )
 	{

src/main/java/appeng/client/render/StackSizeRenderer.java

@@ -53,7 +53,7 @@ public class StackSizeRenderer
 			final boolean unicodeFlag = fontRenderer.getUnicodeFlag();
 			fontRenderer.setUnicodeFlag( false );
 
-			if( is.stackSize == 0 )
+			if( is.getCount() == 0 )
 			{
 				final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft.getLocal();
 				GlStateManager.disableLighting();
@@ -70,7 +70,7 @@ public class StackSizeRenderer
 				GlStateManager.enableBlend();
 			}
 
-			final long amount = aeStack != null ? aeStack.getStackSize() : is.stackSize;
+			final long amount = aeStack != null ? aeStack.getStackSize() : is.getCount();
 			if( amount != 0 )
 			{
 				final String stackSize = this.getToBeRenderedStackSize( amount );

src/main/java/appeng/client/render/cablebus/CubeBuilder.java

@@ -174,10 +174,10 @@ public class CubeBuilder
 				putVertexTR( builder, face, x2, y2, z1, uv );
 				break;
 			case NORTH:
-				putVertexBR( builder, face, x2, y2, z1, uv );
-				putVertexTR( builder, face, x2, y1, z1, uv );
+				putVertexTL( builder, face, x2, y2, z1, uv );
+				putVertexTL( builder, face, x2, y1, z1, uv );
 				putVertexTL( builder, face, x1, y1, z1, uv );
-				putVertexBL( builder, face, x1, y2, z1, uv );
+				putVertexTL( builder, face, x1, y2, z1, uv );
 				break;
 			case SOUTH:
 				putVertexBL( builder, face, x1, y2, z2, uv );

src/main/java/appeng/client/render/effects/AssemblerFX.java

@@ -26,7 +26,7 @@ import net.minecraft.world.World;
 
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.EffectType;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.entity.EntityFloatingItem;
 import appeng.entity.ICanDie;
 
@@ -46,7 +46,7 @@ public class AssemblerFX extends Particle implements ICanDie
 		this.motionZ = 0;
 		this.speed = speed;
 		this.fi = new EntityFloatingItem( this, w, x, y, z, is.getItemStack() );
-		w.spawnEntityInWorld( this.fi );
+		w.spawnEntity( this.fi );
 		this.particleMaxAge = (int) Math.ceil( Math.max( 1, 100.0f / speed ) ) + 2;
 	}
 
@@ -76,7 +76,7 @@ public class AssemblerFX extends Particle implements ICanDie
         }
 
         this.motionY -= 0.04D * (double)this.particleGravity;
-        this.moveEntity(this.motionX, this.motionY, this.motionZ);
+        this.move(this.motionX, this.motionY, this.motionZ);
         this.motionX *= 0.9800000190734863D;
         this.motionY *= 0.9800000190734863D;
         this.motionZ *= 0.9800000190734863D;
@@ -99,10 +99,10 @@ public class AssemblerFX extends Particle implements ICanDie
 		if( this.time > 4.0 )
 		{
 			this.time -= 4.0;
-			// if ( CommonHelper.proxy.shouldAddParticles( r ) )
+			// if ( AppEng.proxy.shouldAddParticles( r ) )
 			for( int x = 0; x < (int) Math.ceil( this.speed / 5 ); x++ )
 			{
-				CommonHelper.proxy.spawnEffect( EffectType.Crafting, this.worldObj, this.posX, this.posY, this.posZ, null );
+				AppEng.proxy.spawnEffect( EffectType.Crafting, this.world, this.posX, this.posY, this.posZ, null );
 			}
 		}
 	}

src/main/java/appeng/client/render/effects/CraftingFx.java

@@ -55,9 +55,9 @@ public class CraftingFx extends ParticleBreaking
 		this.particleTextureIndex = ParticleTextures.BlockEnergyParticle;
 		this.particleMaxAge /= 1.2;
 
-		this.startBlkX = MathHelper.floor_double( this.posX );
-		this.startBlkY = MathHelper.floor_double( this.posY );
-		this.startBlkZ = MathHelper.floor_double( this.posZ );
+		this.startBlkX = MathHelper.floor( this.posX );
+		this.startBlkY = MathHelper.floor( this.posY );
+		this.startBlkZ = MathHelper.floor( this.posZ );
 	}
 
 	@Override
@@ -84,9 +84,9 @@ public class CraftingFx extends ParticleBreaking
 		float offY = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * partialTick );
 		float offZ = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * partialTick );
 
-		final int blkX = MathHelper.floor_double( offX );
-		final int blkY = MathHelper.floor_double( offY );
-		final int blkZ = MathHelper.floor_double( offZ );
+		final int blkX = MathHelper.floor( offX );
+		final int blkY = MathHelper.floor( offY );
+		final int blkZ = MathHelper.floor( offZ );
 		if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
 		{
 			offX -= interpPosX;
@@ -127,7 +127,7 @@ public class CraftingFx extends ParticleBreaking
 		}
 
 		this.motionY -= 0.04D * (double) this.particleGravity;
-		this.moveEntity( this.motionX, this.motionY, this.motionZ );
+		this.move( this.motionX, this.motionY, this.motionZ );
 		this.motionX *= 0.9800000190734863D;
 		this.motionY *= 0.9800000190734863D;
 		this.motionZ *= 0.9800000190734863D;

src/main/java/appeng/client/render/effects/EnergyFx.java

@@ -54,9 +54,9 @@ public class EnergyFx extends ParticleBreaking
 		this.particleScale = 3.5f;
 		this.particleTextureIndex = ParticleTextures.BlockEnergyParticle;
 
-		this.startBlkX = MathHelper.floor_double( this.posX );
-		this.startBlkY = MathHelper.floor_double( this.posY );
-		this.startBlkZ = MathHelper.floor_double( this.posZ );
+		this.startBlkX = MathHelper.floor( this.posX );
+		this.startBlkY = MathHelper.floor( this.posY );
+		this.startBlkZ = MathHelper.floor( this.posZ );
 	}
 
 	@Override
@@ -78,9 +78,9 @@ public class EnergyFx extends ParticleBreaking
 		final float f12 = (float) ( this.prevPosY + ( this.posY - this.prevPosY ) * partialTicks - interpPosY );
 		final float f13 = (float) ( this.prevPosZ + ( this.posZ - this.prevPosZ ) * partialTicks - interpPosZ );
 
-		final int blkX = MathHelper.floor_double( this.posX );
-		final int blkY = MathHelper.floor_double( this.posY );
-		final int blkZ = MathHelper.floor_double( this.posZ );
+		final int blkX = MathHelper.floor( this.posX );
+		final int blkY = MathHelper.floor( this.posY );
+		final int blkZ = MathHelper.floor( this.posZ );
 
 		if( blkX == this.startBlkX && blkY == this.startBlkY && blkZ == this.startBlkZ )
 		{
@@ -117,7 +117,7 @@ public class EnergyFx extends ParticleBreaking
 		}
 
 		this.motionY -= 0.04D * (double) this.particleGravity;
-		this.moveEntity( this.motionX, this.motionY, this.motionZ );
+		this.move( this.motionX, this.motionY, this.motionZ );
 		this.motionX *= 0.9800000190734863D;
 		this.motionY *= 0.9800000190734863D;
 		this.motionZ *= 0.9800000190734863D;

src/main/java/appeng/client/render/effects/LightningFX.java

@@ -89,7 +89,7 @@ public class LightningFX extends Particle
         }
 
         this.motionY -= 0.04D * (double)this.particleGravity;
-        this.moveEntity(this.motionX, this.motionY, this.motionZ);
+        this.move(this.motionX, this.motionY, this.motionZ);
         this.motionX *= 0.9800000190734863D;
         this.motionY *= 0.9800000190734863D;
         this.motionZ *= 0.9800000190734863D;
@@ -125,7 +125,7 @@ public class LightningFX extends Particle
 		double oy = 0;
 		double oz = 0;
 
-		final EntityPlayer p = Minecraft.getMinecraft().thePlayer;
+		final EntityPlayer p = Minecraft.getMinecraft().player;
 		double offX = -rZ;
 		double offY = MathHelper.cos( (float) ( Math.PI / 2.0f + p.rotationPitch * 0.017453292F ) );
 		double offZ = rX;

src/main/java/appeng/client/render/effects/MatterCannonFX.java

@@ -68,7 +68,7 @@ public class MatterCannonFX extends ParticleBreaking
 		}
 
 		this.motionY -= 0.04D * (double) this.particleGravity;
-		this.moveEntity( this.motionX, this.motionY, this.motionZ );
+		this.move( this.motionX, this.motionY, this.motionZ );
 		this.motionX *= 0.9800000190734863D;
 		this.motionY *= 0.9800000190734863D;
 		this.motionZ *= 0.9800000190734863D;

src/main/java/appeng/client/render/model/GlassBakedModel.java

@@ -212,10 +212,10 @@ class GlassBakedModel implements IBakedModel
 
 		// Apply the u,v shift.
 		// This mirrors the logic from OffsetIcon from 1.7
-		float u1 = MathHelper.clamp_float( 0 - uOffset, 0, 16 );
-		float u2 = MathHelper.clamp_float( 16 - uOffset, 0, 16 );
-		float v1 = MathHelper.clamp_float( 0 - vOffset, 0, 16 );
-		float v2 = MathHelper.clamp_float( 16 - vOffset, 0, 16 );
+		float u1 = MathHelper.clamp( 0 - uOffset, 0, 16 );
+		float u2 = MathHelper.clamp( 16 - uOffset, 0, 16 );
+		float v1 = MathHelper.clamp( 0 - vOffset, 0, 16 );
+		float v2 = MathHelper.clamp( 16 - vOffset, 0, 16 );
 
 		UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( vertexFormat );
 		builder.setTexture( sprite );

src/main/java/appeng/client/render/tesr/SkyCompassTESR.java

@@ -50,7 +50,7 @@ public class SkyCompassTESR extends FastTESR<TileSkyCompass>
 	public void renderTileEntityFast( TileSkyCompass te, double x, double y, double z, float partialTicks, int destroyStage, VertexBuffer buffer )
 	{
 
-		if( !te.hasWorldObj() )
+		if( !te.hasWorld() )
 		{
 			return;
 		}
@@ -63,7 +63,7 @@ public class SkyCompassTESR extends FastTESR<TileSkyCompass>
 		BlockPos pos = te.getPos();
 		IBlockAccess world = MinecraftForgeClient.getRegionRenderCache( te.getWorld(), pos );
 		IBlockState state = world.getBlockState( pos );
-		if( state.getPropertyNames().contains( Properties.StaticProperty ) )
+		if( state.getPropertyKeys().contains( Properties.StaticProperty ) )
 		{
 			state = state.withProperty( Properties.StaticProperty, false );
 		}

src/main/java/appeng/container/AEBaseContainer.java

@@ -203,7 +203,7 @@ public abstract class AEBaseContainer extends Container
 			final NBTTagCompound data = CompressedStreamTools.readCompressed( new ByteArrayInputStream( buffer ) );
 			if( data != null )
 			{
-				this.setTargetStack( AEApi.instance().storage().createItemStack( ItemStack.loadItemStackFromNBT( data ) ) );
+				this.setTargetStack( AEApi.instance().storage().createItemStack( new ItemStack( data ) ) );
 			}
 		}
 		catch( final IOException e )
@@ -455,7 +455,7 @@ public abstract class AEBaseContainer extends Container
 	{
 		if( Platform.isClient() )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		boolean hasMETiles = false;
@@ -470,14 +470,14 @@ public abstract class AEBaseContainer extends Container
 
 		if( hasMETiles && Platform.isClient() )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		final AppEngSlot clickSlot = (AppEngSlot) this.inventorySlots.get( idx ); // require AE SLots!
 
 		if( clickSlot instanceof SlotDisabled || clickSlot instanceof SlotInaccessible )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 		if( clickSlot != null && clickSlot.getHasStack() )
 		{
@@ -485,7 +485,7 @@ public abstract class AEBaseContainer extends Container
 
 			if( tis == null )
 			{
-				return null;
+				return ItemStack.EMPTY;
 			}
 
 			final List<Slot> selectedSlots = new ArrayList<Slot>();
@@ -583,17 +583,17 @@ public abstract class AEBaseContainer extends Container
 									maxSize = d.getSlotStackLimit();
 								}
 
-								int placeAble = maxSize - t.stackSize;
+								int placeAble = maxSize - t.getCount();
 
-								if( tis.stackSize < placeAble )
+								if( tis.getCount() < placeAble )
 								{
-									placeAble = tis.stackSize;
+									placeAble = tis.getCount();
 								}
 
-								t.stackSize += placeAble;
-								tis.stackSize -= placeAble;
+								t.setCount( t.getCount() + placeAble );
+								tis.setCount( tis.getCount() - placeAble );
 
-								if( tis.stackSize <= 0 )
+								if( tis.getCount() <= 0 )
 								{
 									clickSlot.putStack( null );
 									d.onSlotChanged();
@@ -602,7 +602,7 @@ public abstract class AEBaseContainer extends Container
 
 									this.updateSlot( clickSlot );
 									this.updateSlot( d );
-									return null;
+									return ItemStack.EMPTY;
 								}
 								else
 								{
@@ -635,17 +635,17 @@ public abstract class AEBaseContainer extends Container
 									maxSize = d.getSlotStackLimit();
 								}
 
-								int placeAble = maxSize - t.stackSize;
+								int placeAble = maxSize - t.getCount();
 
-								if( tis.stackSize < placeAble )
+								if( tis.getCount() < placeAble )
 								{
-									placeAble = tis.stackSize;
+									placeAble = tis.getCount();
 								}
 
-								t.stackSize += placeAble;
-								tis.stackSize -= placeAble;
+								t.setCount( t.getCount() + placeAble );
+								tis.setCount( tis.getCount() - placeAble );
 
-								if( tis.stackSize <= 0 )
+								if( tis.getCount() <= 0 )
 								{
 									clickSlot.putStack( null );
 									d.onSlotChanged();
@@ -656,7 +656,7 @@ public abstract class AEBaseContainer extends Container
 
 									this.updateSlot( clickSlot );
 									this.updateSlot( d );
-									return null;
+									return ItemStack.EMPTY;
 								}
 								else
 								{
@@ -673,15 +673,15 @@ public abstract class AEBaseContainer extends Container
 							}
 
 							final ItemStack tmp = tis.copy();
-							if( tmp.stackSize > maxSize )
+							if( tmp.getCount() > maxSize )
 							{
-								tmp.stackSize = maxSize;
+								tmp.setCount( maxSize );
 							}
 
-							tis.stackSize -= tmp.stackSize;
+							tis.setCount( tis.getCount() - tmp.getCount() );
 							d.putStack( tmp );
 
-							if( tis.stackSize <= 0 )
+							if( tis.getCount() <= 0 )
 							{
 								clickSlot.putStack( null );
 								d.onSlotChanged();
@@ -692,7 +692,7 @@ public abstract class AEBaseContainer extends Container
 
 								this.updateSlot( clickSlot );
 								this.updateSlot( d );
-								return null;
+								return ItemStack.EMPTY;
 							}
 							else
 							{
@@ -707,7 +707,7 @@ public abstract class AEBaseContainer extends Container
 		}
 
 		this.updateSlot( clickSlot );
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
@@ -726,7 +726,7 @@ public abstract class AEBaseContainer extends Container
 		{
 			if( this.tileEntity instanceof IInventory )
 			{
-				return ( (IInventory) this.tileEntity ).isUseableByPlayer( entityplayer );
+				return ( (IInventory) this.tileEntity ).isUsableByPlayer( entityplayer );
 			}
 			return true;
 		}
@@ -781,7 +781,7 @@ public abstract class AEBaseContainer extends Container
 						if( hand != null )
 						{
 							final ItemStack is = hand.copy();
-							is.stackSize = 1;
+							is.setCount( 1 );
 							s.putStack( is );
 						}
 
@@ -793,16 +793,16 @@ public abstract class AEBaseContainer extends Container
 						{
 							if( hand == null )
 							{
-								is.stackSize = Math.max( 1, is.stackSize - 1 );
+								is.setCount( Math.max( 1, is.getCount() - 1 ) );
 							}
 							else if( hand.isItemEqual( is ) )
 							{
-								is.stackSize = Math.min( is.getMaxStackSize(), is.stackSize + 1 );
+								is.setCount(Math.min( is.getMaxStackSize(), is.getCount() + 1 ));
 							}
 							else
 							{
 								is = hand.copy();
-								is.stackSize = 1;
+								is.setCount( 1 );
 							}
 
 							s.putStack( is );
@@ -810,7 +810,7 @@ public abstract class AEBaseContainer extends Container
 						else if( hand != null )
 						{
 							is = hand.copy();
-							is.stackSize = 1;
+							is.setCount( 1 );
 							s.putStack( is );
 						}
 
@@ -863,12 +863,12 @@ public abstract class AEBaseContainer extends Container
 					ais.setStackSize( myItem.getMaxStackSize() );
 
 					final InventoryAdaptor adp = InventoryAdaptor.getAdaptor( player, EnumFacing.UP );
-					myItem.stackSize = (int) ais.getStackSize();
+					myItem.setCount( (int) ais.getStackSize() );
 					myItem = adp.simulateAdd( myItem );
 
 					if( myItem != null )
 					{
-						ais.setStackSize( ais.getStackSize() - myItem.stackSize );
+						ais.setStackSize( ais.getStackSize() - myItem.getCount() );
 					}
 
 					ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
@@ -923,7 +923,7 @@ public abstract class AEBaseContainer extends Container
 
 					if( item != null )
 					{
-						if( item.stackSize >= item.getMaxStackSize() )
+						if( item.getCount() >= item.getMaxStackSize() )
 						{
 							liftQty = 0;
 						}
@@ -1034,8 +1034,8 @@ public abstract class AEBaseContainer extends Container
 					if( ais == null )
 					{
 						final ItemStack is = player.inventory.getItemStack();
-						is.stackSize--;
-						if( is.stackSize <= 0 )
+						is.setCount( is.getCount() - 1 );
+						if( is.getCount() <= 0 )
 						{
 							player.inventory.setItemStack( null );
 						}
@@ -1048,7 +1048,7 @@ public abstract class AEBaseContainer extends Container
 				if( player.capabilities.isCreativeMode && slotItem != null )
 				{
 					final ItemStack is = slotItem.getItemStack();
-					is.stackSize = is.getMaxStackSize();
+					is.setCount( is.getMaxStackSize() );
 					player.inventory.setItemStack( is );
 					this.updateHeld( player );
 				}
@@ -1071,12 +1071,12 @@ public abstract class AEBaseContainer extends Container
 						ais.setStackSize( myItem.getMaxStackSize() );
 
 						final InventoryAdaptor adp = InventoryAdaptor.getAdaptor( player, EnumFacing.UP );
-						myItem.stackSize = (int) ais.getStackSize();
+						myItem.setCount( (int) ais.getStackSize() );
 						myItem = adp.simulateAdd( myItem );
 
 						if( myItem != null )
 						{
-							ais.setStackSize( ais.getStackSize() - myItem.stackSize );
+							ais.setStackSize( ais.getStackSize() - myItem.getCount() );
 						}
 
 						ais = Platform.poweredExtraction( this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource() );
@@ -1103,7 +1103,8 @@ public abstract class AEBaseContainer extends Container
 		{
 			try
 			{
-				NetworkHandler.instance().sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.create( p.inventory.getItemStack() ) ), p );
+				NetworkHandler.instance().sendTo( new PacketInventoryAction( InventoryAction.UPDATE_HAND, 0, AEItemStack.create( p.inventory.getItemStack() ) ),
+						p );
 			}
 			catch( final IOException e )
 			{
@@ -1118,7 +1119,8 @@ public abstract class AEBaseContainer extends Container
 		{
 			return input;
 		}
-		final IAEItemStack ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), AEApi.instance().storage().createItemStack( input ), this.getActionSource() );
+		final IAEItemStack ais = Platform.poweredInsert( this.getPowerSource(), this.getCellInventory(), AEApi.instance().storage().createItemStack( input ),
+				this.getActionSource() );
 		if( ais == null )
 		{
 			return null;
@@ -1172,7 +1174,8 @@ public abstract class AEBaseContainer extends Container
 					{
 						try
 						{
-							NetworkHandler.instance().sendTo( new PacketValueConfig( "CustomName", this.getCustomName() ), (EntityPlayerMP) this.getInventoryPlayer().player );
+							NetworkHandler.instance().sendTo( new PacketValueConfig( "CustomName", this.getCustomName() ),
+									(EntityPlayerMP) this.getInventoryPlayer().player );
 						}
 						catch( final IOException e )
 						{
@@ -1232,32 +1235,32 @@ public abstract class AEBaseContainer extends Container
 		ItemStack testB = isA == null ? null : isA.copy();
 
 		// can put some back?
-		if( testA != null && testA.stackSize > a.getSlotStackLimit() )
+		if( testA != null && testA.getCount() > a.getSlotStackLimit() )
 		{
 			if( testB != null )
 			{
 				return;
 			}
 
-			final int totalA = testA.stackSize;
-			testA.stackSize = a.getSlotStackLimit();
+			final int totalA = testA.getCount();
+			testA.setCount( a.getSlotStackLimit() );
 			testB = testA.copy();
 
-			testB.stackSize = totalA - testA.stackSize;
+			testB.setCount( totalA - testA.getCount() );
 		}
 
-		if( testB != null && testB.stackSize > b.getSlotStackLimit() )
+		if( testB != null && testB.getCount() > b.getSlotStackLimit() )
 		{
 			if( testA != null )
 			{
 				return;
 			}
 
-			final int totalB = testB.stackSize;
-			testB.stackSize = b.getSlotStackLimit();
+			final int totalB = testB.getCount();
+			testB.setCount( b.getSlotStackLimit() );
 			testA = testB.copy();
 
-			testA.stackSize = totalB - testA.stackSize;
+			testA.setCount(  totalB - testA.getCount() );
 		}
 
 		a.putStack( testA );

src/main/java/appeng/container/implementations/ContainerCellWorkbench.java

@@ -243,7 +243,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 			if( i.hasNext() )
 			{
 				final ItemStack g = i.next().getItemStack();
-				g.stackSize = 1;
+				g.setCount( 1 );
 				inv.setInventorySlotContents( x, g );
 			}
 			else
@@ -331,7 +331,7 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		}
 
 		@Override
-		public boolean isUseableByPlayer( final EntityPlayer entityplayer )
+		public boolean isUsableByPlayer( EntityPlayer player )
 		{
 			return false;
 		}
@@ -383,5 +383,12 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		{
 			ContainerCellWorkbench.this.getCellUpgradeInventory().clear();
 		}
+
+		@Override
+		public boolean isEmpty()
+		{
+			// TODO Auto-generated method stub
+			return false;
+		}
 	}
 }

src/main/java/appeng/container/implementations/ContainerCraftAmount.java

@@ -66,7 +66,7 @@ public class ContainerCraftAmount extends AEBaseContainer
 
 	public World getWorld()
 	{
-		return this.getPlayerInv().player.worldObj;
+		return this.getPlayerInv().player.world;
 	}
 
 	public BaseActionSource getActionSrc()

src/main/java/appeng/container/implementations/ContainerCraftConfirm.java

@@ -279,7 +279,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
 			}
 			catch( final Throwable e )
 			{
-				this.getPlayerInv().player.addChatMessage( new TextComponentString( "Error: " + e.toString() ) );
+				this.getPlayerInv().player.sendMessage( new TextComponentString( "Error: " + e.toString() ) );
 				AELog.debug( e );
 				this.setValidContainer( false );
 				this.result = null;
@@ -389,7 +389,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
 
 	public World getWorld()
 	{
-		return this.getPlayerInv().player.worldObj;
+		return this.getPlayerInv().player.world;
 	}
 
 	public boolean isAutoStart()

src/main/java/appeng/container/implementations/ContainerCraftingTerm.java

@@ -80,7 +80,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE
 			ic.setInventorySlotContents( x, this.craftingSlots[x].getStack() );
 		}
 
-		this.outputSlot.putStack( CraftingManager.getInstance().findMatchingRecipe( ic, this.getPlayerInv().player.worldObj ) );
+		this.outputSlot.putStack( CraftingManager.getInstance().findMatchingRecipe( ic, this.getPlayerInv().player.world ) );
 	}
 
 	@Override

src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java

@@ -268,7 +268,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 					}
 					else if( is != null )
 					{
-						ItemStack extra = interfaceSlot.removeItems( ( is.stackSize + 1 ) / 2, null, null );
+						ItemStack extra = interfaceSlot.removeItems( ( is.getCount() + 1 ) / 2, null, null );
 						if( extra != null )
 						{
 							extra = playerHand.addItems( extra );

src/main/java/appeng/container/implementations/ContainerPatternTerm.java

@@ -125,35 +125,28 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 	{
 		if( !this.isCraftingMode() )
 		{
-			this.craftSlot.xDisplayPosition = -9000;
+			this.craftSlot.xPos = -9000;
 
 			for( int y = 0; y < 3; y++ )
 			{
-				this.outputSlots[y].xDisplayPosition = this.outputSlots[y].getX();
+				this.outputSlots[y].xPos = this.outputSlots[y].getX();
 			}
 		}
 		else
 		{
-			this.craftSlot.xDisplayPosition = this.craftSlot.getX();
+			this.craftSlot.xPos = this.craftSlot.getX();
 
 			for( int y = 0; y < 3; y++ )
 			{
-				this.outputSlots[y].xDisplayPosition = -9000;
+				this.outputSlots[y].xPos = -9000;
 			}
 		}
 	}
 
 	@Override
-	public void putStackInSlot( final int par1, final ItemStack par2ItemStack )
+	public void putStackInSlot( int slotID, ItemStack stack )
 	{
-		super.putStackInSlot( par1, par2ItemStack );
-		this.getAndUpdateOutput();
-	}
-
-	@Override
-	public void putStacksInSlots( final ItemStack[] par1ArrayOfItemStack )
-	{
-		super.putStacksInSlots( par1ArrayOfItemStack );
+		super.putStackInSlot( slotID, stack );
 		this.getAndUpdateOutput();
 	}
 
@@ -166,7 +159,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 			ic.setInventorySlotContents( x, this.crafting.getStackInSlot( x ) );
 		}
 
-		final ItemStack is = CraftingManager.getInstance().findMatchingRecipe( ic, this.getPlayerInv().player.worldObj );
+		final ItemStack is = CraftingManager.getInstance().findMatchingRecipe( ic, this.getPlayerInv().player.world );
 		this.cOut.setInventorySlotContents( 0, is );
 		return is;
 	}
@@ -210,8 +203,8 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 			}
 
 			// remove one, and clear the input slot.
-			output.stackSize--;
-			if( output.stackSize == 0 )
+			output.setCount( output.getCount() );
+			if( output.getCount() == 0 )
 			{
 				this.patternSlotIN.putStack( null );
 			}
@@ -277,7 +270,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		{
 			final ItemStack out = this.getAndUpdateOutput();
 
-			if( out != null && out.stackSize > 0 )
+			if( out != null && out.getCount() > 0 )
 			{
 				return new ItemStack[] { out };
 			}
@@ -291,7 +284,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 			{
 				final ItemStack out = outputSlot.getStack();
 
-				if( out != null && out.stackSize > 0 )
+				if( out != null && out.getCount() > 0 )
 				{
 					list.add( out );
 					hasValue = true;
@@ -391,7 +384,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 				ic.setInventorySlotContents( x, packetPatternSlot.pattern[x] == null ? null : packetPatternSlot.pattern[x].getItemStack() );
 			}
 
-			final IRecipe r = Platform.findMatchingRecipe( ic, p.worldObj );
+			final IRecipe r = Platform.findMatchingRecipe( ic, p.world );
 
 			if( r == null )
 			{
@@ -407,17 +400,17 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 			{
 				if( ic.getStackInSlot( x ) != null )
 				{
-					final ItemStack pulled = Platform.extractItemsByRecipe( this.getPowerSource(), this.getActionSource(), storage, p.worldObj, r, is, ic, ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) );
+					final ItemStack pulled = Platform.extractItemsByRecipe( this.getPowerSource(), this.getActionSource(), storage, p.world, r, is, ic, ic.getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.getViewCells() ) );
 					real.setInventorySlotContents( x, pulled );
 				}
 			}
 
-			final IRecipe rr = Platform.findMatchingRecipe( real, p.worldObj );
+			final IRecipe rr = Platform.findMatchingRecipe( real, p.world );
 
 			if( rr == r && Platform.itemComparisons().isSameItem( rr.getCraftingResult( real ), is ) )
 			{
 				final SlotCrafting sc = new SlotCrafting( p, real, this.cOut, 0, 0, 0 );
-				sc.onPickupFromSlot( p, is );
+				sc.onTake( p, is );
 
 				for( int x = 0; x < real.getSizeInventory(); x++ )
 				{

src/main/java/appeng/container/implementations/ContainerQuartzKnife.java

@@ -128,9 +128,9 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	public ItemStack getStackInSlot( final int var1 )
 	{
 		final ItemStack input = this.inSlot.getStackInSlot( 0 );
-		if( input == null )
+		if( input == ItemStack.EMPTY )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		if( SlotRestrictedInput.isMetalIngot( input ) )
@@ -147,7 +147,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 			}
 		}
 
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
@@ -161,7 +161,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 				return is;
 			}
 		}
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	private boolean makePlate()
@@ -171,9 +171,9 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 			final ItemStack item = this.toolInv.getItemStack();
 			item.damageItem( 1, this.getPlayerInv().player );
 
-			if( item.stackSize == 0 )
+			if( item.getCount() == 0 )
 			{
-				this.getPlayerInv().mainInventory[this.getPlayerInv().currentItem] = null;
+				this.getPlayerInv().mainInventory.add( this.getPlayerInv().currentItem, null );
 				MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( this.getPlayerInv().player, item, null ) );
 			}
 
@@ -185,7 +185,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	@Override
 	public ItemStack removeStackFromSlot( final int var1 )
 	{
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
@@ -222,7 +222,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	}
 
 	@Override
-	public boolean isUseableByPlayer( final EntityPlayer var1 )
+	public boolean isUsableByPlayer( EntityPlayer player )
 	{
 		return false;
 	}
@@ -274,4 +274,11 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	{
 		this.inSlot.setInventorySlotContents( 0, null );
 	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		// TODO Auto-generated method stub
+		return false;
+	}
 }

src/main/java/appeng/container/implementations/ContainerStorageBus.java

@@ -160,7 +160,7 @@ public class ContainerStorageBus extends ContainerUpgradeable
 			if( i.hasNext() && this.isSlotEnabled( ( x / 9 ) - 2 ) )
 			{
 				final ItemStack g = i.next().getItemStack();
-				g.stackSize = 1;
+				g.setCount( 1 );
 				inv.setInventorySlotContents( x, g );
 			}
 			else

src/main/java/appeng/container/implementations/ContainerWireless.java

@@ -51,7 +51,7 @@ public class ContainerWireless extends AEBaseContainer
 	@Override
 	public void detectAndSendChanges()
 	{
-		final int boosters = this.boosterSlot.getStack() == null ? 0 : this.boosterSlot.getStack().stackSize;
+		final int boosters = this.boosterSlot.getStack() == null ? 0 : this.boosterSlot.getStack().getCount();
 
 		this.setRange( (long) ( 10 * AEConfig.instance().wireless_getMaxRange( boosters ) ) );
 		this.setDrain( (long) ( 100 * AEConfig.instance().wireless_getPowerDrain( boosters ) ) );

src/main/java/appeng/container/implementations/ContainerWirelessTerm.java

@@ -47,7 +47,7 @@ public class ContainerWirelessTerm extends ContainerMEPortableCell
 		{
 			if( Platform.isServer() && this.isValidContainer() )
 			{
-				this.getPlayerInv().player.addChatMessage( PlayerMessages.OutOfRange.get() );
+				this.getPlayerInv().player.sendMessage( PlayerMessages.OutOfRange.get() );
 			}
 
 			this.setValidContainer( false );

src/main/java/appeng/container/slot/AppEngCraftingSlot.java

@@ -32,6 +32,7 @@ import net.minecraft.item.ItemSword;
 import net.minecraft.item.ItemTool;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.stats.AchievementList;
+import net.minecraft.util.NonNullList;
 
 
 public class AppEngCraftingSlot extends AppEngSlot
@@ -85,7 +86,7 @@ public class AppEngCraftingSlot extends AppEngSlot
 	@Override
 	protected void onCrafting( final ItemStack par1ItemStack )
 	{
-		par1ItemStack.onCrafting( this.thePlayer.worldObj, this.thePlayer, this.amountCrafted );
+		par1ItemStack.onCrafting( this.thePlayer.world, this.thePlayer, this.amountCrafted );
 		this.amountCrafted = 0;
 
 		if( par1ItemStack.getItem() == Item.getItemFromBlock( Blocks.CRAFTING_TABLE ) )
@@ -140,7 +141,7 @@ public class AppEngCraftingSlot extends AppEngSlot
 	}
 
 	@Override
-	public void onPickupFromSlot( final EntityPlayer playerIn, final ItemStack stack )
+	public ItemStack onTake( final EntityPlayer playerIn, final ItemStack stack )
 	{
 		net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerCraftingEvent( playerIn, stack, this.craftMatrix );
 		this.onCrafting( stack );
@@ -152,7 +153,7 @@ public class AppEngCraftingSlot extends AppEngSlot
 			ic.setInventorySlotContents( x, this.craftMatrix.getStackInSlot( x ) );
 		}
 
-		final ItemStack[] aitemstack = CraftingManager.getInstance().getRemainingItems( ic, playerIn.worldObj );
+		final NonNullList<ItemStack> aitemstack = CraftingManager.getInstance().getRemainingItems( ic, playerIn.world );
 
 		for( int x = 0; x < this.craftMatrix.getSizeInventory(); x++ )
 		{
@@ -161,10 +162,10 @@ public class AppEngCraftingSlot extends AppEngSlot
 
 		net.minecraftforge.common.ForgeHooks.setCraftingPlayer( null );
 
-		for( int i = 0; i < aitemstack.length; ++i )
+		for( int i = 0; i < aitemstack.size(); ++i )
 		{
 			final ItemStack itemstack1 = this.craftMatrix.getStackInSlot( i );
-			final ItemStack itemstack2 = aitemstack[i];
+			final ItemStack itemstack2 = aitemstack.get( i );
 
 			if( itemstack1 != null )
 			{
@@ -183,6 +184,8 @@ public class AppEngCraftingSlot extends AppEngSlot
 				}
 			}
 		}
+		
+		return stack;
 	}
 
 	/**
@@ -194,7 +197,7 @@ public class AppEngCraftingSlot extends AppEngSlot
 	{
 		if( this.getHasStack() )
 		{
-			this.amountCrafted += Math.min( par1, this.getStack().stackSize );
+			this.amountCrafted += Math.min( par1, this.getStack().getCount() );
 		}
 
 		return super.decrStackSize( par1 );

src/main/java/appeng/container/slot/AppEngSlot.java

@@ -85,12 +85,12 @@ public class AppEngSlot extends Slot
 	{
 		if( !this.isEnabled() )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		if( this.inventory.getSizeInventory() <= this.getSlotIndex() )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		if( this.isDisplay() )

src/main/java/appeng/container/slot/NullSlot.java

@@ -40,9 +40,9 @@ public class NullSlot extends Slot
 	}
 
 	@Override
-	public void onPickupFromSlot( final EntityPlayer par1EntityPlayer, final ItemStack par2ItemStack )
+	public ItemStack onTake( final EntityPlayer par1EntityPlayer, final ItemStack par2ItemStack )
 	{
-
+		return par2ItemStack;
 	}
 
 	@Override
@@ -54,7 +54,7 @@ public class NullSlot extends Slot
 	@Override
 	public ItemStack getStack()
 	{
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override
@@ -78,7 +78,7 @@ public class NullSlot extends Slot
 	@Override
 	public ItemStack decrStackSize( final int par1 )
 	{
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override

src/main/java/appeng/container/slot/OptionalSlotFakeTypeOnly.java

@@ -37,13 +37,13 @@ public class OptionalSlotFakeTypeOnly extends OptionalSlotFake
 		if( is != null )
 		{
 			is = is.copy();
-			if( is.stackSize > 1 )
+			if( is.getCount() > 1 )
 			{
-				is.stackSize = 1;
+				is.setCount( 1 );
 			}
-			else if( is.stackSize < -1 )
+			else if( is.getCount() < -1 )
 			{
-				is.stackSize = -1;
+				is.setCount( -1 );
 			}
 		}
 

src/main/java/appeng/container/slot/SlotCraftingTerm.java

@@ -81,8 +81,9 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 	}
 
 	@Override
-	public void onPickupFromSlot( final EntityPlayer p, final ItemStack is )
+	public ItemStack onTake( final EntityPlayer p, final ItemStack is )
 	{
+		return is;
 	}
 
 	public void doClick( final InventoryAction action, final EntityPlayer who )
@@ -97,7 +98,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 		}
 
 		final IMEMonitor<IAEItemStack> inv = this.storage.getItemInventory();
-		final int howManyPerCraft = this.getStack().stackSize;
+		final int howManyPerCraft = this.getStack().getCount();
 		int maxTimesToCraft = 0;
 
 		InventoryAdaptor ia = null;
@@ -141,7 +142,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 				{
 					final List<ItemStack> drops = new ArrayList<ItemStack>();
 					drops.add( extra );
-					Platform.spawnDrops( who.worldObj, new BlockPos( (int) who.posX, (int) who.posY, (int) who.posZ ), drops );
+					Platform.spawnDrops( who.world, new BlockPos( (int) who.posX, (int) who.posY, (int) who.posZ ), drops );
 					return;
 				}
 			}
@@ -171,7 +172,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 					ic.setInventorySlotContents( x, this.getPattern().getStackInSlot( x ) );
 				}
 
-				final IRecipe r = Platform.findMatchingRecipe( ic, p.worldObj );
+				final IRecipe r = Platform.findMatchingRecipe( ic, p.world );
 
 				if( r == null )
 				{
@@ -193,13 +194,13 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 						}
 						if( !isBad )
 						{
-							super.onPickupFromSlot( p, is );
+							super.onTake( p, is );
 							// actually necessary to cleanup this case...
 							p.openContainer.onCraftMatrixChanged( this.craftInv );
 							return request;
 						}
 					}
-					return null;
+					return ItemStack.EMPTY;
 				}
 
 				is = r.getCraftingResult( ic );
@@ -210,7 +211,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 					{
 						if( this.getPattern().getStackInSlot( x ) != null )
 						{
-							set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.worldObj, r, is, ic, this.getPattern().getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) );
+							set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.world, r, is, ic, this.getPattern().getStackInSlot( x ), x, all, Actionable.MODULATE, ItemViewCell.createFilter( this.container.getViewCells() ) );
 							ic.setInventorySlotContents( x, set[x] );
 						}
 					}
@@ -230,7 +231,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 			return is;
 		}
 
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	private boolean preCraft( final EntityPlayer p, final IMEMonitor<IAEItemStack> inv, final ItemStack[] set, final ItemStack result )
@@ -240,7 +241,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 
 	private void makeItem( final EntityPlayer p, final ItemStack is )
 	{
-		super.onPickupFromSlot( p, is );
+		super.onTake( p, is );
 	}
 
 	private void postCraft( final EntityPlayer p, final IMEMonitor<IAEItemStack> inv, final ItemStack[] set, final ItemStack result )
@@ -271,7 +272,7 @@ public class SlotCraftingTerm extends AppEngCraftingSlot
 
 		if( drops.size() > 0 )
 		{
-			Platform.spawnDrops( p.worldObj, new BlockPos( (int) p.posX, (int) p.posY, (int) p.posZ ), drops );
+			Platform.spawnDrops( p.world, new BlockPos( (int) p.posX, (int) p.posY, (int) p.posZ ), drops );
 		}
 	}
 

src/main/java/appeng/container/slot/SlotFake.java

@@ -33,14 +33,15 @@ public class SlotFake extends AppEngSlot
 	}
 
 	@Override
-	public void onPickupFromSlot( final EntityPlayer par1EntityPlayer, final ItemStack par2ItemStack )
+	public ItemStack onTake( final EntityPlayer par1EntityPlayer, final ItemStack par2ItemStack )
 	{
+		return par2ItemStack;
 	}
 
 	@Override
 	public ItemStack decrStackSize( final int par1 )
 	{
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	@Override

src/main/java/appeng/container/slot/SlotFakeBlacklist.java

@@ -47,7 +47,7 @@ public class SlotFakeBlacklist extends SlotFakeTypeOnly
 	{
 		if( this.getHasStack() )
 		{
-			return this.getStack().stackSize > 0 ? 16 + 14 : 14;
+			return this.getStack().getCount() > 0 ? 16 + 14 : 14;
 		}
 		return -1;
 	}

src/main/java/appeng/container/slot/SlotFakeTypeOnly.java

@@ -37,13 +37,13 @@ public class SlotFakeTypeOnly extends SlotFake
 		if( is != null )
 		{
 			is = is.copy();
-			if( is.stackSize > 1 )
+			if( is.getCount() > 1 )
 			{
-				is.stackSize = 1;
+				is.setCount( 1 );
 			}
-			else if( is.stackSize < -1 )
+			else if( is.getCount() < -1 )
 			{
-				is.stackSize = -1;
+				is.setCount( -1 );
 			}
 		}
 

src/main/java/appeng/container/slot/SlotRestrictedInput.java

@@ -130,7 +130,7 @@ public class SlotRestrictedInput extends AppEngSlot
 				if( i.getItem() instanceof ICraftingPatternItem )
 				{
 					final ICraftingPatternItem b = (ICraftingPatternItem) i.getItem();
-					final ICraftingPatternDetails de = b.getPatternForItem( i, this.p.player.worldObj );
+					final ICraftingPatternDetails de = b.getPatternForItem( i, this.p.player.world );
 					if( de != null )
 					{
 						return de.isCraftable();

src/main/java/appeng/core/AppEng.java

@@ -33,6 +33,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLInterModComms;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
@@ -64,9 +65,12 @@ import appeng.services.version.VersionCheckerConfig;
 import appeng.util.Platform;
 
 
-@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.10.2]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" )
+@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.11]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" )
 public final class AppEng
 {
+	@SidedProxy( clientSide = "appeng.client.ClientHelper", serverSide = "appeng.server.ServerHelper", modId = AppEng.MOD_ID )
+	public static CommonHelper proxy;
+	
 	public static final String MOD_ID = "appliedenergistics2";
 	public static final String MOD_NAME = "Applied Energistics 2";
 
@@ -78,11 +82,11 @@ public final class AppEng
 			// "after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +
 
 			// depend on version of forge used for build.
-			"after:appliedenergistics2-core;" + "required-after:Forge@[" // require forge.
-					+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
-					+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
-					+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
-					+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion
+			"after:appliedenergistics2-core;";// + "required-after:Forge@[" // require forge.
+					//+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+					//+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
+					//+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
+					//+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion
 
 	@Nonnull
 	private static final AppEng INSTANCE = new AppEng();
@@ -129,7 +133,7 @@ public final class AppEng
 	{
 		if( !Loader.isModLoaded( "appliedenergistics2-core" ) )
 		{
-			CommonHelper.proxy.missingCoreMod();
+			AppEng.proxy.missingCoreMod();
 		}
 
 		final Stopwatch watch = Stopwatch.createStarted();
@@ -161,7 +165,7 @@ public final class AppEng
 
 		if( Platform.isClient() )
 		{
-			CommonHelper.proxy.preinit();
+			AppEng.proxy.preinit();
 		}
 
 		if( versionCheckerConfig.isVersionCheckingEnabled() )
@@ -226,7 +230,7 @@ public final class AppEng
 		IntegrationRegistry.INSTANCE.postInit();
 		FMLCommonHandler.instance().registerCrashCallable( new IntegrationCrashEnhancement() );
 
-		CommonHelper.proxy.postInit();
+		AppEng.proxy.postInit();
 		AEConfig.instance().save();
 
 		NetworkRegistry.INSTANCE.registerGuiHandler( this, GuiBridge.GUI_Handler );

src/main/java/appeng/core/CommonHelper.java

@@ -26,7 +26,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.SidedProxy;
 
 import appeng.api.parts.CableRenderMode;
 import appeng.block.AEBaseBlock;
@@ -37,8 +36,6 @@ import appeng.core.sync.AppEngPacket;
 public abstract class CommonHelper
 {
 
-	@SidedProxy( clientSide = "appeng.client.ClientHelper", serverSide = "appeng.server.ServerHelper" )
-	public static CommonHelper proxy;
 
 	public abstract void preinit();
 
@@ -52,7 +49,7 @@ public abstract class CommonHelper
 
 	public abstract void sendToAllNearExcept( EntityPlayer p, double x, double y, double z, double dist, World w, AppEngPacket packet );
 
-	public abstract void spawnEffect( EffectType effect, World worldObj, double posX, double posY, double posZ, Object extra );
+	public abstract void spawnEffect( EffectType effect, World world, double posX, double posY, double posZ, Object extra );
 
 	public abstract boolean shouldAddParticles( Random r );
 

src/main/java/appeng/core/CreativeTab.java

@@ -23,7 +23,6 @@ import java.util.Optional;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.AEApi;
@@ -49,9 +48,9 @@ public final class CreativeTab extends CreativeTabs
 	}
 
 	@Override
-	public Item getTabIconItem()
+	public ItemStack getTabIconItem()
 	{
-		return this.getIconItemStack().getItem();
+		return this.getIconItemStack();
 	}
 
 	@Override

src/main/java/appeng/core/CreativeTabFacade.java

@@ -46,9 +46,9 @@ public final class CreativeTabFacade extends CreativeTabs
 	}
 
 	@Override
-	public Item getTabIconItem()
+	public ItemStack getTabIconItem()
 	{
-		return this.getIconItemStack().getItem();
+		return this.getIconItemStack();
 	}
 
 	@Override

src/main/java/appeng/core/api/ApiPart.java

@@ -55,7 +55,7 @@ import appeng.api.parts.CableRenderMode;
 import appeng.api.parts.IPartHelper;
 import appeng.api.parts.LayerBase;
 import appeng.core.AELog;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.parts.PartPlacement;
 import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;
@@ -328,7 +328,7 @@ public class ApiPart implements IPartHelper
 	@Override
 	public CableRenderMode getCableRenderMode()
 	{
-		return CommonHelper.proxy.getRenderMode();
+		return AppEng.proxy.getRenderMode();
 	}
 
 	private static class DefaultPackageClassNameRemapper extends Remapper

src/main/java/appeng/core/api/definitions/ApiParts.java

@@ -61,8 +61,8 @@ public final class ApiParts implements IParts
 	private final IItemDefinition p2PTunnelME;
 	private final IItemDefinition p2PTunnelRedstone;
 	private final IItemDefinition p2PTunnelItems;
-	private final IItemDefinition p2PTunnelFluids;
-	private final IItemDefinition p2PTunnelEU;
+	//private final IItemDefinition p2PTunnelLiquids;
+	//private final IItemDefinition p2PTunnelEU;
 	// private final IItemDefinition p2PTunnelRF;
 	private final IItemDefinition p2PTunnelLight;
 	// private final IItemDefinition p2PTunnelOpenComputers;
@@ -112,8 +112,8 @@ public final class ApiParts implements IParts
 		this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2PTunnelME ) );
 		this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2PTunnelRedstone ) );
 		this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemPart.createPart( PartType.P2PTunnelItems ) );
-		this.p2PTunnelFluids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2PTunnelFluids ) );
-		this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2PTunnelEU ) );
+		//this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2PTunnelLiquids ) );
+		//this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2PTunnelEU ) );
 		// this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) );
 		this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2PTunnelLight ) );
 		// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
@@ -280,17 +280,17 @@ public final class ApiParts implements IParts
 		return this.p2PTunnelItems;
 	}
 
-	@Override
-	public IItemDefinition p2PTunnelFluids()
-	{
-		return this.p2PTunnelFluids;
-	}
-
-	@Override
-	public IItemDefinition p2PTunnelEU()
-	{
-		return this.p2PTunnelEU;
-	}
+//	@Override
+//	public IItemDefinition p2PTunnelLiquids()
+//	{
+//		return this.p2PTunnelLiquids;
+//	}
+//
+//	@Override
+//	public IItemDefinition p2PTunnelEU()
+//	{
+//		return this.p2PTunnelEU;
+//	}
 
 	  /* @Override
 	 * public IItemDefinition p2PTunnelRF()

src/main/java/appeng/core/api/imc/IMCGrinder.java

@@ -70,8 +70,8 @@ public class IMCGrinder implements IIMCProcessor
 		final NBTTagCompound inTag = (NBTTagCompound) msg.getTag( "in" );
 		final NBTTagCompound outTag = (NBTTagCompound) msg.getTag( "out" );
 
-		final ItemStack in = ItemStack.loadItemStackFromNBT( inTag );
-		final ItemStack out = ItemStack.loadItemStackFromNBT( outTag );
+		final ItemStack in = new ItemStack( inTag );
+		final ItemStack out = new ItemStack( outTag );
 
 		final int turns = msg.getInteger( "turns" );
 
@@ -88,7 +88,7 @@ public class IMCGrinder implements IIMCProcessor
 		if( msg.hasKey( "optional" ) )
 		{
 			final NBTTagCompound optionalTag = (NBTTagCompound) msg.getTag( "optional" );
-			final ItemStack optional = ItemStack.loadItemStackFromNBT( optionalTag );
+			final ItemStack optional = new ItemStack( optionalTag );
 
 			if( optional == null )
 			{

src/main/java/appeng/core/api/imc/IMCMatterCannon.java

@@ -49,7 +49,7 @@ public class IMCMatterCannon implements IIMCProcessor
 		final NBTTagCompound msg = m.getNBTValue();
 		final NBTTagCompound item = (NBTTagCompound) msg.getTag( "item" );
 
-		final ItemStack ammo = ItemStack.loadItemStackFromNBT( item );
+		final ItemStack ammo = new ItemStack( item );
 		final double weight = msg.getDouble( "weight" );
 
 		if( ammo == null )

src/main/java/appeng/core/features/AEFeature.java

@@ -118,7 +118,7 @@ public enum AEFeature
 	P2P_TUNNEL_ITEMS( "P2PTunnelItems", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_REDSTONE( "P2PTunnelRedstone", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_EU( "P2PTunnelEU", Constants.CATEGORY_P2P_TUNNELS ),
-	P2P_TUNNEL_FLUIDS( "P2PTunnelFluids", Constants.CATEGORY_P2P_TUNNELS ),
+	P2P_TUNNEL_LIQUIDS( "P2PTunnelLiquids", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_LIGHT( "P2PTunnelLight", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_OPEN_COMPUTERS( "P2PTunnelOpenComputers", Constants.CATEGORY_P2P_TUNNELS ),
 	P2P_TUNNEL_PRESSURE( "P2PTunnelPressure", Constants.CATEGORY_P2P_TUNNELS ),

src/main/java/appeng/core/features/ColoredItemDefinition.java

@@ -70,7 +70,7 @@ public final class ColoredItemDefinition implements AEColoredItemDefinition
 
 		if( is == null )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		return is.stack( stackSize );

src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java

@@ -28,8 +28,6 @@ import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 
 import appeng.api.AEApi;
@@ -134,10 +132,10 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 	{
 		if( trigger != null )
 		{
-			if( FluidContainerRegistry.isContainer( trigger ) )
-			{
-				return TunnelType.FLUID;
-			}
+			// if( FluidRegistry.isContainer( trigger ) )
+			// {
+			// return TunnelType.FLUID;
+			// }
 
 			for( final ItemStack is : this.tunnels.keySet() )
 			{
@@ -159,11 +157,12 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 	@Nullable
 	private ItemStack getModItem( final String modID, final String name, final int meta )
 	{
-		final Item item = GameRegistry.findItem( modID, name );
+
+		final Item item = Item.getByNameOrId( modID + ":" + name );
 
 		if( item == null )
 		{
-			return null;
+			return ItemStack.EMPTY;
 		}
 
 		final ItemStack myItemStack = new ItemStack( item, 1, meta );

src/main/java/appeng/core/features/registries/WirelessRegistry.java

@@ -89,7 +89,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry
 
 		if( !this.isWirelessTerminal( item ) )
 		{
-			player.addChatMessage( PlayerMessages.DeviceNotWirelessTerminal.get() );
+			player.sendMessage( PlayerMessages.DeviceNotWirelessTerminal.get() );
 			return;
 		}
 
@@ -97,7 +97,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry
 		final String unparsedKey = handler.getEncryptionKey( item );
 		if( unparsedKey.isEmpty() )
 		{
-			player.addChatMessage( PlayerMessages.DeviceNotLinked.get() );
+			player.sendMessage( PlayerMessages.DeviceNotLinked.get() );
 			return;
 		}
 
@@ -105,7 +105,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry
 		final ILocatable securityStation = AEApi.instance().registries().locatable().getLocatableBy( parsedKey );
 		if( securityStation == null )
 		{
-			player.addChatMessage( PlayerMessages.StationCanNotBeLocated.get() );
+			player.sendMessage( PlayerMessages.StationCanNotBeLocated.get() );
 			return;
 		}
 
@@ -115,7 +115,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry
 		}
 		else
 		{
-			player.addChatMessage( PlayerMessages.DeviceNotPowered.get() );
+			player.sendMessage( PlayerMessages.DeviceNotPowered.get() );
 		}
 	}
 }

src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java

@@ -233,7 +233,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
 		{
 			return is.copy();
 		}
-		return null;
+		return ItemStack.EMPTY;
 	}
 
 	private int getDustToOreRatio( final String name )
@@ -258,7 +258,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
 			if( ratio > 1 )
 			{
 				final ItemStack extra = is.copy();
-				extra.stackSize = ratio - 1;
+				extra.setCount( ratio - 1 );
 				this.addRecipe( item, is, extra, (float) ( AEConfig.instance().getOreDoublePercentage() / 100.0 ), 8 );
 			}
 			else
@@ -305,12 +305,12 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
 			if( name.equals( d.getValue() ) )
 			{
 				final ItemStack is = item.copy();
-				is.stackSize = 1;
+				is.setCount( 1 );
 				final int ratio = this.getDustToOreRatio( name );
 				if( ratio > 1 )
 				{
 					final ItemStack extra = is.copy();
-					extra.stackSize = ratio - 1;
+					extra.setCount( ratio - 1 );
 					this.addRecipe( d.getKey(), is, extra, (float) ( AEConfig.instance().getOreDoublePercentage() / 100.0 ), 8 );
 				}
 				else

src/main/java/appeng/core/sync/GuiBridge.java

@@ -260,7 +260,7 @@ public enum GuiBridge implements IGuiHandler
 			{
 				it = player.inventory.getCurrentItem();
 			}
-			else if( x >= 0 && x < player.inventory.mainInventory.length )
+			else if( x >= 0 && x < player.inventory.mainInventory.size() )
 			{
 				it = player.inventory.getStackInSlot( x );
 			}
@@ -442,7 +442,7 @@ public enum GuiBridge implements IGuiHandler
 			{
 				it = player.inventory.getCurrentItem();
 			}
-			else if( x >= 0 && x < player.inventory.mainInventory.length )
+			else if( x >= 0 && x < player.inventory.mainInventory.size() )
 			{
 				it = player.inventory.getStackInSlot( x );
 			}
@@ -505,7 +505,7 @@ public enum GuiBridge implements IGuiHandler
 		final World w = player.getEntityWorld();
 		final BlockPos pos = new BlockPos( x, y, z );
 
-		if( Platform.hasPermissions( te != null ? new DimensionalCoord( te ) : new DimensionalCoord( player.worldObj, pos ), player ) )
+		if( Platform.hasPermissions( te != null ? new DimensionalCoord( te ) : new DimensionalCoord( player.world, pos ), player ) )
 		{
 			if( this.type.isItem() )
 			{

src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java

@@ -53,7 +53,7 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
 				@Override
 				public void call( final AppEngPacket appEngPacket )
 				{
-					appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
+					appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().player );
 				}
 			};
 

src/main/java/appeng/core/sync/packets/PacketAssemblerAnimation.java

@@ -31,7 +31,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.EffectType;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.item.AEItemStack;
@@ -81,6 +81,6 @@ public class PacketAssemblerAnimation extends AppEngPacket
 		final double d1 = 0.5d;// + ((double) (Platform.getRandomFloat() - 0.5F) * 0.26D);
 		final double d2 = 0.5d;// + ((double) (Platform.getRandomFloat() - 0.5F) * 0.26D);
 
-		CommonHelper.proxy.spawnEffect( EffectType.Assembler, player.getEntityWorld(), this.x + d0, this.y + d1, this.z + d2, this );
+		AppEng.proxy.spawnEffect( EffectType.Assembler, player.getEntityWorld(), this.x + d0, this.y + d1, this.z + d2, this );
 	}
 }

src/main/java/appeng/core/sync/packets/PacketClick.java

@@ -111,7 +111,7 @@ public class PacketClick extends AppEngPacket
 			if( is.getItem() instanceof ToolNetworkTool )
 			{
 				final ToolNetworkTool tnt = (ToolNetworkTool) is.getItem();
-				tnt.serverSideToolLogic( is, player, this.hand, player.worldObj, new BlockPos( this.x, this.y, this.z ), this.side, this.hitX, this.hitY, this.hitZ );
+				tnt.serverSideToolLogic( is, player, this.hand, player.world, new BlockPos( this.x, this.y, this.z ), this.side, this.hitX, this.hitY, this.hitZ );
 			}
 
 			else if( maybeMemoryCard.isSameAs( is ) )

src/main/java/appeng/core/sync/packets/PacketCompassRequest.java

@@ -78,7 +78,7 @@ public class PacketCompassRequest extends AppEngPacket implements ICompassCallba
 	{
 		this.talkBackTo = player;
 
-		final DimensionalCoord loc = new DimensionalCoord( player.worldObj, this.cx << 4, this.cdy << 5, this.cz << 4 );
+		final DimensionalCoord loc = new DimensionalCoord( player.world, this.cx << 4, this.cdy << 5, this.cz << 4 );
 		WorldData.instance().compassData().service().getCompassDirection( loc, 174, this );
 	}
 }

src/main/java/appeng/core/sync/packets/PacketInventoryAction.java

@@ -30,10 +30,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
 import appeng.api.storage.data.IAEItemStack;
-import appeng.client.ClientHelper;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerOpenContext;
 import appeng.container.implementations.ContainerCraftAmount;
+import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.GuiBridge;
 import appeng.core.sync.network.INetworkInfo;
@@ -143,7 +143,7 @@ public class PacketInventoryAction extends AppEngPacket
 						{
 							// Force to stack size 1 to fix a client-side display problem...
 							ItemStack displayIs = baseContainer.getTargetStack().getItemStack().copy();
-							displayIs.stackSize = 1;
+							displayIs.setCount( 1 );
 							cca.getCraftingItem().putStack( displayIs );
 							// This is the *actual* item that matters, not the display item above
 							cca.setItemToCraft( baseContainer.getTargetStack() );
@@ -167,11 +167,11 @@ public class PacketInventoryAction extends AppEngPacket
 		{
 			if( this.slotItem == null )
 			{
-				ClientHelper.proxy.getPlayers().get( 0 ).inventory.setItemStack( null );
+				AppEng.proxy.getPlayers().get( 0 ).inventory.setItemStack( null );
 			}
 			else
 			{
-				ClientHelper.proxy.getPlayers().get( 0 ).inventory.setItemStack( this.slotItem.getItemStack() );
+				AppEng.proxy.getPlayers().get( 0 ).inventory.setItemStack( this.slotItem.getItemStack() );
 			}
 		}
 	}

src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java

@@ -84,7 +84,7 @@ public class PacketJEIRecipe extends AppEngPacket
 					this.recipe[x] = new ItemStack[list.tagCount()];
 					for( int y = 0; y < list.tagCount(); y++ )
 					{
-						this.recipe[x][y] = ItemStack.loadItemStackFromNBT( list.getCompoundTagAt( y ) );
+						this.recipe[x][y] = new ItemStack( list.getCompoundTagAt( y ) );
 					}
 				}
 			}
@@ -144,7 +144,7 @@ public class PacketJEIRecipe extends AppEngPacket
 						}
 					}
 
-					final IRecipe r = Platform.findMatchingRecipe( testInv, pmp.worldObj );
+					final IRecipe r = Platform.findMatchingRecipe( testInv, pmp.world );
 
 					if( r != null && security.hasPermission( player, SecurityPermissions.EXTRACT ) )
 					{
@@ -164,7 +164,7 @@ public class PacketJEIRecipe extends AppEngPacket
 								if( currentItem != null )
 								{
 									testInv.setInventorySlotContents( x, currentItem );
-									final ItemStack newItemStack = r.matches( testInv, pmp.worldObj ) ? r.getCraftingResult( testInv ) : null;
+									final ItemStack newItemStack = r.matches( testInv, pmp.world ) ? r.getCraftingResult( testInv ) : null;
 									testInv.setInventorySlotContents( x, patternItem );
 
 									if( newItemStack == null || !Platform.itemComparisons().isSameItem( newItemStack, is ) )
@@ -191,7 +191,7 @@ public class PacketJEIRecipe extends AppEngPacket
 								if( patternItem != null && currentItem == null )
 								{
 									// Grab from network by recipe
-									ItemStack whichItem = Platform.extractItemsByRecipe( energy, cct.getActionSource(), storage, player.worldObj, r, is, testInv, patternItem, x, all, realForFake, filter );
+									ItemStack whichItem = Platform.extractItemsByRecipe( energy, cct.getActionSource(), storage, player.world, r, is, testInv, patternItem, x, all, realForFake, filter );
 
 									// If that doesn't get it, grab exact items from network (?)
 									// TODO see if this code is necessary

src/main/java/appeng/core/sync/packets/PacketLightning.java

@@ -27,9 +27,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import appeng.client.ClientHelper;
 import appeng.client.render.effects.LightningFX;
 import appeng.core.AEConfig;
+import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.Platform;
@@ -75,7 +75,7 @@ public class PacketLightning extends AppEngPacket
 		{
 			if( Platform.isClient() && AEConfig.instance().isEnableEffects() )
 			{
-				final LightningFX fx = new LightningFX( ClientHelper.proxy.getWorld(), this.x, this.y, this.z, 0.0f, 0.0f, 0.0f );
+				final LightningFX fx = new LightningFX( AppEng.proxy.getWorld(), this.x, this.y, this.z, 0.0f, 0.0f, 0.0f );
 				Minecraft.getMinecraft().effectRenderer.addEffect( fx );
 			}
 		}

src/main/java/appeng/core/sync/packets/PacketMatterCannon.java

@@ -93,7 +93,7 @@ public class PacketMatterCannon extends AppEngPacket
 		try
 		{
 
-			final World world = FMLClientHandler.instance().getClient().theWorld;
+			final World world = FMLClientHandler.instance().getClient().world;
 			for( int a = 1; a < this.len; a++ )
 			{
 				final MatterCannonFX fx = new MatterCannonFX( world, this.x + this.dx * a, this.y + this.dy * a, this.z + this.dz * a, Items.DIAMOND );

src/main/java/appeng/core/sync/packets/PacketMockExplosion.java

@@ -28,7 +28,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 
@@ -69,7 +69,7 @@ public class PacketMockExplosion extends AppEngPacket
 	@SideOnly( Side.CLIENT )
 	public void clientPacketData( final INetworkInfo network, final AppEngPacket packet, final EntityPlayer player )
 	{
-		final World world = CommonHelper.proxy.getWorld();
+		final World world = AppEng.proxy.getWorld();
 		world.spawnParticle( EnumParticleTypes.EXPLOSION_LARGE, this.x, this.y, this.z, 1.0D, 0.0D, 0.0D, new int[0] );
 	}
 }

src/main/java/appeng/core/sync/packets/PacketPartPlacement.java

@@ -28,7 +28,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.parts.PartPlacement;
@@ -75,9 +75,9 @@ public class PacketPartPlacement extends AppEngPacket
 	public void serverPacketData( final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player )
 	{
 		final EntityPlayerMP sender = (EntityPlayerMP) player;
-		CommonHelper.proxy.updateRenderMode( sender );
+		AppEng.proxy.updateRenderMode( sender );
 		PartPlacement.setEyeHeight( this.eyeHeight );
-		PartPlacement.place( sender.getHeldItem( hand ), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, hand, sender.worldObj, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 );
-		CommonHelper.proxy.updateRenderMode( null );
+		PartPlacement.place( sender.getHeldItem( hand ), new BlockPos( this.x, this.y, this.z ), EnumFacing.VALUES[this.face], sender, hand, sender.world, PartPlacement.PlaceType.INTERACT_FIRST_PASS, 0 );
+		AppEng.proxy.updateRenderMode( null );
 	}
 }

src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java

@@ -34,9 +34,8 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.util.AEPartLocation;
-import appeng.client.ClientHelper;
 import appeng.client.render.effects.EnergyFx;
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.Platform;
@@ -86,11 +85,11 @@ public class PacketTransitionEffect extends AppEngPacket
 	@SideOnly( Side.CLIENT )
 	public void clientPacketData( final INetworkInfo network, final AppEngPacket packet, final EntityPlayer player )
 	{
-		final World world = ClientHelper.proxy.getWorld();
+		final World world = AppEng.proxy.getWorld();
 
 		for( int zz = 0; zz < ( this.mode ? 32 : 8 ); zz++ )
 		{
-			if( CommonHelper.proxy.shouldAddParticles( Platform.getRandom() ) )
+			if( AppEng.proxy.shouldAddParticles( Platform.getRandom() ) )
 			{
 				final EnergyFx fx = new EnergyFx( world, this.x + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.y + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.z + ( this.mode ? ( Platform.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), Items.DIAMOND );
 

src/main/java/appeng/core/worlddata/PlayerData.java

@@ -33,7 +33,7 @@ import net.minecraftforge.common.config.ConfigCategory;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 
 
 /**
@@ -75,7 +75,7 @@ final class PlayerData implements IWorldPlayerData, IOnWorldStartable, IOnWorldS
 		if( maybe.isPresent() )
 		{
 			final UUID uuid = maybe.get();
-			for( final EntityPlayer player : CommonHelper.proxy.getPlayers() )
+			for( final EntityPlayer player : AppEng.proxy.getPlayers() )
 			{
 				if( player.getUniqueID().equals( uuid ) )
 				{

src/main/java/appeng/coremod/AppEngCore.java

@@ -37,7 +37,7 @@ import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import appeng.core.AEConfig;
 
 
-@MCVersion( "1.10.2" )
+@MCVersion( "1.11" )
 public final class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 {
 	private final ModMetadata metadata = new ModMetadata();
@@ -64,7 +64,7 @@ public final class AppEngCore extends DummyModContainer implements IFMLLoadingPl
 	@Override
 	public String[] getASMTransformerClass()
 	{
-		return new String[] { "appeng.coremod.asm.ASMIntegration" };
+		return null; //new String[] { "appeng.coremod.asm.ASMIntegration" };
 	}
 
 	@Override

src/main/java/appeng/coremod/asm/ASMIntegration.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.coremod.transformer;
+package appeng.coremod.asm;
 
 
 import java.util.Iterator;

src/main/java/appeng/crafting/CraftingTreeProcess.java

@@ -81,7 +81,7 @@ public class CraftingTreeProcess
 			for( int x = 0; x < ic.getSizeInventory(); x++ )
 			{
 				final ItemStack g = ic.getStackInSlot( x );
-				if( g != null && g.stackSize > 1 )
+				if( g != null && g.getCount() > 1 )
 				{
 					this.fullSimulation = true;
 				}

src/main/java/appeng/debug/TileChunkLoader.java

@@ -60,17 +60,17 @@ public class TileChunkLoader extends AEBaseTile implements ITickable
 			return;
 		}
 
-		this.ct = ForgeChunkManager.requestTicket( AppEng.instance(), this.worldObj, Type.NORMAL );
+		this.ct = ForgeChunkManager.requestTicket( AppEng.instance(), this.world, Type.NORMAL );
 
 		if( this.ct == null )
 		{
 			final MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
 			if( server != null )
 			{
-				final List<EntityPlayerMP> pl = server.getPlayerList().getPlayerList();
+				final List<EntityPlayerMP> pl = server.getPlayerList().getPlayers();
 				for( final EntityPlayerMP p : pl )
 				{
-					p.addChatMessage( new TextComponentString( "Can't chunk load.." ) );
+					p.sendMessage( new TextComponentString( "Can't chunk load.." ) );
 				}
 			}
 			return;

src/main/java/appeng/debug/TileCubeGenerator.java

@@ -28,7 +28,7 @@ import net.minecraft.util.ITickable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextComponentString;
 
-import appeng.core.CommonHelper;
+import appeng.core.AppEng;
 import appeng.tile.AEBaseTile;
 import appeng.util.Platform;
 
@@ -50,9 +50,9 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
 
 			if( this.countdown % 20 == 0 )
 			{
-				for( final EntityPlayer e : CommonHelper.proxy.getPlayers() )
+				for( final EntityPlayer e : AppEng.proxy.getPlayers() )
 				{
-					e.addChatMessage( new TextComponentString( "Spawning in... " + ( this.countdown / 20 ) ) );
+					e.sendMessage( new TextComponentString( "Spawning in... " + ( this.countdown / 20 ) ) );
 				}
 			}
 
@@ -65,7 +65,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
 
 	private void spawn()
 	{
-		this.worldObj.setBlockToAir( this.pos );
+		this.world.setBlockToAir( this.pos );
 
 		final Item i = this.is.getItem();
 		final EnumFacing side = EnumFacing.UP;
@@ -79,7 +79,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
 				for( int z = -half; z < half; z++ )
 				{
 					final BlockPos p = this.pos.add( x, y - 1, z );
-					i.onItemUse( this.is.copy(), this.who, this.worldObj, p, EnumHand.MAIN_HAND, side, 0.5f, 0.0f, 0.5f );
+					i.onItemUse( this.who, this.world, p, EnumHand.MAIN_HAND, side, 0.5f, 0.0f, 0.5f );
 				}
 			}
 		}
@@ -114,7 +114,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
 					this.size = 64;
 				}
 
-				player.addChatMessage( new TextComponentString( "Size: " + this.size ) );
+				player.sendMessage( new TextComponentString( "Size: " + this.size ) );
 			}
 			else
 			{