more refactors

common/implementation/src/main/java/com/dfsek/terra/api/math/range/ConstantRange.java

@@ -1,75 +1,88 @@
-package com.dfsek.terra.api.math;
+package com.dfsek.terra.api.math.range;
 
+import com.dfsek.terra.api.util.Range;
 import net.jafama.FastMath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;
 import java.util.Random;
 
-public class Range implements Iterable<Integer> {
+public class ConstantRange implements Range {
     private int min;
     private int max;
 
-    public Range(int min, int max) {
+    public ConstantRange(int min, int max) {
         if(min > max) throw new IllegalArgumentException("Minimum must not be grater than maximum!");
         this.max = max;
         this.min = min;
     }
 
+    @Override
     public boolean isInRange(int test) {
         return test >= min && test < max;
     }
 
+    @Override
     public int getMax() {
         return max;
     }
 
+    @Override
     public Range setMax(int max) {
         this.max = max;
         return this;
     }
 
+    @Override
     public int getMin() {
         return min;
     }
 
+    @Override
     public Range setMin(int min) {
         this.min = min;
         return this;
     }
 
+    @Override
     public int getRange() {
         return max - min;
     }
 
+    @Override
     public Range multiply(int mult) {
         min *= mult;
         max *= mult;
         return this;
     }
 
+    @Override
     public Range reflect(int pt) {
-        return new Range(2 * pt - this.getMax(), 2 * pt - this.getMin());
+        return new ConstantRange(2 * pt - this.getMax(), 2 * pt - this.getMin());
     }
 
+    @Override
     public int get(Random r) {
         return r.nextInt((max - min) + 1) + min;
     }
 
-    public Range intersects(com.dfsek.terra.api.math.Range other) {
+    @Override
+    public Range intersects(Range other) {
         try {
-            return new Range(FastMath.max(this.getMin(), other.getMin()), FastMath.min(this.getMax(), other.getMax()));
+            return new ConstantRange(FastMath.max(this.getMin(), other.getMin()), FastMath.min(this.getMax(), other.getMax()));
         } catch(IllegalArgumentException e) {
             return null;
         }
     }
 
+    @Override
     public Range add(int add) {
         this.min += add;
         this.max += add;
         return this;
     }
 
+    @Override
     public Range sub(int sub) {
         this.min -= sub;
         this.max -= sub;
@@ -88,8 +101,8 @@ public class Range implements Iterable<Integer> {
 
     @Override
     public boolean equals(Object obj) {
-        if(!(obj instanceof com.dfsek.terra.api.math.Range)) return false;
-        Range other = (com.dfsek.terra.api.math.Range) obj;
+        if(!(obj instanceof ConstantRange)) return false;
+        Range other = (Range) obj;
         return other.getMin() == this.getMin() && other.getMax() == this.getMax();
     }
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java

@@ -28,11 +28,11 @@ import com.dfsek.terra.api.structures.script.builders.UnaryBooleanFunctionBuilde
 import com.dfsek.terra.api.structures.script.builders.UnaryNumberFunctionBuilder;
 import com.dfsek.terra.api.structures.script.builders.UnaryStringFunctionBuilder;
 import com.dfsek.terra.api.structures.script.builders.ZeroArgFunctionBuilder;
-import com.dfsek.terra.api.structures.structure.Rotation;
-import com.dfsek.terra.api.structures.structure.buffer.Buffer;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.structures.structure.buffer.DirectBuffer;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.structures.script;
 
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
-import com.dfsek.terra.api.structures.structure.Rotation;
-import com.dfsek.terra.api.structures.structure.buffer.Buffer;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.structure.buffer.Buffer;
 
 import java.util.Random;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java

@@ -10,7 +10,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedBlock;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java

@@ -11,7 +11,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedPulledBlock;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;
 

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedStateManipulator;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java

@@ -12,8 +12,8 @@ import com.dfsek.terra.api.structures.parser.lang.functions.Function;
 import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
-import com.dfsek.terra.api.structures.structure.Rotation;
-import com.dfsek.terra.api.structures.structure.RotationUtil;
+import com.dfsek.terra.api.structure.rotation.Rotation;
+import com.dfsek.terra.api.structure.rotation.RotationUtil;
 import com.dfsek.terra.api.structures.structure.buffer.IntermediateBuffer;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/Rotation.java

@@ -1,55 +0,0 @@
-package com.dfsek.terra.api.structures.structure;
-
-import net.jafama.FastMath;
-
-public enum Rotation {
-
-    CW_90(90), CW_180(180), CCW_90(270), NONE(0);
-    private final int degrees;
-
-    Rotation(int degrees) {
-        this.degrees = degrees;
-    }
-
-    public static Rotation fromDegrees(int deg) {
-        switch(FastMath.floorMod(deg, 360)) {
-            case 0:
-                return Rotation.NONE;
-            case 90:
-                return Rotation.CW_90;
-            case 180:
-                return Rotation.CW_180;
-            case 270:
-                return Rotation.CCW_90;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    public int getDegrees() {
-        return degrees;
-    }
-
-    public Rotation inverse() {
-        switch(this) {
-            case NONE:
-                return NONE;
-            case CCW_90:
-                return CW_90;
-            case CW_90:
-                return CCW_90;
-            case CW_180:
-                return CW_180;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    public Rotation rotate(Rotation rotation) {
-        return fromDegrees(this.getDegrees() + rotation.getDegrees());
-    }
-
-    public enum Axis {
-        X, Y, Z
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/RotationUtil.java

@@ -1,291 +0,0 @@
-package com.dfsek.terra.api.structures.structure;
-
-import com.dfsek.terra.api.vector.Vector2;
-import com.dfsek.terra.api.block.Axis;
-import com.dfsek.terra.api.block.BlockData;
-import com.dfsek.terra.api.block.BlockFace;
-import com.dfsek.terra.api.block.data.Directional;
-import com.dfsek.terra.api.block.data.MultipleFacing;
-import com.dfsek.terra.api.block.data.Orientable;
-import com.dfsek.terra.api.block.data.Rail;
-import com.dfsek.terra.api.block.data.RedstoneWire;
-import com.dfsek.terra.api.block.data.Rotatable;
-import com.dfsek.terra.api.block.data.Wall;
-import com.google.common.collect.Sets;
-import net.jafama.FastMath;
-
-import java.util.EnumMap;
-import java.util.Map;
-import java.util.Set;
-
-public class RotationUtil {
-    private static final Set<BlockFace> CARDINALS = Sets.newHashSet(BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST, BlockFace.WEST);
-
-    /**
-     * Rotate and mirror a coordinate pair.
-     *
-     * @param orig Vector to rotate.
-     * @param r    Rotation
-     */
-    public static void rotateVector(Vector2 orig, Rotation r) {
-        Vector2 copy = orig.clone();
-        switch(r) {
-            case CW_90:
-                copy.setX(orig.getZ()).setZ(-orig.getX());
-                break;
-            case CCW_90:
-                copy.setX(-orig.getZ()).setZ(orig.getX());
-                break;
-            case CW_180:
-                copy.multiply(-1);
-                break;
-        }
-        orig.setX(copy.getX());
-        orig.setZ(copy.getZ());
-    }
-
-    /**
-     * Get the BlockFace with rotation and mirrors applied to it
-     *
-     * @param f BlockFace to apply rotation to
-     * @param r Rotation
-     * @return Rotated BlockFace
-     */
-    public static BlockFace getRotatedFace(BlockFace f, Rotation r) {
-        BlockFace n = f;
-        int rotateNum = r.getDegrees() / 90;
-        int rn = faceRotation(f);
-        if(rn >= 0) {
-            n = fromRotation(faceRotation(n) + 4 * rotateNum);
-        }
-        return n;
-    }
-
-    /**
-     * Get an integer representation of a BlockFace, to perform math on.
-     *
-     * @param f BlockFace to get integer for
-     * @return integer representation of BlockFace
-     */
-    public static int faceRotation(BlockFace f) {
-        switch(f) {
-            case NORTH:
-                return 0;
-            case NORTH_NORTH_EAST:
-                return 1;
-            case NORTH_EAST:
-                return 2;
-            case EAST_NORTH_EAST:
-                return 3;
-            case EAST:
-                return 4;
-            case EAST_SOUTH_EAST:
-                return 5;
-            case SOUTH_EAST:
-                return 6;
-            case SOUTH_SOUTH_EAST:
-                return 7;
-            case SOUTH:
-                return 8;
-            case SOUTH_SOUTH_WEST:
-                return 9;
-            case SOUTH_WEST:
-                return 10;
-            case WEST_SOUTH_WEST:
-                return 11;
-            case WEST:
-                return 12;
-            case WEST_NORTH_WEST:
-                return 13;
-            case NORTH_WEST:
-                return 14;
-            case NORTH_NORTH_WEST:
-                return 15;
-            default:
-                return -1;
-        }
-    }
-
-    /**
-     * Convert integer to BlockFace representation
-     *
-     * @param r integer to get BlockFace for
-     * @return BlockFace represented by integer.
-     */
-    public static BlockFace fromRotation(int r) {
-        switch(FastMath.floorMod(r, 16)) {
-            case 0:
-                return BlockFace.NORTH;
-            case 1:
-                return BlockFace.NORTH_NORTH_EAST;
-            case 2:
-                return BlockFace.NORTH_EAST;
-            case 3:
-                return BlockFace.EAST_NORTH_EAST;
-            case 4:
-                return BlockFace.EAST;
-            case 5:
-                return BlockFace.EAST_SOUTH_EAST;
-            case 6:
-                return BlockFace.SOUTH_EAST;
-            case 7:
-                return BlockFace.SOUTH_SOUTH_EAST;
-            case 8:
-                return BlockFace.SOUTH;
-            case 9:
-                return BlockFace.SOUTH_SOUTH_WEST;
-            case 10:
-                return BlockFace.SOUTH_WEST;
-            case 11:
-                return BlockFace.WEST_SOUTH_WEST;
-            case 12:
-                return BlockFace.WEST;
-            case 13:
-                return BlockFace.WEST_NORTH_WEST;
-            case 14:
-                return BlockFace.NORTH_WEST;
-            case 15:
-                return BlockFace.NORTH_NORTH_WEST;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
-    public static Axis getRotatedAxis(Axis orig, Rotation r) {
-        Axis other = orig;
-        final boolean shouldSwitch = r.equals(Rotation.CW_90) || r.equals(Rotation.CCW_90);
-        switch(orig) {
-            case X:
-                if(shouldSwitch) other = Axis.Z;
-                break;
-            case Z:
-                if(shouldSwitch) other = Axis.X;
-                break;
-        }
-        return other;
-    }
-
-    /**
-     * Method to rotate the incredibly obnoxious Rail.Shape enum
-     *
-     * @param orig Original shape
-     * @param r    Rotate
-     * @return Rotated/mirrored shape
-     */
-    @SuppressWarnings("fallthrough")
-    public static Rail.Shape getRotatedRail(Rail.Shape orig, Rotation r) {
-        switch(r) {
-            case CCW_90:
-                switch(orig) {
-                    case NORTH_WEST:
-                        return Rail.Shape.SOUTH_WEST;
-                    case NORTH_SOUTH:
-                        return Rail.Shape.EAST_WEST;
-                    case SOUTH_WEST:
-                        return Rail.Shape.SOUTH_EAST;
-                    case SOUTH_EAST:
-                        return Rail.Shape.NORTH_EAST;
-                    case EAST_WEST:
-                        return Rail.Shape.NORTH_SOUTH;
-                    case NORTH_EAST:
-                        return Rail.Shape.NORTH_WEST;
-                    case ASCENDING_EAST:
-                        return Rail.Shape.ASCENDING_NORTH;
-                    case ASCENDING_WEST:
-                        return Rail.Shape.ASCENDING_SOUTH;
-                    case ASCENDING_NORTH:
-                        return Rail.Shape.ASCENDING_WEST;
-                    case ASCENDING_SOUTH:
-                        return Rail.Shape.ASCENDING_EAST;
-                }
-            case CW_90:
-                switch(orig) {
-                    case NORTH_WEST:
-                        return Rail.Shape.NORTH_EAST;
-                    case NORTH_SOUTH:
-                        return Rail.Shape.EAST_WEST;
-                    case SOUTH_WEST:
-                        return Rail.Shape.NORTH_WEST;
-                    case SOUTH_EAST:
-                        return Rail.Shape.SOUTH_WEST;
-                    case EAST_WEST:
-                        return Rail.Shape.NORTH_SOUTH;
-                    case NORTH_EAST:
-                        return Rail.Shape.SOUTH_EAST;
-                    case ASCENDING_EAST:
-                        return Rail.Shape.ASCENDING_SOUTH;
-                    case ASCENDING_WEST:
-                        return Rail.Shape.ASCENDING_NORTH;
-                    case ASCENDING_NORTH:
-                        return Rail.Shape.ASCENDING_EAST;
-                    case ASCENDING_SOUTH:
-                        return Rail.Shape.ASCENDING_WEST;
-                }
-            case CW_180:
-                switch(orig) {
-                    case NORTH_WEST:
-                        return Rail.Shape.SOUTH_EAST;
-                    case NORTH_SOUTH:
-                        return Rail.Shape.NORTH_SOUTH;
-                    case SOUTH_WEST:
-                        return Rail.Shape.NORTH_EAST;
-                    case SOUTH_EAST:
-                        return Rail.Shape.NORTH_WEST;
-                    case EAST_WEST:
-                        return Rail.Shape.EAST_WEST;
-                    case NORTH_EAST:
-                        return Rail.Shape.SOUTH_WEST;
-                    case ASCENDING_EAST:
-                        return Rail.Shape.ASCENDING_WEST;
-                    case ASCENDING_WEST:
-                        return Rail.Shape.ASCENDING_EAST;
-                    case ASCENDING_NORTH:
-                        return Rail.Shape.ASCENDING_SOUTH;
-                    case ASCENDING_SOUTH:
-                        return Rail.Shape.ASCENDING_NORTH;
-                }
-        }
-        return orig;
-    }
-
-    public static void rotateBlockData(BlockData data, Rotation r) {
-        if(data instanceof Rotatable) {
-            BlockFace rt = getRotatedFace(((Rotatable) data).getRotation(), r);
-            ((Rotatable) data).setRotation(rt);
-        } else if(data instanceof Directional) {
-            BlockFace rt = getRotatedFace(((Directional) data).getFacing(), r);
-            ((Directional) data).setFacing(rt);
-        } else if(data instanceof MultipleFacing) {
-            MultipleFacing mfData = (MultipleFacing) data;
-            Map<BlockFace, Boolean> faces = new EnumMap<>(BlockFace.class);
-            for(BlockFace f : mfData.getAllowedFaces()) {
-                faces.put(f, mfData.hasFace(f));
-            }
-            for(Map.Entry<BlockFace, Boolean> face : faces.entrySet()) {
-                mfData.setFace(getRotatedFace(face.getKey(), r), face.getValue());
-            }
-        } else if(data instanceof Rail) {
-            Rail.Shape newShape = getRotatedRail(((Rail) data).getShape(), r);
-            ((Rail) data).setShape(newShape);
-        } else if(data instanceof Orientable) {
-            Axis newAxis = getRotatedAxis(((Orientable) data).getAxis(), r);
-            ((Orientable) data).setAxis(newAxis);
-        } else if(data instanceof RedstoneWire) {
-            Map<BlockFace, RedstoneWire.Connection> connections = new EnumMap<>(BlockFace.class);
-            RedstoneWire rData = (RedstoneWire) data;
-            for(BlockFace f : rData.getAllowedFaces()) {
-                connections.put(f, rData.getFace(f));
-            }
-            for(Map.Entry<BlockFace, RedstoneWire.Connection> e : connections.entrySet()) {
-                rData.setFace(getRotatedFace(e.getKey(), r), e.getValue());
-            }
-        } else if(data instanceof Wall) {
-            Wall wallData = (Wall) data;
-            Map<BlockFace, Wall.Height> faces = new EnumMap<>(BlockFace.class);
-            for(BlockFace b : CARDINALS) faces.put(b, wallData.getHeight(b));
-            for(Map.Entry<BlockFace, Wall.Height> face : faces.entrySet()) {
-                wallData.setHeight(getRotatedFace(face.getKey(), r), face.getValue());
-            }
-        }
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Buffer.java

@@ -1,14 +0,0 @@
-package com.dfsek.terra.api.structures.structure.buffer;
-
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem;
-
-public interface Buffer {
-    Buffer addItem(BufferedItem item, Location location);
-
-    Location getOrigin();
-
-    String getMark(Location location);
-
-    Buffer setMark(String mark, Location location);
-}

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.util.GlueList;
 
 import java.util.List;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java

@@ -1,7 +1,8 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
+import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java

@@ -1,8 +1,9 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
+import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 
 public class IntermediateBuffer implements Buffer {
     private final Buffer original;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java

@@ -1,8 +1,9 @@
 package com.dfsek.terra.api.structures.structure.buffer;
 
+import com.dfsek.terra.api.structure.buffer.Buffer;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.world.Chunk;
-import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import net.jafama.FastMath;
 
 import java.util.LinkedHashMap;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedItem.java

@@ -1,13 +0,0 @@
-package com.dfsek.terra.api.structures.structure.buffer.items;
-
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.world.Chunk;
-
-public interface BufferedItem {
-    void paste(Location origin);
-
-    default void paste(Chunk chunk, Location origin) {
-        origin.setWorld(chunk.getWorld()); // Fabric weirdness
-        paste(origin);
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.state.BlockState;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.api.structures.structure.buffer.items;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.state.BlockState;
 

common/implementation/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java

@@ -1,52 +0,0 @@
-package com.dfsek.terra.api.util.generic.either;
-
-import java.util.Optional;
-import java.util.function.Consumer;
-
-public final class Either<L, R> {
-    private final L left;
-    private final R right;
-    private final boolean leftPresent;
-
-    private Either(L left, R right, boolean leftPresent) {
-        this.left = left;
-        this.right = right;
-        this.leftPresent = leftPresent;
-    }
-
-    public static <L1, R1> Either<L1, R1> left(L1 left) {
-        return new Either<>(left, null, true);
-    }
-
-    public static <L1, R1> Either<L1, R1> right(R1 right) {
-        return new Either<>(null, right, false);
-    }
-
-    public Optional<L> getLeft() {
-        if(leftPresent) return Optional.of(left);
-        return Optional.empty();
-    }
-
-    public Optional<R> getRight() {
-        if(!leftPresent) return Optional.of(right);
-        return Optional.empty();
-    }
-
-    public Either<L, R> ifLeft(Consumer<L> action) {
-        if(leftPresent) action.accept(left);
-        return this;
-    }
-
-    public Either<L, R> ifRight(Consumer<R> action) {
-        if(!leftPresent) action.accept(right);
-        return this;
-    }
-
-    public boolean hasLeft() {
-        return leftPresent;
-    }
-
-    public boolean hasRight() {
-        return !leftPresent;
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java

@@ -1,34 +0,0 @@
-package com.dfsek.terra.api.util.generic.pair;
-
-public final class ImmutablePair<L, R> {
-    private final L left;
-    private final R right;
-
-    private static final ImmutablePair<?, ?> NULL = new ImmutablePair<>(null, null);
-
-    private ImmutablePair(L left, R right) {
-        this.left = left;
-        this.right = right;
-    }
-
-    public static <L1, R1> ImmutablePair<L1, R1> of(L1 left, R1 right) {
-        return new ImmutablePair<>(left, right);
-    }
-
-    public R getRight() {
-        return right;
-    }
-
-    public L getLeft() {
-        return left;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <L1, R1> ImmutablePair<L1, R1> ofNull() {
-        return (ImmutablePair<L1, R1>) NULL;
-    }
-
-    public Pair<L, R> mutable() {
-        return Pair.of(left, right);
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java

@@ -1,35 +0,0 @@
-package com.dfsek.terra.api.util.generic.pair;
-
-public class Pair<L, R> {
-    private L left;
-    private R right;
-
-    private Pair(L left, R right) {
-        this.left = left;
-        this.right = right;
-    }
-
-    public static <L1, R1> Pair<L1, R1> of(L1 left, R1 right) {
-        return new Pair<>(left, right);
-    }
-
-    public L getLeft() {
-        return left;
-    }
-
-    public void setLeft(L left) {
-        this.left = left;
-    }
-
-    public R getRight() {
-        return right;
-    }
-
-    public void setRight(R right) {
-        this.right = right;
-    }
-
-    public ImmutablePair<L, R> immutable() {
-        return ImmutablePair.of(left, right);
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java

@@ -1,35 +0,0 @@
-package com.dfsek.terra.api.util.mutable;
-
-import org.jetbrains.annotations.NotNull;
-
-public class MutableBoolean implements MutablePrimitive<Boolean> {
-    private boolean value;
-
-    public MutableBoolean() {
-        this.value = false;
-    }
-
-    public MutableBoolean(boolean value) {
-        this.value = value;
-    }
-
-    @Override
-    public Boolean get() {
-        return value;
-    }
-
-    @Override
-    public void set(Boolean value) {
-        this.value = value;
-    }
-
-    public boolean invert() {
-        value = !value;
-        return value;
-    }
-
-    @Override
-    public int compareTo(@NotNull Boolean o) {
-        return Boolean.compare(value, o);
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java

@@ -1,46 +0,0 @@
-package com.dfsek.terra.api.util.mutable;
-
-import org.jetbrains.annotations.NotNull;
-
-public class MutableDouble extends MutableNumber<Double> {
-    private static final long serialVersionUID = -2218110876763640053L;
-
-    public MutableDouble(Double value) {
-        super(value);
-    }
-
-    @Override
-    public void increment() {
-        add(1d);
-    }
-
-    @Override
-    public void decrement() {
-        subtract(1d);
-    }
-
-    @Override
-    public void add(Double add) {
-        value += add;
-    }
-
-    @Override
-    public void multiply(Double mul) {
-        value *= mul;
-    }
-
-    @Override
-    public void subtract(Double sub) {
-        value -= sub;
-    }
-
-    @Override
-    public void divide(Double divide) {
-        value /= divide;
-    }
-
-    @Override
-    public int compareTo(@NotNull Double o) {
-        return Double.compare(value, o);
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java

@@ -1,48 +0,0 @@
-package com.dfsek.terra.api.util.mutable;
-
-import org.jetbrains.annotations.NotNull;
-
-public class MutableInteger extends MutableNumber<Integer> {
-    private static final long serialVersionUID = -4427935901819632745L;
-
-    public MutableInteger(Integer value) {
-        super(value);
-    }
-
-    public void increment() {
-        add(1);
-    }
-
-    public void decrement() {
-        subtract(1);
-    }
-
-    @Override
-    public void add(Integer add) {
-        value += add;
-    }
-
-    @Override
-    public void multiply(Integer mul) {
-        value *= mul;
-    }
-
-    @Override
-    public void subtract(Integer sub) {
-        value -= sub;
-    }
-
-    @Override
-    public void divide(Integer divide) {
-        value /= divide;
-    }
-
-    public void add(int add) {
-        value += add;
-    }
-
-    @Override
-    public int compareTo(@NotNull Integer o) {
-        return Integer.compare(value, o);
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java

@@ -1,53 +0,0 @@
-package com.dfsek.terra.api.util.mutable;
-
-public abstract class MutableNumber<T extends Number> extends Number implements MutablePrimitive<T> {
-
-    private static final long serialVersionUID = 8619508342781664393L;
-    protected T value;
-
-    public MutableNumber(T value) {
-        this.value = value;
-    }
-
-    public abstract void increment();
-
-    public abstract void decrement();
-
-    public abstract void add(T add);
-
-    public abstract void multiply(T mul);
-
-    public abstract void subtract(T sub);
-
-    public abstract void divide(T divide);
-
-    @Override
-    public T get() {
-        return value;
-    }
-
-    @Override
-    public void set(T value) {
-        this.value = value;
-    }
-
-    @Override
-    public int intValue() {
-        return value.intValue();
-    }
-
-    @Override
-    public long longValue() {
-        return value.longValue();
-    }
-
-    @Override
-    public float floatValue() {
-        return value.floatValue();
-    }
-
-    @Override
-    public double doubleValue() {
-        return value.doubleValue();
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java

@@ -1,7 +0,0 @@
-package com.dfsek.terra.api.util.mutable;
-
-public interface MutablePrimitive<T> extends Comparable<T>{
-    T get();
-
-    void set(T value);
-}

common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Mutable objects containing primitive types.
- */
-package com.dfsek.terra.api.util.mutable;

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

@@ -1,14 +0,0 @@
-package com.dfsek.terra.api.world.flora;
-
-import com.dfsek.terra.api.math.Range;
-import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.block.Block;
-import com.dfsek.terra.api.world.Chunk;
-
-import java.util.List;
-
-public interface Flora {
-    List<Block> getValidSpawnsAt(Chunk chunk, int x, int z, Range check);
-
-    boolean plant(Location l);
-}

common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java

@@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.vector.Vector3;
-import com.dfsek.terra.api.structures.structure.Rotation;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

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

@@ -5,10 +5,11 @@ import com.dfsek.paralithic.eval.parser.Parser;
 import com.dfsek.paralithic.eval.parser.Scope;
 import com.dfsek.paralithic.eval.tokenizer.ParseException;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.world.World;
@@ -43,7 +44,7 @@ public class UserDefinedCarver extends Carver {
     private final Map<Long, CarverCache> cacheMap = new ConcurrentHashMap<>();
     private final TerraPlugin main;
     private double step = 2;
-    private Range recalc = new Range(8, 10);
+    private Range recalc = new ConstantRange(8, 10);
     private double recalcMagnitude = 3;
 
     public UserDefinedCarver(Range height, Range length, double[] start, double[] mutate, List<String> radii, Scope parent, long hash, int topCut, int bottomCut, CarverTemplate config, TerraPlugin main, Map<String, NoiseSeeded> functions, Map<String, FunctionTemplate> definedFunctions) throws ParseException {

common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java

@@ -13,7 +13,7 @@ import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.structures.parser.lang.constants.NumericConstant;
 import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
 import com.dfsek.terra.api.structures.script.functions.CheckFunction;
-import com.dfsek.terra.api.structures.structure.Rotation;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
 import com.dfsek.terra.api.structures.tokenizer.Position;
 import com.dfsek.terra.api.util.FastRandom;

common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java

@@ -15,7 +15,7 @@ import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.structures.script.StructureScript;
-import com.dfsek.terra.api.structures.structure.Rotation;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.commands.structure.argument.ScriptArgumentParser;
 import com.dfsek.terra.commands.structure.completer.RotationCompleter;

common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java

@@ -5,7 +5,7 @@ import com.dfsek.terra.api.LoaderRegistrar;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.math.GridSpawn;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.noise.samplers.ImageSampler;
 import com.dfsek.terra.api.noise.samplers.noise.CellularSampler;
 import com.dfsek.terra.api.block.BlockType;
@@ -70,7 +70,7 @@ public class GenericLoaders implements LoaderRegistrar {
     @Override
     public void register(TypeRegistry registry) {
         registry.registerLoader(ProbabilityCollectionImpl.class, new ProbabilityCollectionLoader())
-                .registerLoader(Range.class, new RangeLoader())
+                .registerLoader(ConstantRange.class, new RangeLoader())
                 .registerLoader(GridSpawn.class, new GridSpawnLoader())
                 .registerLoader(PaletteHolder.class, new PaletteHolderLoader())
                 .registerLoader(PaletteLayerHolder.class, new PaletteLayerLoader())

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

@@ -2,7 +2,7 @@ package com.dfsek.terra.config.factories;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.palette.NoisePalette;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;

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

@@ -3,7 +3,8 @@ 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.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
+import com.dfsek.terra.api.util.Range;
 
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -13,6 +14,6 @@ public class RangeLoader implements TypeLoader<Range> {
     @Override
     public Range load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
         Map<String, Integer> map = (Map<String, Integer>) o;
-        return new Range(map.get("min"), map.get("max"));
+        return new ConstantRange(map.get("min"), map.get("max"));
     }
 }

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

@@ -4,7 +4,7 @@ import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.world.biome.TerraBiome;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 
 import java.lang.reflect.Type;
 import java.util.Map;

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

@@ -4,11 +4,11 @@ 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.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.api.util.seeded.NoiseSeeded;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.config.loaders.Types;
 import com.dfsek.terra.world.population.items.flora.FloraLayer;
 
@@ -21,7 +21,7 @@ public class FloraLayerLoader implements TypeLoader<FloraLayer> {
     public FloraLayer load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
         Map<String, Object> map = (Map<String, Object>) o;
         double density = ((Number) map.get("density")).doubleValue();
-        Range range = configLoader.loadClass(Range.class, map.get("y"));
+        ConstantRange range = configLoader.loadClass(ConstantRange.class, map.get("y"));
         if(range == null) throw new LoadException("Flora range unspecified");
         ProbabilityCollectionImpl<Flora> items = (ProbabilityCollectionImpl<Flora>) configLoader.loadType(Types.FLORA_PROBABILITY_COLLECTION_TYPE, map.get("items"));
 

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

@@ -2,7 +2,8 @@ package com.dfsek.terra.config.loaders.config;
 
 import com.dfsek.tectonic.loading.ConfigLoader;
 import com.dfsek.tectonic.loading.TypeLoader;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.world.population.items.ores.OreConfig;
 
 import java.lang.reflect.Type;
@@ -13,8 +14,8 @@ public class OreConfigLoader implements TypeLoader<OreConfig> {
     @Override
     public OreConfig load(Type type, Object o, ConfigLoader configLoader) {
         Map<String, Integer> map = (Map<String, Integer>) o;
-        Range amount = new Range(map.get("min"), map.get("max"));
-        Range height = new Range(map.get("min-height"), map.get("max-height"));
+        Range amount = new ConstantRange(map.get("min"), map.get("max"));
+        Range height = new ConstantRange(map.get("min-height"), map.get("max-height"));
         return new OreConfig(amount, height);
     }
 }

common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.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.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
@@ -20,7 +20,7 @@ public class TreeLayerLoader implements TypeLoader<TreeLayer> {
     public TreeLayer load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
         Map<String, Object> map = (Map<String, Object>) o;
         double density = ((Number) map.get("density")).doubleValue();
-        Range range = configLoader.loadClass(Range.class, map.get("y"));
+        ConstantRange range = configLoader.loadClass(ConstantRange.class, map.get("y"));
         if(range == null) throw new LoadException("Tree range unspecified");
         ProbabilityCollectionImpl<Tree> items = (ProbabilityCollectionImpl<Tree>) configLoader.loadType(Types.TREE_PROBABILITY_COLLECTION_TYPE, map.get("items"));
 

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

@@ -3,8 +3,9 @@ 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.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.carving.CarverPalette;
 
@@ -29,7 +30,7 @@ public class CarverTemplate extends AbstractableTemplate {
     @Value("recalculate-direction")
     @Abstractable
     @Default
-    private Range recalc = new Range(8, 10);
+    private Range recalc = new ConstantRange(8, 10);
 
     @Value("length")
     @Abstractable

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

@@ -3,9 +3,9 @@ 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.math.Range;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.world.population.items.ores.Ore;
 

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

@@ -5,9 +5,9 @@ import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.terra.api.math.GridSpawn;
-import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.util.GlueList;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 
 import java.util.List;

common/implementation/src/main/java/com/dfsek/terra/profiler/ProfileFrame.java

@@ -1,14 +0,0 @@
-package com.dfsek.terra.profiler;
-
-public class ProfileFrame implements AutoCloseable {
-    private final Runnable action;
-
-    public ProfileFrame(Runnable action) {
-        this.action = action;
-    }
-
-    @Override
-    public void close() {
-        action.run();
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/profiler/Profiler.java

@@ -1,56 +0,0 @@
-package com.dfsek.terra.profiler;
-
-import java.util.Map;
-
-public interface Profiler {
-    /**
-     * Push a frame to this profiler.
-     *
-     * @param frame ID of frame.
-     */
-    void push(String frame);
-
-    /**
-     * Pop a frame from this profiler.
-     *
-     * @param frame ID of frame. Must match ID
-     *              at the top of the profiler stack.
-     */
-    void pop(String frame);
-
-    /**
-     * Start profiling.
-     */
-    void start();
-
-    /**
-     * Stop profiling.
-     */
-    void stop();
-
-    /**
-     * Get the profiler data.
-     *
-     * @return Profiler data.
-     */
-    Map<String, Timings> getTimings();
-
-    /**
-     * Return a {@link AutoCloseable} implementation that
-     * may be used in a try-with-resources statement for
-     * more intuitive profiling, with auto-push/pop.
-     *
-     * @param frame ID of frame.
-     * @return {@link AutoCloseable} implementation for use
-     * in try-with-resources.
-     */
-    default ProfileFrame profile(String frame) {
-        push(frame);
-        return new ProfileFrame(() -> pop(frame));
-    }
-
-    /**
-     * Clear the profiler data.
-     */
-    void reset();
-}

common/implementation/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.profiler;
 
+import com.dfsek.terra.api.profiler.Profiler;
+import com.dfsek.terra.api.profiler.Timings;
 import com.dfsek.terra.api.util.mutable.MutableInteger;
 import com.dfsek.terra.profiler.exception.MalformedStackException;
 

common/implementation/src/main/java/com/dfsek/terra/profiler/Timings.java

@@ -1,73 +0,0 @@
-package com.dfsek.terra.profiler;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class Timings {
-    private final Map<String, Timings> subItems = new HashMap<>();
-
-    private final List<Long> timings = new ArrayList<>();
-
-    public void addTime(long time) {
-        timings.add(time);
-    }
-
-    public List<Long> getTimings() {
-        return timings;
-    }
-
-    public double average() {
-        return (double) timings.stream().reduce(0L, Long::sum) / timings.size();
-    }
-
-    public long max() {
-        return timings.stream().mapToLong(Long::longValue).max().orElse(0L);
-    }
-
-    public long min() {
-        return timings.stream().mapToLong(Long::longValue).min().orElse(0L);
-    }
-
-    public double sum() {
-        return timings.stream().mapToDouble(Long::doubleValue).sum();
-    }
-
-    public Timings getSubItem(String id) {
-        return subItems.computeIfAbsent(id, s -> new Timings());
-    }
-
-    public String toString(int indent, Timings parent, Set<Integer> branches) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append((double) min() / 1000000).append("ms min / ").append(average() / 1000000).append("ms avg / ")
-                .append((double) max() / 1000000).append("ms max (").append(timings.size()).append(" samples, ")
-                .append((sum() / parent.sum()) * 100).append("% of parent)");
-
-        List<String> frames = new ArrayList<>();
-        Set<Integer> newBranches = new HashSet<>(branches);
-        newBranches.add(indent);
-        subItems.forEach((id, timings) -> frames.add(id + ": " + timings.toString(indent + 1, this, newBranches)));
-
-        for(int i = 0; i < frames.size(); i++) {
-            builder.append('\n');
-            for(int j = 0; j < indent; j++) {
-                if(branches.contains(j)) builder.append("│   ");
-                else builder.append("    ");
-            }
-            if(i == frames.size() - 1 && !frames.get(i).contains("\n")) builder.append("└───");
-            else builder.append("├───");
-            builder.append(frames.get(i));
-        }
-        return builder.toString();
-    }
-
-    @Override
-    public String toString() {
-        return toString(1, this, Collections.emptySet());
-    }
-}

common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.world.Tree;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.builder.BiomeBuilder;

common/implementation/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.registry.config;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.util.collections.MaterialSet;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.registry.OpenRegistry;
 import com.dfsek.terra.world.population.items.flora.ConstantFlora;
 

common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.world.carving;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.world.ChunkAccess;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.world.Carver;

common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.generation.generators;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.world.BiomeGrid;
 import com.dfsek.terra.api.world.World;
@@ -15,7 +15,7 @@ import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
@@ -50,7 +50,7 @@ public class DefaultChunkGenerator2D implements TerraChunkGenerator {
         blockPopulators.add(new OrePopulator(main));
         blockPopulators.add(new TreePopulator(main));
         blockPopulators.add(new TreePopulator(main));
-        carver = new NoiseCarver(new Range(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main);
+        carver = new NoiseCarver(new ConstantRange(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main);
         this.cache = cache;
     }
 

common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.generation.generators;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.BlockData;
@@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.palette.Palette;
 import com.dfsek.terra.api.world.palette.SinglePalette;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.Carver;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.carving.NoiseCarver;
@@ -61,7 +61,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator {
         blockPopulators.add(new TreePopulator(main));
         blockPopulators.add(new FloraPopulator(main));
 
-        carver = new NoiseCarver(new Range(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main);
+        carver = new NoiseCarver(new ConstantRange(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main);
         water = main.getWorldHandle().createBlockData("minecraft:water").getBlockType();
         blank = new SinglePalette(main.getWorldHandle().createBlockData("minecraft:air"));
     }

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

@@ -14,7 +14,7 @@ import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.pack.WorldConfig;
 import com.dfsek.terra.config.templates.CarverTemplate;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import org.jetbrains.annotations.NotNull;
 

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

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.util.world.PopulationUtil;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.flora.FloraLayer;
 import org.jetbrains.annotations.NotNull;

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

@@ -10,7 +10,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.config.templates.BiomeTemplate;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import org.jetbrains.annotations.NotNull;
 

common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java

@@ -5,14 +5,14 @@ import com.dfsek.terra.api.util.MathUtil;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.structures.structure.Rotation;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generation.Chunkified;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
 import com.dfsek.terra.config.pack.WorldConfig;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.TerraStructure;
 import net.jafama.FastMath;

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

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.util.world.PopulationUtil;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generation.TerraBlockPopulator;
-import com.dfsek.terra.profiler.ProfileFrame;
+import com.dfsek.terra.api.profiler.ProfileFrame;
 import com.dfsek.terra.world.TerraWorld;
 import com.dfsek.terra.world.population.items.tree.TreeLayer;
 import net.jafama.FastMath;

common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java

@@ -1,18 +1,19 @@
 package com.dfsek.terra.world.population.items;
 
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.noise.NoiseSampler;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 
 public abstract class PlaceableLayer<T> {
     protected final double density;
-    protected final Range level;
+    protected final ConstantRange level;
     protected final ProbabilityCollectionImpl<T> layer;
     protected final NoiseSampler noise;
 
-    public PlaceableLayer(double density, Range level, ProbabilityCollectionImpl<T> layer, NoiseSampler noise) {
+    public PlaceableLayer(double density, ConstantRange level, ProbabilityCollectionImpl<T> layer, NoiseSampler noise) {
         this.density = density;
         this.level = level;
         this.layer = layer;

common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.world.population.items;
 
 import com.dfsek.terra.api.math.GridSpawn;
-import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.structures.script.StructureScript;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 import com.dfsek.terra.config.templates.StructureTemplate;
 

common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java

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

common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.world.population.items.flora;
 
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.block.BlockFace;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.collections.MaterialSet;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 
 import java.util.List;
 

common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java

@@ -1,16 +1,16 @@
 package com.dfsek.terra.world.population.items.flora;
 
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.world.population.items.PlaceableLayer;
 
 public class FloraLayer extends PlaceableLayer<Flora> {
 
-    public FloraLayer(double density, Range level, ProbabilityCollectionImpl<Flora> layer, NoiseSampler noise) {
+    public FloraLayer(double density, ConstantRange level, ProbabilityCollectionImpl<Flora> layer, NoiseSampler noise) {
         super(density, level, layer, noise);
     }
 

common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.population.items.flora;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;
@@ -14,7 +14,7 @@ import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.util.GlueList;
 import com.dfsek.terra.api.util.collections.MaterialSet;
-import com.dfsek.terra.api.world.flora.Flora;
+import com.dfsek.terra.api.world.Flora;
 import com.dfsek.terra.api.world.palette.Palette;
 import net.jafama.FastMath;
 

common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java

@@ -1,8 +1,8 @@
 package com.dfsek.terra.world.population.items.ores;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.noise.samplers.noise.simplex.OpenSimplex2Sampler;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.Block;

common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java

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

common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.world.population.items.ores;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.vector.Vector3Impl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.block.BlockData;

common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java

@@ -3,7 +3,7 @@ package com.dfsek.terra.world.population.items.tree;
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.structures.script.StructureScript;
-import com.dfsek.terra.api.structures.structure.Rotation;
+import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
 

common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.world.population.items.tree;
 
-import com.dfsek.terra.api.math.Range;
+import com.dfsek.terra.api.math.range.ConstantRange;
 import com.dfsek.terra.api.noise.NoiseSampler;
 import com.dfsek.terra.api.vector.Vector2;
 import com.dfsek.terra.api.block.Block;
@@ -13,7 +13,7 @@ import com.dfsek.terra.world.population.items.PlaceableLayer;
 
 public class TreeLayer extends PlaceableLayer<Tree> {
 
-    public TreeLayer(double density, Range level, ProbabilityCollectionImpl<Tree> layer, NoiseSampler noise) {
+    public TreeLayer(double density, ConstantRange level, ProbabilityCollectionImpl<Tree> layer, NoiseSampler noise) {
         super(density, level, layer, noise);
     }