Fires, puddles, feature reimplementations

annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java

@@ -192,11 +192,13 @@ public class EntityProcess extends BaseProcessor{
             for(Selement<?> type : allDefs){
                 EntityDef ann = type.annotation(EntityDef.class);
                 boolean isFinal = ann.isFinal();
-                if(type.isType() && !type.name().endsWith("Def")){
-                    err("All entity def names must end with 'Def'", type.e);
+
+                if(type.isType() && (!type.name().endsWith("Def") && !type.name().endsWith("Comp"))){
+                    err("All entity def names must end with 'Def'/'Comp'", type.e);
                 }
+
                 String name = type.isType() ?
-                    type.name().replace("Def", "Entity") :
+                    type.name().replace("Def", "Entity").replace("Comp", "Entity") :
                     createName(type);
 
                 //skip double classes

annotations/src/main/resources/classids.properties

@@ -1,5 +1,7 @@
 #Maps entity names to IDs. Autogenerated.
 
+mindustry.entities.def.PuddleComp=12
+mindustry.entities.def.BulletComp=13
 dagger=7
 mindustry.entities.AllEntities.GenericBuilderDef=6
 mindustry.entities.AllEntities.BulletDef=0
@@ -10,5 +12,11 @@ mindustry.entities.AllEntities.EffectDef=2
 mindustry.entities.AllEntities.GenericUnitDef=5
 mindustry.entities.AllEntities.TileDef=3
 vanguard=10
+mindustry.entities.def.PlayerComp=17
 dagger2=8
-mindustry.entities.AllEntities.DecalDef=1
+mindustry.entities.def.DecalComp=14
+mindustry.entities.AllEntities.DecalDef=1
+mindustry.entities.def.StandardEffectComp=18
+mindustry.entities.def.TileComp=19
+mindustry.entities.def.FireComp=15
+mindustry.entities.def.GroundEffectComp=16