Gaea is gone

common/src/main/java/com/dfsek/terra/TerraProfiler.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra;
 
-import com.dfsek.terra.api.gaea.profiler.DataType;
-import com.dfsek.terra.api.gaea.profiler.Measurement;
-import com.dfsek.terra.api.gaea.profiler.WorldProfiler;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.profiler.DataType;
+import com.dfsek.terra.api.profiler.Measurement;
+import com.dfsek.terra.api.profiler.WorldProfiler;
 
 public class TerraProfiler extends WorldProfiler {
     public TerraProfiler(World w) {

common/src/main/java/com/dfsek/terra/api/GenericLoaders.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api;
 
 import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
 import com.dfsek.terra.biome.palette.PaletteHolder;

common/src/main/java/com/dfsek/terra/api/gaea/Debug.java

@@ -1,26 +0,0 @@
-package com.dfsek.terra.api.gaea;
-
-import com.dfsek.terra.api.platform.TerraPlugin;
-
-public class Debug {
-    public static TerraPlugin main;
-
-    public static void setMain(TerraPlugin main) {
-        Debug.main = main;
-    }
-
-    public static void info(String message) {
-        if(Gaea.isDebug()) main.getLogger().info(message);
-    }
-    public static void warn(String message) {
-        if(Gaea.isDebug()) main.getLogger().warning(message);
-    }
-
-    public static void error(String message) {
-        if(Gaea.isDebug()) main.getLogger().severe(message);
-    }
-
-    public static void stack(Exception e) {
-        if(Gaea.isDebug()) e.printStackTrace();
-    }
-}

common/src/main/java/com/dfsek/terra/api/gaea/serial/MovedObjectInputStream.java

@@ -1,50 +0,0 @@
-package com.dfsek.terra.api.gaea.serial;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.lang.reflect.Field;
-
-public class MovedObjectInputStream extends ObjectInputStream {
-    private final String oldNameSpace;
-    private final String newNameSpace;
-
-    public MovedObjectInputStream(InputStream in, String oldNameSpace, String newNameSpace) throws IOException {
-        super(in);
-        this.oldNameSpace = oldNameSpace;
-        this.newNameSpace = newNameSpace;
-    }
-
-    @Override
-    protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
-        ObjectStreamClass result = super.readClassDescriptor();
-        try {
-            if (result.getName().contains(oldNameSpace)) {
-                String newClassName = result.getName().replace(oldNameSpace, newNameSpace);
-                Class localClass = Class.forName(newClassName);
-
-                Field nameField = ObjectStreamClass.class.getDeclaredField("name");
-                nameField.setAccessible(true);
-                nameField.set(result, newClassName);
-
-                ObjectStreamClass localClassDescriptor = ObjectStreamClass.lookup(localClass);
-                Field suidField = ObjectStreamClass.class.getDeclaredField("suid");
-                suidField.setAccessible(true);
-                suidField.set(result, localClassDescriptor.getSerialVersionUID());
-            }
-        } catch(Exception e) {
-            throw new IOException("Exception when trying to replace namespace", e);
-        }
-        return result;
-    }
-
-    @Override
-    protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-        if (desc.getName().contains(oldNameSpace)) {
-            String newClassName = desc.getName().replace(oldNameSpace, newNameSpace);
-            return Class.forName(newClassName);
-        }
-        return super.resolveClass(desc);
-    }
-}

common/src/main/java/com/dfsek/terra/api/gaea/util/SerializationUtil.java

@@ -1,26 +0,0 @@
-package com.dfsek.terra.api.gaea.util;
-
-import com.dfsek.terra.api.gaea.serial.MovedObjectInputStream;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-
-public class SerializationUtil {
-    public static Object fromFile(File f) throws IOException, ClassNotFoundException {
-        ObjectInputStream ois = new MovedObjectInputStream(new FileInputStream(f), "org.polydev.gaea", "com.dfsek.terra.api.gaea"); // Backwards compat with old Gaea location
-        Object o = ois.readObject();
-        ois.close();
-        return o;
-    }
-
-    public static void toFile(Serializable o, File f) throws IOException {
-        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(f));
-        oos.writeObject(o);
-        oos.close();
-    }
-}

common/src/main/java/com/dfsek/terra/api/lang/Language.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.lang;
+package com.dfsek.terra.api.lang;
 
 
 import com.dfsek.tectonic.config.Configuration;

common/src/main/java/com/dfsek/terra/api/lang/Message.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.lang;
+package com.dfsek.terra.api.lang;
 
 
 import com.dfsek.terra.api.platform.CommandSender;

common/src/main/java/com/dfsek/terra/api/lang/MultiLineMessage.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.lang;
+package com.dfsek.terra.api.lang;
 
 import com.dfsek.terra.api.platform.CommandSender;
 

