Update .travis.yml

[Bundle][RU] actual L10n

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+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.*
+
+**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 save file you were playing on when the bug happened, if applicable.*
+
+**Crash report**: *The contents of relevant crash report files. 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 searched the closed and open issues to make sure that this problem has not already been reported.**

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature request
+    url: https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose
+    about: Do not make a new issue for feature requests! Instead, post it in suggestions repository.
+  - name: Question
+    url: https://discord.com/invite/mindustry
+    about: Questions about the game should be asked in the Discord, not in the issue tracker. 

.github/Mindustry-CodeStyle-IJ.xml

@@ -0,0 +1,85 @@
+<code_scheme name="Default" version="173">
+  <option name="AUTODETECT_INDENTS" value="false" />
+  <option name="RIGHT_MARGIN" value="300" />
+  <GroovyCodeStyleSettings>
+    <option name="SPACE_BEFORE_CLOSURE_LBRACE" value="false" />
+  </GroovyCodeStyleSettings>
+  <JavaCodeStyleSettings>
+    <option name="SPACE_AROUND_TYPE_BOUNDS_IN_TYPE_PARAMETERS" value="false" />
+    <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value>
+        <package name="java.awt" withSubpackages="false" static="false" />
+        <package name="mindustry" withSubpackages="false" static="true" />
+        <package name="javax.swing" withSubpackages="false" static="false" />
+      </value>
+    </option>
+    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+    <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
+    <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+    <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+    <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+    <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+  </JavaCodeStyleSettings>
+  <Properties>
+    <option name="SPACES_AROUND_KEY_VALUE_DELIMITER" value="true" />
+    <option name="KEEP_BLANK_LINES" value="true" />
+  </Properties>
+  <codeStyleSettings language="Groovy">
+    <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_CLASS_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_METHOD_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_IF_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_ELSE_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_WHILE_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_FOR_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_DO_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_SWITCH_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_TRY_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_CATCH_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_FINALLY_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_SYNCHRONIZED_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_ELSE_KEYWORD" value="false" />
+    <option name="SPACE_BEFORE_WHILE_KEYWORD" value="false" />
+    <option name="SPACE_BEFORE_CATCH_KEYWORD" value="false" />
+    <option name="SPACE_BEFORE_FINALLY_KEYWORD" value="false" />
+  </codeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+    <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_CLASS_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_METHOD_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_IF_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_ELSE_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_WHILE_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_FOR_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_DO_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_SWITCH_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_TRY_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_CATCH_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_FINALLY_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_SYNCHRONIZED_LBRACE" value="false" />
+    <option name="SPACE_BEFORE_ELSE_KEYWORD" value="false" />
+    <option name="SPACE_BEFORE_WHILE_KEYWORD" value="false" />
+    <option name="SPACE_BEFORE_CATCH_KEYWORD" value="false" />
+    <option name="SPACE_BEFORE_FINALLY_KEYWORD" value="false" />
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="0" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>

.github/workflows/gradle.yml

@@ -0,0 +1,28 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  buildJava8:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Run unit tests with gradle and Java 8
+      run: ./gradlew compileJava
+      
+  buildJava14:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 14
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+    - name: Run unit tests with gradle and Java 14
+      run: ./gradlew compileJava

.gitignore

@@ -4,34 +4,45 @@ logs/
 /core/assets/bundles/output/
 /core/assets/.gifimages/
 /deploy/
+/out/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
 /desktop/mindustry-maps/
 /desktop/gifexport/
+/gifs/
 /core/lib/
+/ios/assets/
 /core/assets-raw/sprites/generated/
 /core/assets-raw/sprites_out/
 /annotations/build/
 /annotations/out/
 /net/build/
 /tools/build/
+/core/build/
 /tests/build/
 /server/build/
+changelog
+saves/
+/core/assets-raw/fontgen/out/
+core/assets/saves/
+/core/assets/saves/
+steam_appid.txt
 /test_files/
-/annotations/build/
 /android/assets/mindustry-maps/
 /android/assets/mindustry-saves/
 /core/assets/gifexport/
+/annotations/src/main/resources/META-INF/services
 /core/assets/version.properties
 /core/assets/locales
-/ios/src/io/anuke/mindustry/gen/
+/ios/src/mindustry/gen/
-/core/src/io/anuke/mindustry/gen/
+/core/src/mindustry/gen/
 ios/robovm.properties
 packr-out/
 config/
 *.gif
 
+/core/assets/basepartnames
 version.properties
 
 .attach_*
@@ -46,15 +57,6 @@ crash-report-*
 ## Robovm
 /ios/robovm-build/
 
-## GWT
-/html/war/
-/html/gwt-unitCache/
-.apt_generated/
-.gwt/
-gwt-unitCache/
-www-test/
-.gwt-tmp/
-
 ## Android Studio and Intellij and Android in general
 /android/libs/armeabi/
 /android/libs/armeabi-v7a/
@@ -77,9 +79,11 @@ com_crashlytics_export_strings.xml
 /android/bin/
 /core/bin/
 /desktop/bin/
-/html/bin/
 /ios/bin/
-/ios-moe/bin/
+/annotations/bin/
+/server/bin/
+/tests/bin/
+/tools/bin/
 *.tmp
 *.bak
 *.swp

.travis.yml

@@ -1,28 +1,50 @@
 jdk:
-- openjdk8
+- openjdk14
+dist: xenial
+android:
+  components:
+  - android-29
+  - build-tools-29.0.3
+
 script:
+- git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
+- cd ../MindustryBuilds
+- echo ${TRAVIS_TAG}
+- if [ -n "$TRAVIS_TAG" ]; then echo versionName=5-fdroid-${TRAVIS_TAG:1}$'\n'versionCode=${TRAVIS_TAG:1} > version_fdroid.txt; git add .; git commit -m "Updating to build ${TRAVIS_TAG}"; fi
+- git tag ${TRAVIS_BUILD_NUMBER}
+- git config --global user.name "Build Uploader"
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds ${TRAVIS_BUILD_NUMBER}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/MindustryBuilds; fi
+- cd ../Mindustry
 - git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+- if [ -n "$TRAVIS_TAG" ]; then cd ../Arc; git tag ${TRAVIS_TAG}; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/Anuken/Arc ${TRAVIS_TAG}; cd ../Mindustry; fi
 - "./gradlew test"
 - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
 - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-
+- "./gradlew core:javadoc"
+- cd ../
+- git clone --depth=1 https://github.com/MindustryGame/docs.git
+- cp -a Mindustry/core/build/docs/javadoc/. docs/
+- cd docs
+- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then git add .; git commit -m "Update ${TRAVIS_BUILD_NUMBER}"; git push https://Anuken:${GH_PUSH_TOKEN}@github.com/MindustryGame/docs; fi
+- cd ../Mindustry
 deploy:
-  - provider: releases
+- provider: releases
   skip_cleanup: true
   draft: false
   api_key:
     secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
   file:
-    - desktop/build/libs/desktop-release.jar
+  - desktop/build/libs/Mindustry.jar
   - server/build/libs/server-release.jar
   on:
     repo: Anuken/Mindustry
     tags: true
-  - provider: script
+#- provider: script
-    script: bash update_wiki.sh
+  #script: bash update_wiki.sh
-    on:
+ # on:
-      repo: Anuken/Mindustry
+  #  repo: Anuken/Mindustry
-      tags: true
+   # tags: true
 env:
   global:
-    secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
+  - secure: TqlUl/ojjkCMVOGbCTKz7Cnr4F08UyWzY/CiJ0vvUOGJGZ1qm7XavAlDf5XT0egU4mvr37THubFO8vojbqmrmy0oZnYh3njKFA8axgyZ8PyKkjGHOfd0i6qyEWsOr9H90/2X8r3LwEeLaDFyHpu3wljIGBjweg53g2qwmDwCFa9UR80FJZ+xDB+rD6B3cXT0DTEkCoLZXLqXm0Y3HvBdSuBL1LR/FNb2BSxNq+tNLGiz1kdQZV5erausbbZypBoGxzz63xAnyz2kkFz73A8xQYVTzGbFodTPz7HM13GVZ5s43I03Y+HYyHBgBaSLziO2hi2kzVJccOwzBp7wS4fs1MqsFY5+IeWJ9k+hm89NiYT7+6zlEgoUMlIniny1qLqWTzx7btUeuC/y/h5TVBNgaV+z0jmHycHfeSyq5I+vmX4J8qe3wmaN8TcdqYKU5nIznOTk3CM5Fzu0Bs9vkCkOxmormmcjMFW1RbdOLc/hpZWZggsBA88sNEAI8eq+r5QEeqzeCx8YKoZDjdrsqvgLMc3El3gS9oMGxkn0Y/TEcqs9Tc4BXtTkqIA68hD0DYzlAxYjVbbkAI9Hh9lHNvV3Dr/oCkGXQ/HflM143kj1L3tSBZpqeqQE2XhngB5nqpS3OZTmZbMTQ8qD2luU18yaTGMLF5tJS/fdKPRx0gQ1kL8=
+  - secure: VEskj/0TVX2o7iUVXuVPysj/VSWmPhDl57SrT7/nBNN/P/8N5jFAvx8PMzG7qT0S5FzKxuV20psE4WylUGRKdeRtK7/QNBV7T3YqYYM6BUB1VeRpxe5hLxTeuBK3izglFO8DkdDqjUtzQSjzkoYT75ilROjhBrBUPhVek7UlbBHbaklPWYFXHnJmYS1FpZTdzqIj+Y0Gd1PSL2MzK4X74aAHl0qaDgsTwYwtKs7IAz+kFaTZBRpi9VjQHAFhDlkDR3jo9wQjH8/F6x0lCgV/FulSc37Okdb40sLFG98xcEA6gWh1NPMkz8CulUdVE7mj7SJNxLbNvoMNrWOVRjmEsn59p/9LiNC1F9ncFz9vjQjAmi7rMFFGHGxe5nn8cIAkpTvHQQkZoWHAA9SNJTDMMf09m2pRy/vvzx+a6NVxyC9iNrhLlnBg4gxAqRh0S6NU0uL+fuygKixn7rqlnb7KMT7bAbfcuV+dng6c8V7hYKDCh7sJbH8iJump1xkwoM7ecnU8fxJF/oKOr/fbk0Bfxu+Q9qYLrV1+DEdm93Vl2Thq+DBKmI66jRGSva6HeCLFo81PEiEjP1nLv75+kvVfOqVqJrZD1BrvoG2eWT/3hVLrN2kEIWWlpvQVC7FL11yWmYtAuOBh/vfhI76zKr+YTS6ccG9rqW4XeYjJytshe8M=

CONTRIBUTING.md

@@ -0,0 +1,73 @@
+# Contributing
+
+This is for code contributions. For translations, see [TRANSLATING](TRANSLATING.md).
+
+## Basic Guidelines
+
+#### Use an IDE.
+Specifically, IntelliJ IDEA. Download the (free) Community Edition of it [here](https://www.jetbrains.com/idea/download/). Some people use other tools, like VS Code, but I would personally not recommend them for Java development.
+
+#### Always test your changes.
+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*).  
+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.
+
+
+## Style Guidelines
+
+#### Follow the formatting guidelines.
+This means:
+- No spaces around parentheses: `if(condition){`, `SomeType s = (SomeType)object`
+- Same-line braces.
+- 4 spaces indentation
+- `camelCase`, **even for constants or enums**. Why? Because `SCREAMING_CASE` is ugly, annoying to type and does not achieve anything useful. Constants are *less* dangerous than variables, not more.
+- No underscores for anything. (Yes, I know `Bindings` violates this principle, but that's for legacy reasons and really should be cleaned up some day)
+- Do not use braceless `if/else` statements. `if(x) statement else statement2` should **never** be done. In very specific situations, having braceless if-statements on one line is allowed: `if(cond) return;` would be valid.
+
+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).
+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.
+  
+The same applies to any class *outside* of the standard `java.[n]io` / `java.net` / `java.util` packages: Most of them are not supported.  
+`java.awt` is one of these packages: do not use it, ever. It is not supported on any platform, even desktop - the entire package is removed during JRE minimization.
+In general, if you are using IntelliJ, you should be warned about platform incompatiblities.
+
+
+#### Use `arc` collections and classes when possible.
+Instead of using `java.util.List`, `java.util.HashMap`, and other standard Java collections, use `Seq`, `ObjectMap` and other equivalents from `arc.struct`.
+Why? Because that's what the rest of the codebase uses, and the standard collections have a lot of cruft and usability issues associated with them.  
+In the rare case that concurrency is required, you may use the standard Java classes for that purpose (e.g. `CopyOnWriteArrayList`).  
+
+What you'll usually need to change:
+- `HashSet` -> `ObjectSet`
+- `HashMap` -> `ObjectMap`
+- `List` / `ArrayList` / `Stack` -> `Seq`
+- `java.util.Queue` -> `arc.struct.Queue`
+- *Many others*
+
+
+#### Avoid boxed types (Integer, Boolean)
+Never create variables or collections with boxed types `Seq<Integer>` or `ObjectMap<Integer, ...>`. Use the collections specialized for this task, e.g. `IntSeq` and `IntMap`.
+
+
+#### Do not allocate anything if possible.
+Never allocate `new` objects in the main loop. If you absolutely require new objects, use `Pools` to obtain and free object instances. 
+Otherwise, use the `Tmp` variables for things like vector/shape operations, or create `static` variables for re-use.
+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. 
+If something needs to be encapsulated in the future, IntelliJ can handle it with a few clicks.
+
+
+#### Do not create methods unless necessary.
+Unless a block of code is very large or used in more than 1-2 places, don't split it up into a separate method. Making unnecessary methods only creates confusion, and may slightly decrease performance.  
+
+## Other Notes
+If you would like your name to appear in the game's credits, add it to the [list of contributors](https://github.com/Anuken/Mindustry/blob/master/core/assets/contributors) as part of your PR.

README.md

@@ -1,4 +1,4 @@
-![Logo](core/assets/sprites/logo.png)
+![Logo](core/assets-raw/sprites/ui/logo.png)
 
 [![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
 [![Discord](https://img.shields.io/discord/391020510269669376.svg)](https://discord.gg/mindustry)  
@@ -6,29 +6,44 @@
 A sandbox tower defense game written in Java.
 
 _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_  
-_[Wiki](http://mindustry.wikia.com/wiki/Mindustry_Wiki)_ 
+_[Wiki](https://mindustrygame.github.io/wiki)_  
+_[Javadoc](https://mindustrygame.github.io/docs/)_ 
+
+### Contributing
+
+See [CONTRIBUTING](CONTRIBUTING.md).
 
 ### Building
 
-Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://jenkins.hellomouse.net/job/mindustry/).
+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 Java 8 and JDK 8 installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
+First, make sure you have [JDK 14](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
 
 #### Windows
 
-_Running:_ `gradlew desktop:run`  
+_Running:_ `gradlew.bat desktop:run`  
-_Building:_ `gradlew desktop:dist`
+_Building:_ `gradlew.bat desktop:dist`  
+_Sprite Packing:_ `gradlew.bat tools:pack`
 
 #### Linux/Mac OS
 
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`  
+_Sprite Packing:_ `./gradlew tools:pack`
 
 #### Server
 
 Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
 
+#### Android
+
+1. Install the Android SDK [here.](https://developer.android.com/studio#downloads) 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.
+3. 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`.
+
 ##### Troubleshooting
 
 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.*
@@ -36,10 +51,22 @@ If the terminal returns `Permission denied` or `Command not found` on Mac/Linux,
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
-After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds.
+After building, the output .JAR file should be in `/desktop/build/libs/Mindustry.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds.
+
+### Feature Requests
+
+Post feature requests and feedback [here](https://github.com/Anuken/Mindustry-Suggestions/issues/new/choose).
 
 ### Downloads
 
-<a href="https://anuke.itch.io/mindustry"><img src="https://static.itch.io/images/badge.svg" width="auto" height="75"></a>
+[<img src="https://static.itch.io/images/badge.svg"
+     alt="Get it on Itch.io"
+     height="60">](https://anuke.itch.io/mindustry)
 
-<a href="https://play.google.com/store/apps/details?id=io.anuke.mindustry&hl=en"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/Get_it_on_Google_play.svg/1280px-Get_it_on_Google_play.svg.png" width="auto" height="75"></a>
+[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     alt="Get it on Google Play"
+     height="80">](https://play.google.com/store/apps/details?id=io.anuke.mindustry)
+
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+     alt="Get it on F-Droid"
+     height="80">](https://f-droid.org/packages/io.anuke.mindustry/)

SERVERLIST.md

@@ -0,0 +1,26 @@
+### Adding a server to the list
+
+Mindustry now has a public list of servers that everyone can see and connect to. 
+This is done by letting clients `GET` a [JSON list of servers](https://github.com/Anuken/Mindustry/blob/master/servers.json) in this repository.
+
+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. **Set an appropriate MOTD, name and description.** This is set with `config <name/desc/motd> <value>`. "Appropriate" means that:
+  - Your name or description must reflect the type of server you're hosting. 
+  Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt.
+  - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you.
+  - Try to be professional in your text; use common sense.
+3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option.
+4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`).
+5. Finally, **submit a pull request** to add your server's IP to the list. 
+This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers.json), then add a JSON object with a single key, indicating your server address.
+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.

TRANSLATING.md

@@ -1,8 +1,5 @@
 ## Translating for Mindustry
 
-**DISCLAIMER:** *Currently, 4.0 is far from done, which means that things such as block names, descriptions, and core text will be changing often. If you begin translating now, you might have to re-do large chunks of the bundle before final release.*
-
-
 To begin, log in to your GitHub account, or if you don't have one yet, create it [here](https://github.com/).
 
 Consult [this list](https://www.science.co.il/language/Locale-codes.php) to find the locale code for your language. Once you've found it, 
@@ -34,6 +31,10 @@ 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)
+
+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.**  
 
 *(...of course, that's never really it. Bother me on Discord when something inevitably goes wrong.)*

android/AndroidManifest.xml

@@ -3,6 +3,7 @@
           package="io.anuke.mindustry">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+    <uses-feature android:name="android.hardware.type.pc" android:required="false" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -13,12 +14,13 @@
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:isGame="true"
+            android:usesCleartextTraffic="true"
             android:appCategory="game"
             android:label="@string/app_name"
-            android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules">
+            android:theme="@style/ArcTheme" android:fullBackupContent="@xml/backup_rules">
         <meta-data android:name="android.max_aspect" android:value="2.1"/>
         <activity
-                android:name="io.anuke.mindustry.AndroidLauncher"
+                android:name="mindustry.android.AndroidLauncher"
                 android:label="@string/app_name"
                 android:screenOrientation="user"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
@@ -32,32 +34,9 @@
                 <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:mimeType="application/octet-stream" />
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap"/>
-            </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>
-
-
-            <intent-filter android:icon="@mipmap/ic_launcher"
-                           android:label="Mindustry Map"
-                           android:priority="1">
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap" android:mimeType="*/*"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav" android:mimeType="*/*"/>
-            </intent-filter>
         </activity>
 
     </application>

android/build.gradle

@@ -8,6 +8,8 @@ buildscript{
     }
 
     dependencies{
+        //IMPORTANT NOTICE: any version of the plugin after 3.4.1 will break builds
+        //it appears abstract methods don't get desugared properly (if at all)
         classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
@@ -19,26 +21,21 @@ configurations{ natives }
 repositories{
     mavenCentral()
     jcenter()
-    maven{
+    maven{ url "https://maven.google.com" }
-        url "https://maven.google.com"
-    }
 }
 
 dependencies{
     implementation project(":core")
-    implementation project(":net")
 
     implementation arcModule("backends:backend-android")
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
+    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
+
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
+    natives "com.github.Anuken.Arc:natives-android:${getArcHash()}"
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
+    natives "com.github.Anuken.Arc:natives-freetype-android:${getArcHash()}"
-    natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
+    natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
-    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
+
-    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+    //android dependencies magically disappear during compilation, thanks gradle!
-    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+    if(new File(projectDir.parent, '../Arc').exists()) compileOnly fileTree(dir: '../../Arc/backends/backend-android/libs', include: ['*.jar'])
-    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
-    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
 }
 
 task deploy(type: Copy){
@@ -46,12 +43,12 @@ task deploy(type: Copy){
 
     from "build/outputs/apk/release/android-release.apk"
     into "../deploy/"
-    rename("android-release.apk", appName + "-android-" + getVersionString() + ".apk")
+    rename("android-release.apk", "${generateDeployName('android')}.apk")
 }
 
 android{
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.3'
-    compileSdkVersion 28
+    compileSdkVersion 29
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -70,27 +67,21 @@ android{
     }
 
     defaultConfig{
-        def vfile = file('../core/assets/version.properties')
+        Properties props = loadVersionProps()
-
+        Integer vcode = props['androidBuildCode']?.toInteger() ?: 1
-        def code = 0
+        def versionNameResult = "$versionNumber-$versionType-${getBuildVersion().replace(" ", "-")}"
-        def versionNameResult = "unknown"
-
-        if(vfile.exists()){
-            def props = new Properties()
-            props.load(new FileInputStream(vfile))
-
-            code = (props['androidBuildCode'] == null ? 0 : props['androidBuildCode']).toInteger() + 1
-
-            props['androidBuildCode'] = code.toString()
-            props.store(vfile.newWriter(), "Autogenerated file. Do not modify.")
-            versionNameResult = "$versionNumber-$versionType-${props['build'].replace(" ", "-")}"
-        }
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
-        versionCode code
+        
         versionName versionNameResult
+        versionCode vcode
+
+        if(project.hasProperty("release")){
+            props['androidBuildCode'] = (vcode + 1).toString()
+        }
+        props.store(file('../core/assets/version.properties').newWriter(), null)
     }
 
     compileOptions{
@@ -108,7 +99,7 @@ android{
                 keyAlias RELEASE_KEY_ALIAS
                 keyPassword RELEASE_KEY_PASSWORD
             }else{
-                println("No keystore info property found!")
+                println("No keystore property found. Releases will be unsigned.")
             }
         }
     }
@@ -125,25 +116,11 @@ android{
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
 task copyAndroidNatives(){
-    file("libs/armeabi/").mkdirs()
-    file("libs/armeabi-v7a/").mkdirs()
-    file("libs/arm64-v8a/").mkdirs()
-    file("libs/x86_64/").mkdirs()
-    file("libs/x86/").mkdirs()
-
     configurations.natives.files.each{ jar ->
-        def outputDir = null
-        if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
-        if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
-        if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
-        if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
-        if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
-        if(outputDir != null){
         copy{
             from zipTree(jar)
-                into outputDir
+            into file("libs/")
-                include "*.so"
+            include "**"
-            }
         }
     }
 }
@@ -167,5 +144,5 @@ task run(type: Exec){
     }
 
     def adb = path + "/platform-tools/adb"
-    commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher'
+    commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/mindustry.android.AndroidLauncher'
 }

android/proguard-project.txt

@@ -1,29 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--verbose
--verbose
--ignorewarnings
--keep class io.anuke.mindustry.game.Rules
--keep class io.anuke.mindustry.desktop.DesktopLauncher
--keepclasseswithmembers public class * {
-    public static void main(java.lang.String[]);
-}

android/project.properties

@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-# Project target.
-target=android-19

android/res/values-v21/styles.xml

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

android/res/values/styles.xml

@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="GdxTheme" parent="android:Theme">
+    <style name="ArcTheme" parent="android:Theme">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation</item>

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -1,186 +0,0 @@
-package io.anuke.mindustry;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.Settings.Secure;
-import android.telephony.TelephonyManager;
-import io.anuke.arc.Core;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
-import io.anuke.arc.files.FileHandle;
-import io.anuke.arc.function.Consumer;
-import io.anuke.arc.function.Predicate;
-import io.anuke.arc.scene.ui.layout.Unit;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.serialization.Base64Coder;
-import io.anuke.mindustry.core.Platform;
-import io.anuke.mindustry.game.Saves.SaveSlot;
-import io.anuke.mindustry.io.SaveIO;
-import io.anuke.mindustry.net.*;
-import io.anuke.mindustry.ui.dialogs.FileChooser;
-
-import java.io.*;
-import java.util.ArrayList;
-
-import static io.anuke.mindustry.Vars.*;
-
-public class AndroidLauncher extends AndroidApplication{
-    public static final int PERMISSION_REQUEST_CODE = 1;
-    boolean doubleScaleTablets = true;
-    FileChooser chooser;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState){
-        super.onCreate(savedInstanceState);
-        AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-        config.useImmersiveMode = true;
-        config.depth = 0;
-        Platform.instance = new Platform(){
-
-            @Override
-            public void hide(){
-                moveTaskToBack(true);
-            }
-
-            @Override
-            public String getUUID(){
-                try{
-                    String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID);
-                    int len = s.length();
-                    byte[] data = new byte[len / 2];
-                    for(int i = 0; i < len; i += 2){
-                        data[i / 2] = (byte)((Character.digit(s.charAt(i), 16) << 4)
-                        + Character.digit(s.charAt(i + 1), 16));
-                    }
-                    String result = new String(Base64Coder.encode(data));
-                    if(result.equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID.");
-                    return result;
-                }catch(Exception e){
-                    return super.getUUID();
-                }
-            }
-
-            @Override
-            public void shareFile(FileHandle file){
-            }
-
-            @Override
-            public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, Predicate<String> filetype){
-                chooser = new FileChooser(text, file -> filetype.test(file.extension().toLowerCase()), open, cons);
-                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
-                    checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser.show();
-                    chooser = null;
-                }else{
-                    ArrayList<String> perms = new ArrayList<>();
-                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
-                    }
-                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-                    }
-                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
-                }
-            }
-
-            @Override
-            public void beginForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
-            }
-
-            @Override
-            public void endForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
-            }
-
-            @Override
-            public boolean canDonate(){
-                return true;
-            }
-        };
-
-        if(doubleScaleTablets && isTablet(this.getContext())){
-            Unit.dp.addition = 0.5f;
-        }
-
-        config.hideStatusBar = true;
-        Net.setClientProvider(new ArcNetClient());
-        Net.setServerProvider(new ArcNetServer());
-        initialize(new Mindustry(), config);
-        checkFiles(getIntent());
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults){
-        if(requestCode == PERMISSION_REQUEST_CODE){
-            for(int i : grantResults){
-                if(i != PackageManager.PERMISSION_GRANTED) return;
-            }
-            if(chooser != null){
-                chooser.show();
-            }
-        }
-    }
-
-    private void checkFiles(Intent intent){
-        try{
-            Uri uri = intent.getData();
-            if(uri != null){
-                File myFile = null;
-                String scheme = uri.getScheme();
-                if(scheme.equals("file")){
-                    String fileName = uri.getEncodedPath();
-                    myFile = new File(fileName);
-                }else if(!scheme.equals("content")){
-                    //error
-                    return;
-                }
-                boolean save = uri.getPath().endsWith(saveExtension);
-                boolean map = uri.getPath().endsWith(mapExtension);
-                InputStream inStream;
-                if(myFile != null) inStream = new FileInputStream(myFile);
-                else inStream = getContentResolver().openInputStream(uri);
-                Core.app.post(() -> Core.app.post(() -> {
-                    if(save){ //open save
-                        System.out.println("Opening save.");
-                        FileHandle file = Core.files.local("temp-save." + saveExtension);
-                        file.write(inStream, false);
-                        if(SaveIO.isSaveValid(file)){
-                            try{
-                                SaveSlot slot = control.saves.importSave(file);
-                                ui.load.runLoadSave(slot);
-                            }catch(IOException e){
-                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true)));
-                            }
-                        }else{
-                            ui.showError("$save.import.invalid");
-                        }
-                    }else if(map){ //open map
-                        FileHandle file = Core.files.local("temp-map." + mapExtension);
-                        file.write(inStream, false);
-                        Core.app.post(() -> {
-                            System.out.println("Opening map.");
-                            if(!ui.editor.isShown()){
-                                ui.editor.show();
-                            }
-                            ui.editor.beginEditMap(file);
-                        });
-                    }
-                }));
-            }
-        }catch(IOException e){
-            e.printStackTrace();
-        }
-    }
-
-    private boolean isTablet(Context context){
-        TelephonyManager manager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
-        return manager != null && manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE;
-    }
-}

