Minor lightning visual change / Hid PvP mode on web

add MechMission as same as the UpgradeBlocks type

.gitignore

@@ -2,6 +2,8 @@
 
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
+/core/assets/bundles/output/
+/core/assets/.gifimages/
 /deploy/
 /desktop/packr-out/
 /desktop/packr-export/
@@ -12,13 +14,17 @@
 /core/assets-raw/sprites/generated/
 /annotations/build/
 /kryonet/build/
-/packer/build/
+/tools/build/
+/tests/build/
 /server/build/
+/test_files/
 /annotations/build/
 /android/assets/mindustry-maps/
 /android/assets/mindustry-saves/
 /core/assets/gifexport/
 /core/assets/version.properties
+/core/assets/locales
+/ios/src/io/anuke/mindustry/gen/
 *.gif
 
 version.properties

.travis.yml

@@ -5,16 +5,19 @@ jdk:
 
 android:
   components:
-    - android-26
+    - android-28
 
     # Additional components
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    - addon-google_apis-google-26
+    - addon-google_apis-google-28
+    - build-tools-28.0.3
 
 script:
+    - ./gradlew test
     - ./gradlew desktop:dist
+    - ./gradlew server:dist
 
 after_success:
     - chmod +x upload-build.sh

README.md

@@ -1,11 +1,10 @@
 ![Imgur](https://i.imgur.com/w4N0yhv.png)
 
 [![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry) 
-[![Waffle.io - Columns and their card count](https://badge.waffle.io/Anuken/Mindustry.svg?columns=all)](https://waffle.io/Anuken/Mindustry)
+[![Discord](https://img.shields.io/discord/391020510269669376.svg)](https://discord.gg/mindustry)
 
 A pixelated sandbox tower defense game made using [LibGDX](https://libgdx.badlogicgames.com/). Winner of the [GDL Metal Monstrosity Jam](https://itch.io/jam/gdl---metal-monstrosity-jam).
 
-_[Issue tracker](https://waffle.io/Anuken/Mindustry)_  
 _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_  
 _[Wiki](http://mindustry.wikia.com/wiki/Mindustry_Wiki)_  
 _[Discord](https://discord.gg/r8BkXNd)_  
@@ -32,7 +31,7 @@ _Building:_ `./gradlew desktop:dist`
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
-After building, the output .JAR file should be in the output JAR file should be in `/desktop/build/libs/desktop-release.jar.`
+After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar.`
 
 ### Downloads
 

TRANSLATING.md

@@ -0,0 +1,39 @@
+## 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, 
+head over to the translation bundle folder and check the [list of bundles](https://github.com/Anuken/Mindustry/tree/master/core/assets/bundles) that have already been created. 
+You're looking for a file called "`bundle_`(insert locale code here)`.properties`". If you don't find one, create one manually (more info below).
+
+#### Editing an existing translation
+
+If a translation bundle already exists, that means someone has already started working on a translation. To edit it or translate text, simply click the file and press the edit (pencil) button in the top right. Once you're done editing, press the green "propose file change" button at the bottom, then "create pull request" (twice).
+Once this is done, all you need to do is wait for me to approve your changes.
+
+#### Creating a new translation bundle
+
+If a translation bundle for your language *doesn't* exist, you need to create one yourself.  
+In the folder with all the bundles in it, click the *'create new file'* button, and name it `bundle_(locale code here).properties`. 
+Then, copy-paste the entire contents of the [English translation bundle](https://raw.githubusercontent.com/Anuken/Mindustry/master/core/assets/bundles/bundle.properties) into the file, and translate all the necessary text to your language.
+Once you are done, press the *propose new file* button at the bottom, then 'create pull request' twice.  
+
+#### Useful Information
+
+- When you see text surrounded by square brackets, such as `[RED]`, `[]` or `[accent]`, this indicates a color code. Don't translate it.
+- `{0}` means an argument that will be replaced when the text is displayed. For example, `Wave: {0}` will replace the `{0}` with whatever wave you are in.
+- Empty lines are fine, and it doesn't matter in what order you place the text.
+- `\n` means "new line". If you want to split text into multiple lines, use `\n` to do it.
+
+#### Testing your translation bundle
+
+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.
+
+**And that's it.**  
+
+*(...of course, that's never really it. Bother me on Discord when something inevitably goes wrong.)*

android/AndroidManifest.xml

@@ -20,8 +20,8 @@
         <activity
             android:name="io.anuke.mindustry.AndroidLauncher"
             android:label="@string/app_name"
-            android:screenOrientation="sensor"
+            android:screenOrientation="user"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/build.gradle

@@ -24,7 +24,6 @@ dependencies {
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
-    implementation "com.badlogicgames.gdx:gdx-ai:$aiVersion"
     implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
 }
 
@@ -32,13 +31,13 @@ task deploy(type: Copy){
     dependsOn "assembleRelease"
 
     from "build/outputs/apk/google/release/android-google-release.apk"
-    into "../deploy/";
+    into "../deploy/"
-    rename ("android-google-release.apk", appName + "-android-" + getVersionString() + ".apk");
+    rename ("android-google-release.apk", appName + "-android-" + getVersionString() + ".apk")
 }
 
 android {
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
-    compileSdkVersion 27
+    compileSdkVersion 28
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -101,7 +100,7 @@ android {
                 keyAlias RELEASE_KEY_ALIAS
                 keyPassword RELEASE_KEY_PASSWORD
             }else{
-                println("No keystore info property found!");
+                println("No keystore info property found!")
             }
         }
     }
@@ -116,11 +115,11 @@ android {
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
 task copyAndroidNatives() {
-    file("libs/armeabi/").mkdirs();
+    file("libs/armeabi/").mkdirs()
-    file("libs/armeabi-v7a/").mkdirs();
+    file("libs/armeabi-v7a/").mkdirs()
-    file("libs/arm64-v8a/").mkdirs();
+    file("libs/arm64-v8a/").mkdirs()
-    file("libs/x86_64/").mkdirs();
+    file("libs/x86_64/").mkdirs()
-    file("libs/x86/").mkdirs();
+    file("libs/x86/").mkdirs()
 
     configurations.natives.files.each { jar ->
         def outputDir = null
@@ -138,6 +137,7 @@ task copyAndroidNatives() {
         }
     }
 }
+
 task run(type: Exec) {
     def path
     def localProperties = project.file("../local.properties")
@@ -159,47 +159,18 @@ task run(type: Exec) {
     def adb = path + "/platform-tools/adb"
     commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher'
 }
-// sets up the Android Eclipse project, using the old Ant based build.
-eclipse {
-    // need to specify Java source sets explicitly, SpringSource Gradle Eclipse plugin
-    // ignores any nodes added in classpath.file.withXml
-    sourceSets {
-        main {
-            java.srcDirs "src", 'gen'
-        }
-    }
 
-    jdt {
-        sourceCompatibility = 1.7
-        targetCompatibility = 1.7
-    }
-
-    classpath {
-        plusConfigurations += [project.configurations.compile]
-        containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'
-    }
-
-    project {
-        name = appName + "-android"
-        natures 'com.android.ide.eclipse.adt.AndroidNature'
-        buildCommands.clear();
-        buildCommand "com.android.ide.eclipse.adt.ResourceManagerBuilder"
-        buildCommand "com.android.ide.eclipse.adt.PreCompilerBuilder"
-        buildCommand "org.eclipse.jdt.core.javabuilder"
-        buildCommand "com.android.ide.eclipse.adt.ApkBuilder"
-    }
-}
 // sets up the Android Idea project, using the old Ant based build.
 idea {
     module {
-        sourceDirs += file("src");
+        sourceDirs += file("src")
         scopes = [COMPILE: [plus: [project.configurations.compile]]]
 
         iml {
             withXml {
                 def node = it.asNode()
-                def builder = NodeBuilder.newInstance();
+                def builder = NodeBuilder.newInstance()
-                builder.current = node;
+                builder.current = node
                 builder.component(name: "FacetManager") {
                     facet(type: "android", name: "Android") {
                         configuration {

android/res/layout/gdxdialogs_inputtext.xml

@@ -12,7 +12,6 @@
         android:layout_height="wrap_content"
         android:inputType="text"
         android:maxLines="1"
-        android:maxLength="15"
          >
  
         <requestFocus />

android/res/values-ko/strings.xml

@@ -0,0 +1,15 @@
+<?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

@@ -0,0 +1,15 @@
+<?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/src/io/anuke/mindustry/AndroidLauncher.java

@@ -12,7 +12,6 @@ import android.provider.Settings.Secure;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.utils.Base64Coder;
@@ -25,8 +24,8 @@ import io.anuke.kryonet.KryoClient;
 import io.anuke.kryonet.KryoServer;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
+import io.anuke.mindustry.game.Saves.SaveSlot;
 import io.anuke.mindustry.io.SaveIO;
-import io.anuke.mindustry.io.Saves.SaveSlot;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.ui.dialogs.FileChooser;
 import io.anuke.ucore.function.Consumer;
@@ -48,27 +47,19 @@ import java.util.Locale;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class AndroidLauncher extends AndroidApplication{
+public class AndroidLauncher extends PatchedAndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
-
     boolean doubleScaleTablets = true;
     FileChooser chooser;
 
     @Override
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
-
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
-
         Platform.instance = new Platform(){
             DateFormat format = SimpleDateFormat.getDateTimeInstance();
 
-			@Override
-			public boolean hasDiscord() {
-				return isPackageInstalled("com.discord");
-			}
-
             @Override
             public String format(Date date){
                 return format.format(date);
@@ -90,78 +81,64 @@ public class AndroidLauncher extends AndroidApplication{
             }
 
             @Override
-			public void openDonations() {
+            public void openDonations(){
                 showDonations();
             }
 
             @Override
-			public ThreadProvider getThreadProvider() {
+            public ThreadProvider getThreadProvider(){
                 return new DefaultThreadImpl();
             }
 
             @Override
-			public boolean isDebug() {
+            public String getUUID(){
-				return false;
+                try{
-			}
-
-			@Override
-			public String getUUID() {
-				try {
                     String s = Secure.getString(getContext().getContentResolver(),
                     Secure.ANDROID_ID);
-
                     int len = s.length();
                     byte[] data = new byte[len / 2];
-					for (int i = 0; i < len; i += 2) {
+                    for(int i = 0; i < len; i += 2){
                         data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
                         + Character.digit(s.charAt(i + 1), 16));
                     }
-
                     String result = new String(Base64Coder.encode(data));
-
                     if(result.equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID.");
-
                     return result;
-				}catch (Exception e){
+                }catch(Exception e){
                     return super.getUUID();
                 }
             }
 
             @Override
             public void shareFile(FileHandle file){
-
             }
 
             @Override
-			public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype) {
+            public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype){
                 chooser = new FileChooser(text, file -> file.extension().equalsIgnoreCase(filetype), open, cons);
-
                 if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                 checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
                     chooser.show();
                     chooser = null;
-				}else {
+                }else{
                     ArrayList<String> perms = new ArrayList<>();
-
+                    if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-					if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                         perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
                     }
-
+                    if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
-					if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                         perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
                     }
-
                     requestPermissions(perms.toArray(new String[perms.size()]), PERMISSION_REQUEST_CODE);
                 }
             }
 
             @Override
-			public void beginForceLandscape() {
+            public void beginForceLandscape(){
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
             }
 
             @Override
-			public void endForceLandscape() {
+            public void endForceLandscape(){
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
             }
 
@@ -170,37 +147,30 @@ public class AndroidLauncher extends AndroidApplication{
                 return true;
             }
         };
-
+        try{
-		try {
             ProviderInstaller.installIfNeeded(this);
-		} catch (GooglePlayServicesRepairableException e) {
+        }catch(GooglePlayServicesRepairableException e){
             GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
             apiAvailability.getErrorDialog(this, e.getConnectionStatusCode(), 0).show();
-		} catch (GooglePlayServicesNotAvailableException e) {
+        }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();
             }
@@ -208,73 +178,65 @@ public class AndroidLauncher extends AndroidApplication{
     }
 
     private void checkFiles(Intent intent){
-		try {
+        try{
             Uri uri = intent.getData();
-			if (uri != null) {
+            if(uri != null){
                 File myFile = null;
                 String scheme = uri.getScheme();
-				if (scheme.equals("file")) {
+                if(scheme.equals("file")){
                     String fileName = uri.getEncodedPath();
                     myFile = new File(fileName);
-				} else if (!scheme.equals("content")) {
+                }else if(!scheme.equals("content")){
                     //error
                     return;
                 }
-
                 boolean save = uri.getPath().endsWith(saveExtension);
                 boolean map = uri.getPath().endsWith(mapExtension);
-
                 InputStream inStream;
-				if (myFile != null) inStream = new FileInputStream(myFile);
+                if(myFile != null) inStream = new FileInputStream(myFile);
                 else inStream = getContentResolver().openInputStream(uri);
-
                 Gdx.app.postRunnable(() -> {
-
                     if(save){ //open save
                         System.out.println("Opening save.");
                         FileHandle file = Gdx.files.local("temp-save." + saveExtension);
                         file.write(inStream, false);
-
                         if(SaveIO.isSaveValid(file)){
                             try{
-								SaveSlot slot = control.getSaves().importSave(file);
+                                SaveSlot slot = control.saves.importSave(file);
                                 ui.load.runLoadSave(slot);
-							}catch (IOException e){
+                            }catch(IOException e){
                                 ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false)));
                             }
                         }else{
                             ui.showError("$text.save.import.invalid");
                         }
-
                     }else if(map){ //open map
                         Gdx.app.postRunnable(() -> {
                             System.out.println("Opening map.");
-							if (!ui.editor.isShown()) {
+                            if(!ui.editor.isShown()){
                                 ui.editor.show();
                             }
-
                             ui.editor.beginEditMap(inStream);
                         });
                     }
                 });
             }
-
+        }catch(IOException e){
-		}catch (IOException e){
             e.printStackTrace();
         }
     }
 
-	private boolean isPackageInstalled(String packagename) {
+    private boolean isPackageInstalled(String packagename){
-	    try {
+        try{
             getPackageManager().getPackageInfo(packagename, 0);
             return true;
-	    } catch (Exception e) {
+        }catch(Exception e){
             return false;
         }
     }
 
-	private boolean isTablet(Context context) {
+    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;
     }
 

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

@@ -17,12 +17,12 @@ public class AndroidTextFieldDialog{
     private TextPromptListener listener;
     private boolean isBuild;
 
-	public AndroidTextFieldDialog() {
+    public AndroidTextFieldDialog(){
-		this.activity = (Activity)Gdx.app;
+        this.activity = (Activity) Gdx.app;
         load();
     }
 
-	public AndroidTextFieldDialog show() {
+    public AndroidTextFieldDialog show(){
 
         activity.runOnUiThread(() -> {
             AlertDialog dialog = builder.create();
@@ -36,7 +36,7 @@ public class AndroidTextFieldDialog{
         return this;
     }
 
-	private AndroidTextFieldDialog load() {
+    private AndroidTextFieldDialog load(){
 
         activity.runOnUiThread(() -> {
 
@@ -56,19 +56,20 @@ public class AndroidTextFieldDialog{
         });
 
         // Wait till TextPrompt is built.
-		while (!isBuild) {
+        while(!isBuild){
-			try {
+            try{
                 Thread.sleep(10);
-			} catch (InterruptedException e) { }
+            }catch(InterruptedException ignored){
+            }
         }
 
         return this;
     }
 
-	public int getResourceId(String pVariableName, String pVariableType) {
+    public int getResourceId(String pVariableName, String pVariableType){
-		try {
+        try{
             return activity.getResources().getIdentifier(pVariableName, pVariableType, activity.getPackageName());
-		} catch (Exception e) {
+        }catch(Exception e){
             Gdx.app.error("Android Dialogs", "Cannot find resouce with name: " + pVariableName
                     + " Did you copy the layouts to /res/layouts and /res/layouts_v14 ?");
             e.printStackTrace();
@@ -76,19 +77,19 @@ public class AndroidTextFieldDialog{
         }
     }
 
-	public AndroidTextFieldDialog setText(CharSequence value) {
+    public AndroidTextFieldDialog setText(CharSequence value){
         userInput.append(value);
         return this;
     }
 
-	public AndroidTextFieldDialog setCancelButtonLabel(CharSequence label) {
+    public AndroidTextFieldDialog setCancelButtonLabel(CharSequence label){
         builder.setNegativeButton(label, (dialog, id) -> dialog.cancel());
         return this;
     }
 
-	public AndroidTextFieldDialog setConfirmButtonLabel(CharSequence label) {
+    public AndroidTextFieldDialog setConfirmButtonLabel(CharSequence label){
         builder.setPositiveButton(label, (dialog, id) -> {
-            if (listener != null && !userInput.getText().toString().isEmpty()) {
+            if(listener != null && !userInput.getText().toString().isEmpty()){
                 listener.confirm(userInput.getText().toString());
             }
 
@@ -96,18 +97,18 @@ public class AndroidTextFieldDialog{
         return this;
     }
 
-	public AndroidTextFieldDialog setTextPromptListener(TextPromptListener listener) {
+    public AndroidTextFieldDialog setTextPromptListener(TextPromptListener listener){
         this.listener = listener;
         return this;
     }
 
-	public AndroidTextFieldDialog setInputType(int type) {
+    public AndroidTextFieldDialog setInputType(int type){
         userInput.setInputType(type);
         return this;
     }
 
-	public AndroidTextFieldDialog setMaxLength(int length) {
+    public AndroidTextFieldDialog setMaxLength(int length){
-		userInput.setFilters(new InputFilter[] { new InputFilter.LengthFilter(length) });
+        userInput.setFilters(new InputFilter[]{new InputFilter.LengthFilter(length)});
         return this;
     }
 

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

@@ -8,12 +8,9 @@ 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 {
+public class DonationsActivity extends FragmentActivity{
-    DonationsFragment donationsFragment;
-
     /**
      * Google
      */
@@ -21,13 +18,14 @@ public class DonationsActivity extends FragmentActivity {
     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" };
+            "mindustry.donation.25", "mindustry.donation.50"};
+    DonationsFragment donationsFragment;
 
     /**
      * Called when the activity is first created.
      */
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
 
         setTheme(R.style.GdxTheme);
@@ -35,7 +33,7 @@ public class DonationsActivity extends FragmentActivity {
         setContentView(R.layout.donations_activity);
 
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        if (BuildConfig.DONATIONS_GOOGLE) {
+        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);
@@ -48,30 +46,27 @@ public class DonationsActivity extends FragmentActivity {
 
     public void onStart(){
         super.onStart();
-        Button b = ((Button)findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button));
+        Button b = findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button);
-        b.setOnClickListener(new View.OnClickListener() {
+        b.setOnClickListener(view -> {
-            @Override public void onClick(View 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) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data){
         super.onActivityResult(requestCode, resultCode, data);
-        Button b = ((Button)findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button));
+        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) {
+        if(fragment != null){
             fragment.onActivityResult(requestCode, resultCode, data);
             //TODO donation event, set settings?
         }

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

@@ -0,0 +1,20 @@
+package io.anuke.mindustry;
+
+import com.badlogic.gdx.backends.android.AndroidApplication;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class PatchedAndroidApplication extends AndroidApplication {
+    private final ExecutorService exec = Executors.newSingleThreadExecutor();
+
+    @Override
+    protected void onPause () {
+        if(useImmersiveMode) {
+            exec.submit(() -> {
+                try {Thread.sleep(100);} catch (InterruptedException ignored) {}
+                graphics.onDrawFrame(null);
+            });
+        }
+        super.onPause();
+    }
+}

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

@@ -15,10 +15,17 @@ public class TextFieldDialogListener extends ClickListener{
     private int type;
     private int max;
 
+    //type - 0 is text, 1 is numbers, 2 is decimals
+    public TextFieldDialogListener(TextField field, int type, int max){
+        this.field = field;
+        this.type = type;
+        this.max = max;
+    }
+
     public static void add(TextField field, int type, int max){
         field.addListener(new TextFieldDialogListener(field, type, max));
         field.addListener(new InputListener(){
-			public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
+            public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){
                 Gdx.input.setOnscreenKeyboardVisible(false);
                 return false;
             }
@@ -29,13 +36,6 @@ public class TextFieldDialogListener extends ClickListener{
         add(field, 0, 16);
     }
 
-	//type - 0 is text, 1 is numbers, 2 is decimals
-	public TextFieldDialogListener(TextField field, int type, int max){
-		this.field = field;
-		this.type = type;
-		this.max = max;
-	}
-
     public void clicked(final InputEvent event, float x, float y){
 
         if(Gdx.app.getType() == ApplicationType.Desktop) return;

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

@@ -5,74 +5,38 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
+public class Annotations{
- * Goal: To create a system to send events to the server from the client and vice versa, without creating a new packet type each time.<br>
+
- * These events may optionally also trigger on the caller client/server as well.<br>
+    /** Marks a class as serializable.*/
- */
+    @Target(ElementType.TYPE)
-public class Annotations {
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Serialize{
 
-    /**Marks a method as invokable remotely across a server/client connection.*/
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
-    public @interface Remote {
-        /**Specifies the locations from which this method can be invoked.*/
-        Loc targets() default Loc.server;
-        /**Specifies which methods are generated. Only affects server-to-client methods.*/
-        Variant variants() default Variant.all;
-        /**The local locations where this method is called locally, when invoked.*/
-        Loc called() default Loc.none;
-        /**Whether to forward this packet to all other clients upon recieval. Server only.*/
-        boolean forward() default false;
-        /**Whether the packet for this method is sent with UDP instead of TCP.
-         * UDP is faster, but is prone to packet loss and duplication.*/
-        boolean unreliable() default false;
-        /**The simple class name where this method is placed.*/
-        String in() default "Call";
-        /**Priority of this event.*/
-        PacketPriority priority() default PacketPriority.normal;
     }
 
-    /**Specifies that this method will be used to write classes of the type returned by {@link #value()}.<br>
+    public enum PacketPriority{
-     * This method must return void and have two parameters, the first being of type {@link java.nio.ByteBuffer} and the second
+        /** Gets put in a queue and processed if not connected. */
-     * being the type returned by {@link #value()}.*/
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
-    public @interface WriteClass {
-        Class<?> value();
-    }
-
-    /**Specifies that this method will be used to read classes of the type returned by {@link #value()}. <br>
-     * This method must return the type returned by {@link #value()},
-     * and have one parameter, being of type {@link java.nio.ByteBuffer}.*/
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
-    public @interface ReadClass {
-        Class<?> value();
-    }
-
-    public enum PacketPriority {
-        /**Gets put in a queue and processed if not connected.*/
         normal,
-        /**Gets handled immediately, regardless of connection status.*/
+        /** Gets handled immediately, regardless of connection status. */
         high,
-        /**Does not get handled unless client is connected.*/
+        /** Does not get handled unless client is connected. */
         low
     }
 
-    /**A set of two booleans, one specifying server and one specifying client.*/
+    /** A set of two booleans, one specifying server and one specifying client. */
-    public enum Loc {
+    public enum Loc{
-        /**Method can only be invoked on the client from the server.*/
+        /** Method can only be invoked on the client from the server. */
         server(true, false),
-        /**Method can only be invoked on the server from the client.*/
+        /** Method can only be invoked on the server from the client. */
         client(false, true),
-        /**Method can be invoked from anywhere*/
+        /** Method can be invoked from anywhere */
         both(true, true),
-        /**Neither server no client.*/
+        /** Neither server nor client. */
         none(false, false);
 
-        /**If true, this method can be invoked ON clients FROM servers.*/
+        /** If true, this method can be invoked ON clients FROM servers. */
         public final boolean isServer;
-        /**If true, this method can be invoked ON servers FROM clients.*/
+        /** If true, this method can be invoked ON servers FROM clients. */
         public final boolean isClient;
 
         Loc(boolean server, boolean client){
@@ -81,12 +45,12 @@ public class Annotations {
         }
     }
 
-    public enum Variant {
+    public enum Variant{
-        /**Method can only be invoked targeting one player.*/
+        /** Method can only be invoked targeting one player. */
         one(true, false),
-        /**Method can only be invoked targeting all players.*/
+        /** Method can only be invoked targeting all players. */
         all(false, true),
-        /**Method targets both one player and all players.*/
+        /** Method targets both one player and all players. */
         both(true, true);
 
         public final boolean isOne, isAll;
@@ -96,4 +60,52 @@ public class Annotations {
             this.isAll = isAll;
         }
     }
+
+    /** Marks a method as invokable remotely across a server/client connection. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Remote{
+        /** Specifies the locations from which this method can be invoked. */
+        Loc targets() default Loc.server;
+
+        /** Specifies which methods are generated. Only affects server-to-client methods. */
+        Variant variants() default Variant.all;
+
+        /** The local locations where this method is called locally, when invoked. */
+        Loc called() default Loc.none;
+
+        /** Whether to forward this packet to all other clients upon recieval. Client only. */
+        boolean forward() default false;
+
+        /**
+         * Whether the packet for this method is sent with UDP instead of TCP.
+         * UDP is faster, but is prone to packet loss and duplication.
+         */
+        boolean unreliable() default false;
+
+        /** Priority of this event. */
+        PacketPriority priority() default PacketPriority.normal;
+    }
+
+    /**
+     * Specifies that this method will be used to write classes of the type returned by {@link #value()}.<br>
+     * This method must return void and have two parameters, the first being of type {@link java.nio.ByteBuffer} and the second
+     * being the type returned by {@link #value()}.
+     */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface WriteClass{
+        Class<?> value();
+    }
+
+    /**
+     * Specifies that this method will be used to read classes of the type returned by {@link #value()}. <br>
+     * This method must return the type returned by {@link #value()},
+     * and have one parameter, being of type {@link java.nio.ByteBuffer}.
+     */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ReadClass{
+        Class<?> value();
+    }
 }

annotations/src/io/anuke/annotations/ClassEntry.java

@@ -2,14 +2,14 @@ package io.anuke.annotations;
 
 import java.util.ArrayList;
 
-/**Represents a class witha list method entries to include in it.*/
+/** Represents a class witha list method entries to include in it. */
-public class ClassEntry {
+public class ClassEntry{
-    /**All methods in this generated class.*/
+    /** All methods in this generated class. */
     public final ArrayList<MethodEntry> methods = new ArrayList<>();
-    /**Simple class name.*/
+    /** Simple class name. */
     public final String name;
 
-    public ClassEntry(String name) {
+    public ClassEntry(String name){
         this.name = name;
     }
 }

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

@@ -10,12 +10,16 @@ import javax.tools.Diagnostic.Kind;
 import java.util.HashMap;
 import java.util.Set;
 
-/**This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
+/**
- * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.*/
+ * This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
-public class IOFinder {
+ * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.
+ */
+public class IOFinder{
 
-    /**Finds all class serializers for all types and returns them. Logs errors when necessary.
+    /**
-     * Maps fully qualified class names to their serializers.*/
+     * Finds all class serializers for all types and returns them. Logs errors when necessary.
+     * Maps fully qualified class names to their serializers.
+     */
     public HashMap<String, ClassSerializer> findSerializers(RoundEnvironment env){
         HashMap<String, ClassSerializer> result = new HashMap<>();
 
@@ -51,33 +55,33 @@ public class IOFinder {
     }
 
     private String getValue(WriteClass write){
-        try {
+        try{
             Class<?> type = write.value();
             return type.getName();
-        }catch (MirroredTypeException e){
+        }catch(MirroredTypeException e){
             return e.getTypeMirror().toString();
         }
     }
 
     private String getValue(ReadClass read){
-        try {
+        try{
             Class<?> type = read.value();
             return type.getName();
-        }catch (MirroredTypeException e){
+        }catch(MirroredTypeException e){
             return e.getTypeMirror().toString();
         }
     }
 
-    /**Information about read/write methods for a specific class type.*/
+    /** Information about read/write methods for a specific class type. */
     public static class ClassSerializer{
-        /**Fully qualified method name of the reader.*/
+        /** Fully qualified method name of the reader. */
         public final String readMethod;
-        /**Fully qualified method name of the writer.*/
+        /** Fully qualified method name of the writer. */
         public final String writeMethod;
-        /**Fully qualified class type name.*/
+        /** Fully qualified class type name. */
         public final String classType;
 
-        public ClassSerializer(String readMethod, String writeMethod, String classType) {
+        public ClassSerializer(String readMethod, String writeMethod, String classType){
             this.readMethod = readMethod;
             this.writeMethod = writeMethod;
             this.classType = classType;

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

@@ -6,32 +6,34 @@ import io.anuke.annotations.Annotations.Variant;
 
 import javax.lang.model.element.ExecutableElement;
 
-/**Class that repesents a remote method to be constructed and put into a class.*/
+/** Class that repesents a remote method to be constructed and put into a class. */
-public class MethodEntry {
+public class MethodEntry{
-    /**Simple target class name.*/
+    /** Simple target class name. */
     public final String className;
-    /**Fully qualified target method to call.*/
+    /** Fully qualified target method to call. */
     public final String targetMethod;
-    /**Whether this method can be called on a client/server.*/
+    /** Whether this method can be called on a client/server. */
     public final Loc where;
-    /**Whether an additional 'one' and 'all' method variant is generated. At least one of these must be true.
+    /**
-     * Only applicable to client (server-invoked) methods.*/
+     * Whether an additional 'one' and 'all' method variant is generated. At least one of these must be true.
+     * Only applicable to client (server-invoked) methods.
+     */
     public final Variant target;
-    /**Whether this method is called locally as well as remotely.*/
+    /** Whether this method is called locally as well as remotely. */
     public final Loc local;
-    /**Whether this method is unreliable and uses UDP.*/
+    /** Whether this method is unreliable and uses UDP. */
     public final boolean unreliable;
-    /**Whether to forward this method call to all other clients when a client invokes it. Server only.*/
+    /** Whether to forward this method call to all other clients when a client invokes it. Server only. */
     public final boolean forward;
-    /**Unique method ID.*/
+    /** Unique method ID. */
     public final int id;
-    /**The element method associated with this entry.*/
+    /** The element method associated with this entry. */
     public final ExecutableElement element;
-    /**The assigned packet priority. Only used in clients.*/
+    /** The assigned packet priority. Only used in clients. */
     public final PacketPriority priority;
 
     public MethodEntry(String className, String targetMethod, Loc where, Variant target,
-                       Loc local, boolean unreliable, boolean forward, int id, ExecutableElement element, PacketPriority priority) {
+                       Loc local, boolean unreliable, boolean forward, int id, ExecutableElement element, PacketPriority priority){
         this.className = className;
         this.forward = forward;
         this.targetMethod = targetMethod;
@@ -45,7 +47,7 @@ public class MethodEntry {
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode(){
         return targetMethod.hashCode();
     }
 }

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

@@ -18,25 +18,27 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 
-/**The annotation processor for generating remote method call code.*/
+/** The annotation processor for generating remote method call code. */
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @SupportedAnnotationTypes({
     "io.anuke.annotations.Annotations.Remote",
     "io.anuke.annotations.Annotations.WriteClass",
     "io.anuke.annotations.Annotations.ReadClass",
 })
-public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
+public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
-    /**Maximum size of each event packet.*/
+    /** Maximum size of each event packet. */
     public static final int maxPacketSize = 4096;
-    /**Name of the base package to put all the generated classes.*/
+    /** Name of the base package to put all the generated classes. */
     private static final String packageName = "io.anuke.mindustry.gen";
 
-    /**Name of class that handles reading and invoking packets on the server.*/
+    /** Name of class that handles reading and invoking packets on the server. */
     private static final String readServerName = "RemoteReadServer";
-    /**Name of class that handles reading and invoking packets on the client.*/
+    /** Name of class that handles reading and invoking packets on the client. */
     private static final String readClientName = "RemoteReadClient";
+    /**Simple class name of generated class name.*/
+    private static final String callLocation = "Call";
 
-    /**Processing round number.*/
+    /** Processing round number. */
     private int round;
 
     //class serializers
@@ -51,7 +53,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
     private ArrayList<ClassEntry> classes;
 
     @Override
-    public synchronized void init(ProcessingEnvironment processingEnv) {
+    public synchronized void init(ProcessingEnvironment processingEnv){
         super.init(processingEnv);
         //put all relevant utils into utils class
         Utils.typeUtils = processingEnv.getTypeUtils();
@@ -61,18 +63,17 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
     }
 
     @Override
-    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+    public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv){
         if(round > 1) return false; //only process 2 rounds
 
-        round ++;
+        round++;
 
-        try {
+        try{
 
             //round 1: find all annotations, generate *writers*
-            if(round == 1) {
+            if(round == 1){
                 //get serializers
                 serializers = new IOFinder().findSerializers(roundEnv);
-
                 //last method ID used
                 int lastMethodID = 0;
                 //find all elements with the Remote annotation
@@ -88,29 +89,29 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
                 orderedElements.sort(Comparator.comparing(Object::toString));
 
                 //create methods
-                for (Element element : orderedElements) {
+                for(Element element : orderedElements){
                     Remote annotation = element.getAnnotation(Remote.class);
 
                     //check for static
-                    if (!element.getModifiers().contains(Modifier.STATIC) || !element.getModifiers().contains(Modifier.PUBLIC)) {
+                    if(!element.getModifiers().contains(Modifier.STATIC) || !element.getModifiers().contains(Modifier.PUBLIC)){
                         Utils.messager.printMessage(Kind.ERROR, "All @Remote methods must be public and static: ", element);
                     }
 
                     //can't generate none methods
-                    if (annotation.targets() == Loc.none) {
+                    if(annotation.targets() == Loc.none){
                         Utils.messager.printMessage(Kind.ERROR, "A @Remote method's targets() cannot be equal to 'none':", element);
                     }
 
                     //get and create class entry if needed
-                    if (!classMap.containsKey(annotation.in())) {
+                    if(!classMap.containsKey(callLocation)){
-                        ClassEntry clas = new ClassEntry(annotation.in());
+                        ClassEntry clas = new ClassEntry(callLocation);
-                        classMap.put(annotation.in(), clas);
+                        classMap.put(callLocation, clas);
                         classes.add(clas);
 
                         Utils.messager.printMessage(Kind.NOTE, "Generating class '" + clas.name + "'.");
                     }
 
-                    ClassEntry entry = classMap.get(annotation.in());
+                    ClassEntry entry = classMap.get(callLocation);
 
                     //create and add entry
                     MethodEntry method = new MethodEntry(entry.name, Utils.getMethodName(element), annotation.targets(), annotation.variants(),
@@ -127,7 +128,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
                 writegen.generateFor(classes, packageName);
 
                 return true;
-            }else if(round == 2) { //round 2: generate all *readers*
+            }else if(round == 2){ //round 2: generate all *readers*
                 RemoteReadGenerator readgen = new RemoteReadGenerator(serializers);
 
                 //generate server readers
@@ -147,7 +148,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
                 return true;
             }
 
-        }catch (Exception e){
+        }catch(Exception e){
             e.printStackTrace();
             throw new RuntimeException(e);
         }

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

@@ -14,22 +14,25 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
 
-/**Generates code for reading remote invoke packets on the client and server.*/
+/** Generates code for reading remote invoke packets on the client and server. */
-public class RemoteReadGenerator {
+public class RemoteReadGenerator{
     private final HashMap<String, ClassSerializer> serializers;
 
-    /**Creates a read generator that uses the supplied serializer setup.*/
+    /** Creates a read generator that uses the supplied serializer setup. */
-    public RemoteReadGenerator(HashMap<String, ClassSerializer> serializers) {
+    public RemoteReadGenerator(HashMap<String, ClassSerializer> serializers){
         this.serializers = serializers;
     }
 
-    /**Generates a class for reading remote invoke packets.
+    /**
+     * Generates a class for reading remote invoke packets.
+     *
      * @param entries List of methods to use/
      * @param className Simple target class name.
      * @param packageName Full target package name.
-     * @param needsPlayer Whether this read method requires a reference to the player sender.*/
+     * @param needsPlayer Whether this read method requires a reference to the player sender.
+     */
     public void generateFor(List<MethodEntry> entries, String className, String packageName, boolean needsPlayer)
-            throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IOException {
+            throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IOException{
 
         TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
 
@@ -69,10 +72,10 @@ public class RemoteReadGenerator {
             StringBuilder varResult = new StringBuilder();
 
             //go through each parameter
-            for(int i = 0; i < entry.element.getParameters().size(); i ++){
+            for(int i = 0; i < entry.element.getParameters().size(); i++){
                 VariableElement var = entry.element.getParameters().get(i);
 
-                if(!needsPlayer || i != 0) { //if client, skip first parameter since it's always of type player and doesn't need to be read
+                if(!needsPlayer || i != 0){ //if client, skip first parameter since it's always of type player and doesn't need to be read
                     //full type name of parameter
                     String typeName = var.asType().toString();
                     //name of parameter
@@ -81,17 +84,17 @@ public class RemoteReadGenerator {
                     String capName = typeName.equals("byte") ? "" : Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1);
 
                     //write primitives automatically
-                    if (Utils.isPrimitive(typeName)) {
+                    if(Utils.isPrimitive(typeName)){
-                        if (typeName.equals("boolean")) {
+                        if(typeName.equals("boolean")){
                             readBlock.addStatement("boolean " + varName + " = buffer.get() == 1");
-                        } else {
+                        }else{
                             readBlock.addStatement(typeName + " " + varName + " = buffer.get" + capName + "()");
                         }
-                    } else {
+                    }else{
                         //else, try and find a serializer
                         ClassSerializer ser = serializers.get(typeName);
 
-                        if (ser == null) { //make sure a serializer exists!
+                        if(ser == null){ //make sure a serializer exists!
                             Utils.messager.printMessage(Kind.ERROR, "No @ReadClass method to read class type: '" + typeName + "'", var);
                             return;
                         }
@@ -121,7 +124,7 @@ public class RemoteReadGenerator {
             }
 
             readBlock.nextControlFlow("catch (java.lang.Exception e)");
-            readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to to read remote method '"+entry.element.getSimpleName() +"'!\", e)");
+            readBlock.addStatement("throw new java.lang.RuntimeException(\"Failed to to read remote method '" + entry.element.getSimpleName() + "'!\", e)");
             readBlock.endControlFlow();
         }
 

annotations/src/io/anuke/annotations/RemoteWriteGenerator.java

@@ -14,17 +14,17 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
 
-/**Generates code for writing remote invoke packets on the client and server.*/
+/** Generates code for writing remote invoke packets on the client and server. */
-public class RemoteWriteGenerator {
+public class RemoteWriteGenerator{
     private final HashMap<String, ClassSerializer> serializers;
 
-    /**Creates a write generator that uses the supplied serializer setup.*/
+    /** Creates a write generator that uses the supplied serializer setup. */
-    public RemoteWriteGenerator(HashMap<String, ClassSerializer> serializers) {
+    public RemoteWriteGenerator(HashMap<String, ClassSerializer> serializers){
         this.serializers = serializers;
     }
 
-    /**Generates all classes in this list.*/
+    /** Generates all classes in this list. */
-    public void generateFor(List<ClassEntry> entries, String packageName) throws IOException {
+    public void generateFor(List<ClassEntry> entries, String packageName) throws IOException{
 
         for(ClassEntry entry : entries){
             //create builder
@@ -58,7 +58,7 @@ public class RemoteWriteGenerator {
         }
     }
 
-    /**Creates a specific variant for a method entry.*/
+    /** Creates a specific variant for a method entry. */
     private void writeMethodVariant(TypeSpec.Builder classBuilder, MethodEntry methodEntry, boolean toAll, boolean forwarded){
         ExecutableElement elem = methodEntry.element;
 
@@ -99,7 +99,7 @@ public class RemoteWriteGenerator {
         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.net.Net.active())");
             }
 
             //concatenate parameters
@@ -109,16 +109,16 @@ public class RemoteWriteGenerator {
                 //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]");
-                }else {
+                }else{
                     results.append(var.getSimpleName());
                 }
                 if(index != elem.getParameters().size() - 1) results.append(", ");
-                index ++;
+                index++;
             }
 
             //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();
@@ -126,10 +126,10 @@ public class RemoteWriteGenerator {
         }
 
         //start control flow to check if it's actually client/server so no netcode is called
-        method.beginControlFlow("if("+getCheckString(methodEntry.where)+")");
+        method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")");
 
         //add statement to create packet from pool
-        method.addStatement("$1N packet = $2N.obtain($1N.class)", "io.anuke.mindustry.net.Packets.InvokePacket", "com.badlogic.gdx.utils.Pools");
+        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.ucore.util.Pooling");
         //assign buffer
         method.addStatement("packet.writeBuffer = TEMP_BUFFER");
         //assign priority
@@ -139,7 +139,7 @@ public class RemoteWriteGenerator {
         //rewind buffer
         method.addStatement("TEMP_BUFFER.position(0)");
 
-        for(int i = 0; i < elem.getParameters().size(); i ++){
+        for(int i = 0; i < elem.getParameters().size(); i++){
             //first argument is skipped as it is always the player caller
             if((!methodEntry.where.isServer/* || methodEntry.mode == Loc.both*/) && i == 0){
                 continue;
@@ -164,7 +164,7 @@ public class RemoteWriteGenerator {
                 method.beginControlFlow("if(io.anuke.mindustry.net.Net.server())");
             }
 
-            if(Utils.isPrimitive(typeName)) { //check if it's a primitive, and if so write it
+            if(Utils.isPrimitive(typeName)){ //check if it's a primitive, and if so write it
                 if(typeName.equals("boolean")){ //booleans are special
                     method.addStatement("TEMP_BUFFER.put(" + varName + " ? (byte)1 : 0)");
                 }else{
@@ -181,7 +181,7 @@ public class RemoteWriteGenerator {
                 }
 
                 //add statement for writing it
-                method.addStatement(ser.writeMethod + "(TEMP_BUFFER, " + varName +")");
+                method.addStatement(ser.writeMethod + "(TEMP_BUFFER, " + varName + ")");
             }
 
             if(writePlayerSkipCheck){ //write end check
@@ -197,7 +197,7 @@ 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(";
-            }else {
+            }else{
                 sendString = "sendExcept(exceptSenderID, ";
             }
         }else if(toAll){ //send to all players / to server
@@ -207,8 +207,8 @@ public class RemoteWriteGenerator {
         }
 
         //send the actual packet
-        method.addStatement("io.anuke.mindustry.net.Net." + sendString + "packet, "+
+        method.addStatement("io.anuke.mindustry.net.Net." + sendString + "packet, " +
-                (methodEntry.unreliable ? "io.anuke.mindustry.net.Net.SendMode.udp" : "io.anuke.mindustry.net.Net.SendMode.tcp")+")");
+                (methodEntry.unreliable ? "io.anuke.mindustry.net.Net.SendMode.udp" : "io.anuke.mindustry.net.Net.SendMode.tcp") + ")");
 
 
         //end check for server/client

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

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

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

@@ -7,14 +7,14 @@ import javax.lang.model.element.TypeElement;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
-public class Utils {
+public class Utils{
     public static Types typeUtils;
     public static Elements elementUtils;
     public static Filer filer;
     public static Messager messager;
 
     public static String getMethodName(Element element){
-        return ((TypeElement)element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
+        return ((TypeElement) element.getEnclosingElement()).getQualifiedName().toString() + "." + element.getSimpleName();
     }
 
     public static boolean isPrimitive(String type){

build.gradle

@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
     }
 }
@@ -22,12 +22,12 @@ allprojects {
 
     ext {
         versionNumber = '4.0'
-        versionType = 'alpha'
+        versionModifier = 'alpha'
+        versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        aiVersion = '1.8.1'
+        uCoreVersion = 'd5f892dcf1773b0f6d47d2190d139cc6342ac75f'
-        uCoreVersion = 'e7a37cff68'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
@@ -43,24 +43,34 @@ allprojects {
             return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
         }
 
+        generateLocales = {
+            def output = 'en\n'
+            def bundles = new File(project(':core').projectDir, 'assets/bundles/')
+            bundles.listFiles().each { other ->
+                if(other.name == "bundle.properties") return
+                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
+            }
+            new File(project(':core').projectDir, 'assets/locales').text = output
+        }
+
         writeVersion = {
-            def pfile = new File('core/assets/version.properties')
+            def pfile = new File(project(':core').projectDir, 'assets/version.properties')
             def props = new Properties()
 
             try{
                 pfile.createNewFile()
-            }catch (Exception e){}
+            }catch (Exception ignored){}
 
             if(pfile.exists()) {
 
                 props.load(new FileInputStream(pfile))
 
-                String code = getBuildVersion()
+                String buildid = getBuildVersion()
 
-                props["name"] = appName
+                props["type"] = versionType
-                props["version"] = versionType
+                props["number"] = versionNumber
-                props["code"] = versionNumber
+                props["modifier"] = versionModifier
-                props["build"] = code
+                props["build"] = buildid
 
                 props.store(pfile.newWriter(), "Autogenerated file. Do not modify.")
             }
@@ -82,11 +92,12 @@ project(":desktop") {
     dependencies {
         compile project(":core")
         compile project(":kryonet")
+        if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug")
+
         compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
         compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
-        compile 'com.yuvimasory:orange-extensions:1.3.0'
     }
 }
 
@@ -94,7 +105,6 @@ project(":html") {
     apply plugin: "gwt"
     apply plugin: "war"
 
-
     dependencies {
         compile project(":core")
         compileOnly project(":annotations")
@@ -102,24 +112,34 @@ project(":html") {
         compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
         compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
-        compile "com.badlogicgames.gdx:gdx-ai:$aiVersion:sources"
 
         compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion:sources"
         compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources"
-        compile "com.sksamuel.gwt:gwt-websockets:1.0.4"
-        compile "com.sksamuel.gwt:gwt-websockets:1.0.4:sources"
     }
-
-    compileJava.options.compilerArgs = [
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor"
-    ]
 }
 
 project(":ios") {
     apply plugin: "java"
     apply plugin: "robovm"
 
+    task copyGen{
+        copy{
+            from ("core/build/classes/java/main/io/anuke/mindustry/gen/"){
+                include "**/*.java"
+            }
+
+            into "ios/src/io/anuke/mindustry/gen"
+        }
+
+        doFirst{
+            delete{
+                delete "ios/src/io/anuke/mindustry/gen/"
+            }
+        }
+    }
+
+    build.dependsOn(copyGen)
 
     dependencies {
         compile project(":core")
@@ -135,16 +155,16 @@ project(":ios") {
 project(":core") {
     apply plugin: "java"
 
+    task finish {
+        generateLocales()
+    }
+
     dependencies {
         compileOnly project(":annotations")
+        build.finalizedBy(finish)
 
-        boolean comp = System.properties["release"] == null || System.properties["release"] == "false"
+        def comp = System.properties["release"] == null || System.properties["release"] == "false"
-
+        if(!comp) println("Note: Compiling release build.")
-        if(!comp){
-            println("NOTICE: Compiling release build.")
-        }else{
-            println("Compiling DEBUG build.")
-        }
 
         if(new File(projectDir.parent, '../uCore').exists() && comp){
             compile project(":uCore")
@@ -161,13 +181,19 @@ project(":core") {
     }
 
     compileJava.options.compilerArgs = [
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor"
+        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor,io.anuke.annotations.SerializeAnnotationProcessor"
     ]
 }
 
 project(":server") {
     apply plugin: "java"
 
+    configurations {
+        if(findProject(":android") != null){
+            compile.exclude module: android
+        }
+    }
+    
     dependencies {
         compileOnly project(":annotations")
 
@@ -178,7 +204,24 @@ project(":server") {
     }
 }
 
-project(":packer") {
+project(":tests"){
+    apply plugin: "java"
+
+    dependencies {
+        testImplementation project(":core")
+        testImplementation('org.junit.jupiter:junit-jupiter-api:5.1.0')
+        testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.1.0')
+        testImplementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+        testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+    }
+
+    test {
+        useJUnitPlatform()
+        workingDir = new File("../core/assets")
+    }
+}
+
+project(":tools") {
     apply plugin: "java"
 
     dependencies {
@@ -199,11 +242,8 @@ project(":kryonet") {
 
     dependencies {
         compile project(":core")
-        compile 'com.github.crykn:kryonet:2.22.1'
+        compile "org.lz4:lz4-java:1.4.1"
-        compile "org.java-websocket:Java-WebSocket:1.3.7"
+        compile 'com.github.Anuken:kryonet:53b10247b1'
+        compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
     }
 }
-
-tasks.eclipse.doLast {
-    delete ".project"
-}