Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fires, puddles, feature reimplementations

Browse Source
This commit is contained in:
Anuken
2020-02-09 23:43:08 -05:00
parent 3feca9bbf8
commit e9b066b866
23 changed files with 375 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
annotations/src/main/java/mindustry/annotations/impl/EntityProcess.java
View File

@@ -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