Work on fixing entity ID mapping

core/src/io/anuke/mindustry/entities/effect/Fire.java

@@ -5,13 +5,15 @@ import io.anuke.arc.collection.IntMap;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
-import io.anuke.arc.util.*;
+import io.anuke.arc.util.Structs;
+import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.impl.TimedEntity;
 import io.anuke.mindustry.entities.traits.SaveTrait;
 import io.anuke.mindustry.entities.traits.SyncTrait;
 import io.anuke.mindustry.entities.type.TileEntity;
+import io.anuke.mindustry.game.TypeID;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.*;
@@ -75,6 +77,11 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait{
         }
     }
 
+    @Override
+    public TypeID getTypeID(){
+        return TypeIDs.fire;
+    }
+
     @Override
     public byte version(){
         return 0;

core/src/io/anuke/mindustry/entities/effect/Puddle.java

@@ -16,6 +16,7 @@ import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.impl.SolidEntity;
 import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.game.TypeID;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Liquid;
@@ -143,6 +144,11 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai
         return liquid.flammability * amount;
     }
 
+    @Override
+    public TypeID getTypeID(){
+        return TypeIDs.puddle;
+    }
+
     @Override
     public byte version(){
         return 0;

core/src/io/anuke/mindustry/entities/traits/TypeTrait.java

@@ -1,6 +1,10 @@
 package io.anuke.mindustry.entities.traits;
 
+import io.anuke.mindustry.game.TypeID;
+
 public interface TypeTrait{
+
+    TypeID getTypeID();
     /*
     int[] lastRegisteredID = {0};
     Array<Supplier<? extends TypeTrait>> registeredTypes = new Array<>();

core/src/io/anuke/mindustry/entities/type/BaseUnit.java

@@ -19,6 +19,7 @@ import io.anuke.mindustry.entities.traits.ShooterTrait;
 import io.anuke.mindustry.entities.traits.TargetTrait;
 import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.game.TypeID;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.*;
@@ -80,6 +81,11 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         return type.drag;
     }
 
+    @Override
+    public TypeID getTypeID(){
+        return type.typeID;
+    }
+
     public Tile getSpawner(){
         return world.tile(spawner);
     }

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -12,11 +12,11 @@ import io.anuke.arc.math.geom.*;
 import io.anuke.arc.util.*;
 import io.anuke.arc.util.pooling.Pools;
 import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.content.Mechs;
+import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.game.TypeID;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.input.Binding;
@@ -115,6 +115,11 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
         heal();
     }
 
+    @Override
+    public TypeID getTypeID(){
+        return TypeIDs.player;
+    }
+
     @Override
     public void move(float x, float y){
         if(!mech.flying){