android/src/mindustry/android/AndroidLauncher.java

@@ -0,0 +1,246 @@
+package mindustry.android;
+
+import android.*;
+import android.app.*;
+import android.content.*;
+import android.content.pm.*;
+import android.net.*;
+import android.os.Build.*;
+import android.os.*;
+import android.provider.Settings.*;
+import android.telephony.*;
+import arc.*;
+import arc.backend.android.*;
+import arc.files.*;
+import arc.func.*;
+import arc.scene.ui.layout.*;
+import arc.util.*;
+import arc.util.serialization.*;
+import mindustry.*;
+import mindustry.game.Saves.*;
+import mindustry.io.*;
+import mindustry.net.*;
+import mindustry.ui.dialogs.*;
+
+import java.io.*;
+import java.lang.System;
+import java.lang.Thread.*;
+import java.util.*;
+
+import static mindustry.Vars.*;
+
+
+public class AndroidLauncher extends AndroidApplication{
+    public static final int PERMISSION_REQUEST_CODE = 1;
+    boolean doubleScaleTablets = true;
+    FileChooser chooser;
+    Runnable permCallback;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState){
+        UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
+
+        Thread.setDefaultUncaughtExceptionHandler((thread, error) -> {
+            CrashSender.log(error);
+
+            //try to forward exception to system handler
+            if(handler != null){
+                handler.uncaughtException(thread, error);
+            }else{
+                error.printStackTrace();
+                System.exit(1);
+            }
+        });
+
+        super.onCreate(savedInstanceState);
+        if(doubleScaleTablets && isTablet(this.getContext())){
+            Scl.setAddition(0.5f);
+        }
+
+        initialize(new ClientLauncher(){
+
+            @Override
+            public void hide(){
+                moveTaskToBack(true);
+            }
+
+            @Override
+            public rhino.Context getScriptContext(){
+                return AndroidRhinoContext.enter(getContext().getCacheDir());
+            }
+
+            @Override
+            public void shareFile(Fi file){
+            }
+
+            @Override
+            public void showFileChooser(boolean open, String extension, Cons<Fi> cons){
+                if(VERSION.SDK_INT >= VERSION_CODES.Q){
+                    Intent intent = new Intent(open ? Intent.ACTION_OPEN_DOCUMENT : Intent.ACTION_CREATE_DOCUMENT);
+                    intent.addCategory(Intent.CATEGORY_OPENABLE);
+                    intent.setType(extension.equals("zip") && !open ? "application/zip" : "*/*");
+                    addResultListener(i -> startActivityForResult(intent, i), (code, in) -> {
+                        if(code == Activity.RESULT_OK && in != null && in.getData() != null){
+                            Uri uri = in.getData();
+
+                            if(uri.getPath().contains("(invalid)")) return;
+
+                            Core.app.post(() -> Core.app.post(() -> cons.get(new Fi(uri.getPath()){
+                                @Override
+                                public InputStream read(){
+                                    try{
+                                        return getContentResolver().openInputStream(uri);
+                                    }catch(IOException e){
+                                        throw new ArcRuntimeException(e);
+                                    }
+                                }
+
+                                @Override
+                                public OutputStream write(boolean append){
+                                    try{
+                                        return getContentResolver().openOutputStream(uri);
+                                    }catch(IOException e){
+                                        throw new ArcRuntimeException(e);
+                                    }
+                                }
+                            })));
+                        }
+                    });
+                }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(open ? "@open" : "@save", file -> file.extension().equalsIgnoreCase(extension), open, file -> {
+                        if(!open){
+                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
+                        }else{
+                            cons.get(file);
+                        }
+                    });
+
+                    ArrayList<String> perms = new ArrayList<>();
+                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                        perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
+                    }
+                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
+                        perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
+                    }
+                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
+                }else{
+                    super.showFileChooser(open, extension, cons);
+                }
+            }
+
+            @Override
+            public void beginForceLandscape(){
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+            }
+
+            @Override
+            public void endForceLandscape(){
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
+            }
+
+        }, new AndroidApplicationConfiguration(){{
+            useImmersiveMode = true;
+            hideStatusBar = true;
+            stencil = 8;
+        }});
+        checkFiles(getIntent());
+
+
+        //new external folder
+        Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath());
+        Core.settings.setDataDirectory(data);
+
+        //move to internal storage if there's no file indicating that it moved
+        if(!Core.files.local("files_moved").exists()){
+            Log.info("Moving files to external storage...");
+
+            try{
+                //current local storage folder
+                Fi src = Core.files.absolute(Core.files.getLocalStoragePath());
+                for(Fi fi : src.list()){
+                    fi.copyTo(data);
+                }
+                //create marker
+                Core.files.local("files_moved").writeString("files moved to " + data);
+                Core.files.local("files_moved_103").writeString("files moved again");
+                Log.info("Files moved.");
+            }catch(Throwable t){
+                Log.err("Failed to move files!");
+                t.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults){
+        if(requestCode == PERMISSION_REQUEST_CODE){
+            for(int i : grantResults){
+                if(i != PackageManager.PERMISSION_GRANTED) return;
+            }
+            if(chooser != null){
+                Core.app.post(chooser::show);
+            }
+            if(permCallback != null){
+                Core.app.post(permCallback);
+                permCallback = null;
+            }
+        }
+    }
+
+    private void checkFiles(Intent intent){
+        try{
+            Uri uri = intent.getData();
+            if(uri != null){
+                File myFile = null;
+                String scheme = uri.getScheme();
+                if(scheme.equals("file")){
+                    String fileName = uri.getEncodedPath();
+                    myFile = new File(fileName);
+                }else if(!scheme.equals("content")){
+                    //error
+                    return;
+                }
+                boolean save = uri.getPath().endsWith(saveExtension);
+                boolean map = uri.getPath().endsWith(mapExtension);
+                InputStream inStream;
+                if(myFile != null) inStream = new FileInputStream(myFile);
+                else inStream = getContentResolver().openInputStream(uri);
+                Core.app.post(() -> Core.app.post(() -> {
+                    if(save){ //open save
+                        System.out.println("Opening save.");
+                        Fi file = Core.files.local("temp-save." + saveExtension);
+                        file.write(inStream, false);
+                        if(SaveIO.isSaveValid(file)){
+                            try{
+                                SaveSlot slot = control.saves.importSave(file);
+                                ui.load.runLoadSave(slot);
+                            }catch(IOException e){
+                                ui.showException("@save.import.fail", e);
+                            }
+                        }else{
+                            ui.showErrorMessage("@save.import.invalid");
+                        }
+                    }else if(map){ //open map
+                        Fi file = Core.files.local("temp-map." + mapExtension);
+                        file.write(inStream, false);
+                        Core.app.post(() -> {
+                            System.out.println("Opening map.");
+                            if(!ui.editor.isShown()){
+                                ui.editor.show();
+                            }
+                            ui.editor.beginEditMap(file);
+                        });
+                    }
+                }));
+            }
+        }catch(IOException e){
+            e.printStackTrace();
+        }
+    }
+
+    private boolean isTablet(Context context){
+        TelephonyManager manager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
+        return manager != null && manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE;
+    }
+}

android/src/mindustry/android/AndroidRhinoContext.java

@@ -0,0 +1,224 @@
+package mindustry.android;
+
+import android.annotation.*;
+import android.os.*;
+import android.os.Build.*;
+import arc.*;
+import arc.backend.android.*;
+import com.android.dex.*;
+import com.android.dx.cf.direct.*;
+import com.android.dx.command.dexer.*;
+import com.android.dx.dex.*;
+import com.android.dx.dex.cf.*;
+import com.android.dx.dex.file.DexFile;
+import com.android.dx.merge.*;
+import dalvik.system.*;
+import rhino.*;
+
+import java.io.*;
+import java.nio.*;
+
+/**
+ * Helps to prepare a Rhino Context for usage on android.
+ * @author F43nd1r
+ * @since 11.01.2016
+ */
+public class AndroidRhinoContext{
+
+    /**
+     * call this instead of {@link Context#enter()}
+     * @return a context prepared for android
+     */
+    public static Context enter(File cacheDirectory){
+        if(!SecurityController.hasGlobal())
+            SecurityController.initGlobal(new SecurityController(){
+                @Override
+                public GeneratedClassLoader createClassLoader(ClassLoader classLoader, Object o){
+                    return Context.getCurrentContext().createClassLoader(classLoader);
+                }
+
+                @Override
+                public Object getDynamicSecurityDomain(Object o){
+                    return null;
+                }
+
+                @Override
+                public Object callWithDomain(Object o, Context context, Callable callable, Scriptable scriptable, Scriptable scriptable1, Object[] objects){
+                    return null;
+                }
+            });
+
+        AndroidContextFactory factory;
+        if(!ContextFactory.hasExplicitGlobal()){
+            factory = new AndroidContextFactory(cacheDirectory);
+            ContextFactory.getGlobalSetter().setContextFactoryGlobal(factory);
+        }else if(!(ContextFactory.getGlobal() instanceof AndroidContextFactory)){
+            throw new IllegalStateException("Cannot initialize factory for Android Rhino: There is already another factory");
+        }else{
+            factory = (AndroidContextFactory)ContextFactory.getGlobal();
+        }
+
+        return factory.enterContext();
+    }
+
+    /**
+     * Ensures that the classLoader used is correct
+     * @author F43nd1r
+     * @since 11.01.2016
+     */
+    public static class AndroidContextFactory extends ContextFactory{
+        private final File cacheDirectory;
+
+        /**
+         * Create a new factory. It will cache generated code in the given directory
+         * @param cacheDirectory the cache directory
+         */
+        public AndroidContextFactory(File cacheDirectory){
+            this.cacheDirectory = cacheDirectory;
+            initApplicationClassLoader(createClassLoader(AndroidContextFactory.class.getClassLoader()));
+        }
+
+        /**
+         * Create a ClassLoader which is able to deal with bytecode
+         * @param parent the parent of the create classloader
+         * @return a new ClassLoader
+         */
+        @Override
+        public BaseAndroidClassLoader createClassLoader(ClassLoader parent){
+            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
+                return new InMemoryAndroidClassLoader(parent);
+            }
+            return new FileAndroidClassLoader(parent, cacheDirectory);
+        }
+
+        @Override
+        protected void onContextReleased(final Context cx){
+            super.onContextReleased(cx);
+            ((BaseAndroidClassLoader)cx.getApplicationClassLoader()).reset();
+        }
+    }
+
+    /**
+     * Compiles java bytecode to dex bytecode and loads it
+     * @author F43nd1r
+     * @since 11.01.2016
+     */
+    abstract static class BaseAndroidClassLoader extends ClassLoader implements GeneratedClassLoader{
+
+        public BaseAndroidClassLoader(ClassLoader parent){
+            super(parent);
+        }
+
+        @Override
+        public Class<?> defineClass(String name, byte[] data){
+            try{
+                DexOptions dexOptions = new DexOptions();
+                DexFile dexFile = new DexFile(dexOptions);
+                DirectClassFile classFile = new DirectClassFile(data, name.replace('.', '/') + ".class", true);
+                classFile.setAttributeFactory(StdAttributeFactory.THE_ONE);
+                classFile.getMagic();
+                DxContext context = new DxContext();
+                dexFile.add(CfTranslator.translate(context, classFile, null, new CfOptions(), dexOptions, dexFile));
+                Dex dex = new Dex(dexFile.toDex(null, false));
+                Dex oldDex = getLastDex();
+                if(oldDex != null){
+                    dex = new DexMerger(new Dex[]{dex, oldDex}, CollisionPolicy.KEEP_FIRST, context).merge();
+                }
+                return loadClass(dex, name);
+            }catch(IOException | ClassNotFoundException e){
+                throw new RuntimeException("Failed to define class", e);
+            }
+        }
+
+        protected abstract Class<?> loadClass(Dex dex, String name) throws ClassNotFoundException;
+
+        protected abstract Dex getLastDex();
+
+        protected abstract void reset();
+
+        @Override
+        public void linkClass(Class<?> aClass){}
+
+        @Override
+        public Class<?> loadClass(String name, boolean resolve)
+        throws ClassNotFoundException{
+            Class<?> loadedClass = findLoadedClass(name);
+            if(loadedClass == null){
+                Dex dex = getLastDex();
+                if(dex != null){
+                    loadedClass = loadClass(dex, name);
+                }
+                if(loadedClass == null){
+                    loadedClass = getParent().loadClass(name);
+                }
+            }
+            return loadedClass;
+        }
+    }
+
+    static class FileAndroidClassLoader extends BaseAndroidClassLoader{
+        private static int instanceCounter = 0;
+        private final File dexFile;
+
+        public FileAndroidClassLoader(ClassLoader parent, File cacheDir){
+            super(parent);
+            int id = instanceCounter++;
+            dexFile = new File(cacheDir, id + ".dex");
+            cacheDir.mkdirs();
+            reset();
+        }
+
+        @Override
+        protected Class<?> loadClass(Dex dex, String name) throws ClassNotFoundException{
+            try{
+                dex.writeTo(dexFile);
+            }catch(IOException e){
+                e.printStackTrace();
+            }
+            android.content.Context context = ((AndroidApplication) Core.app).getContext();
+            return new DexClassLoader(dexFile.getPath(), VERSION.SDK_INT >= 21 ? context.getCodeCacheDir().getPath() : context.getCacheDir().getAbsolutePath(), null, getParent()).loadClass(name);
+        }
+
+        @Override
+        protected Dex getLastDex(){
+            if(dexFile.exists()){
+                try{
+                    return new Dex(dexFile);
+                }catch(IOException e){
+                    e.printStackTrace();
+                }
+            }
+            return null;
+        }
+
+        @Override
+        protected void reset(){
+            dexFile.delete();
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    static class InMemoryAndroidClassLoader extends BaseAndroidClassLoader{
+        private Dex last;
+
+        public InMemoryAndroidClassLoader(ClassLoader parent){
+            super(parent);
+        }
+
+        @Override
+        protected Class<?> loadClass(Dex dex, String name) throws ClassNotFoundException{
+            last = dex;
+            return new InMemoryDexClassLoader(ByteBuffer.wrap(dex.getBytes()), getParent()).loadClass(name);
+        }
+
+        @Override
+        protected Dex getLastDex(){
+            return last;
+        }
+
+        @Override
+        protected void reset(){
+            last = null;
+        }
+    }
+}

annotations/build.gradle

@@ -1,6 +1,2 @@
-apply plugin: "java"
-
-sourceCompatibility = 1.8
 sourceSets.main.java.srcDirs = ["src/main/java/"]
 sourceSets.main.resources.srcDirs = ["src/main/resources/"]
-

annotations/src/main/java/io/anuke/annotations/Annotations.java

@@ -1,150 +0,0 @@
-package io.anuke.annotations;
-
-import java.lang.annotation.*;
-
-public class Annotations{
-
-    /** Indicates that a method should always call its super version. */
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.SOURCE)
-    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 {
-    }
-
-    /** Indicates that a method return or field can be null.*/
-    @Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Nullable{
-
-    }
-
-    /** Indicates that a method return or field cannot be null.*/
-    @Target({ElementType.METHOD, ElementType.FIELD})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface NonNull{
-
-    }
-
-    /** Marks a class as serializable. */
-    @Target(ElementType.TYPE)
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Serialize{
-
-    }
-
-    /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
-    @Target(ElementType.TYPE)
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Struct{
-
-    }
-
-    /** Marks a field of a struct. Optional. */
-    @Target(ElementType.FIELD)
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface StructField{
-        /** Size of a struct field in bits. Not valid on booleans or floating point numbers. */
-        int value();
-    }
-
-    public enum PacketPriority{
-        /** Gets put in a queue and processed if not connected. */
-        normal,
-        /** Gets handled immediately, regardless of connection status. */
-        high,
-        /** Does not get handled unless client is connected. */
-        low
-    }
-
-    /** A set of two booleans, one specifying server and one specifying client. */
-    public enum Loc{
-        /** Method can only be invoked on the client from the server. */
-        server(true, false),
-        /** Method can only be invoked on the server from the client. */
-        client(false, true),
-        /** Method can be invoked from anywhere */
-        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){
-            this.isServer = server;
-            this.isClient = client;
-        }
-    }
-
-    public enum Variant{
-        /** Method can only be invoked targeting one player. */
-        one(true, false),
-        /** Method can only be invoked targeting all players. */
-        all(false, true),
-        /** Method targets both one player and all players. */
-        both(true, true);
-
-        public final boolean isOne, isAll;
-
-        Variant(boolean isOne, boolean isAll){
-            this.isOne = isOne;
-            this.isAll = isAll;
-        }
-    }
-
-    /** Marks a method as invokable remotely across a server/client connection. */
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface Remote{
-        /** Specifies the locations from which this method can be invoked. */
-        Loc targets() default Loc.server;
-
-        /** Specifies which methods are generated. Only affects server-to-client methods. */
-        Variant variants() default Variant.all;
-
-        /** The local locations where this method is called locally, when invoked. */
-        Loc called() default Loc.none;
-
-        /** Whether to forward this packet to all other clients upon recieval. Client only. */
-        boolean forward() default false;
-
-        /**
-         * Whether the packet for this method is sent with UDP instead of TCP.
-         * UDP is faster, but is prone to packet loss and duplication.
-         */
-        boolean unreliable() default false;
-
-        /** Priority of this event. */
-        PacketPriority priority() default PacketPriority.normal;
-    }
-
-    /**
-     * Specifies that this method will be used to write classes of the type returned by {@link #value()}.<br>
-     * This method must return void and have two parameters, the first being of type {@link java.nio.ByteBuffer} and the second
-     * being the type returned by {@link #value()}.
-     */
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface WriteClass{
-        Class<?> value();
-    }
-
-    /**
-     * Specifies that this method will be used to read classes of the type returned by {@link #value()}. <br>
-     * This method must return the type returned by {@link #value()},
-     * and have one parameter, being of type {@link java.nio.ByteBuffer}.
-     */
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface ReadClass{
-        Class<?> value();
-    }
-}

