Save/read NBT in config files as a string to be more readable (#79)

* Switch GSON NBT saving to String

* Switch name to json extension

2 files changed, 9 insertions, 22 deletions

diff --git a/src/main/java/kubatech/api/utils/GSONUtils.java b/src/main/java/kubatech/api/utils/GSONUtils.java
index 90dd70f0df..01c186a44b 100644
--- a/src/main/java/kubatech/api/utils/GSONUtils.java
+++ b/src/main/java/kubatech/api/utils/GSONUtils.java
@@ -20,20 +20,18 @@
 
 package kubatech.api.utils;
 
-import java.io.IOException;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTSizeTracker;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
 import net.minecraft.nbt.NBTTagCompound;
 
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializer;
@@ -57,26 +55,15 @@ public class GSONUtils {
         }
     };
 
-    private static final JsonSerializer<NBTTagCompound> NBTTagCompoundSerializer = (src, typeOfSrc, context) -> {
-        try {
-            JsonArray array = new JsonArray();
-            for (byte b : CompressedStreamTools.compress(src)) {
-                array.add(new JsonPrimitive(b));
-            }
-            return array;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    };
+    private static final JsonSerializer<NBTTagCompound> NBTTagCompoundSerializer = (src, typeOfSrc,
+        context) -> new JsonPrimitive(src.toString());
 
     private static final JsonDeserializer<NBTTagCompound> NBTTagCompoundDeserializer = (json, typeOfT, context) -> {
         try {
-            if (!(json instanceof JsonArray)) return null;
-            byte[] bytes = new byte[((JsonArray) json).size()];
-            for (int i = 0; i < bytes.length; i++) bytes[i] = ((JsonArray) json).get(i)
-                .getAsByte();
-            return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L));
-        } catch (IOException e) {
+            if (!(json instanceof JsonPrimitive)) return null;
+            if (!((JsonPrimitive) json).isString()) return null;
+            return (NBTTagCompound) JsonToNBT.func_150315_a(json.getAsString());
+        } catch (NBTException e) {
             throw new RuntimeException(e);
         }
     };
diff --git a/src/main/java/kubatech/config/OverridesConfig.java b/src/main/java/kubatech/config/OverridesConfig.java
index e80e63a16f..6547854557 100644
--- a/src/main/java/kubatech/config/OverridesConfig.java
+++ b/src/main/java/kubatech/config/OverridesConfig.java
@@ -141,7 +141,7 @@ public class OverridesConfig {
     @SuppressWarnings("UnstableApiUsage")
     public static void LoadConfig() {
         LOG.info("Loading Config");
-        if (overrideFile == null) overrideFile = Config.getConfigFile("MobOverrides.cfg");
+        if (overrideFile == null) overrideFile = Config.getConfigFile("MobOverrides.json");
         if (!overrideFile.exists()) writeExampleFile();
         Reader reader = null;
         try {