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

it launches

Browse Source
This commit is contained in:
Anuken
2020-02-05 22:08:57 -05:00
parent 65857d77c4
commit 8172e69f8c
13 changed files with 127 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ public class EntityProcess extends BaseProcessor{
ObjectMap<String, Stype> componentNames = new ObjectMap<>();
ObjectMap<Stype, Array<Stype>> componentDependencies = new ObjectMap<>();
ObjectMap<Stype, Array<Stype>> defComponents = new ObjectMap<>();
ObjectMap<Svar, String> varInitializers = new ObjectMap<>();
ObjectSet<String> imports = new ObjectSet<>();
{
@@ -161,7 +162,9 @@ public class EntityProcess extends BaseProcessor{
}
//add initializer if it exists
if(tree.getInitializer() != null){
fbuilder.initializer(tree.getInitializer().toString());
String init = tree.getInitializer().toString();
varInitializers.put(f, init);
fbuilder.initializer(init);
}
if(!isFinal) fbuilder.addModifiers(Modifier.PROTECTED);
@@ -377,19 +380,24 @@ public class EntityProcess extends BaseProcessor{
write(def.builder, imports.asArray());
}
//store nulls
TypeSpec.Builder nullsBuilder = TypeSpec.classBuilder("Nulls").addModifiers(Modifier.PUBLIC).addModifiers(Modifier.FINAL);
//create mock types of all components
for(Stype interf : interfaces){
Array<Stype> dependencies = interf.allInterfaces();
dependencies.add(interf);
Log.info(interf + ": sub " + interf.allSuperclasses() + " " + interf.allInterfaces());
//indirect interfaces to implement methods for
Array<Stype> dependencies = interf.allInterfaces().and(interf);
Array<Smethod> methods = dependencies.flatMap(Stype::methods);
methods.sort(Structs.comparing(Object::toString));
methods.sortComparing(Object::toString);
//used method signatures
ObjectSet<String> signatures = new ObjectSet<>();
TypeSpec.Builder nullBuilder = TypeSpec.classBuilder("Null" + interf.name().substring(0, interf.name().length() - 1))
.addModifiers(Modifier.PUBLIC, Modifier.FINAL);
//create null builder
String baseName = interf.name().substring(0, interf.name().length() - 1);
String className = "Null" + baseName;
TypeSpec.Builder nullBuilder = TypeSpec.classBuilder(className)
.addModifiers(Modifier.FINAL);
nullBuilder.addSuperinterface(interf.tname());
@@ -397,11 +405,21 @@ public class EntityProcess extends BaseProcessor{
String signature = method.toString();
if(signatures.contains(signature)) continue;
Stype type = method.type();
Stype compType = interfaceToComp(method.type());
MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
if(!method.isVoid()){
builder.addStatement("return " + getDefault(method.ret().toString()));
if(method.name().equals("isNull")){
builder.addStatement("return true");
}else{
Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(method.name()));
if(variable == null || !varInitializers.containsKey(variable)){
builder.addStatement("return " + getDefault(method.ret().toString()));
}else{
String init = varInitializers.get(variable);
builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init);
}
}
}
nullBuilder.addMethod(builder.build());
@@ -409,10 +427,12 @@ public class EntityProcess extends BaseProcessor{
signatures.add(signature);
}
//write(nullBuilder);
nullsBuilder.addField(FieldSpec.builder(interf.cname(), Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());
Log.info("Methods to override for {0}:\n{1}\n\n", interf, methods.toString("\n", s -> "&lg> &lb" + s));
write(nullBuilder);
}
write(nullsBuilder);
}
}

5
annotations/src/main/java/mindustry/annotations/util/Stype.java
View File

@@ -25,7 +25,7 @@ public class Stype extends Selement<TypeElement>{
}
public Array<Stype> allInterfaces(){
return interfaces().flatMap(Stype::allInterfaces).distinct();
return interfaces().flatMap(s -> s.allInterfaces().and(s)).distinct();
}
public Array<Stype> superclasses(){
@@ -33,8 +33,7 @@ public class Stype extends Selement<TypeElement>{
}
public Array<Stype> allSuperclasses(){
//this is truly PEAK efficiency
return superclasses().flatMap(Stype::allSuperclasses).distinct();
return superclasses().flatMap(s -> s.allSuperclasses().and(s)).distinct();
}
public Stype superclass(){