annotations/src/main/java/io/anuke/annotations/CallSuperAnnotationProcessor.java

@@ -1,65 +0,0 @@
-package io.anuke.annotations;
-
-import com.sun.source.util.TreePath;
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCExpressionStatement;
-import io.anuke.annotations.Annotations.OverrideCallSuper;
-
-import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic.Kind;
-import java.util.List;
-import java.util.Set;
-
-@SupportedAnnotationTypes("java.lang.Override")
-public class CallSuperAnnotationProcessor extends AbstractProcessor{
-    private Trees trees;
-
-    @Override
-    public void init (ProcessingEnvironment pe) {
-        super.init(pe);
-        trees = Trees.instance(pe);
-    }
-
-    public boolean process (Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
-        for (Element e : roundEnv.getElementsAnnotatedWith(Override.class)) {
-            if (e.getAnnotation(OverrideCallSuper.class) != null) return false;
-
-            CodeAnalyzerTreeScanner codeScanner = new CodeAnalyzerTreeScanner();
-            codeScanner.setMethodName(e.getSimpleName().toString());
-
-            TreePath tp = trees.getPath(e.getEnclosingElement());
-            codeScanner.scan(tp, trees);
-
-            if (codeScanner.isCallSuperUsed()) {
-                List list = codeScanner.getMethod().getBody().getStatements();
-
-                if (!doesCallSuper(list, codeScanner.getMethodName())) {
-                    processingEnv.getMessager().printMessage(Kind.ERROR, "Overriding method '" + codeScanner.getMethodName() + "' must explicitly call super method from its parent class.", e);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private boolean doesCallSuper (List list, String methodName) {
-        for (Object object : list) {
-            if (object instanceof JCTree.JCExpressionStatement) {
-                JCTree.JCExpressionStatement expr = (JCExpressionStatement) object;
-                String exprString = expr.toString();
-                if (exprString.startsWith("super." + methodName) && exprString.endsWith(");")) return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public SourceVersion getSupportedSourceVersion () {
-        return SourceVersion.RELEASE_8;
-    }
-}

annotations/src/main/java/io/anuke/annotations/CodeAnalyzerTreeScanner.java

@@ -1,98 +0,0 @@
-package io.anuke.annotations;
-
-import com.sun.source.tree.*;
-import com.sun.source.util.TreePathScanner;
-import com.sun.source.util.Trees;
-import com.sun.tools.javac.code.Scope;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-import com.sun.tools.javac.code.Type.ClassType;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCTypeApply;
-import io.anuke.annotations.Annotations.CallSuper;
-
-import java.lang.annotation.Annotation;
-
-class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees> {
-	private String methodName;
-	private MethodTree method;
-	private boolean callSuperUsed;
-
-	@Override
-	public Object visitClass (ClassTree classTree, Trees trees) {
-		Tree extendTree = classTree.getExtendsClause();
-
-		if (extendTree instanceof JCTypeApply) { //generic classes case
-			JCTypeApply generic = (JCTypeApply) extendTree;
-			extendTree = generic.clazz;
-		}
-
-		if (extendTree instanceof JCIdent) {
-			JCIdent tree = (JCIdent) extendTree;
-			Scope members = tree.sym.members();
-
-			if (checkScope(members))
-				return super.visitClass(classTree, trees);
-
-			if (checkSuperTypes((ClassType) tree.type))
-				return super.visitClass(classTree, trees);
-
-		}
-		callSuperUsed = false;
-
-		return super.visitClass(classTree, trees);
-	}
-
-	public boolean checkSuperTypes (ClassType type) {
-		if (type.supertype_field != null && type.supertype_field.tsym != null) {
-			if (checkScope(type.supertype_field.tsym.members()))
-				return true;
-			else
-				return checkSuperTypes((ClassType) type.supertype_field);
-		}
-
-		return false;
-	}
-
-	public boolean checkScope (Scope members) {
-		for (Symbol s : members.getElements()) {
-			if (s instanceof MethodSymbol) {
-				MethodSymbol ms = (MethodSymbol) s;
-
-				if (ms.getSimpleName().toString().equals(methodName)) {
-					Annotation annotation = ms.getAnnotation(CallSuper.class);
-					if (annotation != null) {
-						callSuperUsed = true;
-						return true;
-					}
-				}
-			}
-		}
-
-		return false;
-	}
-
-	@Override
-	public Object visitMethod (MethodTree methodTree, Trees trees) {
-		if (methodTree.getName().toString().equals(methodName))
-			method = methodTree;
-
-		return super.visitMethod(methodTree, trees);
-	}
-
-	public void setMethodName (String methodName) {
-		this.methodName = methodName;
-	}
-
-	public String getMethodName () {
-		return methodName;
-	}
-
-	public MethodTree getMethod () {
-		return method;
-	}
-
-	public boolean isCallSuperUsed () {
-		return callSuperUsed;
-	}
-}

annotations/src/main/java/io/anuke/annotations/IOFinder.java

@@ -1,90 +0,0 @@
-package io.anuke.annotations;
-
-import io.anuke.annotations.Annotations.ReadClass;
-import io.anuke.annotations.Annotations.WriteClass;
-
-import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.Element;
-import javax.lang.model.type.MirroredTypeException;
-import javax.tools.Diagnostic.Kind;
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
- * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.
- */
-public class IOFinder{
-
-    /**
-     * Finds all class serializers for all types and returns them. Logs errors when necessary.
-     * Maps fully qualified class names to their serializers.
-     */
-    public HashMap<String, ClassSerializer> findSerializers(RoundEnvironment env){
-        HashMap<String, ClassSerializer> result = new HashMap<>();
-
-        //get methods with the types
-        Set<? extends Element> writers = env.getElementsAnnotatedWith(WriteClass.class);
-        Set<? extends Element> readers = env.getElementsAnnotatedWith(ReadClass.class);
-
-        //look for writers first
-        for(Element writer : writers){
-            WriteClass writean = writer.getAnnotation(WriteClass.class);
-            String typeName = getValue(writean);
-
-            //make sure there's only one read method
-            if(readers.stream().filter(elem -> getValue(elem.getAnnotation(ReadClass.class)).equals(typeName)).count() > 1){
-                Utils.messager.printMessage(Kind.ERROR, "Multiple writer methods for type '" + typeName + "'", writer);
-            }
-
-            //make sure there's only one write method
-            long count = readers.stream().filter(elem -> getValue(elem.getAnnotation(ReadClass.class)).equals(typeName)).count();
-            if(count == 0){
-                Utils.messager.printMessage(Kind.ERROR, "Writer method does not have an accompanying reader: ", writer);
-            }else if(count > 1){
-                Utils.messager.printMessage(Kind.ERROR, "Writer method has multiple reader for type: ", writer);
-            }
-
-            Element reader = readers.stream().filter(elem -> getValue(elem.getAnnotation(ReadClass.class)).equals(typeName)).findFirst().get();
-
-            //add to result list
-            result.put(typeName, new ClassSerializer(Utils.getMethodName(reader), Utils.getMethodName(writer), typeName));
-        }
-
-        return result;
-    }
-
-    private String getValue(WriteClass write){
-        try{
-            Class<?> type = write.value();
-            return type.getName();
-        }catch(MirroredTypeException e){
-            return e.getTypeMirror().toString();
-        }
-    }
-
-    private String getValue(ReadClass read){
-        try{
-            Class<?> type = read.value();
-            return type.getName();
-        }catch(MirroredTypeException e){
-            return e.getTypeMirror().toString();
-        }
-    }
-
-    /** Information about read/write methods for a specific class type. */
-    public static class ClassSerializer{
-        /** Fully qualified method name of the reader. */
-        public final String readMethod;
-        /** Fully qualified method name of the writer. */
-        public final String writeMethod;
-        /** Fully qualified class type name. */
-        public final String classType;
-
-        public ClassSerializer(String readMethod, String writeMethod, String classType){
-            this.readMethod = readMethod;
-            this.writeMethod = writeMethod;
-            this.classType = classType;
-        }
-    }
-}

annotations/src/main/java/io/anuke/annotations/RemoteMethodAnnotationProcessor.java

@@ -1,154 +0,0 @@
-package io.anuke.annotations;
-
-import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
-import io.anuke.annotations.IOFinder.ClassSerializer;
-
-import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.*;
-import javax.tools.Diagnostic.Kind;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/** The annotation processor for generating remote method call code. */
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes({
-"io.anuke.annotations.Annotations.Remote",
-"io.anuke.annotations.Annotations.WriteClass",
-"io.anuke.annotations.Annotations.ReadClass",
-})
-public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
-    /** Maximum size of each event packet. */
-    public static final int maxPacketSize = 4096;
-    /** Warning on top of each autogenerated file. */
-    public static final String autogenWarning = "Autogenerated file. Do not modify!\n";
-    /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
-
-    /** Name of class that handles reading and invoking packets on the server. */
-    private static final String readServerName = "RemoteReadServer";
-    /** Name of class that handles reading and invoking packets on the client. */
-    private static final String readClientName = "RemoteReadClient";
-    /** Simple class name of generated class name. */
-    private static final String callLocation = "Call";
-
-    /** Processing round number. */
-    private int round;
-
-    //class serializers
-    private HashMap<String, ClassSerializer> serializers;
-    //all elements with the Remote annotation
-    private Set<? extends Element> elements;
-    //map of all classes to generate by name
-    private HashMap<String, ClassEntry> classMap;
-    //list of all method entries
-    private ArrayList<MethodEntry> methods;
-    //list of all method entries
-    private ArrayList<ClassEntry> classes;
-
-    @Override
-    public synchronized void init(ProcessingEnvironment processingEnv){
-        super.init(processingEnv);
-        //put all relevant utils into utils class
-        Utils.typeUtils = processingEnv.getTypeUtils();
-        Utils.elementUtils = processingEnv.getElementUtils();
-        Utils.filer = processingEnv.getFiler();
-        Utils.messager = processingEnv.getMessager();
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
-        if(round > 1) return false; //only process 2 rounds
-
-        round++;
-
-        try{
-
-            //round 1: find all annotations, generate *writers*
-            if(round == 1){
-                //get serializers
-                serializers = new IOFinder().findSerializers(roundEnv);
-                //last method ID used
-                int lastMethodID = 0;
-                //find all elements with the Remote annotation
-                elements = roundEnv.getElementsAnnotatedWith(Remote.class);
-                //map of all classes to generate by name
-                classMap = new HashMap<>();
-                //list of all method entries
-                methods = new ArrayList<>();
-                //list of all method entries
-                classes = new ArrayList<>();
-
-                List<Element> orderedElements = new ArrayList<>(elements);
-                orderedElements.sort(Comparator.comparing(Object::toString));
-
-                //create methods
-                for(Element element : orderedElements){
-                    Remote annotation = element.getAnnotation(Remote.class);
-
-                    //check for static
-                    if(!element.getModifiers().contains(Modifier.STATIC) || !element.getModifiers().contains(Modifier.PUBLIC)){
-                        Utils.messager.printMessage(Kind.ERROR, "All @Remote methods must be public and static: ", element);
-                    }
-
-                    //can't generate none methods
-                    if(annotation.targets() == Loc.none){
-                        Utils.messager.printMessage(Kind.ERROR, "A @Remote method's targets() cannot be equal to 'none':", element);
-                    }
-
-                    //get and create class entry if needed
-                    if(!classMap.containsKey(callLocation)){
-                        ClassEntry clas = new ClassEntry(callLocation);
-                        classMap.put(callLocation, clas);
-                        classes.add(clas);
-                    }
-
-                    ClassEntry entry = classMap.get(callLocation);
-
-                    //create and add entry
-                    MethodEntry method = new MethodEntry(entry.name, Utils.getMethodName(element), annotation.targets(), annotation.variants(),
-                    annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++, (ExecutableElement)element, annotation.priority());
-
-                    entry.methods.add(method);
-                    methods.add(method);
-                }
-
-                //create read/write generators
-                RemoteWriteGenerator writegen = new RemoteWriteGenerator(serializers);
-
-                //generate the methods to invoke (write)
-                writegen.generateFor(classes, packageName);
-
-                return true;
-            }else if(round == 2){ //round 2: generate all *readers*
-                RemoteReadGenerator readgen = new RemoteReadGenerator(serializers);
-
-                //generate server readers
-                readgen.generateFor(methods.stream().filter(method -> method.where.isClient).collect(Collectors.toList()), readServerName, packageName, true);
-                //generate client readers
-                readgen.generateFor(methods.stream().filter(method -> method.where.isServer).collect(Collectors.toList()), readClientName, packageName, false);
-
-                //create class for storing unique method hash
-                TypeSpec.Builder hashBuilder = TypeSpec.classBuilder("MethodHash").addModifiers(Modifier.PUBLIC);
-                hashBuilder.addJavadoc(autogenWarning);
-                hashBuilder.addField(FieldSpec.builder(int.class, "HASH", Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
-                .initializer("$1L", Objects.hash(methods)).build());
-
-                //build and write resulting hash class
-                TypeSpec spec = hashBuilder.build();
-                JavaFile.builder(packageName, spec).build().writeTo(Utils.filer);
-
-                return true;
-            }
-
-        }catch(Exception e){
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-
-        return false;
-    }
-}

annotations/src/main/java/io/anuke/annotations/SerializeAnnotationProcessor.java

@@ -1,128 +0,0 @@
-package io.anuke.annotations;
-
-import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Serialize;
-
-import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.*;
-import javax.lang.model.util.ElementFilter;
-import java.io.*;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Set;
-
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes("io.anuke.annotations.Annotations.Serialize")
-public class SerializeAnnotationProcessor extends AbstractProcessor{
-    /** Target class name. */
-    private static final String className = "Serialization";
-    /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
-
-    private int round;
-
-    @Override
-    public synchronized void init(ProcessingEnvironment processingEnv){
-        super.init(processingEnv);
-        //put all relevant utils into utils class
-        Utils.typeUtils = processingEnv.getTypeUtils();
-        Utils.elementUtils = processingEnv.getElementUtils();
-        Utils.filer = processingEnv.getFiler();
-        Utils.messager = processingEnv.getMessager();
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
-        if(round++ != 0) return false; //only process 1 round
-
-        try{
-            Set<TypeElement> elements = ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(Serialize.class));
-
-            TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
-            classBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build());
-            classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
-
-
-            MethodSpec.Builder method = MethodSpec.methodBuilder("init").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
-
-            for(TypeElement elem : elements){
-                TypeName type = TypeName.get(elem.asType());
-                String simpleTypeName = type.toString().substring(type.toString().lastIndexOf('.') + 1);
-
-                TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
-                .addSuperinterface(ParameterizedTypeName.get(
-                ClassName.bestGuess("io.anuke.arc.Settings.TypeSerializer"), type));
-
-                MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
-                .returns(void.class)
-                .addParameter(DataOutput.class, "stream")
-                .addParameter(type, "object")
-                .addException(IOException.class)
-                .addModifiers(Modifier.PUBLIC);
-
-                MethodSpec.Builder readMethod = MethodSpec.methodBuilder("read")
-                .returns(type)
-                .addParameter(DataInput.class, "stream")
-                .addException(IOException.class)
-                .addModifiers(Modifier.PUBLIC);
-
-                readMethod.addStatement("$L object = new $L()", type, type);
-
-                List<VariableElement> fields = ElementFilter.fieldsIn(Utils.elementUtils.getAllMembers(elem));
-                for(VariableElement field : fields){
-                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE))
-                        continue;
-
-                    String name = field.getSimpleName().toString();
-                    String typeName = Utils.typeUtils.erasure(field.asType()).toString().replace('$', '.');
-                    String capName = Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1);
-
-                    if(field.asType().getKind().isPrimitive()){
-                        writeMethod.addStatement("stream.write" + capName + "(object." + name + ")");
-                        readMethod.addStatement("object." + name + "= stream.read" + capName + "()");
-                    }else{
-                        writeMethod.addStatement("io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
-                        readMethod.addStatement("object." + name + " = (" + typeName + ")io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
-                    }
-                }
-
-                readMethod.addStatement("return object");
-
-                serializer.addMethod(writeMethod.build());
-                serializer.addMethod(readMethod.build());
-
-                method.addStatement("io.anuke.arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
-
-                name(writeMethod, "write" + simpleTypeName);
-                name(readMethod, "read" + simpleTypeName);
-
-                writeMethod.addModifiers(Modifier.STATIC);
-                readMethod.addModifiers(Modifier.STATIC);
-
-                classBuilder.addMethod(writeMethod.build());
-                classBuilder.addMethod(readMethod.build());
-            }
-
-            classBuilder.addMethod(method.build());
-
-            //write result
-            JavaFile.builder(packageName, classBuilder.build()).build().writeTo(Utils.filer);
-
-            return true;
-        }catch(Exception e){
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    static void name(MethodSpec.Builder builder, String name){
-        try{
-            Field field = builder.getClass().getDeclaredField("name");
-            field.setAccessible(true);
-            field.set(builder, name);
-        }catch(Exception e){
-            throw new RuntimeException(e);
-        }
-    }
-}

annotations/src/main/java/io/anuke/annotations/StructAnnotationProcessor.java

@@ -1,226 +0,0 @@
-package io.anuke.annotations;
-
-import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Struct;
-import io.anuke.annotations.Annotations.StructField;
-
-import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.*;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.util.ElementFilter;
-import javax.tools.Diagnostic.Kind;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Generates ""value types"" classes that are packed into integer primitives of the most aproppriate size.
- * It would be nice if Java didn't make crazy hacks like this necessary.
- */
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes({
-"io.anuke.annotations.Annotations.Struct"
-})
-public class StructAnnotationProcessor extends AbstractProcessor{
-    /** Name of the base package to put all the generated classes. */
-    private static final String packageName = "io.anuke.mindustry.gen";
-    private int round;
-
-    @Override
-    public synchronized void init(ProcessingEnvironment processingEnv){
-        super.init(processingEnv);
-        //put all relevant utils into utils class
-        Utils.typeUtils = processingEnv.getTypeUtils();
-        Utils.elementUtils = processingEnv.getElementUtils();
-        Utils.filer = processingEnv.getFiler();
-        Utils.messager = processingEnv.getMessager();
-    }
-
-    @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
-        if(round++ != 0) return false; //only process 1 round
-
-        try{
-            Set<TypeElement> elements = ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(Struct.class));
-
-            for(TypeElement elem : elements){
-
-                if(!elem.getSimpleName().toString().endsWith("Struct")){
-                    Utils.messager.printMessage(Kind.ERROR, "All classes annotated with @Struct must have their class names end in 'Struct'.", elem);
-                    continue;
-                }
-
-                String structName = elem.getSimpleName().toString().substring(0, elem.getSimpleName().toString().length() - "Struct".length());
-                String structParam = structName.toLowerCase();
-
-                TypeSpec.Builder classBuilder = TypeSpec.classBuilder(structName)
-                .addModifiers(Modifier.FINAL, Modifier.PUBLIC);
-
-                try{
-                    List<VariableElement> variables = ElementFilter.fieldsIn(elem.getEnclosedElements());
-                    int structSize = variables.stream().mapToInt(StructAnnotationProcessor::varSize).sum();
-                    int structTotalSize = (structSize <= 8 ? 8 : structSize <= 16 ? 16 : structSize <= 32 ? 32 : 64);
-
-                    if(variables.size() == 0){
-                        Utils.messager.printMessage(Kind.ERROR, "making a struct with no fields is utterly pointles.", elem);
-                        continue;
-                    }
-
-                    //obtain type which will be stored
-                    Class<?> structType = typeForSize(structSize);
-
-                    //[constructor] get(fields...) : structType
-                    MethodSpec.Builder constructor = MethodSpec.methodBuilder("get")
-                    .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-                    .returns(structType);
-
-                    StringBuilder cons = new StringBuilder();
-                    StringBuilder doc = new StringBuilder();
-                    doc.append("Bits used: ").append(structSize).append(" / ").append(structTotalSize).append("\n");
-
-                    int offset = 0;
-                    for(VariableElement var : variables){
-                        int size = varSize(var);
-                        TypeName varType = TypeName.get(var.asType());
-                        String varName = var.getSimpleName().toString();
-
-                        //add val param to constructor
-                        constructor.addParameter(varType, varName);
-
-                        //[get] field(structType) : fieldType
-                        MethodSpec.Builder getter = MethodSpec.methodBuilder(var.getSimpleName().toString())
-                        .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-                        .returns(varType)
-                        .addParameter(structType, structParam);
-                        //[set] field(structType, fieldType) : structType
-                        MethodSpec.Builder setter = MethodSpec.methodBuilder(var.getSimpleName().toString())
-                        .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
-                        .returns(structType)
-                        .addParameter(structType, structParam).addParameter(varType, "value");
-
-                        //[getter]
-                        if(varType == TypeName.BOOLEAN){
-                            //bools: single bit, is simplified
-                            getter.addStatement("return ($L & (1L << $L)) != 0", structParam, offset);
-                        }else if(varType == TypeName.FLOAT){
-                            //floats: need conversion
-                            getter.addStatement("return Float.intBitsToFloat((int)(($L >>> $L) & $L))", structParam, offset, bitString(size, structTotalSize));
-                        }else{
-                            //bytes, shorts, chars, ints
-                            getter.addStatement("return ($T)(($L >>> $L) & $L)", varType, structParam, offset, bitString(size, structTotalSize));
-                        }
-
-                        //[setter] + [constructor building]
-                        if(varType == TypeName.BOOLEAN){
-                            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.nextControlFlow("else");
-                            setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, 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);
-                        }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);
-                        }
-
-                        doc.append("<br>  ").append(varName).append(" [").append(offset).append("..").append(size + offset).append("]\n");
-
-                        //add finished methods
-                        classBuilder.addMethod(getter.build());
-                        classBuilder.addMethod(setter.build());
-
-                        offset += size;
-                    }
-
-                    classBuilder.addJavadoc(doc.toString());
-
-                    //add constructor final statement + add to class and build
-                    constructor.addStatement("return ($T)($L)", structType, cons.toString().substring(3));
-                    classBuilder.addMethod(constructor.build());
-
-                    JavaFile.builder(packageName, classBuilder.build()).build().writeTo(Utils.filer);
-                }catch(IllegalArgumentException e){
-                    e.printStackTrace();
-                    Utils.messager.printMessage(Kind.ERROR, e.getMessage(), elem);
-                }
-            }
-
-            return true;
-        }catch(Exception e){
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    static String bitString(int offset, int size, int totalSize){
-        StringBuilder builder = new StringBuilder();
-        for(int i = 0; i < offset; i++) builder.append('0');
-        for(int i = 0; i < size; i++) builder.append('1');
-        for(int i = 0; i < totalSize - size - offset; i++) builder.append('0');
-        return "0b" + builder.reverse().toString() + "L";
-    }
-
-    static String bitString(int size, int totalSize){
-        StringBuilder builder = new StringBuilder();
-        for(int i = 0; i < size; i++) builder.append('1');
-        for(int i = 0; i < totalSize - size; i++) builder.append('0');
-        return "0b" + builder.reverse().toString() + "L";
-    }
-
-    static int varSize(VariableElement var) throws IllegalArgumentException{
-        if(!var.asType().getKind().isPrimitive()){
-            throw new IllegalArgumentException("All struct fields must be primitives: " + var);
-        }
-
-        StructField an = var.getAnnotation(StructField.class);
-        if(var.asType().getKind() == TypeKind.BOOLEAN && an != null && an.value() != 1){
-            throw new IllegalArgumentException("Booleans can only be one bit long... why would you do this?");
-        }
-
-        if(var.asType().getKind() == TypeKind.FLOAT && an != null && an.value() != 32){
-            throw new IllegalArgumentException("Float size can't be changed. Very sad.");
-        }
-
-        return an == null ? typeSize(var.asType().getKind()) : an.value();
-    }
-
-    static Class<?> typeForSize(int size) throws IllegalArgumentException{
-        if(size <= 8){
-            return byte.class;
-        }else if(size <= 16){
-            return short.class;
-        }else if(size <= 32){
-            return int.class;
-        }else if(size <= 64){
-            return long.class;
-        }
-        throw new IllegalArgumentException("Too many fields, must fit in 64 bits. Curent size: " + size);
-    }
-
-    /** returns a type's element size in bits. */
-    static int typeSize(TypeKind kind) throws IllegalArgumentException{
-        switch(kind){
-            case BOOLEAN:
-                return 1;
-            case BYTE:
-                return 8;
-            case SHORT:
-                return 16;
-            case FLOAT:
-            case CHAR:
-            case INT:
-                return 32;
-            default:
-                throw new IllegalArgumentException("Invalid type kind: " + kind + ". Note that doubles and longs are not supported.");
-        }
-    }
-}

annotations/src/main/java/io/anuke/annotations/Utils.java

@@ -1,24 +0,0 @@
-package io.anuke.annotations;
-
-import javax.annotation.processing.Filer;
-import javax.annotation.processing.Messager;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-
-public class Utils{
-    public static Types typeUtils;
-    public static Elements elementUtils;
-    public static Filer filer;
-    public static Messager messager;
-
-    public static String getMethodName(Element element){
-        return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
-    }
-
-    public static boolean isPrimitive(String type){
-        return type.equals("boolean") || type.equals("byte") || type.equals("short") || type.equals("int")
-        || type.equals("long") || type.equals("float") || type.equals("double") || type.equals("char");
-    }
-}

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

@@ -0,0 +1,256 @@
+package mindustry.annotations;
+
+import java.lang.annotation.*;
+
+public class Annotations{
+    //region entity interfaces
+
+    /** Indicates that a method overrides other methods. */
+    @Target({ElementType.METHOD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Replace{
+    }
+
+    /** Indicates that a method should be final in all implementing classes. */
+    @Target({ElementType.METHOD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Final{
+    }
+
+    /** Indicates that a field will be interpolated when synced. */
+    @Target({ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface SyncField{
+        /** If true, the field will be linearly interpolated. If false, it will be interpolated as an angle. */
+        boolean value();
+        /** If true, the field is clamped to 0-1. */
+        boolean clamped() default false;
+    }
+
+    /** 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{
+
+    }
+
+    /** 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{
+    }
+
+    /** Indicates that a component field is read-only. */
+    @Target({ElementType.FIELD, ElementType.METHOD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ReadOnly{
+    }
+
+    /** Indicates multiple inheritance on a component type. */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Component{
+        /** 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;
+    }
+
+    /** Indicates that a method is implemented by the annotation processor. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface InternalImpl{
+    }
+
+    /** Indicates priority of a method in an entity. Methods with higher priority are done last. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface MethodPriority{
+        float value();
+    }
+
+    /** Indicates that a component def is present on all entities. */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface BaseComponent{
+    }
+
+    /** Creates a group that only examines entities that have all the components listed. */
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface GroupDef{
+        Class[] value();
+        boolean collide() default false;
+        boolean spatial() default false;
+        boolean mapping() default false;
+    }
+
+    /** Indicates an entity definition. */
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface EntityDef{
+        /** List of component interfaces */
+        Class[] value();
+        /** Whether the class is final */
+        boolean isFinal() default true;
+        /** If true, entities are recycled. */
+        boolean pooled() default false;
+        /** Whether to serialize (makes the serialize method return this value).
+         * If true, this entity is automatically put into save files.
+         * If false, no serialization code is generated at all. */
+        boolean serialize() default true;
+        /** Whether to generate IO code. This is for advanced usage only. */
+        boolean genio() default true;
+    }
+
+    /** Indicates an internal interface for entity components. */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface EntityInterface{
+    }
+
+    //endregion
+    //region misc. utility
+
+    /** Automatically loads block regions annotated with this. */
+    @Target(ElementType.FIELD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Load{
+        /**
+         * The region name to load. Variables can be used:
+         * "@" -> block name
+         * "$size" -> block size
+         * "#" "#1" "#2" -> index number, for arrays
+         * */
+        String value();
+        /** 1D Array length, if applicable.  */
+        int length() default 1;
+        /** 2D array lengths. */
+        int[] lengths() default {};
+        /** Fallback string used to replace "@" (the block name) if the region isn't found. */
+        String fallback() default "error";
+    }
+
+    /** Registers a statement for auto serialization. */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface RegisterStatement{
+        String value();
+    }
+
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface StyleDefaults{
+    }
+
+    /** Indicates that a method should always call its super version. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    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{
+    }
+
+    //endregion
+    //region struct
+
+    /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Struct{
+
+    }
+
+    /** Marks a field of a struct. Optional. */
+    @Target(ElementType.FIELD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface StructField{
+        /** Size of a struct field in bits. Not valid on booleans or floating point numbers. */
+        int value();
+    }
+
+    //endregion
+    //region remote
+
+    public enum PacketPriority{
+        /** Gets put in a queue and processed if not connected. */
+        normal,
+        /** Gets handled immediately, regardless of connection status. */
+        high,
+        /** Does not get handled unless client is connected. */
+        low
+    }
+
+    /** A set of two booleans, one specifying server and one specifying client. */
+    public enum Loc{
+        /** Method can only be invoked on the client from the server. */
+        server(true, false),
+        /** Method can only be invoked on the server from the client. */
+        client(false, true),
+        /** Method can be invoked from anywhere */
+        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){
+            this.isServer = server;
+            this.isClient = client;
+        }
+    }
+
+    public enum Variant{
+        /** Method can only be invoked targeting one player. */
+        one(true, false),
+        /** Method can only be invoked targeting all players. */
+        all(false, true),
+        /** Method targets both one player and all players. */
+        both(true, true);
+
+        public final boolean isOne, isAll;
+
+        Variant(boolean isOne, boolean isAll){
+            this.isOne = isOne;
+            this.isAll = isAll;
+        }
+    }
+
+    /** Marks a method as invokable remotely across a server/client connection. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Remote{
+        /** Specifies the locations from which this method can be invoked. */
+        Loc targets() default Loc.server;
+
+        /** Specifies which methods are generated. Only affects server-to-client methods. */
+        Variant variants() default Variant.all;
+
+        /** The local locations where this method is called locally, when invoked. */
+        Loc called() default Loc.none;
+
+        /** Whether to forward this packet to all other clients upon receival. Client only. */
+        boolean forward() default false;
+
+        /**
+         * Whether the packet for this method is sent with UDP instead of TCP.
+         * UDP is faster, but is prone to packet loss and duplication.
+         */
+        boolean unreliable() default false;
+
+        /** Priority of this event. */
+        PacketPriority priority() default PacketPriority.normal;
+    }
+
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface TypeIOHandler{
+    }
+
+    //endregion
+}

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

@@ -0,0 +1,246 @@
+package mindustry.annotations;
+
+import arc.files.*;
+import arc.struct.*;
+import arc.util.Log;
+import arc.util.Log.*;
+import arc.util.*;
+import com.squareup.javapoet.*;
+import com.sun.source.util.*;
+import com.sun.tools.javac.model.*;
+import com.sun.tools.javac.processing.*;
+import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.util.*;
+import mindustry.annotations.util.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import javax.lang.model.util.*;
+import javax.tools.Diagnostic.*;
+import javax.tools.*;
+import java.io.*;
+import java.lang.annotation.*;
+import java.util.List;
+import java.util.*;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+public abstract class BaseProcessor extends AbstractProcessor{
+    /** Name of the base package to put all the generated classes. */
+    public static final String packageName = "mindustry.gen";
+
+    public static Types typeu;
+    public static JavacElements elementu;
+    public static Filer filer;
+    public static Messager messager;
+    public static Trees trees;
+    public static TreeMaker maker;
+
+    protected int round;
+    protected int rounds = 1;
+    protected RoundEnvironment env;
+    protected Fi rootDirectory;
+
+    protected Context context;
+
+    public static String getMethodName(Element element){
+        return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
+    }
+
+    public static boolean isPrimitive(String type){
+        return type.equals("boolean") || type.equals("byte") || type.equals("short") || type.equals("int")
+        || type.equals("long") || type.equals("float") || type.equals("double") || type.equals("char");
+    }
+
+    public static boolean instanceOf(String type, String other){
+        TypeElement a = elementu.getTypeElement(type);
+        TypeElement b = elementu.getTypeElement(other);
+        return a != null && b != null && typeu.isSubtype(a.asType(), b.asType());
+    }
+
+    public static String getDefault(String value){
+        switch(value){
+            case "float":
+            case "double":
+            case "int":
+            case "long":
+            case "short":
+            case "char":
+            case "byte":
+                return "0";
+            case "boolean":
+                return "false";
+            default:
+                return "null";
+        }
+    }
+
+    //in bytes
+    public static int typeSize(String kind){
+        switch(kind){
+            case "boolean":
+            case "byte":
+                return 1;
+            case "short":
+                return 2;
+            case "float":
+            case "char":
+            case "int":
+                return 4;
+            case "long":
+                return 8;
+            default:
+                throw new IllegalArgumentException("Invalid primitive type: " + kind + "");
+        }
+    }
+
+    public static String simpleName(String str){
+        return str.contains(".") ? str.substring(str.lastIndexOf('.') + 1) : str;
+    }
+
+    public static TypeName tname(String pack, String simple){
+        return ClassName.get(pack, simple );
+    }
+
+    public static TypeName tname(String name){
+        if(!name.contains(".")) return ClassName.get(packageName, name);
+
+        String pack = name.substring(0, name.lastIndexOf("."));
+        String simple = name.substring(name.lastIndexOf(".") + 1);
+        return ClassName.get(pack, simple);
+    }
+
+    public static TypeName tname(Class<?> c){
+        return ClassName.get(c).box();
+    }
+
+    public static TypeVariableName getTVN(TypeParameterElement element) {
+        String name = element.getSimpleName().toString();
+        List<? extends TypeMirror> boundsMirrors = element.getBounds();
+
+        List<TypeName> boundsTypeNames = new ArrayList<>();
+        for (TypeMirror typeMirror : boundsMirrors) {
+            boundsTypeNames.add(TypeName.get(typeMirror));
+        }
+
+        return TypeVariableName.get(name, boundsTypeNames.toArray(new TypeName[0]));
+    }
+
+    public static void write(TypeSpec.Builder builder) throws Exception{
+        write(builder, null);
+    }
+
+    public static void write(TypeSpec.Builder builder, Seq<String> imports) throws Exception{
+        JavaFile file = JavaFile.builder(packageName, builder.build()).skipJavaLangImports(true).build();
+
+        if(imports != null){
+            String rawSource = file.toString();
+            Seq<String> result = new Seq<>();
+            for (String s : rawSource.split("\n", -1)) {
+                result.add(s);
+                if (s.startsWith("package ")) {
+                    result.add("");
+                    for (String i : imports) {
+                        result.add(i);
+                    }
+                }
+            }
+
+            String out = 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);
+        }
+    }
+
+    public Seq<Selement> elements(Class<? extends Annotation> type){
+        return Seq.with(env.getElementsAnnotatedWith(type)).map(Selement::new);
+    }
+
+    public Seq<Stype> types(Class<? extends Annotation> type){
+        return Seq.with(env.getElementsAnnotatedWith(type)).select(e -> e instanceof TypeElement)
+            .map(e -> new Stype((TypeElement)e));
+    }
+
+    public Seq<Svar> fields(Class<? extends Annotation> type){
+        return Seq.with(env.getElementsAnnotatedWith(type)).select(e -> e instanceof VariableElement)
+        .map(e -> new Svar((VariableElement)e));
+    }
+
+    public Seq<Smethod> methods(Class<? extends Annotation> type){
+        return Seq.with(env.getElementsAnnotatedWith(type)).select(e -> e instanceof ExecutableElement)
+        .map(e -> new Smethod((ExecutableElement)e));
+    }
+
+    public static void err(String message){
+        messager.printMessage(Kind.ERROR, message);
+        Log.err("[CODEGEN ERROR] " +message);
+    }
+
+    public static void err(String message, Element elem){
+        messager.printMessage(Kind.ERROR, message, elem);
+        Log.err("[CODEGEN ERROR] " + message + ": " + elem);
+    }
+
+    public void err(String message, Selement elem){
+        err(message, elem.e);
+    }
+
+    @Override
+    public synchronized void init(ProcessingEnvironment env){
+        super.init(env);
+
+        JavacProcessingEnvironment javacProcessingEnv = (JavacProcessingEnvironment)env;
+
+        trees = Trees.instance(env);
+        typeu = env.getTypeUtils();
+        elementu = javacProcessingEnv.getElementUtils();
+        filer = env.getFiler();
+        messager = env.getMessager();
+        context = ((JavacProcessingEnvironment)env).getContext();
+        maker = TreeMaker.instance(javacProcessingEnv.getContext());
+
+        Log.setLogLevel(LogLevel.info);
+
+        if(System.getProperty("debug") != null){
+            Log.setLogLevel(LogLevel.debug);
+        }
+    }
+
+    @Override
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
+        if(round++ >= rounds) return false; //only process 1 round
+        if(rootDirectory == null){
+            try{
+                String path = Fi.get(filer.getResource(StandardLocation.CLASS_OUTPUT, "no", "no")
+                .toUri().toURL().toString().substring(OS.isWindows ? 6 : "file:".length()))
+                .parent().parent().parent().parent().parent().parent().parent().toString().replace("%20", " ");
+                rootDirectory = Fi.get(path);
+            }catch(IOException e){
+                throw new RuntimeException(e);
+            }
+        }
+
+        this.env = roundEnv;
+        try{
+            process(roundEnv);
+        }catch(Throwable e){
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
+    @Override
+    public SourceVersion getSupportedSourceVersion(){
+        return SourceVersion.RELEASE_8;
+    }
+
+    public void process(RoundEnvironment env) throws Exception{
+
+    }
+}

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

@@ -0,0 +1,349 @@
+package mindustry.annotations.entity;
+
+import arc.files.*;
+import arc.math.*;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.serialization.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+import mindustry.annotations.util.TypeIOResolver.*;
+
+import javax.lang.model.element.*;
+
+import static mindustry.annotations.BaseProcessor.instanceOf;
+
+public class EntityIO{
+    final static Json json = new Json();
+    //suffixes for sync fields
+    final static String targetSuf = "_TARGET_", lastSuf = "_LAST_";
+    //replacements after refactoring
+    final static StringMap replacements = StringMap.of("mindustry.entities.units.BuildRequest", "mindustry.entities.units.BuildPlan");
+
+    final ClassSerializer serializer;
+    final String name;
+    final TypeSpec.Builder type;
+    final Fi directory;
+    final Seq<Revision> revisions = new Seq<>();
+
+    boolean write;
+    MethodSpec.Builder method;
+    ObjectSet<String> presentFields = new ObjectSet<>();
+
+    EntityIO(String name, TypeSpec.Builder type, Seq<FieldSpec> typeFields, ClassSerializer serializer, Fi directory){
+        this.directory = directory;
+        this.type = type;
+        this.serializer = serializer;
+        this.name = name;
+
+        json.setIgnoreUnknownFields(true);
+
+        directory.mkdirs();
+
+        //load old revisions
+        for(Fi fi : directory.list()){
+            revisions.add(json.fromJson(Revision.class, fi));
+        }
+
+        revisions.sort(r -> r.version);
+
+        //next revision to be used
+        int nextRevision = revisions.isEmpty() ? 0 : revisions.max(r -> r.version).version + 1;
+
+        //resolve preferred field order based on fields that fit
+        Seq<FieldSpec> fields = typeFields.select(spec ->
+            !spec.hasModifier(Modifier.TRANSIENT) &&
+            !spec.hasModifier(Modifier.STATIC) &&
+            !spec.hasModifier(Modifier.FINAL)/* &&
+            (spec.type.isPrimitive() || serializer.has(spec.type.toString()))*/);
+
+        //sort to keep order
+        fields.sortComparing(f -> f.name);
+
+        //keep track of fields present in the entity
+        presentFields.addAll(fields.map(f -> f.name));
+
+        Revision previous = revisions.isEmpty() ? null : revisions.peek();
+
+        //add new revision if it doesn't match or there are no revisions
+        if(revisions.isEmpty() || !revisions.peek().equal(fields)){
+            revisions.add(new Revision(nextRevision,
+                fields.map(f -> new RevisionField(f.name, f.type.toString()))));
+            Log.warn("Adding new revision @ for @.\nPre = @\nNew = @\n", nextRevision, name, previous == null ? null : previous.fields.toString(", ", f -> f.name + ":" + f.type), fields.toString(", ", f -> f.name + ":" + f.type.toString()));
+            //write revision
+            directory.child(nextRevision + ".json").writeString(json.toJson(revisions.peek()));
+        }
+    }
+
+    void write(MethodSpec.Builder method, boolean write) throws Exception{
+        this.method = method;
+        this.write = write;
+
+        //subclasses *have* to call this method
+        method.addAnnotation(CallSuper.class);
+
+        if(write){
+            //write short revision
+            st("write.s($L)", revisions.peek().version);
+            //write uses most recent revision
+            for(RevisionField field : revisions.peek().fields){
+                io(field.type, "this." + field.name);
+            }
+        }else{
+            //read revision
+            st("short REV = read.s()");
+
+            for(int i = 0; i < revisions.size; i++){
+                //check for the right revision
+                Revision rev = revisions.get(i);
+                if(i == 0){
+                    cont("if(REV == $L)", rev.version);
+                }else{
+                    ncont("else if(REV == $L)", rev.version);
+                }
+
+                //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 + " = " : "");
+                }
+            }
+
+            //throw exception on illegal revisions
+            ncont("else");
+            st("throw new IllegalArgumentException(\"Unknown revision '\" + REV + \"' for entity type '" + name + "'\")");
+            econt();
+        }
+    }
+
+    void writeSync(MethodSpec.Builder method, boolean write, Seq<Svar> syncFields, 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);
+            }
+        }else{
+            Revision rev = revisions.peek();
+
+            //base read code
+            st("if(lastUpdated != 0) updateSpacing = $T.timeSinceMillis(lastUpdated)", Time.class);
+            st("lastUpdated = $T.millis()", Time.class);
+            st("boolean islocal = isLocal()");
+
+            //add code for reading revision
+            for(RevisionField field : rev.fields){
+                Svar var = allFields.find(s -> s.name().equals(field.name));
+                boolean sf = var.has(SyncField.class), sl = var.has(SyncLocal.class);
+
+                if(sl) cont("if(!islocal)");
+
+                if(sf){
+                    st(field.name + lastSuf + " = this." + field.name);
+                }
+
+                io(field.type, "this." + (sf ? field.name + targetSuf : field.name) + " = ");
+
+                if(sl){
+                    ncont("else" );
+
+                    io(field.type, "");
+
+                    //just assign the two values so jumping does not occur on de-possession
+                    if(sf){
+                        st(field.name + lastSuf + " = this." + field.name);
+                        st(field.name + targetSuf + " = this." + field.name);
+                    }
+
+                    econt();
+                }
+            }
+
+            st("afterSync()");
+        }
+    }
+
+    void writeSyncManual(MethodSpec.Builder method, boolean write, Seq<Svar> syncFields) throws Exception{
+        this.method = method;
+        this.write = write;
+
+        if(write){
+            for(Svar field : syncFields){
+                st("buffer.put(this.$L)", field.name());
+            }
+        }else{
+            //base read code
+            st("if(lastUpdated != 0) updateSpacing = $T.timeSinceMillis(lastUpdated)", Time.class);
+            st("lastUpdated = $T.millis()", Time.class);
+
+            //just read the field
+            for(Svar field : syncFields){
+                //last
+                st("this.$L = this.$L", field.name() + lastSuf, field.name());
+                //assign target
+                st("this.$L = buffer.get()", field.name() + targetSuf);
+            }
+        }
+    }
+
+    void writeInterpolate(MethodSpec.Builder method, Seq<Svar> fields) throws Exception{
+        this.method = method;
+
+        cont("if(lastUpdated != 0 && updateSpacing != 0)");
+
+        //base calculations
+        st("float timeSinceUpdate = Time.timeSinceMillis(lastUpdated)");
+        st("float alpha = Math.min(timeSinceUpdate / updateSpacing, 2f)");
+
+        //write interpolated data, using slerp / lerp
+        for(Svar field : fields){
+            String name = field.name(), targetName = name + targetSuf, lastName = name + lastSuf;
+            st("$L = $L($T.$L($L, $L, alpha))", name, field.annotation(SyncField.class).clamped() ? "arc.math.Mathf.clamp" : "", Mathf.class, field.annotation(SyncField.class).value() ? "lerp" : "slerp", lastName, targetName);
+        }
+
+        ncont("else if(lastUpdated != 0)"); //check if no meaningful data has arrived yet
+
+        //write values directly to targets
+        for(Svar field : fields){
+            String name = field.name(), targetName = name + targetSuf;
+            st("$L = $L", name, targetName);
+        }
+
+        econt();
+    }
+
+    private void io(String type, String field) 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")){
+            if(write){
+                s("s", 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){
+            st("$L(write, $L)", 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){
+            st("$L$L(read)", field, serializer.readers.get(type));
+        }else if(type.endsWith("[]")){ //it's a 1D array
+            String rawType = type.substring(0, type.length() - 2);
+
+            if(write){
+                s("i", field + ".length");
+                cont("for(int INDEX = 0; INDEX < $L.length; INDEX ++)", field);
+                io(rawType, field + "[INDEX]");
+            }else{
+                String fieldName = field.replace(" = ", "").replace("this.", "");
+                String lenf = fieldName + "_LENGTH";
+                s("i", "int " + lenf + " = ");
+                if(!field.isEmpty()){
+                    st("$Lnew $L[$L]", field, type.replace("[]", ""), lenf);
+                }
+                cont("for(int INDEX = 0; INDEX < $L; INDEX ++)", lenf);
+                io(rawType, field.replace(" = ", "[INDEX] = "));
+            }
+
+            econt();
+        }else if(type.startsWith("arc.struct") && type.contains("<")){ //it's some type of data structure
+            String struct = type.substring(0, type.indexOf("<"));
+            String generic = type.substring(type.indexOf("<") + 1, type.indexOf(">"));
+
+            if(struct.equals("arc.struct.Queue") || struct.equals("arc.struct.Seq")){
+                if(write){
+                    s("i", field + ".size");
+                    cont("for(int INDEX = 0; INDEX < $L.size; INDEX ++)", field);
+                    io(generic, field + ".get(INDEX)");
+                }else{
+                    String fieldName = field.replace(" = ", "").replace("this.", "");
+                    String lenf = fieldName + "_LENGTH";
+                    s("i", "int " + lenf + " = ");
+                    if(!field.isEmpty()){
+                        st("$L.clear()", field.replace(" = ", ""));
+                    }
+                    cont("for(int INDEX = 0; INDEX < $L; INDEX ++)", lenf);
+                    io(generic, field.replace(" = ", "_ITEM = ").replace("this.", generic + " "));
+                    if(!field.isEmpty()){
+                        String temp = field.replace(" = ", "_ITEM").replace("this.", "");
+                        st("if($L != null) $L.add($L)", temp, field.replace(" = ", ""), temp);
+                    }
+                }
+
+                econt();
+            }else{
+                Log.warn("Missing serialization code for collection '@' in '@'", type, name);
+            }
+        }else{
+            Log.warn("Missing serialization code for type '@' in '@'", type, name);
+        }
+    }
+
+    private void cont(String text, Object... fmt){
+        method.beginControlFlow(text, fmt);
+    }
+
+    private void econt(){
+        method.endControlFlow();
+    }
+
+    private void ncont(String text, Object... fmt){
+        method.nextControlFlow(text, fmt);
+    }
+
+    private void st(String text, Object... args){
+        method.addStatement(text, args);
+    }
+
+    private void s(String type, String field){
+        if(write){
+            method.addStatement("write.$L($L)", type, field);
+        }else{
+            method.addStatement("$Lread.$L()", field, type);
+        }
+    }
+
+    public static class Revision{
+        int version;
+        Seq<RevisionField> fields;
+
+        Revision(int version, Seq<RevisionField> fields){
+            this.version = version;
+            this.fields = fields;
+        }
+
+        Revision(){}
+
+        /** @return whether these two revisions are compatible */
+        boolean equal(Seq<FieldSpec> specs){
+            if(fields.size != specs.size) return false;
+
+            for(int i = 0; i < fields.size; i++){
+                RevisionField field = fields.get(i);
+                FieldSpec spec = specs.get(i);
+                if(!field.type.replace("mindustry.gen.", "").equals(spec.type.toString().replace("mindustry.gen.", ""))){
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    public static class RevisionField{
+        String name, type;
+
+        RevisionField(String name, String type){
+            this.name = name;
+            this.type = type;
+        }
+
+        RevisionField(){}
+    }
+}

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

@@ -0,0 +1,950 @@
+package mindustry.annotations.entity;
+
+import arc.*;
+import arc.files.*;
+import arc.func.*;
+import arc.struct.*;
+import arc.util.ArcAnnotate.*;
+import arc.util.*;
+import arc.util.io.*;
+import arc.util.pooling.Pool.*;
+import arc.util.pooling.*;
+import com.squareup.javapoet.*;
+import com.squareup.javapoet.TypeSpec.*;
+import com.sun.source.tree.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+import mindustry.annotations.util.TypeIOResolver.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import java.lang.annotation.*;
+
+@SupportedAnnotationTypes({
+"mindustry.annotations.Annotations.EntityDef",
+"mindustry.annotations.Annotations.GroupDef",
+"mindustry.annotations.Annotations.EntityInterface",
+"mindustry.annotations.Annotations.BaseComponent",
+"mindustry.annotations.Annotations.TypeIOHandler"
+})
+public class EntityProcess extends BaseProcessor{
+    Seq<EntityDefinition> definitions = new Seq<>();
+    Seq<GroupDefinition> groupDefs = new Seq<>();
+    Seq<Stype> baseComponents;
+    ObjectMap<String, Stype> componentNames = new ObjectMap<>();
+    ObjectMap<Stype, Seq<Stype>> componentDependencies = new ObjectMap<>();
+    ObjectMap<Selement, Seq<Stype>> defComponents = new ObjectMap<>();
+    ObjectMap<String, String> varInitializers = new ObjectMap<>();
+    ObjectMap<String, String> methodBlocks = new ObjectMap<>();
+    ObjectMap<Stype, ObjectSet<Stype>> baseClassDeps = new ObjectMap<>();
+    ObjectSet<String> imports = new ObjectSet<>();
+    Seq<Selement> allGroups = new Seq<>();
+    Seq<Selement> allDefs = new Seq<>();
+    Seq<Stype> allInterfaces = new Seq<>();
+    Seq<TypeSpec.Builder> baseClasses = new Seq<>();
+    ClassSerializer serializer;
+
+    {
+        rounds = 3;
+    }
+
+    @Override
+    public void process(RoundEnvironment env) throws Exception{
+        allGroups.addAll(elements(GroupDef.class));
+        allDefs.addAll(elements(EntityDef.class));
+        allInterfaces.addAll(types(EntityInterface.class));
+
+        //round 1: generate component interfaces
+        if(round == 1){
+            serializer = TypeIOResolver.resolve(this);
+            baseComponents = types(BaseComponent.class);
+            Seq<Stype> allComponents = types(Component.class);
+
+            //store code
+            for(Stype component : allComponents){
+                for(Svar f : component.fields()){
+                    VariableTree tree = f.tree();
+
+                    //add initializer if it exists
+                    if(tree.getInitializer() != null){
+                        String init = tree.getInitializer().toString();
+                        varInitializers.put(f.descString(), init);
+                    }
+                }
+
+                for(Smethod elem : component.methods()){
+                    if(elem.is(Modifier.ABSTRACT) || elem.is(Modifier.NATIVE)) continue;
+                    //get all statements in the method, store them
+                    methodBlocks.put(elem.descString(), elem.tree().getBody().toString()
+                        //replace all self() invocations with this
+                        .replaceAll("this\\.<(.*)>self\\(\\)", "this")
+                        .replaceAll("self\\(\\)", "this")
+                    );
+                }
+            }
+
+            //store components
+            for(Stype type : allComponents){
+                componentNames.put(type.name(), type);
+            }
+
+            //add component imports
+            for(Stype comp : allComponents){
+                imports.addAll(getImports(comp.e));
+            }
+
+            //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());
+
+                //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
+                    inter.superinterfaces.add(tname(extraInterface.fullName()));
+                }
+
+                //implement super interfaces
+                Seq<Stype> depends = getDependencies(component);
+                for(Stype type : depends){
+                    inter.addSuperinterface(ClassName.get(packageName, interfaceName(type)));
+                }
+
+                ObjectSet<String> signatures = new ObjectSet<>();
+
+                //add utility methods to interface
+                for(Smethod method : component.methods()){
+                    //skip private methods, those are for internal use.
+                    if(method.isAny(Modifier.PRIVATE, Modifier.STATIC)) continue;
+
+                    //keep track of signatures used to prevent dupes
+                    signatures.add(method.e.toString());
+
+                    inter.addMethod(MethodSpec.methodBuilder(method.name())
+                    .addJavadoc(method.doc() == null ? "" : method.doc())
+                    .addExceptions(method.thrownt())
+                    .addTypeVariables(method.typeVariables().map(TypeVariableName::get))
+                    .returns(method.ret().toString().equals("void") ? TypeName.VOID : method.retn())
+                    .addParameters(method.params().map(v -> ParameterSpec.builder(v.tname(), v.name())
+                    .build())).addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT).build());
+                }
+
+                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
+                    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")).map(AnnotationSpec::get)).build()).build());
+                    }
+                }
+
+                write(inter);
+
+                //generate base class if necessary
+                //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);
+                    baseClassDeps.get(component, ObjectSet::new).addAll(deps);
+
+                    //do not generate base classes when the component will generate one itself
+                    if(!component.has(EntityDef.class)){
+                        TypeSpec.Builder base = TypeSpec.classBuilder(baseName(component)).addModifiers(Modifier.PUBLIC, Modifier.ABSTRACT);
+
+                        //go through all the fields.
+                        for(Stype type : deps){
+                            //add public fields
+                            for(Svar field : type.fields().select(e -> !e.is(Modifier.STATIC) && !e.is(Modifier.PRIVATE) && !e.has(Import.class) && !e.has(ReadOnly.class))){
+                                FieldSpec.Builder builder = FieldSpec.builder(field.tname(),field.name(), Modifier.PUBLIC);
+
+                                //keep transience
+                                if(field.is(Modifier.TRANSIENT)) builder.addModifiers(Modifier.TRANSIENT);
+                                //keep all annotations
+                                builder.addAnnotations(field.annotations().map(AnnotationSpec::get));
+
+                                //add initializer if it exists
+                                if(varInitializers.containsKey(field.descString())){
+                                    builder.initializer(varInitializers.get(field.descString()));
+                                }
+
+                                base.addField(builder.build());
+                            }
+                        }
+
+                        //add interfaces
+                        for(Stype type : deps){
+                            base.addSuperinterface(tname(packageName, interfaceName(type)));
+                        }
+
+                        //add to queue to be written later
+                        baseClasses.add(base);
+                    }
+                }
+
+                //LOGGING
+
+                Log.debug("&gGenerating interface for " + component.name());
+
+                for(TypeName tn : inter.superinterfaces){
+                    Log.debug("&g> &lbimplements @", simpleName(tn.toString()));
+                }
+
+                //log methods generated
+                for(MethodSpec spec : inter.methodSpecs){
+                    Log.debug("&g> > &c@ @(@)", simpleName(spec.returnType.toString()), spec.name, Seq.with(spec.parameters).toString(", ", p -> simpleName(p.type.toString()) + " " + p.name));
+                }
+
+                Log.debug("");
+            }
+
+        }else if(round == 2){ //round 2: get component classes and generate interfaces for them
+
+            //parse groups
+            //this needs to be done before the entity interfaces are generated, as the entity classes need to know which groups to add themselves to
+            for(Selement<?> group : allGroups){
+                GroupDef an = group.annotation(GroupDef.class);
+                Seq<Stype> types = types(an, GroupDef::value).map(stype -> {
+                    Stype result = interfaceToComp(stype);
+                    if(result == null) throw new IllegalArgumentException("Interface " + stype + " does not have an associated component!");
+                    return result;
+                });
+
+                //representative component type
+                Stype repr = types.first();
+                String groupType = repr.annotation(Component.class).base() ? baseName(repr) : interfaceName(repr);
+
+                boolean collides = an.collide();
+                groupDefs.add(new GroupDefinition(group.name().startsWith("g") ? group.name().substring(1) : group.name(),
+                    ClassName.bestGuess(packageName + "." + groupType), types, an.spatial(), an.mapping(), collides));
+            }
+
+            ObjectMap<String, Selement> usedNames = new ObjectMap<>();
+            ObjectMap<Selement, ObjectSet<String>> extraNames = new ObjectMap<>();
+
+            //look at each definition
+            for(Selement<?> type : allDefs){
+                EntityDef ann = type.annotation(EntityDef.class);
+                boolean isFinal = ann.isFinal();
+
+                //all component classes (not interfaces)
+                Seq<Stype> components = allComponents(type);
+                Seq<GroupDefinition> groups = groupDefs.select(g -> (!g.components.isEmpty() && !g.components.contains(s -> !components.contains(s))) || g.manualInclusions.contains(type));
+                ObjectMap<String, Seq<Smethod>> methods = new ObjectMap<>();
+                ObjectMap<FieldSpec, Svar> specVariables = new ObjectMap<>();
+                ObjectSet<String> usedFields = new ObjectSet<>();
+
+                //make sure there's less than 2 base classes
+                Seq<Stype> baseClasses = components.select(s -> s.annotation(Component.class).base());
+                if(baseClasses.size > 2){
+                    err("No entity may have more than 2 base classes. Base classes: " + baseClasses, type);
+                }
+
+                //get base class type name for extension
+                Stype baseClassType = baseClasses.any() ? baseClasses.first() : null;
+                @Nullable TypeName baseClass = baseClasses.any() ? tname(packageName + "." + baseName(baseClassType)) : null;
+                //whether the main class is the base itself
+                boolean typeIsBase = baseClassType != null && type.has(Component.class) && type.annotation(Component.class).base();
+
+                if(type.isType() && (!type.name().endsWith("Def") && !type.name().endsWith("Comp"))){
+                    err("All entity def names must end with 'Def'/'Comp'", type.e);
+                }
+
+                String name = type.isType() ?
+                    type.name().replace("Def", "").replace("Comp", "") :
+                    createName(type);
+
+                //check for type name conflicts
+                if(!typeIsBase && baseClass != null && name.equals(baseName(baseClassType))){
+                    name += "Entity";
+                }
+
+                //skip double classes
+                if(usedNames.containsKey(name)){
+                    extraNames.get(usedNames.get(name), ObjectSet::new).add(type.name());
+                    continue;
+                }
+
+                usedNames.put(name, type);
+                extraNames.get(type, ObjectSet::new).add(name);
+                if(!type.isType()){
+                    extraNames.get(type, ObjectSet::new).add(type.name());
+                }
+
+                TypeSpec.Builder builder = TypeSpec.classBuilder(name).addModifiers(Modifier.PUBLIC);
+
+                //add serialize() boolean
+                builder.addMethod(MethodSpec.methodBuilder("serialize").addModifiers(Modifier.PUBLIC).returns(boolean.class).addStatement("return " + ann.serialize()).build());
+
+                //all SyncField fields
+                Seq<Svar> syncedFields = new Seq<>();
+                Seq<Svar> allFields = new Seq<>();
+                Seq<FieldSpec> allFieldSpecs = new Seq<>();
+
+                boolean isSync = components.contains(s -> s.name().contains("Sync"));
+
+                //add all components
+                for(Stype comp : components){
+                    //whether this component's fields are defined in the base class
+                    boolean isShadowed = baseClass != null && !typeIsBase && baseClassDeps.get(baseClassType).contains(comp);
+
+                    //write fields to the class; ignoring transient/imported ones
+                    Seq<Svar> fields = comp.fields().select(f -> !f.has(Import.class));
+                    for(Svar f : fields){
+                        if(!usedFields.add(f.name())){
+                            err("Field '" + f.name() + "' of component '" + comp.name() + "' redefines a field in entity '" + type.name() + "'");
+                            continue;
+                        }
+
+                        FieldSpec.Builder fbuilder = FieldSpec.builder(f.tname(), f.name());
+                        //keep statics/finals
+                        if(f.is(Modifier.STATIC)){
+                            fbuilder.addModifiers(Modifier.STATIC);
+                            if(f.is(Modifier.FINAL)) fbuilder.addModifiers(Modifier.FINAL);
+                        }
+                        //add transient modifier for serialization
+                        if(f.is(Modifier.TRANSIENT)){
+                            fbuilder.addModifiers(Modifier.TRANSIENT);
+                        }
+
+                        //add initializer if it exists
+                        if(varInitializers.containsKey(f.descString())){
+                            fbuilder.initializer(varInitializers.get(f.descString()));
+                        }
+
+                        fbuilder.addModifiers(f.has(ReadOnly.class) ? Modifier.PROTECTED : Modifier.PUBLIC);
+                        fbuilder.addAnnotations(f.annotations().map(AnnotationSpec::get));
+                        FieldSpec spec = fbuilder.build();
+
+                        //whether this field would be added to the superclass
+                        boolean isVisible = !f.is(Modifier.STATIC) && !f.is(Modifier.PRIVATE) && !f.has(ReadOnly.class);
+
+                        //add the field only if it isn't visible or it wasn't implemented by the base class
+                        if(!isShadowed || !isVisible){
+                            builder.addField(spec);
+                        }
+
+                        specVariables.put(spec, f);
+
+                        allFieldSpecs.add(spec);
+                        allFields.add(f);
+
+                        //add extra sync fields
+                        if(f.has(SyncField.class) && isSync){
+                            if(!f.tname().toString().equals("float")) err("All SyncFields must be of type float", f);
+
+                            syncedFields.add(f);
+
+                            //a synced field has 3 values:
+                            //- target state
+                            //- last state
+                            //- current state (the field itself, will be written to)
+
+                            //target
+                            builder.addField(FieldSpec.builder(float.class, f.name() + EntityIO.targetSuf).addModifiers(Modifier.TRANSIENT, Modifier.PRIVATE).build());
+
+                            //last
+                            builder.addField(FieldSpec.builder(float.class, f.name() + EntityIO.lastSuf).addModifiers(Modifier.TRANSIENT, Modifier.PRIVATE).build());
+                        }
+                    }
+
+                    //get all methods from components
+                    for(Smethod elem : comp.methods()){
+                        methods.get(elem.toString(), Seq::new).add(elem);
+                    }
+                }
+
+                syncedFields.sortComparing(Selement::name);
+
+                //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(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());
+
+                //add all methods from components
+                for(ObjectMap.Entry<String, Seq<Smethod>> entry : methods){
+                    if(entry.value.contains(m -> m.has(Replace.class))){
+                        //check replacements
+                        if(entry.value.count(m -> m.has(Replace.class)) > 1){
+                            err("Type " + type + " has multiple components replacing method " + entry.key + ".");
+                        }
+                        Smethod base = entry.value.find(m -> m.has(Replace.class));
+                        entry.value.clear();
+                        entry.value.add(base);
+                    }
+
+                    //check multi return
+                    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();
+
+                    //skip internal impl
+                    if(first.has(InternalImpl.class)){
+                        continue;
+                    }
+
+                    //build method using same params/returns
+                    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.is(Modifier.STATIC)) mbuilder.addModifiers(Modifier.STATIC);
+                    mbuilder.addTypeVariables(first.typeVariables().map(TypeVariableName::get));
+                    mbuilder.returns(first.retn());
+                    mbuilder.addExceptions(first.thrownt());
+
+                    for(Svar var : first.params()){
+                        mbuilder.addParameter(var.tname(), var.name());
+                    }
+
+                    //only write the block if it's a void method with several entries
+                    boolean writeBlock = first.ret().toString().equals("void") && entry.value.size > 1;
+
+                    if((entry.value.first().is(Modifier.ABSTRACT) || entry.value.first().is(Modifier.NATIVE)) && entry.value.size == 1 && !entry.value.first().has(InternalImpl.class)){
+                        err(entry.value.first().up().getSimpleName() + "#" + entry.value.first() + " is an abstract method and must be implemented in some component", type);
+                    }
+
+                    //SPECIAL CASE: inject group add/remove code
+                    if(first.name().equals("add") || first.name().equals("remove")){
+                        mbuilder.addStatement("if(added == $L) return", first.name().equals("add"));
+
+                        for(GroupDefinition def : groups){
+                            //remove/add from each group, assume imported
+                            mbuilder.addStatement("Groups.$L.$L(this)", def.name, first.name());
+                        }
+                    }
+
+                    if(hasIO){
+                        //SPECIAL CASE: I/O code
+                        //note that serialization is generated even for non-serializing entities for manual usage
+                        if((first.name().equals("read") || first.name().equals("write"))){
+                            io.write(mbuilder, first.name().equals("write"));
+                        }
+
+                        //SPECIAL CASE: sync I/O code
+                        if((first.name().equals("readSync") || first.name().equals("writeSync"))){
+                            io.writeSync(mbuilder, first.name().equals("writeSync"), syncedFields, allFields);
+                        }
+
+                        //SPECIAL CASE: sync I/O code for writing to/from a manual buffer
+                        if((first.name().equals("readSyncManual") || first.name().equals("writeSyncManual"))){
+                            io.writeSyncManual(mbuilder, first.name().equals("writeSyncManual"), syncedFields);
+                        }
+
+                        //SPECIAL CASE: interpolate method implementation
+                        if(first.name().equals("interpolate")){
+                            io.writeInterpolate(mbuilder, syncedFields);
+                        }
+
+                        //SPECIAL CASE: method to snap to target position after being read for the first time
+                        if(first.name().equals("snapSync")){
+                            mbuilder.addStatement("updateSpacing = 16");
+                            mbuilder.addStatement("lastUpdated = $T.millis()", Time.class);
+                            for(Svar field : syncedFields){
+                                //reset last+current state to target position
+                                mbuilder.addStatement("$L = $L", field.name() + EntityIO.lastSuf, field.name() + EntityIO.targetSuf);
+                                mbuilder.addStatement("$L = $L", field.name(), field.name() + EntityIO.targetSuf);
+                            }
+                        }
+
+                        //SPECIAL CASE: method to snap to current position so interpolation doesn't go wild
+                        if(first.name().equals("snapInterpolation")){
+                            mbuilder.addStatement("updateSpacing = 16");
+                            mbuilder.addStatement("lastUpdated = $T.millis()", Time.class);
+                            for(Svar field : syncedFields){
+                                //reset last+current state to target position
+                                mbuilder.addStatement("$L = $L", field.name() + EntityIO.lastSuf, field.name());
+                                mbuilder.addStatement("$L = $L", field.name() + EntityIO.targetSuf, field.name());
+                            }
+                        }
+                    }
+
+                    for(Smethod elem : entry.value){
+                        String descStr = elem.descString();
+
+                        if(elem.is(Modifier.ABSTRACT) || elem.is(Modifier.NATIVE) || !methodBlocks.containsKey(descStr)) continue;
+
+                        //get all statements in the method, copy them over
+                        String str = methodBlocks.get(descStr);
+                        //name for code blocks in the methods
+                        String blockName = elem.up().getSimpleName().toString().toLowerCase().replace("comp", "");
+
+                        //skip empty blocks
+                        if(str.replace("{", "").replace("\n", "").replace("}", "").replace("\t", "").replace(" ", "").isEmpty()){
+                            continue;
+                        }
+
+                        //wrap scope to prevent variable leakage
+                        if(writeBlock){
+                            //replace return; with block break
+                            str = str.replace("return;", "break " + blockName + ";");
+                            mbuilder.addCode(blockName + ": {\n");
+                        }
+
+                        //trim block
+                        str = str.substring(2, str.length() - 1);
+
+                        //make sure to remove braces here
+                        mbuilder.addCode(str);
+
+                        //end scope
+                        if(writeBlock) mbuilder.addCode("}\n");
+                    }
+
+                    //add free code to remove methods - always at the end
+                    //this only gets called next frame.
+                    if(first.name().equals("remove") && ann.pooled()){
+                        mbuilder.addStatement("$T.app.post(() -> $T.free(this))", Core.class, Pools.class);
+                    }
+
+                    builder.addMethod(mbuilder.build());
+                }
+
+                //add pool reset method and implement Poolable
+                if(ann.pooled()){
+                    builder.addSuperinterface(Poolable.class);
+                    //implement reset()
+                    MethodSpec.Builder resetBuilder = MethodSpec.methodBuilder("reset").addModifiers(Modifier.PUBLIC);
+                    for(FieldSpec spec : allFieldSpecs){
+                        @Nullable Svar variable = specVariables.get(spec);
+                        if(variable != null && variable.isAny(Modifier.STATIC, Modifier.FINAL)) continue;
+                        String desc = variable.descString();
+
+                        if(spec.type.isPrimitive()){
+                            //set to primitive default
+                            resetBuilder.addStatement("$L = $L", spec.name, variable != null && varInitializers.containsKey(desc) ? varInitializers.get(desc) : getDefault(spec.type.toString()));
+                        }else{
+                            //set to default null
+                            if(!varInitializers.containsKey(desc)){
+                                resetBuilder.addStatement("$L = null", spec.name);
+                            } //else... TODO reset if poolable
+                        }
+                    }
+
+                    builder.addMethod(resetBuilder.build());
+                }
+
+                //make constructor private
+                builder.addMethod(MethodSpec.constructorBuilder().addModifiers(Modifier.PROTECTED).build());
+
+                //add create() method
+                builder.addMethod(MethodSpec.methodBuilder("create").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .returns(tname(packageName + "." + name))
+                .addStatement(ann.pooled() ? "return Pools.obtain($L.class, " +name +"::new)" : "return new $L()", name).build());
+
+                definitions.add(new EntityDefinition(packageName + "." + name, builder, type, typeIsBase ? null : baseClass, components, groups, allFieldSpecs));
+            }
+
+            //generate groups
+            TypeSpec.Builder groupsBuilder = TypeSpec.classBuilder("Groups").addModifiers(Modifier.PUBLIC);
+            MethodSpec.Builder groupInit = MethodSpec.methodBuilder("init").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+            for(GroupDefinition group : groupDefs){
+                //class names for interface/group
+                ClassName itype =  group.baseType;
+                ClassName groupc = ClassName.bestGuess("mindustry.entities.EntityGroup");
+
+                //add field...
+                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);
+            }
+
+            //write the groups
+            groupsBuilder.addMethod(groupInit.build());
+
+            MethodSpec.Builder groupClear = MethodSpec.methodBuilder("clear").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+            for(GroupDefinition group : groupDefs){
+                groupClear.addStatement("$L.clear()", group.name);
+            }
+
+            //write clear
+            groupsBuilder.addMethod(groupClear.build());
+
+            //add method for resizing all necessary groups
+            MethodSpec.Builder groupResize = MethodSpec.methodBuilder("resize")
+                .addParameter(TypeName.FLOAT, "x").addParameter(TypeName.FLOAT, "y").addParameter(TypeName.FLOAT, "w").addParameter(TypeName.FLOAT, "h")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+            MethodSpec.Builder groupUpdate = MethodSpec.methodBuilder("update")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+            //method resize
+            for(GroupDefinition group : groupDefs){
+                if(group.spatial){
+                    groupResize.addStatement("$L.resize(x, y, w, h)", group.name);
+                    groupUpdate.addStatement("$L.updatePhysics()", group.name);
+                }
+            }
+
+            groupUpdate.addStatement("all.update()");
+
+            for(GroupDefinition group : groupDefs){
+                if(group.collides){
+                    groupUpdate.addStatement("$L.collide()", group.name);
+                }
+            }
+
+            groupsBuilder.addMethod(groupResize.build());
+            groupsBuilder.addMethod(groupUpdate.build());
+
+            write(groupsBuilder);
+
+            //load map of sync IDs
+            StringMap map = new StringMap();
+            Fi idProps = rootDirectory.child("annotations/src/main/resources/classids.properties");
+            if(!idProps.exists()) idProps.writeString("");
+            PropertiesUtils.load(map, idProps.reader());
+            //next ID to be used in generation
+            Integer max = map.values().toSeq().map(Integer::parseInt).max(i -> i);
+            int maxID = max == null ? 0 : max + 1;
+
+            //assign IDs
+            definitions.sort(Structs.comparing(t -> t.naming.toString()));
+            for(EntityDefinition def : definitions){
+                String name = def.naming.fullName();
+                if(map.containsKey(name)){
+                    def.classID = map.getInt(name);
+                }else{
+                    def.classID = maxID++;
+                    map.put(name, def.classID + "");
+                }
+            }
+
+            OrderedMap<String, String> res = new OrderedMap<>();
+            res.putAll(map);
+            res.orderedKeys().sort();
+
+            //write assigned IDs
+            PropertiesUtils.store(res, idProps.writer(false), "Maps entity names to IDs. Autogenerated.");
+
+            //build mapping class for sync IDs
+            TypeSpec.Builder idBuilder = TypeSpec.classBuilder("EntityMapping").addModifiers(Modifier.PUBLIC)
+            .addField(FieldSpec.builder(TypeName.get(Prov[].class), "idMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new Prov[256]").build())
+            .addField(FieldSpec.builder(ParameterizedTypeName.get(ClassName.get(ObjectMap.class),
+                tname(String.class), tname(Prov.class)),
+                "nameMap", Modifier.PUBLIC, Modifier.STATIC).initializer("new ObjectMap<>()").build())
+            .addMethod(MethodSpec.methodBuilder("map").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .returns(TypeName.get(Prov.class)).addParameter(int.class, "id").addStatement("return idMap[id]").build())
+            .addMethod(MethodSpec.methodBuilder("map").addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .returns(TypeName.get(Prov.class)).addParameter(String.class, "name").addStatement("return nameMap.get(name)").build());
+
+            CodeBlock.Builder idStore = CodeBlock.builder();
+
+            //store the mappings
+            for(EntityDefinition def : definitions){
+                //store mapping
+                idStore.addStatement("idMap[$L] = $L::new", def.classID, def.name);
+                extraNames.get(def.naming).each(extra -> {
+                    idStore.addStatement("nameMap.put($S, $L::new)", extra, def.name);
+                    if(!Strings.camelToKebab(extra).equals(extra)){
+                        idStore.addStatement("nameMap.put($S, $L::new)", Strings.camelToKebab(extra), def.name);
+                    }
+                });
+
+                //return mapping
+                def.builder.addMethod(MethodSpec.methodBuilder("classId").addAnnotation(Override.class)
+                    .returns(int.class).addModifiers(Modifier.PUBLIC).addStatement("return " + def.classID).build());
+            }
+
+
+            idBuilder.addStaticBlock(idStore.build());
+
+            write(idBuilder);
+        }else{
+            //round 3: generate actual classes and implement interfaces
+
+            //write base classes
+            for(TypeSpec.Builder b : baseClasses){
+                write(b, imports.asArray());
+            }
+
+            //implement each definition
+            for(EntityDefinition def : definitions){
+
+                ObjectSet<String> methodNames = def.components.flatMap(type -> type.methods().map(Smethod::simpleString)).<String>as().asSet();
+
+                //add base class extension if it exists
+                if(def.extend != null){
+                    def.builder.superclass(def.extend);
+                }
+
+                //get interface for each component
+                for(Stype comp : def.components){
+
+                    //implement the interface
+                    Stype inter = allInterfaces.find(i -> i.name().equals(interfaceName(comp)));
+                    if(inter == null){
+                        err("Failed to generate interface for", comp);
+                        return;
+                    }
+
+                    def.builder.addSuperinterface(inter.tname());
+
+                    //generate getter/setter for each method
+                    for(Smethod method : inter.methods()){
+                        String var = method.name();
+                        FieldSpec field = Seq.with(def.fieldSpecs).find(f -> f.name.equals(var));
+                        //make sure it's a real variable AND that the component doesn't already implement it somewhere with custom logic
+                        if(field == null || methodNames.contains(method.simpleString())) continue;
+
+                        //getter
+                        if(!method.isVoid()){
+                            def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("return " + var).build());
+                        }
+
+                        //setter
+                        if(method.isVoid() && !Seq.with(field.annotations).contains(f -> f.type.toString().equals("@mindustry.annotations.Annotations.ReadOnly"))){
+                            def.builder.addMethod(MethodSpec.overriding(method.e).addStatement("this." + var + " = " + var).build());
+                        }
+                    }
+                }
+
+                write(def.builder, imports.asArray());
+            }
+
+            //store nulls
+            TypeSpec.Builder nullsBuilder = TypeSpec.classBuilder("Nulls").addModifiers(Modifier.PUBLIC).addModifiers(Modifier.FINAL);
+
+            //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);
+                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);
+        }
+    }
+
+    Seq<String> getImports(Element elem){
+        return Seq.with(trees.getPath(elem).getCompilationUnit().getImports()).map(Object::toString);
+    }
+
+    /** @return interface for a component type */
+    String interfaceName(Stype comp){
+        String suffix = "Comp";
+        if(!comp.name().endsWith(suffix)) err("All components must have names that end with 'Comp'", comp.e);
+
+        //example: BlockComp -> IBlock
+        return comp.name().substring(0, comp.name().length() - suffix.length()) + "c";
+    }
+
+    /** @return base class name for a component type */
+    String baseName(Stype comp){
+        String suffix = "Comp";
+        if(!comp.name().endsWith(suffix)) err("All components must have names that end with 'Comp'", comp.e);
+
+        return comp.name().substring(0, comp.name().length() - suffix.length());
+    }
+
+    @Nullable Stype interfaceToComp(Stype type){
+        //example: IBlock -> BlockComp
+        String name = type.name().substring(0, type.name().length() - 1) + "Comp";
+        return componentNames.get(name);
+    }
+
+    /** @return all components that a entity def has */
+    Seq<Stype> allComponents(Selement<?> type){
+        if(!defComponents.containsKey(type)){
+            //get base defs
+            Seq<Stype> interfaces = types(type.annotation(EntityDef.class), EntityDef::value);
+            Seq<Stype> components = new Seq<>();
+            for(Stype i : interfaces){
+                Stype comp = interfaceToComp(i);
+                if(comp != null){
+                   components.add(comp);
+                }else{
+                    throw new IllegalArgumentException("Type '" + i + "' is not a component interface!");
+                }
+            }
+
+            ObjectSet<Stype> out = new ObjectSet<>();
+            for(Stype comp : components){
+                //get dependencies for each def, add them
+                out.add(comp);
+                out.addAll(getDependencies(comp));
+            }
+
+            defComponents.put(type, out.asArray());
+        }
+
+        return defComponents.get(type);
+    }
+
+    Seq<Stype> getDependencies(Stype component){
+        if(!componentDependencies.containsKey(component)){
+            ObjectSet<Stype> out = new ObjectSet<>();
+            //add base component interfaces
+            out.addAll(component.interfaces().select(this::isCompInterface).map(this::interfaceToComp));
+            //remove self interface
+            out.remove(component);
+
+            //out now contains the base dependencies; finish constructing the tree
+            ObjectSet<Stype> result = new ObjectSet<>();
+            for(Stype type : out){
+                result.add(type);
+                result.addAll(getDependencies(type));
+            }
+
+            if(component.annotation(BaseComponent.class) == null){
+                result.addAll(baseComponents);
+            }
+
+            //remove it again just in case
+            out.remove(component);
+            componentDependencies.put(component, result.asArray());
+        }
+
+        return componentDependencies.get(component);
+    }
+
+    boolean isCompInterface(Stype type){
+        return interfaceToComp(type) != null;
+    }
+
+    String createName(Selement<?> elem){
+        Seq<Stype> comps = types(elem.annotation(EntityDef.class), EntityDef::value).map(this::interfaceToComp);;
+        comps.sortComparing(Selement::name);
+        return comps.toString("", s -> s.name().replace("Comp", ""));
+    }
+
+    <T extends Annotation> Seq<Stype> types(T t, Cons<T> consumer){
+        try{
+            consumer.get(t);
+        }catch(MirroredTypesException e){
+            return Seq.with(e.getTypeMirrors()).map(Stype::of);
+        }
+        throw new IllegalArgumentException("Missing types.");
+    }
+
+    class GroupDefinition{
+        final String name;
+        final ClassName baseType;
+        final Seq<Stype> components;
+        final boolean spatial, mapping, collides;
+        final ObjectSet<Selement> manualInclusions = new ObjectSet<>();
+
+        public GroupDefinition(String name, ClassName bestType, Seq<Stype> components, boolean spatial, boolean mapping, boolean collides){
+            this.baseType = bestType;
+            this.components = components;
+            this.name = name;
+            this.spatial = spatial;
+            this.mapping = mapping;
+            this.collides = collides;
+        }
+
+        @Override
+        public String toString(){
+            return name;
+        }
+    }
+
+    class EntityDefinition{
+        final Seq<GroupDefinition> groups;
+        final Seq<Stype> components;
+        final Seq<FieldSpec> fieldSpecs;
+        final TypeSpec.Builder builder;
+        final Selement naming;
+        final String name;
+        final @Nullable TypeName extend;
+        int classID;
+
+        public EntityDefinition(String name, Builder builder, Selement naming, TypeName extend, Seq<Stype> components, Seq<GroupDefinition> groups, Seq<FieldSpec> fieldSpec){
+            this.builder = builder;
+            this.name = name;
+            this.naming = naming;
+            this.groups = groups;
+            this.components = components;
+            this.extend = extend;
+            this.fieldSpecs = fieldSpec;
+        }
+
+        @Override
+        public String toString(){
+            return "Definition{" +
+            "groups=" + groups +
+            "components=" + components +
+            ", base=" + naming +
+            '}';
+        }
+    }
+}

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

@@ -0,0 +1,145 @@
+package mindustry.annotations.impl;
+
+import arc.files.*;
+import arc.scene.style.*;
+import arc.struct.*;
+import arc.util.serialization.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import java.util.*;
+
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.StyleDefaults")
+public class AssetsProcess extends BaseProcessor{
+
+    @Override
+    public void process(RoundEnvironment env) throws Exception{
+        processSounds("Sounds", rootDirectory + "/core/assets/sounds", "arc.audio.Sound");
+        processSounds("Musics", rootDirectory + "/core/assets/music", "arc.audio.Music");
+        processUI(env.getElementsAnnotatedWith(StyleDefaults.class));
+    }
+
+    void processUI(Set<? extends Element> elements) throws Exception{
+        TypeSpec.Builder type = TypeSpec.classBuilder("Tex").addModifiers(Modifier.PUBLIC);
+        TypeSpec.Builder ictype = TypeSpec.classBuilder("Icon").addModifiers(Modifier.PUBLIC);
+        TypeSpec.Builder ichtype = TypeSpec.classBuilder("Iconc").addModifiers(Modifier.PUBLIC);
+        MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        MethodSpec.Builder loadStyles = MethodSpec.methodBuilder("loadStyles").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        MethodSpec.Builder icload = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        String resources = rootDirectory + "/core/assets-raw/sprites/ui";
+        Jval icons = Jval.read(Fi.get(rootDirectory + "/core/assets-raw/fontgen/config.json").readString());
+
+        ictype.addField(FieldSpec.builder(ParameterizedTypeName.get(ObjectMap.class, String.class, TextureRegionDrawable.class),
+                "icons", Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("new ObjectMap<>()").build());
+
+        for(Jval val : icons.get("glyphs").asArray()){
+            String name = capitalize(val.getString("css", ""));
+            int code = val.getInt("code", 0);
+            ichtype.addField(FieldSpec.builder(char.class, name, Modifier.PUBLIC, Modifier.STATIC, Modifier.FINAL).initializer("(char)" + code).build());
+
+            ictype.addField(TextureRegionDrawable.class, name + "Small", Modifier.PUBLIC, Modifier.STATIC);
+            icload.addStatement(name + "Small = mindustry.ui.Fonts.getGlyph(mindustry.ui.Fonts.def, (char)" + code + ")");
+
+            ictype.addField(TextureRegionDrawable.class, name, Modifier.PUBLIC, Modifier.STATIC);
+            icload.addStatement(name + " = mindustry.ui.Fonts.getGlyph(mindustry.ui.Fonts.icon, (char)" + code + ")");
+
+            icload.addStatement("icons.put($S, " + name + ")", name);
+            icload.addStatement("icons.put($S, " + name + "Small)", name + "Small");
+        }
+
+        Fi.get(resources).walk(p -> {
+            if(!p.extEquals("png")) return;
+
+            String filename = p.name();
+            filename = filename.substring(0, filename.indexOf("."));
+
+            String sfilen = filename;
+            String dtype = p.name().endsWith(".9.png") ? "arc.scene.style.NinePatchDrawable" : "arc.scene.style.TextureRegionDrawable";
+
+            String varname = capitalize(sfilen);
+
+            if(SourceVersion.isKeyword(varname)) varname += "s";
+
+            type.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
+            load.addStatement(varname + " = ("+dtype+")arc.Core.atlas.drawable($S)", sfilen);
+        });
+
+        for(Element elem : elements){
+            Seq.with(((TypeElement)elem).getEnclosedElements()).each(e -> e.getKind() == ElementKind.FIELD, field -> {
+                String fname = field.getSimpleName().toString();
+                if(fname.startsWith("default")){
+                    loadStyles.addStatement("arc.Core.scene.addStyle(" + field.asType().toString() + ".class, mindustry.ui.Styles." + fname + ")");
+                }
+            });
+        }
+
+        ictype.addMethod(icload.build());
+        JavaFile.builder(packageName, ichtype.build()).build().writeTo(BaseProcessor.filer);
+        JavaFile.builder(packageName, ictype.build()).build().writeTo(BaseProcessor.filer);
+
+        type.addMethod(load.build());
+        type.addMethod(loadStyles.build());
+        JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
+    }
+
+    void processSounds(String classname, String path, String rtype) throws Exception{
+        TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
+        MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+        MethodSpec.Builder loadBegin = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+        HashSet<String> names = new HashSet<>();
+        Fi.get(path).walk(p -> {
+            String fname = p.name();
+            String name = p.nameWithoutExtension();
+
+            if(names.contains(name)){
+                BaseProcessor.err("Duplicate file name: " + p.toString() + "!");
+            }else{
+                names.add(name);
+            }
+
+            if(SourceVersion.isKeyword(name)){
+                name = name + "s";
+            }
+
+            String filepath = path.substring(path.lastIndexOf("/") + 1) + "/" + fname;
+
+            String filename = "arc.Core.app.getType() != arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3")+"\"";
+
+            loadBegin.addStatement("arc.Core.assets.load("+filename +", "+rtype+".class).loaded = a -> " + name + " = ("+rtype+")a", filepath, filepath.replace(".ogg", ".mp3"));
+
+            dispose.addStatement("arc.Core.assets.unload(" + filename + ")");
+            dispose.addStatement(name + " = null");
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+        });
+
+        if(classname.equals("Sounds")){
+            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new arc.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+        }
+
+        type.addMethod(loadBegin.build());
+        type.addMethod(dispose.build());
+        JavaFile.builder(packageName, type.build()).build().writeTo(BaseProcessor.filer);
+    }
+
+    static String capitalize(String s){
+        StringBuilder result = new StringBuilder(s.length());
+
+        for(int i = 0; i < s.length(); i++){
+            char c = s.charAt(i);
+            if(c != '_' && c != '-'){
+                if(i > 0 && (s.charAt(i - 1) == '_' || s.charAt(i - 1) == '-')){
+                    result.append(Character.toUpperCase(c));
+                }else{
+                    result.append(c);
+                }
+            }
+        }
+
+        return result.toString();
+    }
+}

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

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

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

@@ -0,0 +1,201 @@
+package mindustry.annotations.impl;
+
+import arc.struct.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+
+/**
+ * Generates ""value types"" classes that are packed into integer primitives of the most aproppriate size.
+ * It would be nice if Java didn't make crazy hacks like this necessary.
+ */
+@SupportedAnnotationTypes({
+"mindustry.annotations.Annotations.Struct"
+})
+public class StructProcess extends BaseProcessor{
+
+    @Override
+    public void process(RoundEnvironment env) throws Exception{
+        Seq<Stype> elements = types(Struct.class);
+
+        for(Stype elem : elements){
+
+            if(!elem.name().endsWith("Struct")){
+                err("All classes annotated with @Struct must have their class names end in 'Struct'.", elem);
+                continue;
+            }
+
+            String structName = elem.name().substring(0, elem.name().length() - "Struct".length());
+            String structParam = structName.toLowerCase();
+
+            TypeSpec.Builder classBuilder = TypeSpec.classBuilder(structName)
+            .addModifiers(Modifier.FINAL, Modifier.PUBLIC);
+
+            try{
+                Seq<Svar> variables = elem.fields();
+                int structSize = variables.mapInt(StructProcess::varSize).sum();
+                int structTotalSize = (structSize <= 8 ? 8 : structSize <= 16 ? 16 : structSize <= 32 ? 32 : 64);
+
+                if(variables.size == 0){
+                    err("making a struct with no fields is utterly pointles.", elem);
+                    continue;
+                }
+
+                //obtain type which will be stored
+                Class<?> structType = typeForSize(structSize);
+
+                //[constructor] get(fields...) : structType
+                MethodSpec.Builder constructor = MethodSpec.methodBuilder("get")
+                .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
+                .returns(structType);
+
+                StringBuilder cons = new StringBuilder();
+                StringBuilder doc = new StringBuilder();
+                doc.append("Bits used: ").append(structSize).append(" / ").append(structTotalSize).append("\n");
+
+                int offset = 0;
+                for(Svar var : variables){
+                    int size = varSize(var);
+                    TypeName varType = var.tname();
+                    String varName = var.name();
+
+                    //add val param to constructor
+                    constructor.addParameter(varType, varName);
+
+                    //[get] field(structType) : fieldType
+                    MethodSpec.Builder getter = MethodSpec.methodBuilder(var.name().toString())
+                    .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
+                    .returns(varType)
+                    .addParameter(structType, structParam);
+                    //[set] field(structType, fieldType) : structType
+                    MethodSpec.Builder setter = MethodSpec.methodBuilder(var.name().toString())
+                    .addModifiers(Modifier.STATIC, Modifier.PUBLIC)
+                    .returns(structType)
+                    .addParameter(structType, structParam).addParameter(varType, "value");
+
+                    //[getter]
+                    if(varType == TypeName.BOOLEAN){
+                        //bools: single bit, is simplified
+                        getter.addStatement("return ($L & (1L << $L)) != 0", structParam, offset);
+                    }else if(varType == TypeName.FLOAT){
+                        //floats: need conversion
+                        getter.addStatement("return Float.intBitsToFloat((int)(($L >>> $L) & $L))", structParam, offset, bitString(size, structTotalSize));
+                    }else{
+                        //bytes, shorts, chars, ints
+                        getter.addStatement("return ($T)(($L >>> $L) & $L)", varType, structParam, offset, bitString(size, structTotalSize));
+                    }
+
+                    //[setter] + [constructor building]
+                    if(varType == TypeName.BOOLEAN){
+                        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.nextControlFlow("else");
+                        setter.addStatement("return ($T)(($L & ~(1L << $LL)) | (1L << $LL))", structType, structParam, offset, 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);
+                    }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);
+                    }
+
+                    doc.append("<br>  ").append(varName).append(" [").append(offset).append("..").append(size + offset).append("]\n");
+
+                    //add finished methods
+                    classBuilder.addMethod(getter.build());
+                    classBuilder.addMethod(setter.build());
+
+                    offset += size;
+                }
+
+                classBuilder.addJavadoc(doc.toString());
+
+                //add constructor final statement + add to class and build
+                constructor.addStatement("return ($T)($L)", structType, cons.toString().substring(3));
+                classBuilder.addMethod(constructor.build());
+
+                JavaFile.builder(packageName, classBuilder.build()).build().writeTo(BaseProcessor.filer);
+            }catch(IllegalArgumentException e){
+                e.printStackTrace();
+                err(e.getMessage(), elem);
+            }
+        }
+
+    }
+
+    static String bitString(int offset, int size, int totalSize){
+        StringBuilder builder = new StringBuilder();
+        for(int i = 0; i < offset; i++) builder.append('0');
+        for(int i = 0; i < size; i++) builder.append('1');
+        for(int i = 0; i < totalSize - size - offset; i++) builder.append('0');
+        return "0b" + builder.reverse().toString() + "L";
+    }
+
+    static String bitString(int size, int totalSize){
+        StringBuilder builder = new StringBuilder();
+        for(int i = 0; i < size; i++) builder.append('1');
+        for(int i = 0; i < totalSize - size; i++) builder.append('0');
+        return "0b" + builder.reverse().toString() + "L";
+    }
+
+    static int varSize(Svar var) throws IllegalArgumentException{
+        if(!var.mirror().getKind().isPrimitive()){
+            throw new IllegalArgumentException("All struct fields must be primitives: " + var);
+        }
+
+        StructField an = var.annotation(StructField.class);
+        if(var.mirror().getKind() == TypeKind.BOOLEAN && an != null && an.value() != 1){
+            throw new IllegalArgumentException("Booleans can only be one bit long... why would you do this?");
+        }
+
+        if(var.mirror().getKind() == TypeKind.FLOAT && an != null && an.value() != 32){
+            throw new IllegalArgumentException("Float size can't be changed. Very sad.");
+        }
+
+        return an == null ? typeSize(var.mirror().getKind()) : an.value();
+    }
+
+    static Class<?> typeForSize(int size) throws IllegalArgumentException{
+        if(size <= 8){
+            return byte.class;
+        }else if(size <= 16){
+            return short.class;
+        }else if(size <= 32){
+            return int.class;
+        }else if(size <= 64){
+            return long.class;
+        }
+        throw new IllegalArgumentException("Too many fields, must fit in 64 bits. Curent size: " + size);
+    }
+
+    /** returns a type's element size in bits. */
+    static int typeSize(TypeKind kind) throws IllegalArgumentException{
+        switch(kind){
+            case BOOLEAN:
+                return 1;
+            case BYTE:
+                return 8;
+            case SHORT:
+                return 16;
+            case FLOAT:
+            case CHAR:
+            case INT:
+                return 32;
+            default:
+                throw new IllegalArgumentException("Invalid type kind: " + kind + ". Note that doubles and longs are not supported.");
+        }
+    }
+}

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

@@ -0,0 +1,114 @@
+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.*;
+import mindustry.annotations.util.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.Load")
+public class LoadRegionProcessor extends BaseProcessor{
+
+    @Override
+    public void process(RoundEnvironment env) throws Exception{
+        TypeSpec.Builder regionClass = TypeSpec.classBuilder("ContentRegions")
+            .addModifiers(Modifier.PUBLIC);
+        MethodSpec.Builder method = MethodSpec.methodBuilder("loadRegions")
+            .addParameter(tname("mindustry.ctype.MappableContent"), "content")
+            .addModifiers(Modifier.STATIC, Modifier.PUBLIC);
+
+        ObjectMap<Stype, Seq<Svar>> fieldMap = new ObjectMap<>();
+
+        for(Svar field : fields(Load.class)){
+            if(!field.is(Modifier.PUBLIC)){
+                err("@LoadRegion field must be public", field);
+            }
+
+            fieldMap.get(field.enclosingType(), Seq::new).add(field);
+        }
+
+        for(Entry<Stype, Seq<Svar>> entry : fieldMap){
+            method.beginControlFlow("if(content instanceof $T)", entry.key.tname());
+
+            for(Svar field : entry.value){
+                Load an = field.annotation(Load.class);
+                //get # of array dimensions
+                int dims = count(field.mirror().toString(), "[]");
+                boolean doFallback = !an.fallback().equals("error");
+                String fallbackString = doFallback ? ", " + parse(an.fallback()) : "";
+
+                //not an array
+                if(dims == 0){
+                    method.addStatement("(($T)content).$L = $T.atlas.find($L$L)", entry.key.tname(), field.name(), Core.class, parse(an.value()), fallbackString);
+                }else{
+                    //is an array, create length string
+                    int[] lengths = an.lengths();
+                    if(lengths.length == 0) lengths = new int[]{an.length()};
+
+                    if(dims != lengths.length){
+                        err("Length dimensions must match array dimensions: " + dims + " != " + lengths.length, field);
+                    }
+
+                    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());
+
+                    for(int i = 0; i < dims; i++){
+                        method.beginControlFlow("for(int INDEX$L = 0; INDEX$L < $L; INDEX$L ++)", i, i, lengths[i], i);
+                    }
+
+                    StringBuilder indexString = new StringBuilder();
+                    for(int i = 0; i < dims; i++){
+                        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);
+
+                    for(int i = 0; i < dims; i++){
+                        method.endControlFlow();
+                    }
+                }
+            }
+
+            method.endControlFlow();
+        }
+
+        regionClass.addMethod(method.build());
+
+        write(regionClass);
+    }
+
+    private static int count(String str, String substring){
+        int lastIndex = 0;
+        int count = 0;
+
+        while(lastIndex != -1){
+
+            lastIndex = str.indexOf(substring, lastIndex);
+
+            if(lastIndex != -1){
+                count ++;
+                lastIndex += substring.length();
+            }
+        }
+        return count;
+    }
+
+    private String parse(String value){
+        value = '"' + value + '"';
+        value = value.replace("@size", "\" + ((mindustry.world.Block)content).size + \"");
+        value = value.replace("@", "\" + content.name + \"");
+        value = value.replace("#1", "\" + INDEX0 + \"");
+        value = value.replace("#2", "\" + INDEX1 + \"");
+        value = value.replace("#", "\" + INDEX0 + \"");
+        return value;
+    }
+
+}

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

@@ -0,0 +1,104 @@
+package mindustry.annotations.misc;
+
+import arc.func.*;
+import arc.struct.*;
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+import mindustry.annotations.util.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.element.*;
+
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.RegisterStatement")
+public class LogicStatementProcessor extends BaseProcessor{
+
+    @Override
+    public void process(RoundEnvironment env) throws Exception{
+        TypeSpec.Builder type = TypeSpec.classBuilder("LogicIO")
+            .addModifiers(Modifier.PUBLIC);
+
+        MethodSpec.Builder writer = MethodSpec.methodBuilder("write")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .addParameter(Object.class, "obj")
+            .addParameter(StringBuilder.class, "out");
+
+        MethodSpec.Builder reader = MethodSpec.methodBuilder("read")
+            .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+            .returns(tname("mindustry.logic.LStatement"))
+            .addParameter(String[].class, "tokens");
+
+        Seq<Stype> types = types(RegisterStatement.class);
+
+        type.addField(FieldSpec.builder(
+            ParameterizedTypeName.get(
+            ClassName.get(Seq.class),
+            ParameterizedTypeName.get(ClassName.get(Prov.class),
+                tname("mindustry.logic.LStatement"))), "allStatements", Modifier.PUBLIC, Modifier.STATIC)
+            .initializer("Seq.with(" + types.toString(", ", t -> "" + t.toString() + "::new") + ")").build());
+
+        boolean beganWrite = false, beganRead = false;
+
+        for(Stype c : types){
+            String name = c.annotation(RegisterStatement.class).value();
+
+            if(beganWrite){
+                writer.nextControlFlow("else if(obj instanceof $T)", c.mirror());
+            }else{
+                writer.beginControlFlow("if(obj instanceof $T)", c.mirror());
+                beganWrite = true;
+            }
+
+            //write the name & individual fields
+            writer.addStatement("out.append($S)", name);
+
+            Seq<Svar> fields = c.fields();
+
+            String readSt = "if(tokens[0].equals($S))";
+            if(beganRead){
+                reader.nextControlFlow("else " + readSt, name);
+            }else{
+                reader.beginControlFlow(readSt, name);
+                beganRead = true;
+            }
+
+            reader.addStatement("$T result = new $T()", c.mirror(), c.mirror());
+
+            int index = 0;
+
+            for(Svar field : fields){
+                if(field.is(Modifier.TRANSIENT)) continue;
+
+                writer.addStatement("out.append(\" \")");
+                writer.addStatement("out.append((($T)obj).$L$L)", c.mirror(), field.name(),
+                    Seq.with(typeu.directSupertypes(field.mirror())).contains(t -> t.toString().contains("java.lang.Enum")) ? ".name()" :
+                    "");
+
+                //reading primitives, strings and enums is supported; nothing else is
+                reader.addStatement("if(tokens.length > $L) result.$L = $L(tokens[$L])",
+                index + 1,
+                field.name(),
+                field.mirror().toString().equals("java.lang.String") ?
+                "" : (field.tname().isPrimitive() ? field.tname().box().toString() :
+                field.mirror().toString()) + ".valueOf", //if it's not a string, it must have a valueOf method
+                index + 1
+                );
+
+                index ++;
+            }
+
+            reader.addStatement("result.afterRead()");
+            reader.addStatement("return result");
+        }
+
+        reader.endControlFlow();
+        writer.endControlFlow();
+
+        reader.addStatement("return null");
+
+        type.addMethod(writer.build());
+        type.addMethod(reader.build());
+
+        write(type);
+    }
+}

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

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations.remote;
 
 import java.util.ArrayList;
 

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

@@ -1,6 +1,6 @@
-package io.anuke.annotations;
+package mindustry.annotations.remote;
 
-import io.anuke.annotations.Annotations.*;
+import mindustry.annotations.Annotations.*;
 
 import javax.lang.model.element.ExecutableElement;
 

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

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

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

@@ -1,23 +1,19 @@
-package io.anuke.annotations;
+package mindustry.annotations.remote;
 
+import arc.struct.*;
+import arc.util.io.*;
 import com.squareup.javapoet.*;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.*;
+import mindustry.annotations.util.TypeIOResolver.*;
 
 import javax.lang.model.element.*;
-import javax.tools.Diagnostic.Kind;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
 
 /** Generates code for reading remote invoke packets on the client and server. */
 public class RemoteReadGenerator{
-    private final HashMap<String, ClassSerializer> serializers;
+    private final ClassSerializer serializers;
 
     /** Creates a read generator that uses the supplied serializer setup. */
-    public RemoteReadGenerator(HashMap<String, ClassSerializer> serializers){
+    public RemoteReadGenerator(ClassSerializer serializers){
         this.serializers = serializers;
     }
 
@@ -28,28 +24,21 @@ public class RemoteReadGenerator{
      * @param packageName Full target package name.
      * @param needsPlayer Whether this read method requires a reference to the player sender.
      */
-    public void generateFor(List<MethodEntry> entries, String className, String packageName, boolean needsPlayer)
+    public void generateFor(Seq<MethodEntry> entries, String className, String packageName, boolean needsPlayer) throws Exception{
-    throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IOException{
 
         TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
-        classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
+        classBuilder.addJavadoc(RemoteProcess.autogenWarning);
 
         //create main method builder
         MethodSpec.Builder readMethod = MethodSpec.methodBuilder("readPacket")
         .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
-        .addParameter(ByteBuffer.class, "buffer") //buffer to read form
+        .addParameter(Reads.class, "read") //buffer to read form
         .addParameter(int.class, "id") //ID of method type to read
         .returns(void.class);
 
         if(needsPlayer){
-            //since the player type isn't loaded yet, creating a type def is necessary
-            //this requires reflection since the TypeName constructor is private for some reason
-            Constructor<TypeName> cons = TypeName.class.getDeclaredConstructor(String.class);
-            cons.setAccessible(true);
-
-            TypeName playerType = cons.newInstance("io.anuke.mindustry.entities.type.Player");
             //add player parameter
-            readMethod.addParameter(playerType, "player");
+            readMethod.addParameter(ClassName.get(packageName, "Player"), "player");
         }
 
         CodeBlock.Builder readBlock = CodeBlock.builder(); //start building block of code inside read method
@@ -79,26 +68,22 @@ public class RemoteReadGenerator{
                     //name of parameter
                     String varName = var.getSimpleName().toString();
                     //captialized version of type name for reading primitives
-                    String capName = typeName.equals("byte") ? "" : Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1);
+                    String pname = typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "";
 
                     //write primitives automatically
-                    if(Utils.isPrimitive(typeName)){
+                    if(BaseProcessor.isPrimitive(typeName)){
-                        if(typeName.equals("boolean")){
+                        readBlock.addStatement("$L $L = read.$L()", typeName, varName, pname);
-                            readBlock.addStatement("boolean " + varName + " = buffer.get() == 1");
-                        }else{
-                            readBlock.addStatement(typeName + " " + varName + " = buffer.get" + capName + "()");
-                        }
                     }else{
                         //else, try and find a serializer
-                        ClassSerializer ser = serializers.get(typeName);
+                        String ser = serializers.readers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(entry.element, var.asType(), false));
 
                         if(ser == null){ //make sure a serializer exists!
-                            Utils.messager.printMessage(Kind.ERROR, "No @ReadClass method to read class type: '" + typeName + "'", var);
+                            BaseProcessor.err("No read method to read class type '" + typeName + "' in method " + entry.targetMethod + "; " + serializers.readers, var);
                             return;
                         }
 
                         //add statement for reading it
-                        readBlock.addStatement(typeName + " " + varName + " = " + ser.readMethod + "(buffer)");
+                        readBlock.addStatement(typeName + " " + varName + " = " + ser + "(read)");
                     }
 
                     //append variable name to string builder
@@ -118,7 +103,7 @@ public class RemoteReadGenerator{
             if(entry.forward && entry.where.isServer && needsPlayer){
                 //call forwarded method
                 readBlock.addStatement(packageName + "." + entry.className + "." + entry.element.getSimpleName() +
-                "__forward(player.con.id" + (varResult.length() == 0 ? "" : ", ") + varResult.toString() + ")");
+                "__forward(player.con" + (varResult.length() == 0 ? "" : ", ") + varResult.toString() + ")");
             }
 
             readBlock.nextControlFlow("catch (java.lang.Exception e)");
@@ -139,6 +124,6 @@ public class RemoteReadGenerator{
 
         //build and write resulting class
         TypeSpec spec = classBuilder.build();
-        JavaFile.builder(packageName, spec).build().writeTo(Utils.filer);
+        JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
     }
 }

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

@@ -1,36 +1,39 @@
-package io.anuke.annotations;
+package mindustry.annotations.remote;
 
+import arc.struct.*;
+import arc.util.io.*;
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.*;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.*;
+import mindustry.annotations.util.TypeIOResolver.*;
 
 import javax.lang.model.element.*;
-import javax.tools.Diagnostic.Kind;
+import java.io.*;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
 
 /** Generates code for writing remote invoke packets on the client and server. */
 public class RemoteWriteGenerator{
-    private final HashMap<String, ClassSerializer> serializers;
+    private final ClassSerializer serializers;
 
     /** Creates a write generator that uses the supplied serializer setup. */
-    public RemoteWriteGenerator(HashMap<String, ClassSerializer> serializers){
+    public RemoteWriteGenerator(ClassSerializer serializers){
         this.serializers = serializers;
     }
 
     /** Generates all classes in this list. */
-    public void generateFor(List<ClassEntry> entries, String packageName) throws IOException{
+    public void generateFor(Seq<ClassEntry> entries, String packageName) throws IOException{
 
         for(ClassEntry entry : entries){
             //create builder
             TypeSpec.Builder classBuilder = TypeSpec.classBuilder(entry.name).addModifiers(Modifier.PUBLIC);
-            classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
+            classBuilder.addJavadoc(RemoteProcess.autogenWarning);
 
             //add temporary write buffer
-            classBuilder.addField(FieldSpec.builder(ByteBuffer.class, "TEMP_BUFFER", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
+            classBuilder.addField(FieldSpec.builder(ReusableByteOutStream.class, "OUT", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
-            .initializer("ByteBuffer.allocate($1L)", RemoteMethodAnnotationProcessor.maxPacketSize).build());
+            .initializer("new ReusableByteOutStream($L)", RemoteProcess.maxPacketSize).build());
+
+            //add writer for that buffer
+            classBuilder.addField(FieldSpec.builder(Writes.class, "WRITE", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
+            .initializer("new Writes(new $T(OUT))", DataOutputStream.class).build());
 
             //go through each method entry in this class
             for(MethodEntry methodEntry : entry.methods){
@@ -52,7 +55,7 @@ public class RemoteWriteGenerator{
 
             //build and write resulting class
             TypeSpec spec = classBuilder.build();
-            JavaFile.builder(packageName, spec).build().writeTo(Utils.filer);
+            JavaFile.builder(packageName, spec).build().writeTo(BaseProcessor.filer);
         }
     }
 
@@ -62,7 +65,7 @@ public class RemoteWriteGenerator{
 
         //create builder
         MethodSpec.Builder method = MethodSpec.methodBuilder(elem.getSimpleName().toString() + (forwarded ? "__forward" : "")) //add except suffix when forwarding
-        .addModifiers(Modifier.STATIC, Modifier.SYNCHRONIZED)
+        .addModifiers(Modifier.STATIC)
         .returns(void.class);
 
         //forwarded methods aren't intended for use, and are not public
@@ -73,31 +76,31 @@ public class RemoteWriteGenerator{
         //validate client methods to make sure
         if(methodEntry.where.isClient){
             if(elem.getParameters().isEmpty()){
-                Utils.messager.printMessage(Kind.ERROR, "Client invoke methods must have a first parameter of type Player.", elem);
+                BaseProcessor.err("Client invoke methods must have a first parameter of type Player", elem);
                 return;
             }
 
-            if(!elem.getParameters().get(0).asType().toString().equals("io.anuke.mindustry.entities.type.Player")){
+            if(!elem.getParameters().get(0).asType().toString().contains("Player")){
-                Utils.messager.printMessage(Kind.ERROR, "Client invoke methods should have a first parameter of type Player.", elem);
+                BaseProcessor.err("Client invoke methods should have a first parameter of type Player", elem);
                 return;
             }
         }
 
         //if toAll is false, it's a 'send to one player' variant, so add the player as a parameter
         if(!toAll){
-            method.addParameter(int.class, "playerClientID");
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "playerConnection");
         }
 
         //add sender to ignore
         if(forwarded){
-            method.addParameter(int.class, "exceptSenderID");
+            method.addParameter(ClassName.bestGuess("mindustry.net.NetConnection"), "exceptConnection");
         }
 
         //call local method if applicable, shouldn't happen when forwarding method as that already happens by default
         if(!forwarded && methodEntry.local != Loc.none){
             //add in local checks
             if(methodEntry.local != Loc.both){
-                method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !io.anuke.mindustry.net.Net.active())");
+                method.beginControlFlow("if(" + getCheckString(methodEntry.local) + " || !mindustry.Vars.net.active())");
             }
 
             //concatenate parameters
@@ -106,7 +109,7 @@ public class RemoteWriteGenerator{
             for(VariableElement var : elem.getParameters()){
                 //special case: calling local-only methods uses the local player
                 if(index == 0 && methodEntry.where == Loc.client){
-                    results.append("io.anuke.mindustry.Vars.player");
+                    results.append("mindustry.Vars.player");
                 }else{
                     results.append(var.getSimpleName());
                 }
@@ -127,15 +130,15 @@ public class RemoteWriteGenerator{
         method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")");
 
         //add statement to create packet from pool
-        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.arc.util.pooling.Pools");
+        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "mindustry.net.Packets.InvokePacket", "arc.util.pooling.Pools");
-        //assign buffer
-        method.addStatement("packet.writeBuffer = TEMP_BUFFER");
         //assign priority
         method.addStatement("packet.priority = (byte)" + methodEntry.priority.ordinal());
         //assign method ID
         method.addStatement("packet.type = (byte)" + methodEntry.id);
-        //rewind buffer
+        //reset stream
-        method.addStatement("TEMP_BUFFER.position(0)");
+        method.addStatement("OUT.reset()");
+
+        method.addTypeVariables(Seq.with(elem.getTypeParameters()).map(BaseProcessor::getTVN));
 
         for(int i = 0; i < elem.getParameters().size(); i++){
             //first argument is skipped as it is always the player caller
@@ -145,8 +148,12 @@ public class RemoteWriteGenerator{
 
             VariableElement var = elem.getParameters().get(i);
 
+            try{
                 //add parameter to method
                 method.addParameter(TypeName.get(var.asType()), var.getSimpleName().toString());
+            }catch(Throwable t){
+                throw new RuntimeException("Error parsing method " + methodEntry.targetMethod);
+            }
 
             //name of parameter
             String varName = var.getSimpleName().toString();
@@ -159,27 +166,22 @@ public class RemoteWriteGenerator{
             boolean writePlayerSkipCheck = methodEntry.where == Loc.both && i == 0;
 
             if(writePlayerSkipCheck){ //write begin check
-                method.beginControlFlow("if(io.anuke.mindustry.net.Net.server())");
+                method.beginControlFlow("if(mindustry.Vars.net.server())");
             }
 
-            if(Utils.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
+            if(BaseProcessor.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
-                if(typeName.equals("boolean")){ //booleans are special
+                method.addStatement("WRITE.$L($L)", typeName.equals("boolean") ? "bool" : typeName.charAt(0) + "", varName);
-                    method.addStatement("TEMP_BUFFER.put(" + varName + " ? (byte)1 : 0)");
-                }else{
-                    method.addStatement("TEMP_BUFFER.put" +
-                    capName + "(" + varName + ")");
-                }
             }else{
                 //else, try and find a serializer
-                ClassSerializer ser = serializers.get(typeName);
+                String ser = serializers.writers.get(typeName.replace("mindustry.gen.", ""), SerializerResolver.locate(elem, var.asType(), true));
 
                 if(ser == null){ //make sure a serializer exists!
-                    Utils.messager.printMessage(Kind.ERROR, "No @WriteClass method to write class type: '" + typeName + "'", var);
+                    BaseProcessor.err("No @WriteClass method to write class type: '" + typeName + "'", var);
                     return;
                 }
 
                 //add statement for writing it
-                method.addStatement(ser.writeMethod + "(TEMP_BUFFER, " + varName + ")");
+                method.addStatement(ser + "(WRITE, " + varName + ")");
             }
 
             if(writePlayerSkipCheck){ //write end check
@@ -187,26 +189,28 @@ public class RemoteWriteGenerator{
             }
         }
 
+        //assign packet bytes
+        method.addStatement("packet.bytes = OUT.getBytes()");
         //assign packet length
-        method.addStatement("packet.writeLength = TEMP_BUFFER.position()");
+        method.addStatement("packet.length = OUT.size()");
 
         String sendString;
 
         if(forwarded){ //forward packet
             if(!methodEntry.local.isClient){ //if the client doesn't get it called locally, forward it back after validation
-                sendString = "send(";
+                sendString = "mindustry.Vars.net.send(";
             }else{
-                sendString = "sendExcept(exceptSenderID, ";
+                sendString = "mindustry.Vars.net.sendExcept(exceptConnection, ";
             }
         }else if(toAll){ //send to all players / to server
-            sendString = "send(";
+            sendString = "mindustry.Vars.net.send(";
         }else{ //send to specific client from server
-            sendString = "sendTo(playerClientID, ";
+            sendString = "playerConnection.send(";
         }
 
         //send the actual packet
-        method.addStatement("io.anuke.mindustry.net.Net." + sendString + "packet, " +
+        method.addStatement(sendString + "packet, " +
-        (methodEntry.unreliable ? "io.anuke.mindustry.net.Net.SendMode.udp" : "io.anuke.mindustry.net.Net.SendMode.tcp") + ")");
+        (methodEntry.unreliable ? "mindustry.net.Net.SendMode.udp" : "mindustry.net.Net.SendMode.tcp") + ")");
 
 
         //end check for server/client
@@ -217,8 +221,8 @@ public class RemoteWriteGenerator{
     }
 
     private String getCheckString(Loc loc){
-        return loc.isClient && loc.isServer ? "io.anuke.mindustry.net.Net.server() || io.anuke.mindustry.net.Net.client()" :
+        return loc.isClient && loc.isServer ? "mindustry.Vars.net.server() || mindustry.Vars.net.client()" :
-        loc.isClient ? "io.anuke.mindustry.net.Net.client()" :
+        loc.isClient ? "mindustry.Vars.net.client()" :
-        loc.isServer ? "io.anuke.mindustry.net.Net.server()" : "false";
+        loc.isServer ? "mindustry.Vars.net.server()" : "false";
     }
 }

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

@@ -0,0 +1,22 @@
+package mindustry.annotations.remote;
+
+import arc.struct.*;
+
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+
+public class SerializerResolver{
+
+    public static String locate(ExecutableElement elem, TypeMirror mirror, boolean write){
+        //generic type
+        if((mirror.toString().equals("T") && Seq.with(elem.getTypeParameters().get(0).getBounds()).contains(SerializerResolver::isEntity)) ||
+            isEntity(mirror)){
+            return write ? "mindustry.io.TypeIO.writeEntity" : "mindustry.io.TypeIO.readEntity";
+        }
+        return null;
+    }
+
+    private static boolean isEntity(TypeMirror mirror){
+        return !mirror.toString().contains(".") || mirror.toString().startsWith("mindustry.gen.") && !mirror.toString().startsWith("byte");
+    }
+}

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

@@ -0,0 +1,262 @@
+package mindustry.annotations.util;
+
+import arc.func.*;
+import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Attribute.Array;
+import com.sun.tools.javac.code.Attribute.Enum;
+import com.sun.tools.javac.code.Attribute.Error;
+import com.sun.tools.javac.code.Attribute.Visitor;
+import com.sun.tools.javac.code.Attribute.*;
+import com.sun.tools.javac.code.Type;
+import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.code.Type.ArrayType;
+import com.sun.tools.javac.util.List;
+import com.sun.tools.javac.util.Name;
+import com.sun.tools.javac.util.*;
+import sun.reflect.annotation.*;
+
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import java.lang.Class;
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.Map.*;
+
+//replaces the standard Java AnnotationProxyMaker with one that doesn't crash
+//thanks, oracle.
+@SuppressWarnings({"sunapi", "unchecked"})
+public class AnnotationProxyMaker{
+    private final Compound anno;
+    private final Class<? extends Annotation> annoType;
+
+    private AnnotationProxyMaker(Compound var1, Class<? extends Annotation> var2){
+        this.anno = var1;
+        this.annoType = var2;
+    }
+
+    public static <A extends Annotation> A generateAnnotation(Compound var0, Class<A> var1){
+        AnnotationProxyMaker var2 = new AnnotationProxyMaker(var0, var1);
+        return (A)var1.cast(var2.generateAnnotation());
+    }
+
+    private Annotation generateAnnotation(){
+        return AnnotationParser.annotationForMap(this.annoType, this.getAllReflectedValues());
+    }
+
+    private Map<String, Object> getAllReflectedValues(){
+        LinkedHashMap var1 = new LinkedHashMap();
+        Iterator var2 = this.getAllValues().entrySet().iterator();
+
+        while(var2.hasNext()){
+            Entry var3 = (Entry)var2.next();
+            MethodSymbol var4 = (MethodSymbol)var3.getKey();
+            Object var5 = this.generateValue(var4, (Attribute)var3.getValue());
+            if(var5 != null){
+                var1.put(var4.name.toString(), var5);
+            }
+        }
+
+        return var1;
+    }
+
+    private Map<MethodSymbol, Attribute> getAllValues(){
+        LinkedHashMap map = new LinkedHashMap();
+        ClassSymbol cl = (ClassSymbol)this.anno.type.tsym;
+
+        //try to use Java 8 API for this if possible
+        try{
+            Class entryClass = Class.forName("com.sun.tools.javac.code.Scope$Entry");
+            Object members = cl.members();
+            Field field = members.getClass().getField("elems");
+            Object elems = field.get(members);
+            Field siblingField = entryClass.getField("sibling");
+            Field symField = entryClass.getField("sym");
+            for(Object currEntry = elems; currEntry != null; currEntry = siblingField.get(currEntry)){
+                handleSymbol((Symbol)symField.get(currEntry), map);
+            }
+
+        }catch(Throwable e){
+            //otherwise try other API
+
+            try{
+                Class lookupClass = Class.forName("com.sun.tools.javac.code.Scope$LookupKind");
+                Field nonRecField = lookupClass.getField("NON_RECURSIVE");
+                Object nonRec = nonRecField.get(null);
+                Scope scope = cl.members();
+                Method getSyms = scope.getClass().getMethod("getSymbols", lookupClass);
+                Iterable<Symbol> it = (Iterable<Symbol>)getSyms.invoke(scope, nonRec);
+                Iterator<Symbol> i = it.iterator();
+                while(i.hasNext()){
+                    handleSymbol(i.next(), map);
+                }
+
+            }catch(Throwable death){
+                //I tried
+                throw new RuntimeException(death);
+            }
+        }
+
+        for(Pair var7 : this.anno.values){
+            map.put(var7.fst, var7.snd);
+        }
+
+        return map;
+    }
+
+    private void handleSymbol(Symbol sym, LinkedHashMap map){
+
+        if(sym.getKind() == ElementKind.METHOD){
+            MethodSymbol var4 = (MethodSymbol)sym;
+            Attribute var5 = var4.getDefaultValue();
+            if(var5 != null){
+                map.put(var4, var5);
+            }
+        }
+    }
+
+    private Object generateValue(MethodSymbol var1, Attribute var2){
+        AnnotationProxyMaker.ValueVisitor var3 = new AnnotationProxyMaker.ValueVisitor(var1);
+        return var3.getValue(var2);
+    }
+
+    private class ValueVisitor implements Visitor{
+        private MethodSymbol meth;
+        private Class<?> returnClass;
+        private Object value;
+
+        ValueVisitor(MethodSymbol var2){
+            this.meth = var2;
+        }
+
+        Object getValue(Attribute var1){
+            Method var2;
+            try{
+                var2 = AnnotationProxyMaker.this.annoType.getMethod(this.meth.name.toString());
+            }catch(NoSuchMethodException var4){
+                return null;
+            }
+
+            this.returnClass = var2.getReturnType();
+            var1.accept(this);
+            if(!(this.value instanceof ExceptionProxy) && !AnnotationType.invocationHandlerReturnType(this.returnClass).isInstance(this.value)){
+                this.typeMismatch(var2, var1);
+            }
+
+            return this.value;
+        }
+
+        public void visitConstant(Constant var1){
+            this.value = var1.getValue();
+        }
+
+        public void visitClass(com.sun.tools.javac.code.Attribute.Class var1){
+            this.value = mirrorProxy(var1.classType);
+        }
+
+        public void visitArray(Array var1){
+            Name var2 = ((ArrayType)var1.type).elemtype.tsym.getQualifiedName();
+            int var6;
+            if(var2.equals(var2.table.names.java_lang_Class)){
+                ListBuffer var14 = new ListBuffer();
+                Attribute[] var15 = var1.values;
+                int var16 = var15.length;
+
+                for(var6 = 0; var6 < var16; ++var6){
+                    Attribute var7 = var15[var6];
+                    Type var8 = var7 instanceof UnresolvedClass ? ((UnresolvedClass)var7).classType : ((com.sun.tools.javac.code.Attribute.Class)var7).classType;
+                    var14.append(var8);
+                }
+
+                this.value = mirrorProxy(var14.toList());
+            }else{
+                int var3 = var1.values.length;
+                Class var4 = this.returnClass;
+                this.returnClass = this.returnClass.getComponentType();
+
+                try{
+                    Object var5 = java.lang.reflect.Array.newInstance(this.returnClass, var3);
+
+                    for(var6 = 0; var6 < var3; ++var6){
+                        var1.values[var6].accept(this);
+                        if(this.value == null || this.value instanceof ExceptionProxy){
+                            return;
+                        }
+
+                        try{
+                            java.lang.reflect.Array.set(var5, var6, this.value);
+                        }catch(IllegalArgumentException var12){
+                            this.value = null;
+                            return;
+                        }
+                    }
+
+                    this.value = var5;
+                }finally{
+                    this.returnClass = var4;
+                }
+            }
+        }
+
+        public void visitEnum(Enum var1){
+            if(this.returnClass.isEnum()){
+                String var2 = var1.value.toString();
+
+                try{
+                    this.value = java.lang.Enum.valueOf((Class)this.returnClass, var2);
+                }catch(IllegalArgumentException var4){
+                    this.value = proxify(() -> new EnumConstantNotPresentException((Class)this.returnClass, var2));
+                }
+            }else{
+                this.value = null;
+            }
+
+        }
+
+        public void visitCompound(Compound var1){
+            try{
+                Class var2 = this.returnClass.asSubclass(Annotation.class);
+                this.value = AnnotationProxyMaker.generateAnnotation(var1, var2);
+            }catch(ClassCastException var3){
+                this.value = null;
+            }
+
+        }
+
+        public void visitError(Error var1){
+            if(var1 instanceof UnresolvedClass){
+                this.value = mirrorProxy(((UnresolvedClass)var1).classType);
+            }else{
+                this.value = null;
+            }
+
+        }
+
+        private void typeMismatch(Method var1, final Attribute var2){
+            this.value = proxify(() -> new AnnotationTypeMismatchException(var1, var2.type.toString()));
+        }
+    }
+
+    private static Object mirrorProxy(Type t){
+        return proxify(() -> new MirroredTypeException(t));
+    }
+
+    private static Object mirrorProxy(List<Type> t){
+        return proxify(() -> new MirroredTypesException(t));
+    }
+
+    private static <T extends Throwable> Object proxify(Prov<T> prov){
+        try{
+
+            return new ExceptionProxy(){
+                @Override
+                protected RuntimeException generateException(){
+                    return (RuntimeException)prov.get();
+                }
+            };
+        }catch(Throwable t){
+            throw new RuntimeException(t);
+        }
+
+    }
+}

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

@@ -0,0 +1,111 @@
+package mindustry.annotations.util;
+
+import arc.struct.*;
+import arc.util.ArcAnnotate.*;
+import com.squareup.javapoet.*;
+import com.sun.tools.javac.code.Attribute.*;
+import mindustry.annotations.*;
+
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+import java.lang.Class;
+import java.lang.annotation.*;
+import java.lang.reflect.*;
+
+public class Selement<T extends Element>{
+    public final T e;
+
+    public Selement(T e){
+        this.e = e;
+    }
+
+    public @Nullable String doc(){
+        return BaseProcessor.elementu.getDocComment(e);
+    }
+
+    public Seq<Selement<?>> enclosed(){
+        return Seq.with(e.getEnclosedElements()).map(Selement::new);
+    }
+
+    public String fullName(){
+        return e.toString();
+    }
+
+    public Stype asType(){
+        return new Stype((TypeElement)e);
+    }
+
+    public Svar asVar(){
+        return new Svar((VariableElement)e);
+    }
+
+    public Smethod asMethod(){
+        return new Smethod((ExecutableElement)e);
+    }
+
+    public boolean isVar(){
+        return e instanceof VariableElement;
+    }
+
+    public boolean isType(){
+        return e instanceof TypeElement;
+    }
+
+    public boolean isMethod(){
+        return e instanceof ExecutableElement;
+    }
+
+    public Seq<? extends AnnotationMirror> annotations(){
+        return Seq.with(e.getAnnotationMirrors());
+    }
+
+    public <A extends Annotation> A annotation(Class<A> annotation){
+        try{
+            Method m = com.sun.tools.javac.code.AnnoConstruct.class.getDeclaredMethod("getAttribute", Class.class);
+            m.setAccessible(true);
+            Compound compound = (Compound)m.invoke(e, annotation);
+            return compound == null ? null : AnnotationProxyMaker.generateAnnotation(compound, annotation);
+        }catch(Exception e){
+            throw new RuntimeException(e);
+        }
+    }
+
+    public <A extends Annotation> boolean has(Class<A> annotation){
+        return annotation(annotation) != null;
+    }
+
+    public Element up(){
+        return e.getEnclosingElement();
+    }
+
+    public TypeMirror mirror(){
+        return e.asType();
+    }
+
+    public TypeName tname(){
+        return TypeName.get(mirror());
+    }
+
+    public ClassName cname(){
+        return ClassName.get((TypeElement)BaseProcessor.typeu.asElement(mirror()));
+    }
+
+    public String name(){
+        return e.getSimpleName().toString();
+    }
+
+    @Override
+    public String toString(){
+        return e.toString();
+    }
+
+    @Override
+    public int hashCode(){
+        return e.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o){
+        return o != null && o.getClass() == getClass() && e.equals(((Selement)o).e);
+    }
+}

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

@@ -0,0 +1,71 @@
+package mindustry.annotations.util;
+
+import arc.struct.*;
+import com.squareup.javapoet.*;
+import com.sun.source.tree.*;
+import mindustry.annotations.*;
+
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+
+public class Smethod extends Selement<ExecutableElement>{
+
+    public Smethod(ExecutableElement executableElement){
+        super(executableElement);
+    }
+
+    public boolean isAny(Modifier... mod){
+        for(Modifier m : mod){
+            if(is(m)) return true;
+        }
+        return false;
+    }
+
+    public String descString(){
+        return up().asType().toString() + "#" + super.toString().replace("mindustry.gen.", "");
+    }
+
+    public boolean is(Modifier mod){
+        return e.getModifiers().contains(mod);
+    }
+
+    public Stype type(){
+        return new Stype((TypeElement)up());
+    }
+
+    public Seq<TypeMirror> thrown(){
+        return Seq.with(e.getThrownTypes()).as();
+    }
+
+    public Seq<TypeName> thrownt(){
+        return Seq.with(e.getThrownTypes()).map(TypeName::get);
+    }
+
+    public Seq<TypeParameterElement> typeVariables(){
+        return Seq.with(e.getTypeParameters()).as();
+    }
+
+    public Seq<Svar> params(){
+        return Seq.with(e.getParameters()).map(Svar::new);
+    }
+
+    public boolean isVoid(){
+        return ret().toString().equals("void");
+    }
+
+    public TypeMirror ret(){
+        return e.getReturnType();
+    }
+
+    public TypeName retn(){
+        return TypeName.get(ret());
+    }
+
+    public MethodTree tree(){
+        return BaseProcessor.trees.getTree(e);
+    }
+
+    public String simpleString(){
+        return name() + "(" + params().toString(", ", p -> BaseProcessor.simpleName(p.mirror().toString())) + ")";
+    }
+}

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

@@ -0,0 +1,61 @@
+package mindustry.annotations.util;
+
+import arc.struct.*;
+import mindustry.annotations.*;
+
+import javax.lang.model.element.*;
+import javax.lang.model.type.*;
+
+public class Stype extends Selement<TypeElement>{
+
+    public Stype(TypeElement typeElement){
+        super(typeElement);
+    }
+
+    public static Stype of(TypeMirror mirror){
+        return new Stype((TypeElement)BaseProcessor.typeu.asElement(mirror));
+    }
+
+    public String fullName(){
+        return mirror().toString();
+    }
+
+    public Seq<Stype> interfaces(){
+        return Seq.with(e.getInterfaces()).map(Stype::of);
+    }
+
+    public Seq<Stype> allInterfaces(){
+        return interfaces().flatMap(s -> s.allInterfaces().and(s)).distinct();
+    }
+
+    public Seq<Stype> superclasses(){
+        return Seq.with(BaseProcessor.typeu.directSupertypes(mirror())).map(Stype::of);
+    }
+
+    public Seq<Stype> allSuperclasses(){
+        return superclasses().flatMap(s -> s.allSuperclasses().and(s)).distinct();
+    }
+
+    public Stype superclass(){
+        return new Stype((TypeElement)BaseProcessor.typeu.asElement(BaseProcessor.typeu.directSupertypes(mirror()).get(0)));
+    }
+
+    public Seq<Svar> fields(){
+        return Seq.with(e.getEnclosedElements()).select(e -> e instanceof VariableElement).map(e -> new Svar((VariableElement)e));
+    }
+
+    public Seq<Smethod> methods(){
+        return Seq.with(e.getEnclosedElements()).select(e -> e instanceof ExecutableElement
+        && !e.getSimpleName().toString().contains("<")).map(e -> new Smethod((ExecutableElement)e));
+    }
+
+    public Seq<Smethod> constructors(){
+        return Seq.with(e.getEnclosedElements()).select(e -> e instanceof ExecutableElement
+        && e.getSimpleName().toString().contains("<")).map(e -> new Smethod((ExecutableElement)e));
+    }
+
+    @Override
+    public TypeMirror mirror(){
+        return e.asType();
+    }
+}

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

@@ -0,0 +1,41 @@
+package mindustry.annotations.util;
+
+import com.sun.source.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
+import mindustry.annotations.*;
+
+import javax.lang.model.element.*;
+
+public class Svar extends Selement<VariableElement>{
+
+    public Svar(VariableElement e){
+        super(e);
+    }
+
+    public String descString(){
+        return up().asType().toString() + "#" + super.toString().replace("mindustry.gen.", "");
+    }
+
+    public JCVariableDecl jtree(){
+        return (JCVariableDecl)BaseProcessor.elementu.getTree(e);
+    }
+
+    public Stype enclosingType(){
+        return new Stype((TypeElement)up());
+    }
+
+    public boolean isAny(Modifier... mods){
+        for(Modifier m : mods){
+            if(is(m)) return true;
+        }
+        return false;
+    }
+
+    public boolean is(Modifier mod){
+        return e.getModifiers().contains(mod);
+    }
+
+    public VariableTree tree(){
+        return (VariableTree)BaseProcessor.trees.getTree(e);
+    }
+}

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

@@ -0,0 +1,58 @@
+package mindustry.annotations.util;
+
+import arc.struct.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.annotations.*;
+
+import javax.lang.model.element.*;
+
+/**
+ * This class finds reader and writer methods.
+ */
+public class TypeIOResolver{
+
+    /**
+     * Finds all class serializers for all types and returns them. Logs errors when necessary.
+     * Maps fully qualified class names to their serializers.
+     */
+    public static ClassSerializer resolve(BaseProcessor processor){
+        ClassSerializer out = new ClassSerializer(new ObjectMap<>(), new ObjectMap<>(), new ObjectMap<>());
+        for(Stype type : processor.types(TypeIOHandler.class)){
+            //look at all TypeIOHandler methods
+            Seq<Smethod> methods = type.methods();
+            for(Smethod meth : methods){
+                if(meth.is(Modifier.PUBLIC) && meth.is(Modifier.STATIC)){
+                    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());
+                    }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());
+                    }else if(params.size == 2 && params.first().tname().toString().equals("arc.util.io.Reads") && !meth.isVoid() && meth.ret().equals(meth.params().get(1).mirror())){
+                        //2 params, one is reader, other is type, returns type - these are made to reduce garbage allocated
+                        out.mutatorReaders.put(fix(meth.retn().toString()), type.fullName() + "." + meth.name());
+                    }
+                }
+            }
+        }
+
+        return out;
+    }
+
+    /** makes sure type names don't contain 'gen' */
+    private static String fix(String str){
+        return str.replace("mindustry.gen", "");
+    }
+
+    /** Information about read/write methods for class types. */
+    public static class ClassSerializer{
+        public final ObjectMap<String, String> writers, readers, mutatorReaders;
+
+        public ClassSerializer(ObjectMap<String, String> writers, ObjectMap<String, String> readers, ObjectMap<String, String> mutatorReaders){
+            this.writers = writers;
+            this.readers = readers;
+            this.mutatorReaders = mutatorReaders;
+        }
+    }
+}

annotations/src/main/resources/META-INF/services/javax.annotation.processing.Processor

@@ -1,4 +0,0 @@
-io.anuke.annotations.RemoteMethodAnnotationProcessor
-io.anuke.annotations.SerializeAnnotationProcessor
-io.anuke.annotations.StructAnnotationProcessor
-io.anuke.annotations.CallSuperAnnotationProcessor

annotations/src/main/resources/classids.properties

@@ -0,0 +1,28 @@
+#Maps entity names to IDs. Autogenerated.
+
+alpha=0
+atrax=1
+block=2
+corvus=24
+flare=3
+mace=4
+mega=5
+mindustry.entities.comp.BuildingComp=6
+mindustry.entities.comp.BulletComp=7
+mindustry.entities.comp.DecalComp=8
+mindustry.entities.comp.EffectStateComp=9
+mindustry.entities.comp.FireComp=10
+mindustry.entities.comp.LaunchCoreComp=11
+mindustry.entities.comp.PlayerComp=12
+mindustry.entities.comp.PuddleComp=13
+mindustry.type.Weather.WeatherStateComp=14
+mindustry.world.blocks.campaign.LaunchPad.LaunchPayloadComp=15
+mindustry.world.blocks.defense.ForceProjector.ForceDrawComp=22
+mono=16
+nova=17
+poly=18
+pulsar=19
+quad=23
+risso=20
+spiroct=21
+vela=25

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{fields:[{name:cons,type:mindustry.world.modules.ConsumeModule,size:-1},{name:health,type:float,size:4},{name:items,type:mindustry.world.modules.ItemModule,size:-1},{name:liquids,type:mindustry.world.modules.LiquidModule,size:-1},{name:power,type:mindustry.world.modules.PowerModule,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{fields:[{name:ammo,type:float,size:4},{name:armor,type:float,size:4},{name:baseRotation,type:float,size:4},{name:controller,type:mindustry.entities.units.UnitController,size:-1},{name:deactivated,type:boolean,size:1},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:isShooting,type:boolean,size:1},{name:mounts,type:"mindustry.entities.units.WeaponMount[]",size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:spawnedByCore,type:boolean,size:1},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Seq<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:lifetime,type:float,size:4},{name:region,type:arc.graphics.g2d.TextureRegion,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

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

@@ -0,0 +1 @@
+{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

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

@@ -0,0 +1 @@
+{version:1,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

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

@@ -0,0 +1 @@
+{version:2,fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:effect,type:mindustry.entities.Effect,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:parent,type:mindustry.gen.Posc,size:-1},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}