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

the errors are back

Browse Source
This commit is contained in:
Anuken
2020-02-05 15:00:35 -05:00
parent eb0ea9030b
commit 84748afc55
48 changed files with 169 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
annotations/src/main/java/mindustry/annotations/Annotations.java
View File

@@ -50,6 +50,7 @@ public class Annotations{
@Retention(RetentionPolicy.SOURCE)
public @interface EntityDef{
Class[] value();
boolean isFinal() default true;
}
/** Indicates an internal interface for entity components. */

9
annotations/src/main/java/mindustry/annotations/BaseProcessor.java
View File

@@ -1,7 +1,7 @@
package mindustry.annotations;
import arc.files.*;
import arc.struct.*;
import arc.struct.Array;
import arc.util.*;
import com.squareup.javapoet.*;
import com.sun.source.util.*;
@@ -16,6 +16,7 @@ import javax.tools.Diagnostic.*;
import javax.tools.*;
import java.io.*;
import java.lang.annotation.*;
import java.lang.reflect.*;
import java.util.*;
@SupportedSourceVersion(SourceVersion.RELEASE_8)
@@ -47,6 +48,12 @@ public abstract class BaseProcessor extends AbstractProcessor{
return str.contains(".") ? str.substring(str.lastIndexOf('.') + 1) : str;
}
public static TypeName tname(String name) throws Exception{
Constructor<TypeName> cons = TypeName.class.getDeclaredConstructor(String.class);
cons.setAccessible(true);
return cons.newInstance(name);
}
public static TypeVariableName getTVN(TypeParameterElement element) {
String name = element.getSimpleName().toString();
List<? extends TypeMirror> boundsMirrors = element.getBounds();

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

@@ -134,11 +134,13 @@ public class EntityProcess extends BaseProcessor{
//look at each definition
for(Stype type : allDefs){
boolean isFinal = type.annotation(EntityDef.class).isFinal();
if(!type.name().endsWith("Def")){
err("All entity def names must end with 'Def'", type.e);
}
String name = type.name().replace("Def", "_"); //TODO remove extra underscore
TypeSpec.Builder builder = TypeSpec.classBuilder(name).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
String name = type.name().replace("Def", "Entity"); //TODO remove extra underscore
TypeSpec.Builder builder = TypeSpec.classBuilder(name).addModifiers(Modifier.PUBLIC);
if(isFinal) builder.addModifiers(Modifier.FINAL);
Array<Stype> components = allComponents(type);
Array<GroupDefinition> groups = groupDefs.select(g -> !g.components.contains(s -> !components.contains(s)));
@@ -185,7 +187,8 @@ public class EntityProcess extends BaseProcessor{
}
//build method using same params/returns
MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC, Modifier.FINAL);
MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC);
if(isFinal) mbuilder.addModifiers(Modifier.FINAL);
mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
mbuilder.returns(first.retn());
mbuilder.addExceptions(first.thrownt());
@@ -244,6 +247,14 @@ public class EntityProcess extends BaseProcessor{
builder.addMethod(mbuilder.build());
}
//make constructor private
builder.addMethod(MethodSpec.constructorBuilder().addModifiers(Modifier.PROTECTED).build());
//add create() method
builder.addMethod(MethodSpec.methodBuilder("create").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
.returns(tname(packageName + "." + name))
.addStatement("return new $L()", name).build());
definitions.add(new EntityDefinition("mindustry.gen." + name, builder, type, components, groups));
}