From 233144eedea3d296c1b0c0788cde64e9ecd61dd5 Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Mon, 4 Jan 2021 20:53:33 -0500
Subject: [PATCH] Update parallax chunk meta to json

---
 .../scaffold/parallax/ParallaxChunkMeta.java  | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java
index 4d0190155..7bda8e783 100644
--- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java
+++ b/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java
@@ -1,8 +1,11 @@
 package com.volmit.iris.scaffold.parallax;
 
+import com.google.gson.Gson;
+import com.volmit.iris.object.IrisFeaturePositional;
 import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter;
 import com.volmit.iris.scaffold.hunk.io.PaletteHunkIOAdapter;
 import com.volmit.iris.util.CompoundTag;
+import com.volmit.iris.util.KList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -17,42 +20,27 @@ public class ParallaxChunkMeta {
     public static final Function<CompoundTag, HunkIOAdapter<ParallaxChunkMeta>> adapter = (c) -> new PaletteHunkIOAdapter<ParallaxChunkMeta>() {
         @Override
         public void write(ParallaxChunkMeta parallaxChunkMeta, DataOutputStream dos) throws IOException {
-            dos.writeBoolean(parallaxChunkMeta.isUpdates());
-            dos.writeBoolean(parallaxChunkMeta.isGenerated());
-            dos.writeBoolean(parallaxChunkMeta.isParallaxGenerated());
-            dos.writeBoolean(parallaxChunkMeta.isObjects());
-
-            if(parallaxChunkMeta.isObjects())
-            {
-                dos.writeByte(parallaxChunkMeta.getMinObject() + Byte.MIN_VALUE);
-                dos.writeByte(parallaxChunkMeta.getMaxObject() + Byte.MIN_VALUE);
-            }
-
-            dos.writeInt(parallaxChunkMeta.count);
+            dos.writeUTF(new Gson().toJson(parallaxChunkMeta));
         }
 
         @Override
         public ParallaxChunkMeta read(DataInputStream din) throws IOException {
-            boolean bb = din.readBoolean();
-            boolean g = din.readBoolean();
-            boolean p = din.readBoolean();
-            boolean o = din.readBoolean();
-            int min = o ? din.readByte() - Byte.MIN_VALUE : -1;
-            int max = o ? din.readByte() - Byte.MIN_VALUE : -1;
-            return new ParallaxChunkMeta(bb, g, p, o, min, max, din.readInt());
+           return new Gson().fromJson(din.readUTF(), ParallaxChunkMeta.class);
         }
     };
 
     private boolean updates;
     private boolean generated;
     private boolean parallaxGenerated;
+    private boolean featureGenerated;
     private boolean objects;
     private int maxObject = -1;
     private int minObject = -1;
     private int count;
+    private KList<IrisFeaturePositional> zones;
 
     public ParallaxChunkMeta()
     {
-        this(false, false, false, false, -1, -1, 0);
+        this(false, false, false, false, false, -1, -1, 0, new KList<>());
     }
 }