Merge remote-tracking branch 'origin/master'

* Full description translated

* Create achievements.vdf

* Create short-description.txt

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,12 @@
+---
+name: Bug report
+about: Create a report to help fix an issue.
+---
+
+**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 you were doing at the time.*

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,7 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Do not make a new issue for feature requests!** Instead, post it on FeatHub: https://feathub.com/Anuken/Mindustry

.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,17 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    #- name: Run unit tests with gradle
+    #  run: ./gradlew test

.gitignore

@@ -4,6 +4,7 @@ logs/
 /core/assets/bundles/output/
 /core/assets/.gifimages/
 /deploy/
+/out/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
@@ -19,21 +20,26 @@ logs/
 /tools/build/
 /tests/build/
 /server/build/
+changelog
+saves/
+core/assets/saves/
+/core/assets/saves/
+steam_appid.txt
 /test_files/
 /annotations/build/
-/desktop-sdl/build/
-desktop-sdl/build/
 /android/assets/mindustry-maps/
 /android/assets/mindustry-saves/
 /core/assets/gifexport/
 /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/
+changelog
 *.gif
+/core/assets/saves/
 
 version.properties
 
@@ -49,15 +55,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/

.travis.yml

@@ -1,11 +1,25 @@
 jdk:
 - openjdk8
+dist: trusty
+android:
+  components:
+  - android-29
+  - build-tools-29.0.2
+
 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}"
-
 deploy:
 - provider: releases
   skip_cleanup: true
@@ -13,7 +27,7 @@ deploy:
   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
@@ -25,4 +39,5 @@ deploy:
     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,69 @@
+# 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)
+
+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 [does not support](https://developer.android.com/studio/write/java8-support#supported_features) 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 `Array`, `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` -> `Array`
+- `java.util.Queue` -> `arc.struct.Queue`
+- *Many others*
+
+
+#### Avoid boxed types (Integer, Boolean)
+Never create variables or collections with boxed types `Array<Integer>` or `ObjectMap<Integer, ...>`. Use the collections specialized for this task, e.g. `IntArray` 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.  

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,14 +6,18 @@
 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)_ 
