Fixed server map find bug

* 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

.gitignore

@@ -1,8 +1,8 @@
-##Packr, build stuff
+logs/
-
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/
+/core/assets/.gifimages/
 /deploy/
 /desktop/packr-out/
 /desktop/packr-export/
@@ -11,17 +11,25 @@
 /desktop/gifexport/
 /core/lib/
 /core/assets-raw/sprites/generated/
+/core/assets-raw/sprites_out/
 /annotations/build/
-/kryonet/build/
+/annotations/out/
-/packer/build/
+/net/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.json
+/core/assets/locales
 /ios/src/io/anuke/mindustry/gen/
+/core/src/io/anuke/mindustry/gen/
+ios/robovm.properties
+packr-out/
+config/
 *.gif
 
 version.properties

.travis.yml

@@ -1,24 +1,21 @@
-language: android
 
 jdk:
 - openjdk8
-
-android:
-  components:
-    - android-27
-
-    # Additional components
-    - extra-google-google_play_services
-    - extra-google-m2repository
-    - extra-android-m2repository
-    - addon-google_apis-google-27
-    - build-tools-27.0.3
-
 script:
-    - ./gradlew desktop:dist
+- "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc"
-
+- "./gradlew test"
-after_success:
+- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
-    - chmod +x upload-build.sh
+- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-    - chmod +x cleanup_builds.sh
-    - ./upload-build.sh
 
+deploy:
+  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"
+  - "server/build/libs/server-release.jar"
+  on:
+    repo: Anuken/Mindustry
+    tags: true

README.md

