Crash fix

# Conflicts:
#	core/assets/bundles/bundle.properties

.travis.yml

@@ -1,4 +1,3 @@
-
 jdk:
   - openjdk8
 script:

android/AndroidManifest.xml

@@ -60,10 +60,6 @@
             </intent-filter>
         </activity>
 
-
-        <activity android:name=".DonationsActivity"
-            android:theme="@style/GdxTheme" />
-
     </application>
 
 </manifest>

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies{
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
     }
 }
 

android/project.properties

@@ -9,6 +9,5 @@
 #
 # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
 # Project target.
 target=android-19

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

@@ -18,18 +18,15 @@ 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.mindustry.net.ArcNetClient;
+import io.anuke.mindustry.net.ArcNetServer;
 
-import java.io.File;
+import java.io.*;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 
 import static io.anuke.mindustry.Vars.*;
@@ -114,8 +111,8 @@ public class AndroidLauncher extends AndroidApplication{
         }
 
         config.hideStatusBar = true;
-        Net.setClientProvider(new KryoClient());
+        Net.setClientProvider(new ArcNetClient());
-        Net.setServerProvider(new KryoServer());
+        Net.setServerProvider(new ArcNetServer());
         initialize(new Mindustry(), config);
         checkFiles(getIntent());
     }

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

@@ -1,9 +1,6 @@
 package io.anuke.annotations;
 
-import java.lang.annotation.ElementType;
+import java.lang.annotation.*;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 public class Annotations{
 

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

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

@@ -1,8 +1,6 @@
 package io.anuke.annotations;
 
-import io.anuke.annotations.Annotations.Loc;
+import io.anuke.annotations.Annotations.*;
-import io.anuke.annotations.Annotations.PacketPriority;
-import io.anuke.annotations.Annotations.Variant;
 
 import javax.lang.model.element.ExecutableElement;
 

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

@@ -1,18 +1,13 @@
 package io.anuke.annotations;
 
-import com.squareup.javapoet.FieldSpec;
+import com.squareup.javapoet.*;
-import com.squareup.javapoet.JavaFile;
-import com.squareup.javapoet.TypeSpec;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
+import javax.lang.model.element.*;
-import javax.lang.model.element.ExecutableElement;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 import java.util.*;
 import java.util.stream.Collectors;

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

@@ -3,9 +3,7 @@ package io.anuke.annotations;
 import com.squareup.javapoet.*;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic.Kind;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -25,7 +23,6 @@ public class RemoteReadGenerator{
 
     /**
      * 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.

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

@@ -4,10 +4,7 @@ import com.squareup.javapoet.*;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.IOFinder.ClassSerializer;
 
-import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.*;
-import javax.lang.model.element.Modifier;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.tools.Diagnostic.Kind;
 import java.io.IOException;
 import java.nio.ByteBuffer;

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

@@ -5,13 +5,9 @@ import io.anuke.annotations.Annotations.Serialize;
 
 import javax.annotation.processing.*;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Modifier;
+import javax.lang.model.element.*;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.VariableElement;
 import javax.lang.model.util.ElementFilter;
-import java.io.DataInput;
+import java.io.*;
-import java.io.DataOutput;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Set;
@@ -99,7 +95,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 List<VariableElement> fields = ElementFilter.fieldsIn(Utils.elementUtils.getAllMembers(elem));
                 for(VariableElement field : fields){
-                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE)) continue;
+                    if(field.getModifiers().contains(Modifier.STATIC) || field.getModifiers().contains(Modifier.TRANSIENT) || field.getModifiers().contains(Modifier.PRIVATE))
+                        continue;
 
                     String name = field.getSimpleName().toString();
                     String typeName = Utils.typeUtils.erasure(field.asType()).toString().replace('$', '.');

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

@@ -1,25 +1,22 @@
 package io.anuke.annotations;
 
-import com.squareup.javapoet.JavaFile;
+import com.squareup.javapoet.*;
-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.*;
-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.*/
+ * 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"

build.gradle

@@ -89,7 +89,8 @@ allprojects{
 
             try{
                 pfile.createNewFile()
-            }catch(Exception ignored){}
+            }catch(Exception ignored){
+            }
 
             if(pfile.exists()){
                 props.load(new FileInputStream(pfile))
@@ -112,6 +113,7 @@ allprojects{
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url "https://oss.sonatype.org/content/repositories/releases/" }
         maven{ url 'https://jitpack.io' }
+        jcenter()
     }
 }
 
@@ -128,7 +130,7 @@ project(":desktop"){
         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'
+        compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.2'
     }
 }
 
@@ -174,32 +176,10 @@ project(":core"){
         generateLocales()
     }
 
-    task cleanGen{
-        doFirst{
-            delete{
-                delete "../core/src/io/anuke/mindustry/gen/"
-            }
-        }
-    }
-
-    task copyGen{
-        doLast{
-            copy{
-                from("../core/build/classes/java/main/io/anuke/mindustry/gen/"){
-                    include "**/*.java"
-                }
-
-                into "../core/src/io/anuke/mindustry/gen"
-            }
-        }
-    }
-
     dependencies{
-        compileJava.dependsOn(cleanGen)
-        compileJava.finalizedBy(copyGen)
-
         compile arcModule("arc-core")
         compile arcModule("extensions:freetype")
+        compile arcModule("extensions:arcnet")
         if(localArc() && debugged()) compile arcModule("extensions:recorder")
 
         compileOnly project(":annotations")
@@ -256,7 +236,6 @@ project(":net"){
     dependencies{
         compile project(":core")
         compile "org.lz4:lz4-java:1.4.1"
-        compile 'com.github.Anuken:kryonet:a64d2280880e80566ca1bdaffa55de43e51cad38'
         compile 'com.github.Anuken:WaifUPnP:05eb46bc577fd7674596946ba288c96c0cedd893'
     }
 }

core/assets-raw/sprites/blocks/environment/pack.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 2048,
   maxHeight: 2048,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites/blocks/environment/pack_fallback.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 1024,
   maxHeight: 1024,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites/pack.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 2048,
   maxHeight: 2048,
-	fast: true,
+  fast: true
 }

core/assets-raw/sprites/pack_fallback.json

@@ -4,5 +4,5 @@
   flattenPaths: true,
   maxWidth: 1024,
   maxHeight: 1024,
-	fast: true,
+  fast: true
 }