1.8.8 + deleted all integration can be recovered later or something.

src/main/java/appeng/util/inv/AdaptorPlayerInventory.java

@@ -64,9 +64,9 @@ public class AdaptorPlayerInventory implements IInventory
 	}
 
 	@Override
-	public ItemStack getStackInSlotOnClosing( final int var1 )
+	public ItemStack removeStackFromSlot( final int var1 )
 	{
-		return this.src.getStackInSlotOnClosing( this.min + var1 );
+		return this.src.removeStackFromSlot( this.min + var1 );
 	}
 
 	@Override
@@ -127,9 +127,9 @@ public class AdaptorPlayerInventory implements IInventory
 	}
 
 	@Override
-	public String getCommandSenderName()
+	public String getName()
 	{
-		return this.src.getCommandSenderName();
+		return this.src.getName();
 	}
 
 	@Override

src/main/java/appeng/util/inv/WrapperBCPipe.java

@@ -63,7 +63,7 @@ public class WrapperBCPipe implements IInventory
 	}
 
 	@Override
-	public ItemStack getStackInSlotOnClosing( final int i )
+	public ItemStack removeStackFromSlot( final int i )
 	{
 		return null;
 	}
@@ -138,7 +138,7 @@ public class WrapperBCPipe implements IInventory
 	}
 
 	@Override
-	public String getCommandSenderName()
+	public String getName()
 	{
 		return null;
 	}

src/main/java/appeng/util/inv/WrapperChainedInventory.java

@@ -147,12 +147,12 @@ public class WrapperChainedInventory implements IInventory
 	}
 
 	@Override
-	public ItemStack getStackInSlotOnClosing( final int idx )
+	public ItemStack removeStackFromSlot( final int idx )
 	{
 		final InvOffset io = this.offsets.get( idx );
 		if( io != null )
 		{
-			return io.i.getStackInSlotOnClosing( idx - io.offset );
+			return io.i.removeStackFromSlot( idx - io.offset );
 		}
 		return null;
 	}
@@ -168,7 +168,7 @@ public class WrapperChainedInventory implements IInventory
 	}
 
 	@Override
-	public String getCommandSenderName()
+	public String getName()
 	{
 		return "ChainedInv";
 	}

src/main/java/appeng/util/inv/WrapperInvSlot.java

@@ -76,9 +76,9 @@ public class WrapperInvSlot
 		}
 
 		@Override
-		public ItemStack getStackInSlotOnClosing( final int i )
+		public ItemStack removeStackFromSlot( final int i )
 		{
-			return this.inv.getStackInSlotOnClosing( this.slot );
+			return this.inv.removeStackFromSlot( this.slot );
 		}
 
 		@Override
@@ -106,9 +106,9 @@ public class WrapperInvSlot
 		}
 
 		@Override
-		public String getCommandSenderName()
+		public String getName()
 		{
-			return this.inv.getCommandSenderName();
+			return this.inv.getName();
 		}
 
 		@Override

src/main/java/appeng/util/inv/WrapperInventoryRange.java

@@ -93,9 +93,9 @@ public class WrapperInventoryRange implements IInventory
 	}
 
 	@Override
-	public ItemStack getStackInSlotOnClosing( final int var1 )
+	public ItemStack removeStackFromSlot( final int var1 )
 	{
-		return this.src.getStackInSlotOnClosing( this.getSlots()[var1] );
+		return this.src.removeStackFromSlot( this.getSlots()[var1] );
 	}
 
 	@Override
@@ -123,9 +123,9 @@ public class WrapperInventoryRange implements IInventory
 	}
 
 	@Override
-	public String getCommandSenderName()
+	public String getName()
 	{
-		return this.src.getCommandSenderName();
+		return this.src.getName();
 	}
 
 	@Override

src/main/java/appeng/util/item/AEFluidStack.java

@@ -303,7 +303,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 		{
 			final FluidStack is = (FluidStack) ia;
 
-			if( is.getFluidID() == this.fluid.getID() )
+			if( is.getFluid() == this.fluid )
 			{
 				final NBTTagCompound ta = (NBTTagCompound) this.tagCompound;
 				final NBTTagCompound tb = is.tag;