Typo fix

* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 8041c305ad
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* settings

* Update bundle_ro.properties

* new blocks

* new units I

* new units II

* Update bundle_ro.properties

* Update bundle_ro.properties

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,9 +17,11 @@ assignees: ''
 
 **Link(s) to mod(s) used**: *The mod repositories or zip files that are related to the issue, if applicable.*
 
-**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME.*
+**Save file**: *The (zipped) save file you were playing on when the bug happened. THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT DELETE OR OMIT THIS LINE UNLESS YOU ARE SURE THAT THE ISSUE DOES NOT HAPPEN IN-GAME. IF YOU DO NOT HAVE A SAVE, DON'T WASTE TIME OPENING THIS ISSUE.*
 
-**Crash report**: *The contents of relevant crash report files. REQUIRED if you are reporting a crash.*
+If you remove the line above without reading it properly and understanding what it means, I will reap your soul. Even if you're playing on someone's server, you can still save the game to a slot.
+
+**(Crash) logs**: *Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs. REQUIRED if you are reporting a crash.*
 
 ---
 

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+If your pull request is **not** translation or serverlist-related, read the list of requirements below and check each box:
+
+- [ ] I have read the [contribution guidelines](https://github.com/Anuken/Mindustry/blob/master/CONTRIBUTING.md).
+- [ ] I have ensured that my code compiles, if applicable.
+- [ ] I have ensured that any new features in this PR function correctly in-game, if applicable.

.github/workflows/deployment.yml

@@ -6,56 +6,63 @@ 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
+      run: |
+        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+        cd ../Arc
+        git tag ${RELEASE_VERSION}
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${RELEASE_VERSION};
+        cd ../Mindustry
     - name: Create artifacts
       run: |
-        ./gradlew desktop:dist server:dist core:javadoc -Pbuildversion=${GITHUB_REF:1}
+        ./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
     - name: Update docs
       run: |
         cd ../
         git config --global user.email "cli@github.com"
         git config --global user.name "Github Actions"
         git clone --depth=1 https://github.com/MindustryGame/docs.git
-        cp -a Mindustry/core/build/docs/javadoc/. docs/
+        cd docs
+        find . -maxdepth 1 ! -name ".git" ! -name . -exec rm -r {} \;
+        cd ../
+        cp -a Mindustry/core/build/javadoc/. docs/
         cd docs
         git add .
-        git commit -m "Update ${GITHUB_REF:1}"
+        git commit -m "Update ${RELEASE_VERSION:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
         cd ../Mindustry
-    - name: Add Arc release
-      run: |
-        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
-        cd ../Arc
-        git tag ${GITHUB_REF}
-        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${GITHUB_REF};
-        cd ../Mindustry
     - name: Update F-Droid build string
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
         cd ../MindustryBuilds
-        echo "Updating version to ${GITHUB_REF:1}"
+        echo "Updating version to ${RELEASE_VERSION:1}"
-        echo versionName=6-fdroid-${GITHUB_REF:1}$'\n'versionCode=${GITHUB_REF:1} > version_fdroid.txt
+        BNUM=$(($GITHUB_RUN_NUMBER + 1000))
+        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
         git add .
-        git commit -m "Updating to build ${GITHUB_REF:1}"
+        git commit -m "Updating to build ${RELEASE_VERSION:1}"
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds
         cd ../Mindustry
     - name: Upload client artifacts
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: desktop/libs/Mindustry.jar
+        file: desktop/build/libs/Mindustry.jar
         tag: ${{ github.ref }}
     - name: Upload server artifacts
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: server/libs/server-release.jar
+        file: server/build/libs/server-release.jar
         tag: ${{ github.ref }}
 

.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

@@ -1,21 +1,15 @@
 name: Tests
 
-on: [push]
+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 test
     - name: Trigger BE build
-      if: ${{ github.repository == ‘Anuken/Mindustry’ }}
+      if: ${{ github.repository == 'Anuken/Mindustry' }}
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
         cd ../MindustryBuilds
@@ -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

@@ -1,4 +1,5 @@
 logs/
+/fastlane/metadata/android/en-US/changelogs/
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/
@@ -43,10 +44,17 @@ ios/robovm.properties
 packr-out/
 config/
 *.gif
+/tests/out
 
 /core/assets/basepartnames
 version.properties
 
+#sprites
+
+core/assets/sprites/sprites*
+core/assets/sprites/fallback/
+core/assets/sprites/block_colors.png
+
 .attach_*
 ## Java
 
@@ -95,6 +103,10 @@ com_crashlytics_export_strings.xml
 .externalToolBuilders/
 *.launch
 
+## VSCode
+
+.vscode/
+
 ## NetBeans
 
 /nbproject/private/

CONTRIBUTING.md

@@ -15,9 +15,6 @@ If you are submitting a new block, make sure it has a name and description, and
 If you are interested in adding a large mechanic/feature or changing large amounts of code, first contact me (Anuken) via [Discord](https://discord.gg/mindustry) (preferred method) or via e-mail (*anukendev@gmail.com*).  
 For most changes, this should not be necessary. I just want to know if you're doing something big so I can offer advice and/or make sure you're not wasting your time on it.
 
-### Do not include packed sprites in your pull request.
-When making a pull request that changes or adds new sprites, do not add the modified atlas & `spritesX.png` files to your final pull request. These are a frequent source of conflicts.
-
 
 ## Style Guidelines
 
@@ -29,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.
 

ISSUES.md

@@ -0,0 +1,52 @@
+# Why was my issue closed?
+
+This document goes over some common causes for issue closures.
+
+## You did not fill in the template
+
+I can't debug the problem unless you provide the information the template asks for. 
+If you cannot put in the effort to fill out a template, then don't expect me to put in the effort to fix it.
+
+## Your issue was already reported
+
+If the problem in your issue has already been encountered before, it will be closed - especially if your report doesn't provide any new information.
+Make sure you search the *closed* issues before making an issue.
+
+I do not link the specific issue(s) that report the same problem, because searching takes time - if you're interested in finding them, you should be able to do so without my help.
+
+To be clear: I do **not** expect users to look at *all* previous issues, or do a comprehensive stack trace analysis to see if their crash was already reported.
+
+## Your issue was already fixed
+
+The problem you reported has been addressed. Note that this does **not** mean that the latest stable version of Mindustry has the fix! 
+It simply means that I have committed (or am about to commit) a patch that fixes it *on the current development branch*.
+
+## Your issue is missing a crash report or log
+
+If the game crashes without a specific cause, and you don't send me a log, I can't fix it. There is no way for me to know what went wrong.
+
+During a normal crash, the game should tell you where the log is saved. If not, you should still be able to look in the game's crash folder on most operating systems, or export the logs in *Settings -> Game Data -> Export Crash Logs*.
+
+## Your issue is missing saves or screenshots
+
+Even if you think your problem happens everywhere and saves/screenshots are redundant, this is frequently not the case.
+If I cannot reproduce the problem on my own saves and you have not linked any of your own, then the problem is likely to be save-specific. If you do not send me any, the problem cannot be investigated further.
+
+## Your issue is related to an external program
+
+If Mindustry causes something else to crash or misbehave, I am very unlikely to fix it. Unless the problem is serious, widespread and/or clearly a bug *in Mindustry*, it is not my responsibility.
+
+Similarly, if you use another (invasive) program to change how Mindustry works, and something goes wrong, that is not my problem. Don't do it.
+
+## Your issue is caused by mods
+
+Crashes and bugs related to installed mods should be reported in the relevant mod repository, not here.
+*Note that problems with the Mindustry modding API are a separate problem, and do not apply.*
+
+## I cannot reproduce your issue
+
+If I follow your instructions and am repeatedly unable to reproduce the problem you've reported, then it is very unlikely to be fixed. 
+Either the problem is device-specific, or there is not enough information given for me to be able to reproduce it.
+
+I may attempt to change some code if I think it will make the issue less likely to occur, but without knowing for sure, the issue cannot be considered truly "fixed". 
+As I cannot make any further progress on the problem, there is no reason to keep it open. If it is a common bug/crash, other people will come along with information that may shed some light on the issue.

README.md

@@ -1,7 +1,7 @@
 ![Logo](core/assets-raw/sprites/ui/logo.png)
 
-[![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
+[![Build Status](https://github.com/Anuken/Mindustry/workflows/Tests/badge.svg?event=push)](https://github.com/Anuken/Mindustry/actions)
-[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord)](https://discord.gg/mindustry)  
+[![Discord](https://img.shields.io/discord/391020510269669376.svg?logo=discord&logoColor=white&logoWidth=20&labelColor=7289DA&label=Discord&color=17cf48)](https://discord.gg/mindustry)  
 
 A sandbox tower defense game written in Java.
 
@@ -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
 
@@ -61,5 +61,5 @@ Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Su
 
 ## Downloads
 
-| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry)    |    [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry)   |    [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry)	| [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry)     |
+| [![](https://static.itch.io/images/badge.svg)](https://anuke.itch.io/mindustry)    |    [![](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=io.anuke.mindustry)   |    [![](https://fdroid.gitlab.io/artwork/badge/get-it-on.png)](https://f-droid.org/packages/io.anuke.mindustry)	| [![](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/com.github.Anuken.Mindustry)  
 |---	|---	|---	|---	|

SERVERLIST.md

@@ -1,22 +1,23 @@
 ### Adding a server to the list
 
 Mindustry now has a public list of servers that everyone can see and connect to. 
-This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers.json) in this repository.
+This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json) in this repository.
 
 You may want to add your server to this list. The steps for getting this done are as follows:
 
 1. **Ensure your server is properly moderated.** For the most part, this applies to survival servers, but PvP servers can be affected as well.
-You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins. 
+You'll need to either hire some moderators, or make use of (currently non-existent) anti-grief and anti-curse plugins.
 *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
-2. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
+2. Make sure that your server is able to handle inappropriate content - this includes NSFW display/sorter art and abusive messages. **Servers that allow such content will be removed immediately.** Consider banning display blocks if it is a problem for your server: `rules add bannedBlocks ["logic-display", "large-logic-display"]`.
+3. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
   - Your name or description must reflect the type of server you're hosting. 
   Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
   - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
   - Try to be professional in your text; use common sense.
-3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
+4. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
-4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
+5. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
-5. Finally, **submit a pull request** to add your server's IP to the list. 
+6. Finally, **submit a pull request** to add your server's IP to the list. 
-This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers.json), then add a JSON object with a single key, indicating your server address.
+This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers_v6.json), then add a JSON object with a single key, indicating your server address.
 For example, if your server address is `google.com`, you would add a comma after the last entry and insert:
 ```json
   {

android/AndroidManifest.xml

@@ -14,10 +14,11 @@
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:isGame="true"
+            android:theme="@style/ArcTheme"
             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

@@ -4,13 +4,11 @@ buildscript{
         mavenCentral()
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
     }
 
     dependencies{
-        //IMPORTANT NOTICE: any version of the plugin after 3.4.1 will break builds
+        //note that later versions, like alpha05, fail to work correctly
-        //it appears abstract methods don't get desugared properly (if at all)
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
-        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
@@ -20,36 +18,20 @@ configurations{ natives }
 
 repositories{
     mavenCentral()
-    jcenter()
     maven{ url "https://maven.google.com" }
 }
 
-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'
@@ -60,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'
     }
@@ -74,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)
@@ -110,6 +96,17 @@ android{
         }
     }
 
+    buildTypes{
+        all{
+            minifyEnabled = true
+            shrinkResources = true
+            //this is the ONLY WAY I could find to force r8 to keep its filthy hands off of my default interfaces.
+            //may have undesirable side effects
+            debuggable = true
+            proguardFiles("proguard-rules.pro")
+        }
+    }
+
     if(project.hasProperty("RELEASE_STORE_FILE") || System.getenv("CI") == "true"){
         buildTypes{
             release{
@@ -117,10 +114,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{
@@ -132,23 +156,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()
+if(!project.ext.hasSprites()){
-        localProperties.withInputStream{ instr ->
+    tasks.whenTaskAdded{ task ->
-            properties.load(instr)
+        if(task.name == 'assembleDebug' || task.name == 'assembleRelease'){
-        }
+            task.dependsOn ":tools:pack"
-        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'
 }

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

@@ -8,4 +8,4 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowFullscreen">true</item>
     </style>
-</resources>
+</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,5 +1,4 @@
 <resources>
-
     <style name="ArcTheme" parent="android:Theme">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -8,5 +7,4 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowFullscreen">true</item>
     </style>
-
+</resources>
-</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();
@@ -44,13 +47,13 @@ public class AndroidLauncher extends AndroidApplication{
             if(handler != null){
                 handler.uncaughtException(thread, error);
             }else{
-                error.printStackTrace();
+                Log.err(error);
                 System.exit(1);
             }
         });
 
         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,9 +74,28 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-            public Class<?> loadJar(Fi jar, String mainClass) throws Exception{
+            public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
-                DexClassLoader loader = new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, getClassLoader());
+                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
-                return Class.forName(mainClass, true, loader);
+                    @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
@@ -161,15 +183,25 @@ public class AndroidLauncher extends AndroidApplication{
         }, new AndroidApplicationConfiguration(){{
             useImmersiveMode = true;
             hideStatusBar = true;
-            stencil = 8;
         }});
         checkFiles(getIntent());
 
         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...");
@@ -211,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,7 +533,9 @@ public class EntityProcess extends BaseProcessor{
                         mbuilder.addStatement("mindustry.gen.Groups.queueFree(($T)this)", Poolable.class);
                     }
 
-                    builder.addMethod(mbuilder.build());
+                    if(!legacy || specialIO){
+                        builder.addMethod(mbuilder.build());
+                    }
                 }
 
                 //add pool reset method and implement Poolable
@@ -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

@@ -1,5 +1,7 @@
 package mindustry.annotations.impl;
 
+import arc.*;
+import arc.audio.*;
 import arc.files.*;
 import arc.scene.style.*;
 import arc.struct.*;
@@ -43,7 +45,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());
@@ -87,18 +89,18 @@ public class AssetsProcess extends BaseProcessor{
             filename = filename.substring(0, filename.indexOf("."));
 
             String sfilen = filename;
-            String dtype = p.name().endsWith(".9.png") ? "arc.scene.style.NinePatchDrawable" : "arc.scene.style.TextureRegionDrawable";
+            String dtype = "arc.scene.style.Drawable";
 
             String varname = capitalize(sfilen);
 
             if(SourceVersion.isKeyword(varname)) varname += "s";
 
             type.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
-            load.addStatement(varname + " = (" + dtype + ")arc.Core.atlas.drawable($S)", sfilen);
+            load.addStatement(varname + " = arc.Core.atlas.drawable($S)", sfilen);
         });
 
         for(Element elem : elements){
-            Seq.with(((TypeElement)elem).getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
+            Seq.with(elem.getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
                 String fname = field.getSimpleName().toString();
                 if(fname.startsWith("default")){
                     loadStyles.addStatement("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")");
@@ -117,15 +119,36 @@ public class AssetsProcess extends BaseProcessor{
 
     void processSounds(String classname, String path, String rtype) throws Exception{
         TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
-        MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
         MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        CodeBlock.Builder staticb = CodeBlock.builder();
+
+        type.addField(FieldSpec.builder(IntMap.class, "idToSound", Modifier.STATIC, Modifier.PRIVATE).initializer("new IntMap()").build());
+        type.addField(FieldSpec.builder(ObjectIntMap.class, "soundToId", Modifier.STATIC, Modifier.PRIVATE).initializer("new ObjectIntMap()").build());
+
+        type.addMethod(MethodSpec.methodBuilder("getSoundId")
+        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+        .addParameter(Sound.class, "sound")
+        .returns(int.class)
+        .addStatement("return soundToId.get(sound, -1)").build());
+
+        type.addMethod(MethodSpec.methodBuilder("getSound")
+        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+        .addParameter(int.class, "id")
+        .returns(Sound.class)
+        .addStatement("return (Sound)idToSound.get(id, () -> Sounds.none)").build());
 
         HashSet<String> names = new HashSet<>();
-        Fi.get(path).walk(p -> {
+        Seq<Fi> files = new Seq<>();
+        Fi.get(path).walk(files::add);
+
+        files.sortComparing(Fi::name);
+        int id = 0;
+
+        for(Fi p : files){
             String name = p.nameWithoutExtension();
 
             if(names.contains(name)){
-                BaseProcessor.err("Duplicate file name: " + p.toString() + "!");
+                BaseProcessor.err("Duplicate file name: " + p + "!");
             }else{
                 names.add(name);
             }
@@ -134,20 +157,23 @@ public class AssetsProcess extends BaseProcessor{
 
             String filepath =  path.substring(path.lastIndexOf("/") + 1) + p.path().substring(p.path().lastIndexOf(path) + path.length());
 
-            String filename = "\"" + filepath + "\"";
+            staticb.addStatement("soundToId.put($L, $L)", name, id);
-            loadBegin.addStatement("arc.Core.assets.load(" + filename + ", " + rtype + ".class).loaded = a -> " + name + " = (" + rtype + ")a", filepath, filepath.replace(".ogg", ".mp3"));
 
-            dispose.addStatement("arc.Core.assets.unload(" + filename + ")");
+            loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; soundToId.put(a, $L); idToSound.put($L, a); }",
-            dispose.addStatement(name + " = null");
+                Core.class, filepath, rtype, name, rtype, id, id);
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
+
-        });
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
+
+            id ++;
+        }
+
+        type.addStaticBlock(staticb.build());
 
         if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.audio." + rtype.substring(rtype.lastIndexOf(".") + 1) + "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
         }
 
         type.addMethod(loadBegin.build());
-        type.addMethod(dispose.build());
         JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
     }
 

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/misc/LogicStatementProcessor.java

@@ -26,7 +26,8 @@ public class LogicStatementProcessor extends BaseProcessor{
         MethodSpec.Builder reader = MethodSpec.methodBuilder("read")
             .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
             .returns(tname("mindustry.logic.LStatement"))
-            .addParameter(String[].class, "tokens");
+            .addParameter(String[].class, "tokens")
+            .addParameter(int.class, "length");
 
         Seq<Stype> types = types(RegisterStatement.class);
 
@@ -76,7 +77,7 @@ public class LogicStatementProcessor extends BaseProcessor{
                     "");
 
                 //reading primitives, strings and enums is supported; nothing else is
-                reader.addStatement("if(tokens.length > $L) result.$L = $L(tokens[$L])",
+                reader.addStatement("if(length > $L) result.$L = $L(tokens[$L])",
                 index + 1,
                 field.name(),
                 field.mirror().toString().equals("java.lang.String") ?

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,106 +17,58 @@ 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*
+        //get serializers
-        if(round == 1){
+        //class serializers
-            //get serializers
+        ClassSerializer serializer = TypeIOResolver.resolve(this);
-            serializer = TypeIOResolver.resolve(this);
+        //last method ID used
-            //last method ID used
+        int lastMethodID = 0;
-            int lastMethodID = 0;
+        //find all elements with the Remote annotation
-            //find all elements with the Remote annotation
+        //all elements with the Remote annotation
-            elements = methods(Remote.class);
+        Seq<Smethod> elements = methods(Remote.class);
-            //map of all classes to generate by name
+        //list of all method entries
-            classMap = new HashMap<>();
+        Seq<MethodEntry> methods = new Seq<>();
-            //list of all method entries
-            methods = new Seq<>();
-            //list of all method entries
-            classes = new Seq<>();
 
-            Seq<Smethod> orderedElements = elements.copy();
+        Seq<Smethod> orderedElements = elements.copy();
-            orderedElements.sortComparing(Object::toString);
+        orderedElements.sortComparing(Selement::toString);
 
-            //create methods
+        //create methods
-            for(Smethod element : orderedElements){
+        for(Smethod element : orderedElements){
-                Remote annotation = element.annotation(Remote.class);
+            Remote annotation = element.annotation(Remote.class);
 
-                //check for static
+            //check for static
-                if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){
+            if(!element.is(Modifier.STATIC) || !element.is(Modifier.PUBLIC)){
-                    err("All @Remote methods must be public and static: ", element);
+                err("All @Remote methods must be public and static", element);
-                }
-
-                //can't generate none methods
-                if(annotation.targets() == Loc.none){
-                    err("A @Remote method's targets() cannot be equal to 'none':", element);
-                }
-
-                //get and create class entry if needed
-                if(!classMap.containsKey(callLocation)){
-                    ClassEntry clas = new ClassEntry(callLocation);
-                    classMap.put(callLocation, clas);
-                    classes.add(clas);
-                }
-
-                ClassEntry entry = classMap.get(callLocation);
-
-                //create and add entry
-                MethodEntry method = new MethodEntry(entry.name, BaseProcessor.getMethodName(element.e), annotation.targets(), annotation.variants(),
-                annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++, element.e, annotation.priority());
-
-                entry.methods.add(method);
-                methods.add(method);
             }
 
-            //create read/write generators
+            //can't generate none methods
-            RemoteWriteGenerator writegen = new RemoteWriteGenerator(serializer);
+            if(annotation.targets() == Loc.none){
+                err("A @Remote method's targets() cannot be equal to 'none'", element);
+            }
 
-            //generate the methods to invoke (write)
+            String packetName = Strings.capitalize(element.name()) + "CallPacket";
-            writegen.generateFor(classes, packageName);
+            int[] index = {1};
-        }else if(round == 2){ //round 2: generate all *readers*
-            RemoteReadGenerator readgen = new RemoteReadGenerator(serializer);
 
-            //generate server readers
+            while(methods.contains(m -> m.packetClassName.equals(packetName + (index[0] == 1 ? "" : index[0])))){
-            readgen.generateFor(methods.select(method -> method.where.isClient), readServerName, packageName, true);
+                index[0] ++;
-            //generate client readers
+            }
-            readgen.generateFor(methods.select(method -> method.where.isServer), readClientName, packageName, false);
 
-            //create class for storing unique method hash
+            //create and add entry
-            TypeSpec.Builder hashBuilder = TypeSpec.classBuilder("MethodHash").addModifiers(Modifier.PUBLIC);
+            MethodEntry method = new MethodEntry(
-            hashBuilder.addJavadoc(autogenWarning);
+                callLocation, BaseProcessor.getMethodName(element.e), packetName + (index[0] == 1 ? "" : index[0]),
-            hashBuilder.addField(FieldSpec.builder(int.class, "HASH", Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
+                annotation.targets(), annotation.variants(),
-            .initializer("$1L", Arrays.hashCode(methods.map(m -> m.element).toArray())).build());
+                annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++,
+                element, annotation.priority()
+            );
 
-            //build and write resulting hash class
+            methods.add(method);
-            TypeSpec spec = hashBuilder.build();
-            JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
         }
+
+        //generate the methods to invoke, as well as the packet classes
+        CallGenerator.generate(serializer, methods);
     }
 }

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 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/AnnotationProxyMaker.java

@@ -7,6 +7,7 @@ import com.sun.tools.javac.code.Attribute.Enum;
 import com.sun.tools.javac.code.Attribute.Error;
 import com.sun.tools.javac.code.Attribute.Visitor;
 import com.sun.tools.javac.code.Attribute.*;
+import com.sun.tools.javac.code.Scope.*;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.ArrayType;
@@ -64,36 +65,13 @@ public class AnnotationProxyMaker{
         LinkedHashMap map = new LinkedHashMap();
         ClassSymbol cl = (ClassSymbol)this.anno.type.tsym;
 
-        //try to use Java 8 API for this if possible
+        for(Symbol s : cl.members().getSymbols(LookupKind.NON_RECURSIVE)){
-        try{
+            if(s.getKind() == ElementKind.METHOD){
-            Class entryClass = Class.forName("com.sun.tools.javac.code.Scope$Entry");
+                MethodSymbol var4 = (MethodSymbol)s;
-            Object members = cl.members();
+                Attribute var5 = var4.getDefaultValue();
-            Field field = members.getClass().getField("elems");
+                if(var5 != null){
-            Object elems = field.get(members);
+                    map.put(var4, var5);
-            Field siblingField = entryClass.getField("sibling");
-            Field symField = entryClass.getField("sym");
-            for(Object currEntry = elems; currEntry != null; currEntry = siblingField.get(currEntry)){
-                handleSymbol((Symbol)symField.get(currEntry), map);
-            }
-
-        }catch(Throwable e){
-            //otherwise try other API
-
-            try{
-                Class lookupClass = Class.forName("com.sun.tools.javac.code.Scope$LookupKind");
-                Field nonRecField = lookupClass.getField("NON_RECURSIVE");
-                Object nonRec = nonRecField.get(null);
-                Scope scope = cl.members();
-                Method getSyms = scope.getClass().getMethod("getSymbols", lookupClass);
-                Iterable<Symbol> it = (Iterable<Symbol>)getSyms.invoke(scope, nonRec);
-                Iterator<Symbol> i = it.iterator();
-                while(i.hasNext()){
-                    handleSymbol(i.next(), map);
                 }
-
-            }catch(Throwable death){
-                //I tried
-                throw new RuntimeException(death);
             }
         }
 
@@ -104,17 +82,6 @@ public class AnnotationProxyMaker{
         return map;
     }
 
-    private void handleSymbol(Symbol sym, LinkedHashMap map){
-
-        if(sym.getKind() == ElementKind.METHOD){
-            MethodSymbol var4 = (MethodSymbol)sym;
-            Attribute var5 = var4.getDefaultValue();
-            if(var5 != null){
-                map.put(var4, var5);
-            }
-        }
-    }
-
     private Object generateValue(MethodSymbol var1, Attribute var2){
         AnnotationProxyMaker.ValueVisitor var3 = new AnnotationProxyMaker.ValueVisitor(var1);
         return var3.getValue(var2);

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

@@ -12,6 +12,10 @@ import java.lang.Class;
 import java.lang.annotation.*;
 import java.lang.reflect.*;
 
+/**
+ * Wrapper over Element with added utility functions.
+ * I would have preferred to use extension methods for this, but Java doesn't have any.
+ * */
 public class Selement<T extends Element>{
     public final T e;
 

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/BulletComp/2.json

@@ -0,0 +1 @@
+{version:2,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:vel,type:arc.math.geom.Vec2},{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}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/alpha/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/arkyid/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/beta/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/block/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/block/6.json

@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/corvus/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/corvus/6.json

@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/flare/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/flare/6.json

@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/gamma/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mace/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mace/6.json

@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mega/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mega/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mono/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/mono/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/nova/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/nova/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/oct/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/oct/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/poly/3.json

@@ -0,0 +1 @@
+{version:3,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/poly/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/pulsar/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/quad/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/quad/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:payloads,type:arc.struct.Seq<mindustry.world.blocks.payloads.Payload>},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/quasar/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:baseRotation,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/risso/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/risso/6.json

@@ -0,0 +1 @@
+{version:6,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/spiroct/4.json

@@ -0,0 +1 @@
+{version:4,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/spiroct/5.json

@@ -0,0 +1 @@
+{version:5,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:ammo,type:float},{name:armor,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:x,type:float},{name:y,type:float}]}

annotations/src/main/resources/revisions/toxopid/2.json

@@ -0,0 +1 @@
+{version:2,fields:[{name:ammo,type:float},{name:controller,type:mindustry.entities.units.UnitController},{name:elevation,type:float},{name:flag,type:double},{name:health,type:float},{name:isShooting,type:boolean},{name:mineTile,type:mindustry.world.Tile},{name:mounts,type:"mindustry.entities.units.WeaponMount[]"},{name:plans,type:arc.struct.Queue<mindustry.entities.units.BuildPlan>},{name:rotation,type:float},{name:shield,type:float},{name:spawnedByCore,type:boolean},{name:stack,type:mindustry.type.ItemStack},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>},{name:team,type:mindustry.game.Team},{name:type,type:mindustry.type.UnitType},{name:updateBuilding,type:boolean},{name:vel,type:arc.math.geom.Vec2},{name:x,type:float},{name:y,type:float}]}

build.gradle

@@ -12,31 +12,52 @@ buildscript{
         mavenCentral()
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        jcenter()
         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 = 'beta'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
+        steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
-        rhinoVersion = '2617981f706e50b8753155d8e15e326308be3b22'
+        rhinoVersion = '9f792d202471fb3789eab7bb261fec13d67287e2'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -83,10 +104,12 @@ allprojects{
             return "v$buildVersion"
         }
 
+        hasSprites = {
+            return new File(rootDir, "core/assets/sprites/sprites.aatls").exists()
+        }
+
         getModifierString = {
-            if(versionModifier != "release"){
+            if(versionModifier != "release") return "[${versionModifier.toUpperCase()}]"
-                return "[${versionModifier.toUpperCase()}]"
-            }
             return ""
         }
 
@@ -104,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")
         }
@@ -180,7 +202,6 @@ allprojects{
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
         maven{ url 'https://jitpack.io' }
-        jcenter()
     }
 
     task clearCache{
@@ -193,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'
+        ])
     }
 }
 
@@ -204,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')
         }
     }
 }
@@ -235,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")
 
@@ -253,18 +273,22 @@ project(":ios"){
 
     task incrementConfig{
         def vfile = file('robovm.properties')
+        def bversion = getBuildVersion()
         def props = new Properties()
         if(vfile.exists()){
             props.load(new FileInputStream(vfile))
         }else{
             props['app.id'] = 'io.anuke.mindustry'
-            props['app.version'] = '5.0'
+            props['app.version'] = '6.0'
             props['app.mainclass'] = 'mindustry.IOSLauncher'
             props['app.executable'] = 'IOSLauncher'
             props['app.name'] = 'Mindustry'
         }
         
         props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
+        if(bversion != "custom build"){
+            props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0")
+        }
         props.store(vfile.newWriter(), null)
     }
 
@@ -281,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
 
@@ -297,9 +330,10 @@ project(":core"){
             def props = loadVersionProps()
             def androidVersion = props['androidBuildCode'].toInteger() - 2
             def loglines = file("../changelog").text.split("\n")
+            def notice = "[This is a truncated changelog, see Github for full notes]"
             def maxLength = 460
 
-            def androidLogList = loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
+            def androidLogList = [notice] + loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
             def result = ""
             androidLogList.forEach{line ->
                 if(result.length() + line.length() + 1 < maxLength){
@@ -311,22 +345,74 @@ project(":core"){
         }
     }
 
+    task sourcesJar(type: Jar, dependsOn: classes){
+        archiveClassifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task assetsJar(type: Jar, dependsOn: ":tools:pack"){
+        archiveClassifier = 'assets'
+        from files("assets"){
+            exclude "config", "cache", "music", "sounds"
+        }
+    }
+
+    task musicJar(type: Jar){
+        archiveClassifier = 'music'
+        from files("assets"){
+            include "music/*", "sounds/*"
+        }
+    }
+
+    artifacts{
+        archives sourcesJar
+        archives assetsJar
+    }
+
     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{
+        task mergedJavadoc(type: Javadoc){
+            def blacklist = [project(":ios"), project(":desktop"), project(":server"), project(":annotations")]
+            if(findProject(":android") != null){
+                blacklist += project(":android")
+            }
+
+            source rootProject.subprojects.collect{ project ->
+                if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
+                    return project.sourceSets.main.allJava
+                }
+            }
+
+            classpath = files(rootProject.subprojects.collect { project ->
+                if(!blacklist.contains(project) && project.hasProperty("sourceSets")){
+                    return project.sourceSets.main.compileClasspath
+                }
+            })
+            destinationDir = new File(buildDir, 'javadoc')
+        }
+    }
+
+    //comp** classes are only used for code generation
+    jar{
+        exclude("mindustry/entities/comp/**")
     }
 }
 
@@ -344,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
         }
@@ -378,7 +466,21 @@ project(":annotations"){
     dependencies{
         implementation 'com.squareup:javapoet:1.12.1'
         implementation "com.github.Anuken.Arc:arc-core:$arcHash"
-        implementation files("${System.getProperty('java.home')}/../lib/tools.jar")
+    }
+}
+
+configure([":core", ":desktop", ":server", ":tools"].collect{project(it)}){
+    java{
+        withJavadocJar()
+        withSourcesJar()
+    }
+
+    publishing{
+        publications{
+            maven(MavenPublication){
+                from components.java
+            }
+        }
     }
 }
 
@@ -399,6 +501,17 @@ task deployAll{
     dependsOn "desktop:packrWindows64"
     dependsOn "desktop:packrWindows32"
     dependsOn "desktop:packrMacOS"
-    dependsOn "server:deploy"
+    if(versionModifier != "steam"){
-    dependsOn "android:deploy"
+        dependsOn "server:deploy"
+        dependsOn "android:deploy"
+    }
+}
+
+task resolveDependencies{
+    doLast{
+        rootProject.allprojects{ project ->
+            Set<Configuration> configurations = project.buildscript.configurations + project.configurations
+            configurations.findAll{c -> c.canBeResolved}.forEach{c -> c.resolve()}
+        }
+    }
 }

core/assets-raw/fontgen/extra/planet.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg542"
+   sodipodi:docname="planet.svg"
+   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
+  <metadata
+     id="metadata548">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs546" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1316"
+     id="namedview544"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="15.75"
+     inkscape:cx="-16.385458"
+     inkscape:cy="16.16535"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg542" />
+  <path
+     id="polygon2"
+     style="fill:#ffffff"
+     d="M 5.5 0 L 5 0.5 L 4.5 1 L 3.5 1 L 3 1.5 L 2.5 2 L 2 2.5 L 1.5 3 L 1 3.5 L 1 4.5 L 0.5 5 L 0 5.5 L 0 6.5 L 0 7.5 L 0 8.5 L 0 9.5 L 0 10.5 L 0.5 11 L 1 11.5 L 1 12.5 L 1.5 13 L 2 13.5 L 2.5 14 L 3 14.5 L 3.5 15 L 4.5 15 L 5 15.5 L 5.5 16 L 6.5 16 L 7.5 16 L 8.5 16 L 9.5 16 L 10.5 16 L 11 15.5 L 11.5 15 L 12.5 15 L 13 14.5 L 13.5 14 L 14 13.5 L 14.5 13 L 15 12.5 L 15 11.5 L 15.5 11 L 16 10.5 L 16 9.5 L 16 8.5 L 16 7.5 L 16 6.5 L 16 5.5 L 15.5 5 L 15 4.5 L 15 3.5 L 14.5 3 L 14 2.5 L 13.5 2 L 13 1.5 L 12.5 1 L 11.5 1 L 11 0.5 L 10.5 0 L 9.5 0 L 8.5 0 L 7.5 0 L 6.5 0 L 5.5 0 z M 6.5 1 L 7 1.5 L 7.5 2 L 8.5 2 L 9 2.5 L 9 3.5 L 9.5 4 L 10 4.5 L 10.5 5 L 11 5.5 L 11.5 6 L 12.5 6 L 13.5 6 L 14.5 6 L 15 6.5 L 15 7.5 L 15 8.5 L 15 9.5 L 14.5 10 L 14 10.5 L 14 11.5 L 13.5 12 L 13 12.5 L 12.5 13 L 12 13.5 L 11.5 14 L 10.5 14 L 10 14.5 L 9.5 15 L 8.5 15 L 8 14.5 L 7.5 14 L 7 13.5 L 7 12.5 L 7.5 12 L 8 11.5 L 8.5 11 L 9 10.5 L 9 9.5 L 9 8.5 L 8.5 8 L 8 7.5 L 7.5 7 L 6.5 7 L 5.5 7 L 4.5 7 L 4 7.5 L 3.5 8 L 3 8.5 L 2.5 9 L 2 9.5 L 1.5 10 L 1 9.5 L 1 8.5 L 1 7.5 L 1 6.5 L 1.5 6 L 2 5.5 L 2 4.5 L 2.5 4 L 3 3.5 L 3.5 3 L 4 2.5 L 4.5 2 L 5.5 2 L 6 1.5 L 6.5 1 z M 11.5 9 L 11 9.5 L 11 10.5 L 11.5 11 L 12.5 11 L 13 10.5 L 13 9.5 L 12.5 9 L 11.5 9 z " />
+</svg>