Update bundle_zh_TW.properties (#1097)

* :flag_ua:

* 🇺🇦

* ЇїЇ

* 30.10.2019

* Упс.

* 1

* 06.11.2019

* lol

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

.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="io.anuke.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,12 +4,14 @@ logs/
 /core/assets/bundles/output/
 /core/assets/.gifimages/
 /deploy/
+/out/
 /desktop/packr-out/
 /desktop/packr-export/
 /desktop/mindustry-saves/
 /desktop/mindustry-maps/
 /desktop/gifexport/
 /core/lib/
+/ios/assets/
 /core/assets-raw/sprites/generated/
 /core/assets-raw/sprites_out/
 /annotations/build/
@@ -18,6 +20,11 @@ logs/
 /tools/build/
 /tests/build/
 /server/build/
+changelog
+saves/
+core/assets/saves/
+/core/assets/saves/
+steam_appid.txt
 /test_files/
 /annotations/build/
 /android/assets/mindustry-maps/
@@ -30,7 +37,9 @@ logs/
 ios/robovm.properties
 packr-out/
 config/
+changelog
 *.gif
+/core/assets/saves/
 
 version.properties
 

.travis.yml

@@ -1,21 +1,43 @@
-
 jdk:
 - openjdk8
+dist: trusty
+android:
+  components:
+  - android-29
+  - build-tools-29.0.2
+
 script:
-- "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc"
+- 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
+- provider: releases
   skip_cleanup: true
   draft: false
   api_key:
     secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
   file:
-  - "desktop/build/libs/desktop-release.jar"
+  - desktop/build/libs/Mindustry.jar
-  - "server/build/libs/server-release.jar"
+  - server/build/libs/server-release.jar
   on:
     repo: Anuken/Mindustry
     tags: true
+- provider: script
+  script: bash update_wiki.sh
+  on:
+    repo: Anuken/Mindustry
+    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: 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,62 @@
+# 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 `io.anuke.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 `io.anuke.arc.collection`. 
+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`).
+
+
+#### 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 @@
-![Imgur](https://i.imgur.com/w4N0yhv.png)
+![Logo](core/assets/sprites/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://i.imgur.com/sk26hTV.png" 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://i.imgur.com/8dF6l81.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

@@ -1,8 +1,5 @@
 ## Translating for Mindustry
 
-**DISCLAIMER:** *Currently, 4.0 is far from done, which means that things such as block names, descriptions, and core text will be changing often. If you begin translating now, you might have to re-do large chunks of the bundle before final release.*
-
-
 To begin, log in to your GitHub account, or if you don't have one yet, create it [here](https://github.com/).
 
 Consult [this list](https://www.science.co.il/language/Locale-codes.php) to find the locale code for your language. Once you've found it, 
@@ -34,6 +31,10 @@ There are two ways to test the translation bundle:
 1) Assuming you have the PC version downloaded, download your bundle file, name it `bundle.properties`, then place it in the same folder as the Mindustry desktop executable and run it. *You should get a popup message in-game confirming that you have loaded an external translation.*
 2) For advanced users: simply download your fork of mindustry and compile/run the game.
 
+#### Translating for stores (Steam, Google Play)
+
+If you would like to translate the descriptions for Google Play or Steam, see the [Fastlane Metadata folder](https://github.com/Anuken/Mindustry/tree/master/fastlane/metadata) and submit a pull request for files there. On Google Play, you would create or edit the folder with the correct local code; for Steam, I have to update the translations manually, so just name the folder with the language name, and include the same files as the English folder does.
+
 **And that's it.**  
 
 *(...of course, that's never really it. Bother me on Discord when something inevitably goes wrong.)*

android/AndroidManifest.xml

@@ -2,11 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="io.anuke.mindustry">
 
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
-    <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
             android:resizeableActivity="false"
@@ -14,10 +13,11 @@
             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" />
+        <meta-data android:name="android.max_aspect" android:value="2.1"/>
         <activity
                 android:name="io.anuke.mindustry.AndroidLauncher"
                 android:label="@string/app_name"
@@ -25,46 +25,19 @@
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
 
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER" />
+                <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:mimeType="application/octet-stream" />
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.mmap" />
+                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:mimeType="application/octet-stream"/>
-                <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msav" />
-            </intent-filter>
-
-
-            <intent-filter android:icon="@mipmap/ic_launcher"
-                           android:label="Mindustry Map"
-                           android:priority="1">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="file"   android:host="*" android:pathPattern=".*\\.mmap"  android:mimeType="*/*"  />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="file"  android:host="*" android:pathPattern=".*\\.msav" android:mimeType="*/*"  />
             </intent-filter>
         </activity>
 
-
-        <activity android:name=".DonationsActivity"
-            android:theme="@style/GdxTheme" />
-
     </application>
 
 </manifest>

android/build.gradle

@@ -1,35 +1,31 @@
-buildscript {
+buildscript{
-    repositories {
+    repositories{
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
     }
 
-    dependencies {
+    dependencies{
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
 apply plugin: "com.android.application"
 
-configurations { natives }
+configurations{ natives }
 
-repositories {
+repositories{
     mavenCentral()
     jcenter()
-    maven {
+    maven{
         url "https://maven.google.com"
     }
 }
 
-dependencies {
+dependencies{
     implementation project(":core")
-    implementation project(":net")
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'org.sufficientlysecure:donations:2.5'
-    implementation 'com.google.android.gms:play-services-auth:16.0.1'
 
     implementation arcModule("backends:backend-android")
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
@@ -47,16 +43,16 @@ dependencies {
 task deploy(type: Copy){
     dependsOn "assembleRelease"
 
-    from "build/outputs/apk/google/release/android-google-release.apk"
+    from "build/outputs/apk/release/android-release.apk"
     into "../deploy/"
-    rename ("android-google-release.apk", appName + "-android-" + getVersionString() + ".apk")
+    rename("android-release.apk", "${generateDeployName('android')}.apk")
 }
 
-android {
+android{
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
-    compileSdkVersion 28
+    compileSdkVersion 29
-    sourceSets {
+    sourceSets{
-        main {
+        main{
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             aidl.srcDirs = ['src']
@@ -68,50 +64,38 @@ android {
 
         androidTest.setRoot('tests')
     }
-    packagingOptions {
+    packagingOptions{
         exclude 'META-INF/robovm/ios/robovm.xml'
     }
 
-    defaultConfig {
+    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 {
+    compileOptions{
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
     flavorDimensions "google"
 
-    productFlavors {
+    signingConfigs{
-        google {
+        release{
-            buildConfigField "boolean", "DONATIONS_GOOGLE", "true"
+            if(project.hasProperty("RELEASE_STORE_FILE")){
-        }
-    }
-
-    signingConfigs {
-        release {
-            if(project.hasProperty("RELEASE_STORE_FILE")) {
                 storeFile file(RELEASE_STORE_FILE)
                 storePassword RELEASE_STORE_PASSWORD
                 keyAlias RELEASE_KEY_ALIAS
@@ -122,31 +106,33 @@ android {
         }
     }
 
+    if(project.hasProperty("RELEASE_STORE_FILE")) {
         buildTypes {
             release {
                 signingConfig signingConfigs.release
             }
         }
+    }
 }
 // called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
-task copyAndroidNatives() {
+task copyAndroidNatives(){
     file("libs/armeabi/").mkdirs()
     file("libs/armeabi-v7a/").mkdirs()
     file("libs/arm64-v8a/").mkdirs()
     file("libs/x86_64/").mkdirs()
     file("libs/x86/").mkdirs()
 
-    configurations.natives.files.each { jar ->
+    configurations.natives.files.each{ jar ->
         def outputDir = null
-        if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
+        if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
-        if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
+        if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
-        if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
+        if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
-        if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
+        if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
-        if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
+        if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
-        if (outputDir != null) {
+        if(outputDir != null){
-            copy {
+            copy{
                 from zipTree(jar)
                 into outputDir
                 include "*.so"
@@ -155,47 +141,24 @@ task copyAndroidNatives() {
     }
 }
 
-task run(type: Exec) {
+task run(type: Exec){
     def path
     def localProperties = project.file("../local.properties")
-    if (localProperties.exists()) {
+    if(localProperties.exists()){
         Properties properties = new Properties()
-        localProperties.withInputStream { instr ->
+        localProperties.withInputStream{ instr ->
             properties.load(instr)
         }
         def sdkDir = properties.getProperty('sdk.dir')
-        if (sdkDir) {
+        if(sdkDir){
             path = sdkDir
-        } else {
+        }else{
             path = "$System.env.ANDROID_HOME"
         }
-    } else {
+    }else{
         path = "$System.env.ANDROID_HOME"
     }
 
     def adb = path + "/platform-tools/adb"
     commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher'
 }
-
-// sets up the Android Idea project, using the old Ant based build.
-idea {
-    module {
-        sourceDirs += file("src")
-        scopes = [COMPILE: [plus: [project.configurations.compile]]]
-
-        iml {
-            withXml {
-                def node = it.asNode()
-                def builder = NodeBuilder.newInstance()
-                builder.current = node
-                builder.component(name: "FacetManager") {
-                    facet(type: "android", name: "Android") {
-                        configuration {
-                            option(name: "UPDATE_PROPERTY_FILES", value: "true")
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

android/project.properties

@@ -9,6 +9,5 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
 # Project target.
 target=android-19

android/res/layout/donations_activity.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:orientation="vertical"
-              android:background="#000">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="top"
-            android:adjustViewBounds="false"
-            android:contentDescription="background"
-            android:cropToPadding="false"
-            android:scaleType="centerCrop"
-            android:src="@drawable/background" />
-
-        <LinearLayout
-            android:id="@+id/donations_activity_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-        </LinearLayout>
-    </RelativeLayout>
-
-</LinearLayout>

android/res/values-ko/strings.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">Mindustry</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 달러</item>
-        <item>2 달러</item>
-        <item>5 달러</item>
-        <item>10 달러</item>
-        <item>15 달러</item>
-        <item>25 달러</item>
-        <item>50 달러</item>
-    </string-array>
-
-</resources>

android/res/values-ru/strings.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">Mindustry</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 Доллар</item>
-        <item>2 Доллара</item>
-        <item>5 Долларов</item>
-        <item>10 Долларов</item>
-        <item>15 Долларов</item>
-        <item>25 Долларов</item>
-        <item>50 Долларов</item>
-    </string-array>
-
-</resources>

android/res/values-uk/strings.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">Mindustry</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 Доллар</item>
-        <item>2 Доллара</item>
-        <item>5 Долларів</item>
-        <item>10 Долларів</item>
-        <item>15 Долларів</item>
-        <item>25 Долларів</item>
-        <item>50 Долларів</item>
-    </string-array>
-
-</resources>

android/res/values/strings.xml

@@ -2,14 +2,5 @@
 <resources>
 
     <string name="app_name">Mindustry</string>
-    <string-array name="donation_google_catalog_values">
-        <item>1 Dollar</item>
-        <item>2 Dollars</item>
-        <item>5 Dollars</item>
-        <item>10 Dollars</item>
-        <item>15 Dollars</item>
-        <item>25 Dollars</item>
-        <item>50 Dollars</item>
-    </string-array>
 
 </resources>

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

@@ -1,41 +1,29 @@
 package io.anuke.mindustry;
 
-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 io.anuke.arc.*;
-import android.util.Log;
+import io.anuke.arc.backends.android.surfaceview.*;
-import com.google.android.gms.common.GoogleApiAvailability;
+import io.anuke.arc.files.*;
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
+import io.anuke.arc.func.Cons;
-import com.google.android.gms.common.GooglePlayServicesRepairableException;
+import io.anuke.arc.scene.ui.layout.*;
-import com.google.android.gms.security.ProviderInstaller;
+import io.anuke.arc.util.*;
-import io.anuke.arc.Core;
+import io.anuke.arc.util.serialization.*;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
+import io.anuke.mindustry.game.Saves.*;
-import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
+import io.anuke.mindustry.io.*;
-import io.anuke.arc.files.FileHandle;
+import io.anuke.mindustry.mod.*;
-import io.anuke.arc.function.Consumer;
+import io.anuke.mindustry.ui.dialogs.*;
-import io.anuke.arc.scene.ui.layout.Unit;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.serialization.Base64Coder;
-import io.anuke.net.KryoClient;
-import io.anuke.net.KryoServer;
-import io.anuke.mindustry.core.Platform;
-import io.anuke.mindustry.game.Saves.SaveSlot;
-import io.anuke.mindustry.io.SaveIO;
-import io.anuke.mindustry.net.Net;
-import io.anuke.mindustry.ui.dialogs.FileChooser;
 
-import java.io.File;
+import java.io.*;
-import java.io.FileInputStream;
+import java.lang.System;
-import java.io.IOException;
+import java.util.*;
-import java.io.InputStream;
-import java.util.ArrayList;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -43,18 +31,20 @@ public class AndroidLauncher extends AndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
     boolean doubleScaleTablets = true;
     FileChooser chooser;
+    Runnable permCallback;
 
     @Override
     protected void onCreate(Bundle savedInstanceState){
         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 openDonations(){
+            public void hide(){
-                showDonations();
+                moveTaskToBack(true);
             }
 
             @Override
@@ -64,7 +54,7 @@ public class AndroidLauncher extends AndroidApplication{
                     int len = s.length();
                     byte[] data = new byte[len / 2];
                     for(int i = 0; i < len; i += 2){
-                        data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                        data[i / 2] = (byte)((Character.digit(s.charAt(i), 16) << 4)
                         + Character.digit(s.charAt(i + 1), 16));
                     }
                     String result = new String(Base64Coder.encode(data));
@@ -80,13 +70,48 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-            public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype){
+            public void showFileChooser(boolean open, String extension, Cons<FileHandle> cons){
-                chooser = new FileChooser(text, file -> file.extension().equalsIgnoreCase(filetype), open, cons);
+                if(VERSION.SDK_INT >= VERSION_CODES.Q){
-                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
+                    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 FileHandle(uri.getPath()){
+                                @Override
+                                public InputStream read(){
+                                    try{
+                                        return getContentResolver().openInputStream(uri);
+                                    }catch(IOException e){
+                                        throw new ArcRuntimeException(e);
+                                    }
+                                }
+
+                                @Override
+                                public OutputStream write(boolean append){
+                                    try{
+                                        return getContentResolver().openOutputStream(uri);
+                                    }catch(IOException e){
+                                        throw new ArcRuntimeException(e);
+                                    }
+                                }
+                            })));
+                        }
+                    });
+                }else if(VERSION.SDK_INT >= VERSION_CODES.M && !(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
-                    chooser.show();
+                    chooser = new FileChooser(open ? "$open" : "$save", file -> file.extension().equalsIgnoreCase(extension), open, file -> {
-                    chooser = null;
+                        if(!open){
+                            cons.get(file.parent().child(file.nameWithoutExtension() + "." + extension));
                         }else{
+                            cons.get(file);
+                        }
+                    });
+
                     ArrayList<String> perms = new ArrayList<>();
                     if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
                         perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
@@ -94,7 +119,9 @@ public class AndroidLauncher extends AndroidApplication{
                     if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
                         perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
                     }
-                    requestPermissions(perms.toArray(new String[perms.size()]), PERMISSION_REQUEST_CODE);
+                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
+                }else{
+                    super.showFileChooser(open, extension, cons);
                 }
             }
 
@@ -105,41 +132,30 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public void endForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
             }
 
-            @Override
+        }, new AndroidApplicationConfiguration(){{
-            public boolean canDonate(){
+            useImmersiveMode = true;
-                return true;
+            depth = 0;
-            }
+            hideStatusBar = true;
-        };
+            errorHandler = ModCrashHandler::handle;
-
+        }});
-        try{
-            ProviderInstaller.installIfNeeded(this);
-        }catch(GooglePlayServicesRepairableException e){
-            GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
-            apiAvailability.getErrorDialog(this, e.getConnectionStatusCode(), 0).show();
-        }catch(GooglePlayServicesNotAvailableException e){
-            Log.e("SecurityException", "Google Play Services not available.");
-        }
-        if(doubleScaleTablets && isTablet(this.getContext())){
-            Unit.dp.addition = 0.5f;
-        }
-        config.hideStatusBar = true;
-        Net.setClientProvider(new KryoClient());
-        Net.setServerProvider(new KryoServer());
-        initialize(new Mindustry(), config);
         checkFiles(getIntent());
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults){
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults){
         if(requestCode == PERMISSION_REQUEST_CODE){
             for(int i : grantResults){
                 if(i != PackageManager.PERMISSION_GRANTED) return;
             }
             if(chooser != null){
-                chooser.show();
+                Core.app.post(chooser::show);
+            }
+            if(permCallback != null){
+                Core.app.post(permCallback);
+                permCallback = null;
             }
         }
     }
@@ -162,7 +178,7 @@ public class AndroidLauncher extends AndroidApplication{
                 InputStream inStream;
                 if(myFile != null) inStream = new FileInputStream(myFile);
                 else inStream = getContentResolver().openInputStream(uri);
-                Core.app.post(() -> {
+                Core.app.post(() -> Core.app.post(() -> {
                     if(save){ //open save
                         System.out.println("Opening save.");
                         FileHandle file = Core.files.local("temp-save." + saveExtension);
@@ -172,10 +188,10 @@ public class AndroidLauncher extends AndroidApplication{
                                 SaveSlot slot = control.saves.importSave(file);
                                 ui.load.runLoadSave(slot);
                             }catch(IOException e){
-                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false)));
+                                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);
@@ -188,29 +204,15 @@ public class AndroidLauncher extends AndroidApplication{
                             ui.editor.beginEditMap(file);
                         });
                     }
-                });
+                }));
             }
         }catch(IOException e){
             e.printStackTrace();
         }
     }
 
-    private boolean isPackageInstalled(String packagename){
-        try{
-            getPackageManager().getPackageInfo(packagename, 0);
-            return true;
-        }catch(Exception e){
-            return false;
-        }
-    }
-
     private boolean isTablet(Context context){
-        TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        TelephonyManager manager = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
-        return manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE;
+        return manager != null && manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE;
-    }
-
-    private void showDonations(){
-        Intent intent = new Intent(this, DonationsActivity.class);
-        startActivity(intent);
     }
 }

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

@@ -1,73 +0,0 @@
-package io.anuke.mindustry;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.view.View;
-import android.widget.Button;
-import org.sufficientlysecure.donations.DonationsFragment;
-
-public class DonationsActivity extends FragmentActivity{
-    /**
-     * Google
-     */
-    private static final String GOOGLE_PUBKEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzG93KhpfBPKTo2jF0yxbWkkmMKwsPNM4SsMj1aDq7vv6n3R+mqJVfprOJxFfJh7JchXTflLIgiaKXFAiU70gJbMTniEWnEaFSxAeF09a7U0RjOwN+7rFwjCG91c2CpYxPanBTQP4zasc1ODPVzq4q6/4ByjhenN71V4WmR08NFIAodcfFPrOkDPil7i8y7cgcd1Ky53U0TS+LLYJttAK3XdTK4s7VE3I5IKoeNa4uwCmIM59R67q2k3cXjLk/nP6MP+y++EzHN/PTiR1sVg4dMP8K31RPw/1QNLPQwJz6Wc872oWwb7xo5gkoXbDc5WPPydsi8F3SyKNaYwzN6CDFQIDAQAB";
-    private static final String[] GOOGLE_CATALOG = new String[]{
-            "mindustry.donation.1", "mindustry.donation.2", "mindustry.donation.5",
-            "mindustry.donation.10", "mindustry.donation.15",
-            "mindustry.donation.25", "mindustry.donation.50"};
-    DonationsFragment donationsFragment;
-
-    /**
-     * Called when the activity is first created.
-     */
-    @Override
-    public void onCreate(Bundle savedInstanceState){
-        super.onCreate(savedInstanceState);
-
-        setTheme(R.style.GdxTheme);
-
-        setContentView(R.layout.donations_activity);
-
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        if(BuildConfig.DONATIONS_GOOGLE){
-            donationsFragment = DonationsFragment.newInstance(BuildConfig.DEBUG, true, GOOGLE_PUBKEY, GOOGLE_CATALOG,
-                    getResources().getStringArray(R.array.donation_google_catalog_values), false, null, null,
-                    null, false, null, null, false, null);
-        }
-
-
-        ft.replace(R.id.donations_activity_container, donationsFragment, "donationsFragment");
-        ft.commit();
-    }
-
-    public void onStart(){
-        super.onStart();
-        Button b = findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button);
-        b.setOnClickListener(view -> {
-            donationsFragment.donateGoogleOnClick(donationsFragment.getView());
-            b.setEnabled(false);
-        });
-    }
-
-
-    /**
-     * Needed for Google Play In-app Billing. It uses startIntentSenderForResult(). The result is not propagated to
-     * the Fragment like in startActivityForResult(). Thus we need to propagate manually to our Fragment.
-     */
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data){
-        super.onActivityResult(requestCode, resultCode, data);
-        Button b = findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button);
-        b.setEnabled(true);
-
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment");
-        if(fragment != null){
-            fragment.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-}

annotations/build.gradle

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

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

@@ -1,31 +1,46 @@
 package io.anuke.annotations;
 
-import java.lang.annotation.ElementType;
+import java.lang.annotation.*;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 public class Annotations{
 
-    /** Marks a class as serializable.*/
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface StyleDefaults {
+    }
+
+    /** Indicates that a method should always call its super version. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface CallSuper{
+
+    }
+
+    /** Annotation that allows overriding CallSuper annotation. To be used on method that overrides method with CallSuper annotation from parent class.*/
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface OverrideCallSuper {
+    }
+
+    /** Marks a class as serializable. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
     public @interface Serialize{
 
     }
 
-    /** Marks a class as a special value type struct. Class name must end in 'Struct'.*/
+    /** Marks a class as a special value type struct. Class name must end in 'Struct'. */
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
     public @interface Struct{
 
     }
 
-    /**Marks a field of a struct. Optional.*/
+    /** Marks a field of a struct. Optional. */
     @Target(ElementType.FIELD)
     @Retention(RetentionPolicy.SOURCE)
     public @interface StructField{
-        /**Size of a struct field in bits. Not valid on booleans or floating point numbers.*/
+        /** Size of a struct field in bits. Not valid on booleans or floating point numbers. */
         int value();
     }
 

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

@@ -0,0 +1,173 @@
+package io.anuke.annotations;
+
+import com.squareup.javapoet.*;
+import io.anuke.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("io.anuke.annotations.Annotations.StyleDefaults")
+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 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", "io.anuke.arc.audio.Sound");
+            processSounds("Musics", path + "/assets/music", "io.anuke.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") ? "io.anuke.arc.scene.style.NinePatchDrawable" : "io.anuke.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+")io.anuke.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("io.anuke.arc.Core.scene.addStyle(" + field.asType().toString() + ".class, io.anuke.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 = "io.anuke.arc.Core.app.getType() != io.anuke.arc.Application.ApplicationType.iOS ? \"" + filepath + "\" : \"" + filepath.replace(".ogg", ".mp3")+"\"";
+
+            loadBegin.addStatement("io.anuke.arc.Core.assets.load("+filename +", "+rtype+".class).loaded = a -> " + name + " = ("+rtype+")a", filepath, filepath.replace(".ogg", ".mp3"));
+
+            dispose.addStatement("io.anuke.arc.Core.assets.unload(" + filename + ")");
+            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());
+        });
+
+        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(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/io/anuke/annotations/CallSuperAnnotationProcessor.java

@@ -0,0 +1,62 @@
+package io.anuke.annotations;
+
+import com.sun.source.util.*;
+import com.sun.tools.javac.tree.*;
+import com.sun.tools.javac.tree.JCTree.*;
+import io.anuke.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/io/anuke/annotations/ClassEntry.java

@@ -1,7 +1,5 @@
 package io.anuke.annotations;
 
-import io.anuke.annotations.MethodEntry;
-
 import java.util.ArrayList;
 
 /** Represents a class witha list method entries to include in it. */

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

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

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

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

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

@@ -1,18 +1,13 @@
 package io.anuke.annotations;
 
-import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.*;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
+import javax.lang.model.element.*;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -21,14 +16,14 @@ import java.util.stream.Collectors;
 /** The annotation processor for generating remote method call code. */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-    "io.anuke.annotations.Annotations.Remote",
+"io.anuke.annotations.Annotations.Remote",
-    "io.anuke.annotations.Annotations.WriteClass",
+"io.anuke.annotations.Annotations.WriteClass",
-    "io.anuke.annotations.Annotations.ReadClass",
+"io.anuke.annotations.Annotations.ReadClass",
 })
 public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** Maximum size of each event packet. */
     public static final int maxPacketSize = 4096;
-    /** Warning on top of each autogenerated file.*/
+    /** 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";
@@ -37,7 +32,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     private static final String readServerName = "RemoteReadServer";
     /** Name of class that handles reading and invoking packets on the client. */
     private static final String readClientName = "RemoteReadClient";
-    /**Simple class name of generated class name.*/
+    /** Simple class name of generated class name. */
     private static final String callLocation = "Call";
 
     /** Processing round number. */
@@ -115,7 +110,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
 
                     //create and add entry
                     MethodEntry method = new MethodEntry(entry.name, Utils.getMethodName(element), annotation.targets(), annotation.variants(),
-                            annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++, (ExecutableElement) element, annotation.priority());
+                    annotation.called(), annotation.unreliable(), annotation.forward(), lastMethodID++, (ExecutableElement)element, annotation.priority());
 
                     entry.methods.add(method);
                     methods.add(method);

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

@@ -3,9 +3,7 @@ package io.anuke.annotations;
 import com.squareup.javapoet.*;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic.Kind;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -25,7 +23,6 @@ public class RemoteReadGenerator{
 
     /**
      * Generates a class for reading remote invoke packets.
-     *
      * @param entries List of methods to use.
      * @param className Simple target class name.
      * @param packageName Full target package name.
@@ -115,13 +112,13 @@ public class RemoteReadGenerator{
 
             //execute the relevant method before the forward
             //if it throws a ValidateException, the method won't be forwarded
-            readBlock.addStatement("$N." + entry.element.getSimpleName() + "(" + varResult.toString() + ")", ((TypeElement) entry.element.getEnclosingElement()).getQualifiedName().toString());
+            readBlock.addStatement("$N." + entry.element.getSimpleName() + "(" + varResult.toString() + ")", ((TypeElement)entry.element.getEnclosingElement()).getQualifiedName().toString());
 
             //call forwarded method, don't forward on the client reader
             if(entry.forward && entry.where.isServer && needsPlayer){
                 //call forwarded method
                 readBlock.addStatement(packageName + "." + entry.className + "." + entry.element.getSimpleName() +
-                        "__forward(player.con.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/io/anuke/annotations/RemoteWriteGenerator.java

@@ -4,10 +4,7 @@ import com.squareup.javapoet.*;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
-import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.*;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic.Kind;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -88,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("io.anuke.mindustry.net.NetConnection"), "playerConnection");
         }
 
         //add sender to ignore
         if(forwarded){
-            method.addParameter(int.class, "exceptSenderID");
+            method.addParameter(ClassName.bestGuess("io.anuke.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) + " || !io.anuke.mindustry.Vars.net.active())");
             }
 
             //concatenate parameters
@@ -109,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.players[0]");
+                    results.append("io.anuke.mindustry.Vars.player");
                 }else{
                     results.append(var.getSimpleName());
                 }
@@ -119,7 +116,7 @@ public class RemoteWriteGenerator{
 
             //add the statement to call it
             method.addStatement("$N." + elem.getSimpleName() + "(" + results.toString() + ")",
-                    ((TypeElement) elem.getEnclosingElement()).getQualifiedName().toString());
+            ((TypeElement)elem.getEnclosingElement()).getQualifiedName().toString());
 
             if(methodEntry.local != Loc.both){
                 method.endControlFlow();
@@ -162,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(io.anuke.mindustry.Vars.net.server())");
             }
 
             if(Utils.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
@@ -197,18 +194,18 @@ 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 = "io.anuke.mindustry.Vars.net.send(";
             }else{
-                sendString = "sendExcept(exceptSenderID, ";
+                sendString = "io.anuke.mindustry.Vars.net.sendExcept(exceptConnection, ";
             }
         }else if(toAll){ //send to all players / to server
-            sendString = "send(";
+            sendString = "io.anuke.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") + ")");
 
 
@@ -220,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 ? "io.anuke.mindustry.Vars.net.server() || io.anuke.mindustry.Vars.net.client()" :
-                loc.isClient ? "io.anuke.mindustry.net.Net.client()" :
+        loc.isClient ? "io.anuke.mindustry.Vars.net.client()" :
-                        loc.isServer ? "io.anuke.mindustry.net.Net.server()" : "false";
+        loc.isServer ? "io.anuke.mindustry.Vars.net.server()" : "false";
     }
 }

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

@@ -5,23 +5,17 @@ import io.anuke.annotations.Annotations.Serialize;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.util.ElementFilter;
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Set;
 
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedAnnotationTypes({
+@SupportedAnnotationTypes("io.anuke.annotations.Annotations.Serialize")
-"io.anuke.annotations.Annotations.Serialize"
-})
 public class SerializeAnnotationProcessor extends AbstractProcessor{
-    /**Target class name.*/
+    /** 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";
@@ -48,10 +42,13 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
             TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
             classBuilder.addAnnotation(AnnotationSpec.builder(SuppressWarnings.class).addMember("value", "\"unchecked\"").build());
             classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
+
+
             MethodSpec.Builder method = MethodSpec.methodBuilder("init").addModifiers(Modifier.PUBLIC, Modifier.STATIC);
 
             for(TypeElement elem : elements){
                 TypeName type = TypeName.get(elem.asType());
+                String simpleTypeName = type.toString().substring(type.toString().lastIndexOf('.') + 1);
 
                 TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
                 .addSuperinterface(ParameterizedTypeName.get(
@@ -74,7 +71,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 List<VariableElement> fields = ElementFilter.fieldsIn(Utils.elementUtils.getAllMembers(elem));
                 for(VariableElement field : fields){
-                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE)) continue;
+                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE))
+                        continue;
 
                     String name = field.getSimpleName().toString();
                     String typeName = Utils.typeUtils.erasure(field.asType()).toString().replace('$', '.');
@@ -84,8 +82,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("io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
-                        readMethod.addStatement("object." + name + " = (" +typeName+")io.anuke.arc.Core.settings.getSerializer(" + typeName+ ".class).read(stream)");
+                        readMethod.addStatement("object." + name + " = (" + typeName + ")io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
                     }
                 }
 
@@ -96,10 +94,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 method.addStatement("io.anuke.arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
 
-                String sname = type.toString().substring(type.toString().lastIndexOf('.') + 1);
+                name(writeMethod, "write" + simpleTypeName);
-
+                name(readMethod, "read" + simpleTypeName);
-                name(writeMethod, "write" + sname);
-                name(readMethod, "read" + sname);
 
                 writeMethod.addModifiers(Modifier.STATIC);
                 readMethod.addModifiers(Modifier.STATIC);

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

@@ -1,28 +1,25 @@
 package io.anuke.annotations;
 
-import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.*;
-import com.squareup.javapoet.MethodSpec;
-import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
 import io.anuke.annotations.Annotations.Struct;
 import io.anuke.annotations.Annotations.StructField;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 import javax.tools.Diagnostic.Kind;
 import java.util.List;
 import java.util.Set;
 
-/**Generates ""value types"" classes that are packed into integer primitives of the most aproppriate size.
+/**
- * It would be nice if Java didn't make crazy hacks like this necessary.*/
+ * Generates ""value types"" classes that are packed into integer primitives of the most aproppriate size.
+ * It would be nice if Java didn't make crazy hacks like this necessary.
+ */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
-    "io.anuke.annotations.Annotations.Struct"
+"io.anuke.annotations.Annotations.Struct"
 })
 public class StructAnnotationProcessor extends AbstractProcessor{
     /** Name of the base package to put all the generated classes. */
@@ -129,7 +126,7 @@ public class StructAnnotationProcessor extends AbstractProcessor{
                             //floats: need conversion
                             setter.addStatement("return ($T)(($L & $L) | (($T)Float.floatToIntBits(value) << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
                         }else{
-                            cons.append(" | (").append("(").append(structType).append(")").append(varName).append(" << ").append(offset).append("L)");
+                            cons.append(" | (((").append(structType).append(")").append(varName).append(" << ").append(offset).append("L)").append(" & ").append(bitString(offset, size, structTotalSize)).append(")");
 
                             //bytes, shorts, chars, ints
                             setter.addStatement("return ($T)(($L & $L) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
@@ -209,7 +206,7 @@ public class StructAnnotationProcessor extends AbstractProcessor{
         throw new IllegalArgumentException("Too many fields, must fit in 64 bits. Curent size: " + size);
     }
 
-    /**returns a type's element size in bits.*/
+    /** returns a type's element size in bits. */
     static int typeSize(TypeKind kind) throws IllegalArgumentException{
         switch(kind){
             case BOOLEAN:

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

@@ -14,7 +14,7 @@ public class Utils{
     public static Messager messager;
 
     public static String getMethodName(Element element){
-        return ((TypeElement) element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
+        return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
     }
 
     public static boolean isPrimitive(String type){

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

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

build.gradle

@@ -5,48 +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.5'
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8'
-        classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
+        classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
-        classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
+        classpath "com.github.anuken:packr:-SNAPSHOT"
     }
 }
 
 allprojects{
-    apply plugin: "idea"
-
     version = 'release'
+    apply plugin: 'maven-publish'
+    group = 'com.github.Anuken'
 
     ext{
-        versionNumber = '4'
+        versionNumber = '5'
-        versionModifier = 'beta'
+        if(!project.hasProperty("versionModifier")) versionModifier = 'release'
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        gdxVersion = '1.9.9'
+        gdxVersion = '1.9.10'
-        roboVMVersion = '2.3.0'
+        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() && System.properties["release"] == null
+            return new File(projectDir.parent, '../Mindustry-Debug').exists() && !project.hasProperty("release") && project.hasProperty("args")
         }
 
         localArc = {
-            return (System.properties["release"] == null || System.properties["release"] == "false") && new File(projectDir.parent, '../Arc').exists()
+            return !project.hasProperty("release") && new File(projectDir.parent, '../Arc').exists()
         }
 
         getArcHash = {
-            //get latest commit hash from gtihub 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 ->
@@ -59,11 +56,36 @@ allprojects{
             }
         }
 
+        generateDeployName = { String platform ->
+            if(platform == "windows"){
+                platform += "64"
+            }
+            platform = platform.capitalize()
+
+            if(platform.endsWith("64") || platform.endsWith("32")){
+                platform = "${platform.substring(0, platform.length() - 2)}-${platform.substring(platform.length() - 2)}bit"
+            }
+
+            return "[${platform}]${getModifierString()}[${getNeatVersionString()}]${appName}"
+        }
+
         getVersionString = {
             String buildVersion = getBuildVersion()
             return "$versionNumber-$versionModifier-$buildVersion"
         }
 
+        getNeatVersionString = {
+            String buildVersion = getBuildVersion()
+            return "v$buildVersion"
+        }
+
+        getModifierString = {
+            if(versionModifier != "release"){
+                return "[${versionModifier.toUpperCase()}]"
+            }
+            return ""
+        }
+
         getBuildVersion = {
             if(!project.hasProperty("buildversion")) return "custom build"
             return project.getProperties()["buildversion"]
@@ -89,12 +111,14 @@ allprojects{
 
             try{
                 pfile.createNewFile()
-            }catch(Exception ignored){}
+            }catch(Exception ignored){
+            }
 
             if(pfile.exists()){
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
+                println("Compiling with build: '$buildid'")
 
                 props["type"] = versionType
                 props["number"] = versionNumber
@@ -112,7 +136,10 @@ allprojects{
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
         maven{ url 'https://jitpack.io' }
+        jcenter()
     }
+
+    tasks.withType(Javadoc).all{ enabled = false }
 }
 
 project(":desktop"){
@@ -120,15 +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.0'
+
+        compile arcModule("backends:backend-sdl")
+        compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.1'
     }
 }
 
@@ -142,20 +170,21 @@ project(":ios"){
         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.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")
 
@@ -169,10 +198,35 @@ project(":ios"){
 project(":core"){
     apply plugin: "java"
 
-    task finish{
+    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{
+        if(System.properties["user.name"] == "anuke"){
             task cleanGen{
                 doFirst{
                     delete{
@@ -184,7 +238,7 @@ project(":core"){
             task copyGen{
                 doLast{
                     copy{
-                from("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
+                        from("../core/build/generated/sources/annotationProcessor/java/main/io/anuke/mindustry/gen"){
                             include "**/*.java"
                         }
 
@@ -193,12 +247,16 @@ project(":core"){
                 }
             }
 
-    dependencies{
             compileJava.dependsOn(cleanGen)
             compileJava.finalizedBy(copyGen)
+        }
 
+        compileJava.dependsOn(preGen)
+
+        compile "org.lz4:lz4-java:1.4.1"
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
+        compile arcModule("extensions:arcnet")
         if(localArc() && debugged()) compile arcModule("extensions:recorder")
 
         compileOnly project(":annotations")
@@ -211,7 +269,6 @@ project(":server"){
 
     dependencies{
         compile project(":core")
-        compile project(":net")
         compile arcModule("backends:backend-headless")
     }
 }
@@ -238,6 +295,11 @@ project(":tools"){
 
     dependencies{
         compile project(":core")
+
+        compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+        compile arcModule("backends:backend-sdl")
     }
 }
 
@@ -246,16 +308,27 @@ project(":annotations"){
 
     dependencies{
         compile 'com.squareup:javapoet:1.11.0'
+        compile files("${System.getProperty('java.home')}/../lib/tools.jar")
     }
 }
 
-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"
-        compile 'com.github.Anuken:kryonet:a64d2280880e80566ca1bdaffa55de43e51cad38'
-        compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
             }
+        }
+    }
+
+    dependsOn cleanDeployOutput
+    dependsOn "desktop:packrLinux64"
+    dependsOn "desktop:packrWindows64"
+    dependsOn "desktop:packrWindows32"
+    dependsOn "desktop:packrMacOS"
+    dependsOn "server:deploy"
+    dependsOn "android:deploy"
 }