Fixed cryofluid mixer

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* match orignal bundle

* Update bundle_ko.properties

* Update bundle_ko.properties

.gitignore

@@ -1,5 +1,3 @@
-##Packr, build stuff
-
 logs/
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
@@ -13,8 +11,10 @@ logs/
 /desktop/gifexport/
 /core/lib/
 /core/assets-raw/sprites/generated/
+/core/assets-raw/sprites_out/
 /annotations/build/
-/kryonet/build/
+/annotations/out/
+/net/build/
 /tools/build/
 /tests/build/
 /server/build/
@@ -28,6 +28,8 @@ logs/
 /ios/src/io/anuke/mindustry/gen/
 /core/src/io/anuke/mindustry/gen/
 ios/robovm.properties
+packr-out/
+config/
 *.gif
 
 version.properties

.travis.yml

@@ -2,6 +2,7 @@
 jdk:
 - openjdk8
 script:
+- "git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc"
 - "./gradlew test"
 - "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
 - "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
@@ -17,4 +18,4 @@ deploy:
   - "server/build/libs/server-release.jar"
   on:
     repo: Anuken/Mindustry
-    tags: true
+    tags: true

README.md

@@ -3,32 +3,35 @@
 [![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)_  
+_[Wiki](http://mindustry.wikia.com/wiki/Mindustry_Wiki)_ 
 
 ### Building
 
 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
 
 _Running:_ `gradlew desktop:run`  
 _Building:_ `gradlew desktop:dist`
 
-#### Linux
+#### Linux/Mac OS
 
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`
 
-#### For Server Builds...
+#### Server
 
-Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server' i.e. `gradlew server:dist`.
+Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server', e.g. `gradlew server:dist`.
+
+##### 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.*
 
 ---
 

android/AndroidManifest.xml

@@ -3,7 +3,6 @@
     package="io.anuke.mindustry">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -17,10 +16,11 @@
             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:screenOrientation="sensor"
+            android:screenOrientation="user"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
 
             <intent-filter>

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
     }
 }
 
@@ -26,32 +26,27 @@ repositories {
 
 dependencies {
     implementation project(":core")
-    implementation project(":kryonet")
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'org.sufficientlysecure:donations:2.5'
-    implementation 'com.google.android.gms:play-services-auth:16.0.1'
+    implementation project(":net")
 
-    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-freetype:$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"
-    implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
 }
 
 task deploy(type: Copy){
     dependsOn "assembleRelease"
 
-    from "build/outputs/apk/google/release/android-google-release.apk"
+    from "build/outputs/apk/release/android-release.apk"
     into "../deploy/"
-    rename ("android-google-release.apk", appName + "-android-" + getVersionString() + ".apk")
+    rename ("android-release.apk", appName + "-android-" + getVersionString() + ".apk")
 }
 
 android {
@@ -105,12 +100,6 @@ android {
 
     flavorDimensions "google"
 
-    productFlavors {
-        google {
-            buildConfigField "boolean", "DONATIONS_GOOGLE", "true"
-        }
-    }
-
     signingConfigs {
         release {
             if(project.hasProperty("RELEASE_STORE_FILE")) {

android/proguard-project.txt

@@ -20,26 +20,10 @@
 #}
 
 -verbose
-
--dontwarn android.support.**
--dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication
--dontwarn com.badlogic.gdx.utils.GdxBuild
--dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild
--dontwarn com.badlogic.gdx.jnigen.BuildTarget*
--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);
+-verbose
+-ignorewarnings
+-keep class io.anuke.mindustry.game.Rules
+-keep class io.anuke.mindustry.desktop.DesktopLauncher
+-keepclasseswithmembers public class * {
+    public static void main(java.lang.String[]);
 }

android/res/layout/donations_activity.xml

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

android/res/values-ko/strings.xml

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

android/res/values-ru/strings.xml

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

android/res/values/strings.xml

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

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

@@ -10,26 +10,21 @@ import android.os.Build;
 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.KryoClient;
-import io.anuke.kryonet.KryoServer;
+import io.anuke.arc.Core;
+import io.anuke.arc.backends.android.surfaceview.AndroidApplication;
+import io.anuke.arc.backends.android.surfaceview.AndroidApplicationConfiguration;
+import io.anuke.arc.files.FileHandle;
+import io.anuke.arc.function.Consumer;
+import io.anuke.arc.scene.ui.layout.Unit;
+import io.anuke.arc.util.Strings;
+import io.anuke.arc.util.serialization.Base64Coder;
+import io.anuke.net.KryoClient;
+import io.anuke.net.KryoServer;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.game.Saves.SaveSlot;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.ui.dialogs.FileChooser;
-import io.anuke.ucore.function.Consumer;
-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;
@@ -39,7 +34,7 @@ import java.util.ArrayList;
 
 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;
@@ -49,11 +44,12 @@ public class AndroidLauncher extends PatchedAndroidApplication{
         super.onCreate(savedInstanceState);
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
+        config.depth = 0;
         Platform.instance = new Platform(){
 
             @Override
-            public void openDonations(){
-                showDonations();
+            public void hide(){
+                moveTaskToBack(true);
             }
 
             @Override
@@ -93,13 +89,13 @@ public class AndroidLauncher extends PatchedAndroidApplication{
                     if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
                         perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
                     }
-                    requestPermissions(perms.toArray(new String[perms.size()]), PERMISSION_REQUEST_CODE);
+                    requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE);
                 }
             }
 
             @Override
             public void beginForceLandscape(){
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
             }
 
             @Override
@@ -113,17 +109,10 @@ public class AndroidLauncher extends PatchedAndroidApplication{
             }
         };
 
-        try{
-            ProviderInstaller.installIfNeeded(this);
-        }catch(GooglePlayServicesRepairableException e){
-            GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
-            apiAvailability.getErrorDialog(this, e.getConnectionStatusCode(), 0).show();
-        }catch(GooglePlayServicesNotAvailableException e){
-            Log.e("SecurityException", "Google Play Services not available.");
-        }
         if(doubleScaleTablets && isTablet(this.getContext())){
             Unit.dp.addition = 0.5f;
         }
+
         config.hideStatusBar = true;
         Net.setClientProvider(new KryoClient());
         Net.setServerProvider(new KryoServer());
@@ -132,7 +121,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{
     }
 
     @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;
@@ -161,28 +150,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.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);
                         });
                     }
                 });
@@ -192,22 +183,8 @@ public class AndroidLauncher extends PatchedAndroidApplication{
         }
     }
 
-    private boolean isPackageInstalled(String packagename){
-        try{
-            getPackageManager().getPackageInfo(packagename, 0);
-            return true;
-        }catch(Exception e){
-            return false;
-        }
-    }
-
     private boolean isTablet(Context context){
         TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        return manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE;
-    }
-
-    private void showDonations(){
-        Intent intent = new Intent(this, DonationsActivity.class);
-        startActivity(intent);
+        return manager != null && manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE;
     }
 }

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

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

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();
-    }
-}

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

@@ -7,6 +7,18 @@ import java.lang.annotation.Target;
 
 public class Annotations{
 
+    @Target({ElementType.METHOD, ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Nullable{
+
+    }
+
+    @Target({ElementType.METHOD, ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface NonNull{
+
+    }
+
     /** Marks a class as serializable.*/
     @Target(ElementType.TYPE)
     @Retention(RetentionPolicy.SOURCE)
@@ -14,6 +26,21 @@ public class Annotations{
 
     }
 
+    /** 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,

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";
 
@@ -107,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);
@@ -138,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

@@ -2,8 +2,6 @@ package io.anuke.annotations;
 
 import com.squareup.javapoet.*;
 import io.anuke.annotations.IOFinder.ClassSerializer;
-import io.anuke.annotations.MethodEntry;
-import io.anuke.annotations.Utils;
 
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -28,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.
@@ -37,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")
@@ -51,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;
             }
@@ -108,7 +109,7 @@ public class RemoteWriteGenerator{
             for(VariableElement var : elem.getParameters()){
                 //special case: calling local-only methods uses the local player
                 if(index == 0 && methodEntry.where == Loc.client){
-                    results.append("io.anuke.mindustry.Vars.players[0]");
+                    results.append("io.anuke.mindustry.Vars.player");
                 }else{
                     results.append(var.getSimpleName());
                 }
@@ -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, $1N::new)", "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

@@ -12,6 +12,7 @@ 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;
 
@@ -45,31 +46,56 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
             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);
 
+            TypeName jsonType = ClassName.bestGuess("io.anuke.arc.util.serialization.Json");
+            TypeName jsonValueType = ClassName.bestGuess("io.anuke.arc.util.serialization.JsonValue");
+            TypeName ubJsonWriterType = ClassName.bestGuess("io.anuke.arc.util.serialization.UBJsonWriter");
+            TypeName ubJsonReaderType = ClassName.bestGuess("io.anuke.arc.util.serialization.UBJsonReader");
+
+            classBuilder.addField(jsonType, "bjson", Modifier.STATIC, Modifier.PRIVATE);
+            classBuilder.addField(ubJsonReaderType, "bjsonReader", Modifier.STATIC, Modifier.PRIVATE);
+            classBuilder.addStaticBlock(CodeBlock.builder()
+                .addStatement("bjson = new " + jsonType + "()")
+                .addStatement("bjsonReader = new " + ubJsonReaderType + "()")
+            .build());
+
             for(TypeElement elem : elements){
                 TypeName type = TypeName.get(elem.asType());
+                String simpleTypeName = type.toString().substring(type.toString().lastIndexOf('.') + 1);
 
                 TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
                 .addSuperinterface(ParameterizedTypeName.get(
-                ClassName.bestGuess("io.anuke.ucore.io.TypeSerializer"), type));
+                ClassName.bestGuess("io.anuke.arc.Settings.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);
 
+                MethodSpec.Builder jsonWriteMethod = MethodSpec.methodBuilder("write" + simpleTypeName + "Json")
+                .returns(void.class)
+                .addParameter(jsonType, "json")
+                .addParameter(type, "object")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
+                MethodSpec.Builder jsonReadMethod = MethodSpec.methodBuilder("read" + simpleTypeName + "Json")
+                .returns(type)
+                .addParameter(jsonValueType, "value")
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC);
+
                 readMethod.addStatement("$L object = new $L()", type, type);
+                jsonReadMethod.addStatement("$L object = new $L()", type, type);
 
                 List<VariableElement> fields = ElementFilter.fieldsIn(Utils.elementUtils.getAllMembers(elem));
                 for(VariableElement field : fields){
@@ -82,18 +108,57 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                     if(field.asType().getKind().isPrimitive()){
                         writeMethod.addStatement("stream.write" + capName + "(object." + name + ")");
                         readMethod.addStatement("object." + name + "= stream.read" + capName + "()");
+
+                        jsonWriteMethod.addStatement("json.writeValue(\"" + name + "\", object." + name +")");
+                        jsonReadMethod.addStatement("if(value.has(\"" + name + "\")) object." + name + "= value.get" + capName + "(\"" + name + "\")");
                     }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)");
+                        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");
+                jsonReadMethod.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());
+                method.addStatement("io.anuke.arc.Core.settings.setSerializer($N, $L)",  Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
+
+                name(writeMethod, "write" + simpleTypeName);
+                name(readMethod, "read" + simpleTypeName);
+
+                writeMethod.addModifiers(Modifier.STATIC);
+                readMethod.addModifiers(Modifier.STATIC);
+
+                classBuilder.addMethod(writeMethod.build());
+                classBuilder.addMethod(readMethod.build());
+
+                classBuilder.addMethod(jsonWriteMethod.build());
+                classBuilder.addMethod(jsonReadMethod.build());
+
+                MethodSpec.Builder binaryJsonWriteMethod = MethodSpec.methodBuilder("write" + simpleTypeName + "StreamJson")
+                .returns(void.class)
+                .addParameter(DataOutput.class, "stream")
+                .addParameter(type, "object")
+                .addException(IOException.class)
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .addStatement("java.io.StringWriter output = new java.io.StringWriter()")
+                .addStatement("bjson.setWriter(output)")
+                .addStatement("bjson.writeObjectStart(" + type + ".class, " + type + ".class)")
+                .addStatement("write" + simpleTypeName + "Json(bjson, object)")
+                .addStatement("bjson.writeObjectEnd()")
+                .addStatement("stream.writeUTF(output.toString())");
+
+                MethodSpec.Builder binaryJsonReadMethod = MethodSpec.methodBuilder("read" + simpleTypeName + "StreamJson")
+                .returns(type)
+                .addParameter(DataInput.class, "stream")
+                .addException(IOException.class)
+                .addModifiers(Modifier.PUBLIC, Modifier.STATIC)
+                .addStatement("return read" + simpleTypeName + "Json(bjson.fromJson(null, stream.readUTF()))");
+
+                classBuilder.addMethod(binaryJsonWriteMethod.build());
+                classBuilder.addMethod(binaryJsonReadMethod.build());
             }
 
             classBuilder.addMethod(method.build());
@@ -107,4 +172,14 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
             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(structType).append(")").append(varName).append(" << ").append(offset).append("L)").append(" & ").append(bitString(offset, size, structTotalSize)).append(")");
+
+                            //bytes, shorts, chars, ints
+                            setter.addStatement("return ($T)(($L & $L) | (($T)value << $LL))", structType, structParam, bitString(offset, size, structTotalSize), structType, offset);
+                        }
+
+                        doc.append("<br>  ").append(varName).append(" [").append(offset).append("..").append(size + offset).append("]\n");
+
+                        //add finished methods
+                        classBuilder.addMethod(getter.build());
+                        classBuilder.addMethod(setter.build());
+
+                        offset += size;
+                    }
+
+                    classBuilder.addJavadoc(doc.toString());
+
+                    //add constructor final statement + add to class and build
+                    constructor.addStatement("return ($T)($L)", structType, cons.toString().substring(3));
+                    classBuilder.addMethod(constructor.build());
+
+                    JavaFile.builder(packageName, classBuilder.build()).build().writeTo(Utils.filer);
+                }catch(IllegalArgumentException e){
+                    e.printStackTrace();
+                    Utils.messager.printMessage(Kind.ERROR, e.getMessage(), elem);
+                }
+            }
+
+            return true;
+        }catch(Exception e){
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+    static String bitString(int offset, int size, int totalSize){
+        StringBuilder builder = new StringBuilder();
+        for(int i = 0; i < offset; i++) builder.append('0');
+        for(int i = 0; i < size; i++) builder.append('1');
+        for(int i = 0; i < totalSize - size - offset; i++) builder.append('0');
+        return "0b" + builder.reverse().toString() + "L";
+    }
+
+    static String bitString(int size, int totalSize){
+        StringBuilder builder = new StringBuilder();
+        for(int i = 0; i < size; i++) builder.append('1');
+        for(int i = 0; i < totalSize - size; i++) builder.append('0');
+        return "0b" + builder.reverse().toString() + "L";
+    }
+
+    static int varSize(VariableElement var) throws IllegalArgumentException{
+        if(!var.asType().getKind().isPrimitive()){
+            throw new IllegalArgumentException("All struct fields must be primitives: " + var);
+        }
+
+        StructField an = var.getAnnotation(StructField.class);
+        if(var.asType().getKind() == TypeKind.BOOLEAN && an != null && an.value() != 1){
+            throw new IllegalArgumentException("Booleans can only be one bit long... why would you do this?");
+        }
+
+        if(var.asType().getKind() == TypeKind.FLOAT && an != null && an.value() != 32){
+            throw new IllegalArgumentException("Float size can't be changed. Very sad.");
+        }
+
+        return an == null ? typeSize(var.asType().getKind()) : an.value();
+    }
+
+    static Class<?> typeForSize(int size) throws IllegalArgumentException{
+        if(size <= 8){
+            return byte.class;
+        }else if(size <= 16){
+            return short.class;
+        }else if(size <= 32){
+            return int.class;
+        }else if(size <= 64){
+            return long.class;
+        }
+        throw new IllegalArgumentException("Too many fields, must fit in 64 bits. Curent size: " + size);
+    }
+
+    /**returns a type's element size in bits.*/
+    static int typeSize(TypeKind kind) throws IllegalArgumentException{
+        switch(kind){
+            case BOOLEAN:
+                return 1;
+            case BYTE:
+                return 8;
+            case SHORT:
+                return 16;
+            case FLOAT:
+            case CHAR:
+            case INT:
+                return 32;
+            default:
+                throw new IllegalArgumentException("Invalid type kind: " + kind + ". Note that doubles and longs are not supported.");
+        }
+    }
+}

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

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

build.gradle

@@ -1,31 +1,63 @@
-buildscript {
-    repositories {
+buildscript{
+    repositories{
         mavenLocal()
         mavenCentral()
         google()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         jcenter()
     }
-    dependencies {
-        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
-        classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
+
+    dependencies{
+        classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6'
+        classpath "com.badlogicgames.gdx:gdx-tools:1.9.9"
+        classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT"
     }
 }
 
-allprojects {
-    apply plugin: "eclipse"
+allprojects{
     apply plugin: "idea"
 
     version = 'release'
 
-    ext {
+    ext{
         versionNumber = '4'
-        versionModifier = 'alpha'
-        versionType = 'official'
+        versionModifier = 'beta'
+        if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         gdxVersion = '1.9.9'
-        roboVMVersion = '2.3.0'
-        uCoreVersion = '09e13f973a0769d971316d1d4f4a1eef3570926f'
+        roboVMVersion = '2.3.6'
+        arcHash = null
+        
+        debugged = {
+            return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release")
+        }
+
+        localArc = {
+            return (!project.hasProperty("release")) && new File(projectDir.parent, '../Arc').exists()
+        }
+
+        getArcHash = {
+            //get latest commit hash from gtihub since JITPack's '-snapshot' version doesn't work correctly
+            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()
@@ -44,7 +76,7 @@ allprojects {
         generateLocales = {
             def output = 'en\n'
             def bundles = new File(project(':core').projectDir, 'assets/bundles/')
-            bundles.listFiles().each { other ->
+            bundles.listFiles().each{ other ->
                 if(other.name == "bundle.properties") return
                 output += other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + "\n"
             }
@@ -57,10 +89,9 @@ allprojects {
 
             try{
                 pfile.createNewFile()
-            }catch (Exception ignored){}
-
-            if(pfile.exists()) {
+            }catch(Exception ignored){}
 
+            if(pfile.exists()){
                 props.load(new FileInputStream(pfile))
 
                 String buildid = getBuildVersion()
@@ -75,51 +106,36 @@ allprojects {
         }
     }
 
-    repositories {
+    repositories{
         mavenLocal()
         mavenCentral()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-        maven { url "https://oss.sonatype.org/content/repositories/releases/" }
-        maven { url 'https://jitpack.io' }
+        maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
+        maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
+        maven{ url 'https://jitpack.io' }
     }
 }
 
-project(":desktop") {
+project(":desktop"){
     apply plugin: "java"
 
-    dependencies {
+    dependencies{
         compile project(":core")
-        compile project(":kryonet")
-        if(new File(projectDir.parent, '../debug').exists() && System.properties["release"] == null) compile project(":debug")
+        compile project(":net")
+        
+        if(debugged()) 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.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+
+        compile arcModule("backends:backend-lwjgl3")
         compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
     }
 }
 
-project(":ios") {
+project(":ios"){
     apply plugin: "java"
     apply plugin: "robovm"
 
-    task copyGen{
-        copy{
-            from ("core/build/classes/java/main/io/anuke/mindustry/gen/"){
-                include "**/*.java"
-            }
-
-            into "core/src/io/anuke/mindustry/gen"
-        }
-
-        doFirst{
-            delete{
-                delete "core/src/io/anuke/mindustry/gen/"
-            }
-        }
-    }
-
     task incrementConfig{
         def vfile = file('robovm.properties')
 
@@ -133,116 +149,115 @@ project(":ios") {
         props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
         props['app.executable'] = 'IOSLauncher'
         props['app.name'] = 'Mindustry'
-        props['app.build'] = (!props.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
+        props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + ""
         props.store(vfile.newWriter(), null)
     }
 
-    build.dependsOn(incrementConfig)
-    build.dependsOn(copyGen)
-
-    dependencies {
+    dependencies{
         compile project(":core")
-        implementation project(":kryonet")
-
+        compile project(":net")
+        compileOnly project(":annotations")
+        
+        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"
-        compileOnly project(":annotations")
     }
 }
 
-project(":core") {
+project(":core"){
     apply plugin: "java"
 
-    task finish {
+    task finish{
         generateLocales()
     }
 
-    dependencies {
-        build.finalizedBy(finish)
-
-        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"
+    task cleanGen{
+        doFirst{
+            delete{
+                delete "../core/src/io/anuke/mindustry/gen/"
+            }
         }
+    }
 
-        if(new File(projectDir.parent, '../GDXGifRecorder').exists() && comp) {
-            compile project(":GDXGifRecorder")
+    task copyGen{
+        doLast{
+            copy{
+                from("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
+                    include "**/*.java"
+                }
+
+                into "../core/src/io/anuke/mindustry/gen"
+            }
         }
+    }
 
-        compile "com.badlogicgames.gdx:gdx:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+    dependencies{
+        compileJava.dependsOn(cleanGen)
+        compileJava.finalizedBy(copyGen)
+
+        compile arcModule("arc-core")
+        compile arcModule("extensions:freetype")
+        //compile arcModule("extensions:postprocessing")
+        if(localArc() && debugged()) compile arcModule("extensions:recorder")
 
         compileOnly project(":annotations")
         annotationProcessor project(":annotations")
     }
 }
 
-project(":server") {
+project(":server"){
     apply plugin: "java"
 
-    configurations {
-        if(findProject(":android") != null){
-            compile.exclude module: android
-        }
-    }
-    
-    dependencies {
-
+    dependencies{
         compile project(":core")
-        compile project(":kryonet")
-        compile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
-        compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+        compile project(":net")
+        compile arcModule("backends:backend-headless")
     }
 }
 
 project(":tests"){
     apply plugin: "java"
 
-    dependencies {
+    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"
+        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")
     }
 
-    test {
+    test{
         useJUnitPlatform()
         workingDir = new File("../core/assets")
     }
 }
 
-project(":tools") {
+project(":tools"){
     apply plugin: "java"
 
-    dependencies {
+    dependencies{
         compile project(":core")
     }
 }
 
-project(":annotations") {
+project(":annotations"){
     apply plugin: "java"
 
-    dependencies {
+    dependencies{
         compile 'com.squareup:javapoet:1.11.0'
     }
 }
 
-project(":kryonet") {
+project(":net"){
     apply plugin: "java"
 
-    dependencies {
+    dependencies{
         compile project(":core")
         compile "org.lz4:lz4-java:1.4.1"
-        compile 'com.github.Anuken:kryonet:53b10247b1'
+        compile 'com.github.Anuken:kryonet:a64d2280880e80566ca1bdaffa55de43e51cad38'
         compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
     }
-}
+}