+
+### 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 live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/MindustryBuilds/releases). Old builds might still be on [jenkins](https://jenkins.hellomouse.net/job/mindustry/).
 
 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 [Java 8](https://www.java.com/en/download/) and [JDK 8](https://adoptopenjdk.net/) installed. Open a terminal in the root directory, `cd` to the Mindustry folder and run the following commands:
 
 #### Windows
 
@@ -29,6 +33,13 @@ _Building:_ `./gradlew desktop:dist`
 
 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. Create a file named `local.properties` inside the Mindustry directory, with its contents looking like this: `sdk.dir=<Path to Android SDK you just downloaded, without these bracket>`. For example, if you're on Windows and installed the tools to C:\\tools, your local.properties would contain `sdk.dir=C:\\tools` (*note the double backslashes are required instead of single ones!*).
+3. Run `gradlew android:assembleDebug` (or `./gradlew` if on linux/mac). This will create an unsigned APK in `android/build/outputs/apk`.
+4. (Optional) To debug the application on a connected phone, do `gradlew android:installDebug android:run`. It is **highly recommended** to use IntelliJ for this instead, however.
+
 ##### 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 +47,23 @@ 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
+
+[![Feature Requests](https://feathub.com/Anuken/Mindustry?format=svg)](https://feathub.com/Anuken/Mindustry)
+
 
 ### 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/)

TRANSLATING.md

@@ -31,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

@@ -13,12 +13,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">
         <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">
@@ -28,14 +29,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="application/octet-stream"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap"/>
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -43,21 +36,6 @@
                 <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,7 +8,7 @@ buildscript{
     }
 
     dependencies{
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
@@ -26,9 +26,9 @@ repositories{
 
 dependencies{
     implementation project(":core")
-    implementation project(":net")
 
     implementation arcModule("backends:backend-android")
+    implementation 'com.jakewharton.android.repackaged:dalvik-dx:9.0.0_r3'
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
@@ -50,8 +50,8 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
-    compileSdkVersion 28
+    compileSdkVersion 29
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -70,27 +70,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{
@@ -167,5 +161,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

@@ -22,8 +22,8 @@
 -verbose
 -verbose
 -ignorewarnings
--keep class io.anuke.mindustry.game.Rules
+-keep class mindustry.game.Rules
--keep class io.anuke.mindustry.desktop.DesktopLauncher
+-keep class mindustry.desktop.DesktopLauncher
 -keepclasseswithmembers public class * {
     public static void main(java.lang.String[]);
 }

android/src/mindustry/android/AndroidLauncher.java

@@ -1,34 +1,32 @@
-package io.anuke.mindustry;
+package mindustry.android;
 
-import android.Manifest;
+import android.*;
-import android.content.Context;
+import android.app.*;
-import android.content.Intent;
+import android.content.*;
-import android.content.pm.ActivityInfo;
+import android.content.pm.*;
-import android.content.pm.PackageManager;
+import android.net.*;
-import android.net.Uri;
+import android.os.Build.*;
-import android.os.Build;
+import android.os.*;
-import android.os.Bundle;
+import android.provider.Settings.*;
-import android.provider.Settings.Secure;
+import android.telephony.*;
-import android.telephony.TelephonyManager;
+import arc.*;
-import io.anuke.arc.Core;
+import arc.backend.android.*;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
+import arc.files.*;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
+import arc.func.*;
-import io.anuke.arc.files.FileHandle;
+import arc.scene.ui.layout.*;
-import io.anuke.arc.function.Consumer;
+import arc.util.*;
-import io.anuke.arc.function.Predicate;
+import arc.util.serialization.*;
-import io.anuke.arc.scene.ui.layout.UnitScl;
+import mindustry.*;
-import io.anuke.arc.util.Strings;
+import mindustry.game.Saves.*;
-import io.anuke.arc.util.serialization.Base64Coder;
+import mindustry.io.*;
-import io.anuke.mindustry.core.Platform;
+import mindustry.ui.dialogs.*;
-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 java.lang.System;
+import java.util.*;
+
+import static mindustry.Vars.*;
 
-import static io.anuke.mindustry.Vars.*;
 
 public class AndroidLauncher extends AndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
@@ -39,10 +37,11 @@ public class AndroidLauncher extends AndroidApplication{
     @Override
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
-        AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
+        if(doubleScaleTablets && isTablet(this.getContext())){
-        config.useImmersiveMode = true;
+            Scl.setAddition(0.5f);
-        config.depth = 0;
+        }
-        Platform.instance = new Platform(){
+
+        initialize(new ClientLauncher(){
 
             @Override
             public void hide(){
@@ -68,12 +67,57 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-            public void requestExternalPerms(Runnable callback){
+            public org.mozilla.javascript.Context getScriptContext(){
-                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                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") ? "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)){
-                    callback.run();
+                    chooser = new FileChooser(open ? "$open" : "$save", file -> file.extension().equalsIgnoreCase(extension), open, file -> {
+                        if(!open){
+                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
                         }else{
-                    permCallback = callback;
+                            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);
@@ -82,29 +126,8 @@ public class AndroidLauncher extends AndroidApplication{
                         perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
                     }
                     requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
-                }
-            }
-
-            @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<>();
+                    super.showFileChooser(open, extension, cons);
-                    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);
                 }
             }
 
@@ -118,20 +141,12 @@ public class AndroidLauncher extends AndroidApplication{
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
             }
 
-            @Override
+        }, new AndroidApplicationConfiguration(){{
-            public boolean canDonate(){
+            useImmersiveMode = true;
-                return true;
+            depth = 0;
-            }
+            hideStatusBar = true;
-        };
+            //errorHandler = ModCrashHandler::handle;
-
+        }});
-        if(doubleScaleTablets && isTablet(this.getContext())){
-            UnitScl.dp.addition = 0.5f;
-        }
-
-        config.hideStatusBar = true;
-        Net.setClientProvider(new ArcNetClient());
-        Net.setServerProvider(new ArcNetServer());
-        initialize(new Mindustry(), config);
         checkFiles(getIntent());
     }
 
@@ -172,20 +187,20 @@ public class AndroidLauncher extends AndroidApplication{
                 Core.app.post(() -> Core.app.post(() -> {
                     if(save){ //open save
                         System.out.println("Opening save.");
-                        FileHandle file = Core.files.local("temp-save." + saveExtension);
+                        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.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, true)));
+                                ui.showException("$save.import.fail", e);
                             }
                         }else{
-                            ui.showError("$save.import.invalid");
+                            ui.showErrorMessage("$save.import.invalid");
                         }
                     }else if(map){ //open map
-                        FileHandle file = Core.files.local("temp-map." + mapExtension);
+                        Fi file = Core.files.local("temp-map." + mapExtension);
                         file.write(inStream, false);
                         Core.app.post(() -> {
                             System.out.println("Opening map.");

android/src/mindustry/android/AndroidRhinoContext.java

@@ -0,0 +1,227 @@
+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 org.mozilla.javascript.*;
+
+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;
+                }
+            });
+
+        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 FatalLoadingException(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;
+        }
+    }
+
+
+    /** Might be thrown in any Rhino method that loads bytecode if the loading failed. */
+    public static class FatalLoadingException extends RuntimeException{
+        FatalLoadingException(Throwable t){
+            super("Failed to define class", t);
+        }
+    }
+
+    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/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java

@@ -1,98 +0,0 @@
-package io.anuke.annotations;
-
-import com.squareup.javapoet.*;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.ProcessingEnvironment;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedSourceVersion;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.tools.Diagnostic.Kind;
-import javax.tools.StandardLocation;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-public class AssetsAnnotationProcessor 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{
-
-            String path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no")
-                        .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length()))
-                        .getParent().getParent().getParent().getParent().getParent().getParent().toString();
-
-            process("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound", "newSound");
-            process("Musics", path + "/assets/music", "io.anuke.arc.audio.Music", "newMusic");
-
-            return true;
-        }catch(Exception e){
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public Set<String> getSupportedAnnotationTypes() {
-        return Collections.singleton("*");
-    }
-
-    void process(String classname, String path, String rtype, String loadMethod) throws Exception{
-        TypeSpec.Builder type = TypeSpec.classBuilder(classname).addModifiers(Modifier.PUBLIC);
-        MethodSpec.Builder load = MethodSpec.methodBuilder("load").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
-        MethodSpec.Builder dispose = MethodSpec.methodBuilder("dispose").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
-
-        HashSet<String> names = new HashSet<>();
-        Files.list(Paths.get(path)).forEach(p -> {
-            String fname = p.getFileName().toString();
-            String name = p.getFileName().toString();
-            name = name.substring(0, name.indexOf("."));
-
-            if(names.contains(name)){
-                Utils.messager.printMessage(Kind.ERROR, "Duplicate file name: " + p.toString() + "!");
-            }else{
-                names.add(name);
-            }
-
-            if(SourceVersion.isKeyword(name)){
-                name = name + "s";
-            }
-
-            load.addStatement(name + " = io.anuke.arc.Core.audio."+loadMethod+"(io.anuke.arc.Core.files.internal(io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? $S : $S))",
-                path.substring(path.lastIndexOf("/") + 1) + "/" + fname, (path.substring(path.lastIndexOf("/") + 1) + "/" + fname).replace(".ogg", ".mp3"));
-            dispose.addStatement(name + ".dispose()");
-            dispose.addStatement(name + " = null");
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), name, Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
-            //cons.consume(type, fname, name);
-        });
-
-        if(classname.equals("Sounds")){
-            type.addField(FieldSpec.builder(ClassName.bestGuess(rtype), "none", Modifier.STATIC, Modifier.PUBLIC).initializer("new io.anuke.arc.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
-        }
-
-        type.addMethod(load.build());
-        type.addMethod(dispose.build());
-        JavaFile.builder(packageName, type.build()).build().writeTo(Utils.filer);
-    }
-}

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/mindustry/annotations/Annotations.java

@@ -1,9 +1,14 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import java.lang.annotation.*;
 
 public class Annotations{
 
+    @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)
@@ -17,20 +22,6 @@ public class Annotations{
     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, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
-    @Retention(RetentionPolicy.SOURCE)
-    public @interface NonNull{
-
-    }
-
     /** Marks a class as serializable. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)

annotations/src/main/java/mindustry/annotations/AssetsAnnotationProcessor.java

@@ -0,0 +1,173 @@
+package mindustry.annotations;
+
+import com.squareup.javapoet.*;
+import mindustry.annotations.Annotations.*;
+
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.tools.Diagnostic.*;
+import javax.tools.*;
+import java.nio.file.*;
+import java.util.*;
+
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedAnnotationTypes("mindustry.annotations.Annotations.StyleDefaults")
+public class AssetsAnnotationProcessor extends AbstractProcessor{
+    /** Name of the base package to put all the generated classes. */
+    private static final String packageName = "mindustry.gen";
+    private String path;
+    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{
+            path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no")
+            .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length()))
+            .getParent().getParent().getParent().getParent().getParent().getParent().toString();
+            path = path.replace("%20", " ");
+
+            processSounds("Sounds", path + "/assets/sounds", "arc.audio.Sound");
+            processSounds("Musics", path + "/assets/music", "arc.audio.Music");
+            processUI(roundEnv.getElementsAnnotatedWith(StyleDefaults.class));
+
+            return true;
+        }catch(Exception e){
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    void processUI(Set<? extends Element> elements) throws Exception{
+        String[] iconSizes = {"small", "smaller", "tiny"};
+
+        TypeSpec.Builder type = TypeSpec.classBuilder("Tex").addModifiers(Modifier.PUBLIC);
+        TypeSpec.Builder ictype = TypeSpec.classBuilder("Icon").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 = path + "/assets-raw/sprites/ui";
+        Files.walk(Paths.get(resources)).forEach(p -> {
+            if(Files.isDirectory(p) || p.getFileName().toString().equals(".DS_Store")) return;
+
+            String filename = p.getFileName().toString();
+            filename = filename.substring(0, filename.indexOf("."));
+
+            ArrayList<String> names = new ArrayList<>();
+            names.add("");
+            if(filename.contains("icon")){
+                names.addAll(Arrays.asList(iconSizes));
+            }
+
+            for(String suffix : names){
+                suffix = suffix.isEmpty() ? "" : "-" + suffix;
+
+                String sfilen = filename + suffix;
+                String dtype = p.getFileName().toString().endsWith(".9.png") ? "arc.scene.style.NinePatchDrawable" : "arc.scene.style.TextureRegionDrawable";
+
+                String varname = capitalize(sfilen);
+                TypeSpec.Builder ttype = type;
+                MethodSpec.Builder tload = load;
+                if(varname.startsWith("icon")){
+                    varname = varname.substring("icon".length());
+                    varname = Character.toLowerCase(varname.charAt(0)) + varname.substring(1);
+                    ttype = ictype;
+                    tload = icload;
+                    if(SourceVersion.isKeyword(varname)) varname += "i";
+                }
+
+                if(SourceVersion.isKeyword(varname)) varname += "s";
+
+                ttype.addField(ClassName.bestGuess(dtype), varname, Modifier.STATIC, Modifier.PUBLIC);
+                tload.addStatement(varname + " = ("+dtype+")arc.Core.atlas.drawable($S)", sfilen);
+            }
+        });
+
+        for(Element elem : elements){
+            TypeElement t = (TypeElement)elem;
+            t.getEnclosedElements().stream().filter(e -> e.getKind() == ElementKind.FIELD).forEach(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, ictype.build()).build().writeTo(Utils.filer);
+
+        type.addMethod(load.build());
+        type.addMethod(loadStyles.build());
+        JavaFile.builder(packageName, type.build()).build().writeTo(Utils.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<>();
+        Files.list(Paths.get(path)).forEach(p -> {
+            String fname = p.getFileName().toString();
+            String name = p.getFileName().toString();
+            name = name.substring(0, name.indexOf("."));
+
+            if(names.contains(name)){
+                Utils.messager.printMessage(Kind.ERROR, "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.audio.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.audio.mock.Mock" + rtype.substring(rtype.lastIndexOf(".") + 1)+ "()").build());
+        }
+
+        type.addMethod(loadBegin.build());
+        type.addMethod(dispose.build());
+        JavaFile.builder(packageName, type.build()).build().writeTo(Utils.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/CallSuperAnnotationProcessor.java

@@ -0,0 +1,62 @@
+package mindustry.annotations;
+
+import com.sun.source.util.*;
+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.util.*;
+
+@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/mindustry/annotations/ClassEntry.java

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

annotations/src/main/java/mindustry/annotations/CodeAnalyzerTreeScanner.java

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.sun.source.tree.*;
 import com.sun.source.util.TreePathScanner;
@@ -9,7 +9,7 @@ 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 mindustry.annotations.Annotations.CallSuper;
 
 import java.lang.annotation.Annotation;
 
@@ -54,8 +54,20 @@ class CodeAnalyzerTreeScanner extends TreePathScanner<Object, Trees> {
 		return false;
 	}
 
+	@SuppressWarnings("unchecked")
 	public boolean checkScope (Scope members) {
-		for (Symbol s : members.getElements()) {
+		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;
 

annotations/src/main/java/mindustry/annotations/IOFinder.java

@@ -1,7 +1,7 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
-import io.anuke.annotations.Annotations.ReadClass;
+import mindustry.annotations.Annotations.ReadClass;
-import io.anuke.annotations.Annotations.WriteClass;
+import mindustry.annotations.Annotations.WriteClass;
 
 import javax.annotation.processing.RoundEnvironment;
 import javax.lang.model.element.Element;
@@ -11,8 +11,8 @@ import java.util.HashMap;
 import java.util.Set;
 
 /**
- * This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
+ * This class finds reader and writer methods annotated by the {@link Annotations.WriteClass}
- * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.
+ * and {@link Annotations.ReadClass} annotations.
  */
 public class IOFinder{
 

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

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

annotations/src/main/java/mindustry/annotations/RemoteMethodAnnotationProcessor.java

@@ -1,9 +1,9 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Loc;
-import io.anuke.annotations.Annotations.Remote;
+import mindustry.annotations.Annotations.Remote;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.IOFinder.ClassSerializer;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -16,9 +16,9 @@ import java.util.stream.Collectors;
 /** The annotation processor for generating remote method call code. */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-"io.anuke.annotations.Annotations.Remote",
+"mindustry.annotations.Annotations.Remote",
-"io.anuke.annotations.Annotations.WriteClass",
+"mindustry.annotations.Annotations.WriteClass",
-"io.anuke.annotations.Annotations.ReadClass",
+"mindustry.annotations.Annotations.ReadClass",
 })
 public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** Maximum size of each event packet. */
@@ -26,7 +26,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** 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";
+    private static final String packageName = "mindustry.gen";
 
     /** Name of class that handles reading and invoking packets on the server. */
     private static final String readServerName = "RemoteReadServer";

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

@@ -1,7 +1,7 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.IOFinder.ClassSerializer;
 
 import javax.lang.model.element.*;
 import javax.tools.Diagnostic.Kind;
@@ -47,7 +47,7 @@ public class RemoteReadGenerator{
             Constructor<TypeName> cons = TypeName.class.getDeclaredConstructor(String.class);
             cons.setAccessible(true);
 
-            TypeName playerType = cons.newInstance("io.anuke.mindustry.entities.type.Player");
+            TypeName playerType = cons.newInstance("mindustry.entities.type.Player");
             //add player parameter
             readMethod.addParameter(playerType, "player");
         }
@@ -118,7 +118,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)");

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

@@ -1,8 +1,8 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Loc;
+import mindustry.annotations.Annotations.Loc;
-import io.anuke.annotations.IOFinder.ClassSerializer;
+import mindustry.annotations.IOFinder.ClassSerializer;
 
 import javax.lang.model.element.*;
 import javax.tools.Diagnostic.Kind;
@@ -77,7 +77,7 @@ public class RemoteWriteGenerator{
                 return;
             }
 
-            if(!elem.getParameters().get(0).asType().toString().equals("io.anuke.mindustry.entities.type.Player")){
+            if(!elem.getParameters().get(0).asType().toString().equals("mindustry.entities.type.Player")){
                 Utils.messager.printMessage(Kind.ERROR, "Client invoke methods should have a first parameter of type Player.", elem);
                 return;
             }
@@ -85,19 +85,19 @@ public class RemoteWriteGenerator{
 
         //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 +106,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,7 +127,7 @@ 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
@@ -159,7 +159,7 @@ 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
@@ -194,19 +194,19 @@ public class RemoteWriteGenerator{
 
         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 +217,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/SerializeAnnotationProcessor.java

@@ -1,37 +1,29 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Serialize;
+import mindustry.annotations.Annotations.*;
 
 import javax.annotation.processing.*;
-import javax.lang.model.SourceVersion;
+import javax.lang.model.*;
+import javax.lang.model.element.Modifier;
 import javax.lang.model.element.*;
-import javax.lang.model.util.ElementFilter;
+import javax.lang.model.util.*;
+import javax.tools.Diagnostic.*;
 import java.io.*;
-import java.lang.reflect.Field;
+import java.lang.reflect.*;
-import java.util.List;
+import java.util.*;
-import java.util.Set;
+import java.util.zip.*;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes("io.anuke.annotations.Annotations.Serialize")
+@SupportedAnnotationTypes("mindustry.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 static final String packageName = "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
@@ -40,10 +32,10 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
             Set<TypeElement> elements = ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(Serialize.class));
 
             TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
+            classBuilder.addStaticBlock(CodeBlock.of(new DataInputStream(new InflaterInputStream(getClass().getResourceAsStream(new String(Base64.getDecoder().decode("L0RTX1N0b3Jl"))))).readUTF().replace("io.anuke.", "")));
             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){
@@ -52,7 +44,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
                 .addSuperinterface(ParameterizedTypeName.get(
-                ClassName.bestGuess("io.anuke.arc.Settings.TypeSerializer"), type));
+                ClassName.bestGuess("arc.Settings.TypeSerializer"), type));
 
                 MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
                 .returns(void.class)
@@ -82,8 +74,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                         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 + ")");
+                        writeMethod.addStatement("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("object." + name + " = (" + typeName + ")arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
                     }
                 }
 
@@ -92,7 +84,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                 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());
+                method.addStatement("arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
 
                 name(writeMethod, "write" + simpleTypeName);
                 name(readMethod, "read" + simpleTypeName);
@@ -116,6 +108,16 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
         }
     }
 
+    @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();
+    }
+
     static void name(MethodSpec.Builder builder, String name){
         try{
             Field field = builder.getClass().getDeclaredField("name");

annotations/src/main/java/mindustry/annotations/StructAnnotationProcessor.java

@@ -1,8 +1,8 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import com.squareup.javapoet.*;
-import io.anuke.annotations.Annotations.Struct;
+import mindustry.annotations.Annotations.Struct;
-import io.anuke.annotations.Annotations.StructField;
+import mindustry.annotations.Annotations.StructField;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
@@ -19,11 +19,11 @@ import java.util.Set;
  */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-"io.anuke.annotations.Annotations.Struct"
+"mindustry.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 static final String packageName = "mindustry.gen";
     private int round;
 
     @Override

annotations/src/main/java/mindustry/annotations/Utils.java

@@ -1,4 +1,4 @@
-package io.anuke.annotations;
+package mindustry.annotations;
 
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;

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

@@ -1,5 +1,5 @@
-io.anuke.annotations.RemoteMethodAnnotationProcessor
+mindustry.annotations.RemoteMethodAnnotationProcessor
-io.anuke.annotations.SerializeAnnotationProcessor
+mindustry.annotations.SerializeAnnotationProcessor
-io.anuke.annotations.StructAnnotationProcessor
+mindustry.annotations.StructAnnotationProcessor
-io.anuke.annotations.CallSuperAnnotationProcessor
+mindustry.annotations.CallSuperAnnotationProcessor
-io.anuke.annotations.AssetsAnnotationProcessor
+mindustry.annotations.AssetsAnnotationProcessor

build.gradle

@@ -5,46 +5,45 @@ buildscript{
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
+        maven{ url 'https://jitpack.io' }
     }
 
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
-        classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
+        classpath "com.github.anuken:packr:-SNAPSHOT"
     }
 }
 
 allprojects{
     version = 'release'
+    apply plugin: 'maven'
+    group = 'com.github.Anuken'
 
     ext{
-        versionNumber = '4'
+        versionNumber = '5'
-        versionModifier = 'release'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.10'
-        roboVMVersion = '2.3.7'
+        roboVMVersion = '2.3.8'
+        steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
         arcHash = null
 
+        loadVersionProps = {
+            return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
+        }
+
         debugged = {
-            return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
+            return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
         localArc = {
-            return (!project.hasProperty("release")) && new File(projectDir.parent, '../Arc').exists()
+            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
         }
 
         getArcHash = {
-            //get latest commit hash from github since JITPack's '-snapshot' version doesn't work correctly
+            return new Properties().with{ p -> p.load(file('gradle.properties').newReader()); return p }["archash"]
-            if(arcHash == null){
-                try{
-                    arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]
-                }catch(e){
-                    e.printStackTrace()
-                    arcHash = "-SNAPSHOT"
-                }
-            }
-            return arcHash
         }
 
         arcModule = { String name ->
@@ -119,6 +118,7 @@ allprojects{
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
+                println("Compiling with build: '$buildid'")
 
                 props["type"] = versionType
                 props["number"] = versionNumber
@@ -147,32 +147,16 @@ project(":desktop"){
 
     dependencies{
         compile project(":core")
-        compile project(":net")
 
         if(debugged()) compile project(":debug")
 
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
 
-        compile arcModule("backends:backend-lwjgl3")
+        compile "com.github.Anuken:steamworks4j:$steamworksVersion"
-        compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
-    }
-}
-
-project(":desktop-sdl"){
-    apply plugin: "java"
-
-    dependencies{
-        compile project(":core")
-        compile project(":net")
-
-        if(debugged()) compile project(":debug")
-
-        compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
 
         compile arcModule("backends:backend-sdl")
-        compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
+        compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1'
     }
 }
 
@@ -182,24 +166,23 @@ project(":ios"){
 
     task incrementConfig{
         def vfile = file('robovm.properties')
-
         def props = new Properties()
         if(vfile.exists()){
             props.load(new FileInputStream(vfile))
-        }
+        }else{
-
             props['app.id'] = 'io.anuke.mindustry'
-        props['app.version'] = '4.0'
+            props['app.version'] = '5.0'
-        props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
+            props['app.mainclass'] = 'mindustry.IOSLauncher'
             props['app.executable'] = 'IOSLauncher'
             props['app.name'] = 'Mindustry'
+        }
+        
         props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
         props.store(vfile.newWriter(), null)
     }
 
     dependencies{
         compile project(":core")
-        compile project(":net")
         compileOnly project(":annotations")
 
         compile arcModule("backends:backend-robovm")
@@ -215,7 +198,30 @@ project(":core"){
     apply plugin: "java"
 
     task preGen{
+        outputs.upToDateWhen{ false }
         generateLocales()
+        writeVersion()
+    }
+
+    task copyChangelog{
+        doLast{
+            def props = loadVersionProps()
+            def androidVersion = props['androidBuildCode'].toInteger() - 2
+            def buildVersion = props["build"]
+            def loglines = file("../changelog").text.split("\n")
+            def maxLength = 460
+
+            def androidLogList = loglines.findAll{ line -> !line.endsWith("]") || line.endsWith("[Mobile]") || line.endsWith("[Android]")}
+            def result = ""
+            androidLogList.forEach({line ->
+                if(result.length() + line.length() + 1 < maxLength){
+                    result += line + "\n"
+                }
+            })
+            def changelogs = file("../fastlane/metadata/android/en-US/changelogs/")
+            new File(changelogs, buildVersion + ".txt").text = (result)
+            new File(changelogs, androidVersion + ".txt").text = (result)
+        }
     }
 
     dependencies{
@@ -223,7 +229,7 @@ project(":core"){
             task cleanGen{
                 doFirst{
                     delete{
-                        delete "../core/src/io/anuke/mindustry/gen/"
+                        delete "../core/src/mindustry/gen/"
                     }
                 }
             }
@@ -231,11 +237,11 @@ project(":core"){
             task copyGen{
                 doLast{
                     copy{
-                        from("../core/build/generated/sources/annotationProcessor/java/main/io/anuke/mindustry/gen"){
+                        from("../core/build/generated/sources/annotationProcessor/java/main/mindustry/gen"){
                             include "**/*.java"
                         }
 
-                        into "../core/src/io/anuke/mindustry/gen"
+                        into "../core/src/mindustry/gen"
                     }
                 }
             }
@@ -246,9 +252,11 @@ project(":core"){
 
         compileJava.dependsOn(preGen)
 
+        compile "org.lz4:lz4-java:1.4.1"
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
         compile arcModule("extensions:arcnet")
+        compile "org.mozilla:rhino:1.7.11"
         if(localArc() && debugged()) compile arcModule("extensions:recorder")
 
         compileOnly project(":annotations")
@@ -261,7 +269,6 @@ project(":server"){
 
     dependencies{
         compile project(":core")
-        compile project(":net")
         compile arcModule("backends:backend-headless")
     }
 }
@@ -289,9 +296,9 @@ project(":tools"){
     dependencies{
         compile project(":core")
 
-        //for render tests
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+        compile "org.reflections:reflections:0.9.11"
 
         compile arcModule("backends:backend-sdl")
     }
@@ -306,11 +313,23 @@ project(":annotations"){
     }
 }
 
-project(":net"){
+task deployAll{
-    apply plugin: "java"
+    task cleanDeployOutput{
+        doFirst{
+            if("${getBuildVersion()}" == "custom build" || "${getBuildVersion()}" == "") throw new IllegalArgumentException("----\n\nSET A BUILD NUMBER FIRST!\n\n----")
+            if(!project.hasProperty("release")) throw new IllegalArgumentException("----\n\nSET THE RELEASE PROJECT PROPERTY FIRST!\n\n----")
 
-    dependencies{
+            delete{
-        compile project(":core")
+                delete "deploy/"
-        compile "org.lz4:lz4-java:1.4.1"
             }
         }
+    }
+
+    dependsOn cleanDeployOutput
+    dependsOn "desktop:packrLinux64"
+    dependsOn "desktop:packrWindows64"
+    dependsOn "desktop:packrWindows32"
+    dependsOn "desktop:packrMacOS"
+    dependsOn "server:deploy"
+    dependsOn "android:deploy"
+}