common/src/main/java/com/dfsek/terra/api/lang/SingleLineMessage.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.lang;
+package com.dfsek.terra.api.lang;
 
 
 import com.dfsek.terra.api.platform.CommandSender;

common/src/main/java/com/dfsek/terra/api/loot/Entry.java

@@ -1,12 +1,12 @@
-package com.dfsek.terra.api.gaea.structures.loot;
+package com.dfsek.terra.api.loot;
 
-import com.dfsek.terra.api.gaea.structures.loot.functions.AmountFunction;
+import com.dfsek.terra.api.loot.functions.AmountFunction;
-import com.dfsek.terra.api.gaea.structures.loot.functions.DamageFunction;
+import com.dfsek.terra.api.loot.functions.DamageFunction;
-import com.dfsek.terra.api.gaea.structures.loot.functions.Function;
+import com.dfsek.terra.api.loot.functions.Function;
-import com.dfsek.terra.api.gaea.util.GlueList;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.util.GlueList;
 import net.jafama.FastMath;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;

common/src/main/java/com/dfsek/terra/api/loot/LootTable.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.api.gaea.structures.loot;
+package com.dfsek.terra.api.loot;
 
-import com.dfsek.terra.api.gaea.util.GlueList;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.inventory.Inventory;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.util.GlueList;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;

common/src/main/java/com/dfsek/terra/api/loot/Pool.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.api.gaea.structures.loot;
+package com.dfsek.terra.api.loot;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.util.GlueList;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.util.GlueList;
 import net.jafama.FastMath;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;

common/src/main/java/com/dfsek/terra/api/loot/functions/AmountFunction.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.structures.loot.functions;
+package com.dfsek.terra.api.loot.functions;
 
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;

common/src/main/java/com/dfsek/terra/api/loot/functions/DamageFunction.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.structures.loot.functions;
+package com.dfsek.terra.api.loot.functions;
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.Damageable;

common/src/main/java/com/dfsek/terra/api/loot/functions/Function.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.structures.loot.functions;
+package com.dfsek.terra.api.loot.functions;
 
 
 import com.dfsek.terra.api.platform.inventory.ItemStack;

common/src/main/java/com/dfsek/terra/api/math/ChunkInterpolator3.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.math;
+package com.dfsek.terra.api.math;
 
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.world.biome.BiomeGrid;

common/src/main/java/com/dfsek/terra/api/math/FastNoiseLite.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.math;// MIT License
+package com.dfsek.terra.api.math;// MIT License
 
 import net.jafama.FastMath;
 
