From ec4c2c7adb385124046b0681c07a8e0d203c429d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 25 Dec 2019 12:22:12 -0500
Subject: [PATCH] Fixed compilation

---
 .gitignore                                               | 4 ++--
 .../annotations/SerializeAnnotationProcessor.java        | 9 +++++----
 core/src/mindustry/io/JsonIO.java                        | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index c362483e39..10fca2d7f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,8 @@ steam_appid.txt
 /core/assets/gifexport/
 /core/assets/version.properties
 /core/assets/locales
-/ios/src/io/anuke/mindustry/gen/
-/core/src/io/anuke/mindustry/gen/
+/ios/src/mindustry/gen/
+/core/src/mindustry/gen/
 ios/robovm.properties
 packr-out/
 config/
diff --git a/annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java b/annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
index d93ebefb3f..af66fc3b11 100644
--- a/annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
+++ b/annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
@@ -8,6 +8,7 @@ import javax.lang.model.*;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.*;
 import javax.lang.model.util.*;
+import javax.tools.Diagnostic.*;
 import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
@@ -43,7 +44,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
 
                 TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
                 .addSuperinterface(ParameterizedTypeName.get(
-                ClassName.bestGuess("io.anuke.arc.Settings.TypeSerializer"), type));
+                ClassName.bestGuess("arc.Settings.TypeSerializer"), type));
 
                 MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
                 .returns(void.class)
@@ -73,8 +74,8 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                         writeMethod.addStatement("stream.write" + capName + "(object." + name + ")");
                         readMethod.addStatement("object." + name + "= stream.read" + capName + "()");
                     }else{
-                        writeMethod.addStatement("io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
-                        readMethod.addStatement("object." + name + " = (" + typeName + ")io.anuke.arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
+                        writeMethod.addStatement("arc.Core.settings.getSerializer(" + typeName + ".class).write(stream, object." + name + ")");
+                        readMethod.addStatement("object." + name + " = (" + typeName + ")arc.Core.settings.getSerializer(" + typeName + ".class).read(stream)");
                     }
                 }
 
@@ -83,7 +84,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
                 serializer.addMethod(writeMethod.build());
                 serializer.addMethod(readMethod.build());
 
-                method.addStatement("io.anuke.arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
+                method.addStatement("arc.Core.settings.setSerializer($N, $L)", Utils.elementUtils.getBinaryName(elem).toString().replace('$', '.') + ".class", serializer.build());
 
                 name(writeMethod, "write" + simpleTypeName);
                 name(readMethod, "read" + simpleTypeName);
diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java
index 1d8e0e69bb..7c570bace8 100644
--- a/core/src/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -53,11 +53,11 @@ public class JsonIO{
     }
 
     public static <T> T read(Class<T> type, String string){
-        return json.fromJson(type, string);
+        return json.fromJson(type, string.replace("io.anuke.", ""));
     }
 
     public static <T> T read(Class<T> type, T base, String string){
-        return jsonBase.fromBaseJson(type, base, string);
+        return jsonBase.fromBaseJson(type, base, string.replace("io.anuke.", ""));
     }
 
     public static String print(String in){