Auto stash before revert of "f"

src/main/java/com/volmit/iris/util/mantle/Mantle.java

@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList;
 import com.volmit.iris.Iris;
 import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.engine.object.basic.IrisPosition;
+import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.collection.KSet;
 import com.volmit.iris.util.documentation.BlockCoordinates;
@@ -115,6 +116,12 @@ public class Mantle {
         }
     }
 
+    @ChunkCoordinates
+    public MantleChunk getChunk(int x, int z)
+    {
+        return get(x>>5, z>>5).getOrCreate(x & 31, z & 31);
+    }
+
     /**
      * Flag or unflag a chunk
      * @param x the chunk x
@@ -146,22 +153,15 @@ public class Mantle {
      * @param z the chunk z
      * @param type the type of data to iterate
      * @param iterator the iterator (x,y,z,data) -> do stuff
-     * @param requiredFlags any required flags that must be met for this chunk to be iterated
      * @param <T> the type of data to iterate
      */
     @ChunkCoordinates
-    public <T> void iterateChunk(int x, int z, Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator, MantleFlag... requiredFlags) {
+    public <T> void iterateChunk(int x, int z, Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator) {
         if(!hasTectonicPlate(x >> 5, z >> 5))
         {
             return;
         }
 
-        for (MantleFlag i : requiredFlags) {
-            if (!hasFlag(x, z, i)) {
-                return;
-            }
-        }
-
         get(x >> 5, z >> 5).getOrCreate(x & 31, z & 31).iterate(type, iterator);
     }
 
@@ -206,11 +206,20 @@ public class Mantle {
             return;
         }
 
-        Matter matter = get((x >> 4) >> 5, (z >> 4) >> 5)
-                .getOrCreate((x >> 4) & 31, (z >> 4) & 31)
-                .getOrCreate(y >> 4);
-        matter.slice(matter.getClass(t))
-                .set(x & 15, y & 15, z & 15, t);
+        if(t instanceof IrisFeaturePositional)
+        {
+            get((x >> 4) >> 5, (z >> 4) >> 5)
+                    .getOrCreate((x >> 4) & 31, (z >> 4) & 31).addFeature((IrisFeaturePositional) t);
+        }
+
+        else
+        {
+            Matter matter = get((x >> 4) >> 5, (z >> 4) >> 5)
+                    .getOrCreate((x >> 4) & 31, (z >> 4) & 31)
+                    .getOrCreate(y >> 4);
+            matter.slice(matter.getClass(t))
+                    .set(x & 15, y & 15, z & 15, t);
+        }
     }
 
     /**
@@ -235,7 +244,7 @@ public class Mantle {
             throw new RuntimeException("The Mantle is closed");
         }
 
-        if(!hasTectonicPlate(x >> 5, z >> 5))
+        if(!hasTectonicPlate((x >> 4) >> 5, (z >> 4) >> 5))
         {
             return null;
         }

src/main/java/com/volmit/iris/util/mantle/MantleChunk.java

@@ -18,17 +18,22 @@
 
 package com.volmit.iris.util.mantle;
 
+import com.volmit.iris.engine.object.feature.IrisFeaturePositional;
+import com.volmit.iris.util.data.Varint;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.function.Consumer4;
 import com.volmit.iris.util.matter.IrisMatter;
 import com.volmit.iris.util.matter.Matter;
 import com.volmit.iris.util.matter.MatterSlice;
+import com.volmit.iris.util.matter.slices.ZoneMatter;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicIntegerArray;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
@@ -37,8 +42,10 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
  * Mantle Chunks are fully atomic & thread safe
  */
 public class MantleChunk {
+    private static final ZoneMatter zm = new ZoneMatter();
     private final AtomicIntegerArray flags;
     private final AtomicReferenceArray<Matter> sections;
+    private final CopyOnWriteArrayList<IrisFeaturePositional> features;
 
     /**
      * Create a mantle chunk
@@ -49,6 +56,7 @@ public class MantleChunk {
     public MantleChunk(int sectionHeight) {
         sections = new AtomicReferenceArray<>(sectionHeight);
         flags = new AtomicIntegerArray(MantleFlag.values().length);
+        features = new CopyOnWriteArrayList<>();
 
         for (int i = 0; i < flags.length(); i++) {
             flags.set(i, 0);
@@ -76,6 +84,13 @@ public class MantleChunk {
                 sections.set(i, Matter.read(din));
             }
         }
+
+        short v = din.readShort();
+
+        for(int i = 0; i < v; i++)
+        {
+            features.add(zm.readNode(din));
+        }
     }
 
     public void flag(MantleFlag flag, boolean f) {
@@ -169,6 +184,13 @@ public class MantleChunk {
                 dos.writeBoolean(false);
             }
         }
+
+        dos.writeShort(features.size());
+
+        for(IrisFeaturePositional i : features)
+        {
+            zm.writeNode(i, dos);
+        }
     }
 
     private void trimSlice(int i) {
@@ -186,26 +208,6 @@ public class MantleChunk {
         }
     }
 
-    public <T> void iterate(Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator, BurstExecutor burst) {
-        for (int i = 0; i < sections.length(); i++) {
-            int finalI = i;
-            burst.queue(() -> {
-                int bs = (finalI << 4);
-                Matter matter = get(finalI);
-
-                if (matter != null) {
-                    MatterSlice<T> t = matter.getSlice(type);
-
-                    if (t != null) {
-                        t.iterateSync((a, b, c, f) -> iterator.accept(a, b + bs, c, f));
-                    }
-                }
-            });
-        }
-
-        burst.complete();
-    }
-
     public <T> void iterate(Class<T> type, Consumer4<Integer, Integer, Integer, T> iterator) {
         for (int i = 0; i < sections.length(); i++) {
             int bs = (i << 4);
@@ -220,4 +222,12 @@ public class MantleChunk {
             }
         }
     }
+
+    public void addFeature(IrisFeaturePositional t) {
+        features.add(t);
+    }
+
+    public List<IrisFeaturePositional> getFeatures() {
+        return features;
+    }
 }

src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java

@@ -19,9 +19,11 @@
 package com.volmit.iris.util.mantle;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.engine.data.cache.Cache;
 import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.format.Form;
+import com.volmit.iris.util.hunk.storage.ArrayHunk;
 import com.volmit.iris.util.scheduling.PrecisionStopwatch;
 
 import java.io.*;
@@ -140,7 +142,7 @@ public class TectonicPlate {
 
     @ChunkCoordinates
     private int index(int x, int z) {
-        return (x & 0x1F) + (z & 0x1F) * 32;
+        return Cache.to1D(x, z, 0, 32, 32);
     }
 
     /**