Buildscript fixes

Merge remote-tracking branch 'origin/master'
Fixed improperly initialized mods crashing the database
2026-02-13 11:29:36 -05:00 · 2026-02-13 11:17:48 -05:00 · 2026-02-13 11:17:43 -05:00 · 2026-02-13 11:13:46 -05:00 · 2026-02-13 11:06:24 -05:00 · 2026-02-13 10:01:37 -05:00
3079 changed files with 150365 additions and 40759 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,30 +0,0 @@
 ---
 name: Bug report
 about: Create a report to help fix an issue.
 title: ''
 labels: bug
 assignees: ''
 ---
 **Platform**: *Android/iOS/Mac/Windows/Linux*
 **Build**: *The build number under the title in the main menu. Required. "LATEST" IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.*
 **Issue**: *Explain your issue in detail.*
 **Steps to reproduce**: *How you happened across the issue, and what exactly you did to make the bug happen.*
 **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 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.*
 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.*
 ---
 *Place an X (no spaces) between the brackets to confirm that you have read the line below.*  
 - [ ] **I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.**
 - [ ] **I have searched the closed and open issues to make sure that this problem has not already been reported.**
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,76 @@
 name: Bug report
 description: The type of device you were playing on
 labels: ["bug"]
 body:
  - type: dropdown
    id: platform
    attributes:
      label: Platforms
      description: On what platforms do you know the bug happens?
      multiple: false
      options:
        - Android
        - iOS
        - Mac
        - Windows
        - Linux
    validations:
      required: true
  - type: input
    id: build
    attributes:
      label: Build
      description: The build number under the title in the main menu.
      placeholder: LATEST IS NOT A VERSION, I NEED THE EXACT BUILD NUMBER OF YOUR GAME.
    validations:
      required: true
  - type: textarea
    id: issue
    attributes:
      label: Issue
      description: Explain your issue in detail.
    validations:
      required: true
  - type: textarea
    id: reproduction
    attributes:
      label: Steps to reproduce
      description: How you happened across the issue, and what exactly you did to make the bug happen.
    validations:
      required: true
  - type: textarea
    id: mods
    attributes:
      label: Mods used
      description: The mod repositories or zip files that are related to the issue, if applicable.
    validations:
      required: false
  - type: textarea
    id: save-file
    attributes:
      label: Save file
      description: The (zipped) save file you were playing on when the bug happened. If this happened in the campaign, specify the sector, and attach the file you get from Settings -> Game Data -> Export Data. For custom games, attach the .msav file exported from the save dialog, zipped.
      placeholder: THIS IS REQUIRED FOR ANY ISSUE HAPPENING IN-GAME OR IN MULTIPLAYER, REGARDLESS OF WHETHER YOU THINK IT HAPPENS EVERYWHERE. DO NOT 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.
    validations:
      required: false
  - type: textarea
    id: logs
    attributes:
      label: (Crash) logs
      description: Either crash reports from the crash folder, or the file you get when you go into Settings -> Game Data -> Export Crash logs.
      placeholder: REQUIRED if you are reporting a crash.
    validations:
      required: false
  - type: checkboxes
    id: agreement
    attributes:
      label: Submission
      description: Check the boxes to confirm that you have read the lines below.
      options:
        - label: I have updated to the latest release (https://github.com/Anuken/Mindustry/releases) to make sure my issue has not been fixed.
          required: true
        - label: I have searched the closed and open issues to make sure that this problem has not already been reported.
          required: true
        - label: "I am not using Foo's Client, and have made sure the bug is not caused by mods I have installed."
          required: true
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -5,25 +5,49 @@ on:
    tags:
      - 'v*'
 permissions: {}
 jobs:
  deploy:
    permissions:
      contents: write # for release creation (svenstaro/upload-release-action)
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
      uses: actions/setup-java@v1
      with:
-        java-version: 16
+        java-version: 17
    - name: Set env
      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
    - name: Add Arc release
      run: |
        git config --global user.email "actions@github.com"
        git config --global user.name "Github Actions"
        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: Update JITpack repo
      run: |
        cd ../
        cp -r ./Mindustry ./MindustryJitpack
        cd MindustryJitpack
        git config --global user.name "Github Actions"
        git config --global user.email "actions@github.com"
        git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git
        rm -rf .git
        cp -r ./MindustryJitpack/.git ./.git
        rm -rf MindustryJitpack
        rm -rf .github
        rm README.md
        git add .
        git commit --allow-empty -m "Updating"
        git tag ${RELEASE_VERSION}
        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack ${RELEASE_VERSION}
        cd ../Mindustry
    - name: Create artifacts
      run: |
        ./gradlew desktop:dist server:dist core:mergedJavadoc -Pbuildversion=${RELEASE_VERSION:1}
@@ -48,7 +72,7 @@ jobs:
        cd ../MindustryBuilds
        echo "Updating version to ${RELEASE_VERSION:1}"
        BNUM=$(($GITHUB_RUN_NUMBER + 1000))
-        echo versionName=7-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
+        echo versionName=8-fdroid-${RELEASE_VERSION:1}$'\n'versionCode=${BNUM} > version_fdroid.txt
        git add .
        git commit -m "Updating to build ${RELEASE_VERSION:1}"
        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
 name: "Validate Gradle Wrapper"
 on: [push, pull_request]
 jobs:
  validation:
    name: "Validation"
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - uses: gradle/wrapper-validation-action@v2
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,20 +2,29 @@ name: Pull Request Tests
 on: [pull_request, workflow_dispatch]
 permissions:
  contents: read # to fetch code (actions/checkout)
 jobs:
  testPR:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
      uses: actions/setup-java@v1
      with:
-        java-version: 16
+        java-version: 17
    - name: Fetch latest Arc
      run: git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
    - name: Setup Gradle
      uses: gradle/gradle-build-action@v2
    - name: Run unit tests
      run: ./gradlew tests:test --stacktrace --rerun
    - name: Run unit tests and build JAR
-      run: ./gradlew test desktop:dist
+      run: ./gradlew desktop:dist
    - name: Upload desktop JAR for testing
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
      with:
        name: Desktop JAR (zipped)
        path: desktop/build/libs/Mindustry.jar
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,8 +2,12 @@ name: Tests
 on: [push, workflow_dispatch]
 permissions: {}
 jobs:
  runPush:
    permissions:
      contents: write # for Update bundles
    runs-on: ubuntu-latest
    steps:
@@ -15,11 +19,45 @@ jobs:
        cd ../MindustryBuilds
        BNUM=$(($GITHUB_RUN_NUMBER + 20000))
        git tag ${BNUM}
-        git config --global user.name "Build Uploader"
+        git config --global user.name "Github Actions"
        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryBuilds ${BNUM}
-    - name: Set up JDK 16
+    - name: Set up JDK 17
      uses: actions/setup-java@v1
      with:
-        java-version: 16
+        java-version: 17
    - name: Fetch latest Arc
      run: git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
    - name: Setup Gradle
      uses: gradle/gradle-build-action@v2
    - name: Update bundles
      if: ${{ github.repository == 'Anuken/Mindustry' }}
      run: |
        ./gradlew updateBundles
        if [ -n "$(git status --porcelain)" ]; then
          git config --global user.name "Github Actions"
          git config --global user.email "actions@github.com"
          git add core/assets/bundles/*
          git commit -m "Automatic bundle update"
          git push
        fi
    - name: Update JITpack repo
      if: ${{ github.repository == 'Anuken/Mindustry' }}
      run: |
        git config --global user.name "Github Actions"
        git config --global user.email "actions@github.com"
        cd ../
        cp -r ./Mindustry ./MindustryJitpack
        cd MindustryJitpack
        git clone --depth 1 https://github.com/Anuken/MindustryJitpack.git
        rm -rf .git
        cp -r ./MindustryJitpack/.git ./.git
        rm -rf MindustryJitpack
        rm -rf .github
        rm README.md
        git add .
        git commit --allow-empty -m "Updating"
        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/MindustryJitpack
        cd ../Mindustry
    - name: Run unit tests
-      run: ./gradlew clean cleanTest test
+      run: ./gradlew tests:test --rerun --stacktrace
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ logs/
 /core/assets/.gifimages/
 /deploy/
 /out/
 ios/libs/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
@@ -22,6 +23,7 @@ logs/
 /tools/build/
 /tests/build/
 /server/build/
 ios/libs/
 changelog
 saves/
 /core/assets-raw/fontgen/out/
@@ -43,6 +45,7 @@ steam_appid.txt
 ios/robovm.properties
 packr-out/
 config/
 buildSrc/
 *.gif
 /tests/out
@@ -162,3 +165,9 @@ gradle-app.setting
 .DS_Store
 Thumbs.db
 android/libs/
 # ignored due to frequent branch conflicts.
 core/assets/logicids.dat
 # project files for the sectors
 core/assets-raw/sprites/ui/sectors/*.json
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,9 +12,19 @@ Do not submit something without at least running the game to see if it compiles.
 If you are submitting a new block, make sure it has a name and description, and that it works correctly in-game. If you are changing existing block mechanics, test them out first.
 ### Do not make large changes before discussing them first.
-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*).  
+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) - either via PM or by posting in the `#pulls` channel.
-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.
+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 make formatting or "cleanup" PRs.
 Yes, there are occurrences of trailing spaces, extra newlines, empty indents, and other tiny errors. No, I don't want to merge, view, or get notified by your 1-line PR fixing it. If you're implementing a PR with modification of *actual code*, feel free to fix formatting in the general vicinity of your changes, but please don't waste everyone's time with pointless changes.
 I **especially** do not want to see PRs that apply any kind of automated analysis to the source code to "optimize" anything - my IDE can do that already. If the PR doesn't actually change anything useful, I'm not going to review or merge it.
 ### Do not make AI "contributions".
 If I see a PR with significant amounts of code that's obviously written by AI, I will reject your PR, and you will be blocked. Don't waste my time with slop.
 Asking AI questions, and using that information to help you write code? Fine. Using it to actually write code? No.
 ## Style Guidelines
@@ -32,7 +42,7 @@ This means:
 Import [this style file](.github/Mindustry-CodeStyle-IJ.xml) into IntelliJ to get correct formatting when developing Mindustry.
-### Do not use incompatible Java features (java.util.function, java.awt).
+### Do not use incompatible Java features (java.util.function, java.awt, java.lang.Objects).
 Android and RoboVM (iOS) do not support many of Java 8's features, such as the packages `java.util.function`, `java.util.stream` or `forEach` in collections. Do not use these in your code.  
 If you need to use functional interfaces, use the ones in `arc.func`, which are more or less the same with different naming schemes.
@@ -64,7 +74,7 @@ Otherwise, use the `Tmp` variables for things like vector/shape operations, or c
 If using a list, make it a static variable and clear it every time it is used. Re-use as much as possible.
 ### Avoid bloated code and unnecessary getters/setters.
-This is situational, but in essence what it means is to avoid using any sort of getters and setters unless absolutely necessary. Public or protected fields should suffice for most things. 
+This is situational, but in essence, what it means is to avoid using any sort of getters and setters unless absolutely necessary. Public or protected fields should suffice for most things. 
 If something needs to be encapsulated in the future, IntelliJ can handle it with a few clicks.
--- a/55
+++ b/55
@@ -617,58 +617,3 @@ reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
    <program>  Copyright (C) <year>  <name of author>
    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
 might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![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&color=17cf48)](https://discord.gg/mindustry)  
-A sandbox tower defense game written in Java.
+The automation tower defense RTS, written in Java.
 _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_  
 _[Wiki](https://mindustrygame.github.io/wiki)_  
@@ -11,14 +11,16 @@ _[Javadoc](https://mindustrygame.github.io/docs/)_
 ## Contributing
-See [CONTRIBUTING](CONTRIBUTING.md).
+See [CONTRIBUTING](CONTRIBUTING.md) for general code style and PR guidelines.
 If you are a first-time contributor looking for features to implement or bugs to fix, see the issues tagged with 'candidate' [in the Mindustry-Suggestions repostiory](https://github.com/Anuken/Mindustry-Suggestions/issues?q=is%3Aissue%20state%3Aopen%20label%3Acandidate).
 ## Building
 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 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:
+First, make sure you have [JDK 17](https://adoptium.net/temurin/releases/?os=any&arch=any&version=17) installed. **Other JDK versions will not work.** Open a terminal in the Mindustry directory and run the following commands:
 ### Windows
@@ -39,10 +41,13 @@ Server builds are bundled with each released build (in Releases). If you'd rathe
 ### Android
 1. Install the Android SDK [here.](https://developer.android.com/studio#command-tools) Make sure you're downloading the "Command line tools only", as Android Studio is not required.
-2. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
+2. In the unzipped Android SDK folder, find the cmdline-tools directory. Then create a folder inside of it called `latest` and put all of its contents into the newly created folder.
-3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
+3. In the same directory run the command `sdkmanager --licenses` (or `./sdkmanager --licenses` if on linux/mac)
 4. Set the `ANDROID_HOME` environment variable to point to your unzipped Android SDK directory.
 5. Enable developer mode on your device/emulator. If you are on testing on a phone you can follow [these instructions](https://developer.android.com/studio/command-line/adb#Enabling), otherwise you need to google how to enable your emulator's developer mode specifically.
 6. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
-To debug the application on a connected phone, run `gradlew android:installDebug android:run`.
+To debug the application on a connected device/emulator, run `gradlew android:installDebug android:run`.
 ### Troubleshooting
@@ -50,6 +55,16 @@ To debug the application on a connected phone, run `gradlew android:installDebug
 If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. *This is a one-time procedure.*
 #### Where is the `mindustry.gen` package?
 As the name implies, `mindustry.gen` is generated *at build time* based on other code. You will not find source code for this package in the repository, and it should not be edited by hand.
 The following is a non-exhaustive list of the "source" of generated code in `mindustry.gen`:
 - `Call`, `*Packet` classes: Generated from methods marked with `@Remote`.
 - All entity classes (`Unit`, `EffectState`, `Posc`, etc): Generated from component classes in the `mindustry.entities.comp` package, and combined using definitions in `mindustry.content.UnitTypes`.
 - `Sounds`, `Musics`, `Tex`, `Icon`, etc: Generated based on files in the respective asset folders.
 ---
 Gradle may take up to several minutes to download files. Be patient. <br>
--- a/SERVERLIST.md
+++ b/SERVERLIST.md
@@ -1,27 +1,3 @@
-### Adding a server to the list
+# Note: The v7 server list is frozen. No new servers will be accepted. All v8 server PRs should be made [here](https://github.com/Anuken/MindustryServerList).
-Mindustry now has a public list of servers that everyone can see and connect to. 
+*PRs to edit addresses of existing servers will still be accepted, although very infrequently.*
 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.
 *Consider enabling a rate limit:* `config messageRateLimit 2` will make it so that players can only send messages every 2 seconds, for example.
 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.
 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.
 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`).
 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_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
  {
    "address": "google.com"
  }
 ```
 Then, press the *'submit pull request'* button and I'll take a look at your server. If I have any issues with it, I'll let you know in the PR comments.
--- a/TRANSLATING.md
+++ b/TRANSLATING.md
@@ -31,9 +31,11 @@ There are two ways to test the translation bundle:
 1) Assuming you have the PC version downloaded, download your bundle file, name it `bundle.properties`, then place it in the same folder as the Mindustry desktop executable and run it. *You should get a popup message in-game confirming that you have loaded an external translation.*
 2) For advanced users: simply download your fork of mindustry and compile/run the game.
-#### Translating for stores (Steam, Google Play)
+#### Translating for stores (Steam, ~~Google Play~~)
-If you would like to translate the descriptions for Google Play or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
+NOTE: The Google Play description is in the process of being re-written, please do not translate it.
 If you would like to translate the descriptions for ~~Google Play~~ or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
 **And that's it.**  
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
          package="io.anuke.mindustry">
    <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
    <uses-feature android:name="android.hardware.type.pc" android:required="false" />
@@ -9,7 +8,7 @@
    <uses-permission android:name="android.permission.INTERNET"/>
    <application
-            android:resizeableActivity="false"
+            android:resizeableActivity="true"
            android:allowBackup="true"
            android:icon="@mipmap/ic_launcher"
            android:roundIcon="@mipmap/ic_launcher_round"
@@ -18,12 +17,14 @@
            android:usesCleartextTraffic="true"
            android:appCategory="game"
            android:label="@string/app_name"
-            android:fullBackupContent="@xml/backup_rules">
+            android:fullBackupContent="@xml/backup_rules"
            android:largeHeap="true">
        <meta-data android:name="android.max_aspect" android:value="2.1"/>
        <activity
                android:name="mindustry.android.AndroidLauncher"
                android:label="@string/app_name"
                android:screenOrientation="user"
                android:exported="true"
                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
            <intent-filter>
@@ -31,13 +32,6 @@
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW"/>
                <category android:name="android.intent.category.DEFAULT"/>
                <category android:name="android.intent.category.BROWSABLE"/>
                <data android:mimeType="application/octet-stream" />
                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav"/>
            </intent-filter>
        </activity>
    </application>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -7,8 +7,7 @@ buildscript{
    }
    dependencies{
-        //note that later versions, like alpha05, fail to work correctly
+        classpath 'com.android.tools.build:gradle:8.2.2'
        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
    }
 }
@@ -24,14 +23,15 @@ repositories{
 task deploy(type: Copy){
    dependsOn "assembleRelease"
-    from "build/outputs/apk/standard/release/android-standard-release.apk"
+    from "build/outputs/apk/release/android-release.apk"
    into "../deploy/"
-    rename("android-standard-release.apk", "${generateDeployName('android')}.apk")
+    rename("android-release.apk", "${generateDeployName('android')}.apk")
 }
 android{
-    buildToolsVersion '30.0.2'
+    namespace = "io.anuke.mindustry"
-    compileSdkVersion 30
+    buildToolsVersion = '36.0.0'
    compileSdk = 36
    sourceSets{
        main{
            manifest.srcFile 'AndroidManifest.xml'
@@ -40,10 +40,12 @@ android{
            renderscript.srcDirs = ['src']
            res.srcDirs = ['res']
            assets.srcDirs = ['assets', 'src/main/assets', '../core/assets/']
-            jniLibs.srcDirs = ['libs']
+
-        }
+            if(localArc){
-        gp{
+                jniLibs.srcDirs += ['../../Arc/natives/natives-android/libs', '../../Arc/natives/natives-freetype-android/libs']
-            java.srcDirs = ['srcgp']
+            }else{
                jniLibs.srcDirs = ['libs']
            }
        }
        androidTest.setRoot('tests')
@@ -60,15 +62,17 @@ android{
        applicationId "io.anuke.mindustry"
        minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 36
        versionName versionNameResult
-        versionCode = (System.getenv("TRAVIS_BUILD_ID") != null ? System.getenv("TRAVIS_BUILD_ID").toInteger() : vcode)
+        versionCode = vcode
        if(project.hasProperty("release")){
            props['androidBuildCode'] = (vcode + 1).toString()
        }
        props.store(file('../core/assets/version.properties').newWriter(), null)
        multiDexEnabled true
    }
    compileOptions{
@@ -76,7 +80,7 @@ android{
        targetCompatibility JavaVersion.VERSION_1_8
    }
-    flavorDimensions "google"
+    flavorDimensions = ["google"]
    signingConfigs{
        release{
@@ -98,11 +102,12 @@ android{
    buildTypes{
        all{
            //TODO without these lines (r8 enabled), Mindustry crashes with missing default interface method errors.
            //WHY THE HELL ARE DEFAULT INTERFACES NOT BEING DESUGARED? WHY DID UPDATING AGP MAKE THIS HAPPEN?
            //When I ENABLE shrinking, r8 goes and REMOVES ALL DEFAULT INTERFACE CLASSES, which breaks mods. Why?
            //-keep class mindustry.** { *; } should *keep the classes* - WHY IS R8 REMOVING THEM?
            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")
        }
    }
@@ -114,18 +119,6 @@ android{
            }
        }
    }
    // Specifies one flavor dimension.
    flavorDimensions "version"
    productFlavors{
        standard{
        }
        gp{
            applicationIdSuffix ".gp"
            versionNameSuffix "-gp"
        }
    }
 }
 dependencies{
@@ -134,23 +127,29 @@ dependencies{
    implementation arcModule("backends:backend-android")
    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
-    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
+    if(!localArc){
-    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
+        natives "com.github.Anuken.Arc:natives-android:$arcHash"
        natives "com.github.Anuken.Arc:natives-freetype-android:$arcHash"
    }
-    gpImplementation "com.google.android.gms:play-services-games:21.0.0"
+    def version, highestVersion
-    gpImplementation "com.google.android.gms:play-services-auth:19.0.0"
+    new File((String)findSdkDir(), "/platforms").eachFileMatch ~/android-\d+/, {
        version = it.name.find(/\d+/).toInteger()
        highestVersion = version > highestVersion ? version : highestVersion
    }
-    //android dependencies magically disappear during compilation, thanks gradle!
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-${highestVersion}/android.jar")
    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 ->
+    if(!localArc){
-        copy{
+        configurations.natives.files.each{ jar ->
-            from zipTree(jar)
+            copy{
-            into file("libs/")
+                from zipTree(jar)
-            include "**"
+                into file("libs/")
                include "**"
            }
        }
    }
 }
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -1,9 +1,13 @@
 -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.** { *; }
 -keep class com.android.dx.** { *; }
 -keepattributes Signature,*Annotation*,InnerClasses,EnclosingMethod
 -dontwarn javax.naming.**
 #-printusage out.txt
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -33,15 +33,12 @@ public class AndroidLauncher extends AndroidApplication{
    FileChooser chooser;
    Runnable permCallback;
    Object gpService;
    Class<?> serviceClass;
    @Override
    protected void onCreate(Bundle savedInstanceState){
        UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
        Thread.setDefaultUncaughtExceptionHandler((thread, error) -> {
-            CrashSender.log(error);
+            CrashHandler.log(error);
            //try to forward exception to system handler
            if(handler != null){
@@ -75,27 +72,58 @@ public class AndroidLauncher extends AndroidApplication{
            @Override
            public ClassLoader loadJar(Fi jar, ClassLoader parent) throws Exception{
-                return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
+                //Required to load jar files in Android 14: https://developer.android.com/about/versions/14/behavior-changes-14#safer-dynamic-code-loading
-                    @Override
+                try{
-                    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
+                    jar.file().setReadOnly();
-                        //check for loaded state
+                    return new DexClassLoader(jar.file().getPath(), getFilesDir().getPath(), null, parent){
-                        Class<?> loadedClass = findLoadedClass(name);
+                        @Override
-                        if(loadedClass == null){
+                        protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException{
-                            try{
+                            //check for loaded state
-                                //try to load own class first
+                            Class<?> loadedClass = findLoadedClass(name);
-                                loadedClass = findClass(name);
+                            if(loadedClass == null){
-                            }catch(ClassNotFoundException | NoClassDefFoundError e){
+                                try{
-                                //use parent if not found
+                                    //try to load own class first
-                                return parent.loadClass(name);
+                                    loadedClass = findClass(name);
                                }catch(ClassNotFoundException | NoClassDefFoundError e){
                                    //use parent if not found
                                    return parent.loadClass(name);
                                }
                            }
                        }
-                        if(resolve){
+                            if(resolve){
-                            resolveClass(loadedClass);
+                                resolveClass(loadedClass);
                            }
                            return loadedClass;
                        }
-                        return loadedClass;
+                    };
                }catch(SecurityException e){
                    //`setReadOnly` to jar file in `/sdcard/Android/data/...` does not work on some Android 14 device
                    //But in `/data/...` it works
                    if(Build.VERSION.SDK_INT < VERSION_CODES.O_MR1){
                        throw e;
                    }
-                };
+
                    Fi cacheDir = new Fi(getCacheDir()).child("mods");
                    cacheDir.mkdirs();
                    //long file name support
                    Fi modCacheDir = cacheDir.child(jar.nameWithoutExtension());
                    Fi modCache = modCacheDir.child(Long.toHexString(jar.lastModified()) + ".zip");
                    if(modCacheDir.equals(jar.parent())){
                        //should not reach here, just in case
                        throw e;
                    }
                    //Cache will be deleted when mod is removed
                    if(!modCache.exists() || jar.length() != modCache.length()){
                        modCacheDir.mkdirs();
                        jar.copyTo(modCache);
                    }
                    modCache.file().setReadOnly();
                    return loadJar(modCache, parent);
                }
            }
            @Override
@@ -104,64 +132,69 @@ public class AndroidLauncher extends AndroidApplication{
            }
            void showFileChooser(boolean open, String title, Cons<Fi> cons, String... extensions){
-                String extension = extensions[0];
+                try{
                    String extension = extensions[0];
-                if(VERSION.SDK_INT >= VERSION_CODES.Q){
+                    if(VERSION.SDK_INT >= VERSION_CODES.Q){
-                    Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
+                        Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
-                    intent.addCategory(Intent.CATEGORY_OPENABLE);
+                        intent.addCategory(Intent.CATEGORY_OPENABLE);
-                    intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
+                        intent.setType(extension.equals("zip") && !open && extensions.length == 1 ? "application/zip" : "*/*");
                        intent.putExtra(Intent.EXTRA_TITLE, "export." + extension);
-                    addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
+                        addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
-                        if(code == Activity.RESULT_OK && in != null && in.getData() != null){
+                            if(code == Activity.RESULT_OK && in != null && in.getData() != null){
-                            Uri uri = in.getData();
+                                Uri uri = in.getData();
-                            if(uri.getPath().contains("(invalid)")) return;
+                                if(uri.getPath().contains("(invalid)")) return;
-                            Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
+                                Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
-                                @Override
+                                    @Override
-                                public InputStream read(){
+                                    public InputStream read(){
-                                    try{
+                                        try{
-                                        return getContentResolver().openInputStream(uri);
+                                            return getContentResolver().openInputStream(uri);
-                                    }catch(IOException e){
+                                        }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                                            throw new ArcRuntimeException(e);
                                        }
                                    }
                                }
-                                @Override
+                                    @Override
-                                public OutputStream write(boolean append){
+                                    public OutputStream write(boolean append){
-                                    try{
+                                        try{
-                                        return getContentResolver().openOutputStream(uri);
+                                            return getContentResolver().openOutputStream(uri, "rwt");
-                                    }catch(IOException e){
+                                        }catch(IOException e){
-                                        throw new ArcRuntimeException(e);
+                                            throw new ArcRuntimeException(e);
                                        }
                                    }
-                                }
+                                })));
-                            })));
+                            }
-                        }
+                        });
-                    });
+                    }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                    checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
+                        chooser = new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), open, file -> {
-                        if(!open){
+                            if(!open){
-                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
+                                cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
-                        }else{
+                            }else{
-                            cons.get(file);
+                                cons.get(file);
-                        }
+                            }
-                    });
+                        });
-                    ArrayList<String> perms = new ArrayList<>();
+                        ArrayList<String> perms = new ArrayList<>();
-                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                        if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                            perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                    }
+                        }
-                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                        if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+                            perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-                    }
+                        }
-                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
+                        requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
                }else{
                    if(open){
                        new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
                    }else{
-                        super.showFileChooser(open, "@open", extension, cons);
+                        if(open){
                            new FileChooser(title, file -> Structs.contains(extensions, file.extension().toLowerCase()), true, cons).show();
                        }else{
                            super.showFileChooser(open, "@open", extension, cons);
                        }
                    }
                }catch(Throwable error){
                    Core.app.post(() -> Vars.ui.showException(error));
                }
            }
