Updated TR Bundle to the latest V7 prealpha (#5505)

* Updated TR Bundle to the latest V7 prealpha

* Update bundle_tr.properties

.github/workflows/deployment.yml

@@ -6,15 +6,15 @@ on:
       - 'v*'
 
 jobs:
-  buildJava14:
+  deploy:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 16
     - name: Set env
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
     - name: Add Arc release
@@ -47,7 +47,7 @@ jobs:
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
         cd ../MindustryBuilds
         echo "Updating version to ${RELEASE_VERSION:1}"
-        echo versionName=6-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${RELEASE_VERSION:1} > version_fdroid.txt
+        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${GITHUB_RUN_NUMBER} > version_fdroid.txt
         git add .
         git commit -m "Updating to build ${RELEASE_VERSION:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds

.github/workflows/pr.yml

@@ -1,17 +1,17 @@
 name: Pull Request Tests
 
-on: [pull_request]
+on: [pull_request, workflow_dispatch]
 
 jobs:
-  buildJava14:
+  testPR:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
+    - name: Set up JDK 16
       uses: actions/setup-java@v1
       with:
-        java-version: 14
+        java-version: 16
     - name: Run unit tests and build JAR
       run: ./gradlew test desktop:dist
     - name: Upload desktop JAR for testing

.github/workflows/push.yml

@@ -3,17 +3,11 @@ name: Tests
 on: [push, workflow_dispatch]
 
 jobs:
-  buildJava14:
+  runPush:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 14
-      uses: actions/setup-java@v1
-      with:
-        java-version: 14
-    - name: Run unit tests
-      run: ./gradlew clean cleanTest test
     - name: Trigger BE build
       if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |
@@ -23,3 +17,9 @@ jobs:
         git tag ${BNUM}
         git config --global user.name "Build Uploader"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}
+    - name: Set up JDK 16
+      uses: actions/setup-java@v1
+      with:
+        java-version: 16
+    - name: Run unit tests
+      run: ./gradlew clean cleanTest test

.gitignore

@@ -102,6 +102,10 @@ com_crashlytics_export_strings.xml
 .externalToolBuilders/
 *.launch
 
+## VSCode
+
+.vscode/
+
 ## NetBeans
 
 /nbproject/private/

CONTRIBUTING.md

