From 40bb0ddf39bf88c531f98ab8391d1676a8477019 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 4 May 2020 12:08:02 -0400
Subject: [PATCH] Cleanup / Updated arc

---
 .../java/mindustry/annotations/BaseProcessor.java  | 14 ++++++--------
 .../main/java/mindustry/annotations/util/Svar.java |  5 +++++
 gradle.properties                                  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
index 00c5295947..22b3e173f3 100644
--- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
@@ -32,10 +32,11 @@ public abstract class BaseProcessor extends AbstractProcessor{
     public static final String packageName = "mindustry.gen";
 
     public static Types typeu;
-    public static Elements elementu;
+    public static JavacElements elementu;
     public static Filer filer;
     public static Messager messager;
     public static Trees trees;
+    public static TreeMaker maker;
 
     protected int round;
     protected int rounds = 1;
@@ -43,8 +44,6 @@ public abstract class BaseProcessor extends AbstractProcessor{
     protected Fi rootDirectory;
 
     protected Context context;
-    protected JavacElements elementUtils;
-    protected TreeMaker maker;
 
     public static String getMethodName(Element element){
         return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
@@ -190,16 +189,15 @@ public abstract class BaseProcessor extends AbstractProcessor{
     public synchronized void init(ProcessingEnvironment env){
         super.init(env);
 
+        JavacProcessingEnvironment javacProcessingEnv = (JavacProcessingEnvironment)env;
+
         trees = Trees.instance(env);
         typeu = env.getTypeUtils();
-        elementu = env.getElementUtils();
+        elementu = javacProcessingEnv.getElementUtils();
         filer = env.getFiler();
         messager = env.getMessager();
         context = ((JavacProcessingEnvironment)env).getContext();
-
-        JavacProcessingEnvironment javacProcessingEnv = (JavacProcessingEnvironment)env;
-        this.elementUtils = javacProcessingEnv.getElementUtils();
-        this.maker = TreeMaker.instance(javacProcessingEnv.getContext());
+        maker = TreeMaker.instance(javacProcessingEnv.getContext());
 
         Log.setLogLevel(LogLevel.info);
 
diff --git a/annotations/src/main/java/mindustry/annotations/util/Svar.java b/annotations/src/main/java/mindustry/annotations/util/Svar.java
index daee29106b..3a20776a7f 100644
--- a/annotations/src/main/java/mindustry/annotations/util/Svar.java
+++ b/annotations/src/main/java/mindustry/annotations/util/Svar.java
@@ -1,6 +1,7 @@
 package mindustry.annotations.util;
 
 import com.sun.source.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
 import mindustry.annotations.*;
 
 import javax.lang.model.element.*;
@@ -11,6 +12,10 @@ public class Svar extends Selement<VariableElement>{
         super(e);
     }
 
+    public JCVariableDecl jtree(){
+        return (JCVariableDecl)BaseProcessor.elementu.getTree(e);
+    }
+
     public Stype enclosingType(){
         return new Stype((TypeElement)up());
     }
diff --git a/gradle.properties b/gradle.properties
index 38a2de2fcf..97e109ee75 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=caa68598497505cd1aa4531648c56c1b6b48a1a6
+archash=c3006b41f6c2f9f07d1004ab1d829040b6af561f