Better conveyor physics / Performance test maps / Unit inventory begin

core/src/io/anuke/mindustry/resource/AmmoEntry.java

@@ -0,0 +1,11 @@
+package io.anuke.mindustry.resource;
+
+public class AmmoEntry{
+    public AmmoType type;
+    public int amount;
+
+    public AmmoEntry(AmmoType type, int amount) {
+        this.type = type;
+        this.amount = amount;
+    }
+}

core/src/io/anuke/mindustry/resource/AmmoType.java

@@ -53,7 +53,7 @@ public class AmmoType {
         return allTypes;
     }
 
-    public static AmmoType getByID(byte id){
+    public static AmmoType getByID(int id){
         return allTypes.get(id);
     }
 }

core/src/io/anuke/mindustry/resource/ItemStack.java

@@ -3,7 +3,6 @@ package io.anuke.mindustry.resource;
 public class ItemStack{
 	public Item item;
 	public int amount;
-	public float pos;
 	
 	public ItemStack(Item item, int amount){
 		this.item = item;

core/src/io/anuke/mindustry/resource/LiquidStack.java

@@ -0,0 +1,15 @@
+package io.anuke.mindustry.resource;
+
+public class LiquidStack {
+    public Liquid liquid;
+    public float amount;
+
+    public LiquidStack(Liquid liquid, float amount){
+        this.liquid = liquid;
+        this.amount = amount;
+    }
+
+    public boolean equals(LiquidStack other){
+        return other != null && other.liquid == liquid && other.amount == amount;
+    }
+}