mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-31 15:09:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradual component conversion

Browse Source
This commit is contained in:
Anuken
2020-02-02 20:17:22 -05:00
parent 63fa50d111 ad6e0bcd0f
commit f2f31120a0
70 changed files with 1061 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,8 +8,9 @@ public class Annotations{
/** Indicates multiple inheritance on a component type. */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.SOURCE)
public @interface Depends{
Class[] value();
public @interface Component{
/** Dependencies. */
Class[] value() default {};
}
/** Indicates that a component def is present on all entities. */

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

@ -45,7 +45,7 @@ public class EntityProcess extends BaseProcessor{
}
//add all components w/ dependencies
allComponents.addAll(types(Depends.class).map(s -> Array.withArrays(getDependencies(s), s)).flatten());
allComponents.addAll(types(Component.class).map(s -> Array.withArrays(getDependencies(s), s)).flatten());
//add component imports
for(Stype comp : allComponents){
@ -77,6 +77,9 @@ public class EntityProcess extends BaseProcessor{
//add utility methods to interface
for(Smethod method : component.methods()){
//skip private methods, those are for internal use.
if(method.is(Modifier.PRIVATE)) continue;
inter.addMethod(MethodSpec.methodBuilder(method.name())
.addExceptions(method.thrownt())
.addTypeVariables(method.typeVariables().map(TypeVariableName::get))
@ -107,6 +110,11 @@ public class EntityProcess extends BaseProcessor{
for(Svar f : fields){
VariableTree tree = f.tree();
FieldSpec.Builder fbuilder = FieldSpec.builder(f.tname(), f.name());
//keep statics/finals
if(f.is(Modifier.STATIC)){
fbuilder.addModifiers(Modifier.STATIC);
if(f.is(Modifier.FINAL)) fbuilder.addModifiers(Modifier.FINAL);
}
//add initializer if it exists
if(tree.getInitializer() != null){
fbuilder.initializer(tree.getInitializer().toString());
@ -125,7 +133,7 @@ public class EntityProcess extends BaseProcessor{
//representative method
Smethod first = entry.value.first();
//build method using same params/returns
MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC, Modifier.FINAL);
mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
mbuilder.returns(first.retn());
mbuilder.addExceptions(first.thrownt());
@ -191,6 +199,11 @@ public class EntityProcess extends BaseProcessor{
for(Stype comp : components){
//implement the interface
Stype inter = interfaces.find(i -> i.name().equals(interfaceName(comp)));
if(inter == null){
err("Failed to generate interface for component. Interfaces are " + interfaces + "\nComponent", comp);
return;
}
def.builder.addSuperinterface(inter.tname());
//generate getter/setter for each method
@ -251,9 +264,9 @@ public class EntityProcess extends BaseProcessor{
out.addAll(component.superclasses());
//get dependency classes
if(component.annotation(Depends.class) != null){
if(component.annotation(Component.class) != null){
try{
component.annotation(Depends.class).value();
component.annotation(Component.class).value();
}catch(MirroredTypesException e){
out.addAll(Array.with(e.getTypeMirrors()).map(Stype::of));
}

8
annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java
View File

@ -146,8 +146,12 @@ public class RemoteWriteGenerator{
VariableElement var = elem.getParameters().get(i);
//add parameter to method
method.addParameter(TypeName.get(var.asType()), var.getSimpleName().toString());
try{
//add parameter to method
method.addParameter(TypeName.get(var.asType()), var.getSimpleName().toString());
}catch(Throwable t){
throw new RuntimeException("Error parsing method " + methodEntry.targetMethod);
}
//name of parameter
String varName = var.getSimpleName().toString();