@@ -328,14 +328,14 @@ public class FastNoiseLite {
     private TransformType3D mWarpTransformType3D = TransformType3D.DefaultOpenSimplex2;
     private double mDomainWarpAmp = 1.0f;
 
-    private static final com.dfsek.terra.api.gaea.math.FastNoiseLite CELLULAR_LOOKUP_DEFAULT = new com.dfsek.terra.api.gaea.math.FastNoiseLite();
+    private static final com.dfsek.terra.api.math.FastNoiseLite CELLULAR_LOOKUP_DEFAULT = new com.dfsek.terra.api.math.FastNoiseLite();
-    private com.dfsek.terra.api.gaea.math.FastNoiseLite cellularNoiseLookup = CELLULAR_LOOKUP_DEFAULT;
+    private com.dfsek.terra.api.math.FastNoiseLite cellularNoiseLookup = CELLULAR_LOOKUP_DEFAULT;
 
-    public com.dfsek.terra.api.gaea.math.FastNoiseLite getCellularNoiseLookup() {
+    public com.dfsek.terra.api.math.FastNoiseLite getCellularNoiseLookup() {
         return cellularNoiseLookup;
     }
 
-    public void setCellularNoiseLookup(com.dfsek.terra.api.gaea.math.FastNoiseLite cellularNoiseLookup) {
+    public void setCellularNoiseLookup(com.dfsek.terra.api.math.FastNoiseLite cellularNoiseLookup) {
         this.cellularNoiseLookup = cellularNoiseLookup;
     }
 

common/src/main/java/com/dfsek/terra/api/math/Interpolator.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.math;
+package com.dfsek.terra.api.math;
 
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/api/math/Interpolator3.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.math;
+package com.dfsek.terra.api.math;
 
 /**
  * Class for bilinear interpolation of values arranged on a unit square.

common/src/main/java/com/dfsek/terra/api/math/MathUtil.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.gaea.math;
+package com.dfsek.terra.api.math;
 
-import com.dfsek.terra.api.gaea.util.FastRandom;
+import com.dfsek.terra.api.util.FastRandom;
 import net.jafama.FastMath;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/api/math/ProbabilityCollection.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.math;
+package com.dfsek.terra.api.math;
 
 import com.dfsek.terra.api.world.biome.NormalizationUtil;
 
@@ -13,7 +13,7 @@ public class ProbabilityCollection<E> {
     private Object[] array = new Object[0];
     private int size;
 
-    public com.dfsek.terra.api.gaea.math.ProbabilityCollection<E> add(E item, int probability) {
+    public com.dfsek.terra.api.math.ProbabilityCollection<E> add(E item, int probability) {
         if(!cont.contains(item)) size++;
         cont.add(item);
         int oldLength = array.length;

common/src/main/java/com/dfsek/terra/api/math/Range.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.math;
+package com.dfsek.terra.api.math;
 
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +24,7 @@ public class Range implements Iterable<Integer> {
         return max;
     }
 
-    public com.dfsek.terra.api.gaea.math.Range setMax(int max) {
+    public com.dfsek.terra.api.math.Range setMax(int max) {
         this.max = max;
         return this;
     }
@@ -33,7 +33,7 @@ public class Range implements Iterable<Integer> {
         return min;
     }
 
-    public com.dfsek.terra.api.gaea.math.Range setMin(int min) {
+    public com.dfsek.terra.api.math.Range setMin(int min) {
         this.min = min;
         return this;
     }
@@ -42,35 +42,35 @@ public class Range implements Iterable<Integer> {
         return max - min;
     }
 
-    public com.dfsek.terra.api.gaea.math.Range multiply(int mult) {
+    public com.dfsek.terra.api.math.Range multiply(int mult) {
         min *= mult;
         max *= mult;
         return this;
     }
 
-    public com.dfsek.terra.api.gaea.math.Range reflect(int pt) {
+    public com.dfsek.terra.api.math.Range reflect(int pt) {
-        return new com.dfsek.terra.api.gaea.math.Range(2 * pt - this.getMax(), 2 * pt - this.getMin());
+        return new com.dfsek.terra.api.math.Range(2 * pt - this.getMax(), 2 * pt - this.getMin());
     }
 
     public int get(Random r) {
         return r.nextInt((max - min) + 1) + min;
     }
 
-    public com.dfsek.terra.api.gaea.math.Range intersects(com.dfsek.terra.api.gaea.math.Range other) {
+    public com.dfsek.terra.api.math.Range intersects(com.dfsek.terra.api.math.Range other) {
         try {
-            return new com.dfsek.terra.api.gaea.math.Range(FastMath.max(this.getMin(), other.getMin()), FastMath.min(this.getMax(), other.getMax()));
+            return new com.dfsek.terra.api.math.Range(FastMath.max(this.getMin(), other.getMin()), FastMath.min(this.getMax(), other.getMax()));
         } catch(IllegalArgumentException e) {
             return null;
         }
     }
 
-    public com.dfsek.terra.api.gaea.math.Range add(int add) {
+    public com.dfsek.terra.api.math.Range add(int add) {
         this.min += add;
         this.max += add;
         return this;
     }
 
-    public com.dfsek.terra.api.gaea.math.Range sub(int sub) {
+    public com.dfsek.terra.api.math.Range sub(int sub) {
         this.min -= sub;
         this.max -= sub;
         return this;
@@ -88,8 +88,8 @@ public class Range implements Iterable<Integer> {
 
     @Override
     public boolean equals(Object obj) {
-        if(! (obj instanceof com.dfsek.terra.api.gaea.math.Range)) return false;
+        if(!(obj instanceof com.dfsek.terra.api.math.Range)) return false;
-        com.dfsek.terra.api.gaea.math.Range other = (com.dfsek.terra.api.gaea.math.Range) obj;
+        com.dfsek.terra.api.math.Range other = (com.dfsek.terra.api.math.Range) obj;
         return other.getMin() == this.getMin() && other.getMax() == this.getMax();
     }
 
@@ -100,10 +100,10 @@ public class Range implements Iterable<Integer> {
     }
 
     private static class RangeIterator implements Iterator<Integer> {
-        private final com.dfsek.terra.api.gaea.math.Range m;
+        private final com.dfsek.terra.api.math.Range m;
         private Integer current;
 
-        public RangeIterator(com.dfsek.terra.api.gaea.math.Range m) {
+        public RangeIterator(com.dfsek.terra.api.math.Range m) {
             this.m = m;
             current = m.getMin();
         }

common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.api.platform;
 
 import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.LoaderRegistrar;
-import com.dfsek.terra.api.gaea.lang.Language;
+import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.platform.inventory.ItemHandle;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.WorldHandle;

common/src/main/java/com/dfsek/terra/api/profiler/DataHolder.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.profiler;
+package com.dfsek.terra.api.profiler;
 
 /**
  * Class to hold a profiler data value. Contains formatting method to highlight value based on desired range.

common/src/main/java/com/dfsek/terra/api/profiler/DataType.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.profiler;
+package com.dfsek.terra.api.profiler;
 
 import net.jafama.FastMath;
 

common/src/main/java/com/dfsek/terra/api/profiler/Desire.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.profiler;
+package com.dfsek.terra.api.profiler;
 
 
 /**

common/src/main/java/com/dfsek/terra/api/profiler/Measurement.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.gaea.profiler;
+package com.dfsek.terra.api.profiler;
 
-import com.dfsek.terra.api.gaea.math.MathUtil;
+import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.gaea.util.GlueList;
+import com.dfsek.terra.api.util.GlueList;
 import net.jafama.FastMath;
 
 import java.math.BigInteger;

common/src/main/java/com/dfsek/terra/api/profiler/ProfileFuture.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.profiler;
+package com.dfsek.terra.api.profiler;
 
 import java.util.concurrent.CompletableFuture;
 

common/src/main/java/com/dfsek/terra/api/profiler/WorldProfiler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.profiler;
+package com.dfsek.terra.api.profiler;
 
 import com.dfsek.terra.api.platform.world.World;
 import com.google.common.collect.BiMap;
@@ -49,7 +49,7 @@ public class WorldProfiler {
         }
     }
 
-    public com.dfsek.terra.api.gaea.profiler.WorldProfiler addMeasurement(Measurement m, String name) {
+    public com.dfsek.terra.api.profiler.WorldProfiler addMeasurement(Measurement m, String name) {
         measures.put(name, m);
         return this;
     }

common/src/main/java/com/dfsek/terra/api/util/FastRandom.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.util;
+package com.dfsek.terra.api.util;
 
 
 import org.apache.commons.rng.core.source64.XoRoShiRo128PlusPlus;

common/src/main/java/com/dfsek/terra/api/util/GlueList.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.dfsek.terra.api.gaea.util;
+package com.dfsek.terra.api.util;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -702,6 +702,59 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
         return new Itr();
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public Object clone() {
+
+        try {
+            com.dfsek.terra.api.util.GlueList<T> clone = (com.dfsek.terra.api.util.GlueList<T>) super.clone();
+
+            clone.first = clone.last = null;
+
+            int capacity = min(MAX_ARRAY_SIZE, max(clone.size, max(clone.initialCapacity, DEFAULT_CAPACITY)));
+
+            Node<T> initNode = new Node<>(null, null, 0, capacity);
+
+            clone.initialCapacity = capacity;
+
+            clone.first = clone.last = initNode;
+
+            clone.modCount = 0;
+            clone.size = 0;
+
+            for(Node<T> node = first; node != null; node = node.next) {
+
+                for(int i = 0; i < node.elementDataPointer; i++) {
+                    clone.add(node.elementData[i]);
+                }
+            }
+
+            return clone;
+        } catch(CloneNotSupportedException e) {
+            throw new InternalError();
+        }
+    }
+
+    @Override
+    public ListIterator<T> listIterator(int index) {
+
+        checkPositionIndex(index);
+
+        return new ListItr(index);
+    }
+
+    private void checkPositionIndex(int index) {
+
+        if(!(index >= 0 && index <= size)) {
+            throw new ArrayIndexOutOfBoundsException(index);
+        }
+    }
+
+    @Override
+    public ListIterator<T> listIterator() {
+        return new ListItr(0);
+    }
+
     private class Itr implements Iterator<T> {
 
         Node<T> node = first;
@@ -761,7 +814,7 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
             checkForComodification();
 
             try {
-                com.dfsek.terra.api.gaea.util.GlueList.this.remove(lastReturn);
+                com.dfsek.terra.api.util.GlueList.this.remove(lastReturn);
 
                 j = lastReturn;
 
@@ -785,23 +838,8 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
     }
 
     @Override
-    public ListIterator<T> listIterator(int index) {
+    public int size() {
-
+        return size;
-        checkPositionIndex(index);
-
-        return new ListItr(index);
-    }
-
-    private void checkPositionIndex(int index) {
-
-        if (!(index >= 0 && index <= size)) {
-            throw new ArrayIndexOutOfBoundsException(index);
-        }
-    }
-
-    @Override
-    public ListIterator<T> listIterator() {
-        return new ListItr(0);
     }
 
     private class ListItr extends Itr implements ListIterator<T> {
@@ -886,7 +924,7 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
             checkForComodification();
 
             try {
-                com.dfsek.terra.api.gaea.util.GlueList.this.set(lastReturn, t);
+                com.dfsek.terra.api.util.GlueList.this.set(lastReturn, t);
             } catch (IndexOutOfBoundsException e) {
                 throw new ConcurrentModificationException();
             }
@@ -900,7 +938,7 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
             try {
                 int temp = j;
 
-                com.dfsek.terra.api.gaea.util.GlueList.this.add(temp, t);
+                com.dfsek.terra.api.util.GlueList.this.add(temp, t);
 
                 j = temp + 1;
 
@@ -916,44 +954,6 @@ public class GlueList<T> extends AbstractList<T> implements List<T>, Cloneable,
         }
     }
 
-    @Override
-    public int size() {
-        return size;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Object clone() {
-
-        try {
-            com.dfsek.terra.api.gaea.util.GlueList<T> clone = (com.dfsek.terra.api.gaea.util.GlueList<T>) super.clone();
-
-            clone.first = clone.last = null;
-
-            int capacity = min(MAX_ARRAY_SIZE, max(clone.size, max(clone.initialCapacity, DEFAULT_CAPACITY)));
-
-            Node<T> initNode = new Node<>(null, null, 0, capacity);
-
-            clone.initialCapacity = capacity;
-
-            clone.first = clone.last = initNode;
-
-            clone.modCount = 0;
-            clone.size = 0;
-
-            for (Node<T> node = first; node != null; node = node.next) {
-
-                for (int i = 0; i < node.elementDataPointer; i++) {
-                    clone.add(node.elementData[i]);
-                }
-            }
-
-            return clone;
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError();
-        }
-    }
-
     private void writeObject(ObjectOutputStream s) throws IOException {
 
         int expectedModCount = modCount;

common/src/main/java/com/dfsek/terra/api/util/JarUtil.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.gaea.util;
+package com.dfsek.terra.api.util;
 
-import com.dfsek.terra.api.gaea.Debug;
+import com.dfsek.terra.debug.Debug;
 
 import java.io.File;
 import java.io.FileOutputStream;

common/src/main/java/com/dfsek/terra/api/util/SerializationUtil.java

@@ -0,0 +1,70 @@
+package com.dfsek.terra.api.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+
+public class SerializationUtil {
+    public static Object fromFile(File f) throws IOException, ClassNotFoundException {
+        ObjectInputStream ois = new MovedObjectInputStream(new FileInputStream(f), "org.polydev.gaea", "com.dfsek.terra.api.gaea"); // Backwards compat with old Gaea location
+        Object o = ois.readObject();
+        ois.close();
+        return o;
+    }
+
+    public static void toFile(Serializable o, File f) throws IOException {
+        ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(f));
+        oos.writeObject(o);
+        oos.close();
+    }
+
+    public static class MovedObjectInputStream extends ObjectInputStream {
+        private final String oldNameSpace;
+        private final String newNameSpace;
+
+        public MovedObjectInputStream(InputStream in, String oldNameSpace, String newNameSpace) throws IOException {
+            super(in);
+            this.oldNameSpace = oldNameSpace;
+            this.newNameSpace = newNameSpace;
+        }
+
+        @Override
+        protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
+            ObjectStreamClass result = super.readClassDescriptor();
+            try {
+                if(result.getName().contains(oldNameSpace)) {
+                    String newClassName = result.getName().replace(oldNameSpace, newNameSpace);
+                    Class localClass = Class.forName(newClassName);
+
+                    Field nameField = ObjectStreamClass.class.getDeclaredField("name");
+                    nameField.setAccessible(true);
+                    nameField.set(result, newClassName);
+
+                    ObjectStreamClass localClassDescriptor = ObjectStreamClass.lookup(localClass);
+                    Field suidField = ObjectStreamClass.class.getDeclaredField("suid");
+                    suidField.setAccessible(true);
+                    suidField.set(result, localClassDescriptor.getSerialVersionUID());
+                }
+            } catch(Exception e) {
+                throw new IOException("Exception when trying to replace namespace", e);
+            }
+            return result;
+        }
+
+        @Override
+        protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+            if(desc.getName().contains(oldNameSpace)) {
+                String newClassName = desc.getName().replace(oldNameSpace, newNameSpace);
+                return Class.forName(newClassName);
+            }
+            return super.resolveClass(desc);
+        }
+    }
+}

common/src/main/java/com/dfsek/terra/api/world/biome/BiomeGrid.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.biome;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 

common/src/main/java/com/dfsek/terra/api/world/biome/Decorator.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.world.Flora;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.tree.Tree;
 
 public abstract class Decorator {

common/src/main/java/com/dfsek/terra/api/world/biome/Generator.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.biome;
 
-import com.dfsek.terra.api.gaea.math.Interpolator;
+import com.dfsek.terra.api.math.Interpolator;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.world.palette.Palette;

common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.carving;
 
-import com.dfsek.terra.api.gaea.math.MathUtil;
+import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.gaea.util.FastRandom;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.util.FastRandom;
 import net.jafama.FastMath;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/api/world/flora/Flora.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.gaea.world;
+package com.dfsek.terra.api.world.flora;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.api.platform.world.vector.Location;

common/src/main/java/com/dfsek/terra/api/world/generation/population/ChunkCoordinate.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.gaea.population;
+package com.dfsek.terra.api.world.generation.population;
 
 
 import com.dfsek.terra.api.platform.world.Chunk;
@@ -43,8 +43,8 @@ public class ChunkCoordinate implements Serializable {
 
     @Override
     public boolean equals(Object obj) {
-        if(! (obj instanceof com.dfsek.terra.api.gaea.population.ChunkCoordinate)) return false;
+        if(!(obj instanceof com.dfsek.terra.api.world.generation.population.ChunkCoordinate)) return false;
-        com.dfsek.terra.api.gaea.population.ChunkCoordinate other = (com.dfsek.terra.api.gaea.population.ChunkCoordinate) obj;
+        com.dfsek.terra.api.world.generation.population.ChunkCoordinate other = (com.dfsek.terra.api.world.generation.population.ChunkCoordinate) obj;
         return other.getX() == x && other.getZ() == z;
     }
 }

common/src/main/java/com/dfsek/terra/api/world/generation/population/PopulationManager.java

@@ -1,14 +1,14 @@
-package com.dfsek.terra.api.gaea.population;
+package com.dfsek.terra.api.world.generation.population;
 
 import com.dfsek.terra.api.gaea.Gaea;
-import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
-import com.dfsek.terra.api.gaea.profiler.WorldProfiler;
-import com.dfsek.terra.api.gaea.util.FastRandom;
-import com.dfsek.terra.api.gaea.util.GlueList;
-import com.dfsek.terra.api.gaea.util.SerializationUtil;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.profiler.ProfileFuture;
+import com.dfsek.terra.api.profiler.WorldProfiler;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.util.SerializationUtil;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/com/dfsek/terra/api/world/palette/Palette.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.palette;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.util.GlueList;
+import com.dfsek.terra.api.util.GlueList;
 
 import java.util.List;
 import java.util.Random;

common/src/main/java/com/dfsek/terra/api/world/palette/SimplexPalette.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.palette;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 
 import java.util.List;
 

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/TreeGeometry.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.tree.fractal;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.platform.world.vector.Vector3;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.platform.world.block.BlockData;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.platform.world.block.BlockData;

common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.WorldHandle;
 import com.dfsek.terra.api.platform.world.block.BlockData;

common/src/main/java/com/dfsek/terra/biome/BiomeZone.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.world.biome.BiomeGrid;
 import com.dfsek.terra.api.world.biome.NormalizationUtil;
 import com.dfsek.terra.config.base.ConfigPack;

common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.palette;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import org.jetbrains.annotations.NotNull;
 

common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.postprocessing;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.api.platform.world.vector.Vector2;
 
 /**

common/src/main/java/com/dfsek/terra/biome/postprocessing/ErosionNoise.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.biome.postprocessing;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import net.jafama.FastMath;
 
 /**

common/src/main/java/com/dfsek/terra/carving/CarverCache.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.carving;
 
-import com.dfsek.terra.api.gaea.math.MathUtil;
+import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.gaea.util.FastRandom;
-import com.dfsek.terra.api.gaea.util.GlueList;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.carving.Worm;
 import com.dfsek.terra.api.world.generation.GenerationPhase;

common/src/main/java/com/dfsek/terra/carving/CarverPalette.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.carving;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java

@@ -1,10 +1,10 @@
 package com.dfsek.terra.carving;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.util.FastRandom;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.carving.Carver;
 import com.dfsek.terra.api.world.carving.Worm;
 import com.dfsek.terra.api.world.generation.GenerationPhase;

common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java

@@ -6,10 +6,10 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.LoaderRegistrar;
-import com.dfsek.terra.api.gaea.structures.loot.LootTable;
+import com.dfsek.terra.api.loot.LootTable;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.biome.UserDefinedBiome;

common/src/main/java/com/dfsek/terra/config/base/PluginConfig.java

@@ -5,8 +5,8 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.terra.api.gaea.util.JarUtil;
 import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.util.JarUtil;
 import com.dfsek.terra.debug.Debug;
 
 import java.io.File;

common/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.config.factories;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.biome.UserDefinedBiome;
 import com.dfsek.terra.config.base.ConfigPack;

common/src/main/java/com/dfsek/terra/config/factories/CarverFactory.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.config.factories;
 
 import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.terra.api.gaea.math.MathUtil;
+import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.base.ConfigPack;

common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.config.factories;
 
-import com.dfsek.terra.api.gaea.util.FastRandom;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.RandomPalette;
 import com.dfsek.terra.biome.palette.PaletteLayer;

common/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.config.factories;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.util.FastRandom;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.block.BlockData;
+import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.RandomPalette;
 import com.dfsek.terra.api.world.palette.SimplexPalette;

common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.config.lang;
 
-import com.dfsek.terra.api.gaea.lang.Language;
+import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.platform.CommandSender;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.debug.Debug;
@@ -12,7 +12,7 @@ import java.util.jar.JarFile;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.dfsek.terra.api.gaea.util.JarUtil.copyResourcesToDirectory;
+import static com.dfsek.terra.api.util.JarUtil.copyResourcesToDirectory;
 
 public final class LangUtil {
     private static Language language;

common/src/main/java/com/dfsek/terra/config/loaders/LootTableLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.structures.loot.LootTable;
+import com.dfsek.terra.api.loot.LootTable;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.config.files.Loader;
 import org.apache.commons.io.IOUtils;

common/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;

common/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 
 import java.lang.reflect.Type;
 import java.util.Map;

common/src/main/java/com/dfsek/terra/config/loaders/Types.java

@@ -1,9 +1,9 @@
 package com.dfsek.terra.config.loaders;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.tree.Tree;
 

common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java

@@ -3,10 +3,10 @@ package com.dfsek.terra.config.loaders.config;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.world.Flora;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.config.loaders.Types;
 import com.dfsek.terra.generation.items.flora.FloraLayer;
 

common/src/main/java/com/dfsek/terra/config/loaders/config/NoiseBuilderLoader.java

@@ -5,7 +5,7 @@ import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.generation.config.NoiseBuilder;
 
 import java.lang.reflect.Type;

common/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.generation.items.ores.OreConfig;
 
 import java.lang.reflect.Type;

common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java

@@ -3,9 +3,9 @@ package com.dfsek.terra.config.loaders.config;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.world.tree.Tree;
 import com.dfsek.terra.config.loaders.Types;

common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.config.Configuration;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.carving.CarverPalette;
 import com.dfsek.terra.config.loaders.Types;

common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.palette;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.biome.palette.PaletteLayer;
 import com.dfsek.terra.config.loaders.Types;

common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java

@@ -5,11 +5,11 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ValidatedConfigTemplate;
 import com.dfsek.tectonic.exception.ValidationException;
-import com.dfsek.terra.api.gaea.util.GlueList;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.biome.palette.PaletteHolder;
 import com.dfsek.terra.biome.palette.SinglePalette;

common/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.carving.CarverPalette;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.generation.items.ores.Ore;
 import com.dfsek.terra.util.MaterialSet;

common/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java

@@ -3,10 +3,10 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.loot.LootTable;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.structures.loot.LootTable;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.util.GlueList;
+import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.procgen.GridSpawn;
 
 import java.util.List;

common/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.templates;
 import com.dfsek.tectonic.annotations.Abstractable;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.util.MaterialSet;
 
 @SuppressWarnings({"unused", "FieldMayBeFinal"})

common/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation;
 
-import com.dfsek.terra.api.gaea.math.Interpolator;
+import com.dfsek.terra.api.math.Interpolator;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.biome.grid.master.TerraBiomeGrid;
 import com.dfsek.terra.generation.config.WorldGenerator;

common/src/main/java/com/dfsek/terra/generation/MasterChunkGenerator.java

@@ -1,8 +1,7 @@
 package com.dfsek.terra.generation;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.gaea.math.ChunkInterpolator3;
+import com.dfsek.terra.api.math.ChunkInterpolator3;
-import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
@@ -15,6 +14,7 @@ import com.dfsek.terra.api.platform.world.block.data.Slab;
 import com.dfsek.terra.api.platform.world.block.data.Stairs;
 import com.dfsek.terra.api.platform.world.block.data.Waterlogged;
 import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.api.world.palette.Palette;

common/src/main/java/com/dfsek/terra/generation/Sampler.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation;
 
-import com.dfsek.terra.api.gaea.math.ChunkInterpolator3;
+import com.dfsek.terra.api.math.ChunkInterpolator3;
 import net.jafama.FastMath;
 
 public class Sampler {

common/src/main/java/com/dfsek/terra/generation/UserDefinedDecorator.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.generation;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.world.biome.Decorator;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.tree.Tree;
 
 public class UserDefinedDecorator extends Decorator {

common/src/main/java/com/dfsek/terra/generation/config/NoiseBuilder.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.generation.config;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 
 public class NoiseBuilder implements ConfigTemplate {
     @Value("type")

common/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation.config;
 
-import com.dfsek.terra.api.gaea.math.Interpolator;
+import com.dfsek.terra.api.math.Interpolator;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.world.biome.Generator;

common/src/main/java/com/dfsek/terra/generation/items/PlaceableLayer.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.generation.items;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.vector.Vector2;
 

common/src/main/java/com/dfsek/terra/generation/items/TerraStructure.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.generation.items;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.loot.LootTable;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.structures.loot.LootTable;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.config.templates.StructureTemplate;
 import com.dfsek.terra.procgen.GridSpawn;
 

common/src/main/java/com/dfsek/terra/generation/items/flora/BlockFlora.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.generation.items.flora;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.util.GlueList;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.block.BlockFace;
 import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.world.flora.Flora;
 
 import java.util.List;
 

common/src/main/java/com/dfsek/terra/generation/items/flora/ConstantFlora.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.generation.items.flora;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.util.GlueList;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.block.BlockFace;
 import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.util.MaterialSet;
 
 import java.util.List;

common/src/main/java/com/dfsek/terra/generation/items/flora/FloraLayer.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.generation.items.flora;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.generation.items.PlaceableLayer;
 
 import java.util.Random;

common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java

@@ -1,9 +1,6 @@
 package com.dfsek.terra.generation.items.flora;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.gaea.util.FastRandom;
-import com.dfsek.terra.api.gaea.util.GlueList;
-import com.dfsek.terra.api.gaea.world.Flora;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.WorldHandle;
@@ -14,6 +11,9 @@ import com.dfsek.terra.api.platform.world.block.data.Directional;
 import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
 import com.dfsek.terra.api.platform.world.block.data.Rotatable;
 import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.util.FastRandom;
+import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.world.flora.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.util.MaterialSet;
 import net.jafama.FastMath;

common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.generation.items.ores;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.WorldHandle;

common/src/main/java/com/dfsek/terra/generation/items/ores/OreConfig.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation.items.ores;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 
 public class OreConfig {
     private final Range amount;

common/src/main/java/com/dfsek/terra/generation/items/ores/OreHolder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation.items.ores;
 
-import com.dfsek.terra.api.gaea.util.GlueList;
+import com.dfsek.terra.api.util.GlueList;
 
 import java.util.List;
 import java.util.function.BiConsumer;

common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation.items.ores;
 
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.WorldHandle;

common/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.generation.items.tree;
 
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.api.world.tree.Tree;

common/src/main/java/com/dfsek/terra/generation/items/tree/TreeLayer.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.generation.items.tree;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
+import com.dfsek.terra.api.math.ProbabilityCollection;
-import com.dfsek.terra.api.gaea.math.Range;
+import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.api.platform.world.block.BlockFace;

common/src/main/java/com/dfsek/terra/math/NoiseFunction2.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.math;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.generation.config.NoiseBuilder;
 import com.dfsek.terra.util.hash.HashMapDoubleDouble;
 import parsii.eval.Expression;

common/src/main/java/com/dfsek/terra/math/NoiseFunction3.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.math;
 
-import com.dfsek.terra.api.gaea.math.FastNoiseLite;
+import com.dfsek.terra.api.math.FastNoiseLite;
 import com.dfsek.terra.generation.config.NoiseBuilder;
 import parsii.eval.Expression;
 

common/src/main/java/com/dfsek/terra/math/RandomFunction.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.math;
 
-import com.dfsek.terra.api.gaea.util.FastRandom;
+import com.dfsek.terra.api.util.FastRandom;
 import parsii.eval.Expression;
 import parsii.eval.Function;
 
 import java.util.List;
 
 /**
- * Provides access to a PRNG ({@link com.dfsek.terra.api.gaea.util.FastRandom})
+ * Provides access to a PRNG ({@link com.dfsek.terra.api.util.FastRandom})
  * <p>
  * Takes 1 argument, which sets the seed
  */

common/src/main/java/com/dfsek/terra/population/CavePopulator.java

@@ -1,7 +1,6 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
@@ -10,6 +9,7 @@ import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.base.ConfigPack;

common/src/main/java/com/dfsek/terra/population/FloraPopulator.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.biome.UserDefinedBiome;

common/src/main/java/com/dfsek/terra/population/OrePopulator.java

@@ -1,13 +1,13 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.gaea.math.MathUtil;
+import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
-import com.dfsek.terra.api.gaea.util.FastRandom;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.profiler.ProfileFuture;
+import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;

common/src/main/java/com/dfsek/terra/population/TreePopulator.java

@@ -1,11 +1,11 @@
 package com.dfsek.terra.population;
 
 import com.dfsek.terra.TerraWorld;
-import com.dfsek.terra.api.gaea.profiler.ProfileFuture;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.profiler.ProfileFuture;
 import com.dfsek.terra.api.world.generation.GenerationPhase;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.biome.UserDefinedBiome;