@@ -183,6 +216,7 @@ public class AndroidLauncher extends AndroidApplication{
        }, new AndroidApplicationConfiguration(){{
            useImmersiveMode = true;
            hideStatusBar = true;
            useGL30 = true;
        }});
        checkFiles(getIntent());
@@ -243,24 +277,6 @@ 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();
--- a/android/srcgp/mindustry/android/GPGameService.java
+++ b/android/srcgp/mindustry/android/GPGameService.java
@@ -1,40 +0,0 @@
 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.");
                }
            });
        }
    }
 }
--- a/annotations/src/main/java/mindustry/annotations/Annotations.java
+++ b/annotations/src/main/java/mindustry/annotations/Annotations.java
@@ -8,14 +8,12 @@ public class Annotations{
    /** Indicates that a method overrides other methods. */
    @Target({ElementType.METHOD})
    @Retention(RetentionPolicy.SOURCE)
-    public @interface Replace{
+    public @interface Replace{}
    }
    /** Indicates that a method should be final in all implementing classes. */
    @Target({ElementType.METHOD})
    @Retention(RetentionPolicy.SOURCE)
-    public @interface Final{
+    public @interface Final{}
    }
    /** Indicates that a field will be interpolated when synced. */
    @Target({ElementType.FIELD})
@@ -30,15 +28,18 @@ public class Annotations{
    /** Indicates that a field will not be read from the server when syncing the local player state. */
    @Target({ElementType.FIELD})
    @Retention(RetentionPolicy.SOURCE)
-    public @interface SyncLocal{
+    public @interface SyncLocal{}
    /** Indicates that a field should not be synced to clients (but may still be non-transient) */
    @Target({ElementType.FIELD})
    @Retention(RetentionPolicy.SOURCE)
    public @interface NoSync{}
    }
    /** Indicates that a component field is imported from other components. This means it doesn't actually exist. */
    @Target({ElementType.FIELD})
    @Retention(RetentionPolicy.SOURCE)
-    public @interface Import{
+    public @interface Import{}
    }
    /** Indicates that a component field is read-only. */
    @Target({ElementType.FIELD, ElementType.METHOD})
@@ -53,6 +54,8 @@ public class Annotations{
        /** Whether to generate a base class for this components.
         * An entity cannot have two base classes, so only one component can have base be true. */
        boolean base() default false;
        /** Whether to generate a proper interface for this component class. */
        boolean genInterface() default true;
    }
    /** Indicates that a method is implemented by the annotation processor. */
@@ -105,8 +108,7 @@ public class Annotations{
    /** Indicates an internal interface for entity components. */
    @Target(ElementType.TYPE)
    @Retention(RetentionPolicy.SOURCE)
-    public @interface EntityInterface{
+    public @interface EntityInterface{}
    }
    //endregion
    //region misc. utility
@@ -145,15 +147,12 @@ public class Annotations{
    /** Indicates that a method should always call its super version. */
    @Target(ElementType.METHOD)
    @Retention(RetentionPolicy.SOURCE)
-    public @interface CallSuper{
+    public @interface CallSuper{}
    }
    /** Annotation that allows overriding CallSuper annotation. To be used on method that overrides method with CallSuper annotation from parent class. */
    @Target(ElementType.METHOD)
    @Retention(RetentionPolicy.SOURCE)
-    public @interface OverrideCallSuper{
+    public @interface OverrideCallSuper{}
    }
    //endregion
    //region struct
@@ -161,9 +160,7 @@ public class Annotations{
    /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
    @Target(ElementType.TYPE)
    @Retention(RetentionPolicy.SOURCE)
-    public @interface Struct{
+    public @interface Struct{}
    }
    /** Marks a field of a struct. Optional. */
    @Target(ElementType.FIELD)
@@ -187,18 +184,16 @@ public class Annotations{
    /** A set of two booleans, one specifying server and one specifying client. */
    public enum Loc{
-        /** Method can only be invoked on the client from the server. */
+        /** Server only. */
        server(true, false),
-        /** Method can only be invoked on the server from the client. */
+        /** Client only. */
        client(false, true),
-        /** Method can be invoked from anywhere */
+        /** Both server and client. */
        both(true, true),
        /** Neither server nor client. */
        none(false, false);
        /** If true, this method can be invoked ON clients FROM servers. */
        public final boolean isServer;
        /** If true, this method can be invoked ON servers FROM clients. */
        public final boolean isClient;
        Loc(boolean server, boolean client){
@@ -227,16 +222,16 @@ public class Annotations{
    @Target(ElementType.METHOD)
    @Retention(RetentionPolicy.SOURCE)
    public @interface Remote{
-        /** Specifies the locations from which this method can be invoked. */
+        /** Specifies the locations from which this method can cause remote invocations (This -> Remote) [Default: Server -> Client]. */
        Loc targets() default Loc.server;
-        /** Specifies which methods are generated. Only affects server-to-client methods. */
+        /** Specifies which methods are generated. Only affects server-to-client methods (Server -> Client(s)) [Default: Server -> Client & Server -> All Clients]. */
        Variant variants() default Variant.all;
-        /** The local locations where this method is called locally, when invoked. */
+        /** The locations where this method is called locally, when invoked locally (This -> This) [Default: No local invocations]. */
        Loc called() default Loc.none;
-        /** Whether to forward this packet to all other clients upon receival. Client only. */
+        /** Whether the server should forward this packet to all other clients upon receival from a client (Client -> Server -> Other Clients). [Default: Don't Forward Client Invocations] */
        boolean forward() default false;
        /**
@@ -251,8 +246,7 @@ public class Annotations{
    @Target(ElementType.TYPE)
    @Retention(RetentionPolicy.SOURCE)
-    public @interface TypeIOHandler{
+    public @interface TypeIOHandler{ }
    }
    //endregion
 }
--- a/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/BaseProcessor.java
@@ -91,7 +91,7 @@ public abstract class BaseProcessor extends AbstractProcessor{
    }
    public static TypeName tname(String pack, String simple){
-        return ClassName.get(pack, simple );
+        return ClassName.get(pack, simple);
    }
    public static TypeName tname(String name){
@@ -123,14 +123,21 @@ public abstract class BaseProcessor extends AbstractProcessor{
    }
    public static void write(TypeSpec.Builder builder, Seq<String> imports) throws Exception{
        builder.superinterfaces.sort(Structs.comparing(t -> t.toString()));
        builder.methodSpecs.sort(Structs.comparing(m -> m.toString()));
        builder.fieldSpecs.sort(Structs.comparing(f -> f.name));
        JavaFile file = JavaFile.builder(packageName, builder.build()).skipJavaLangImports(true).build();
        String writeString;
        if(imports != null){
            imports = imports.map(m -> Seq.with(m.split("\n")).sort().toString("\n"));
            imports.sort();
            String rawSource = file.toString();
            Seq<String> result = new Seq<>();
            for(String s : rawSource.split("\n", -1)){
                result.add(s);
-                if (s.startsWith("package ")){
+                if(s.startsWith("package ")){
                    result.add("");
                    for (String i : imports){
                        result.add(i);
@@ -138,14 +145,15 @@ public abstract class BaseProcessor extends AbstractProcessor{
                }
            }
-            String out = result.toString("\n");
+            writeString = result.toString("\n");
            JavaFileObject object = filer.createSourceFile(file.packageName + "." + file.typeSpec.name, file.typeSpec.originatingElements.toArray(new Element[0]));
            OutputStream stream = object.openOutputStream();
            stream.write(out.getBytes());
            stream.close();
        }else{
-            file.writeTo(filer);
+            writeString = file.toString();
        }
        JavaFileObject object = filer.createSourceFile(file.packageName + "." + file.typeSpec.name, file.typeSpec.originatingElements.toArray(new Element[0]));
        Writer stream = object.openWriter();
        stream.write(writeString);
        stream.close();
    }
    public Seq<Selement> elements(Class<? extends Annotation> type){
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityIO.java
@@ -89,7 +89,7 @@ public class EntityIO{
            st("write.s($L)", revisions.peek().version);
            //write uses most recent revision
            for(RevisionField field : revisions.peek().fields){
-                io(field.type, "this." + field.name);
+                io(field.type, "this." + field.name, false);
            }
        }else{
            //read revision
@@ -107,7 +107,7 @@ public class EntityIO{
                //add code for reading revision
                for(RevisionField field : rev.fields){
                    //if the field doesn't exist, the result will be an empty string, it won't get assigned
-                    io(field.type, presentFields.contains(field.name) ? "this." + field.name + " = " : "");
+                    io(field.type, presentFields.contains(field.name) ? "this." + field.name + " = " : "", false);
                }
            }
@@ -118,14 +118,17 @@ public class EntityIO{
        }
    }
-    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> syncFields, Seq<Svar> allFields) throws Exception{
+    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> allFields) throws Exception{
        this.method = method;
        this.write = write;
        if(write){
            //write uses most recent revision
            for(RevisionField field : revisions.peek().fields){
-                io(field.type, "this." + field.name);
+                Svar var = allFields.find(s -> s.name().equals(field.name));
                if(var == null || var.has(NoSync.class)) continue;
                io(field.type, "this." + field.name, true);
            }
        }else{
            Revision rev = revisions.peek();
@@ -138,6 +141,7 @@ public class EntityIO{
            //add code for reading revision
            for(RevisionField field : rev.fields){
                Svar var = allFields.find(s -> s.name().equals(field.name));
                if(var == null || var.has(NoSync.class)) continue;
                boolean sf = var.has(SyncField.class), sl = var.has(SyncLocal.class);
                if(sl) cont("if(!islocal)");
@@ -147,12 +151,12 @@ public class EntityIO{
                    st(field.name + lastSuf + " = this." + field.name);
                }
-                io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ");
+                io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ", true);
                if(sl){
                    ncont("else" );
-                    io(field.type, "");
+                    io(field.type, "", true);
                    //just assign the two values so jumping does not occur on de-possession
                    if(sf){
@@ -217,20 +221,20 @@ public class EntityIO{
        econt();
    }
-    private void io(String type, String field) throws Exception{
+    private void io(String type, String field, boolean network) throws Exception{
        type = type.replace("mindustry.gen.", "");
        type = replacements.get(type, type);
        if(BaseProcessor.isPrimitive(type)){
            s(type.equals("boolean") ? "bool" : type.charAt(0) + "", field);
-        }else if(instanceOf(type, "mindustry.ctype.Content")){
+        }else if(instanceOf(type, "mindustry.ctype.Content") && !type.equals("mindustry.ai.UnitStance") && !type.equals("mindustry.ai.UnitCommand")){
            if(write){
-                s("s", field + ".id");
+                s("s", field + " == null ? -1 : " + field + ".id");
            }else{
                st(field + "mindustry.Vars.content.getByID(mindustry.ctype.ContentType.$L, read.s())", BaseProcessor.simpleName(type).toLowerCase().replace("type", ""));
            }
-        }else if(serializer.writers.containsKey(type) && write){
+        }else if((serializer.writers.containsKey(type) || (network && serializer.netWriters.containsKey(type))) && write){
-            st("$L(write, $L)", serializer.writers.get(type), field);
+            st("$L(write, $L)", network ? serializer.getNetWriter(type, null) : serializer.writers.get(type), field);
        }else if(serializer.mutatorReaders.containsKey(type) && !write && !field.replace(" = ", "").contains(" ") && !field.isEmpty()){
            st("$L$L(read, $L)", field, serializer.mutatorReaders.get(type), field.replace(" = ", ""));
        }else if(serializer.readers.containsKey(type) && !write){
@@ -241,7 +245,7 @@ public class EntityIO{
            if(write){
                s("i", field + ".length");
                cont("for(int INDEX = 0; INDEX < $L.length; INDEX ++)", field);
-                io(rawType, field + "[INDEX]");
+                io(rawType, field + "[INDEX]", network);
            }else{
                String fieldName = field.replace(" = ", "").replace("this.", "");
                String lenf = fieldName + "_LENGTH";
@@ -250,7 +254,7 @@ public class EntityIO{
                    st("$Lnew $L[$L]", field, type.replace("[]", ""), lenf);
                }
                cont("for(int INDEX = 0; INDEX < $L; INDEX ++)", lenf);
-                io(rawType, field.replace(" = ", "[INDEX] = "));
+                io(rawType, field.replace(" = ", "[INDEX] = "), network);
            }
            econt();
@@ -262,7 +266,7 @@ public class EntityIO{
                if(write){
                    s("i", field + ".size");
                    cont("for(int INDEX = 0; INDEX < $L.size; INDEX ++)", field);
-                    io(generic, field + ".get(INDEX)");
+                    io(generic, field + ".get(INDEX)", network);
                }else{
                    String fieldName = field.replace(" = ", "").replace("this.", "");
                    String lenf = fieldName + "_LENGTH";
@@ -271,7 +275,7 @@ public class EntityIO{
                        st("$L.clear()", field.replace(" = ", ""));
                    }
                    cont("for(int INDEX = 0; INDEX < $L; INDEX ++)", lenf);
-                    io(generic, field.replace(" = ", "_ITEM = ").replace("this.", generic + " "));
+                    io(generic, field.replace(" = ", "_ITEM = ").replace("this.", generic + " "), network);
                    if(!field.isEmpty()){
                        String temp = field.replace(" = ", "_ITEM").replace("this.", "");
                        st("if($L != null) $L.add($L)", temp, field.replace(" = ", ""), temp);
--- a/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/entity/EntityProcess.java
@@ -19,6 +19,7 @@ import javax.annotation.processing.*;
 import javax.lang.model.element.*;
 import javax.lang.model.type.*;
 import java.lang.annotation.*;
 import java.util.*;
@SupportedAnnotationTypes({
 "mindustry.annotations.Annotations.EntityDef",
@@ -42,6 +43,7 @@ public class EntityProcess extends BaseProcessor{
    Seq<Selement> allDefs = new Seq<>();
    Seq<Stype> allInterfaces = new Seq<>();
    Seq<TypeSpec.Builder> baseClasses = new Seq<>();
    ObjectSet<TypeSpec.Builder> baseClassIndexers = new ObjectSet<>();
    ClassSerializer serializer;
    {
@@ -96,11 +98,15 @@ public class EntityProcess extends BaseProcessor{
            //create component interfaces
            for(Stype component : allComponents){
                TypeSpec.Builder inter = TypeSpec.interfaceBuilder(interfaceName(component))
                .addModifiers(Modifier.PUBLIC).addAnnotation(EntityInterface.class);
                inter.addJavadoc("Interface for {@link $L}", component.fullName());
                skipDeprecated(inter);
                //implement extra interfaces these components may have, e.g. position
                for(Stype extraInterface : component.interfaces().select(i -> !isCompInterface(i))){
                    //javapoet completely chokes on this if I add `addSuperInterface` or create the type name with TypeName.get
@@ -113,45 +119,47 @@ public class EntityProcess extends BaseProcessor{
                    inter.addSuperinterface(ClassName.get(packageName, interfaceName(type)));
                }
-                ObjectSet<String> signatures = new ObjectSet<>();
+                if(component.annotation(Component.class).genInterface()){
                    ObjectSet<String> signatures = new ObjectSet<>();
-                //add utility methods to interface
+                    //add utility methods to interface
-                for(Smethod method : component.methods()){
+                    for(Smethod method : component.methods()){
-                    //skip private methods, those are for internal use.
+                        //skip private methods, those are for internal use.
-                    if(method.isAny(Modifier.PRIVATE, Modifier.STATIC)) continue;
+                        if(method.isAny(Modifier.PRIVATE, Modifier.STATIC)) continue;
-                    //keep track of signatures used to prevent dupes
+                        //keep track of signatures used to prevent dupes
-                    signatures.add(method.e.toString());
+                        signatures.add(method.e.toString());
-                    inter.addMethod(MethodSpec.methodBuilder(method.name())
+                        inter.addMethod(MethodSpec.methodBuilder(method.name())
-                    .addJavadoc(method.doc() == null ? "" : method.doc())
+                        .addJavadoc(method.doc() == null ? "" : method.doc())
-                    .addExceptions(method.thrownt())
+                        .addExceptions(method.thrownt())
-                    .addTypeVariables(method.typeVariables().map(TypeVariableName::get))
+                        .addTypeVariables(method.typeVariables().map(TypeVariableName::get))
-                    .returns(method.ret().toString().equals("void") ? TypeName.VOID : method.retn())
+                        .returns(method.ret().toString().equals("void") ? TypeName.VOID : method.retn())
-                    .addParameters(method.params().map(v -> ParameterSpec.builder(v.tname(), v.name())
+                        .addParameters(method.params().map(v -> ParameterSpec.builder(v.tname(), v.name())
-                    .build())).addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT).build());
+                        .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();
                    //getter
                    if(!signatures.contains(cname + "()")){
                        inter.addMethod(MethodSpec.methodBuilder(cname).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
                        .addAnnotations(Seq.with(field.annotations()).select(a -> a.toString().contains("Null")).map(AnnotationSpec::get))
                        .addJavadoc(field.doc() == null ? "" : field.doc())
                        .returns(field.tname()).build());
                    }
-                    //setter
+                    //generate interface getters and setters for all "standard" fields
-                    if(!field.is(Modifier.FINAL) && !signatures.contains(cname + "(" + field.mirror().toString() + ")") &&
+                    for(Svar field : component.fields().select(e -> !e.is(Modifier.STATIC) && !e.is(Modifier.PRIVATE) && !e.has(Import.class))){
-                    !field.annotations().contains(f -> f.toString().equals("@mindustry.annotations.Annotations.ReadOnly"))){
+                        String cname = field.name();
-                        inter.addMethod(MethodSpec.methodBuilder(cname).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
+
-                        .addJavadoc(field.doc() == null ? "" : field.doc())
+                        //getter
-                        .addParameter(ParameterSpec.builder(field.tname(), field.name())
+                        if(!signatures.contains(cname + "()")){
-                        .addAnnotations(Seq.with(field.annotations())
+                            inter.addMethod(MethodSpec.methodBuilder(cname).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
-                        .select(a -> a.toString().contains("Null")).map(AnnotationSpec::get)).build()).build());
+                            .addAnnotations(Seq.with(field.annotations()).select(a -> a.toString().contains("Null") || a.toString().contains("Deprecated")).map(AnnotationSpec::get))
                            .addJavadoc(field.doc() == null ? "" : field.doc())
                            .returns(field.tname()).build());
                        }
                        //setter
                        if(!field.is(Modifier.FINAL) && !signatures.contains(cname + "(" + field.mirror().toString() + ")") &&
                        !field.annotations().contains(f -> f.toString().equals("@mindustry.annotations.Annotations.ReadOnly"))){
                            inter.addMethod(MethodSpec.methodBuilder(cname).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC)
                            .addJavadoc(field.doc() == null ? "" : field.doc())
                            .addParameter(ParameterSpec.builder(field.tname(), field.name())
                            .addAnnotations(Seq.with(field.annotations())
                            .select(a -> a.toString().contains("Null") || a.toString().contains("Deprecated")).map(AnnotationSpec::get)).build()).build());
                        }
                    }
                }
@@ -161,7 +169,7 @@ public class EntityProcess extends BaseProcessor{
                //SPECIAL CASE: components with EntityDefs don't get a base class! the generated class becomes the base class itself
                if(component.annotation(Component.class).base()){
-                    Seq<Stype> deps = depends.copy().and(component);
+                    Seq<Stype> deps = depends.copy().add(component);
                    baseClassDeps.get(component, ObjectSet::new).addAll(deps);
                    //do not generate base classes when the component will generate one itself
@@ -230,9 +238,15 @@ public class EntityProcess extends BaseProcessor{
                Stype repr = types.first();
                String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr);
                String name = group.name().startsWith("g") ? group.name().substring(1) : group.name();
                boolean collides = an.collide();
-                groupDefs.add(new GroupDefinition(group.name().startsWith("g") ? group.name().substring(1) : group.name(),
+                groupDefs.add(new GroupDefinition(name,
                    ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides));
                TypeSpec.Builder accessor = TypeSpec.interfaceBuilder("IndexableEntity__" + name);
                accessor.addMethod(MethodSpec.methodBuilder("setIndex__" + name).addModifiers(Modifier.ABSTRACT, Modifier.PUBLIC).addParameter(int.class, "index").returns(void.class).build());
                write(accessor);
            }
            ObjectMap<String, Selement> usedNames = new ObjectMap<>();
@@ -258,6 +272,8 @@ public class EntityProcess extends BaseProcessor{
                //get base class type name for extension
                Stype baseClassType = baseClasses.any() ? baseClasses.first() : null;
                @Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null;
                @Nullable TypeSpec.Builder baseClassBuilder = baseClassType == null ? null : this.baseClasses.find(b -> Reflect.<String>get(b, "name").equals(baseName(baseClassType)));
                boolean addIndexToBase = baseClassBuilder != null && baseClassIndexers.add(baseClassBuilder);
                //whether the main class is the base itself
                boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base();
@@ -334,7 +350,7 @@ public class EntityProcess extends BaseProcessor{
                            fbuilder.initializer(varInitializers.get(f.descString()));
                        }
-                        fbuilder.addModifiers(f.has(ReadOnly.class) ? Modifier.PROTECTED : Modifier.PUBLIC);
+                        fbuilder.addModifiers(f.has(ReadOnly.class) || f.is(Modifier.PRIVATE) ? Modifier.PROTECTED : Modifier.PUBLIC);
                        fbuilder.addAnnotations(f.annotations().map(AnnotationSpec::get));
                        FieldSpec spec = fbuilder.build();
@@ -379,35 +395,63 @@ public class EntityProcess extends BaseProcessor{
                syncedFields.sortComparing(Selement::name);
-                //override toString method
+                if(!methods.containsKey("toString()")){
-                builder.addMethod(MethodSpec.methodBuilder("toString")
+                    //override toString method
                    builder.addMethod(MethodSpec.methodBuilder("toString")
                    .addAnnotation(Override.class)
                    .returns(String.class)
                    .addModifiers(Modifier.PUBLIC)
                    .addStatement("return $S + $L", name + "#", "id").build());
                }
                EntityIO io = new EntityIO(type.name(), builder, allFieldSpecs, serializer, rootDirectory.child("annotations/src/main/resources/revisions").child(type.name()));
                //entities with no sync comp and no serialization gen no code
                boolean hasIO = ann.genio() && (components.contains(s -> s.name().contains("Sync")) || ann.serialize());
                TypeSpec.Builder indexBuilder = baseClassBuilder == null ? builder : baseClassBuilder;
                if(baseClassBuilder == null || addIndexToBase){
                    //implement indexable interfaces.
                    for(GroupDefinition def : groups){
                        indexBuilder.addSuperinterface(tname(packageName + ".IndexableEntity__" + def.name));
                        indexBuilder.addMethod(MethodSpec.methodBuilder("setIndex__" + def.name).addParameter(int.class, "index").addModifiers(Modifier.PUBLIC).addAnnotation(Override.class)
                        .addCode("index__$L = index;", def.name).build());
                    }
                }
                //add all methods from components
                for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){
-                    if(entry.value.contains(m -> m.has(Replace.class))){
+
-                        //check replacements
+                    //there are multiple @Replace implementations, or multiple non-void implementations.
-                        if(entry.value.count(m -> m.has(Replace.class)) > 1){
+                    if(entry.value.size > 1 && (entry.value.contains(m -> m.has(Replace.class)) || entry.value.count(m -> !m.isAny(Modifier.NATIVE, Modifier.ABSTRACT) && !m.isVoid()) > 1)){
-                            err("Type " + type + " has multiple components replacing method " + entry.key + ".");
+
                        //remove clutter
                        entry.value.removeAll(s -> s.is(Modifier.ABSTRACT));
                        Comparator<Smethod> comp = Structs.comps(
                            Structs.comps(
                                //highest priority first
                                Structs.comparingFloat(m -> m.has(MethodPriority.class) ? m.annotation(MethodPriority.class).value() : 0f),
                                //replacement means priority
                                Structs.comparingBool(m -> m.has(Replace.class))
                            ),
                            //otherwise, the 'highest' subclass (most dependencies)
                            Structs.comparingInt(m -> getDependencies(m.type()).size)
                        );
                        Smethod best = entry.value.max(comp);
                        if(entry.value.contains(s -> best != s && comp.compare(s, best) == 0)){
                            err("Type " + type + " has multiple components implementing method " + entry.value.first() + " in an ambiguous way. Use MethodPriority to designate which one should be used. Implementations: " +
                                entry.value.map(s -> s.descString()));
                        }
-                        Smethod base = entry.value.find(m -> m.has(Replace.class));
+
                        entry.value.clear();
-                        entry.value.add(base);
+                        entry.value.add(best);
                    }
-                    //check multi return
+                    entry.value.sort(Structs.comps(Structs.comparingFloat(m -> m.has(MethodPriority.class) ? m.annotation(MethodPriority.class).value() : 0), Structs.comparing(s -> s.up().getSimpleName().toString())));
                    if(entry.value.count(m -> !m.isAny(Modifier.NATIVE, Modifier.ABSTRACT) && !m.isVoid()) > 1){
                        err("Type " + type + " has multiple components implementing non-void method " + entry.key + ".");
                    }
                    entry.value.sort(Structs.comps(Structs.comparingFloat(m -> m.has(MethodPriority.class) ? m.annotation(MethodPriority.class).value() : 0), Structs.comparing(Selement::name)));
                    //representative method
                    Smethod first = entry.value.first();
@@ -421,6 +465,7 @@ public class EntityProcess extends BaseProcessor{
                    MethodSpec.Builder mbuilder = MethodSpec.methodBuilder(first.name()).addModifiers(first.is(Modifier.PRIVATE) ? Modifier.PRIVATE : Modifier.PUBLIC);
                    //if(isFinal || entry.value.contains(s -> s.has(Final.class))) mbuilder.addModifiers(Modifier.FINAL);
                    if(entry.value.contains(s -> s.has(CallSuper.class))) mbuilder.addAnnotation(CallSuper.class); //add callSuper here if necessary
                    if(first.has(Nullable.class)) mbuilder.addAnnotation(Nullable.class);
                    if(first.is(Modifier.STATIC)) mbuilder.addModifiers(Modifier.STATIC);
                    mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
                    mbuilder.returns(first.retn());
@@ -442,8 +487,15 @@ public class EntityProcess extends BaseProcessor{
                        mbuilder.addStatement("if(added == $L) return", first.name().equals("add"));
                        for(GroupDefinition def : groups){
-                            //remove/add from each group, assume imported
+                            if(first.name().equals("add")){
-                            mbuilder.addStatement("Groups.$L.$L(this)", def.name, first.name());
+                                //remove/add from each group, assume imported
                                mbuilder.addStatement("index__$L = Groups.$L.addIndex(this)", def.name, def.name);
                            }else{
                                //remove/add from each group, assume imported
                                mbuilder.addStatement("Groups.$L.removeIndex(this, index__$L);", def.name, def.name);
                                mbuilder.addStatement("index__$L = -1", def.name);
                            }
                        }
                    }
@@ -459,7 +511,7 @@ public class EntityProcess extends BaseProcessor{
                        //SPECIAL CASE: sync I/O code
                        if((first.name().equals("readSync") || first.name().equals("writeSync"))){
-                            io.writeSync(mbuilder, first.name().equals("writeSync"), syncedFields, allFields);
+                            io.writeSync(mbuilder, first.name().equals("writeSync"), allFields);
                        }
                        //SPECIAL CASE: sync I/O code for writing to/from a manual buffer
@@ -543,6 +595,7 @@ public class EntityProcess extends BaseProcessor{
                    builder.addSuperinterface(Poolable.class);
                    //implement reset()
                    MethodSpec.Builder resetBuilder = MethodSpec.methodBuilder("reset").addModifiers(Modifier.PUBLIC);
                    allFieldSpecs.sortComparing(s -> s.name);
                    for(FieldSpec spec : allFieldSpecs){
                        @Nullable Svar variable = specVariables.get(spec);
                        if(variable != null && variable.isAny(Modifier.STATIC, Modifier.FINAL)) continue;
@@ -570,6 +623,18 @@ public class EntityProcess extends BaseProcessor{
                .returns(tname(packageName + "." + name))
                .addStatement(ann.pooled() ? "return Pools.obtain($L.class, " +name +"::new)" : "return new $L()", name).build());
                skipDeprecated(builder);
                if(!legacy){
                    TypeSpec.Builder fieldBuilder = baseClassBuilder != null ? baseClassBuilder : builder;
                    if(addIndexToBase || baseClassBuilder == null){
                        //add group index int variables
                        for(GroupDefinition def : groups){
                            fieldBuilder.addField(FieldSpec.builder(int.class, "index__" + def.name, Modifier.PROTECTED, Modifier.TRANSIENT).initializer("-1").build());
                        }
                    }
                }
                definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs, legacy));
            }
@@ -585,16 +650,20 @@ public class EntityProcess extends BaseProcessor{
                groupsBuilder.addField(ParameterizedTypeName.get(
                    ClassName.bestGuess("mindustry.entities.EntityGroup"), itype), group.name, Modifier.PUBLIC, Modifier.STATIC);
-                groupInit.addStatement("$L = new $T<>($L.class, $L, $L)", group.name, groupc, itype, group.spatial, group.mapping);
+                groupInit.addStatement("$L = new $T<>($L.class, $L, $L, (e, pos) -> { if(e instanceof $L.IndexableEntity__$L ix) ix.setIndex__$L(pos); })", group.name, groupc, itype, group.spatial, group.mapping, packageName, group.name, group.name);
            }
            //write the groups
            groupsBuilder.addMethod(groupInit.build());
            groupsBuilder.addField(boolean.class, "isClearing", Modifier.PUBLIC, Modifier.STATIC);
            MethodSpec.Builder groupClear = MethodSpec.methodBuilder("clear").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
            groupClear.addStatement("isClearing = true");
            for(GroupDefinition group : groupDefs){
                groupClear.addStatement("$L.clear()", group.name);
            }
            groupClear.addStatement("isClearing = false");
            //write clear
            groupsBuilder.addMethod(groupClear.build());
@@ -796,86 +865,13 @@ public class EntityProcess extends BaseProcessor{
                    }
                }
-                write(def.builder, imports.asArray());
+                write(def.builder, imports.toSeq());
            }
            //write base classes last
            for(TypeSpec.Builder b : baseClasses){
-                write(b, imports.asArray());
+                write(b, imports.toSeq());
            }
            //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){
                //indirect interfaces to implement methods for
                Seq<Stype> dependencies = interf.allInterfaces().and(interf);
                Seq<Smethod> methods = dependencies.flatMap(Stype::methods);
                methods.sortComparing(Object::toString);
                //optionally add superclass
                Stype superclass = dependencies.map(this::interfaceToComp).find(s -> s != null && s.annotation(Component.class).base());
                //use the base type when the interface being emulated has a base
                TypeName type = superclass != null && interfaceToComp(interf).annotation(Component.class).base() ? tname(baseName(superclass)) : interf.tname();
                //used method signatures
                ObjectSet<String> signatures = new ObjectSet<>();
                //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);
                nullBuilder.addSuperinterface(interf.tname());
                if(superclass != null) nullBuilder.superclass(tname(baseName(superclass)));
                for(Smethod method : methods){
                    String signature = method.toString();
                    if(signatures.contains(signature)) continue;
                    Stype compType = interfaceToComp(method.type());
                    MethodSpec.Builder builder = MethodSpec.overriding(method.e).addModifiers(Modifier.PUBLIC, Modifier.FINAL);
                    builder.addAnnotation(OverrideCallSuper.class); //just in case
                    if(!method.isVoid()){
                        if(method.name().equals("isNull")){
                            builder.addStatement("return true");
                        }else if(method.name().equals("id")){
                                builder.addStatement("return -1");
                        }else{
                            Svar variable = compType == null || method.params().size > 0 ? null : compType.fields().find(v -> v.name().equals(method.name()));
                            String desc = variable == null ? null : variable.descString();
                            if(variable == null || !varInitializers.containsKey(desc)){
                                builder.addStatement("return " + getDefault(method.ret().toString()));
                            }else{
                                String init = varInitializers.get(desc);
                                builder.addStatement("return " + (init.equals("{}") ? "new " + variable.mirror().toString() : "") + init);
                            }
                        }
                    }
                    nullBuilder.addMethod(builder.build());
                    signatures.add(signature);
                }
                nullsBuilder.addField(FieldSpec.builder(type, Strings.camelize(baseName)).initializer("new " + className + "()").addModifiers(Modifier.FINAL, Modifier.STATIC, Modifier.PUBLIC).build());
                write(nullBuilder);
            }
            write(nullsBuilder);
        }
    }
@@ -928,7 +924,7 @@ public class EntityProcess extends BaseProcessor{
                out.addAll(getDependencies(comp));
            }
-            defComponents.put(type, out.asArray());
+            defComponents.put(type, out.toSeq());
        }
        return defComponents.get(type);
@@ -955,7 +951,7 @@ public class EntityProcess extends BaseProcessor{
            //remove it again just in case
            out.remove(component);
-            componentDependencies.put(component, result.asArray());
+            componentDependencies.put(component, result.toSeq());
        }
        return componentDependencies.get(component);
@@ -980,6 +976,11 @@ public class EntityProcess extends BaseProcessor{
        throw new IllegalArgumentException("Missing types.");
    }
    void skipDeprecated(TypeSpec.Builder builder){
        //deprecations are irrelevant in generated code
        builder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"deprecation\"").build());
    }
    class GroupDefinition{
        final String name;
        final ClassName baseType;
--- a/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/AssetsProcess.java
@@ -22,8 +22,8 @@ public class AssetsProcess extends BaseProcessor{
    @Override
    public void process(RoundEnvironment env) throws Exception{
-        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound");
+        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound", true);
-        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music");
+        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music", false);
        processUI(env.getElementsAnnotatedWith(StyleDefaults.class));
    }
@@ -57,6 +57,9 @@ public class AssetsProcess extends BaseProcessor{
        ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectIntMap.class, String.class),
            "codes", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectIntMap<>()").build());
        ichtype.addField(FieldSpec.builder(ParameterizedTypeName.get(IntMap.class, String.class),
            "codeToName", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new IntMap<>()").build());
        ObjectSet<String> used = new ObjectSet<>();
        for(Jval val : icons.get("glyphs").asArray()){
@@ -67,7 +70,9 @@ public class AssetsProcess extends BaseProcessor{
            int code = val.getInt("code", 0);
            iconcAll.append((char)code);
            ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).addJavadoc(String.format("\\u%04x", code)).initializer("'" + ((char)code) + "'").build());
            ichinit.addStatement("codes.put($S, $L)", name, code);
            ichinit.addStatement("codeToName.put($L, $S)", code, name);
            ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC);
            icload.addStatement(name + "Small = mindustry.ui.Fonts.getGlyph(mindustry.ui.Fonts.def, (char)" + code + ")");
@@ -117,25 +122,27 @@ public class AssetsProcess extends BaseProcessor{
        JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
    }
-    void processSounds(String classname, String path, String rtype) throws Exception{
+    void processSounds(String classname, String path, String rtype, boolean genid) throws Exception{
        TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
        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());
+        if(genid){
-        type.addField(FieldSpec.builder(ObjectIntMap.class, "soundToId", Modifier.STATIC, Modifier.PRIVATE).initializer("new ObjectIntMap()").build());
+            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")
+            type.addMethod(MethodSpec.methodBuilder("getSoundId")
-        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-        .addParameter(Sound.class, "sound")
+            .addParameter(Sound.class, "sound")
-        .returns(int.class)
+            .returns(int.class)
-        .addStatement("return soundToId.get(sound, -1)").build());
+            .addStatement("return soundToId.get(sound, -1)").build());
-        type.addMethod(MethodSpec.methodBuilder("getSound")
+            type.addMethod(MethodSpec.methodBuilder("getSound")
-        .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-        .addParameter(int.class, "id")
+            .addParameter(int.class, "id")
-        .returns(Sound.class)
+            .returns(Sound.class)
-        .addStatement("return (Sound)idToSound.get(id, () -> Sounds.none)").build());
+            .addStatement("return (Sound)idToSound.get(id, () -> Sounds.none)").build());
        }
        HashSet<String> names = new HashSet<>();
        Seq<Fi> files = new Seq<>();
@@ -157,20 +164,30 @@ public class AssetsProcess extends BaseProcessor{
            String filepath =  path.substring(path.lastIndexOf("/") + 1) + p.path().substring(p.path().lastIndexOf(path) + path.length());
-            staticb.addStatement("soundToId.put($L, $L)", name, id);
+            if(genid){
                staticb.addStatement("soundToId.put($L, $L)", name, id);
-            loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; soundToId.put(a, $L); idToSound.put($L, a); }",
+                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; soundToId.put(a, $L); idToSound.put($L, a); }",
                Core.class, filepath, rtype, name, rtype, id, id);
            }else{
                loadBegin.addStatement("$T.assets.load($S, $L.class).loaded = a -> { $L = ($L)a; }", Core.class, filepath, rtype, name, rtype);
            }
            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
            id ++;
        }
-        type.addStaticBlock(staticb.build());
+        if(genid){
            type.addStaticBlock(staticb.build());
        }
        if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()").build());
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()")
            .addJavadoc("Does not play anything.").build());
            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "unset", Modifier.STATIC, Modifier.PUBLIC).initializer("new " + rtype + "()")
            .addJavadoc("Used a placeholder value for unset default values. This is usually reassigned in init() of the relevant block or unit. Does not play anything.").build());
        }
        type.addMethod(loadBegin.build());
--- a/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java
+++ b/annotations/src/main/java/mindustry/annotations/impl/StructProcess.java
@@ -1,6 +1,7 @@
 package mindustry.annotations.impl;
 import arc.struct.*;
 import arc.util.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
@@ -63,23 +64,28 @@ public class StructProcess extends BaseProcessor{
                    int size = varSize(var);
                    TypeName varType = var.tname();
                    String varName = var.name();
                    boolean isBool = varType == TypeName.BOOLEAN;
                    //add val param to constructor
                    constructor.addParameter(varType, varName);
                    //[get] field(structType) : fieldType
-                    MethodSpec.Builder getter = MethodSpec.methodBuilder(var.name().toString())
+                    MethodSpec.Builder getter = MethodSpec.methodBuilder(var.name())
                    .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
                    .returns(varType)
                    .addParameter(structType, structParam);
                    //[set] field(structType, fieldType) : structType
-                    MethodSpec.Builder setter = MethodSpec.methodBuilder(var.name().toString())
+                    MethodSpec.Builder setter = MethodSpec.methodBuilder(var.name())
                    .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
                    .returns(structType)
                    .addParameter(structType, structParam).addParameter(varType, "value");
                    //field for offset
                    classBuilder.addField(FieldSpec.builder(structType, "bitMask" + Strings.capitalize(varName), Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL)
                        .initializer(!isBool ? "($T)($L)" : "($T)(1L << $L)", structType, isBool ? offset : bitString(offset, size, structTotalSize)).build());
                    //[getter]
-                    if(varType == TypeName.BOOLEAN){
+                    if(isBool){
                        //bools: single bit, is simplified
                        getter.addStatement("return ($L & (1L << $L)) != 0", structParam, offset);
                    }else if(varType == TypeName.FLOAT){
@@ -91,25 +97,25 @@ public class StructProcess extends BaseProcessor{
                    }
                    //[setter] + [constructor building]
-                    if(varType == TypeName.BOOLEAN){
+                    if(isBool){
                        cons.append(" | (").append(varName).append(" ? ").append("1L << ").append(offset).append("L : 0)");
                        //bools: single bit, needs special case to clear things
                        setter.beginControlFlow("if(value)");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
+                        setter.addStatement("return ($T)($L | (1L << $LL))", structType, structParam, offset);
                        setter.nextControlFlow("else");
-                        setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, offset);
+                        setter.addStatement("return ($T)(($L & ~(1L << $LL)))", structType, structParam, offset);
                        setter.endControlFlow();
                    }else if(varType == TypeName.FLOAT){
                        cons.append(" | (").append("(").append(structType).append(")").append("Float.floatToIntBits(").append(varName).append(") << ").append(offset).append("L)");
                        //floats: need conversion
-                        setter.addStatement("return ($T)(($L & $L) | (($T)Float.floatToIntBits(value) << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
+                        setter.addStatement("return ($T)(($L & (~$L)) | (($T)Float.floatToIntBits(value) << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
                    }else{
                        cons.append(" | (((").append(structType).append(")").append(varName).append(" << ").append(offset).append("L)").append(" & ").append(bitString(offset, size, structTotalSize)).append(")");
                        //bytes, shorts, chars, ints
-                        setter.addStatement("return ($T)(($L & $L) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
+                        setter.addStatement("return ($T)(($L & (~$L)) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
                    }
                    doc.append("<br>  ").append(varName).append(" [").append(offset).append("..").append(size + offset).append("]\n");
@@ -124,7 +130,7 @@ public class StructProcess extends BaseProcessor{
                classBuilder.addJavadoc(doc.toString());
                //add constructor final statement + add to class and build
-                constructor.addStatement("return ($T)($L)", structType, cons.toString().substring(3));
+                constructor.addStatement("return ($T)($L)", structType, cons.substring(3));
                classBuilder.addMethod(constructor.build());
                JavaFile.builder(packageName, classBuilder.build()).build().writeTo(BaseProcessor.filer);
--- a/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/misc/LoadRegionProcessor.java
@@ -3,7 +3,6 @@ package mindustry.annotations.misc;
 import arc.*;
 import arc.graphics.g2d.*;
 import arc.struct.*;
 import arc.struct.ObjectMap.*;
 import com.squareup.javapoet.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.annotations.*;
@@ -34,10 +33,15 @@ public class LoadRegionProcessor extends BaseProcessor{
            fieldMap.get(field.enclosingType(), Seq::new).add(field);
        }
-        for(Entry<Stype, Seq<Svar>> entry : fieldMap){
+        Seq<Stype> entries = Seq.with(fieldMap.keys());
-            method.beginControlFlow("if(content instanceof $L)", entry.key.fullName());
+        entries.sortComparing(e -> e.name());
-            for(Svar field : entry.value){
+        for(Stype type : entries){
            Seq<Svar> fields = fieldMap.get(type);
            fields.sortComparing(s -> s.name());
            method.beginControlFlow("if(content instanceof $L)", type.fullName());
            for(Svar field : fields){
                Load an = field.annotation(Load.class);
                //get # of array dimensions
                int dims = count(field.mirror().toString(), "[]");
@@ -46,7 +50,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                //not an array
                if(dims == 0){
-                    method.addStatement("(($L)content).$L = $T.atlas.find($L$L)", entry.key.fullName(), field.name(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($L)content).$L = $T.atlas.find($L$L)", type.fullName(), field.name(), Core.class, parse(an.value()), fallbackString);
                }else{
                    //is an array, create length string
                    int[] lengths = an.lengths();
@@ -59,7 +63,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                    StringBuilder lengthString = new StringBuilder();
                    for(int value : lengths) lengthString.append("[").append(value).append("]");
-                    method.addStatement("(($T)content).$L = new $T$L", entry.key.tname(), field.name(), TextureRegion.class, lengthString.toString());
+                    method.addStatement("(($T)content).$L = new $T$L", type.tname(), field.name(), TextureRegion.class, lengthString.toString());
                    for(int i = 0; i < dims; i++){
                        method.beginControlFlow("for(int INDEX$L = 0; INDEX$L < $L; INDEX$L ++)", i, i, lengths[i], i);
@@ -70,7 +74,7 @@ public class LoadRegionProcessor extends BaseProcessor{
                        indexString.append("[INDEX").append(i).append("]");
                    }
-                    method.addStatement("(($T)content).$L$L = $T.atlas.find($L$L)", entry.key.tname(), field.name(), indexString.toString(), Core.class, parse(an.value()), fallbackString);
+                    method.addStatement("(($T)content).$L$L = $T.atlas.find($L$L)", type.tname(), field.name(), indexString.toString(), Core.class, parse(an.value()), fallbackString);
                    for(int i = 0; i < dims; i++){
                        method.endControlFlow();
--- a/annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java
+++ b/annotations/src/main/java/mindustry/annotations/remote/CallGenerator.java
@@ -60,7 +60,13 @@ public class CallGenerator{
            register.addStatement("mindustry.net.Net.registerPacket($L.$L::new)", packageName, ent.packetClassName);
            //add fields to the type
-            for(Svar param : ent.element.params()){
+            Seq<Svar> params = ent.element.params();
            for(int i = 0; i < params.size; i++){
                if(!ent.where.isServer && i == 0){
                    continue;
                }
                Svar param = params.get(i);
                packet.addField(param.tname(), param.name(), Modifier.PUBLIC);
            }
@@ -120,7 +126,7 @@ public class CallGenerator{
                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));
+                String ser = serializer.getNetWriter(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);
--- a/annotations/src/main/java/mindustry/annotations/util/Stype.java
+++ b/annotations/src/main/java/mindustry/annotations/util/Stype.java
@@ -25,7 +25,11 @@ public class Stype extends Selement<TypeElement>{
    }
    public Seq<Stype> allInterfaces(){
-        return interfaces().flatMap(s -> s.allInterfaces().and(s)).distinct();
+        return interfaces().flatMap(s -> s.allInterfaces().add(s)).distinct();
    }
    public boolean isInterface(){
        return e.getKind() == ElementKind.INTERFACE;
    }
    public Seq<Stype> superclasses(){
@@ -33,7 +37,7 @@ public class Stype extends Selement<TypeElement>{
    }
    public Seq<Stype> allSuperclasses(){
-        return superclasses().flatMap(s -> s.allSuperclasses().and(s)).distinct();
+        return superclasses().flatMap(s -> s.allSuperclasses().add(s)).distinct();
    }
    public Stype superclass(){
--- a/annotations/src/main/java/mindustry/annotations/util/TypeIOResolver.java
+++ b/annotations/src/main/java/mindustry/annotations/util/TypeIOResolver.java
@@ -16,7 +16,7 @@ public class TypeIOResolver{
     * Maps fully qualified class names to their serializers.
     */
    public static ClassSerializer resolve(BaseProcessor processor){
-        ClassSerializer out = new ClassSerializer(new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>());
+        ClassSerializer out = new ClassSerializer(new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>());
        for(Stype type : processor.types(TypeIOHandler.class)){
            //look at all TypeIOHandler methods
            Seq<Smethod> methods = type.methods();
@@ -25,7 +25,10 @@ public class TypeIOResolver{
                    Seq<Svar> params = meth.params();
                    //2 params, second one is type, first is writer
                    if(params.size == 2 && params.first().tname().toString().equals("arc.util.io.Writes")){
-                        out.writers.put(fix(params.get(1).tname().toString()), type.fullName() + "." + meth.name());
+                        //Net suffix indicates that this should only be used for sync operations
                        ObjectMap<String, String> targetMap = meth.name().endsWith("Net") ? out.netWriters : out.writers;
                        targetMap.put(fix(params.get(1).tname().toString()), type.fullName() + "." + meth.name());
                    }else if(params.size == 1 && params.first().tname().toString().equals("arc.util.io.Reads") && !meth.isVoid()){
                        //1 param, one is reader, returns type
                        out.readers.put(fix(meth.retn().toString()), type.fullName() + "." + meth.name());
@@ -47,12 +50,17 @@ public class TypeIOResolver{
    /** Information about read/write methods for class types. */
    public static class ClassSerializer{
-        public final ObjectMap<String, String> writers, readers, mutatorReaders;
+        public final ObjectMap<String, String> writers, readers, mutatorReaders, netWriters;
-        public ClassSerializer(ObjectMap<String, String> writers, ObjectMap<String, String> readers, ObjectMap<String, String> mutatorReaders){
+        public ClassSerializer(ObjectMap<String, String> writers, ObjectMap<String, String> readers, ObjectMap<String, String> mutatorReaders, ObjectMap<String, String> netWriters){
            this.writers = writers;
            this.readers = readers;
            this.mutatorReaders = mutatorReaders;
            this.netWriters = netWriters;
        }
        public String getNetWriter(String type, String fallback){
            return netWriters.get(type, writers.get(type, fallback));
        }
    }
 }
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -6,9 +6,12 @@ atrax=1
 beta=30
 block=2
 corvus=24
 elude=45
 flare=3
 gamma=31
 latum=46
 mace=4
 manifold=36
 mega=5
 mindustry.entities.comp.BuildingComp=6
 mindustry.entities.comp.BulletComp=7
@@ -19,19 +22,29 @@ mindustry.entities.comp.LaunchCoreComp=11
 mindustry.entities.comp.PlayerComp=12
 mindustry.entities.comp.PosTeam=27
 mindustry.entities.comp.PosTeamDef=28
 mindustry.entities.comp.PowerGraphComp=41
 mindustry.entities.comp.PowerGraphUpdaterComp=42
 mindustry.entities.comp.PuddleComp=13
 mindustry.entities.comp.WorldLabelComp=35
 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
 missile=39
 mono=16
 nova=17
 oct=26
 osc=44
 poly=18
 pulsar=19
 quad=23
 quasar=32
 renale=47
 risso=20
 spiroct=21
 stell=43
 timed=38
 timedDef=37
 toxopid=33
 vanquish=40
 vela=25
--- a/annotations/src/main/resources/revisions/BuildingComp/1.json
+++ b/annotations/src/main/resources/revisions/BuildingComp/1.json
@@ -0,0 +1 @@
 {version:1,fields:[{name:health,type:float},{name:items,type:mindustry.world.modules.ItemModule},{name:liquids,type:mindustry.world.modules.LiquidModule},{name:power,type:mindustry.world.modules.PowerModule},{name:team,type:mindustry.game.Team},{name:x,type:float},{name:y,type:float}]}
--- a/annotations/src/main/resources/revisions/EffectStateComp/6.json
+++ b/annotations/src/main/resources/revisions/EffectStateComp/6.json
@@ -0,0 +1 @@
 {version:6,fields:[{name:color,type:arc.graphics.Color},{name:data,type:java.lang.Object},{name:effect,type:mindustry.entities.Effect},{name:lifetime,type:float},{name:offsetPos,type:float},{name:offsetRot,type:float},{name:offsetX,type:float},{name:offsetY,type:float},{name:parent,type:mindustry.gen.Posc},{name:rotWithParent,type:boolean},{name:rotation,type:float},{name:time,type:float},{name:x,type:float},{name:y,type:float}]}
--- a/annotations/src/main/resources/revisions/PlayerComp/1.json
+++ b/annotations/src/main/resources/revisions/PlayerComp/1.json
@@ -0,0 +1 @@
 {version:1,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}
--- a/annotations/src/main/resources/revisions/PlayerComp/2.json
+++ b/annotations/src/main/resources/revisions/PlayerComp/2.json
@@ -0,0 +1 @@
 {version:2,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:selectedBlock,type:mindustry.world.Block},{name:selectedRotation,type:int},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}
--- a/annotations/src/main/resources/revisions/PowerGraphUpdaterComp/0.json
+++ b/annotations/src/main/resources/revisions/PowerGraphUpdaterComp/0.json
@@ -0,0 +1 @@
 {fields:[]}
--- a/annotations/src/main/resources/revisions/WorldLabelComp/0.json
+++ b/annotations/src/main/resources/revisions/WorldLabelComp/0.json
@@ -0,0 +1 @@
 {fields:[{name:flags,type:byte},{name:fontSize,type:float},{name:text,type:java.lang.String},{name:x,type:float},{name:y,type:float},{name:z,type:float}]}
--- a/annotations/src/main/resources/revisions/alpha/3.json
+++ b/annotations/src/main/resources/revisions/alpha/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/arkyid/3.json
+++ b/annotations/src/main/resources/revisions/arkyid/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/beta/3.json
+++ b/annotations/src/main/resources/revisions/beta/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/block/7.json
+++ b/annotations/src/main/resources/revisions/block/7.json
@@ -0,0 +1 @@
 {version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/corvus/7.json
+++ b/annotations/src/main/resources/revisions/corvus/7.json
@@ -0,0 +1 @@
 {version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/elude/0.json
+++ b/annotations/src/main/resources/revisions/elude/0.json
@@ -0,0 +1 @@
 {fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/flare/7.json
+++ b/annotations/src/main/resources/revisions/flare/7.json
@@ -0,0 +1 @@
 {version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/gamma/3.json
+++ b/annotations/src/main/resources/revisions/gamma/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/latum/0.json
+++ b/annotations/src/main/resources/revisions/latum/0.json
@@ -0,0 +1 @@
 {fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/mace/7.json
+++ b/annotations/src/main/resources/revisions/mace/7.json
@@ -0,0 +1 @@
 {version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/manifold/0.json
+++ b/annotations/src/main/resources/revisions/manifold/0.json
@@ -0,0 +1 @@
 {fields:[{name:ammo,type:float},{name:building,type:Building},{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}]}
--- a/annotations/src/main/resources/revisions/manifold/1.json
+++ b/annotations/src/main/resources/revisions/manifold/1.json
@@ -0,0 +1 @@
 {version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:building,type:Building},{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}]}
--- a/annotations/src/main/resources/revisions/mega/5.json
+++ b/annotations/src/main/resources/revisions/mega/5.json
@@ -0,0 +1 @@
 {version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/missile/0.json
+++ b/annotations/src/main/resources/revisions/missile/0.json
@@ -0,0 +1 @@
 {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:lifetime,type:float},{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:time,type:float},{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}]}
--- a/annotations/src/main/resources/revisions/missile/1.json
+++ b/annotations/src/main/resources/revisions/missile/1.json
@@ -0,0 +1 @@
 {version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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:lifetime,type:float},{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:time,type:float},{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}]}
--- a/annotations/src/main/resources/revisions/mono/6.json
+++ b/annotations/src/main/resources/revisions/mono/6.json
@@ -0,0 +1 @@
 {version:6,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/nova/5.json
+++ b/annotations/src/main/resources/revisions/nova/5.json
@@ -0,0 +1 @@
 {version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/oct/5.json
+++ b/annotations/src/main/resources/revisions/oct/5.json
@@ -0,0 +1 @@
 {version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/osc/0.json
+++ b/annotations/src/main/resources/revisions/osc/0.json
@@ -0,0 +1 @@
 {fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/poly/5.json
+++ b/annotations/src/main/resources/revisions/poly/5.json
@@ -0,0 +1 @@
 {version:5,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/pulsar/3.json
+++ b/annotations/src/main/resources/revisions/pulsar/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/quad/6.json
+++ b/annotations/src/main/resources/revisions/quad/6.json
@@ -0,0 +1 @@
 {version:6,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/quasar/3.json
+++ b/annotations/src/main/resources/revisions/quasar/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/risso/7.json
+++ b/annotations/src/main/resources/revisions/risso/7.json
@@ -0,0 +1 @@
 {version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/scuttler/0.json
+++ b/annotations/src/main/resources/revisions/scuttler/0.json
@@ -0,0 +1 @@
 {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}]}
--- a/annotations/src/main/resources/revisions/scuttler/1.json
+++ b/annotations/src/main/resources/revisions/scuttler/1.json
@@ -0,0 +1 @@
 {version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/spiroct/6.json
+++ b/annotations/src/main/resources/revisions/spiroct/6.json
@@ -0,0 +1 @@
 {version:6,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/stell/0.json
+++ b/annotations/src/main/resources/revisions/stell/0.json
@@ -0,0 +1 @@
 {fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/toxopid/3.json
+++ b/annotations/src/main/resources/revisions/toxopid/3.json
@@ -0,0 +1 @@
 {version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/annotations/src/main/resources/revisions/vanquish/0.json
+++ b/annotations/src/main/resources/revisions/vanquish/0.json
@@ -0,0 +1 @@
 {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}]}
--- a/annotations/src/main/resources/revisions/vanquish/1.json
+++ b/annotations/src/main/resources/revisions/vanquish/1.json
@@ -0,0 +1 @@
 {version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,16 @@
 import java.text.SimpleDateFormat
 buildscript{
    ext{
-        getArcHash = {
+        arcHash = property("archash")
            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
        }
-        arcHash = getArcHash()
+        localArc = new File(rootDir.parent, 'Arc').exists() && !project.hasProperty("noLocalArc")
        arcModule = { String name ->
            //skip to last submodule
            name = name.substring(name.lastIndexOf(':') + 1)
            return "com.github.Anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
        }
    }
    repositories{
@@ -13,51 +19,32 @@ buildscript{
        google()
        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
        maven{ url 'https://jitpack.io' }
        //fake repository to download my patched robovm jar from
        ivy{
            url 'https://github.com/'
            patternLayout {
                artifact '/[organisation]/[module]/raw/a-single-jar-file/[revision].jar'
            }
            // This is required in Gradle 6.0+ as metadata file (ivy.xml)
            // is mandatory. Docs linked below this code section
            metadataSources { artifact() }
        }
    }
    dependencies{
-        //use local, patched robovm gradle plugin until my PR for gradle 7.0 support is merged
+        classpath arcModule(":extensions:packer")
-        //https://github.com/Anuken/robovm/raw/a-single-jar-file/robovm-gradle-plugin-2.3.14-SNAPSHOT.jar
+        classpath arcModule(":arc-core")
        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.jvm" version "2.1.10"
-    id "org.jetbrains.kotlin.kapt" version "1.4.32"
+    id "org.jetbrains.kotlin.kapt" version "2.1.10"
 }
 allprojects{
    apply plugin: 'maven-publish'
-    version = 'release'
+    version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release'
    group = 'com.github.Anuken'
    ext{
-        versionNumber = '7'
+        versionNumber = '8'
-        if(!project.hasProperty("versionModifier")) versionModifier = 'pre-alpha'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'beta'
        if(!project.hasProperty("versionType")) versionType = 'official'
        appName = 'Mindustry'
        steamworksVersion = '0b86023401880bb5e586bc404bedbaae9b1f1c94'
-        rhinoVersion = '3c6bbadf73a904eefcc28b6fd8aa742ac575e878'
+        rhinoVersion = '54b75cbd1207ef1fd5cff517cbd188e763c85baa'
        loadVersionProps = {
            return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
@@ -67,20 +54,6 @@ allprojects{
            return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
        }
        localArc = {
            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
        }
        arcModule = { String name ->
            if(localArc()){
                return project(":Arc:$name")
            }else{
                //skip to last submodule
                if(name.contains(':')) name = name.split(':').last()
                return "com.github.Anuken.Arc:$name:${getArcHash()}"
            }
        }
        generateDeployName = { String platform ->
            if(platform == "windows"){
                platform += "64"
@@ -118,6 +91,10 @@ allprojects{
            return project.getProperties()["buildversion"]
        }
        getCommitHash = {
            return 'git rev-parse --verify --short HEAD'.execute().text.trim()
        }
        getPackage = {
            return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
        }
@@ -135,12 +112,12 @@ allprojects{
        generateLocales = {
            def output = 'en\n'
            def bundles = new File(project(':core').projectDir, 'assets/bundles/')
-            bundles.listFiles().each{ other ->
+            bundles.list().sort().each{ name ->
-                if(other.name == "bundle.properties") return
+                if(name == "bundle.properties" || name == "global.properties") return
-                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
+                output += name.substring("bundle".length() + 1, name.lastIndexOf('.')) + "\n"
            }
            new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().join("\n")
+            new File(project(':core').projectDir, 'assets/basepartnames').text = new File(project(':core').projectDir, 'assets/baseparts/').list().sort().findAll{f -> f.endsWith(".msch")}.join("\n")
        }
        writeVersion = {
@@ -162,6 +139,11 @@ allprojects{
                props["number"] = versionNumber
                props["modifier"] = versionModifier
                props["build"] = buildid
                props["buildDate"] = new SimpleDateFormat("MMMM d, yyyy HH:mm a", Locale.getDefault()).format(new Date())
                props["commitHash"] = "unknown"
                if(project.hasProperty("showCommitHash")){
                    props["commitHash"] = getCommitHash()
                }
                props.store(pfile.newWriter(), "Autogenerated file. Do not modify.")
            }
@@ -214,15 +196,21 @@ allprojects{
    tasks.withType(JavaCompile){
        targetCompatibility = 8
-        sourceCompatibility = JavaVersion.VERSION_16
+        sourceCompatibility = JavaVersion.VERSION_17
        options.encoding = "UTF-8"
        options.compilerArgs += ["-Xlint:deprecation"]
        dependsOn clearCache
-        options.forkOptions.jvmArgs.addAll([
+        options.forkOptions.jvmArgs += [
            '--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
            '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
-            '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED'
+            '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED',
-        ])
+            '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED',
            '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
            '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
            '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
            '--add-opens=java.base/sun.reflect.annotation=ALL-UNNAMED'
        ]
    }
 }
@@ -235,7 +223,7 @@ configure(project(":annotations")){
 }
 //compile with java 8 compatibility for everything except the annotation project
-configure(subprojects - project(":annotations")){
+configure(subprojects - project(":annotations") - project(":tests")){
    tasks.withType(JavaCompile){
        options.compilerArgs.addAll(['--release', '8'])
    }
@@ -243,7 +231,8 @@ configure(subprojects - project(":annotations")){
    tasks.withType(Javadoc){
        options{
            addStringOption('Xdoclint:none', '-quiet')
-            addStringOption('-release', '16')
+            addStringOption('-release', '17')
            encoding('UTF-8')
        }
    }
 }
@@ -255,6 +244,7 @@ project(":desktop"){
    dependencies{
        implementation project(":core")
        implementation arcModule("extensions:profiling")
        implementation arcModule("extensions:discord")
        implementation arcModule("natives:natives-desktop")
        implementation arcModule("natives:natives-freetype-desktop")
@@ -264,42 +254,7 @@ project(":desktop"){
        implementation "com.github.Anuken:steamworks4j:$steamworksVersion"
        implementation arcModule("backends:backend-sdl")
-    }
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
 }
 project(":ios"){
    apply plugin: "java"
    apply plugin: "robovm"
    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'] = '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)
    }
    dependencies{
        implementation project(":core")
        implementation arcModule("natives:natives-ios")
        implementation arcModule("natives:natives-freetype-ios")
        implementation arcModule("backends:backend-robovm")
        compileOnly project(":annotations")
    }
 }
@@ -310,7 +265,7 @@ project(":core"){
    kapt{
        javacOptions{
-            option("-source", "16")
+            option("-source", "17")
            option("-target", "1.8")
        }
    }
@@ -357,7 +312,7 @@ project(":core"){
    task assetsJar(type: Jar, dependsOn: ":tools:pack"){
        archiveClassifier = 'assets'
        from files("assets"){
-            exclude "config", "cache", "music", "sounds"
+            exclude "config", "cache", "music", "sounds", "sprites/fallback"
        }
    }
@@ -368,15 +323,10 @@ project(":core"){
        }
    }
    artifacts{
        archives sourcesJar
        archives assetsJar
    }
    dependencies{
        compileJava.dependsOn(preGen)
-        api "org.lz4:lz4-java:1.7.1"
+        api "at.yawk.lz4:lz4-java:1.10.2"
        api arcModule("arc-core")
        api arcModule("extensions:flabel")
        api arcModule("extensions:freetype")
@@ -384,12 +334,12 @@ project(":core"){
        api arcModule("extensions:fx")
        api arcModule("extensions:arcnet")
        api "com.github.Anuken:rhino:$rhinoVersion"
-        if(localArc() && debugged()) api arcModule("extensions:recorder")
+        if(localArc && debugged()) api arcModule("extensions:recorder")
-        if(localArc()) api arcModule(":extensions:packer")
+        if(localArc) api arcModule(":extensions:packer")
-        annotationProcessor 'com.github.Anuken:jabel:34e4c172e65b3928cd9eabe1993654ea79c409cd'
+        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
        compileOnly project(":annotations")
-        kapt project(":annotations")
+        if(!project.hasProperty("noKapt")) kapt project(":annotations")
    }
    afterEvaluate{
@@ -414,6 +364,12 @@ project(":core"){
        }
    }
    gradle.taskGraph.whenReady{
        //these are completely unnecessary
        tasks.kaptGenerateStubsKotlin.onlyIf{ false }
        tasks.compileKotlin.onlyIf{ false }
    }
    //comp** classes are only used for code generation
    jar{
        exclude("mindustry/entities/comp/**")
@@ -426,6 +382,7 @@ project(":server"){
    dependencies{
        implementation project(":core")
        implementation arcModule("backends:backend-headless")
        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
    }
 }
@@ -437,9 +394,16 @@ project(":tests"){
        testImplementation "org.junit.jupiter:junit-jupiter-params:5.7.1"
        testImplementation "org.junit.jupiter:junit-jupiter-api:5.7.1"
        testImplementation arcModule("backends:backend-headless")
        testImplementation "org.json:json:20230618"
        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.7.1"
    }
    tasks.withType(JavaCompile){
        targetCompatibility = JavaVersion.VERSION_17
        sourceCompatibility = JavaVersion.VERSION_17
        options.compilerArgs.addAll(['--release', '17'])
    }
    test{
        //fork every test so mods don't interact with each other
        forkEvery = 1
@@ -461,6 +425,9 @@ project(":tools"){
        implementation arcModule("natives:natives-desktop")
        implementation arcModule("natives:natives-freetype-desktop")
        implementation arcModule("backends:backend-headless")
        implementation("com.google.guava:guava:33.3.1-jre")
        annotationProcessor 'com.github.Anuken:jabel:0.9.0'
    }
 }
@@ -469,11 +436,11 @@ project(":annotations"){
    dependencies{
        implementation 'com.squareup:javapoet:1.12.1'
-        implementation "com.github.Anuken.Arc:arc-core:$arcHash"
+        implementation arcModule("arc-core")
    }
 }
-configure([":core", ":desktop", ":server", ":tools"].collect{project(it)}){
+configure([":core", ":server"].collect{project(it)}){
    java{
        withJavadocJar()
        withSourcesJar()
@@ -483,6 +450,10 @@ configure([":core", ":desktop", ":server", ":tools"].collect{project(it)}){
        publications{
            maven(MavenPublication){
                from components.java
                //TODO: uncomment this once the jitpack packing is fixed (currently depends on a newer glibc version)
                //if(project.name == "core"){
                //    artifact(tasks.named("assetsJar"))
                //}
            }
        }
    }
--- a/core/assets-raw/fontgen/config.json
+++ b/core/assets-raw/fontgen/config.json
@@ -1055,6 +1055,34 @@
      "search": [
        "defense"
      ]
    },
    {
      "uid": "99aa5c8f6bbe4d96a3f422a60ff065a9",
      "css": "planet",
      "code": 59443,
      "src": "custom_icons",
      "selected": true,
      "svg": {
        "path": "M343.8 0L312.5 31.3 281.3 62.5 218.8 62.5 187.5 93.8 156.3 125 125 156.3 93.8 187.5 62.5 218.8 62.5 281.3 31.3 312.5 0 343.8 0 406.3 0 468.8 0 531.3 0 593.8 0 656.3 31.3 687.5 62.5 718.8 62.5 781.3 93.8 812.5 125 843.8 156.3 875 187.5 906.3 218.8 937.5 281.3 937.5 312.5 968.8 343.8 1000 406.3 1000 468.8 1000 531.3 1000 593.8 1000 656.3 1000 687.5 968.8 718.8 937.5 781.3 937.5 812.5 906.3 843.8 875 875 843.8 906.3 812.5 937.5 781.3 937.5 718.8 968.8 687.5 1000 656.3 1000 593.8 1000 531.3 1000 468.8 1000 406.3 1000 343.8 968.8 312.5 937.5 281.3 937.5 218.8 906.3 187.5 875 156.3 843.8 125 812.5 93.8 781.3 62.5 718.8 62.5 687.5 31.3 656.3 0 593.8 0 531.3 0 468.8 0 406.3 0 343.8 0ZM406.3 62.5L437.5 93.8 468.8 125 531.3 125 562.5 156.3 562.5 218.8 593.8 250 625 281.3 656.3 312.5 687.5 343.8 718.8 375 781.3 375 843.8 375 906.3 375 937.5 406.3 937.5 468.8 937.5 531.3 937.5 593.8 906.3 625 875 656.3 875 718.8 843.8 750 812.5 781.3 781.3 812.5 750 843.8 718.8 875 656.3 875 625 906.3 593.8 937.5 531.3 937.5 500 906.3 468.8 875 437.5 843.8 437.5 781.3 468.8 750 500 718.8 531.3 687.5 562.5 656.3 562.5 593.8 562.5 531.3 531.3 500 500 468.8 468.8 437.5 406.3 437.5 343.8 437.5 281.3 437.5 250 468.8 218.8 500 187.5 531.3 156.3 562.5 125 593.8 93.8 625 62.5 593.8 62.5 531.3 62.5 468.8 62.5 406.3 93.8 375 125 343.8 125 281.3 156.3 250 187.5 218.8 218.8 187.5 250 156.3 281.3 125 343.8 125 375 93.8 406.3 62.5ZM718.8 562.5L687.5 593.8 687.5 656.3 718.8 687.5 781.3 687.5 812.5 656.3 812.5 593.8 781.3 562.5 718.8 562.5Z",
        "width": 1000
      },
      "search": [
        "planet"
      ]
    },
    {
      "uid": "ec43f846ca53702f30310718d627f2b5",
      "css": "arrow-note",
      "code": 59444,
      "src": "custom_icons",
      "selected": true,
      "svg": {
        "path": "M50 0L0 50V150 250 350 450 550 650L50 700H150 250 350 450 550 650 750L800 750 750 800 700 850V950L750 1000H850L900 950 950 900 1000 850 1050 800 1100 750 1150 700 1200 650V550L1150 500 1100 450 1050 400 1000 350 950 300 900 250 850 200H750L700 250V350L750 400 800 450 750 500H650 550 450 350 250L200 450V350 250 150 50L150 0Z",
        "width": 1200
      },
      "search": [
        "arrow-note"
      ]
    }
  ]
 }
--- a/core/assets-raw/fontgen/extra/admin.svg
+++ b/core/assets-raw/fontgen/extra/admin.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
-   width="12"
+        height="12"
-   height="12"
+        version="1.1"
-   version="1.1"
+        id="svg380"
-   id="svg380"
+        sodipodi:docname="admin.svg"
-   sodipodi:docname="admin.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
  <metadata
     id="metadata386">
    <rdf:RDF>
--- a/core/assets-raw/fontgen/extra/distribution.svg
+++ b/core/assets-raw/fontgen/extra/distribution.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
-   width="10"
+        height="10"
-   height="10"
+        version="1.1"
-   version="1.1"
+        id="svg192"
-   id="svg192"
+        sodipodi:docname="distribution.svg"
-   sodipodi:docname="distribution.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
  <metadata
     id="metadata198">
    <rdf:RDF>
--- a/core/assets-raw/fontgen/extra/effect.svg
+++ b/core/assets-raw/fontgen/extra/effect.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
-   width="10"
+        height="10"
-   height="10"
+        version="1.1"
-   version="1.1"
+        id="svg252"
-   id="svg252"
+        sodipodi:docname="effect.svg"
-   sodipodi:docname="effect.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
  <metadata
     id="metadata258">
    <rdf:RDF>
--- a/core/assets-raw/fontgen/extra/file-image.svg
+++ b/core/assets-raw/fontgen/extra/file-image.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="10"
-   width="10"
+        height="13"
-   height="13"
+        version="1.1"
-   version="1.1"
+        id="svg310"
-   id="svg310"
+        sodipodi:docname="file-image.svg"
-   sodipodi:docname="file-image.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
  <metadata
     id="metadata316">
    <rdf:RDF>
--- a/core/assets-raw/fontgen/extra/info.svg
+++ b/core/assets-raw/fontgen/extra/info.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="12"
-   width="12"
+        height="12"
-   height="12"
+        version="1.1"
-   version="1.1"
+        id="svg300"
-   id="svg300"
+        sodipodi:docname="info.svg"
-   sodipodi:docname="info.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
  <metadata
     id="metadata306">
    <rdf:RDF>
--- a/core/assets-raw/fontgen/extra/logic.svg
+++ b/core/assets-raw/fontgen/extra/logic.svg
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        sodipodi:docname="logic.svg"
-   sodipodi:docname="logic.svg"
+        inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
-   inkscape:version="1.0 (9f2f71dc58, 2020-08-02)"
+        id="svg8"
-   id="svg8"
+        version="1.1"
-   version="1.1"
+        viewBox="0 0 128 128">
   viewBox="0 0 128 128">
  <defs
     id="defs2" />
  <sodipodi:namedview
--- a/core/assets-raw/fontgen/extra/planet.svg
+++ b/core/assets-raw/fontgen/extra/planet.svg
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-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="http://www.w3.org/2000/svg"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16"
-   width="16"
+        height="16"
-   height="16"
+        version="1.1"
-   version="1.1"
+        id="svg542"
-   id="svg542"
+        sodipodi:docname="planet.svg"
-   sodipodi:docname="planet.svg"
+        inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)">
  <metadata
     id="metadata548">
    <rdf:RDF>
--- a/core/assets-raw/icons/arrow-note.png
+++ b/core/assets-raw/icons/arrow-note.png
--- a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png
+++ b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-light.png
--- a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png
+++ b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-pod.png
--- a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-preview.png
+++ b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad-preview.png
--- a/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png
+++ b/core/assets-raw/sprites/blocks/campaign/advanced-launch-pad.png
--- a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator-team.png
+++ b/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator-team.png
--- a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png
+++ b/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png
--- a/core/assets-raw/sprites/blocks/campaign/landing-pad.png
+++ b/core/assets-raw/sprites/blocks/campaign/landing-pad.png
--- a/core/assets-raw/sprites/blocks/campaign/payload-launch-pad-light.png
+++ b/core/assets-raw/sprites/blocks/campaign/payload-launch-pad-light.png
--- a/core/assets-raw/sprites/blocks/campaign/payload-launch-pad.png
+++ b/core/assets-raw/sprites/blocks/campaign/payload-launch-pad.png
--- a/core/assets-raw/sprites/blocks/defense/build-tower-base.png
+++ b/core/assets-raw/sprites/blocks/defense/build-tower-base.png
--- a/core/assets-raw/sprites/blocks/defense/build-tower-glow.png
+++ b/core/assets-raw/sprites/blocks/defense/build-tower-glow.png
--- a/core/assets-raw/sprites/blocks/defense/build-tower.png
+++ b/core/assets-raw/sprites/blocks/defense/build-tower.png
--- a/core/assets-raw/sprites/blocks/defense/large-shield-projector-team.png
+++ b/core/assets-raw/sprites/blocks/defense/large-shield-projector-team.png
--- a/core/assets-raw/sprites/blocks/defense/large-shield-projector.png
+++ b/core/assets-raw/sprites/blocks/defense/large-shield-projector.png
--- a/core/assets-raw/sprites/blocks/defense/radar-base.png
+++ b/core/assets-raw/sprites/blocks/defense/radar-base.png
--- a/core/assets-raw/sprites/blocks/defense/radar-glow.png
+++ b/core/assets-raw/sprites/blocks/defense/radar-glow.png
--- a/core/assets-raw/sprites/blocks/defense/radar.png
+++ b/core/assets-raw/sprites/blocks/defense/radar.png
--- a/core/assets-raw/sprites/blocks/defense/regen-projector-bottom.png
+++ b/core/assets-raw/sprites/blocks/defense/regen-projector-bottom.png
--- a/core/assets-raw/sprites/blocks/defense/regen-projector-glow.png
+++ b/core/assets-raw/sprites/blocks/defense/regen-projector-glow.png
--- a/core/assets-raw/sprites/blocks/defense/regen-projector-mid.png
+++ b/core/assets-raw/sprites/blocks/defense/regen-projector-mid.png
--- a/core/assets-raw/sprites/blocks/defense/regen-projector.png
+++ b/core/assets-raw/sprites/blocks/defense/regen-projector.png
--- a/core/assets-raw/sprites/blocks/defense/shield-projector-team.png
+++ b/core/assets-raw/sprites/blocks/defense/shield-projector-team.png
--- a/core/assets-raw/sprites/blocks/defense/shield-projector.png
+++ b/core/assets-raw/sprites/blocks/defense/shield-projector.png
--- a/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png
+++ b/core/assets-raw/sprites/blocks/defense/shockwave-tower-heat.png
--- a/core/assets-raw/sprites/blocks/defense/shockwave-tower.png
+++ b/core/assets-raw/sprites/blocks/defense/shockwave-tower.png
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1 @@`
							`{version:1,fields:[{name:health,type:float},{name:items,type:mindustry.world.modules.ItemModule},{name:liquids,type:mindustry.world.modules.LiquidModule},{name:power,type:mindustry.world.modules.PowerModule},{name:team,type:mindustry.game.Team},{name:x,type:float},{name:y,type:float}]}`
		`@@ -0,0 +1 @@`
							`{version:6,fields:[{name:color,type:arc.graphics.Color},{name:data,type:java.lang.Object},{name:effect,type:mindustry.entities.Effect},{name:lifetime,type:float},{name:offsetPos,type:float},{name:offsetRot,type:float},{name:offsetX,type:float},{name:offsetY,type:float},{name:parent,type:mindustry.gen.Posc},{name:rotWithParent,type:boolean},{name:rotation,type:float},{name:time,type:float},{name:x,type:float},{name:y,type:float}]}`
		`@@ -0,0 +1 @@`
							`{version:1,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}`
		`@@ -0,0 +1 @@`
							`{version:2,fields:[{name:admin,type:boolean},{name:boosting,type:boolean},{name:color,type:arc.graphics.Color},{name:lastCommand,type:mindustry.ai.UnitCommand},{name:mouseX,type:float},{name:mouseY,type:float},{name:name,type:java.lang.String},{name:selectedBlock,type:mindustry.world.Block},{name:selectedRotation,type:int},{name:shooting,type:boolean},{name:team,type:mindustry.game.Team},{name:typing,type:boolean},{name:unit,type:Unit},{name:x,type:float},{name:y,type:float}]}`
		`@@ -0,0 +1 @@`
							`{fields:[{name:flags,type:byte},{name:fontSize,type:float},{name:text,type:java.lang.String},{name:x,type:float},{name:y,type:float},{name:z,type:float}]}`
		`@@ -0,0 +1 @@`
							{version:3,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
		`@@ -0,0 +1 @@`
							{version:7,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
		`@@ -0,0 +1 @@`
							{fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{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}]}
		`@@ -0,0 +1 @@`
							{fields:[{name:ammo,type:float},{name:building,type:Building},{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}]}
		`@@ -0,0 +1 @@`
							{version:1,fields:[{name:abilities,type:"mindustry.entities.abilities.Ability[]"},{name:ammo,type:float},{name:building,type:Building},{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}]}