Cleanup

src/main/java/com/volmit/iris/engine/data/cache/Cache.java

@@ -25,10 +25,6 @@ public interface Cache<V> {
         return key(chunk.getX(), chunk.getZ());
     }
 
-    int getId();
-
-    V get(int x, int z);
-
     static long key(int x, int z) {
         return (((long) x) << 32) | (z & 0xffffffffL);
     }
@@ -52,4 +48,8 @@ public interface Cache<V> {
         final int x = idx % w;
         return new int[]{x, y, z};
     }
+
+    int getId();
+
+    V get(int x, int z);
 }

src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java

@@ -34,8 +34,8 @@ import org.bukkit.material.MaterialData;
 @SuppressWarnings("deprecation")
 public class LinkedTerrainChunk implements TerrainChunk {
     private final IrisBiomeStorage biome3D;
-    private ChunkData rawChunkData;
     private final BiomeGrid storage;
+    private ChunkData rawChunkData;
     @Setter
     private boolean unsafe = false;
 

src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java

@@ -46,18 +46,11 @@ public class MCATerrainChunk implements TerrainChunk {
         return injector;
     }
 
-    @Override
-    public void setRaw(ChunkGenerator.ChunkData data) {
-
-    }
-
-
     @Override
     public Biome getBiome(int x, int z) {
         return Biome.THE_VOID;
     }
 
-
     @Override
     public Biome getBiome(int x, int y, int z) {
         return Biome.THE_VOID;
@@ -99,7 +92,6 @@ public class MCATerrainChunk implements TerrainChunk {
         mcaChunk.setBlockStateAt(xx, y, zz, NBTWorld.getCompound(blockData), false);
     }
 
-
     @Override
     public org.bukkit.block.data.BlockData getBlockData(int x, int y, int z) {
         if (y > getMaxHeight()) {
@@ -118,6 +110,11 @@ public class MCATerrainChunk implements TerrainChunk {
         return null;
     }
 
+    @Override
+    public void setRaw(ChunkGenerator.ChunkData data) {
+
+    }
+
     @Override
     public void inject(ChunkGenerator.BiomeGrid biome) {
 

src/main/java/com/volmit/iris/engine/data/chunk/TerrainChunk.java

@@ -46,8 +46,6 @@ public interface TerrainChunk extends BiomeGrid, ChunkData {
 
     BiomeBaseInjector getBiomeBaseInjector();
 
-    void setRaw(ChunkData data);
-
     /**
      * Get biome at x, z within chunk being generated
      *
@@ -129,5 +127,7 @@ public interface TerrainChunk extends BiomeGrid, ChunkData {
 
     ChunkData getRaw();
 
+    void setRaw(ChunkData data);
+
     void inject(BiomeGrid biome);
 }

src/main/java/com/volmit/iris/engine/data/io/Deserializer.java

@@ -18,7 +18,12 @@
 
 package com.volmit.iris.engine.data.io;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 
 public interface Deserializer<T> {

src/main/java/com/volmit/iris/engine/data/io/Serializer.java

@@ -18,7 +18,12 @@
 
 package com.volmit.iris.engine.data.io;
 
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 
 public interface Serializer<T> {
 

src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java

@@ -18,7 +18,13 @@
 
 package com.volmit.iris.engine.data.io;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
 
 public interface StringDeserializer<T> extends Deserializer<T> {
 

src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java

@@ -18,7 +18,13 @@
 
 package com.volmit.iris.engine.data.io;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 
 public interface StringSerializer<T> extends Serializer<T> {