Fixed ground units always spawning in (-1, -1)

Just making another revision.

.gitignore

@@ -1,5 +1,6 @@
 ##Packr, build stuff
 
+logs/
 /core/assets/mindustry-saves/
 /core/assets/mindustry-maps/
 /core/assets/bundles/output/
@@ -25,6 +26,8 @@
 /core/assets/version.properties
 /core/assets/locales
 /ios/src/io/anuke/mindustry/gen/
+/core/src/io/anuke/mindustry/gen/
+ios/robovm.properties
 *.gif
 
 version.properties

.travis.yml

@@ -1,26 +1,20 @@
-language: android
 
 jdk:
-    - openjdk8
+- openjdk8
-
-android:
-  components:
-    - android-28
-
-    # Additional components
-    - extra-google-google_play_services
-    - extra-google-m2repository
-    - extra-android-m2repository
-    - addon-google_apis-google-28
-    - build-tools-28.0.3
-
 script:
-    - ./gradlew test
+- "./gradlew test"
-    - ./gradlew desktop:dist
+- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
-    - ./gradlew server:dist
+- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
-
-after_success:
-    - chmod +x upload-build.sh
-    - 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

@@ -11,27 +11,29 @@ _[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:
 
+#### Windows
 
-**_Windows_**
+_Running:_ `gradlew desktop:run`  
+_Building:_ `gradlew desktop:dist`
 
-_Running:_ `gradlew.bat desktop:run`  
+#### Linux
-_Building:_ `gradlew.bat desktop:dist`
-
-
-**_Linux_**
 
 _Running:_ `./gradlew desktop:run`  
 _Building:_ `./gradlew desktop:dist`
 
+#### For Server Builds...
+
+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`.
+
 ---
 
 Gradle may take up to several minutes to download files. Be patient. <br>
-After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar.`
+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
 

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.2.1'
+    }
+}
 
 apply plugin: "com.android.application"
 
@@ -14,9 +27,9 @@ repositories {
 dependencies {
     implementation project(":core")
     implementation project(":kryonet")
-    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"
     natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
@@ -24,6 +37,12 @@ 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-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"
 }
 
@@ -74,7 +93,7 @@ android {
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode code
         versionName versionNameResult
     }

android/res/layout/gdxdialogs_inputtext.xml

@@ -1,21 +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"
-         >
- 
-        <requestFocus />
- 
-    </EditText>
- 
-</LinearLayout>

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

@@ -19,17 +19,14 @@ 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.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.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;
@@ -38,12 +35,7 @@ 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.*;
 
@@ -58,43 +50,16 @@ public class AndroidLauncher extends PatchedAndroidApplication{
         AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
         config.useImmersiveMode = true;
         Platform.instance = new Platform(){
-            DateFormat format = SimpleDateFormat.getDateTimeInstance();
-
-            @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 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){
@@ -147,6 +112,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{
                 return true;
             }
         };
+
         try{
             ProviderInstaller.installIfNeeded(this);
         }catch(GooglePlayServicesRepairableException e){

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 ignored){
-            }
-        }
-
-        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

@@ -68,7 +68,6 @@ public class DonationsActivity extends FragmentActivity{
         Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment");
         if(fragment != null){
             fragment.onActivityResult(requestCode, resultCode, data);
-            //TODO donation event, set settings?
         }
     }
 }

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/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/RemoteReadGenerator.java

@@ -2,6 +2,8 @@ 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;

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

@@ -52,7 +52,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
                 .addSuperinterface(ParameterizedTypeName.get(
-                ClassName.get(Class.forName("io.anuke.ucore.io.TypeSerializer")), type));
+                ClassName.bestGuess("io.anuke.ucore.io.TypeSerializer"), type));
 
                 MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
                 .returns(void.class)

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

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

build.gradle

@@ -8,8 +8,6 @@ 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.2.1'
         classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
     }
 }
@@ -21,17 +19,17 @@ allprojects {
     version = 'release'
 
     ext {
-        versionNumber = '4.0'
+        versionNumber = '4'
         versionModifier = 'alpha'
         versionType = 'official'
         appName = 'Mindustry'
-        gdxVersion = '1.9.8'
+        gdxVersion = '1.9.9'
         roboVMVersion = '2.3.0'
-        uCoreVersion = 'd5f892dcf1773b0f6d47d2190d139cc6342ac75f'
+        uCoreVersion = '3dfb820142a0fc583ad19413a24fc5038aa29d89'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
-            return "$versionNumber-$versionType-$buildVersion"
+            return "$versionNumber-$versionModifier-$buildVersion"
         }
 
         getBuildVersion = {
@@ -97,28 +95,11 @@ project(":desktop") {
         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 '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"
-    }
-}
-
 project(":ios") {
     apply plugin: "java"
     apply plugin: "robovm"
@@ -129,16 +110,34 @@ project(":ios") {
                 include "**/*.java"
             }
 
-            into "ios/src/io/anuke/mindustry/gen"
+            into "core/src/io/anuke/mindustry/gen"
         }
 
         doFirst{
             delete{
-                delete "ios/src/io/anuke/mindustry/gen/"
+                delete "core/src/io/anuke/mindustry/gen/"
             }
         }
     }
 
+    task incrementConfig{
+        def vfile = file('robovm.properties')
+
+        def props = new Properties()
+        if(vfile.exists()){
+            props.load(new FileInputStream(vfile))
+        }
+
+        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.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
+        props.store(vfile.newWriter(), null)
+    }
+
+    build.dependsOn(incrementConfig)
     build.dependsOn(copyGen)
 
     dependencies {
@@ -149,6 +148,8 @@ project(":ios") {
         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")
     }
 }
 
@@ -160,7 +161,6 @@ project(":core") {
     }
 
     dependencies {
-        compileOnly project(":annotations")
         build.finalizedBy(finish)
 
         def comp = System.properties["release"] == null || System.properties["release"] == "false"
@@ -178,11 +178,11 @@ project(":core") {
 
         compile "com.badlogicgames.gdx:gdx:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
-    }
+        compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
 
-    compileJava.options.compilerArgs = [
+        compileOnly project(":annotations")
-        "-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor,io.anuke.annotations.SerializeAnnotationProcessor"
+        annotationProcessor project(":annotations")
-    ]
+    }
 }
 
 project(":server") {
@@ -195,7 +195,6 @@ project(":server") {
     }
     
     dependencies {
-        compileOnly project(":annotations")
 
         compile project(":core")
         compile project(":kryonet")

core/assets-raw/sprites/pack.json

@@ -1,5 +1,6 @@
 {
 	duplicatePadding: true,
 	combineSubdirectories: true,
-	flattenPaths: true
+	flattenPaths: true,
+	fast: true
 }