Content mapping, part 1

core/src/io/anuke/mindustry/entities/bullet/BulletType.java

@@ -4,6 +4,7 @@ import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.game.Content;
+import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.StatusEffect;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Effects;
@@ -69,8 +70,8 @@ public abstract class BulletType extends BaseBulletType<Bullet> implements Conte
     }
 
     @Override
-    public String getContentTypeName(){
-        return "bullettype";
+    public ContentType getContentType(){
+        return ContentType.bullet;
     }
 
     @Override

core/src/io/anuke/mindustry/entities/units/UnitType.java

@@ -10,6 +10,7 @@ import io.anuke.mindustry.entities.traits.TypeTrait;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.game.UnlockableContent;
+import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.ui.ContentDisplay;
@@ -77,6 +78,11 @@ public class UnitType implements UnlockableContent{
         return types;
     }
 
+    @Override
+    public int getID() {
+        return id;
+    }
+
     @Override
     public void displayInfo(Table table){
         ContentDisplay.displayUnit(table, this);
@@ -104,8 +110,8 @@ public class UnitType implements UnlockableContent{
     }
 
     @Override
-    public String getContentTypeName(){
-        return "unit-type";
+    public ContentType getContentType(){
+        return ContentType.unit;
     }
 
     @Override