@@ -26,7 +26,7 @@ This means:
 - `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more. Any reasonable IDE should highlight them for you anyway.
 - No underscores for anything. (Yes, I know `Bindings` violates this principle, but that's for legacy reasons and really should be cleaned up some day)
 - Do not use braceless `if/else` statements. `if(x) statement else statement2` should **never** be done. In very specific situations, having braceless if-statements on one line is allowed: `if(cond) return;` would be valid.
-- Prefer single-line javadoc `/** @return for example */` instead of multiline javadoc whenver possible
+- Prefer single-line javadoc `/** @return for example */` instead of multiline javadoc whenever possible
 - Short method/variable names (multipleLongWords should be avoided if it's possible to do so reasonably, especially for variables)
 - Use wildcard imports - `import some.package.*` - for everything. This makes incorrect class usage more obvious (*e.g. arc.util.Timer vs java.util.Timer*) and leads to cleaner-looking code.
 

README.md

@@ -18,7 +18,7 @@ See [CONTRIBUTING](CONTRIBUTING.md).
 Bleeding-edge builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases).
 
 If you'd rather compile on your own, follow these instructions.
-First, make sure you have [JDK 14](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
+First, make sure you have [JDK 16](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
 
 ### Windows
 

android/AndroidManifest.xml

@@ -17,7 +17,7 @@
             android:usesCleartextTraffic="true"
             android:appCategory="game"
             android:label="@string/app_name"
-            android:theme="@style/ArcTheme" android:fullBackupContent="@xml/backup_rules">
+            android:fullBackupContent="@xml/backup_rules">
         <meta-data android:name="android.max_aspect" android:value="2.1"/>
         <activity
                 android:name="mindustry.android.AndroidLauncher"

android/build.gradle

@@ -7,9 +7,7 @@ buildscript{
     }
 
     dependencies{
-        //IMPORTANT NOTICE: any version of the plugin after 3.4.1 will break builds
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
-        //it appears abstract methods don't get desugared properly (if at all)
-        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
@@ -20,35 +18,20 @@ configurations{ natives }
 repositories{
     mavenCentral()
     maven{ url "https://maven.google.com" }
-    jcenter() //remove later once google fixes the dependency
+    jcenter() //remove later once google/JetBrains fixes the dependency
-}
-
-dependencies{
-    implementation project(":core")
-
-    implementation arcModule("backends:backend-android")
-    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
-
-    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
-    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
-    natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
-
-    //android dependencies magically disappear during compilation, thanks gradle!
-    def sdkFile = new File((String)findSdkDir(), "/platforms/android-29/android.jar")
-    if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 
 task deploy(type: Copy){
     dependsOn "assembleRelease"
 
-    from "build/outputs/apk/release/android-release.apk"
+    from "build/outputs/apk/standard/release/android-standard-release.apk"
     into "../deploy/"
-    rename("android-release.apk", "${generateDeployName('android')}.apk")
+    rename("android-standard-release.apk", "${generateDeployName('android')}.apk")
 }
 
 android{
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '30.0.2'
-    compileSdkVersion 29
+    compileSdkVersion 30
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -59,9 +42,13 @@ android{
             assets.srcDirs = ['assets', 'src/main/assets', '../core/assets/']
             jniLibs.srcDirs = ['libs']
         }
+        gp{
+            java.srcDirs = ['srcgp']
+        }
 
         androidTest.setRoot('tests')
     }
+
     packagingOptions{
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
@@ -73,7 +60,7 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         
         versionName versionNameResult
         versionCode = (System.getenv("TRAVIS_BUILD_ID") != null ? System.getenv("TRAVIS_BUILD_ID").toInteger() : vcode)
@@ -109,6 +96,14 @@ android{
         }
     }
 
+    buildTypes{
+        all{
+            minifyEnabled = true
+            shrinkResources = true
+            proguardFiles("proguard-rules.pro")
+        }
+    }
+
     if(project.hasProperty("RELEASE_STORE_FILE") || System.getenv("CI") == "true"){
         buildTypes{
             release{
@@ -116,10 +111,37 @@ android{
             }
         }
     }
+
+    // Specifies one flavor dimension.
+    flavorDimensions "version"
+    productFlavors{
+        standard{
+
+        }
+        gp{
+            applicationIdSuffix ".gp"
+            versionNameSuffix "-gp"
+        }
+    }
 }
-// called every time gradle gets executed, takes the native dependencies of
+
-// the natives configuration, and extracts them to the proper libs/ folders
+dependencies{
-// so they get packed with the APK.
+    implementation project(":core")
+
+    implementation arcModule("backends:backend-android")
+    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
+
+    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
+    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
+
+    gpImplementation "com.google.android.gms:play-services-games:21.0.0"
+    gpImplementation "com.google.android.gms:play-services-auth:19.0.0"
+
+    //android dependencies magically disappear during compilation, thanks gradle!
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-29/android.jar")
+    if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
+}
+
 task copyAndroidNatives(){
     configurations.natives.files.each{ jar ->
         copy{
@@ -131,29 +153,13 @@ task copyAndroidNatives(){
 }
 
 task run(type: Exec){
-    def path
+    commandLine "${findSdkDir()}/platform-tools/adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
-    def localProperties = project.file("../local.properties")
-    if(localProperties.exists()){
-        Properties properties = new Properties()
-        localProperties.withInputStream{ instr ->
-            properties.load(instr)
-        }
-        def sdkDir = properties.getProperty('sdk.dir')
-        if(sdkDir){
-            path = sdkDir
-        }else{
-            path = "$System.env.ANDROID_HOME"
-        }
-    }else{
-        path = "$System.env.ANDROID_HOME"
-    }
-
-    def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
 }
 
 if(!project.ext.hasSprites()){
-    println "Scheduling sprite pack."
+    tasks.whenTaskAdded{ task ->
-    run.dependsOn ":tools:pack"
+        if(task.name == 'assembleDebug' || task.name == 'assembleRelease'){
-    deploy.dependsOn ":tools:pack"
+            task.dependsOn ":tools:pack"
+        }
+    }
 }

android/proguard-rules.pro

@@ -0,0 +1,9 @@
+-dontobfuscate
+
+#these are essential packages that should not be "optimized" in any way
+#the main purpose of d8 here is to shrink the absurdly-large google play games libraries
+-keep class mindustry.** { *; }
+-keep class arc.** { *; }
+-keep class net.jpountz.** { *; }
+-keep class rhino.** { *; }
+-keep class com.android.dex.** { *; }

android/res/values-v21/styles.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="ArcTheme" parent="android:Theme.Material.NoActionBar">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-</resources>

android/res/values/strings.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="app_name">Mindustry</string>
-
 </resources>

android/res/values/styles.xml

@@ -1,12 +0,0 @@
-<resources>
-
-    <style name="ArcTheme" parent="android:Theme">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-
-</resources>

android/src/mindustry/android/AndroidLauncher.java

@@ -33,6 +33,9 @@ public class AndroidLauncher extends AndroidApplication{
     FileChooser chooser;
     Runnable permCallback;
 
+    Object gpService;
+    Class<?> serviceClass;
+
     @Override
     protected void onCreate(Bundle savedInstanceState){
         UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
@@ -50,7 +53,7 @@ public class AndroidLauncher extends AndroidApplication{
         });
 
         super.onCreate(savedInstanceState);
-        if(doubleScaleTablets && isTablet(this.getContext())){
+        if(doubleScaleTablets && isTablet(this)){
             Scl.setAddition(0.5f);
         }
 
@@ -63,7 +66,7 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public rhino.Context getScriptContext(){
-                return AndroidRhinoContext.enter(getContext().getCacheDir());
+                return AndroidRhinoContext.enter(getCacheDir());
             }
 
             @Override
@@ -71,8 +74,28 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-            public ClassLoader loadJar(Fi jar, String mainClass) throws Exception{
+            public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
-                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader());
+                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
+                    @Override
+                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
+                        //check for loaded state
+                        Class<?> loadedClass = findLoadedClass(name);
+                        if(loadedClass == null){
+                            try{
+                                //try to load own class first
+                                loadedClass = findClass(name);
+                            }catch(ClassNotFoundException | NoClassDefFoundError e){
+                                //use parent if not found
+                                return parent.loadClass(name);
+                            }
+                        }
+
+                        if(resolve){
+                            resolveClass(loadedClass);
+                        }
+                        return loadedClass;
+                    }
+                };
             }
 
             @Override
@@ -165,9 +188,20 @@ public class AndroidLauncher extends AndroidApplication{
 
         try{
             //new external folder
-            Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath());
+            Fi data = Core.files.absolute(((Context)this).getExternalFilesDir(null).getAbsolutePath());
             Core.settings.setDataDirectory(data);
 
+            //delete unused cache folder to free up space
+            try{
+                Fi cache = Core.settings.getDataDirectory().child("cache");
+                if(cache.exists()){
+                    cache.deleteDirectory();
+                }
+            }catch(Throwable t){
+                Log.err("Failed to delete cached folder", t);
+            }
+
+
             //move to internal storage if there's no file indicating that it moved
             if(!Core.files.local("files_moved").exists()){
                 Log.info("Moving files to external storage...");
@@ -209,6 +243,24 @@ public class AndroidLauncher extends AndroidApplication{
         }
     }
 
+    @Override
+    public void onResume(){
+        super.onResume();
+
+        //TODO enable once GPGS is set up on the GP console
+        if(false && getPackageName().endsWith(".gp")){
+            try{
+                if(gpService == null){
+                    serviceClass = Class.forName("mindustry.android.GPGameService");
+                    gpService = serviceClass.getConstructor().newInstance();
+                }
+                serviceClass.getMethod("onResume", Context.class).invoke(gpService, this);
+            }catch(Exception e){
+                Log.err("Failed to update Google Play Services", e);
+            }
+        }
+    }
+
     private void checkFiles(Intent intent){
         try{
             Uri uri = intent.getData();

android/src/mindustry/android/AndroidRhinoContext.java

@@ -13,6 +13,7 @@ import com.android.dx.dex.cf.*;
 import com.android.dx.dex.file.DexFile;
 import com.android.dx.merge.*;
 import dalvik.system.*;
+import mindustry.mod.*;
 import rhino.*;
 
 import java.io.*;
@@ -30,23 +31,6 @@ public class AndroidRhinoContext{
      * @return a context prepared for android
      */
     public static Context enter(File cacheDirectory){
-        if(!SecurityController.hasGlobal())
-            SecurityController.initGlobal(new SecurityController(){
-                @Override
-                public GeneratedClassLoader createClassLoader(ClassLoader classLoader, Object o){
-                    return Context.getCurrentContext().createClassLoader(classLoader);
-                }
-
-                @Override
-                public Object getDynamicSecurityDomain(Object o){
-                    return null;
-                }
-
-                @Override
-                public Object callWithDomain(Object o, Context context, Callable callable, Scriptable scriptable, Scriptable scriptable1, Object[] objects){
-                    return null;
-                }
-            });
 
         AndroidContextFactory factory;
         if(!ContextFactory.hasExplicitGlobal()){
@@ -175,7 +159,7 @@ public class AndroidRhinoContext{
             }catch(IOException e){
                 e.printStackTrace();
             }
-            android.content.Context context = ((AndroidApplication) Core.app).getContext();
+            android.content.Context context = (android.content.Context)((AndroidApplication)Core.app);
             return new DexClassLoader(dexFile.getPath(), VERSION.SDK_INT >= 21 ? context.getCodeCacheDir().getPath() : context.getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name);
         }
 

android/srcgp/mindustry/android/GPGameService.java

@@ -0,0 +1,40 @@
+package mindustry.android;
+
+import android.content.*;
+import arc.util.*;
+import com.google.android.gms.auth.api.signin.*;
+import com.google.android.gms.games.*;
+import mindustry.service.*;
+
+public class GPGameService extends GameService{
+    private GoogleSignInAccount account;
+
+    public void onResume(Context context){
+        Log.info("[GooglePlayService] Resuming.");
+
+        GoogleSignInAccount current = GoogleSignIn.getLastSignedInAccount(context);
+
+        GoogleSignInOptions options =
+        new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_GAMES_SIGN_IN)
+        .requestScopes(Games.SCOPE_GAMES_SNAPSHOTS)
+        .build();
+
+        if(GoogleSignIn.hasPermissions(current, options.getScopeArray())){
+            this.account = current;
+            Log.info("Already signed in to Google Play Games.");
+        }else{
+            GoogleSignIn.getClient(context, options).silentSignIn().addOnCompleteListener(complete -> {
+                if(!complete.isSuccessful()){
+                    if(complete.getException() != null){
+                        Log.err("Failed to sign in to Google Play Games.", complete.getException());
+                    }else{
+                        Log.warn("Failed to sign in to Google Play Games.");
+                    }
+                }else{
+                    this.account = complete.getResult();
+                    Log.info("Signed in to Google Play Games.");
+                }
+            });
+        }
+    }
+}

annotations/src/main/java/mindustry/annotations/Annotations.java

@@ -118,7 +118,7 @@ public class Annotations{
         /**
          * The region name to load. Variables can be used:
          * "@" -> block name
-         * "$size" -> block size
+         * "@size" -> block size
          * "#" "#1" "#2" -> index number, for arrays
          * */
         String value();
@@ -177,12 +177,12 @@ public class Annotations{
     //region remote
 
     public enum PacketPriority{
+        /** Does not get handled unless client is connected. */
+        low,
         /** Gets put in a queue and processed if not connected. */
         normal,
         /** Gets handled immediately, regardless of connection status. */
         high,
-        /** Does not get handled unless client is connected. */
-        low
     }
 
     /** A set of two booleans, one specifying server and one specifying client. */

annotations/src/main/java/mindustry/annotations/BaseProcessor.java

@@ -2,15 +2,10 @@ package mindustry.annotations;
 
 import arc.files.*;
 import arc.struct.*;
-import arc.util.Log;
-import arc.util.Log.*;
 import arc.util.*;
+import arc.util.Log.*;
 import com.squareup.javapoet.*;
 import com.sun.source.util.*;
-import com.sun.tools.javac.model.*;
-import com.sun.tools.javac.processing.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.util.*;
 import mindustry.annotations.util.*;
 
 import javax.annotation.processing.*;
@@ -22,7 +17,6 @@ import javax.tools.Diagnostic.*;
 import javax.tools.*;
 import java.io.*;
 import java.lang.annotation.*;
-import java.util.List;
 import java.util.*;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
@@ -31,19 +25,16 @@ public abstract class BaseProcessor extends AbstractProcessor{
     public static final String packageName = "mindustry.gen";
 
     public static Types typeu;
-    public static JavacElements elementu;
+    public static Elements elementu;
     public static Filer filer;
     public static Messager messager;
     public static Trees trees;
-    public static TreeMaker maker;
 
     protected int round;
     protected int rounds = 1;
     protected RoundEnvironment env;
     protected Fi rootDirectory;
 
-    protected Context context;
-
     public static String getMethodName(Element element){
         return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
     }
@@ -186,7 +177,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
         Log.err("[CODEGEN ERROR] " + message + ": " + elem);
     }
 
-    public void err(String message, Selement elem){
+    public static void err(String message, Selement elem){
         err(message, elem.e);
     }
 
@@ -194,15 +185,11 @@ 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 = javacProcessingEnv.getElementUtils();
+        elementu = env.getElementUtils();
         filer = env.getFiler();
         messager = env.getMessager();
-        context = ((JavacProcessingEnvironment)env).getContext();
-        maker = TreeMaker.instance(javacProcessingEnv.getContext());
 
         Log.level = LogLevel.info;
 
@@ -219,7 +206,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
                 String path = Fi.get(filer.getResource(StandardLocation.CLASS_OUTPUT, "no", "no")
                 .toUri().toURL().toString().substring(OS.isWindows ? 6 : "file:".length()))
                 .parent().parent().parent().parent().parent().parent().parent().toString().replace("%20", " ");
-                rootDirectory = Fi.get(path);
+                rootDirectory = Fi.get(path).parent();
             }catch(IOException e){
                 throw new RuntimeException(e);
             }

annotations/src/main/java/mindustry/annotations/entity/EntityIO.java

@@ -143,6 +143,7 @@ public class EntityIO{
                 if(sl) cont("if(!islocal)");
 
                 if(sf){
+                    //TODO adding + targetSuf to the assignment fixes units being interpolated incorrectly during physics, but makes interpolation snap instead.
                     st(field.name + lastSuf + " = this." + field.name);
                 }
 

annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java

@@ -132,6 +132,7 @@ public class EntityProcess extends BaseProcessor{
                     .build())).addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT).build());
                 }
 
+                //generate interface getters and setters for all "standard" fields
                 for(Svar field : component.fields().select(e -> !e.is(Modifier.STATIC) && !e.is(Modifier.PRIVATE) && !e.has(Import.class))){
                     String cname = field.name();
 
@@ -273,7 +274,10 @@ public class EntityProcess extends BaseProcessor{
                     name += "Entity";
                 }
 
-                if(ann.legacy()){
+                boolean legacy = ann.legacy();
+
+                if(legacy){
+                    baseClass = tname(packageName + "." + name);
                     name += "Legacy" + Strings.capitalize(type.name());
                 }
 
@@ -338,7 +342,8 @@ public class EntityProcess extends BaseProcessor{
                         boolean isVisible = !f.is(Modifier.STATIC) && !f.is(Modifier.PRIVATE) && !f.has(ReadOnly.class);
 
                         //add the field only if it isn't visible or it wasn't implemented by the base class
-                        if(!isShadowed || !isVisible){
+                        //legacy classes have no extra fields
+                        if((!isShadowed || !isVisible) && !legacy){
                             builder.addField(spec);
                         }
 
@@ -348,7 +353,7 @@ public class EntityProcess extends BaseProcessor{
                         allFields.add(f);
 
                         //add extra sync fields
-                        if(f.has(SyncField.class) && isSync){
+                        if(f.has(SyncField.class) && isSync && !legacy){
                             if(!f.tname().toString().equals("float")) err("All SyncFields must be of type float", f);
 
                             syncedFields.add(f);
@@ -442,11 +447,14 @@ public class EntityProcess extends BaseProcessor{
                         }
                     }
 
+                    boolean specialIO = false;
+
                     if(hasIO){
                         //SPECIAL CASE: I/O code
                         //note that serialization is generated even for non-serializing entities for manual usage
                         if((first.name().equals("read") || first.name().equals("write"))){
                             io.write(mbuilder, first.name().equals("write"));
+                            specialIO = true;
                         }
 
                         //SPECIAL CASE: sync I/O code
@@ -525,8 +533,10 @@ public class EntityProcess extends BaseProcessor{
                         mbuilder.addStatement("mindustry.gen.Groups.queueFree(($T)this)", Poolable.class);
                     }
 
+                    if(!legacy || specialIO){
                         builder.addMethod(mbuilder.build());
                     }
+                }
 
                 //add pool reset method and implement Poolable
                 if(ann.pooled()){
@@ -560,7 +570,7 @@ public class EntityProcess extends BaseProcessor{
                 .returns(tname(packageName + "." + name))
                 .addStatement(ann.pooled() ? "return Pools.obtain($L.class, " +name +"::new)" : "return new $L()", name).build());
 
-                definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs));
+                definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
             }
 
             //generate groups
@@ -665,11 +675,28 @@ public class EntityProcess extends BaseProcessor{
             //build mapping class for sync IDs
             TypeSpec.Builder idBuilder = TypeSpec.classBuilder("EntityMapping").addModifiers(Modifier.PUBLIC)
             .addField(FieldSpec.builder(TypeName.get(Prov[].class), "idMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new Prov[256]").build())
+
             .addField(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(ObjectMap.class),
                 tname(String.class), tname(Prov.class)),
                 "nameMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new ObjectMap<>()").build())
+
+            .addField(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(IntMap.class), tname(String.class)),
+                "customIdMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new IntMap<>()").build())
+
+            .addMethod(MethodSpec.methodBuilder("register").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .returns(TypeName.get(int.class))
+                .addParameter(String.class, "name").addParameter(Prov.class, "constructor")
+                .addStatement("int next = arc.util.Structs.indexOf(idMap, v -> v == null)")
+                .addStatement("idMap[next] = constructor")
+                .addStatement("nameMap.put(name, constructor)")
+                .addStatement("customIdMap.put(next, name)")
+                .addStatement("return next")
+                .addJavadoc("Use this method for obtaining a classId for custom modded unit types. Only call this once for each type. Modded types should return this id in their overridden classId method.")
+                .build())
+
             .addMethod(MethodSpec.methodBuilder("map").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .returns(TypeName.get(Prov.class)).addParameter(int.class, "id").addStatement("return idMap[id]").build())
+
             .addMethod(MethodSpec.methodBuilder("map").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
                 .returns(TypeName.get(Prov.class)).addParameter(String.class, "name").addStatement("return nameMap.get(name)").build());
 
@@ -698,11 +725,6 @@ public class EntityProcess extends BaseProcessor{
         }else{
             //round 3: generate actual classes and implement interfaces
 
-            //write base classes
-            for(TypeSpec.Builder b : baseClasses){
-                write(b, imports.asArray());
-            }
-
             //implement each definition
             for(EntityDefinition def : definitions){
 
@@ -725,6 +747,14 @@ public class EntityProcess extends BaseProcessor{
 
                     def.builder.addSuperinterface(inter.tname());
 
+                    if(def.legacy) continue;
+
+                    @Nullable TypeSpec.Builder superclass = null;
+
+                    if(def.extend != null){
+                        superclass = baseClasses.find(b -> (packageName + "." + Reflect.get(b, "name")).equals(def.extend.toString()));
+                    }
+
                     //generate getter/setter for each method
                     for(Smethod method : inter.methods()){
                         String var = method.name();
@@ -732,14 +762,36 @@ public class EntityProcess extends BaseProcessor{
                         //make sure it's a real variable AND that the component doesn't already implement it somewhere with custom logic
                         if(field == null || methodNames.contains(method.simpleString())) continue;
 
+                        MethodSpec result = null;
+
                         //getter
                         if(!method.isVoid()){
-                            def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("return " + var).build());
+                            result = MethodSpec.overriding(method.e).addStatement("return " + var).build();
                         }
 
                         //setter
                         if(method.isVoid() && !Seq.with(field.annotations).contains(f -> f.type.toString().equals("@mindustry.annotations.Annotations.ReadOnly"))){
-                            def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("this." + var + " = " + var).build());
+                            result = MethodSpec.overriding(method.e).addStatement("this." + var + " = " + var).build();
+                        }
+
+                        //add getter/setter to parent class, if possible. when this happens, skip adding getters setters *here* because they are defined in the superclass.
+                        if(result != null && superclass != null){
+                            FieldSpec superField = Seq.with(superclass.fieldSpecs).find(f -> f.name.equals(var));
+
+                            //found the right field, try to check for the method already existing now
+                            if(superField != null){
+                                MethodSpec fr = result;
+                                MethodSpec targetMethod = Seq.with(superclass.methodSpecs).find(m -> m.name.equals(var) && m.returnType.equals(fr.returnType));
+                                //if the method isn't added yet, add it. in any case, skip.
+                                if(targetMethod == null){
+                                    superclass.addMethod(result);
+                                }
+                                continue;
+                            }
+                        }
+
+                        if(result != null){
+                            def.builder.addMethod(result);
                         }
                     }
                 }
@@ -747,8 +799,16 @@ public class EntityProcess extends BaseProcessor{
                 write(def.builder, imports.asArray());
             }
 
+            //write base classes last
+            for(TypeSpec.Builder b : baseClasses){
+                write(b, imports.asArray());
+            }
+
+            //TODO nulls were an awful idea
             //store nulls
             TypeSpec.Builder nullsBuilder = TypeSpec.classBuilder("Nulls").addModifiers(Modifier.PUBLIC).addModifiers(Modifier.FINAL);
+            //TODO should be dynamic
+            ObjectSet<String> nullList = ObjectSet.with("unit");
 
             //create mock types of all components
             for(Stype interf : allInterfaces){
@@ -767,6 +827,12 @@ public class EntityProcess extends BaseProcessor{
 
                 //create null builder
                 String baseName = interf.name().substring(0, interf.name().length() - 1);
+
+                //prevent Nulls bloat
+                if(!nullList.contains(Strings.camelize(baseName))){
+                    continue;
+                }
+
                 String className = "Null" + baseName;
                 TypeSpec.Builder nullBuilder = TypeSpec.classBuilder(className)
                 .addModifiers(Modifier.FINAL);
@@ -900,7 +966,7 @@ public class EntityProcess extends BaseProcessor{
     }
 
     String createName(Selement<?> elem){
-        Seq<Stype> comps = types(elem.annotation(EntityDef.class), EntityDef::value).map(this::interfaceToComp);;
+        Seq<Stype> comps = types(elem.annotation(EntityDef.class), EntityDef::value).map(this::interfaceToComp);
         comps.sortComparing(Selement::name);
         return comps.toString("", s -> s.name().replace("Comp", ""));
     }
@@ -944,9 +1010,10 @@ public class EntityProcess extends BaseProcessor{
         final Selement naming;
         final String name;
         final @Nullable TypeName extend;
+        final boolean legacy;
         int classID;
 
-        public EntityDefinition(String name, Builder builder, Selement naming, TypeName extend, Seq<Stype> components, Seq<GroupDefinition> groups, Seq<FieldSpec> fieldSpec){
+        public EntityDefinition(String name, Builder builder, Selement naming, TypeName extend, Seq<Stype> components, Seq<GroupDefinition> groups, Seq<FieldSpec> fieldSpec, boolean legacy){
             this.builder = builder;
             this.name = name;
             this.naming = naming;
@@ -954,6 +1021,7 @@ public class EntityProcess extends BaseProcessor{
             this.components = components;
             this.extend = extend;
             this.fieldSpecs = fieldSpec;
+            this.legacy = legacy;
         }
 
         @Override

annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java

@@ -43,7 +43,7 @@ public class AssetsProcess extends BaseProcessor{
 
         texIcons.each((key, val) -> {
             String[] split = val.split("\\|");
-            String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "");
+            String name = Strings.kebabToCamel(split[1]).replace("Medium", "").replace("Icon", "").replace("Ui", "");
             if(SourceVersion.isKeyword(name) || name.equals("char")) name += "i";
 
             ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", Integer.parseInt(key))).initializer("'" + ((char)Integer.parseInt(key)) + "'").build());

annotations/src/main/java/mindustry/annotations/impl/CallSuperProcess.java

@@ -1,154 +0,0 @@
-package mindustry.annotations.impl;
-
-import com.sun.source.tree.*;
-import com.sun.source.util.*;
-import com.sun.tools.javac.code.Scope;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.tree.JCTree.*;
-import mindustry.annotations.Annotations.*;
-
-import javax.annotation.processing.*;
-import javax.lang.model.*;
-import javax.lang.model.element.*;
-import javax.tools.Diagnostic.*;
-import java.lang.annotation.*;
-import java.util.*;
-
-@SupportedAnnotationTypes({"java.lang.Override"})
-public class CallSuperProcess extends AbstractProcessor{
-    private Trees trees;
-
-    @Override
-    public void init(ProcessingEnvironment pe){
-        super.init(pe);
-        trees = Trees.instance(pe);
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
-        for(Element e : roundEnv.getElementsAnnotatedWith(Override.class)){
-            if(e.getAnnotation(OverrideCallSuper.class) != null) return false;
-
-            CodeAnalyzerTreeScanner codeScanner = new CodeAnalyzerTreeScanner();
-            codeScanner.methodName = e.getSimpleName().toString();
-
-            TreePath tp = trees.getPath(e.getEnclosingElement());
-            codeScanner.scan(tp, trees);
-
-            if(codeScanner.callSuperUsed){
-                List list = codeScanner.method.getBody().getStatements();
-
-                if(!doesCallSuper(list, codeScanner.methodName)){
-                    processingEnv.getMessager().printMessage(Kind.ERROR, "Overriding method '" + codeScanner.methodName + "' must explicitly call super method from its parent class.", e);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private boolean doesCallSuper(List list, String methodName){
-        for(Object object : list){
-            if(object instanceof JCTree.JCExpressionStatement){
-                JCTree.JCExpressionStatement expr = (JCExpressionStatement)object;
-                String exprString = expr.toString();
-                if(exprString.startsWith("super." + methodName) && exprString.endsWith(");")) return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public SourceVersion getSupportedSourceVersion(){
-        return SourceVersion.RELEASE_8;
-    }
-
-    static class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees>{
-        String methodName;
-        MethodTree method;
-        boolean callSuperUsed;
-
-        @Override
-        public Object visitClass(ClassTree classTree, Trees trees){
-            Tree extendTree = classTree.getExtendsClause();
-
-            if(extendTree instanceof JCTypeApply){ //generic classes case
-                JCTypeApply generic = (JCTypeApply)extendTree;
-                extendTree = generic.clazz;
-            }
-
-            if(extendTree instanceof JCIdent){
-                JCIdent tree = (JCIdent)extendTree;
-
-                if(tree == null || tree.sym == null)  return super.visitClass(classTree, trees);
-
-                com.sun.tools.javac.code.Scope members = tree.sym.members();
-
-                if(checkScope(members))
-                    return super.visitClass(classTree, trees);
-
-                if(checkSuperTypes((ClassType)tree.type))
-                    return super.visitClass(classTree, trees);
-
-            }
-            callSuperUsed = false;
-
-            return super.visitClass(classTree, trees);
-        }
-
-        public boolean checkSuperTypes(ClassType type){
-            if(type.supertype_field != null && type.supertype_field.tsym != null){
-                if(checkScope(type.supertype_field.tsym.members()))
-                    return true;
-                else
-                    return checkSuperTypes((ClassType)type.supertype_field);
-            }
-
-            return false;
-        }
-
-        @SuppressWarnings("unchecked")
-        public boolean checkScope(Scope members){
-            Iterable<Symbol> it;
-            try{
-                it = (Iterable<Symbol>)members.getClass().getMethod("getElements").invoke(members);
-            }catch(Throwable t){
-                try{
-                    it = (Iterable<Symbol>)members.getClass().getMethod("getSymbols").invoke(members);
-                }catch(Exception e){
-                    throw new RuntimeException(e);
-                }
-            }
-
-            for(Symbol s : it){
-
-                if(s instanceof MethodSymbol){
-                    MethodSymbol ms = (MethodSymbol)s;
-
-                    if(ms.getSimpleName().toString().equals(methodName)){
-                        Annotation annotation = ms.getAnnotation(CallSuper.class);
-                        if(annotation != null){
-                            callSuperUsed = true;
-                            return true;
-                        }
-                    }
-                }
-            }
-
-            return false;
-        }
-
-        @Override
-        public Object visitMethod(MethodTree methodTree, Trees trees){
-            if(methodTree.getName().toString().equals(methodName))
-                method = methodTree;
-
-            return super.visitMethod(methodTree, trees);
-        }
-
-    }
-}

annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java

@@ -18,6 +18,7 @@ public class LoadRegionProcessor extends BaseProcessor{
     @Override
     public void process(RoundEnvironment env) throws Exception{
         TypeSpec.Builder regionClass = TypeSpec.classBuilder("ContentRegions")
+            .addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"deprecation\"").build())
             .addModifiers(Modifier.PUBLIC);
         MethodSpec.Builder method = MethodSpec.methodBuilder("loadRegions")
             .addParameter(tname("mindustry.ctype.MappableContent"), "content")
@@ -34,7 +35,7 @@ public class LoadRegionProcessor extends BaseProcessor{
         }
 
         for(Entry<Stype, Seq<Svar>> entry : fieldMap){
-            method.beginControlFlow("if(content instanceof $T)", entry.key.tname());
+            method.beginControlFlow("if(content instanceof $L)", entry.key.fullName());
 
             for(Svar field : entry.value){
                 Load an = field.annotation(Load.class);
@@ -45,7 +46,7 @@ public class LoadRegionProcessor extends BaseProcessor{
 
                 //not an array
                 if(dims == 0){
-                    method.addStatement("(($T)content).$L = $T.atlas.find($L$L)", entry.key.tname(), field.name(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($L)content).$L = $T.atlas.find($L$L)", entry.key.fullName(), field.name(), Core.class, parse(an.value()), fallbackString);
                 }else{
                     //is an array, create length string
                     int[] lengths = an.lengths();

annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java

@@ -0,0 +1,380 @@
+package mindustry.annotations.remote;
+
+import arc.struct.*;
+import arc.util.io.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+import mindustry.annotations.util.TypeIOResolver.*;
+
+import javax.lang.model.element.*;
+import java.io.*;
+
+import static mindustry.annotations.BaseProcessor.*;
+
+/** Generates code for writing remote invoke packets on the client and server. */
+public class CallGenerator{
+
+    /** Generates all classes in this list. */
+    public static void generate(ClassSerializer serializer, Seq<MethodEntry> methods) throws IOException{
+        //create builder
+        TypeSpec.Builder callBuilder = TypeSpec.classBuilder(RemoteProcess.callLocation).addModifiers(Modifier.PUBLIC);
+
+        MethodSpec.Builder register = MethodSpec.methodBuilder("registerPackets")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+        //go through each method entry in this class
+        for(MethodEntry ent : methods){
+            //builder for the packet type
+            TypeSpec.Builder packet = TypeSpec.classBuilder(ent.packetClassName)
+            .addModifiers(Modifier.PUBLIC);
+
+            //temporary data to deserialize later
+            packet.addField(FieldSpec.builder(byte[].class, "DATA", Modifier.PRIVATE).initializer("NODATA").build());
+
+            packet.superclass(tname("mindustry.net.Packet"));
+
+            //return the correct priority
+            if(ent.priority != PacketPriority.normal){
+                packet.addMethod(MethodSpec.methodBuilder("getPriority")
+                    .addModifiers(Modifier.PUBLIC)
+                    .addAnnotation(Override.class).returns(int.class).addStatement("return $L", ent.priority.ordinal())
+                .build());
+            }
+
+            //implement read & write methods
+            makeWriter(packet, ent, serializer);
+            makeReader(packet, ent, serializer);
+
+            //generate handlers
+            if(ent.where.isClient){
+                packet.addMethod(writeHandleMethod(ent, false));
+            }
+
+            if(ent.where.isServer){
+                packet.addMethod(writeHandleMethod(ent, true));
+            }
+
+            //register packet
+            register.addStatement("mindustry.net.Net.registerPacket($L.$L::new)", packageName, ent.packetClassName);
+
+            //add fields to the type
+            for(Svar param : ent.element.params()){
+                packet.addField(param.tname(), param.name(), Modifier.PUBLIC);
+            }
+
+            //write the 'send event to all players' variant: always happens for clients, but only happens if 'all' is enabled on the server method
+            if(ent.where.isClient || ent.target.isAll){
+                writeCallMethod(callBuilder, ent, true, false);
+            }
+
+            //write the 'send event to one player' variant, which is only applicable on the server
+            if(ent.where.isServer && ent.target.isOne){
+                writeCallMethod(callBuilder, ent, false, false);
+            }
+
+            //write the forwarded method version
+            if(ent.where.isServer && ent.forward){
+                writeCallMethod(callBuilder, ent, true, true);
+            }
+
+            //write the completed packet class
+            JavaFile.builder(packageName, packet.build()).build().writeTo(BaseProcessor.filer);
+        }
+
+        callBuilder.addMethod(register.build());
+
+        //build and write resulting class
+        TypeSpec spec = callBuilder.build();
+        JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
+    }
+
+    private static void makeWriter(TypeSpec.Builder typespec, MethodEntry ent, ClassSerializer serializer){
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("write")
+            .addParameter(Writes.class, "WRITE")
+            .addModifiers(Modifier.PUBLIC).addAnnotation(Override.class);
+        Seq<Svar> params = ent.element.params();
+
+        for(int i = 0; i < params.size; i++){
+            //first argument is skipped as it is always the player caller
+            if(!ent.where.isServer && i == 0){
+                continue;
+            }
+
+            Svar var = params.get(i);
+
+            //name of parameter
+            String varName = var.name();
+            //name of parameter type
+            String typeName = var.mirror().toString();
+            //special case: method can be called from anywhere to anywhere
+            //thus, only write the player when the SERVER is writing data, since the client is the only one who reads the player anyway
+            boolean writePlayerSkipCheck = ent.where == Loc.both && i == 0;
+
+            if(writePlayerSkipCheck){ //write begin check
+                builder.beginControlFlow("if(mindustry.Vars.net.server())");
+            }
+
+            if(BaseProcessor.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
+                builder.addStatement("WRITE.$L($L)", typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "", varName);
+            }else{
+                //else, try and find a serializer
+                String ser = serializer.writers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(ent.element.e, var.mirror(), true));
+
+                if(ser == null){ //make sure a serializer exists!
+                    BaseProcessor.err("No method to write class type: '" + typeName + "'", var);
+                }
+
+                //add statement for writing it
+                builder.addStatement(ser + "(WRITE, " + varName + ")");
+            }
+
+            if(writePlayerSkipCheck){ //write end check
+                builder.endControlFlow();
+            }
+        }
+
+        typespec.addMethod(builder.build());
+    }
+
+    private static void makeReader(TypeSpec.Builder typespec, MethodEntry ent, ClassSerializer serializer){
+        MethodSpec.Builder readbuilder = MethodSpec.methodBuilder("read")
+            .addParameter(Reads.class, "READ")
+            .addParameter(int.class, "LENGTH")
+            .addModifiers(Modifier.PUBLIC).addAnnotation(Override.class);
+
+        //read only into temporary data buffer
+        readbuilder.addStatement("DATA = READ.b(LENGTH)");
+
+        typespec.addMethod(readbuilder.build());
+
+        MethodSpec.Builder builder = MethodSpec.methodBuilder("handled")
+            .addModifiers(Modifier.PUBLIC)
+            .addAnnotation(Override.class);
+
+        //make sure data is present, begin reading it if so
+        builder.addStatement("BAIS.setBytes(DATA)");
+
+        Seq<Svar> params = ent.element.params();
+
+        //go through each parameter
+        for(int i = 0; i < params.size; i++){
+            Svar var = params.get(i);
+
+            //first argument is skipped as it is always the player caller
+            if(!ent.where.isServer && i == 0){
+                continue;
+            }
+
+            //special case: method can be called from anywhere to anywhere
+            //thus, only read the player when the CLIENT is receiving data, since the client is the only one who cares about the player anyway
+            boolean writePlayerSkipCheck = ent.where == Loc.both && i == 0;
+
+            if(writePlayerSkipCheck){ //write begin check
+                builder.beginControlFlow("if(mindustry.Vars.net.client())");
+            }
+
+            //full type name of parameter
+            String typeName = var.mirror().toString();
+            //name of parameter
+            String varName = var.name();
+            //capitalized version of type name for reading primitives
+            String pname = typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "";
+
+            //write primitives automatically
+            if(BaseProcessor.isPrimitive(typeName)){
+                builder.addStatement("$L = READ.$L()", varName, pname);
+            }else{
+                //else, try and find a serializer
+                String ser = serializer.readers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(ent.element.e, var.mirror(), false));
+
+                if(ser == null){ //make sure a serializer exists!
+                    BaseProcessor.err("No read method to read class type '" + typeName + "' in method " + ent.targetMethod + "; " + serializer.readers, var);
+                }
+
+                //add statement for reading it
+                builder.addStatement("$L = $L(READ)", varName, ser);
+            }
+
+            if(writePlayerSkipCheck){ //write end check
+                builder.endControlFlow();
+            }
+        }
+
+        typespec.addMethod(builder.build());
+    }
+
+    /** Creates a specific variant for a method entry. */
+    private static void writeCallMethod(TypeSpec.Builder classBuilder, MethodEntry ent, boolean toAll, boolean forwarded){
+        Smethod elem = ent.element;
+        Seq<Svar> params = elem.params();
+
+        //create builder
+        MethodSpec.Builder method = MethodSpec.methodBuilder(elem.name() + (forwarded ? "__forward" : "")) //add except suffix when forwarding
+        .addModifiers(Modifier.STATIC)
+        .returns(void.class);
+
+        //forwarded methods aren't intended for use, and are not public
+        if(!forwarded){
+            method.addModifiers(Modifier.PUBLIC);
+        }
+
+        //validate client methods to make sure
+        if(ent.where.isClient){
+            if(params.isEmpty()){
+                BaseProcessor.err("Client invoke methods must have a first parameter of type Player", elem);
+                return;
+            }
+
+            if(!params.get(0).mirror().toString().contains("Player")){
+                BaseProcessor.err("Client invoke methods should have a first parameter of type Player", elem);
+                return;
+            }
+        }
+
+        //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
+        if(!toAll){
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "playerConnection");
+        }
+
+        //add sender to ignore
+        if(forwarded){
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "exceptConnection");
+        }
+
+        //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
+        if(!forwarded && ent.local != Loc.none){
+            //add in local checks
+            if(ent.local != Loc.both){
+                method.beginControlFlow("if(" + getCheckString(ent.local) + " || !mindustry.Vars.net.active())");
+            }
+
+            //concatenate parameters
+            int index = 0;
+            StringBuilder results = new StringBuilder();
+            for(Svar var : params){
+                //special case: calling local-only methods uses the local player
+                if(index == 0 && ent.where == Loc.client){
+                    results.append("mindustry.Vars.player");
+                }else{
+                    results.append(var.name());
+                }
+                if(index != params.size - 1) results.append(", ");
+                index++;
+            }
+
+            //add the statement to call it
+            method.addStatement("$N." + elem.name() + "(" + results + ")",
+            ((TypeElement)elem.up()).getQualifiedName().toString());
+
+            if(ent.local != Loc.both){
+                method.endControlFlow();
+            }
+        }
+
+        //start control flow to check if it's actually client/server so no netcode is called
+        method.beginControlFlow("if(" + getCheckString(ent.where) + ")");
+
+        //add statement to create packet from pool
+        method.addStatement("$1T packet = new $1T()", tname("mindustry.gen." + ent.packetClassName));
+
+        method.addTypeVariables(Seq.with(elem.e.getTypeParameters()).map(BaseProcessor::getTVN));
+
+        for(int i = 0; i < params.size; i++){
+            //first argument is skipped as it is always the player caller
+            if((!ent.where.isServer) && i == 0){
+                continue;
+            }
+
+            Svar var = params.get(i);
+
+            method.addParameter(var.tname(), var.name());
+
+            //name of parameter
+            String varName = var.name();
+            //special case: method can be called from anywhere to anywhere
+            //thus, only write the player when the SERVER is writing data, since the client is the only one who reads it
+            boolean writePlayerSkipCheck = ent.where == Loc.both && i == 0;
+
+            if(writePlayerSkipCheck){ //write begin check
+                method.beginControlFlow("if(mindustry.Vars.net.server())");
+            }
+
+            method.addStatement("packet.$L = $L", varName, varName);
+
+            if(writePlayerSkipCheck){ //write end check
+                method.endControlFlow();
+            }
+        }
+
+        String sendString;
+
+        if(forwarded){ //forward packet
+            if(!ent.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
+                sendString = "mindustry.Vars.net.send(";
+            }else{
+                sendString = "mindustry.Vars.net.sendExcept(exceptConnection, ";
+            }
+        }else if(toAll){ //send to all players / to server
+            sendString = "mindustry.Vars.net.send(";
+        }else{ //send to specific client from server
+            sendString = "playerConnection.send(";
+        }
+
+        //send the actual packet
+        method.addStatement(sendString + "packet, " + (!ent.unreliable) + ")");
+
+
+        //end check for server/client
+        method.endControlFlow();
+
+        //add method to class, finally
+        classBuilder.addMethod(method.build());
+    }
+
+    private static String getCheckString(Loc loc){
+        return
+            loc.isClient && loc.isServer ? "mindustry.Vars.net.server() || mindustry.Vars.net.client()" :
+            loc.isClient ? "mindustry.Vars.net.client()" :
+            loc.isServer ? "mindustry.Vars.net.server()" : "false";
+    }
+
+    /** Generates handleServer / handleClient methods. */
+    public static MethodSpec writeHandleMethod(MethodEntry ent, boolean isClient){
+
+        //create main method builder
+        MethodSpec.Builder builder = MethodSpec.methodBuilder(isClient ? "handleClient" : "handleServer")
+        .addModifiers(Modifier.PUBLIC)
+        .addAnnotation(Override.class)
+        .returns(void.class);
+
+        Smethod elem = ent.element;
+        Seq<Svar> params = elem.params();
+
+        if(!isClient){
+            //add player parameter
+            builder.addParameter(ClassName.get("mindustry.net", "NetConnection"), "con");
+
+            //skip if player is invalid
+            builder.beginControlFlow("if(con.player == null || con.kicked)");
+            builder.addStatement("return");
+            builder.endControlFlow();
+
+            //make sure to use the actual player who sent the packet
+            builder.addStatement("mindustry.gen.Player player = con.player");
+        }
+
+        //execute the relevant method before the forward
+        //if it throws a ValidateException, the method won't be forwarded
+        builder.addStatement("$N." + elem.name() + "(" + params.toString(", ", s -> s.name()) + ")", ((TypeElement)elem.up()).getQualifiedName().toString());
+
+        //call forwarded method, don't forward on the client reader
+        if(ent.forward && ent.where.isServer && !isClient){
+            //call forwarded method
+            builder.addStatement("$L.$L.$L__forward(con, $L)", packageName, ent.className, elem.name(), params.toString(", ", s -> s.name()));
+        }
+
+        return builder.build();
+    }
+}

annotations/src/main/java/mindustry/annotations/remote/ClassEntry.java

@@ -1,15 +0,0 @@
-package mindustry.annotations.remote;
-
-import java.util.ArrayList;
-
-/** Represents a class witha list method entries to include in it. */
-public class ClassEntry{
-    /** All methods in this generated class. */
-    public final ArrayList<MethodEntry> methods = new ArrayList<>();
-    /** Simple class name. */
-    public final String name;
-
-    public ClassEntry(String name){
-        this.name = name;
-    }
-}

annotations/src/main/java/mindustry/annotations/remote/MethodEntry.java

@@ -1,8 +1,7 @@
 package mindustry.annotations.remote;
 
 import mindustry.annotations.Annotations.*;
-
+import mindustry.annotations.util.*;
-import javax.lang.model.element.ExecutableElement;
 
 /** Class that repesents a remote method to be constructed and put into a class. */
 public class MethodEntry{
@@ -10,6 +9,8 @@ public class MethodEntry{
     public final String className;
     /** Fully qualified target method to call. */
     public final String targetMethod;
+    /** Simple name of the generated packet class. */
+    public final String packetClassName;
     /** Whether this method can be called on a client/server. */
     public final Loc where;
     /**
@@ -26,12 +27,13 @@ public class MethodEntry{
     /** Unique method ID. */
     public final int id;
     /** The element method associated with this entry. */
-    public final ExecutableElement element;
+    public final Smethod element;
     /** The assigned packet priority. Only used in clients. */
     public final PacketPriority priority;
 
-    public MethodEntry(String className, String targetMethod, Loc where, Variant target,
+    public MethodEntry(String className, String targetMethod, String packetClassName, Loc where, Variant target,
-                       Loc local, boolean unreliable, boolean forward, int id, ExecutableElement element, PacketPriority priority){
+                       Loc local, boolean unreliable, boolean forward, int id, Smethod element, PacketPriority priority){
+        this.packetClassName = packetClassName;
         this.className = className;
         this.forward = forward;
         this.targetMethod = targetMethod;

annotations/src/main/java/mindustry/annotations/remote/RemoteProcess.java

@@ -1,7 +1,7 @@
 package mindustry.annotations.remote;
 
 import arc.struct.*;
-import com.squareup.javapoet.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
 import mindustry.annotations.util.*;
@@ -9,7 +9,6 @@ import mindustry.annotations.util.TypeIOResolver.*;
 
 import javax.annotation.processing.*;
 import javax.lang.model.element.*;
-import java.util.*;
 
 
 /** The annotation processor for generating remote method call code. */
@@ -18,52 +17,24 @@ import java.util.*;
 "mindustry.annotations.Annotations.TypeIOHandler"
 })
 public class RemoteProcess extends BaseProcessor{
-    /** Maximum size of each event packet. */
-    public static final int maxPacketSize = 8192;
-    /** Warning on top of each autogenerated file. */
-    public static final String autogenWarning = "Autogenerated file. Do not modify!\n";
-
-    /** Name of class that handles reading and invoking packets on the server. */
-    private static final String readServerName = "RemoteReadServer";
-    /** Name of class that handles reading and invoking packets on the client. */
-    private static final String readClientName = "RemoteReadClient";
     /** Simple class name of generated class name. */
-    private static final String callLocation = "Call";
+    public static final String callLocation = "Call";
-
-    //class serializers
-    private ClassSerializer serializer;
-    //all elements with the Remote annotation
-    private Seq<Smethod> elements;
-    //map of all classes to generate by name
-    private HashMap<String, ClassEntry> classMap;
-    //list of all method entries
-    private Seq<MethodEntry> methods;
-    //list of all method entries
-    private Seq<ClassEntry> classes;
-
-    {
-        rounds = 2;
-    }
 
     @Override
     public void process(RoundEnvironment roundEnv) throws Exception{
-        //round 1: find all annotations, generate *writers*
-        if(round == 1){
         //get serializers
-            serializer = TypeIOResolver.resolve(this);
+        //class serializers
+        ClassSerializer serializer = TypeIOResolver.resolve(this);
         //last method ID used
         int lastMethodID = 0;
         //find all elements with the Remote annotation
-            elements = methods(Remote.class);
+        //all elements with the Remote annotation
-            //map of all classes to generate by name
+        Seq<Smethod> elements = methods(Remote.class);
-            classMap = new HashMap<>();
         //list of all method entries
-            methods = new Seq<>();
+        Seq<MethodEntry> methods = new Seq<>();
-            //list of all method entries
-            classes = new Seq<>();
 
         Seq<Smethod> orderedElements = elements.copy();
-            orderedElements.sort((a, b) -> -a.toString().compareTo(b.toString()));
+        orderedElements.sortComparing(Selement::toString);
 
         //create methods
         for(Smethod element : orderedElements){
@@ -79,45 +50,25 @@ public class RemoteProcess extends BaseProcessor{
                 err("A @Remote method's targets() cannot be equal to 'none'", element);
             }
 
-                //get and create class entry if needed
+            String packetName = Strings.capitalize(element.name()) + "CallPacket";
-                if(!classMap.containsKey(callLocation)){
+            int[] index = {1};
-                    ClassEntry clas = new ClassEntry(callLocation);
+
-                    classMap.put(callLocation, clas);
+            while(methods.contains(m -> m.packetClassName.equals(packetName + (index[0] == 1 ? "" : index[0])))){
-                    classes.add(clas);
+                index[0] ++;
             }
 
-                ClassEntry entry = classMap.get(callLocation);
-
             //create and add entry
-                MethodEntry method = new MethodEntry(entry.name, BaseProcessor.getMethodName(element.e), annotation.targets(), annotation.variants(),
+            MethodEntry method = new MethodEntry(
-                annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++, element.e, annotation.priority());
+                callLocation, BaseProcessor.getMethodName(element.e), packetName + (index[0] == 1 ? "" : index[0]),
+                annotation.targets(), annotation.variants(),
+                annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++,
+                element, annotation.priority()
+            );
 
-                entry.methods.add(method);
             methods.add(method);
         }
 
-            //create read/write generators
+        //generate the methods to invoke, as well as the packet classes
-            RemoteWriteGenerator writegen = new RemoteWriteGenerator(serializer);
+        CallGenerator.generate(serializer, methods);
-
-            //generate the methods to invoke (write)
-            writegen.generateFor(classes, packageName);
-        }else if(round == 2){ //round 2: generate all *readers*
-            RemoteReadGenerator readgen = new RemoteReadGenerator(serializer);
-
-            //generate server readers
-            readgen.generateFor(methods.select(method -> method.where.isClient), readServerName, packageName, true);
-            //generate client readers
-            readgen.generateFor(methods.select(method -> method.where.isServer), readClientName, packageName, false);
-
-            //create class for storing unique method hash
-            TypeSpec.Builder hashBuilder = TypeSpec.classBuilder("MethodHash").addModifiers(Modifier.PUBLIC);
-            hashBuilder.addJavadoc(autogenWarning);
-            hashBuilder.addField(FieldSpec.builder(int.class, "HASH", Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
-            .initializer("$1L", Arrays.hashCode(methods.map(m -> m.element).toArray())).build());
-
-            //build and write resulting hash class
-            TypeSpec spec = hashBuilder.build();
-            JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
-        }
     }
 }

annotations/src/main/java/mindustry/annotations/remote/RemoteReadGenerator.java

@@ -1,129 +0,0 @@
-package mindustry.annotations.remote;
-
-import arc.struct.*;
-import arc.util.io.*;
-import com.squareup.javapoet.*;
-import mindustry.annotations.*;
-import mindustry.annotations.util.TypeIOResolver.*;
-
-import javax.lang.model.element.*;
-
-/** Generates code for reading remote invoke packets on the client and server. */
-public class RemoteReadGenerator{
-    private final ClassSerializer serializers;
-
-    /** Creates a read generator that uses the supplied serializer setup. */
-    public RemoteReadGenerator(ClassSerializer serializers){
-        this.serializers = serializers;
-    }
-
-    /**
-     * Generates a class for reading remote invoke packets.
-     * @param entries List of methods to use.
-     * @param className Simple target class name.
-     * @param packageName Full target package name.
-     * @param needsPlayer Whether this read method requires a reference to the player sender.
-     */
-    public void generateFor(Seq<MethodEntry> entries, String className, String packageName, boolean needsPlayer) throws Exception{
-
-        TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
-        classBuilder.addJavadoc(RemoteProcess.autogenWarning);
-
-        //create main method builder
-        MethodSpec.Builder readMethod = MethodSpec.methodBuilder("readPacket")
-        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-        .addParameter(Reads.class, "read") //buffer to read form
-        .addParameter(int.class, "id") //ID of method type to read
-        .returns(void.class);
-
-        if(needsPlayer){
-            //add player parameter
-            readMethod.addParameter(ClassName.get(packageName, "Player"), "player");
-        }
-
-        CodeBlock.Builder readBlock = CodeBlock.builder(); //start building block of code inside read method
-        boolean started = false; //whether an if() statement has been written yet
-
-        for(MethodEntry entry : entries){
-            //write if check for this entry ID
-            if(!started){
-                started = true;
-                readBlock.beginControlFlow("if(id == " + entry.id + ")");
-            }else{
-                readBlock.nextControlFlow("else if(id == " + entry.id + ")");
-            }
-
-            readBlock.beginControlFlow("try");
-
-            //concatenated list of variable names for method invocation
-            StringBuilder varResult = new StringBuilder();
-
-            //go through each parameter
-            for(int i = 0; i < entry.element.getParameters().size(); i++){
-                VariableElement var = entry.element.getParameters().get(i);
-
-                if(!needsPlayer || i != 0){ //if client, skip first parameter since it's always of type player and doesn't need to be read
-                    //full type name of parameter
-                    String typeName = var.asType().toString();
-                    //name of parameter
-                    String varName = var.getSimpleName().toString();
-                    //captialized version of type name for reading primitives
-                    String pname = typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "";
-
-                    //write primitives automatically
-                    if(BaseProcessor.isPrimitive(typeName)){
-                        readBlock.addStatement("$L $L = read.$L()", typeName, varName, pname);
-                    }else{
-                        //else, try and find a serializer
-                        String ser = serializers.readers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(entry.element, var.asType(), false));
-
-                        if(ser == null){ //make sure a serializer exists!
-                            BaseProcessor.err("No read method to read class type '" + typeName + "' in method " + entry.targetMethod + "; " + serializers.readers, var);
-                            return;
-                        }
-
-                        //add statement for reading it
-                        readBlock.addStatement(typeName + " " + varName + " = " + ser + "(read)");
-                    }
-
-                    //append variable name to string builder
-                    varResult.append(var.getSimpleName());
-                    if(i != entry.element.getParameters().size() - 1) varResult.append(", ");
-                }else{
-                    varResult.append("player");
-                    if(i != entry.element.getParameters().size() - 1) varResult.append(", ");
-                }
-            }
-
-            //execute the relevant method before the forward
-            //if it throws a ValidateException, the method won't be forwarded
-            readBlock.addStatement("$N." + entry.element.getSimpleName() + "(" + varResult.toString() + ")", ((TypeElement)entry.element.getEnclosingElement()).getQualifiedName().toString());
-
-            //call forwarded method, don't forward on the client reader
-            if(entry.forward && entry.where.isServer && needsPlayer){
-                //call forwarded method
-                readBlock.addStatement(packageName + "." + entry.className + "." + entry.element.getSimpleName() +
-                "__forward(player.con" + (varResult.length() == 0 ? "" : ", ") + varResult.toString() + ")");
-            }
-
-            readBlock.nextControlFlow("catch (java.lang.Exception e)");
-            readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to read remote method '" + entry.element.getSimpleName() + "'!\", e)");
-            readBlock.endControlFlow();
-        }
-
-        //end control flow if necessary
-        if(started){
-            readBlock.nextControlFlow("else");
-            readBlock.addStatement("throw new $1N(\"Invalid read method ID: \" + id + \"\")", RuntimeException.class.getName()); //handle invalid method IDs
-            readBlock.endControlFlow();
-        }
-
-        //add block and method to class
-        readMethod.addCode(readBlock.build());
-        classBuilder.addMethod(readMethod.build());
-
-        //build and write resulting class
-        TypeSpec spec = classBuilder.build();
-        JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
-    }
-}

annotations/src/main/java/mindustry/annotations/remote/RemoteWriteGenerator.java

@@ -1,228 +0,0 @@
-package mindustry.annotations.remote;
-
-import arc.struct.*;
-import arc.util.io.*;
-import com.squareup.javapoet.*;
-import mindustry.annotations.Annotations.*;
-import mindustry.annotations.*;
-import mindustry.annotations.util.TypeIOResolver.*;
-
-import javax.lang.model.element.*;
-import java.io.*;
-
-/** Generates code for writing remote invoke packets on the client and server. */
-public class RemoteWriteGenerator{
-    private final ClassSerializer serializers;
-
-    /** Creates a write generator that uses the supplied serializer setup. */
-    public RemoteWriteGenerator(ClassSerializer serializers){
-        this.serializers = serializers;
-    }
-
-    /** Generates all classes in this list. */
-    public void generateFor(Seq<ClassEntry> entries, String packageName) throws IOException{
-
-        for(ClassEntry entry : entries){
-            //create builder
-            TypeSpec.Builder classBuilder = TypeSpec.classBuilder(entry.name).addModifiers(Modifier.PUBLIC);
-            classBuilder.addJavadoc(RemoteProcess.autogenWarning);
-
-            //add temporary write buffer
-            classBuilder.addField(FieldSpec.builder(ReusableByteOutStream.class, "OUT", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
-            .initializer("new ReusableByteOutStream($L)", RemoteProcess.maxPacketSize).build());
-
-            //add writer for that buffer
-            classBuilder.addField(FieldSpec.builder(Writes.class, "WRITE", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
-            .initializer("new Writes(new $T(OUT))", DataOutputStream.class).build());
-
-            //go through each method entry in this class
-            for(MethodEntry methodEntry : entry.methods){
-                //write the 'send event to all players' variant: always happens for clients, but only happens if 'all' is enabled on the server method
-                if(methodEntry.where.isClient || methodEntry.target.isAll){
-                    writeMethodVariant(classBuilder, methodEntry, true, false);
-                }
-
-                //write the 'send event to one player' variant, which is only applicable on the server
-                if(methodEntry.where.isServer && methodEntry.target.isOne){
-                    writeMethodVariant(classBuilder, methodEntry, false, false);
-                }
-
-                //write the forwarded method version
-                if(methodEntry.where.isServer && methodEntry.forward){
-                    writeMethodVariant(classBuilder, methodEntry, true, true);
-                }
-            }
-
-            //build and write resulting class
-            TypeSpec spec = classBuilder.build();
-            JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
-        }
-    }
-
-    /** Creates a specific variant for a method entry. */
-    private void writeMethodVariant(TypeSpec.Builder classBuilder, MethodEntry methodEntry, boolean toAll, boolean forwarded){
-        ExecutableElement elem = methodEntry.element;
-
-        //create builder
-        MethodSpec.Builder method = MethodSpec.methodBuilder(elem.getSimpleName().toString() + (forwarded ? "__forward" : "")) //add except suffix when forwarding
-        .addModifiers(Modifier.STATIC)
-        .returns(void.class);
-
-        //forwarded methods aren't intended for use, and are not public
-        if(!forwarded){
-            method.addModifiers(Modifier.PUBLIC);
-        }
-
-        //validate client methods to make sure
-        if(methodEntry.where.isClient){
-            if(elem.getParameters().isEmpty()){
-                BaseProcessor.err("Client invoke methods must have a first parameter of type Player", elem);
-                return;
-            }
-
-            if(!elem.getParameters().get(0).asType().toString().contains("Player")){
-                BaseProcessor.err("Client invoke methods should have a first parameter of type Player", elem);
-                return;
-            }
-        }
-
-        //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
-        if(!toAll){
-            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "playerConnection");
-        }
-
-        //add sender to ignore
-        if(forwarded){
-            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "exceptConnection");
-        }
-
-        //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
-        if(!forwarded && methodEntry.local != Loc.none){
-            //add in local checks
-            if(methodEntry.local != Loc.both){
-                method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !mindustry.Vars.net.active())");
-            }
-
-            //concatenate parameters
-            int index = 0;
-            StringBuilder results = new StringBuilder();
-            for(VariableElement var : elem.getParameters()){
-                //special case: calling local-only methods uses the local player
-                if(index == 0 && methodEntry.where == Loc.client){
-                    results.append("mindustry.Vars.player");
-                }else{
-                    results.append(var.getSimpleName());
-                }
-                if(index != elem.getParameters().size() - 1) results.append(", ");
-                index++;
-            }
-
-            //add the statement to call it
-            method.addStatement("$N." + elem.getSimpleName() + "(" + results.toString() + ")",
-            ((TypeElement)elem.getEnclosingElement()).getQualifiedName().toString());
-
-            if(methodEntry.local != Loc.both){
-                method.endControlFlow();
-            }
-        }
-
-        //start control flow to check if it's actually client/server so no netcode is called
-        method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")");
-
-        //add statement to create packet from pool
-        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "mindustry.net.Packets.InvokePacket", "arc.util.pooling.Pools");
-        //assign priority
-        method.addStatement("packet.priority = (byte)" + methodEntry.priority.ordinal());
-        //assign method ID
-        method.addStatement("packet.type = (byte)" + methodEntry.id);
-        //reset stream
-        method.addStatement("OUT.reset()");
-
-        method.addTypeVariables(Seq.with(elem.getTypeParameters()).map(BaseProcessor::getTVN));
-
-        for(int i = 0; i < elem.getParameters().size(); i++){
-            //first argument is skipped as it is always the player caller
-            if((!methodEntry.where.isServer/* || methodEntry.mode == Loc.both*/) && i == 0){
-                continue;
-            }
-
-            VariableElement var = elem.getParameters().get(i);
-
-            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();
-            //name of parameter type
-            String typeName = var.asType().toString();
-            //captialized version of type name for writing primitives
-            String capName = typeName.equals("byte") ? "" : Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1);
-            //special case: method can be called from anywhere to anywhere
-            //thus, only write the player when the SERVER is writing data, since the client is the only one who reads it
-            boolean writePlayerSkipCheck = methodEntry.where == Loc.both && i == 0;
-
-            if(writePlayerSkipCheck){ //write begin check
-                method.beginControlFlow("if(mindustry.Vars.net.server())");
-            }
-
-            if(BaseProcessor.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
-                method.addStatement("WRITE.$L($L)", typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "", varName);
-            }else{
-                //else, try and find a serializer
-                String ser = serializers.writers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(elem, var.asType(), true));
-
-                if(ser == null){ //make sure a serializer exists!
-                    BaseProcessor.err("No @WriteClass method to write class type: '" + typeName + "'", var);
-                    return;
-                }
-
-                //add statement for writing it
-                method.addStatement(ser + "(WRITE, " + varName + ")");
-            }
-
-            if(writePlayerSkipCheck){ //write end check
-                method.endControlFlow();
-            }
-        }
-
-        //assign packet bytes
-        method.addStatement("packet.bytes = OUT.getBytes()");
-        //assign packet length
-        method.addStatement("packet.length = OUT.size()");
-
-        String sendString;
-
-        if(forwarded){ //forward packet
-            if(!methodEntry.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
-                sendString = "mindustry.Vars.net.send(";
-            }else{
-                sendString = "mindustry.Vars.net.sendExcept(exceptConnection, ";
-            }
-        }else if(toAll){ //send to all players / to server
-            sendString = "mindustry.Vars.net.send(";
-        }else{ //send to specific client from server
-            sendString = "playerConnection.send(";
-        }
-
-        //send the actual packet
-        method.addStatement(sendString + "packet, " +
-        (methodEntry.unreliable ? "mindustry.net.Net.SendMode.udp" : "mindustry.net.Net.SendMode.tcp") + ")");
-
-
-        //end check for server/client
-        method.endControlFlow();
-
-        //add method to class, finally
-        classBuilder.addMethod(method.build());
-    }
-
-    private String getCheckString(Loc loc){
-        return loc.isClient && loc.isServer ? "mindustry.Vars.net.server() || mindustry.Vars.net.client()" :
-        loc.isClient ? "mindustry.Vars.net.client()" :
-        loc.isServer ? "mindustry.Vars.net.server()" : "false";
-    }
-}

annotations/src/main/java/mindustry/annotations/util/Svar.java

@@ -1,7 +1,6 @@
 package mindustry.annotations.util;
 
 import com.sun.source.tree.*;
-import com.sun.tools.javac.tree.JCTree.*;
 import mindustry.annotations.*;
 
 import javax.lang.model.element.*;
@@ -16,10 +15,6 @@ public class Svar extends Selement<VariableElement>{
         return up().asType().toString() + "#" + super.toString().replace("mindustry.gen.", "");
     }
 
-    public JCVariableDecl jtree(){
-        return (JCVariableDecl)BaseProcessor.elementu.getTree(e);
-    }
-
     public Stype enclosingType(){
         return new Stype((TypeElement)up());
     }

annotations/src/main/resources/classids.properties

@@ -22,6 +22,7 @@ mindustry.entities.comp.PosTeamDef=28
 mindustry.entities.comp.PuddleComp=13
 mindustry.type.Weather.WeatherStateComp=14
 mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15
+mindustry.world.blocks.campaign.PayloadLaunchPad.LargeLaunchPayloadComp=34
 mindustry.world.blocks.defense.ForceProjector.ForceDrawComp=22
 mono=16
 nova=17

annotations/src/main/resources/revisions/BulletComp/1.json

@@ -0,0 +1 @@
+{version:1,fields:[{name:collided,type:arc.struct.IntSeq},{name:damage,type:float},{name:data,type:java.lang.Object},{name:fdata,type:float},{name:lifetime,type:float},{name:owner,type:mindustry.gen.Entityc},{name:rotation,type:float},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:type,type:mindustry.entities.bullet.BulletType},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/LargeLaunchPayloadComp/0.json

@@ -0,0 +1 @@
+{fields:[{name:lifetime,type:float},{name:payload,type:mindustry.world.blocks.payloads.Payload},{name:team,type:mindustry.game.Team},{name:time,type:float},{name:x,type:float},{name:y,type:float}]}

build.gradle

@@ -13,29 +13,51 @@ buildscript{
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url 'https://jitpack.io' }
+
+        //fake repository to download my patched robovm jar from
+        ivy{
+            url 'https://github.com/'
+
+            patternLayout {
+                artifact '/[organisation]/[module]/raw/a-single-jar-file/[revision].jar'
+            }
+
+            // This is required in Gradle 6.0+ as metadata file (ivy.xml)
+            // is mandatory. Docs linked below this code section
+            metadataSources { artifact() }
+        }
     }
 
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.11'
+        //use local, patched robovm gradle plugin until my PR for gradle 7.0 support is merged
-        classpath "com.github.anuken:packr:-SNAPSHOT"
+        //https://github.com/Anuken/robovm/raw/a-single-jar-file/robovm-gradle-plugin-2.3.14-SNAPSHOT.jar
+        classpath "Anuken:robovm:robovm-gradle-plugin-2.3.14-SNAPSHOT"
+        //needed for plugin above
+        classpath "com.mobidevelop.robovm:robovm-dist-compiler:2.3.13"
+
         classpath "com.github.Anuken.Arc:packer:$arcHash"
         classpath "com.github.Anuken.Arc:arc-core:$arcHash"
     }
 }
 
+plugins{
+    id 'org.jetbrains.kotlin.jvm' version '1.4.32'
+    id "org.jetbrains.kotlin.kapt" version "1.4.32"
+}
+
 allprojects{
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
     
     version = 'release'
     group = 'com.github.Anuken'
 
     ext{
-        versionNumber = '6'
+        versionNumber = '7'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
+        steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
-        rhinoVersion = '378626d8abc552bba57864358358045d2f2dbe9b'
+        rhinoVersion = '55bf0dac1cfa7770672fd26112512c733ca9d5dc'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -83,13 +105,11 @@ allprojects{
         }
 
         hasSprites = {
-            return new File(rootDir, "core/assets/sprites/sprites.atlas").exists()
+            return new File(rootDir, "core/assets/sprites/sprites.aatls").exists()
         }
 
         getModifierString = {
-            if(versionModifier != "release"){
+            if(versionModifier != "release") return "[${versionModifier.toUpperCase()}]"
-                return "[${versionModifier.toUpperCase()}]"
-            }
             return ""
         }
 
@@ -107,8 +127,7 @@ allprojects{
             def v = System.getenv("ANDROID_HOME")
             if(v != null) return v
             //rootDir is null here, amazing. brilliant.
-            def file = new File("local.properties")
+            def file = new File(rootDir, "local.properties")
-            if(!file.exists()) file = new File("../local.properties")
             def props = new Properties().with{p -> p.load(file.newReader()); return p }
             return props.get("sdk.dir")
         }
@@ -195,10 +214,15 @@ allprojects{
 
     tasks.withType(JavaCompile){
         targetCompatibility = 8
-        sourceCompatibility = 14
+        sourceCompatibility = JavaVersion.VERSION_16
         options.encoding = "UTF-8"
         options.compilerArgs += ["-Xlint:deprecation"]
         dependsOn clearCache
+
+        options.forkOptions.jvmArgs.addAll([
+            '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
+            '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED'
+        ])
     }
 }
 
@@ -206,26 +230,20 @@ configure(project(":annotations")){
     tasks.withType(JavaCompile){
         targetCompatibility = 8
         sourceCompatibility = 8
+        options.fork = true
     }
 }
 
 //compile with java 8 compatibility for everything except the annotation project
 configure(subprojects - project(":annotations")){
     tasks.withType(JavaCompile){
-        if(JavaVersion.current() != JavaVersion.VERSION_1_8){
+        options.compilerArgs.addAll(['--release', '8'])
-            options.compilerArgs.addAll(['--release', '8', '--enable-preview'])
-        }
-
-        doFirst{
-            options.compilerArgs = options.compilerArgs.findAll{it != '--enable-preview' }
-        }
     }
 
     tasks.withType(Javadoc){
         options{
             addStringOption('Xdoclint:none', '-quiet')
-            addBooleanOption('-enable-preview', true)
+            addStringOption('-release', '16')
-            addStringOption('-release', '14')
         }
     }
 }
@@ -237,9 +255,9 @@ project(":desktop"){
 
     dependencies{
         implementation project(":core")
+        implementation arcModule("extensions:discord")
         implementation arcModule("natives:natives-desktop")
         implementation arcModule("natives:natives-freetype-desktop")
-        implementation 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1'
 
         if(debugged()) implementation project(":debug")
 
@@ -287,6 +305,15 @@ project(":ios"){
 
 project(":core"){
     apply plugin: "java-library"
+    apply plugin: "kotlin"
+    apply plugin: "kotlin-kapt"
+
+    kapt{
+        javacOptions{
+            option("-source", "16")
+            option("-target", "1.8")
+        }
+    }
 
     compileJava.options.fork = true
 
@@ -345,19 +372,20 @@ project(":core"){
     dependencies{
         compileJava.dependsOn(preGen)
 
-        api "org.lz4:lz4-java:1.4.1"
+        api "org.lz4:lz4-java:1.7.1"
         api arcModule("arc-core")
+        api arcModule("extensions:flabel")
         api arcModule("extensions:freetype")
         api arcModule("extensions:g3d")
         api arcModule("extensions:fx")
         api arcModule("extensions:arcnet")
         api "com.github.Anuken:rhino:$rhinoVersion"
         if(localArc() && debugged()) api arcModule("extensions:recorder")
+        if(localArc()) api arcModule(":extensions:packer")
 
-        compileOnly project(":annotations")
-        annotationProcessor project(":annotations")
         annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
-
+        compileOnly project(":annotations")
+        kapt project(":annotations")
     }
 
     afterEvaluate{
@@ -381,6 +409,11 @@ project(":core"){
             destinationDir = new File(buildDir, 'javadoc')
         }
     }
+
+    //comp** classes are only used for code generation
+    jar{
+        exclude("mindustry/entities/comp/**")
+    }
 }
 
 project(":server"){
@@ -397,16 +430,18 @@ project(":tests"){
 
     dependencies{
         testImplementation project(":core")
-        testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
         testImplementation arcModule("backends:backend-headless")
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
     }
 
     test{
+        //fork every test so mods don't interact with each other
+        forkEvery = 1
         useJUnitPlatform()
         workingDir = new File("../core/assets")
-        testLogging {
+        testLogging{
             exceptionFormat = 'full'
             showStandardStreams = true
         }
@@ -434,6 +469,21 @@ project(":annotations"){
     }
 }
 
+configure([":core", ":desktop", ":server", ":tools"].collect{project(it)}){
+    java{
+        withJavadocJar()
+        withSourcesJar()
+    }
+
+    publishing{
+        publications{
+            maven(MavenPublication){
+                from components.java
+            }
+        }
+    }
+}
+
 task deployAll{
     task cleanDeployOutput{
         doFirst{