Fixed multiblocks not accepting items

Big update for italian bundle

.gitignore

@@ -2,6 +2,7 @@
 
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
+/core/assets/bundles/output/
 /deploy/
 /desktop/packr-out/
 /desktop/packr-export/
@@ -19,6 +20,8 @@
 /android/assets/mindustry-saves/
 /core/assets/gifexport/
 /core/assets/version.properties
+/core/assets/locales.json
+/ios/src/io/anuke/mindustry/gen/
 *.gif
 
 version.properties

.travis.yml

@@ -5,13 +5,14 @@ jdk:
 
 android:
   components:
-    - android-26
+    - android-27
 
     # Additional components
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    - addon-google_apis-google-26
+    - addon-google_apis-google-27
+    - build-tools-27.0.3
 
 script: 
     - ./gradlew desktop:dist

README.md

@@ -1,11 +1,9 @@
 ![Imgur](https://i.imgur.com/w4N0yhv.png)
 
 [![Build Status](https://travis-ci.org/Anuken/Mindustry.svg?branch=master)](https://travis-ci.org/Anuken/Mindustry)
-[![Waffle.io - Columns and their card count](https://badge.waffle.io/Anuken/Mindustry.svg?columns=all)](https://waffle.io/Anuken/Mindustry)
+\
-
 A pixelated sandbox tower defense game made using [LibGDX](https://libgdx.badlogicgames.com/). Winner of the [GDL Metal Monstrosity Jam](https://itch.io/jam/gdl---metal-monstrosity-jam).
 
-_[Issue tracker](https://waffle.io/Anuken/Mindustry)_  
 _[Trello Board](https://trello.com/b/aE2tcUwF/mindustry-40-plans)_  
 _[Wiki](http://mindustry.wikia.com/wiki/Mindustry_Wiki)_  
 _[Discord](https://discord.gg/r8BkXNd)_  

TRANSLATING.md

@@ -0,0 +1,39 @@
+## Translating for Mindustry
+
+**DISCLAIMER:** *Currently, 4.0 is far from done, which means that things such as block names, descriptions, and core text will be changing often. If you begin translating now, you might have to re-do large chunks of the bundle before final release.*
+
+
+To begin, log in to your GitHub account, or if you don't have one yet, create it [here](https://github.com/).
+
+Consult [this list](https://www.science.co.il/language/Locale-codes.php) to find the locale code for your language. Once you've found it, 
+head over to the translation bundle folder and check the [list of bundles](https://github.com/Anuken/Mindustry/tree/master/core/assets/bundles) that have already been created. 
+You're looking for a file called "`bundle_`(insert locale code here)`.properties`". If you don't find one, create one manually (more info below).
+
+#### Editing an existing translation
+
+If a translation bundle already exists, that means someone has already started working on a translation. To edit it or translate text, simply click the file and press the edit (pencil) button in the top right. Once you're done editing, press the green "propose file change" button at the bottom, then "create pull request" (twice).
+Once this is done, all you need to do is wait for me to approve your changes.
+
+#### Creating a new translation bundle
+
+If a translation bundle for your language *doesn't* exist, you need to create one yourself.  
+In the folder with all the bundles in it, click the *'create new file'* button, and name it `bundle_(locale code here).properties`. 
+Then, copy-paste the entire contents of the [English translation bundle](https://raw.githubusercontent.com/Anuken/Mindustry/master/core/assets/bundles/bundle.properties) into the file, and translate all the necessary text to your language.
+Once you are done, press the *propose new file* button at the bottom, then 'create pull request' twice.  
+
+#### Useful Information
+
+- When you see text surrounded by square brackets, such as `[RED]`, `[]` or `[accent]`, this indicates a color code. Don't translate it.
+- `{0}` means an argument that will be replaced when the text is displayed. For example, `Wave: {0}` will replace the `{0}` with whatever wave you are in.
+- Empty lines are fine, and it doesn't matter in what order you place the text.
+- `\n` means "new line". If you want to split text into multiple lines, use `\n` to do it.
+
+#### Testing your translation bundle
+
+There are two ways to test the translation bundle:
+1) Assuming you have the PC version downloaded, download your bundle file, name it `bundle.properties`, then place it in the same folder as the Mindustry desktop executable and run it. *You should get a popup message in-game confirming that you have loaded an external translation.*
+2) For advanced users: simply download your fork of mindustry and compile/run the game.
+
+**And that's it.**  
+
+*(...of course, that's never really it. Bother me on Discord when something inevitably goes wrong.)*

android/AndroidManifest.xml

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

android/build.gradle

@@ -24,7 +24,6 @@ dependencies {
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
-    implementation "com.badlogicgames.gdx:gdx-ai:$aiVersion"
     implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
 }
 

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

@@ -12,7 +12,6 @@ import android.provider.Settings.Secure;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import com.badlogic.gdx.Gdx;
-import com.badlogic.gdx.backends.android.AndroidApplication;
 import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.utils.Base64Coder;
@@ -25,8 +24,8 @@ import io.anuke.kryonet.KryoClient;
 import io.anuke.kryonet.KryoServer;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
+import io.anuke.mindustry.game.Saves.SaveSlot;
 import io.anuke.mindustry.io.SaveIO;
-import io.anuke.mindustry.io.Saves.SaveSlot;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.ui.dialogs.FileChooser;
 import io.anuke.ucore.function.Consumer;
@@ -48,19 +47,16 @@ import java.util.Locale;
 
 import static io.anuke.mindustry.Vars.*;
 
-public class AndroidLauncher extends AndroidApplication{
+public class AndroidLauncher extends PatchedAndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
-
     boolean doubleScaleTablets = true;
     FileChooser chooser;
 
     @Override
     protected void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
-
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
-
         Platform.instance = new Platform(){
             DateFormat format = SimpleDateFormat.getDateTimeInstance();
 
@@ -109,18 +105,14 @@ public class AndroidLauncher extends AndroidApplication{
                 try{
                     String s = Secure.getString(getContext().getContentResolver(),
                     Secure.ANDROID_ID);
-
                     int len = s.length();
                     byte[] data = new byte[len / 2];
                     for(int i = 0; i < len; i += 2){
                         data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
                         + Character.digit(s.charAt(i + 1), 16));
                     }
-
                     String result = new String(Base64Coder.encode(data));
-
                     if(result.equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID.");
-
                     return result;
                 }catch(Exception e){
                     return super.getUUID();
@@ -129,28 +121,23 @@ public class AndroidLauncher extends AndroidApplication{
 
             @Override
             public void shareFile(FileHandle file){
-
             }
 
             @Override
             public void showFileChooser(String text, String content, Consumer<FileHandle> cons, boolean open, String filetype){
                 chooser = new FileChooser(text, file -> file.extension().equalsIgnoreCase(filetype), open, cons);
-
                 if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                 checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED)){
                     chooser.show();
                     chooser = null;
                 }else{
                     ArrayList<String> perms = new ArrayList<>();
-
                     if(checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
                         perms.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
                     }
-
                     if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){
                         perms.add(Manifest.permission.READ_EXTERNAL_STORAGE);
                     }
-
                     requestPermissions(perms.toArray(new String[perms.size()]), PERMISSION_REQUEST_CODE);
                 }
             }
@@ -170,7 +157,6 @@ public class AndroidLauncher extends AndroidApplication{
                 return true;
             }
         };
-
         try{
             ProviderInstaller.installIfNeeded(this);
         }catch(GooglePlayServicesRepairableException e){
@@ -179,18 +165,13 @@ public class AndroidLauncher extends AndroidApplication{
         }catch(GooglePlayServicesNotAvailableException e){
             Log.e("SecurityException", "Google Play Services not available.");
         }
-
         if(doubleScaleTablets && isTablet(this.getContext())){
             Unit.dp.addition = 0.5f;
         }
-		
         config.hideStatusBar = true;
-
         Net.setClientProvider(new KryoClient());
         Net.setServerProvider(new KryoServer());
-
         initialize(new Mindustry(), config);
-
         checkFiles(getIntent());
     }
 
@@ -200,7 +181,6 @@ public class AndroidLauncher extends AndroidApplication{
             for(int i : grantResults){
                 if(i != PackageManager.PERMISSION_GRANTED) return;
             }
-
             if(chooser != null){
                 chooser.show();
             }
@@ -220,21 +200,16 @@ public class AndroidLauncher extends AndroidApplication{
                     //error
                     return;
                 }
-
                 boolean save = uri.getPath().endsWith(saveExtension);
                 boolean map = uri.getPath().endsWith(mapExtension);
-
                 InputStream inStream;
                 if(myFile != null) inStream = new FileInputStream(myFile);
                 else inStream = getContentResolver().openInputStream(uri);
-
                 Gdx.app.postRunnable(() -> {
-
                     if(save){ //open save
                         System.out.println("Opening save.");
                         FileHandle file = Gdx.files.local("temp-save." + saveExtension);
                         file.write(inStream, false);
-
                         if(SaveIO.isSaveValid(file)){
                             try{
                                 SaveSlot slot = control.getSaves().importSave(file);
@@ -245,20 +220,17 @@ public class AndroidLauncher extends AndroidApplication{
                         }else{
                             ui.showError("$text.save.import.invalid");
                         }
-
                     }else if(map){ //open map
                         Gdx.app.postRunnable(() -> {
                             System.out.println("Opening map.");
                             if(!ui.editor.isShown()){
                                 ui.editor.show();
                             }
-
                             ui.editor.beginEditMap(inStream);
                         });
                     }
                 });
             }
-
         }catch(IOException e){
             e.printStackTrace();
         }

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

@@ -59,7 +59,8 @@ public class AndroidTextFieldDialog{
         while(!isBuild){
             try{
                 Thread.sleep(10);
-			} catch (InterruptedException e) { }
+            }catch(InterruptedException e){
+            }
         }
 
         return this;

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

@@ -8,12 +8,9 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 import android.widget.Button;
-
 import org.sufficientlysecure.donations.DonationsFragment;
 
 public class DonationsActivity extends FragmentActivity{
-    DonationsFragment donationsFragment;
-
     /**
      * Google
      */
@@ -22,6 +19,7 @@ public class DonationsActivity extends FragmentActivity {
             "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.
@@ -50,7 +48,8 @@ public class DonationsActivity extends FragmentActivity {
         super.onStart();
         Button b = ((Button) findViewById(org.sufficientlysecure.donations.R.id.donations__google_android_market_donate_button));
         b.setOnClickListener(new View.OnClickListener(){
-            @Override public void onClick(View view) {
+            @Override
+            public void onClick(View view){
                 donationsFragment.donateGoogleOnClick(donationsFragment.getView());
                 b.setEnabled(false);
             }
@@ -58,7 +57,6 @@ public class DonationsActivity extends FragmentActivity {
     }
 
 
-
     /**
      * 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.

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

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

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

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

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

@@ -11,45 +11,6 @@ import java.lang.annotation.Target;
  */
 public class Annotations{
 
-    /**Marks a method as invokable remotely across a server/client connection.*/
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
-    public @interface Remote {
-        /**Specifies the locations from which this method can be invoked.*/
-        Loc targets() default Loc.server;
-        /**Specifies which methods are generated. Only affects server-to-client methods.*/
-        Variant variants() default Variant.all;
-        /**The local locations where this method is called locally, when invoked.*/
-        Loc called() default Loc.none;
-        /**Whether to forward this packet to all other clients upon recieval. Server only.*/
-        boolean forward() default false;
-        /**Whether the packet for this method is sent with UDP instead of TCP.
-         * UDP is faster, but is prone to packet loss and duplication.*/
-        boolean unreliable() default false;
-        /**The simple class name where this method is placed.*/
-        String in() default "Call";
-        /**Priority of this event.*/
-        PacketPriority priority() default PacketPriority.normal;
-    }
-
-    /**Specifies that this method will be used to write classes of the type returned by {@link #value()}.<br>
-     * This method must return void and have two parameters, the first being of type {@link java.nio.ByteBuffer} and the second
-     * being the type returned by {@link #value()}.*/
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
-    public @interface WriteClass {
-        Class<?> value();
-    }
-
-    /**Specifies that this method will be used to read classes of the type returned by {@link #value()}. <br>
-     * This method must return the type returned by {@link #value()},
-     * and have one parameter, being of type {@link java.nio.ByteBuffer}.*/
-    @Target(ElementType.METHOD)
-    @Retention(RetentionPolicy.CLASS)
-    public @interface ReadClass {
-        Class<?> value();
-    }
-
     public enum PacketPriority{
         /** Gets put in a queue and processed if not connected. */
         normal,
@@ -67,7 +28,7 @@ public class Annotations {
         client(false, true),
         /** Method can be invoked from anywhere */
         both(true, true),
-        /**Neither server no client.*/
+        /** Neither server nor client. */
         none(false, false);
 
         /** If true, this method can be invoked ON clients FROM servers. */
@@ -96,4 +57,52 @@ public class Annotations {
             this.isAll = isAll;
         }
     }
+
+    /** Marks a method as invokable remotely across a server/client connection. */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    public @interface Remote{
+        /** Specifies the locations from which this method can be invoked. */
+        Loc targets() default Loc.server;
+
+        /** Specifies which methods are generated. Only affects server-to-client methods. */
+        Variant variants() default Variant.all;
+
+        /** The local locations where this method is called locally, when invoked. */
+        Loc called() default Loc.none;
+
+        /** Whether to forward this packet to all other clients upon recieval. Client only. */
+        boolean forward() default false;
+
+        /**
+         * Whether the packet for this method is sent with UDP instead of TCP.
+         * UDP is faster, but is prone to packet loss and duplication.
+         */
+        boolean unreliable() default false;
+
+        /** Priority of this event. */
+        PacketPriority priority() default PacketPriority.normal;
+    }
+
+    /**
+     * Specifies that this method will be used to write classes of the type returned by {@link #value()}.<br>
+     * This method must return void and have two parameters, the first being of type {@link java.nio.ByteBuffer} and the second
+     * being the type returned by {@link #value()}.
+     */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    public @interface WriteClass{
+        Class<?> value();
+    }
+
+    /**
+     * Specifies that this method will be used to read classes of the type returned by {@link #value()}. <br>
+     * This method must return the type returned by {@link #value()},
+     * and have one parameter, being of type {@link java.nio.ByteBuffer}.
+     */
+    @Target(ElementType.METHOD)
+    @Retention(RetentionPolicy.CLASS)
+    public @interface ReadClass{
+        Class<?> value();
+    }
 }

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

@@ -10,12 +10,16 @@ import javax.tools.Diagnostic.Kind;
 import java.util.HashMap;
 import java.util.Set;
 
-/**This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
+/**
- * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.*/
+ * This class finds reader and writer methods annotated by the {@link io.anuke.annotations.Annotations.WriteClass}
+ * and {@link io.anuke.annotations.Annotations.ReadClass} annotations.
+ */
 public class IOFinder{
 
-    /**Finds all class serializers for all types and returns them. Logs errors when necessary.
+    /**
-     * Maps fully qualified class names to their serializers.*/
+     * Finds all class serializers for all types and returns them. Logs errors when necessary.
+     * Maps fully qualified class names to their serializers.
+     */
     public HashMap<String, ClassSerializer> findSerializers(RoundEnvironment env){
         HashMap<String, ClassSerializer> result = new HashMap<>();
 

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

@@ -14,8 +14,10 @@ public class MethodEntry {
     public final String targetMethod;
     /** Whether this method can be called on a client/server. */
     public final Loc where;
-    /**Whether an additional 'one' and 'all' method variant is generated. At least one of these must be true.
+    /**
-     * Only applicable to client (server-invoked) methods.*/
+     * Whether an additional 'one' and 'all' method variant is generated. At least one of these must be true.
+     * Only applicable to client (server-invoked) methods.
+     */
     public final Variant target;
     /** Whether this method is called locally as well as remotely. */
     public final Loc local;

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

@@ -35,6 +35,8 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
     private static final String readServerName = "RemoteReadServer";
     /** Name of class that handles reading and invoking packets on the client. */
     private static final String readClientName = "RemoteReadClient";
+    /**Simple class name of generated class name.*/
+    private static final String callLocation = "Call";
 
     /** Processing round number. */
     private int round;
@@ -102,15 +104,15 @@ public class RemoteMethodAnnotationProcessor extends AbstractProcessor {
                     }
 
                     //get and create class entry if needed
-                    if (!classMap.containsKey(annotation.in())) {
+                    if(!classMap.containsKey(callLocation)){
-                        ClassEntry clas = new ClassEntry(annotation.in());
+                        ClassEntry clas = new ClassEntry(callLocation);
-                        classMap.put(annotation.in(), clas);
+                        classMap.put(callLocation, clas);
                         classes.add(clas);
 
                         Utils.messager.printMessage(Kind.NOTE, "Generating class '" + clas.name + "'.");
                     }
 
-                    ClassEntry entry = classMap.get(annotation.in());
+                    ClassEntry entry = classMap.get(callLocation);
 
                     //create and add entry
                     MethodEntry method = new MethodEntry(entry.name, Utils.getMethodName(element), annotation.targets(), annotation.variants(),

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

@@ -23,11 +23,14 @@ public class RemoteReadGenerator {
         this.serializers = serializers;
     }
 
-    /**Generates a class for reading remote invoke packets.
+    /**
+     * Generates a class for reading remote invoke packets.
+     *
      * @param entries List of methods to use/
      * @param className Simple target class name.
      * @param packageName Full target package name.
-     * @param needsPlayer Whether this read method requires a reference to the player sender.*/
+     * @param needsPlayer Whether this read method requires a reference to the player sender.
+     */
     public void generateFor(List<MethodEntry> entries, String className, String packageName, boolean needsPlayer)
             throws IllegalAccessException, InvocationTargetException, InstantiationException, NoSuchMethodException, IOException{
 

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

@@ -129,7 +129,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", "com.badlogic.gdx.utils.Pools");
+        method.addStatement("$1N packet = $2N.obtain($1N.class)", "io.anuke.mindustry.net.Packets.InvokePacket", "io.anuke.ucore.util.Pooling");
         //assign buffer
         method.addStatement("packet.writeBuffer = TEMP_BUFFER");
         //assign priority

build.gradle

@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
     }
 }
@@ -26,8 +26,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        aiVersion = '1.8.1'
+        uCoreVersion = '76dc741b49'
-        uCoreVersion = '2241e5402e'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
@@ -43,6 +42,17 @@ allprojects {
             return project.ext.mainClassName.substring(0, project.ext.mainClassName.indexOf("desktop") - 1)
         }
 
+        generateLocales = {
+            def output = '["en",'
+            def bundles = new File('core/assets/bundles/')
+            bundles.listFiles().each { other ->
+                if(other.name == "bundle.properties") return;
+                output += '"' + other.name.substring("bundle".length() + 1, other.name.lastIndexOf('.')) + '",'
+            }
+            output = (output.substring(0, output.size() - 1) + "]")
+            new File(project(':core').projectDir, 'assets/locales.json').text = output;
+        }
+
         writeVersion = {
             def pfile = new File('core/assets/version.properties')
             def props = new Properties()
@@ -86,7 +96,6 @@ project(":desktop") {
         compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
         compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
-        compile 'com.yuvimasory:orange-extensions:1.3.0'
     }
 }
 
@@ -102,13 +111,10 @@ project(":html") {
         compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
         compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
-        compile "com.badlogicgames.gdx:gdx-ai:$aiVersion:sources"
 
         compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion:sources"
         compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources"
-        compile "com.sksamuel.gwt:gwt-websockets:1.0.4"
-        compile "com.sksamuel.gwt:gwt-websockets:1.0.4:sources"
     }
 
     compileJava.options.compilerArgs = [
@@ -120,6 +126,25 @@ project(":ios") {
     apply plugin: "java"
     apply plugin: "robovm"
 
+    task copyGen{
+        doFirst{
+            copy{
+                from ("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
+                    include "**/*.java"
+                }
+
+                into "../core/src/io/anuke/mindustry/gen"
+            }
+        }
+
+        doLast{
+            delete{
+                delete "../core/src/io/anuke/mindustry/gen/"
+            }
+        }
+    }
+
+    build.finalizedBy(copyGen)
 
     dependencies {
         compile project(":core")
@@ -135,16 +160,16 @@ project(":ios") {
 project(":core") {
     apply plugin: "java"
 
+    task finish {
+        generateLocales()
+    }
+
     dependencies {
         compileOnly project(":annotations")
+        build.finalizedBy(finish)
 
-        boolean comp = System.properties["release"] == null || System.properties["release"] == "false"
+        def comp = System.properties["release"] == null || System.properties["release"] == "false"
-
+        if(!comp) println("Note: Compiling release build.")
-        if(!comp){
-            println("NOTICE: Compiling release build.")
-        }else{
-            println("Compiling DEBUG build.")
-        }
 
         if(new File(projectDir.parent, '../uCore').exists() && comp){
             compile project(":uCore")
@@ -168,6 +193,10 @@ project(":core") {
 project(":server") {
     apply plugin: "java"
 
+    configurations {
+        compile.exclude module: android
+    }
+    
     dependencies {
         compileOnly project(":annotations")
 
@@ -200,7 +229,6 @@ project(":kryonet") {
     dependencies {
         compile project(":core")
         compile 'com.github.crykn:kryonet:2.22.1'
-        compile "org.java-websocket:Java-WebSocket:1.3.7"
     }
 }