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

UnitType cleanup

Browse Source
This commit is contained in:
Anuken
2020-02-04 11:40:56 -05:00
parent 006004fd70
commit 1d0cfd4435
14 changed files with 76 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,8 +248,8 @@ public class EntityProcess extends BaseProcessor{
if(method.name().length() <= 3) continue;
String var = Strings.camelize(method.name().substring(method.name().startsWith("is") ? 2 : 3));
//make sure it's a real variable
if(!Array.with(def.builder.fieldSpecs).contains(f -> f.name.equals(var))) continue;
//make sure it's a real variable AND that the component doesn't already implement it with custom logic
if(!Array.with(def.builder.fieldSpecs).contains(f -> f.name.equals(var)) || comp.methods().contains(m -> m.name().equals(method.name()))) continue;
if(method.name().startsWith("get") || method.name().startsWith("is")){
def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("return " + var).build());