@@ -1,36 +1,42 @@
 ![Imgur](https://i.imgur.com/w4N0yhv.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)
-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).
+
+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)_ 
-_[Discord](https://discord.gg/r8BkXNd)_  
 
 ### Building
 
-Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/Mindustry/wiki).
+Bleeding-edge live builds are generated automatically for every commit. You can see them [here](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, and run the following commands:
+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:
 
+#### Windows
 
-**_Windows_**
+_Running:_ `gradlew desktop:run`  
+_Building:_ `gradlew desktop:dist`
 
-_Running:_ `gradlew.bat desktop:run`  
+#### Linux/Mac OS
-_Building:_ `gradlew.bat desktop:dist`
-
-
-**_Linux_**
 
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`
 
+#### Server
+
+Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
+
+##### 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.*
+
 ---
 
 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` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds.
 
 ### Downloads
 

TRANSLATING.md

@@ -7,7 +7,7 @@ To begin, log in to your GitHub account, or if you don't have one yet, create it
 
 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`".
+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
 
@@ -19,7 +19,7 @@ Once this is done, all you need to do is wait for me to approve your changes.
 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'.  
+Once you are done, press the *propose new file* button at the bottom, then 'create pull request' twice.  
 
 #### Useful Information
 

android/AndroidManifest.xml

@@ -17,6 +17,7 @@
             android:appCategory="game"
             android:label="@string/app_name"
             android:theme="@style/GdxTheme" android:fullBackupContent="@xml/backup_rules">
+        <meta-data android:name="android.max_aspect" android:value="2.1" />
         <activity
             android:name="io.anuke.mindustry.AndroidLauncher"
             android:label="@string/app_name"

android/build.gradle

@@ -1,3 +1,16 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+        google()
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        jcenter()
+    }
+    
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.2'
+    }
+}
 
 apply plugin: "com.android.application"
 
@@ -13,31 +26,35 @@ repositories {
 
 dependencies {
     implementation project(":core")
-    implementation project(":kryonet")
+    implementation project(":net")
-    implementation 'com.android.support:support-v4:25.3.1'
+    implementation 'com.android.support:support-v4:28.0.0'
     implementation 'org.sufficientlysecure:donations:2.5'
-    implementation 'com.google.android.gms:play-services-auth:11.8.0'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
 
-    implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
+    implementation arcModule("backends:backend-android")
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
-    implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
+    natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
 }
 
 task deploy(type: Copy){
     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'
@@ -74,7 +91,7 @@ android {
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode code
         versionName versionNameResult
     }
@@ -100,7 +117,7 @@ android {
                 keyAlias RELEASE_KEY_ALIAS
                 keyPassword RELEASE_KEY_PASSWORD
             }else{
-                println("No keystore info property found!");
+                println("No keystore info property found!")
             }
         }
     }
@@ -115,11 +132,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
@@ -137,6 +154,7 @@ task copyAndroidNatives() {
         }
     }
 }
+
 task run(type: Exec) {
     def path
     def localProperties = project.file("../local.properties")
@@ -158,47 +176,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/proguard-project.txt

@@ -20,26 +20,10 @@
 #}
 
 -verbose
-
+-verbose
--dontwarn android.support.**
+-ignorewarnings
--dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
+-keep class io.anuke.mindustry.game.Rules
--dontwarn com.badlogic.gdx.utils.GdxBuild
+-keep class io.anuke.mindustry.desktop.DesktopLauncher
--dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild
+-keepclasseswithmembers public class * {
--dontwarn com.badlogic.gdx.jnigen.BuildTarget*
+    public static void main(java.lang.String[]);
--dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild
-
--keep class com.badlogic.gdx.controllers.android.AndroidControllers
-
--keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* {
-   <init>(com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration);
-}
-
--keepclassmembers class com.badlogic.gdx.physics.box2d.World {
-   boolean contactFilter(long, long);
-   void    beginContact(long);
-   void    endContact(long);
-   void    preSolve(long, long);
-   void    postSolve(long, long);
-   boolean reportFixture(long);
-   float   reportRayFixture(long, float, float, float, float, float);
 }

android/res/layout/gdxdialogs_inputtext.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_root"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:padding="10dp" >
-
-    <EditText
-        android:id="@+id/gdxDialogsEditTextInput"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="text"
-        android:maxLines="1"
-        android:maxLength="15"
-         >
- 
-        <requestFocus />
- 
-    </EditText>
- 
-</LinearLayout>

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/res/values-uk/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

@@ -11,43 +11,35 @@ import android.os.Bundle;
 import android.provider.Settings.Secure;
 import android.telephony.TelephonyManager;
 import android.util.Log;
-import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
-import com.badlogic.gdx.files.FileHandle;
-import com.badlogic.gdx.utils.Base64Coder;
 import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
 import com.google.android.gms.common.GooglePlayServicesRepairableException;
 import com.google.android.gms.security.ProviderInstaller;
-import io.anuke.kryonet.DefaultThreadImpl;
+import io.anuke.arc.Core;
-import io.anuke.kryonet.KryoClient;
+import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
-import io.anuke.kryonet.KryoServer;
+import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
+import io.anuke.arc.files.FileHandle;
+import io.anuke.arc.function.Consumer;
+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.core.ThreadHandler.ThreadProvider;
 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 io.anuke.ucore.function.Consumer;
-import io.anuke.ucore.scene.ui.TextField;
-import io.anuke.ucore.scene.ui.layout.Unit;
-import io.anuke.ucore.util.Bundles;
-import io.anuke.ucore.util.Strings;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.Locale;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class AndroidLauncher extends PatchedAndroidApplication{
+public class AndroidLauncher extends AndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
     boolean doubleScaleTablets = true;
     FileChooser chooser;
@@ -57,54 +49,18 @@ public class AndroidLauncher extends PatchedAndroidApplication{
         super.onCreate(savedInstanceState);
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
+        config.depth = 0;
         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);
-            }
-
-            @Override
-            public String format(int number){
-                return NumberFormat.getIntegerInstance().format(number);
-            }
-
-            @Override
-            public void addDialog(TextField field, int length){
-                TextFieldDialogListener.add(field, 0, length);
-            }
-
-            @Override
-            public String getLocaleName(Locale locale){
-                return locale.getDisplayName(locale);
-            }
 
             @Override
             public void openDonations(){
                 showDonations();
             }
 
-            @Override
-            public ThreadProvider getThreadProvider(){
-                return new DefaultThreadImpl();
-            }
-
-            @Override
-            public boolean isDebug(){
-                return false;
-            }
-
             @Override
             public String getUUID(){
                 try{
-                    String s = Secure.getString(getContext().getContentResolver(),
+                    String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID);
-                    Secure.ANDROID_ID);
                     int len = s.length();
                     byte[] data = new byte[len / 2];
                     for(int i = 0; i < len; i += 2){
@@ -144,7 +100,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{
 
             @Override
             public void beginForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
             }
 
             @Override
@@ -157,6 +113,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{
                 return true;
             }
         };
+
         try{
             ProviderInstaller.installIfNeeded(this);
         }catch(GooglePlayServicesRepairableException e){
@@ -205,28 +162,30 @@ public class AndroidLauncher extends PatchedAndroidApplication{
                 InputStream inStream;
                 if(myFile != null) inStream = new FileInputStream(myFile);
                 else inStream = getContentResolver().openInputStream(uri);
-                Gdx.app.postRunnable(() -> {
+                Core.app.post(() -> {
                     if(save){ //open save
                         System.out.println("Opening save.");
-                        FileHandle file = Gdx.files.local("temp-save." + saveExtension);
+                        FileHandle file = Core.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){
-                                ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false)));
+                                ui.showError(Core.bundle.format("save.import.fail", Strings.parseException(e, false)));
                             }
                         }else{
-                            ui.showError("$text.save.import.invalid");
+                            ui.showError("$save.import.invalid");
                         }
                     }else if(map){ //open map
-                        Gdx.app.postRunnable(() -> {
+                        FileHandle file = Core.files.local("temp-map." + mapExtension);
+                        file.write(inStream, false);
+                        Core.app.post(() -> {
                             System.out.println("Opening map.");
                             if(!ui.editor.isShown()){
                                 ui.editor.show();
                             }
-                            ui.editor.beginEditMap(inStream);
+                            ui.editor.beginEditMap(file);
                         });
                     }
                 });

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

@@ -1,119 +0,0 @@
-package io.anuke.mindustry;
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.text.InputFilter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager.LayoutParams;
-import android.widget.EditText;
-import com.badlogic.gdx.Gdx;
-
-public class AndroidTextFieldDialog{
-    private Activity activity;
-    private EditText userInput;
-    private AlertDialog.Builder builder;
-    private TextPromptListener listener;
-    private boolean isBuild;
-
-    public AndroidTextFieldDialog(){
-        this.activity = (Activity) Gdx.app;
-        load();
-    }
-
-    public AndroidTextFieldDialog show(){
-
-        activity.runOnUiThread(() -> {
-            AlertDialog dialog = builder.create();
-
-            dialog.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
-            dialog.show();
-
-        });
-
-        return this;
-    }
-
-    private AndroidTextFieldDialog load(){
-
-        activity.runOnUiThread(() -> {
-
-            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(activity);
-            LayoutInflater li = LayoutInflater.from(activity);
-
-            View promptsView = li.inflate(getResourceId("gdxdialogs_inputtext", "layout"), null);
-
-            alertDialogBuilder.setView(promptsView);
-
-            userInput = promptsView.findViewById(getResourceId("gdxDialogsEditTextInput", "id"));
-
-            alertDialogBuilder.setCancelable(false);
-            builder = alertDialogBuilder;
-
-            isBuild = true;
-        });
-
-        // Wait till TextPrompt is built.
-        while(!isBuild){
-            try{
-                Thread.sleep(10);
-            }catch(InterruptedException e){
-            }
-        }
-
-        return this;
-    }
-
-    public int getResourceId(String pVariableName, String pVariableType){
-        try{
-            return activity.getResources().getIdentifier(pVariableName, pVariableType, activity.getPackageName());
-        }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();
-            return -1;
-        }
-    }
-
-    public AndroidTextFieldDialog setText(CharSequence value){
-        userInput.append(value);
-        return this;
-    }
-
-    public AndroidTextFieldDialog setCancelButtonLabel(CharSequence label){
-        builder.setNegativeButton(label, (dialog, id) -> dialog.cancel());
-        return this;
-    }
-
-    public AndroidTextFieldDialog setConfirmButtonLabel(CharSequence label){
-        builder.setPositiveButton(label, (dialog, id) -> {
-            if(listener != null && !userInput.getText().toString().isEmpty()){
-                listener.confirm(userInput.getText().toString());
-            }
-
-        });
-        return this;
-    }
-
-    public AndroidTextFieldDialog setTextPromptListener(TextPromptListener listener){
-        this.listener = listener;
-        return this;
-    }
-
-    public AndroidTextFieldDialog setInputType(int type){
-        userInput.setInputType(type);
-        return this;
-    }
-
-    public AndroidTextFieldDialog setMaxLength(int length){
-        userInput.setFilters(new InputFilter[]{new InputFilter.LengthFilter(length)});
-        return this;
-    }
-
-    public interface TextPromptListener{
-        void confirm(String text);
-    }
-
-}

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

@@ -46,13 +46,10 @@ 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);
-            }
         });
     }
 
@@ -64,14 +61,13 @@ public class DonationsActivity extends FragmentActivity{
     @Override
     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){
             fragment.onActivityResult(requestCode, resultCode, data);
-            //TODO donation event, set settings?
         }
     }
 }

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

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

@@ -1,67 +0,0 @@
-package io.anuke.mindustry;
-
-
-import android.text.InputType;
-import com.badlogic.gdx.Application.ApplicationType;
-import com.badlogic.gdx.Gdx;
-import io.anuke.ucore.scene.event.ChangeListener;
-import io.anuke.ucore.scene.event.ClickListener;
-import io.anuke.ucore.scene.event.InputEvent;
-import io.anuke.ucore.scene.event.InputListener;
-import io.anuke.ucore.scene.ui.TextField;
-
-public class TextFieldDialogListener extends ClickListener{
-    private TextField field;
-    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){
-                Gdx.input.setOnscreenKeyboardVisible(false);
-                return false;
-            }
-        });
-    }
-
-    public static void add(TextField field){
-        add(field, 0, 16);
-    }
-
-    public void clicked(final InputEvent event, float x, float y){
-
-        if(Gdx.app.getType() == ApplicationType.Desktop) return;
-
-        AndroidTextFieldDialog dialog = new AndroidTextFieldDialog();
-
-        dialog.setTextPromptListener(text -> {
-            field.clearText();
-            field.appendText(text);
-            field.fire(new ChangeListener.ChangeEvent());
-            Gdx.graphics.requestRendering();
-        });
-
-        if(type == 0){
-            dialog.setInputType(InputType.TYPE_CLASS_TEXT);
-        }else if(type == 1){
-            dialog.setInputType(InputType.TYPE_CLASS_NUMBER);
-        }else if(type == 2){
-            dialog.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL);
-        }
-
-        dialog.setConfirmButtonLabel("OK").setText(field.getText());
-        dialog.setCancelButtonLabel("Cancel");
-        dialog.setMaxLength(max);
-        dialog.show();
-        event.cancel();
-
-    }
-}

annotations/build.gradle

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

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

@@ -5,12 +5,30 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * 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>
- */
 public class Annotations{
 
+    /** Marks a class as serializable.*/
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Serialize{
+
+    }
+
+    /** Marks a class as a special value type struct. Class name must end in 'Struct'.*/
+    @Target(ElementType.TYPE)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Struct{
+
+    }
+
+    /**Marks a field of a struct. Optional.*/
+    @Target(ElementType.FIELD)
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface StructField{
+        /**Size of a struct field in bits. Not valid on booleans or floating point numbers.*/
+        int value();
+    }
+
     public enum PacketPriority{
         /** Gets put in a queue and processed if not connected. */
         normal,
@@ -60,7 +78,7 @@ public class Annotations{
 
     /** Marks a method as invokable remotely across a server/client connection. */
     @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
+    @Retention(RetentionPolicy.SOURCE)
     public @interface Remote{
         /** Specifies the locations from which this method can be invoked. */
         Loc targets() default Loc.server;
@@ -90,7 +108,7 @@ public class Annotations{
      * being the type returned by {@link #value()}.
      */
     @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
+    @Retention(RetentionPolicy.SOURCE)
     public @interface WriteClass{
         Class<?> value();
     }
@@ -101,7 +119,7 @@ public class Annotations{
      * and have one parameter, being of type {@link java.nio.ByteBuffer}.
      */
     @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
+    @Retention(RetentionPolicy.SOURCE)
     public @interface ReadClass{
         Class<?> value();
     }

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

@@ -1,5 +1,7 @@
 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/RemoteMethodAnnotationProcessor.java

@@ -28,6 +28,8 @@ import java.util.stream.Collectors;
 public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
     /** Maximum size of each event packet. */
     public static final int maxPacketSize = 4096;
+    /** Warning on top of each autogenerated file.*/
+    public static final String autogenWarning = "Autogenerated file. Do not modify!\n";
     /** Name of the base package to put all the generated classes. */
     private static final String packageName = "io.anuke.mindustry.gen";
 
@@ -74,7 +76,6 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
             if(round == 1){
                 //get serializers
                 serializers = new IOFinder().findSerializers(roundEnv);
-
                 //last method ID used
                 int lastMethodID = 0;
                 //find all elements with the Remote annotation
@@ -108,8 +109,6 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
                         ClassEntry clas = new ClassEntry(callLocation);
                         classMap.put(callLocation, clas);
                         classes.add(clas);
-
-                        Utils.messager.printMessage(Kind.NOTE, "Generating class '" + clas.name + "'.");
                     }
 
                     ClassEntry entry = classMap.get(callLocation);
@@ -139,6 +138,7 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor{
 
                 //create class for storing unique method hash
                 TypeSpec.Builder hashBuilder = TypeSpec.classBuilder("MethodHash").addModifiers(Modifier.PUBLIC);
+                hashBuilder.addJavadoc(autogenWarning);
                 hashBuilder.addField(FieldSpec.builder(int.class, "HASH", Modifier.STATIC, Modifier.PUBLIC, Modifier.FINAL)
                         .initializer("$1L", Objects.hash(methods)).build());
 

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

@@ -26,7 +26,7 @@ public class RemoteReadGenerator{
     /**
      * Generates a class for reading remote invoke packets.
      *
-     * @param entries List of methods to use/
+     * @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.
@@ -35,6 +35,7 @@ public class RemoteReadGenerator{
             throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IOException{
 
         TypeSpec.Builder classBuilder = TypeSpec.classBuilder(className).addModifiers(Modifier.PUBLIC);
+        classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
 
         //create main method builder
         MethodSpec.Builder readMethod = MethodSpec.methodBuilder("readPacket")
@@ -49,7 +50,7 @@ public class RemoteReadGenerator{
             Constructor<TypeName> cons = TypeName.class.getDeclaredConstructor(String.class);
             cons.setAccessible(true);
 
-            TypeName playerType = cons.newInstance("io.anuke.mindustry.entities.Player");
+            TypeName playerType = cons.newInstance("io.anuke.mindustry.entities.type.Player");
             //add player parameter
             readMethod.addParameter(playerType, "player");
         }

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

@@ -29,6 +29,7 @@ public class RemoteWriteGenerator{
         for(ClassEntry entry : entries){
             //create builder
             TypeSpec.Builder classBuilder = TypeSpec.classBuilder(entry.name).addModifiers(Modifier.PUBLIC);
+            classBuilder.addJavadoc(RemoteMethodAnnotationProcessor.autogenWarning);
 
             //add temporary write buffer
             classBuilder.addField(FieldSpec.builder(ByteBuffer.class, "TEMP_BUFFER", Modifier.STATIC, Modifier.PRIVATE, Modifier.FINAL)
@@ -79,7 +80,7 @@ public class RemoteWriteGenerator{
                 return;
             }
 
-            if(!elem.getParameters().get(0).asType().toString().equals("io.anuke.mindustry.entities.Player")){
+            if(!elem.getParameters().get(0).asType().toString().equals("io.anuke.mindustry.entities.type.Player")){
                 Utils.messager.printMessage(Kind.ERROR, "Client invoke methods should have a first parameter of type Player.", elem);
                 return;
             }
@@ -129,7 +130,7 @@ public class RemoteWriteGenerator{
         method.beginControlFlow("if(" + getCheckString(methodEntry.where) + ")");
 
         //add statement to create packet from pool
-        method.addStatement("$1N packet = $2N.obtain($1N.class)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.ucore.util.Pooling");
+        method.addStatement("$1N packet = $2N.obtain($1N.class, $1N::new)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.arc.util.pooling.Pools");
         //assign buffer
         method.addStatement("packet.writeBuffer = TEMP_BUFFER");
         //assign priority

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

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

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

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

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

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

build.gradle

@@ -6,31 +6,62 @@ buildscript {
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
     }
+
     dependencies{
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5'
-        classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
+        classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
-        classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
     }
 }
 
 allprojects{
-    apply plugin: "eclipse"
     apply plugin: "idea"
 
     version = 'release'
 
     ext{
-        versionNumber = '4.0'
+        versionNumber = '4'
-        versionType = 'alpha'
+        versionModifier = 'beta'
+        if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
-        gdxVersion = '1.9.8'
+        gdxVersion = '1.9.9'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '9969ed07b1'
+        arcHash = null
+        
+        debugged = {
+            return new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null
+        }
+
+        localArc = {
+            return (System.properties["release"] == null || System.properties["release"] == "false") && new File(projectDir.parent, '../Arc').exists()
+        }
+
+        getArcHash = {
+            //get latest commit hash from gtihub since JITPack's '-snapshot' version doesn't work correctly
+            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 ->
+            if(localArc()){
+                return project(":Arc:$name")
+            }else{
+                //skip to last submodule
+                if(name.contains(':')) name = name.split(':').last()
+                return "com.github.Anuken.Arc:$name:${getArcHash()}"
+            }
+        }
 
         getVersionString = {
             String buildVersion = getBuildVersion()
-            return "$versionNumber-$versionType-$buildVersion"
+            return "$versionNumber-$versionModifier-$buildVersion"
         }
 
         getBuildVersion = {
@@ -43,34 +74,32 @@ allprojects {
         }
 
         generateLocales = {
-            def output = '["en",'
+            def output = 'en\n'
-            def bundles = new File('core/assets/bundles/')
+            def bundles = new File(project(':core').projectDir, 'assets/bundles/')
             bundles.listFiles().each{ other ->
-                if(other.name == "bundle.properties") return;
+                if(other.name == "bundle.properties") return
-                output += '"' + other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + '",'
+                output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
             }
-            output = (output.substring(0, output.size() - 1) + "]")
+            new File(project(':core').projectDir, 'assets/locales').text = output
-            new File(project(':core').projectDir, 'assets/locales.json').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.")
             }
@@ -91,69 +120,49 @@ project(":desktop") {
 
     dependencies{
         compile project(":core")
-        compile project(":kryonet")
+        compile project(":net")
-        compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
+        
+        if(debugged()) compile project(":debug")
+
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
-        compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+        compile arcModule("backends:backend-lwjgl3")
         compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
     }
 }
 
-project(":html") {
-    apply plugin: "gwt"
-    apply plugin: "war"
-
-
-    dependencies {
-        compile project(":core")
-        compileOnly project(":annotations")
-
-        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-controllers:$gdxVersion:sources"
-        compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources"
-    }
-
-    compileJava.options.compilerArgs = [
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor"
-    ]
-}
-
 project(":ios"){
     apply plugin: "java"
     apply plugin: "robovm"
 
-    task copyGen{
+    task incrementConfig{
-        doFirst{
+        def vfile = file('robovm.properties')
-            copy{
+
-                from ("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
+        def props = new Properties()
-                    include "**/*.java"
+        if(vfile.exists()){
+            props.load(new FileInputStream(vfile))
         }
 
-                into "../core/src/io/anuke/mindustry/gen"
+        props['app.id'] = 'io.anuke.mindustry'
+        props['app.version'] = '4.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)
     }
-        }
-
-        doLast{
-            delete{
-                delete "../core/src/io/anuke/mindustry/gen/"
-            }
-        }
-    }
-
-    build.finalizedBy(copyGen)
 
     dependencies{
         compile project(":core")
-        implementation project(":kryonet")
+        compile project(":net")
+
+        compile arcModule("backends:backend-robovm")
         
         compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
         compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
-        compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
+        compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
     }
 }
 
@@ -164,51 +173,67 @@ project(":core") {
         generateLocales()
     }
 
+    task cleanGen{
+        doFirst{
+            delete{
+                delete "../core/src/io/anuke/mindustry/gen/"
+            }
+        }
+    }
+
+    task copyGen{
+        doLast{
+            copy{
+                from("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
+                    include "**/*.java"
+                }
+
+                into "../core/src/io/anuke/mindustry/gen"
+            }
+        }
+    }
+
     dependencies{
+        compileJava.dependsOn(cleanGen)
+        compileJava.finalizedBy(copyGen)
+
+        compile arcModule("arc-core")
+        compile arcModule("extensions:freetype")
+        if(localArc() && debugged()) compile arcModule("extensions:recorder")
+
         compileOnly project(":annotations")
-        build.finalizedBy(finish)
+        annotationProcessor project(":annotations")
-
-        def comp = System.properties["release"] == null || System.properties["release"] == "false"
-
-        if(!comp) println("Note: Compiling release build.")
-
-        if(new File(projectDir.parent, '../uCore').exists() && comp){
-            compile project(":uCore")
-        }else{
-            compile "com.github.anuken:ucore:$uCoreVersion"
     }
-
-        if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp) {
-            compile project(":GDXGifRecorder")
-        }
-
-        compile "com.badlogicgames.gdx:gdx:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
-    }
-
-    compileJava.options.compilerArgs = [
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor"
-    ]
 }
 
 project(":server"){
     apply plugin: "java"
 
-    configurations {
+    dependencies{
-        compile.exclude module: android
+        compile project(":core")
+        compile project(":net")
+        compile arcModule("backends:backend-headless")
     }
+}
+
+project(":tests"){
+    apply plugin: "java"
 
     dependencies{
-        compileOnly project(":annotations")
+        testImplementation project(":core")
+        testImplementation "org.junit.jupiter:junit-jupiter-params:5.3.1"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.3.1"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.3.1"
+        compile arcModule("backends:backend-headless")
+    }
 
-        compile project(":core")
+    test{
-        compile project(":kryonet")
+        useJUnitPlatform()
-        compile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+        workingDir = new File("../core/assets")
-        compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
     }
 }
 
-project(":packer") {
+project(":tools"){
     apply plugin: "java"
 
     dependencies{
@@ -224,15 +249,13 @@ project(":annotations") {
     }
 }
 
-project(":kryonet") {
+project(":net"){
     apply plugin: "java"
 
     dependencies{
         compile project(":core")
-        compile 'com.github.crykn:kryonet:2.22.1'
+        compile "org.lz4:lz4-java:1.4.1"
+        compile 'com.github.Anuken:kryonet:a64d2280880e80566ca1bdaffa55de43e51cad38'
+        compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
     }
 }
-
-tasks.eclipse.doLast {
-    delete ".project"
-}