Rework AEItemStack (#3091)

* Use itemstack as itemdef
* HIGH_TAG/LOW_TAG should be compared both directions
* Remove getTagCompound
* Make Itemlist implementation independent
* Cache item id for performance reasons
* Add preconditions to saveguard against external meddling
* Chache itemDamage
* Remove IAEStackSearchKey for now, rename getDisplayStack

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

@@ -27,7 +27,6 @@ import net.minecraft.item.ItemStack;
 import appeng.api.features.IMatterCannonAmmoRegistry;
 import appeng.recipes.ores.IOreListener;
 import appeng.recipes.ores.OreDictionaryHandler;
-import appeng.util.Platform;
 
 
 public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmoRegistry
@@ -52,7 +51,7 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo
 	{
 		for( final ItemStack o : this.DamageModifiers.keySet() )
 		{
-			if( Platform.itemComparisons().isEqualItem( o, is ) )
+			if( ItemStack.areItemsEqual( o, is ) )
 			{
 				return this.DamageModifiers.get( o ).floatValue();
 			}

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

@@ -41,7 +41,6 @@ import appeng.api.definitions.IParts;
 import appeng.api.features.IP2PTunnelRegistry;
 import appeng.api.util.AEColor;
 import appeng.capabilities.Capabilities;
-import appeng.util.Platform;
 
 
 public final class P2PTunnelRegistry implements IP2PTunnelRegistry
@@ -216,7 +215,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
 					return this.tunnels.get( is );
 				}
 
-				if( Platform.itemComparisons().isEqualItem( is, trigger ) )
+				if( ItemStack.areItemsEqual( is, trigger ) )
 				{
 					return this.tunnels.get( is );
 				}

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

@@ -141,10 +141,7 @@ public class PacketInventoryAction extends AppEngPacket
 
 						if( baseContainer.getTargetStack() != null )
 						{
-							// Force to stack size 1 to fix a client-side display problem...
-							ItemStack displayIs = baseContainer.getTargetStack().getItemStack();
-							displayIs.setCount( 1 );
-							cca.getCraftingItem().putStack( displayIs );
+							cca.getCraftingItem().putStack( baseContainer.getTargetStack().asItemStackRepresentation() );
 							// This is the *actual* item that matters, not the display item above
 							cca.setItemToCraft( baseContainer.getTargetStack() );
 						}
@@ -171,7 +168,7 @@ public class PacketInventoryAction extends AppEngPacket
 			}
 			else
 			{
-				AppEng.proxy.getPlayers().get( 0 ).inventory.setItemStack( this.slotItem.getItemStack() );
+				AppEng.proxy.getPlayers().get( 0 ).inventory.setItemStack( this.slotItem.createItemStack() );
 			}
 		}
 	}

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

@@ -155,7 +155,7 @@ public class PacketJEIRecipe extends AppEngPacket
 						final IAEItemStack out = cct.useRealItems() ? Platform.poweredInsert( energy, storage, in, cct.getActionSource() ) : null;
 						if( out != null )
 						{
-							currentItem = out.getItemStack();
+							currentItem = out.createItemStack();
 						}
 						else
 						{
@@ -188,7 +188,7 @@ public class PacketJEIRecipe extends AppEngPacket
 
 								if( out != null )
 								{
-									currentItem = out.getItemStack();
+									currentItem = out.createItemStack();
 								}
 							}