Merge pull request #1078 from thatsIch/b-1077-hotfix-packet-size

Fixes #1077 Hotfix: Opening a terminal will not crash as fast anymore in systems with many items.

README.md

@@ -1,6 +1,6 @@
 # Applied Energistics 2
 
-## Table of Content
+## Table of Contents
 
 * [About](#about)
 * [Contacts](#contacts)

build.properties

@@ -14,12 +14,12 @@ forge_version=10.13.2.1291
 # APIs used for development                             #
 #########################################################
 cb_minecraft_version=1.7.10
-fmp_version=1.1.1.321
+fmp_version=1.1.1.324
-code_chicken_lib_version=1.1.1.110
+code_chicken_lib_version=1.1.3.127
 code_chicken_core_version=1.0.4.35
 nei_version=1.0.4.90
-waila_version=1.5.9_1.7.10
+waila_version=1.5.10_1.7.10
-bc_version=6.4.2
+bc_version=6.4.3
 
 #########################################################
 # API Stubs                                             #

src/api/java/appeng/api/storage/IMEInventory.java

@@ -49,7 +49,7 @@ public interface IMEInventory<StackType extends IAEStack>
 	 * @param src action source
 	 * @return returns the number of items not added.
 	 */
-	public StackType injectItems(StackType input, Actionable type, BaseActionSource src);
+	StackType injectItems( StackType input, Actionable type, BaseActionSource src );
 
 	/**
 	 * Extract the specified item from the ME Inventory
@@ -60,7 +60,7 @@ public interface IMEInventory<StackType extends IAEStack>
 	 *            simulate, or perform action?
 	 * @return returns the number of items extracted, null
 	 */
-	public StackType extractItems(StackType request, Actionable mode, BaseActionSource src);
+	StackType extractItems( StackType request, Actionable mode, BaseActionSource src );
 
 	/**
 	 * request a full report of all available items, storage.
@@ -69,11 +69,11 @@ public interface IMEInventory<StackType extends IAEStack>
 	 *            the IItemList the results will be written too
 	 * @return returns same list that was passed in, is passed out
 	 */
-	public IItemList<StackType> getAvailableItems(IItemList<StackType> out);
+	IItemList<StackType> getAvailableItems( IItemList<StackType> out );
 
 	/**
 	 * @return the type of channel your handler should be part of
 	 */
-	public StorageChannel getChannel();
+	StorageChannel getChannel();
 
 }

src/api/java/appeng/api/storage/IMEMonitor.java

@@ -30,12 +30,12 @@ import appeng.api.storage.data.IItemList;
 public interface IMEMonitor<T extends IAEStack> extends IMEInventoryHandler<T>, IBaseMonitor<T>
 {
 
-	@Override
-	@Deprecated
 	/**
 	 * This method is discouraged when accessing data via a IMEMonitor
 	 */
-	public IItemList<T> getAvailableItems(IItemList out);
+	@Override
+	@Deprecated
+	IItemList<T> getAvailableItems( IItemList out );
 
 	/**
 	 * Get access to the full item list of the network, preferred over {@link IMEInventory} .getAvailableItems(...)

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

@@ -70,8 +70,8 @@ import appeng.parts.NullCableBusContainer;
 import appeng.tile.AEBaseTile;
 import appeng.tile.networking.TileCableBus;
 import appeng.tile.networking.TileCableBusTESR;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 
 @Interface(iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", iname = "MFR")

src/main/java/appeng/block/solids/BlockSkyStone.java

@@ -25,6 +25,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -163,10 +164,11 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock
 	}
 
 	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
+	public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
 	{
-		ItemStack is = super.getPickBlock( target, world, x, y, z );
+		final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
 		is.setItemDamage( world.getBlockMetadata( x, y, z ) );
+
 		return is;
 	}
 

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

@@ -87,10 +87,11 @@ public class BlockSkyChest extends AEBaseBlock implements ICustomCollision
 	}
 
 	@Override
-	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z)
+	public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player )
 	{
-		ItemStack is = super.getPickBlock( target, world, x, y, z );
+		final ItemStack is = super.getPickBlock( target, world, x, y, z, player );
 		is.setItemDamage( world.getBlockMetadata( x, y, z ) );
+
 		return is;
 	}
 

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

@@ -33,21 +33,47 @@ import appeng.container.slot.SlotRestrictedInput;
 import appeng.tile.storage.TileIOPort;
 import appeng.util.Platform;
 
+
 public class ContainerIOPort extends ContainerUpgradeable
 {
 
 	final TileIOPort ioPort;
 
-	@GuiSync(2)
+	@GuiSync( 2 )
 	public FullnessMode fMode = FullnessMode.EMPTY;
-	@GuiSync(3)
+	@GuiSync( 3 )
 	public OperationMode opMode = OperationMode.EMPTY;
 
-	public ContainerIOPort(InventoryPlayer ip, TileIOPort te) {
+	public ContainerIOPort( InventoryPlayer ip, TileIOPort te )
+	{
 		super( ip, te );
 		this.ioPort = te;
 	}
 
+	@Override
+	protected void setupConfig()
+	{
+		int offX = 19;
+		int offY = 17;
+
+		IInventory cells = this.upgradeable.getInventoryByName( "cells" );
+
+		for ( int y = 0; y < 3; y++ )
+			for ( int x = 0; x < 2; x++ )
+				this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this.invPlayer ) );
+
+		offX = 122;
+		offY = 17;
+		for ( int y = 0; y < 3; y++ )
+			for ( int x = 0; x < 2; x++ )
+				this.addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offX + x * 18, offY + y * 18, SlotRestrictedInput.PlacableItemType.STORAGE_CELLS.IIcon ) );
+
+		IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" );
+		this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer ) ).setNotDraggable() );
+		this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer ) ).setNotDraggable() );
+		this.addSlotToContainer( ( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer ) ).setNotDraggable() );
+	}
+
 	@Override
 	protected int getHeight()
 	{
@@ -66,30 +92,6 @@ public class ContainerIOPort extends ContainerUpgradeable
 		return false;
 	}
 
-	@Override
-	protected void setupConfig()
-	{
-		int offX = 19;
-		int offY = 17;
-
-		IInventory cells = this.upgradeable.getInventoryByName( "cells" );
-
-		for (int y = 0; y < 3; y++)
-			for (int x = 0; x < 2; x++)
-				this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.STORAGE_CELLS, cells, x + y * 2, offX + x * 18, offY + y * 18, this.invPlayer ) );
-
-		offX = 122;
-		offY = 17;
-		for (int y = 0; y < 3; y++)
-			for (int x = 0; x < 2; x++)
-				this.addSlotToContainer( new SlotOutput( cells, 6 + x + y * 2, offX + x * 18, offY + y * 18, SlotRestrictedInput.PlacableItemType.STORAGE_CELLS.IIcon ) );
-
-		IInventory upgrades = this.upgradeable.getInventoryByName( "upgrades" );
-		this.addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 0, 187, 8, this.invPlayer )).setNotDraggable() );
-		this.addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 1, 187, 8 + 18, this.invPlayer )).setNotDraggable() );
-		this.addSlotToContainer( (new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.UPGRADES, upgrades, 2, 187, 8 + 18 * 2, this.invPlayer )).setNotDraggable() );
-	}
-
 	@Override
 	public void detectAndSendChanges()
 	{
@@ -104,5 +106,4 @@ public class ContainerIOPort extends ContainerUpgradeable
 
 		this.standardDetectAndSendChanges();
 	}
-
 }

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

@@ -63,6 +63,7 @@ public final class LocatableRegistry implements ILocatableRegistry
 	 * Find a locate-able object by its serial.
 	 */
 	@Override
+	@Deprecated
 	public Object findLocatableBySerial( long ser )
 	{
 		return this.set.get( ser );

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

@@ -18,6 +18,7 @@
 
 package appeng.core.sync;
 
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
@@ -50,101 +51,101 @@ import appeng.core.sync.packets.PacketSwitchGuis;
 import appeng.core.sync.packets.PacketTransitionEffect;
 import appeng.core.sync.packets.PacketValueConfig;
 
+
 public class AppEngPacketHandlerBase
 {
+	private static final Map<Class<? extends AppEngPacket>, PacketTypes> REVERSE_LOOKUP = new HashMap<Class<? extends AppEngPacket>, AppEngPacketHandlerBase.PacketTypes>();
 
-	public static final Map<Class, PacketTypes> REVERSE_LOOKUP = new HashMap<Class, AppEngPacketHandlerBase.PacketTypes>();
 
 	public enum PacketTypes
 	{
-		PACKET_COMPASS_REQUEST(PacketCompassRequest.class),
+		PACKET_COMPASS_REQUEST( PacketCompassRequest.class ),
 
-		PACKET_COMPASS_RESPONSE(PacketCompassResponse.class),
+		PACKET_COMPASS_RESPONSE( PacketCompassResponse.class ),
 
-		PACKET_INVENTORY_ACTION(PacketInventoryAction.class),
+		PACKET_INVENTORY_ACTION( PacketInventoryAction.class ),
 
-		PACKET_ME_INVENTORY_UPDATE(PacketMEInventoryUpdate.class),
+		PACKET_ME_INVENTORY_UPDATE( PacketMEInventoryUpdate.class ),
 
-		PACKET_CONFIG_BUTTON(PacketConfigButton.class),
+		PACKET_CONFIG_BUTTON( PacketConfigButton.class ),
 
-		PACKET_MULTIPART(PacketMultiPart.class),
+		PACKET_MULTIPART( PacketMultiPart.class ),
 
-		PACKET_PART_PLACEMENT(PacketPartPlacement.class),
+		PACKET_PART_PLACEMENT( PacketPartPlacement.class ),
 
-		PACKET_LIGHTNING(PacketLightning.class),
+		PACKET_LIGHTNING( PacketLightning.class ),
 
-		PACKET_MATTER_CANNON(PacketMatterCannon.class),
+		PACKET_MATTER_CANNON( PacketMatterCannon.class ),
 
-		PACKET_MOCK_EXPLOSION(PacketMockExplosion.class),
+		PACKET_MOCK_EXPLOSION( PacketMockExplosion.class ),
 
-		PACKET_VALUE_CONFIG(PacketValueConfig.class),
+		PACKET_VALUE_CONFIG( PacketValueConfig.class ),
 
-		PACKET_TRANSITION_EFFECT(PacketTransitionEffect.class),
+		PACKET_TRANSITION_EFFECT( PacketTransitionEffect.class ),
 
-		PACKET_PROGRESS_VALUE(PacketProgressBar.class),
+		PACKET_PROGRESS_VALUE( PacketProgressBar.class ),
 
-		PACKET_CLICK(PacketClick.class),
+		PACKET_CLICK( PacketClick.class ),
 
-		PACKET_NEW_STORAGE_DIMENSION(PacketNewStorageDimension.class),
+		PACKET_NEW_STORAGE_DIMENSION( PacketNewStorageDimension.class ),
 
-		PACKET_SWITCH_GUIS(PacketSwitchGuis.class),
+		PACKET_SWITCH_GUIS( PacketSwitchGuis.class ),
 
-		PACKET_SWAP_SLOTS(PacketSwapSlots.class),
+		PACKET_SWAP_SLOTS( PacketSwapSlots.class ),
 
-		PACKET_PATTERN_SLOT(PacketPatternSlot.class),
+		PACKET_PATTERN_SLOT( PacketPatternSlot.class ),
 
-		PACKET_RECIPE_NEI(PacketNEIRecipe.class),
+		PACKET_RECIPE_NEI( PacketNEIRecipe.class ),
 
-		PACKET_PARTIAL_ITEM(PacketPartialItem.class),
+		PACKET_PARTIAL_ITEM( PacketPartialItem.class ),
 
-		PACKET_CRAFTING_REQUEST(PacketCraftRequest.class),
+		PACKET_CRAFTING_REQUEST( PacketCraftRequest.class ),
 
-		PACKET_ASSEMBLER_ANIMATION(PacketAssemblerAnimation.class),
+		PACKET_ASSEMBLER_ANIMATION( PacketAssemblerAnimation.class ),
 
-		PACKET_COMPRESSED_NBT(PacketCompressedNBT.class),
+		PACKET_COMPRESSED_NBT( PacketCompressedNBT.class ),
 
-		PACKET_PAINTED_ENTITY(PacketPaintedEntity.class);
+		PACKET_PAINTED_ENTITY( PacketPaintedEntity.class );
 
-		final public Class pc;
+		private final Class<? extends AppEngPacket> packetClass;
-		final public Constructor con;
+		private final Constructor<? extends AppEngPacket> packetConstructor;
 
-		private PacketTypes(Class c) {
+		PacketTypes( Class<? extends AppEngPacket> c )
-			this.pc = c;
+		{
+			this.packetClass = c;
 
-			Constructor x = null;
+			Constructor<? extends AppEngPacket> x = null;
 			try
 			{
-				x = this.pc.getConstructor( ByteBuf.class );
+				x = this.packetClass.getConstructor( ByteBuf.class );
 			}
-			catch (NoSuchMethodException ignored)
+			catch( NoSuchMethodException ignored )
 			{
 			}
-			catch (SecurityException ignored)
+			catch( SecurityException ignored )
 			{
 			}
 
-			this.con = x;
+			this.packetConstructor = x;
-			AppEngPacketHandlerBase.REVERSE_LOOKUP.put( this.pc, this );
+			REVERSE_LOOKUP.put( this.packetClass, this );
 
-			if ( this.con == null )
+			if( this.packetConstructor == null )
 				throw new RuntimeException( "Invalid Packet Class, must be constructable on DataInputStream" );
 		}
 
-		public AppEngPacket parsePacket(ByteBuf in) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
+		public static PacketTypes getPacket( int id )
 		{
-			return (AppEngPacket) this.con.newInstance( in );
+			return ( values() )[id];
 		}
 
-		public static PacketTypes getPacket(int id)
+		public static PacketTypes getID( Class<? extends AppEngPacket> c )
 		{
-			return (values())[id];
+			return REVERSE_LOOKUP.get( c );
 		}
 
-		public static PacketTypes getID(Class<? extends AppEngPacket> c)
+		public AppEngPacket parsePacket( ByteBuf in ) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException
 		{
-			return AppEngPacketHandlerBase.REVERSE_LOOKUP.get( c );
+			return this.packetConstructor.newInstance( in );
 		}
-
 	}
-
 }

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

@@ -18,6 +18,7 @@
 
 package appeng.core.sync.packets;
 
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -26,6 +27,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+import javax.annotation.Nullable;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -48,23 +50,31 @@ import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.item.AEItemStack;
 
+
 public class PacketMEInventoryUpdate extends AppEngPacket
 {
-
+	private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024;
-	// output...
+	private static final int OPERATION_BYTE_LIMIT = 2 * 1024;
-	final private byte ref;
+	private static final int TEMP_BUFFER_SIZE = 1024;
-	final private ByteBuf data;
+	private static final int STREAM_MASK = 0xff;
-	final private GZIPOutputStream compressFrame;
-
-	int writtenBytes = 0;
-
-	boolean empty = true;
 
 	// input.
-	final List<IAEItemStack> list;
+	@Nullable
+	private final List<IAEItemStack> list;
+	// output...
+	private final byte ref;
+
+	@Nullable
+	private final ByteBuf data;
+	@Nullable
+	private final GZIPOutputStream compressFrame;
+
+	private int writtenBytes = 0;
+	private boolean empty = true;
 
 	// automatic.
-	public PacketMEInventoryUpdate(final ByteBuf stream) throws IOException {
+	public PacketMEInventoryUpdate( final ByteBuf stream ) throws IOException
+	{
 		this.data = null;
 		this.compressFrame = null;
 		this.list = new LinkedList<IAEItemStack>();
@@ -72,25 +82,24 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 
 		// int originalBytes = stream.readableBytes();
 
-		GZIPInputStream gzReader = new GZIPInputStream( new InputStream() {
+		GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
-
+		{
 			@Override
 			public int read() throws IOException
 			{
-				if ( stream.readableBytes() <= 0 )
+				if( stream.readableBytes() <= 0 )
 					return -1;
 
-				return stream.readByte() & 0xff;
+				return stream.readByte() & STREAM_MASK;
 			}
-
 		} );
 
 		ByteBuf uncompressed = Unpooled.buffer( stream.readableBytes() );
-		byte[] tmp = new byte[1024];
+		byte[] tmp = new byte[TEMP_BUFFER_SIZE];
-		while (gzReader.available() != 0)
+		while( gzReader.available() != 0 )
 		{
 			int bytes = gzReader.read( tmp );
-			if ( bytes > 0 )
+			if( bytes > 0 )
 				uncompressed.writeBytes( tmp, 0, bytes );
 		}
 		gzReader.close();
@@ -98,32 +107,58 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 		// int uncompressedBytes = uncompressed.readableBytes();
 		// AELog.info( "Receiver: " + originalBytes + " -> " + uncompressedBytes );
 
-		while (uncompressed.readableBytes() > 0)
+		while( uncompressed.readableBytes() > 0 )
 			this.list.add( AEItemStack.loadItemStackFromPacket( uncompressed ) );
 
 		this.empty = this.list.isEmpty();
 	}
 
+	// api
+	public PacketMEInventoryUpdate() throws IOException
+	{
+		this( (byte) 0 );
+	}
+
+	// api
+	public PacketMEInventoryUpdate( byte ref ) throws IOException
+	{
+		this.ref = ref;
+		this.data = Unpooled.buffer( OPERATION_BYTE_LIMIT );
+		this.data.writeInt( this.getPacketID() );
+		this.data.writeByte( this.ref );
+
+		this.compressFrame = new GZIPOutputStream( new OutputStream()
+		{
+			@Override
+			public void write( int value ) throws IOException
+			{
+				PacketMEInventoryUpdate.this.data.writeByte( value );
+			}
+		} );
+
+		this.list = null;
+	}
+
 	@Override
-	@SideOnly(Side.CLIENT)
+	@SideOnly( Side.CLIENT )
-	public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
+	public void clientPacketData( INetworkInfo network, AppEngPacket packet, EntityPlayer player )
 	{
 		GuiScreen gs = Minecraft.getMinecraft().currentScreen;
 
-		if ( gs instanceof GuiCraftConfirm )
+		if( gs instanceof GuiCraftConfirm )
-			((GuiCraftConfirm) gs).postUpdate( this.list, this.ref );
+			( (GuiCraftConfirm) gs ).postUpdate( this.list, this.ref );
 
-		if ( gs instanceof GuiCraftingCPU )
+		if( gs instanceof GuiCraftingCPU )
-			((GuiCraftingCPU) gs).postUpdate( this.list, this.ref );
+			( (GuiCraftingCPU) gs ).postUpdate( this.list, this.ref );
 
-		if ( gs instanceof GuiMEMonitorable )
+		if( gs instanceof GuiMEMonitorable )
-			((GuiMEMonitorable) gs).postUpdate( this.list );
+			( (GuiMEMonitorable) gs ).postUpdate( this.list );
-
-		if ( gs instanceof GuiNetworkStatus )
-			((GuiNetworkStatus) gs).postUpdate( this.list );
 
+		if( gs instanceof GuiNetworkStatus )
+			( (GuiNetworkStatus) gs ).postUpdate( this.list );
 	}
 
+	@Nullable
 	@Override
 	public FMLProxyPacket getProxy()
 	{
@@ -134,46 +169,24 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 			this.configureWrite( this.data );
 			return super.getProxy();
 		}
-		catch (IOException e)
+		catch( IOException e )
 		{
 			AELog.error( e );
 		}
+
 		return null;
 	}
 
-	// api
+	public void appendItem( IAEItemStack is ) throws IOException, BufferOverflowException
-	public PacketMEInventoryUpdate() throws IOException {
-		this( (byte) 0 );
-	}
-
-	// api
-	public PacketMEInventoryUpdate(byte ref) throws IOException {
-
-		this.data = Unpooled.buffer( 2048 );
-		this.data.writeInt( this.getPacketID() );
-		this.data.writeByte( this.ref = ref );
-
-		this.compressFrame = new GZIPOutputStream( new OutputStream() {
-
-			@Override
-			public void write(int value) throws IOException
-			{
-				PacketMEInventoryUpdate.this.data.writeByte( value );
-			}
-
-		} );
-
-		this.list = null;
-	}
-
-	public void appendItem(IAEItemStack is) throws IOException, BufferOverflowException
 	{
-		ByteBuf tmp = Unpooled.buffer( 2048 );
+		ByteBuf tmp = Unpooled.buffer( OPERATION_BYTE_LIMIT );
 		is.writeToPacket( tmp );
 
 		this.compressFrame.flush();
-		if ( this.writtenBytes + tmp.readableBytes() > 2 * 1024 * 1024 ) // 2mb!
+		if( this.writtenBytes + tmp.readableBytes() > UNCOMPRESSED_PACKET_BYTE_LIMIT )
+		{
 			throw new BufferOverflowException();
+		}
 		else
 		{
 			this.writtenBytes += tmp.readableBytes();
@@ -191,5 +204,4 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 	{
 		return this.empty;
 	}
-
 }

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

@@ -202,7 +202,7 @@ public class PacketNEIRecipe extends AppEngPacket
 											{
 												// check if the item in slot y matches the required item.
 												playerItemStack = playerInventory.getStackInSlot( i );
-												if ( playerItemStack != null && playerItemStack.getItem() == this.recipe[x][y].getItem() )
+												if ( playerItemStack != null && this.recipe[x][y] != null && playerItemStack.getItem() == this.recipe[x][y].getItem() )
 												{
 													if ( realForFake == Actionable.SIMULATE )
 													{

src/main/java/appeng/helpers/DualityInterface.java

@@ -1080,7 +1080,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
 					{
 						if ( mop.blockX == te.xCoord && mop.blockY == te.yCoord && mop.blockZ == te.zCoord )
 						{
-							ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord );
+							ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord, null );
 							if ( g != null )
 								what = g;
 						}

src/main/java/appeng/helpers/WirelessTerminalGuiObject.java

@@ -27,6 +27,7 @@ import appeng.api.AEApi;
 import appeng.api.config.AccessRestriction;
 import appeng.api.config.Actionable;
 import appeng.api.config.PowerMultiplier;
+import appeng.api.features.ILocatable;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.implementations.guiobjects.IPortableCell;
 import appeng.api.implementations.tiles.IWirelessAccessPoint;
@@ -76,12 +77,12 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost
 		this.myPlayer = ep;
 		this.wth = wh;
 
-		Object obj = null;
+		ILocatable obj = null;
 
 		try
 		{
 			long encKey = Long.parseLong( this.encryptionKey );
-			obj = AEApi.instance().registries().locatable().findLocatableBySerial( encKey );
+			obj = AEApi.instance().registries().locatable().getLocatableBy( encKey );
 		}
 		catch (NumberFormatException err)
 		{

src/main/java/appeng/items/tools/ToolNetworkTool.java

@@ -50,7 +50,7 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketClick;
 import appeng.items.AEBaseItem;
 import appeng.items.contents.NetworkToolViewer;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 import appeng.util.Platform;
 
 

src/main/java/appeng/items/tools/powered/powersink/IC2.java

@@ -29,9 +29,9 @@ import ic2.api.item.IElectricItemManager;
 import ic2.api.item.ISpecialElectricItem;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.InterfaceList;
+import appeng.transformer.annotations.Integration.InterfaceList;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Method;
 
 
 @InterfaceList( value = { @Interface( iface = "ic2.api.item.ISpecialElectricItem", iname = "IC2" ),

src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java

@@ -26,7 +26,7 @@ import net.minecraft.item.ItemStack;
 import cofh.api.energy.IEnergyContainerItem;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 
 
 @Interface( iface = "cofh.api.energy.IEnergyContainerItem", iname = "RFItem" )

src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java

@@ -35,7 +35,7 @@ import appeng.api.implementations.items.IAEWrench;
 import appeng.api.util.DimensionalCoord;
 import appeng.core.features.AEFeature;
 import appeng.items.AEBaseItem;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 import appeng.util.Platform;
 
 

src/main/java/appeng/me/GridConnection.java

@@ -77,8 +77,12 @@ public class GridConnection implements IGridConnection, IPathItem
 			throw new GridException( "Connection Forged Between null entities." );
 
 		if ( a.hasConnection( b ) || b.hasConnection( a ) )
-			throw new GridException( "Connection already exists." );
+		{
+			final String aCoords = a.getGridBlock().getLocation().toString();
+			final String bCoords = b.getGridBlock().getLocation().toString();
 
+			throw new GridException( String.format( "Connection already exists between node at [%s] and node at [%s].", aCoords, bCoords ) );
+		}
 		this.sideA = a;
 		this.fromAtoB = fromAtoB;
 		this.sideB = b;

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -81,7 +81,7 @@ public class QuantumCluster implements ILocatable, IAECluster
 
 	public boolean canUseNode(long qe)
 	{
-		QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().findLocatableBySerial( qe );
+		QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().getLocatableBy( qe );
 		if ( qc != null )
 		{
 			World theWorld = qc.getCenter().getWorldObj();
@@ -147,7 +147,7 @@ public class QuantumCluster implements ILocatable, IAECluster
 			}
 		}
 
-		Object myOtherSide = this.otherSide == 0 ? null : AEApi.instance().registries().locatable().findLocatableBySerial( this.otherSide );
+		ILocatable myOtherSide = this.otherSide == 0 ? null : AEApi.instance().registries().locatable().getLocatableBy( this.otherSide );
 
 		boolean shutdown = false;
 

src/main/java/appeng/parts/misc/PartStorageBus.java

@@ -82,8 +82,8 @@ import appeng.me.storage.MEMonitorIInventory;
 import appeng.parts.automation.PartUpgradeable;
 import appeng.tile.inventory.AppEngInternalAEInventory;
 import appeng.tile.inventory.InvOperation;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 import appeng.util.prioitylist.FuzzyPriorityList;
 import appeng.util.prioitylist.PrecisePriorityList;

src/main/java/appeng/parts/p2p/PartP2PIC2Power.java

@@ -36,8 +36,8 @@ import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.InterfaceList;
+import appeng.transformer.annotations.Integration.InterfaceList;
 import appeng.util.Platform;
 
 @InterfaceList(value = { @Interface(iface = "ic2.api.energy.tile.IEnergySink", iname = "IC2"),

src/main/java/appeng/parts/p2p/PartP2PItems.java

@@ -53,8 +53,8 @@ import appeng.integration.abstraction.IBC;
 import appeng.me.GridAccessException;
 import appeng.me.cache.helpers.TunnelCollection;
 import appeng.tile.inventory.AppEngNullInventory;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 import appeng.util.inv.WrapperBCPipe;
 import appeng.util.inv.WrapperChainedInventory;

src/main/java/appeng/parts/p2p/PartP2PRFPower.java

@@ -38,8 +38,8 @@ import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.integration.modules.helpers.NullRFHandler;
 import appeng.me.GridAccessException;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.InterfaceList;
+import appeng.transformer.annotations.Integration.InterfaceList;
 import appeng.util.Platform;
 
 

src/main/java/appeng/tile/AEBaseInvTile.java

@@ -124,13 +124,13 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
 	}
 
 	@Override
-	public boolean canInsertItem(int i, ItemStack itemstack, int j)
+	public boolean canInsertItem(int slotIndex, ItemStack insertingItem, int side)
 	{
-		return this.isItemValidForSlot( i, itemstack );
+		return this.isItemValidForSlot( slotIndex, insertingItem );
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side)
 	{
 		return true;
 	}

src/main/java/appeng/tile/crafting/TileMolecularAssembler.java

@@ -285,9 +285,9 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
-		return i == 9;
+		return slotIndex == 9;
 	}
 
 	@Override

src/main/java/appeng/tile/grindstone/TileGrinder.java

@@ -72,18 +72,18 @@ public class TileGrinder extends AEBaseInvTile implements ICrankable
 	}
 
 	@Override
-	public boolean canInsertItem(int i, ItemStack itemstack, int j)
+	public boolean canInsertItem(int slotIndex, ItemStack insertingItem, int side )
 	{
-		if ( AEApi.instance().registries().grinder().getRecipeForInput( itemstack ) == null )
+		if ( AEApi.instance().registries().grinder().getRecipeForInput( insertingItem ) == null )
 			return false;
 
-		return i >= 0 && i <= 2;
+		return slotIndex >= 0 && slotIndex <= 2;
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
-		return i >= 3 && i <= 5;
+		return slotIndex >= 3 && slotIndex <= 5;
 	}
 
 	@Override

src/main/java/appeng/tile/misc/TileCharger.java

@@ -219,16 +219,16 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
-		if ( Platform.isChargeable( itemstack ) )
+		if ( Platform.isChargeable( extractedItem ) )
 		{
-			IAEItemPowerStorage ips = (IAEItemPowerStorage) itemstack.getItem();
+			IAEItemPowerStorage ips = (IAEItemPowerStorage) extractedItem.getItem();
-			if ( ips.getAECurrentPower( itemstack ) >= ips.getAEMaxPower( itemstack ) )
+			if ( ips.getAECurrentPower( extractedItem ) >= ips.getAEMaxPower( extractedItem ) )
 				return true;
 		}
 
-		return AEApi.instance().materials().materialCertusQuartzCrystalCharged.sameAsStack( itemstack );
+		return AEApi.instance().materials().materialCertusQuartzCrystalCharged.sameAsStack( extractedItem );
 	}
 
 	public void activate(EntityPlayer player)

src/main/java/appeng/tile/misc/TileCondenser.java

@@ -168,15 +168,15 @@ public class TileCondenser extends AEBaseInvTile implements IFluidHandler, IConf
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
-		return i != 0;
+		return slotIndex != 0;
 	}
 
 	@Override
-	public boolean canInsertItem(int i, ItemStack itemstack, int j)
+	public boolean canInsertItem(int slotIndex, ItemStack insertingItem, int side )
 	{
-		return i == 0;
+		return slotIndex == 0;
 	}
 
 	@Override

src/main/java/appeng/tile/misc/TileInscriber.java

@@ -224,12 +224,12 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
 		if ( this.smash )
 			return false;
 
-		return i == 0 || i == 1 || i == 3;
+		return slotIndex == 0 || slotIndex == 1 || slotIndex == 3;
 	}
 
 	@Override

src/main/java/appeng/tile/misc/TileVibrationChamber.java

@@ -142,7 +142,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
 		return false;
 	}

src/main/java/appeng/tile/powersink/IC2.java

@@ -29,7 +29,7 @@ import appeng.api.config.PowerUnits;
 import appeng.core.AppEng;
 import appeng.integration.IntegrationType;
 import appeng.integration.abstraction.IIC2;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 import appeng.util.Platform;
 
 @Interface(iname = "IC2", iface = "ic2.api.energy.tile.IEnergySink")

src/main/java/appeng/tile/powersink/MekJoules.java

@@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import mekanism.api.energy.IStrictEnergyAcceptor;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 
 @Interface(iname = "Mekanism", iface = "mekanism.api.energy.IStrictEnergyAcceptor")
 public abstract class MekJoules extends RedstoneFlux implements IStrictEnergyAcceptor   {

src/main/java/appeng/tile/powersink/RedstoneFlux.java

@@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import cofh.api.energy.IEnergyReceiver;
 
 import appeng.api.config.PowerUnits;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
 
 
 @Interface( iname = "RF", iface = "cofh.api.energy.IEnergyReceiver" )

src/main/java/appeng/tile/powersink/RotaryCraft.java

@@ -25,8 +25,8 @@ import Reika.RotaryCraft.API.ShaftPowerReceiver;
 import appeng.api.config.PowerUnits;
 import appeng.tile.TileEvent;
 import appeng.tile.events.TileEventType;
-import appeng.transformer.annotations.integration.Interface;
+import appeng.transformer.annotations.Integration.Interface;
-import appeng.transformer.annotations.integration.Method;
+import appeng.transformer.annotations.Integration.Method;
 import appeng.util.Platform;
 
 @Interface(iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.ShaftPowerReceiver")

src/main/java/appeng/tile/spatial/TileSpatialIOPort.java

@@ -174,15 +174,15 @@ public class TileSpatialIOPort extends AENetworkInvTile implements Callable
 	}
 
 	@Override
-	public boolean canInsertItem(int i, ItemStack itemstack, int j)
+	public boolean canInsertItem(int slotIndex, ItemStack insertingItem, int side )
 	{
-		return this.isItemValidForSlot( i, itemstack );
+		return this.isItemValidForSlot( slotIndex, insertingItem );
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
-		return i == 1;
+		return slotIndex == 1;
 	}
 
 	@Override

src/main/java/appeng/tile/storage/TileChest.java

@@ -548,19 +548,19 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 	}
 
 	@Override
-	public boolean canExtractItem(int i, ItemStack itemstack, int j)
+	public boolean canExtractItem(int slotIndex, ItemStack extractedItem, int side )
 	{
-		return i == 1;
+		return slotIndex == 1;
 	}
 
 	@Override
-	public boolean canInsertItem(int i, ItemStack itemstack, int j)
+	public boolean canInsertItem(int slotIndex, ItemStack insertingItem, int side )
 	{
-		if ( i == 1 )
+		if ( slotIndex == 1 )
 		{
-			if ( AEApi.instance().registries().cell().getCellInventory( itemstack, this, StorageChannel.ITEMS ) != null )
+			if ( AEApi.instance().registries().cell().getCellInventory( insertingItem, this, StorageChannel.ITEMS ) != null )
 				return true;
-			if ( AEApi.instance().registries().cell().getCellInventory( itemstack, this, StorageChannel.FLUIDS ) != null )
+			if ( AEApi.instance().registries().cell().getCellInventory( insertingItem, this, StorageChannel.FLUIDS ) != null )
 				return true;
 		}
 		else
@@ -569,7 +569,7 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
 			{
 				IMEInventory<IAEItemStack> cell = this.getHandler( StorageChannel.ITEMS );
 				IAEItemStack returns = cell.injectItems( AEApi.instance().storage().createItemStack( this.inv.getStackInSlot( 0 ) ), Actionable.SIMULATE, this.mySrc );
-				return returns == null || returns.getStackSize() != itemstack.stackSize;
+				return returns == null || returns.getStackSize() != insertingItem.stackSize;
 			}
 			catch (ChestNoHandler ignored)
 			{

src/main/java/appeng/tile/storage/TileIOPort.java

@@ -18,6 +18,7 @@
 
 package appeng.tile.storage;
 
+
 import java.util.ArrayList;
 
 import net.minecraft.inventory.IInventory;
@@ -67,51 +68,67 @@ import appeng.util.InventoryAdaptor;
 import appeng.util.Platform;
 import appeng.util.inv.WrapperInventoryRange;
 
+
 public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IConfigManagerHost, IGridTickable
 {
+	private static final int INPUT_SLOT_INDEX_TOP_LEFT = 0;
+	private static final int INPUT_SLOT_INDEX_TOP_RIGHT = 1;
+	private static final int INPUT_SLOT_INDEX_CENTER_LEFT = 2;
+	private static final int INPUT_SLOT_INDEX_CENTER_RIGHT = 3;
+	private static final int INPUT_SLOT_INDEX_BOTTOM_LEFT = 4;
+	private static final int INPUT_SLOT_INDEX_BOTTOM_RIGHT = 5;
 
-	final ConfigManager cm = new ConfigManager( this );
+	private static final int OUTPUT_SLOT_INDEX_TOP_LEFT = 6;
+	private static final int OUTPUT_SLOT_INDEX_TOP_RIGHT = 7;
+	private static final int OUTPUT_SLOT_INDEX_CENTER_LEFT = 8;
+	private static final int OUTPUT_SLOT_INDEX_CENTER_RIGHT = 9;
+	private static final int OUTPUT_SLOT_INDEX_BOTTOM_LEFT = 10;
+	private static final int OUTPUT_SLOT_INDEX_BOTTOM_RIGHT = 11;
 
-	final int[] input = { 0, 1, 2, 3, 4, 5 };
+	private final ConfigManager manager = new ConfigManager( this );
-	final int[] output = { 6, 7, 8, 9, 10, 11 };
 
-	final int[] outputSlots = { 6, 7, 8, 9, 10, 11 };
+	private final int[] input = { INPUT_SLOT_INDEX_TOP_LEFT, INPUT_SLOT_INDEX_TOP_RIGHT, INPUT_SLOT_INDEX_CENTER_LEFT, INPUT_SLOT_INDEX_CENTER_RIGHT, INPUT_SLOT_INDEX_BOTTOM_LEFT, INPUT_SLOT_INDEX_BOTTOM_RIGHT };
+	private final int[] output = { OUTPUT_SLOT_INDEX_TOP_LEFT, OUTPUT_SLOT_INDEX_TOP_RIGHT, OUTPUT_SLOT_INDEX_CENTER_LEFT, OUTPUT_SLOT_INDEX_CENTER_RIGHT, OUTPUT_SLOT_INDEX_BOTTOM_LEFT, OUTPUT_SLOT_INDEX_BOTTOM_RIGHT };
 
-	final AppEngInternalInventory cells = new AppEngInternalInventory( this, 12 );
+	private final AppEngInternalInventory cells = new AppEngInternalInventory( this, 12 );
-	final UpgradeInventory upgrades = new UpgradeInventory( AEApi.instance().blocks().blockIOPort.block(), this, 3 );
+	private final UpgradeInventory upgrades = new UpgradeInventory( AEApi.instance().blocks().blockIOPort.block(), this, 3 );
 
-	final BaseActionSource mySrc = new MachineSource( this );
+	private final BaseActionSource mySrc = new MachineSource( this );
 
-	YesNo lastRedstoneState = YesNo.UNDECIDED;
+	private YesNo lastRedstoneState = YesNo.UNDECIDED;
+	private ItemStack currentCell;
+	private IMEInventory<IAEFluidStack> cachedFluid;
+	private IMEInventory<IAEItemStack> cachedItem;
 
-	@TileEvent(TileEventType.WORLD_NBT_WRITE)
+	public TileIOPort()
-	public void writeToNBT_TileIOPort(NBTTagCompound data)
 	{
-		this.cm.writeToNBT( data );
+		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
+		this.manager.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE );
+		this.manager.registerSetting( Settings.FULLNESS_MODE, FullnessMode.EMPTY );
+		this.manager.registerSetting( Settings.OPERATION_MODE, OperationMode.EMPTY );
+	}
+
+	@TileEvent( TileEventType.WORLD_NBT_WRITE )
+	public void writeToNBT_TileIOPort( NBTTagCompound data )
+	{
+		this.manager.writeToNBT( data );
 		this.cells.writeToNBT( data, "cells" );
 		this.upgrades.writeToNBT( data, "upgrades" );
 		data.setInteger( "lastRedstoneState", this.lastRedstoneState.ordinal() );
 	}
 
-	@TileEvent(TileEventType.WORLD_NBT_READ)
+	@TileEvent( TileEventType.WORLD_NBT_READ )
-	public void readFromNBT_TileIOPort(NBTTagCompound data)
+	public void readFromNBT_TileIOPort( NBTTagCompound data )
 	{
-		this.cm.readFromNBT( data );
+		this.manager.readFromNBT( data );
 		this.cells.readFromNBT( data, "cells" );
 		this.upgrades.readFromNBT( data, "upgrades" );
 		if ( data.hasKey( "lastRedstoneState" ) )
 			this.lastRedstoneState = YesNo.values()[data.getInteger( "lastRedstoneState" )];
 	}
 
-	public TileIOPort() {
-		this.gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL );
-		this.cm.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE );
-		this.cm.registerSetting( Settings.FULLNESS_MODE, FullnessMode.EMPTY );
-		this.cm.registerSetting( Settings.OPERATION_MODE, OperationMode.EMPTY );
-	}
-
 	@Override
-	public AECableType getCableConnectionType(ForgeDirection dir)
+	public AECableType getCableConnectionType( ForgeDirection dir )
 	{
 		return AECableType.SMART;
 	}
@@ -122,21 +139,6 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		return new DimensionalCoord( this );
 	}
 
-	@Override
-	public IInventory getInternalInventory()
-	{
-		return this.cells;
-	}
-
-	@Override
-	public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added)
-	{
-		if ( this.cells == inv )
-		{
-			this.updateTask();
-		}
-	}
-
 	private void updateTask()
 	{
 		try
@@ -146,7 +148,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 			else
 				this.gridProxy.getTick().sleepDevice( this.gridProxy.getNode() );
 		}
-		catch (GridAccessException e)
+		catch ( GridAccessException e )
 		{
 			// :P
 		}
@@ -175,29 +177,20 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		if ( this.getInstalledUpgrades( Upgrades.REDSTONE ) == 0 )
 			return true;
 
-		RedstoneMode rs = (RedstoneMode) this.cm.getSetting( Settings.REDSTONE_CONTROLLED );
+		RedstoneMode rs = (RedstoneMode) this.manager.getSetting( Settings.REDSTONE_CONTROLLED );
 		if ( rs == RedstoneMode.HIGH_SIGNAL )
 			return this.getRedstoneState();
 		return !this.getRedstoneState();
 	}
 
-	@Override
-	public int[] getAccessibleSlotsBySide(ForgeDirection d)
-	{
-		if ( d == ForgeDirection.UP || d == ForgeDirection.DOWN )
-			return this.input;
-
-		return this.output;
-	}
-
 	@Override
 	public IConfigManager getConfigManager()
 	{
-		return this.cm;
+		return this.manager;
 	}
 
 	@Override
-	public IInventory getInventoryByName(String name)
+	public IInventory getInventoryByName( String name )
 	{
 		if ( name.equals( "upgrades" ) )
 			return this.upgrades;
@@ -209,13 +202,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 	}
 
 	@Override
-	public int getInstalledUpgrades(Upgrades u)
+	public void updateSetting( IConfigManager manager, Enum settingName, Enum newValue )
-	{
-		return this.upgrades.getInstalledUpgrades( u );
-	}
-
-	@Override
-	public void updateSetting(IConfigManager manager, Enum settingName, Enum newValue)
 	{
 		this.updateTask();
 	}
@@ -224,7 +211,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 	{
 		if ( this.isEnabled() )
 		{
-			for (int x = 0; x < 6; x++)
+			for ( int x = 0; x < 6; x++ )
 				if ( this.cells.getStackInSlot( x ) != null )
 					return true;
 		}
@@ -233,30 +220,82 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 	}
 
 	@Override
-	public TickingRequest getTickingRequest(IGridNode node)
+	public boolean canInsertItem( int slotIndex, ItemStack insertingItem, int side )
+	{
+		for ( int inputSlotIndex : this.input )
+		{
+			if ( inputSlotIndex == slotIndex )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public boolean canExtractItem( int slotIndex, ItemStack extractedItem, int side )
+	{
+		for ( int outputSlotIndex : this.output )
+		{
+			if ( outputSlotIndex == slotIndex )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public IInventory getInternalInventory()
+	{
+		return this.cells;
+	}
+
+	@Override
+	public void onChangeInventory( IInventory inv, int slot, InvOperation mc, ItemStack removed, ItemStack added )
+	{
+		if ( this.cells == inv )
+		{
+			this.updateTask();
+		}
+	}
+
+	@Override
+	public int[] getAccessibleSlotsBySide( ForgeDirection d )
+	{
+		if ( d == ForgeDirection.UP || d == ForgeDirection.DOWN )
+			return this.input;
+
+		return this.output;
+	}
+
+	@Override
+	public TickingRequest getTickingRequest( IGridNode node )
 	{
 		return new TickingRequest( TickRates.IOPort.min, TickRates.IOPort.max, this.hasWork(), false );
 	}
 
 	@Override
-	public TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall)
+	public TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall )
 	{
 		if ( !this.gridProxy.isActive() )
 			return TickRateModulation.IDLE;
 
 		long ItemsToMove = 256;
 
-		switch (this.getInstalledUpgrades( Upgrades.SPEED ))
+		switch ( this.getInstalledUpgrades( Upgrades.SPEED ) )
 		{
-		case 1:
+			case 1:
-			ItemsToMove *= 2;
+				ItemsToMove *= 2;
-			break;
+				break;
-		case 2:
+			case 2:
-			ItemsToMove *= 4;
+				ItemsToMove *= 4;
-			break;
+				break;
-		case 3:
+			case 3:
-			ItemsToMove *= 8;
+				ItemsToMove *= 8;
-			break;
+				break;
 		}
 
 		try
@@ -264,7 +303,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 			IMEInventory<IAEItemStack> itemNet = this.gridProxy.getStorage().getItemInventory();
 			IMEInventory<IAEFluidStack> fluidNet = this.gridProxy.getStorage().getFluidInventory();
 			IEnergySource energy = this.gridProxy.getEnergy();
-			for (int x = 0; x < 6; x++)
+			for ( int x = 0; x < 6; x++ )
 			{
 				ItemStack is = this.cells.getStackInSlot( x );
 				if ( is != null )
@@ -274,7 +313,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 						IMEInventory<IAEItemStack> itemInv = this.getInv( is, StorageChannel.ITEMS );
 						IMEInventory<IAEFluidStack> fluidInv = this.getInv( is, StorageChannel.FLUIDS );
 
-						if ( this.cm.getSetting( Settings.OPERATION_MODE ) == OperationMode.EMPTY )
+						if ( this.manager.getSetting( Settings.OPERATION_MODE ) == OperationMode.EMPTY )
 						{
 							if ( itemInv != null )
 								ItemsToMove = this.transferContents( energy, itemInv, itemNet, ItemsToMove, StorageChannel.ITEMS );
@@ -298,9 +337,8 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 						return TickRateModulation.URGENT;
 				}
 			}
-
 		}
-		catch (GridAccessException e)
+		catch ( GridAccessException e )
 		{
 			return TickRateModulation.IDLE;
 		}
@@ -309,49 +347,13 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		return TickRateModulation.SLEEP;
 	}
 
-	private boolean shouldMove(IMEInventory<IAEItemStack> itemInv, IMEInventory<IAEFluidStack> fluidInv)
+	@Override
+	public int getInstalledUpgrades( Upgrades u )
 	{
-		FullnessMode fm = (FullnessMode) this.cm.getSetting( Settings.FULLNESS_MODE );
+		return this.upgrades.getInstalledUpgrades( u );
-
-		if ( itemInv != null && fluidInv != null )
-			return this.matches( fm, itemInv ) && this.matches( fm, fluidInv );
-		else if ( itemInv != null )
-			return this.matches( fm, itemInv );
-		else if ( fluidInv != null )
-			return this.matches( fm, fluidInv );
-
-		return true;
 	}
 
-	private boolean matches(FullnessMode fm, IMEInventory src)
+	private IMEInventory getInv( ItemStack is, StorageChannel chan )
-	{
-		if ( fm == FullnessMode.HALF )
-			return true;
-
-		IItemList<? extends IAEStack> myList;
-
-		if ( src instanceof IMEMonitor )
-			myList = ((IMEMonitor) src).getStorageList();
-		else
-			myList = src.getAvailableItems( src.getChannel().createList() );
-
-		if ( fm == FullnessMode.EMPTY )
-			return myList.isEmpty();
-
-		IAEStack test = myList.getFirstItem();
-		if ( test != null )
-		{
-			test.setStackSize( 1 );
-			return src.injectItems( test, Actionable.SIMULATE, this.mySrc ) != null;
-		}
-		return false;
-	}
-
-	ItemStack currentCell;
-	IMEInventory<IAEFluidStack> cachedFluid;
-	IMEInventory<IAEItemStack> cachedItem;
-
-	private IMEInventory getInv(ItemStack is, StorageChannel chan)
 	{
 		if ( this.currentCell != is )
 		{
@@ -366,11 +368,11 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		return this.cachedFluid;
 	}
 
-	private long transferContents(IEnergySource energy, IMEInventory src, IMEInventory destination, long itemsToMove, StorageChannel chan)
+	private long transferContents( IEnergySource energy, IMEInventory src, IMEInventory destination, long itemsToMove, StorageChannel chan )
 	{
 		IItemList<? extends IAEStack> myList;
 		if ( src instanceof IMEMonitor )
-			myList = ((IMEMonitor) src).getStorageList();
+			myList = ( (IMEMonitor) src ).getStorageList();
 		else
 			myList = src.getAvailableItems( src.getChannel().createList() );
 
@@ -380,7 +382,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		{
 			didStuff = false;
 
-			for (IAEStack s : myList)
+			for ( IAEStack s : myList )
 			{
 				long totalStackSize = s.getStackSize();
 				if ( totalStackSize > 0 )
@@ -422,14 +424,28 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 				}
 			}
 		}
-		while (itemsToMove > 0 && didStuff);
+		while ( itemsToMove > 0 && didStuff );
 
 		return itemsToMove;
 	}
 
-	private boolean moveSlot(int x)
+	private boolean shouldMove( IMEInventory<IAEItemStack> itemInv, IMEInventory<IAEFluidStack> fluidInv )
 	{
-		WrapperInventoryRange wir = new WrapperInventoryRange( this, this.outputSlots, true );
+		FullnessMode fm = (FullnessMode) this.manager.getSetting( Settings.FULLNESS_MODE );
+
+		if ( itemInv != null && fluidInv != null )
+			return this.matches( fm, itemInv ) && this.matches( fm, fluidInv );
+		else if ( itemInv != null )
+			return this.matches( fm, itemInv );
+		else if ( fluidInv != null )
+			return this.matches( fm, fluidInv );
+
+		return true;
+	}
+
+	private boolean moveSlot( int x )
+	{
+		WrapperInventoryRange wir = new WrapperInventoryRange( this, this.output, true );
 		ItemStack result = InventoryAdaptor.getAdaptor( wir, ForgeDirection.UNKNOWN ).addItems( this.getStackInSlot( x ) );
 
 		if ( result == null )
@@ -441,13 +457,37 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 		return false;
 	}
 
+	private boolean matches( FullnessMode fm, IMEInventory src )
+	{
+		if ( fm == FullnessMode.HALF )
+			return true;
+
+		IItemList<? extends IAEStack> myList;
+
+		if ( src instanceof IMEMonitor )
+			myList = ( (IMEMonitor) src ).getStorageList();
+		else
+			myList = src.getAvailableItems( src.getChannel().createList() );
+
+		if ( fm == FullnessMode.EMPTY )
+			return myList.isEmpty();
+
+		IAEStack test = myList.getFirstItem();
+		if ( test != null )
+		{
+			test.setStackSize( 1 );
+			return src.injectItems( test, Actionable.SIMULATE, this.mySrc ) != null;
+		}
+		return false;
+	}
+
 	/**
 	 * Adds the items in the upgrade slots to the drop list.
 	 *
-	 * @param w world
+	 * @param w     world
-	 * @param x x pos of tile entity
+	 * @param x     x pos of tile entity
-	 * @param y y pos of tile entity
+	 * @param y     y pos of tile entity
-	 * @param z z pos of tile entity
+	 * @param z     z pos of tile entity
 	 * @param drops drops of tile entity
 	 */
 	@Override
@@ -455,9 +495,9 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
 	{
 		super.getDrops( w, x, y, z, drops );
 
-		for (int upgradeIndex = 0; upgradeIndex < this.upgrades.getSizeInventory(); upgradeIndex++)
+		for ( int upgradeIndex = 0; upgradeIndex < this.upgrades.getSizeInventory(); upgradeIndex++ )
 		{
-			ItemStack stackInSlot = this.upgrades.getStackInSlot(upgradeIndex);
+			ItemStack stackInSlot = this.upgrades.getStackInSlot( upgradeIndex );
 
 			if ( stackInSlot != null )
 			{

src/main/java/appeng/transformer/annotations/Integration.java

@@ -18,36 +18,35 @@
 
 package appeng.transformer.annotations;
 
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-public @interface integration {
-
-	@Retention(RetentionPolicy.RUNTIME)
-	@Target(ElementType.TYPE)
-	public @interface InterfaceList {
-
-		public Interface[] value();
 
+public @interface Integration
+{
+	@Retention( RetentionPolicy.RUNTIME )
+	@Target( ElementType.TYPE )
+	@interface InterfaceList
+	{
+		Interface[] value();
 	}
 
-	@Retention(RetentionPolicy.RUNTIME)
+	@Retention( RetentionPolicy.RUNTIME )
-	@Target(ElementType.TYPE)
+	@Target( ElementType.TYPE )
-	public @interface Interface {
+	@interface Interface
-
+	{
-		public String iface();
+		String iface();
-
-		public String iname();
 
+		String iname();
 	}
 
-	@Retention(RetentionPolicy.RUNTIME)
+	@Retention( RetentionPolicy.RUNTIME )
-	@Target(ElementType.METHOD)
+	@Target( ElementType.METHOD )
-	public @interface Method {
+	@interface Method
-
+	{
-		public String iname();
+		String iname();
-
 	}
 }

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

@@ -36,7 +36,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog;
 
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
-import appeng.transformer.annotations.integration;
+import appeng.transformer.annotations.Integration;
 
 
 public class ASMIntegration implements IClassTransformer
@@ -105,16 +105,16 @@ public class ASMIntegration implements IClassTransformer
 		{
 			for ( AnnotationNode an : classNode.visibleAnnotations )
 			{
-				if ( this.hasAnnotation( an, integration.Interface.class ) )
+				if ( this.hasAnnotation( an, Integration.Interface.class ) )
 				{
-					if ( this.stripInterface( classNode, integration.Interface.class, an ) )
+					if ( this.stripInterface( classNode, Integration.Interface.class, an ) )
 						changed = true;
 				}
-				else if ( this.hasAnnotation( an, integration.InterfaceList.class ) )
+				else if ( this.hasAnnotation( an, Integration.InterfaceList.class ) )
 				{
 					for ( Object o : ( ( List ) an.values.get( 1 ) ) )
 					{
-						if ( this.stripInterface( classNode, integration.InterfaceList.class, ( AnnotationNode ) o ) )
+						if ( this.stripInterface( classNode, Integration.InterfaceList.class, ( AnnotationNode ) o ) )
 							changed = true;
 					}
 				}
@@ -130,9 +130,9 @@ public class ASMIntegration implements IClassTransformer
 			{
 				for ( AnnotationNode an : mn.visibleAnnotations )
 				{
-					if ( this.hasAnnotation( an, integration.Method.class ) )
+					if ( this.hasAnnotation( an, Integration.Method.class ) )
 					{
-						if ( this.stripMethod( classNode, mn, i, integration.Method.class, an ) )
+						if ( this.stripMethod( classNode, mn, i, Integration.Method.class, an ) )
 							changed = true;
 					}
 				}

src/main/resources/assets/appliedenergistics2/lang/en_US.lang

@@ -467,6 +467,7 @@ commands.ae2.ChunkLoggerOn=Chunk Logging is now on
 commands.ae2.ChunkLoggerOff=Chunk Logging is now off
 commands.ae2.Supporters=Displays a list of AE2 Supporters
 
+// Achievements
 achievement.ae2.Compass=Meteorite Hunter
 achievement.ae2.Compass.desc=Craft a Meteorite Compass
 achievement.ae2.Presses=Unknown Technology
@@ -494,13 +495,13 @@ achievement.ae2.CrystalGrowthAccelerator.desc=Craft a Crystal Growth Accelerator
 achievement.ae2.GlassCable=Fluix Energy Connection
 achievement.ae2.GlassCable.desc=Craft ME Glass Cable
 achievement.ae2.Networking1=Network Apprentice
-achievement.ae2.Networking1.desc=Reach 8 channel using devices on a network.
+achievement.ae2.Networking1.desc=Reach 8 channels using devices on a network.
 achievement.ae2.Controller=Networking Switchboard
 achievement.ae2.Controller.desc=Craft a Controller
 achievement.ae2.Networking2=Network Engineer
-achievement.ae2.Networking2.desc=Reach 128 channel using devices on a network.
+achievement.ae2.Networking2.desc=Reach 128 channels using devices on a network.
 achievement.ae2.Networking3=Network Administrator
-achievement.ae2.Networking3.desc=Reach 2048 channel using devices on a network.
+achievement.ae2.Networking3.desc=Reach 2048 channels using devices on a network.
 achievement.ae2.P2P=Point to Point Networking
 achievement.ae2.P2P.desc=Craft a P2P Tunnel
 achievement.ae2.Recursive=Recursive Networking

src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang

@@ -467,6 +467,7 @@ commands.ae2.ChunkLoggerOn=区块日志已打开
 commands.ae2.ChunkLoggerOff=区块日志已关闭
 commands.ae2.Supporters=显示ae2支持者列表
 
+// 成就
 achievement.ae2.Compass=陨石猎手
 achievement.ae2.Compass.desc=制作一个陨石罗盘
 achievement.ae2.Presses=未知科技