From cefb9d263a5678176c7a9678b8b9939ac3e8a62f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 27 Mar 2022 19:18:53 -0400
Subject: [PATCH] Process fix

---
 .../annotations/entity/EntityProcess.java      |  4 ++++
 .../annotations/misc/LoadRegionProcessor.java  | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
index cca106e271..ff68aa20be 100644
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
@@ -853,6 +853,10 @@ public class EntityProcess extends BaseProcessor{
 
                     Stype compType = interfaceToComp(method.type());
                     MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
+                    int index = 0;
+                    for(ParameterSpec spec : builder.parameters){
+                        Reflect.set(spec, "name",  "arg" + index++);
+                    }
                     builder.addAnnotation(OverrideCallSuper.class); //just in case
 
                     if(!method.isVoid()){
diff --git a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
index 7002972345..b9b2bc9dad 100644
--- a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
@@ -3,7 +3,6 @@ package mindustry.annotations.misc;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.struct.*;
-import arc.struct.ObjectMap.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
@@ -34,10 +33,15 @@ public class LoadRegionProcessor extends BaseProcessor{
             fieldMap.get(field.enclosingType(), Seq::new).add(field);
         }
 
-        for(Entry<Stype, Seq<Svar>> entry : fieldMap){
-            method.beginControlFlow("if(content instanceof $L)", entry.key.fullName());
+        Seq<Stype> entries = Seq.with(fieldMap.keys());
+        entries.sortComparing(e -> e.name());
 
-            for(Svar field : entry.value){
+        for(Stype type : entries){
+            Seq<Svar> fields = fieldMap.get(type);
+            fields.sortComparing(s -> s.name());
+            method.beginControlFlow("if(content instanceof $L)", type.fullName());
+
+            for(Svar field : fields){
                 Load an = field.annotation(Load.class);
                 //get # of array dimensions
                 int dims = count(field.mirror().toString(), "[]");
@@ -46,7 +50,7 @@ public class LoadRegionProcessor extends BaseProcessor{
 
                 //not an array
                 if(dims == 0){
-                    method.addStatement("(($L)content).$L = $T.atlas.find($L$L)", entry.key.fullName(), field.name(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($L)content).$L = $T.atlas.find($L$L)", type.fullName(), field.name(), Core.class, parse(an.value()), fallbackString);
                 }else{
                     //is an array, create length string
                     int[] lengths = an.lengths();
@@ -59,7 +63,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                     StringBuilder lengthString = new StringBuilder();
                     for(int value : lengths) lengthString.append("[").append(value).append("]");
 
-                    method.addStatement("(($T)content).$L = new $T$L", entry.key.tname(), field.name(), TextureRegion.class, lengthString.toString());
+                    method.addStatement("(($T)content).$L = new $T$L", type.tname(), field.name(), TextureRegion.class, lengthString.toString());
 
                     for(int i = 0; i < dims; i++){
                         method.beginControlFlow("for(int INDEX$L = 0; INDEX$L < $L; INDEX$L ++)", i, i, lengths[i], i);
@@ -70,7 +74,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                         indexString.append("[INDEX").append(i).append("]");
                     }
 
-                    method.addStatement("(($T)content).$L$L = $T.atlas.find($L$L)", entry.key.tname(), field.name(), indexString.toString(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($T)content).$L$L = $T.atlas.find($L$L)", type.tname(), field.name(), indexString.toString(), Core.class, parse(an.value()), fallbackString);
 
                     for(int i = 0; i < dims; i++){
                         method.endControlFlow();