diff --git a/annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java similarity index 99% rename from annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java rename to annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java index 2ac95b7b40..10e258959c 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java @@ -16,7 +16,7 @@ import javax.tools.*; import java.util.*; @SupportedAnnotationTypes("mindustry.annotations.Annotations.StyleDefaults") -public class AssetsAnnotationProcessor extends BaseProcessor{ +public class AssetsProcess extends BaseProcessor{ private String path; @Override diff --git a/annotations/src/main/java/mindustry/annotations/impl/CallSuperAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java similarity index 98% rename from annotations/src/main/java/mindustry/annotations/impl/CallSuperAnnotationProcessor.java rename to annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java index 4815073331..0080c0887f 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/CallSuperAnnotationProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java @@ -18,7 +18,7 @@ import java.lang.annotation.*; import java.util.*; @SupportedAnnotationTypes({"java.lang.Override"}) -public class CallSuperAnnotationProcessor extends AbstractProcessor{ +public class CallSuperProcess extends AbstractProcessor{ private Trees trees; @Override diff --git a/annotations/src/main/java/mindustry/annotations/impl/SerializeAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java similarity index 97% rename from annotations/src/main/java/mindustry/annotations/impl/SerializeAnnotationProcessor.java rename to annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java index 3d07b2abce..9bade20179 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/SerializeAnnotationProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/impl/SerializeProcess.java @@ -15,7 +15,7 @@ import java.util.*; import java.util.zip.*; @SupportedAnnotationTypes("mindustry.annotations.Annotations.Serialize") -public class SerializeAnnotationProcessor extends BaseProcessor{ +public class SerializeProcess extends BaseProcessor{ /** Target class name. */ private static final String className = "Serialization"; /** Name of the base package to put all the generated classes. */ @@ -28,7 +28,7 @@ public class SerializeAnnotationProcessor extends BaseProcessor{ TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC); classBuilder.addStaticBlock(CodeBlock.of(new DataInputStream(new InflaterInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(data)))).readUTF())); classBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build()); - classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning); + classBuilder.addJavadoc(RemoteProcess.autogenWarning); MethodSpec.Builder method = MethodSpec.methodBuilder("init").addModifiers(Modifier.PUBLIC, Modifier.STATIC); diff --git a/annotations/src/main/java/mindustry/annotations/impl/StructAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java similarity index 98% rename from annotations/src/main/java/mindustry/annotations/impl/StructAnnotationProcessor.java rename to annotations/src/main/java/mindustry/annotations/impl/StructProcess.java index e4387245c5..b27871d63d 100644 --- a/annotations/src/main/java/mindustry/annotations/impl/StructAnnotationProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java @@ -20,7 +20,7 @@ import java.util.Set; @SupportedAnnotationTypes({ "mindustry.annotations.Annotations.Struct" }) -public class StructAnnotationProcessor extends BaseProcessor{ +public class StructProcess extends BaseProcessor{ @Override public void process(RoundEnvironment env) throws Exception{ @@ -41,7 +41,7 @@ public class StructAnnotationProcessor extends BaseProcessor{ try{ List variables = ElementFilter.fieldsIn(elem.getEnclosedElements()); - int structSize = variables.stream().mapToInt(StructAnnotationProcessor::varSize).sum(); + int structSize = variables.stream().mapToInt(StructProcess::varSize).sum(); int structTotalSize = (structSize <= 8 ? 8 : structSize <= 16 ? 16 : structSize <= 32 ? 32 : 64); if(variables.size() == 0){ diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteMethodAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java similarity index 98% rename from annotations/src/main/java/mindustry/annotations/remote/RemoteMethodAnnotationProcessor.java rename to annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java index 7f3acc0c86..b54db3ee15 100644 --- a/annotations/src/main/java/mindustry/annotations/remote/RemoteMethodAnnotationProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java @@ -18,7 +18,7 @@ import java.util.stream.*; "mindustry.annotations.Annotations.WriteClass", "mindustry.annotations.Annotations.ReadClass", }) -public class RemoteMethodAnnotationProcessor extends BaseProcessor{ +public class RemoteProcess extends BaseProcessor{ /** Maximum size of each event packet. */ public static final int maxPacketSize = 4096; /** Warning on top of each autogenerated file. */ diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java index ab7abb2538..211d807067 100644 --- a/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java +++ b/annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java @@ -33,7 +33,7 @@ public class RemoteReadGenerator{ throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IOException{ TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC); - classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning); + classBuilder.addJavadoc(RemoteProcess.autogenWarning); //create main method builder MethodSpec.Builder readMethod = MethodSpec.methodBuilder("readPacket") diff --git a/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java b/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java index 19c5d73df3..10d822dd59 100644 --- a/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java +++ b/annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java @@ -27,11 +27,11 @@ public class RemoteWriteGenerator{ for(ClassEntry entry : entries){ //create builder TypeSpec.Builder classBuilder = TypeSpec.classBuilder(entry.name).addModifiers(Modifier.PUBLIC); - classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning); + classBuilder.addJavadoc(RemoteProcess.autogenWarning); //add temporary write buffer classBuilder.addField(FieldSpec.builder(ByteBuffer.class, "TEMP_BUFFER", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL) - .initializer("ByteBuffer.allocate($1L)", RemoteMethodAnnotationProcessor.maxPacketSize).build()); + .initializer("ByteBuffer.allocate($1L)", RemoteProcess.maxPacketSize).build()); //go through each method entry in this class for(MethodEntry methodEntry : entry.methods){