begin refactor

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform;
+package com.dfsek.terra.api;
 
 /**
  * An interface that contains a platform delegate.

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

@@ -2,9 +2,9 @@ package com.dfsek.terra.api;
 
 import com.dfsek.terra.api.addons.TerraAddon;
 import com.dfsek.terra.api.event.EventManager;
-import com.dfsek.terra.api.platform.handle.ItemHandle;
+import com.dfsek.terra.api.handle.ItemHandle;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.handle.WorldHandle;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.LockedRegistry;
 import com.dfsek.terra.api.util.JarUtil;

common/api/src/main/java/com/dfsek/terra/api/addon/TerraAddon.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.api.addons;
+package com.dfsek.terra.api.addon;
 
 
-import com.dfsek.terra.api.addons.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Addon;
-import com.dfsek.terra.api.addons.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Author;
-import com.dfsek.terra.api.addons.annotations.Version;
+import com.dfsek.terra.api.addon.annotations.Version;
 import org.jetbrains.annotations.NotNull;
 
 /**

common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Addon.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.addons.annotations;
+package com.dfsek.terra.api.addon.annotations;
 
 import org.jetbrains.annotations.NotNull;
 

common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Author.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.addons.annotations;
+package com.dfsek.terra.api.addon.annotations;
 
 import org.jetbrains.annotations.NotNull;
 

common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Depends.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.addons.annotations;
+package com.dfsek.terra.api.addon.annotations;
 
 import org.jetbrains.annotations.NotNull;
 

common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Version.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.addons.annotations;
+package com.dfsek.terra.api.addon.annotations;
 
 import org.jetbrains.annotations.NotNull;
 

common/api/src/main/java/com/dfsek/terra/api/block/Axis.java

@@ -0,0 +1,5 @@
+package com.dfsek.terra.api.block;
+
+public enum Axis {
+    X, Y, Z
+}

common/api/src/main/java/com/dfsek/terra/api/block/Block.java

@@ -1,8 +1,8 @@
-package com.dfsek.terra.api.platform.block;
+package com.dfsek.terra.api.block;
 
-import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.platform.block.state.BlockState;
+import com.dfsek.terra.api.block.state.BlockState;
 
 public interface Block extends Handle {
     void setBlockData(BlockData data, boolean physics);

common/api/src/main/java/com/dfsek/terra/api/block/BlockData.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block;
+package com.dfsek.terra.api.block;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
 
 public interface BlockData extends Cloneable, Handle {
 

common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java

@@ -1,6 +1,7 @@
-package com.dfsek.terra.api.platform.block;
+package com.dfsek.terra.api.block;
 
-import com.dfsek.terra.api.math.vector.Vector3;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.api.vector.Vector3Impl;
 import org.jetbrains.annotations.NotNull;
 
 public enum BlockFace {
@@ -74,7 +75,7 @@ public enum BlockFace {
      */
     @NotNull
     public Vector3 getDirection() {
-        Vector3 direction = new Vector3(modX, modY, modZ);
+        Vector3 direction = new Vector3Impl(modX, modY, modZ);
         if(modX != 0 || modY != 0 || modZ != 0) {
             direction.normalize();
         }

common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block;
+package com.dfsek.terra.api.block;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
 
 public interface BlockType extends Handle {
     BlockData getDefaultData();

common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
 
 public interface AnaloguePowerable extends BlockData {
     int getMaximumPower();

common/api/src/main/java/com/dfsek/terra/api/block/data/Bisected.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
 
 public interface Bisected extends BlockData {
     Half getHalf();

common/api/src/main/java/com/dfsek/terra/api/block/data/Directional.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.api.block.data;
+
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockFace;
+
+public interface Directional extends BlockData {
+    BlockFace getFacing();
+
+    void setFacing(BlockFace facing);
+}

common/api/src/main/java/com/dfsek/terra/api/block/data/MultipleFacing.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
+import com.dfsek.terra.api.block.BlockFace;
 
 import java.util.Set;
 

common/api/src/main/java/com/dfsek/terra/api/block/data/Orientable.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.Axis;
+import com.dfsek.terra.api.block.Axis;
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
 
 import java.util.Set;
 

common/api/src/main/java/com/dfsek/terra/api/block/data/Rail.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
 
 public interface Rail extends BlockData {
     Shape getShape();

common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
+import com.dfsek.terra.api.block.BlockFace;
 
 import java.util.Set;
 

common/api/src/main/java/com/dfsek/terra/api/block/data/Rotatable.java

@@ -0,0 +1,10 @@
+package com.dfsek.terra.api.block.data;
+
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockFace;
+
+public interface Rotatable extends BlockData {
+    BlockFace getRotation();
+
+    void setRotation(BlockFace face);
+}

common/api/src/main/java/com/dfsek/terra/api/block/data/Slab.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
 public interface Slab extends Waterlogged {
     Type getType();

common/api/src/main/java/com/dfsek/terra/api/block/data/Stairs.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
 public interface Stairs extends Waterlogged, Directional, Bisected {
     Shape getShape();

common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
+import com.dfsek.terra.api.block.BlockFace;
 
 public interface Wall extends BlockData, Waterlogged {
     boolean isUp();

common/api/src/main/java/com/dfsek/terra/api/block/data/Waterlogged.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block.data;
+package com.dfsek.terra.api.block.data;
 
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
 
 public interface Waterlogged extends BlockData {
     boolean isWaterlogged();

common/api/src/main/java/com/dfsek/terra/api/block/data/properties/Property.java

@@ -0,0 +1,5 @@
+package com.dfsek.terra.api.block.data.properties;
+
+public interface Property<T> {
+
+}

common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java

@@ -1,8 +1,8 @@
-package com.dfsek.terra.api.platform.block.state;
+package com.dfsek.terra.api.block.state;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
 
 public interface BlockState extends Handle {
     Block getBlock();

common/api/src/main/java/com/dfsek/terra/api/block/state/Container.java

@@ -0,0 +1,6 @@
+package com.dfsek.terra.api.block.state;
+
+import com.dfsek.terra.api.inventory.BlockInventoryHolder;
+
+public interface Container extends BlockState, BlockInventoryHolder {
+}

common/api/src/main/java/com/dfsek/terra/api/block/state/MobSpawner.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.block.state;
+package com.dfsek.terra.api.block.state;
 
-import com.dfsek.terra.api.platform.entity.EntityType;
+import com.dfsek.terra.api.entity.EntityType;
 import org.jetbrains.annotations.NotNull;
 
 public interface MobSpawner extends BlockState {

common/api/src/main/java/com/dfsek/terra/api/block/state/SerialState.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.block.state;
+package com.dfsek.terra.api.block.state;
 
 import java.util.HashMap;
 import java.util.Map;

common/api/src/main/java/com/dfsek/terra/api/block/state/Sign.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.platform.block.state;
+package com.dfsek.terra.api.block.state;
 
 import org.jetbrains.annotations.NotNull;
 

common/api/src/main/java/com/dfsek/terra/api/entity/CommandSender.java

@@ -1,4 +1,6 @@
-package com.dfsek.terra.api.platform;
+package com.dfsek.terra.api.entity;
+
+import com.dfsek.terra.api.Handle;
 
 public interface CommandSender extends Handle {
     void sendMessage(String message);

common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java

@@ -0,0 +1,13 @@
+package com.dfsek.terra.api.entity;
+
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.Handle;
+import com.dfsek.terra.api.world.World;
+
+public interface Entity extends Handle, CommandSender {
+    Location getLocation();
+
+    void setLocation(Location location);
+
+    World getWorld();
+}

common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java

@@ -0,0 +1,6 @@
+package com.dfsek.terra.api.entity;
+
+import com.dfsek.terra.api.Handle;
+
+public interface EntityType extends Handle {
+}

common/api/src/main/java/com/dfsek/terra/api/entity/Player.java

@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.entity;
+
+public interface Player extends Entity {
+}

common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.event;
 
-import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.addon.TerraAddon;
 import com.dfsek.terra.api.event.events.Event;
 
 /**

common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java

@@ -2,7 +2,7 @@ package com.dfsek.terra.api.event.events.world.generation;
 
 import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.entity.Entity;
+import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity;
 import com.dfsek.terra.config.pack.ConfigPack;
 

common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java

@@ -3,8 +3,8 @@ package com.dfsek.terra.api.event.events.world.generation;
 import com.dfsek.terra.api.event.events.AbstractCancellable;
 import com.dfsek.terra.api.event.events.Cancellable;
 import com.dfsek.terra.api.event.events.PackEvent;
-import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.block.Block;
-import com.dfsek.terra.api.platform.block.state.Container;
+import com.dfsek.terra.api.block.state.Container;
 import com.dfsek.terra.api.structures.loot.LootTable;
 import com.dfsek.terra.api.structures.script.StructureScript;
 import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication;

common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.handle;
+package com.dfsek.terra.api.handle;
 
-import com.dfsek.terra.api.platform.inventory.Item;
+import com.dfsek.terra.api.inventory.Item;
-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
+import com.dfsek.terra.api.inventory.item.Enchantment;
 
 import java.util.Set;
 

common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java

@@ -1,9 +1,9 @@
-package com.dfsek.terra.api.platform.handle;
+package com.dfsek.terra.api.handle;
 
-import com.dfsek.terra.api.math.vector.Location;
+import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.block.BlockData;
-import com.dfsek.terra.api.platform.entity.EntityType;
+import com.dfsek.terra.api.entity.EntityType;
-import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 
 /**

common/api/src/main/java/com/dfsek/terra/api/injection/Injector.java

@@ -0,0 +1,38 @@
+package com.dfsek.terra.api.injection;
+
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.injection.exception.InjectionException;
+
+/**
+ * Dynamic dependency injector.
+ * <p>
+ * Stores an object to inject, and injects it into objects passed to {@link #inject(Object)}.
+ *
+ * @param <T> Type of object to inject.
+ */
+public interface Injector<T> {
+    /**
+     * Add an explicit class as a target. Useful for applications where subclasses may cause issues with DI.
+     *
+     * @param target Target class type.
+     */
+    void addExplicitTarget(Class<? extends T> target);
+
+    /**
+     * Inject the stored object into an object.
+     * <p>
+     * Injects the stored object into any non-static, non-final fields
+     * annotated with {@link Inject},
+     * with type matching the stored object or any explicit targets
+     * ({@link #addExplicitTarget(Class)}.
+     *
+     * @param object Object to inject into
+     * @throws InjectionException If:
+     *                            <ul>
+     *                                <li>Matching field annotated with {@link Inject} is final</li>
+     *                                <li>Matching field annotated with {@link Inject} is static</li>
+     *                                <li>A reflective access exception occurs</li>
+     *                            </ul>
+     */
+    void inject(Object object) throws InjectionException;
+}

common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java

@@ -0,0 +1,7 @@
+package com.dfsek.terra.api.inventory;
+
+import com.dfsek.terra.api.block.Block;
+
+public interface BlockInventoryHolder extends InventoryHolder {
+    Block getBlock();
+}

common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.inventory;
+package com.dfsek.terra.api.inventory;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
 
 public interface Inventory extends Handle {
     int getSize();

common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java

@@ -0,0 +1,7 @@
+package com.dfsek.terra.api.inventory;
+
+import com.dfsek.terra.api.Handle;
+
+public interface InventoryHolder extends Handle {
+    Inventory getInventory();
+}

common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.inventory;
+package com.dfsek.terra.api.inventory;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
 
 /**
  * An inventory item.

common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java

@@ -1,8 +1,8 @@
-package com.dfsek.terra.api.platform.inventory;
+package com.dfsek.terra.api.inventory;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.platform.inventory.item.Damageable;
+import com.dfsek.terra.api.inventory.item.Damageable;
-import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
 
 public interface ItemStack extends Handle {
     int getAmount();

common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.inventory.item;
+package com.dfsek.terra.api.inventory.item;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
 
 public interface Damageable extends Handle {
     int getDamage();

common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.platform.inventory.item;
+package com.dfsek.terra.api.inventory.item;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.ItemStack;
 
 public interface Enchantment extends Handle {
     boolean canEnchantItem(ItemStack itemStack);

common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.platform.inventory.item;
+package com.dfsek.terra.api.inventory.item;
 
-import com.dfsek.terra.api.platform.Handle;
+import com.dfsek.terra.api.Handle;
 
 import java.util.Map;
 

common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise;
+package com.dfsek.terra.api.noise;
 
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;

common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/ClampNormalizer.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.normalizer;
+package com.dfsek.terra.api.noise.normalizer;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import net.jafama.FastMath;
 
 public class ClampNormalizer extends Normalizer {

common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/LinearNormalizer.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.normalizer;
+package com.dfsek.terra.api.noise.normalizer;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 /**
  * Normalizer to linearly scale data's range.

common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/NormalNormalizer.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.math.noise.normalizer;
+package com.dfsek.terra.api.noise.normalizer;
 
 import com.dfsek.terra.api.math.MathUtil;
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import net.jafama.FastMath;
 
 /**

common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/Normalizer.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.normalizer;
+package com.dfsek.terra.api.noise.normalizer;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 public abstract class Normalizer implements NoiseSampler {
     private final NoiseSampler sampler;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/DomainWarpedSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers;
+package com.dfsek.terra.api.noise.samplers;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 public class DomainWarpedSampler implements NoiseSampler {
     private final NoiseSampler function;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ExpressionSampler.java

@@ -1,10 +1,10 @@
-package com.dfsek.terra.api.math.noise.samplers;
+package com.dfsek.terra.api.noise.samplers;
 
 import com.dfsek.paralithic.Expression;
 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.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 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;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ImageSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers;
+package com.dfsek.terra.api.noise.samplers;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import net.jafama.FastMath;
 
 import java.awt.image.BufferedImage;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/KernelSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers;
+package com.dfsek.terra.api.noise.samplers;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 public class KernelSampler implements NoiseSampler {
     private final double[][] kernel;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/CellularSampler.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.math.noise.samplers.noise;
+package com.dfsek.terra.api.noise.samplers.noise;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler;
+import com.dfsek.terra.api.noise.samplers.noise.simplex.OpenSimplex2Sampler;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/ConstantSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise;
+package com.dfsek.terra.api.noise.samplers.noise;
 
 /**
  * Sampler3D implementation that returns a constant.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/ExpressionFunction.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise;
+package com.dfsek.terra.api.noise.samplers.noise;
 
 import com.dfsek.paralithic.Expression;
 import com.dfsek.paralithic.eval.parser.Parser;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/GaborNoiseSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise;
+package com.dfsek.terra.api.noise.samplers.noise;
 
-import com.dfsek.terra.api.math.noise.samplers.noise.random.WhiteNoiseSampler;
+import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
 import net.jafama.FastMath;
 
 public class GaborNoiseSampler extends NoiseFunction {

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/NoiseFunction.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise;
+package com.dfsek.terra.api.noise.samplers.noise;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 import net.jafama.FastMath;
 
 @SuppressWarnings("ManualMinMaxCalculation")

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/BrownianMotionSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.fractal;
+package com.dfsek.terra.api.noise.samplers.noise.fractal;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 public class BrownianMotionSampler extends FractalNoiseFunction {
     public BrownianMotionSampler(int seed, NoiseSampler input) {

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/FractalNoiseFunction.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.fractal;
+package com.dfsek.terra.api.noise.samplers.noise.fractal;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
-import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;
+import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
 
 public abstract class FractalNoiseFunction extends NoiseFunction {
     protected final NoiseSampler input;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/PingPongSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.fractal;
+package com.dfsek.terra.api.noise.samplers.noise.fractal;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 public class PingPongSampler extends FractalNoiseFunction {
     private double pingPongStrength = 2.0;

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/RidgedFractalSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.fractal;
+package com.dfsek.terra.api.noise.samplers.noise.fractal;
 
-import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.noise.NoiseSampler;
 
 public class RidgedFractalSampler extends FractalNoiseFunction {
 

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/random/GaussianNoiseSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.random;
+package com.dfsek.terra.api.noise.samplers.noise.random;
 
-import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;
+import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
 
 /**
  * NoiseSampler implementation to provide random, normally distributed (Gaussian) noise.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/random/WhiteNoiseSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.random;
+package com.dfsek.terra.api.noise.samplers.noise.random;
 
-import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;
+import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
 
 /**
  * NoiseSampler implementation to produce random, uniformly distributed (white) noise.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/OpenSimplex2SSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.simplex;
+package com.dfsek.terra.api.noise.samplers.noise.simplex;
 
 /**
  * NoiseSampler implementation to provide OpenSimplex2 (Smooth Variant) noise.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/OpenSimplex2Sampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.simplex;
+package com.dfsek.terra.api.noise.samplers.noise.simplex;
 
 /**
  * NoiseSampler implementation to provide OpenSimplex2 noise.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/PerlinSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.simplex;
+package com.dfsek.terra.api.noise.samplers.noise.simplex;
 
 /**
  * NoiseSampler implementation to provide Perlin Noise.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/SimplexSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.simplex;
+package com.dfsek.terra.api.noise.samplers.noise.simplex;
 
 public class SimplexSampler extends SimplexStyleSampler {
     private static final Double2[] GRAD_2D = {

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/SimplexStyleSampler.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.simplex;
+package com.dfsek.terra.api.noise.samplers.noise.simplex;
 
-import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;
+import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
 
 /**
  * Abstract NoiseSampler implementation for simplex-style noise functions.

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/value/ValueCubicSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.value;
+package com.dfsek.terra.api.noise.samplers.noise.value;
 
 public class ValueCubicSampler extends ValueStyleNoise {
     public ValueCubicSampler(int seed) {

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/value/ValueSampler.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.value;
+package com.dfsek.terra.api.noise.samplers.noise.value;
 
 public class ValueSampler extends ValueStyleNoise {
     public ValueSampler(int seed) {

common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/value/ValueStyleNoise.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.math.noise.samplers.noise.value;
+package com.dfsek.terra.api.noise.samplers.noise.value;
 
-import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction;
+import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
 
 public abstract class ValueStyleNoise extends NoiseFunction {
     public ValueStyleNoise(int seed) {

common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java

@@ -0,0 +1,24 @@
+package com.dfsek.terra.api.registry;
+
+public interface CheckedRegistry<T> extends Registry<T> {
+    /**
+     * Add a value to this registry, checking whether it is present first.
+     *
+     * @param identifier Identifier to assign value.
+     * @param value      Value to add.
+     * @throws DuplicateEntryException If an entry with the same identifier is already present.
+     */
+    void add(String identifier, T value) throws DuplicateEntryException;
+
+    /**
+     * Add a value to the registry, without checking presence beforehand.
+     * <p>
+     * Use of this method is generally discouraged, as it is bad practice to overwrite registry values.
+     *
+     * @param identifier Identifier to assign value.
+     * @param value      Value to add.
+     * @deprecated Use of {@link #add(String, Object)} is encouraged.
+     */
+    @Deprecated
+    void addUnchecked(String identifier, T value);
+}

common/api/src/main/java/com/dfsek/terra/api/registry/DuplicateEntryException.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.registry.exception;
+package com.dfsek.terra.api.registry;
 
 /**
  * Thrown when a duplicate entry is found in a registry.

common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java

@@ -0,0 +1,25 @@
+package com.dfsek.terra.api.registry;
+
+public interface OpenRegistry<T> extends Registry<T> {
+    /**
+     * Add a value to this registry.
+     *
+     * @param identifier Identifier to assign value.
+     * @param value      Value to add.
+     */
+    boolean add(String identifier, T value);
+
+    /**
+     * Add a value to this registry, checking whether it is present first.
+     *
+     * @param identifier Identifier to assign value.
+     * @param value      Value to add.
+     * @throws DuplicateEntryException If an entry with the same identifier is already present.
+     */
+    void addChecked(String identifier, T value) throws DuplicateEntryException;
+
+    /**
+     * Clears all entries from the registry.
+     */
+    void clear();
+}

common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java

@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.transform;
 
+import com.dfsek.terra.api.transform.exception.TransformException;
+
 /**
  * Interface to transform data from one type to another.
  */

common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java

@@ -0,0 +1,11 @@
+package com.dfsek.terra.api.transform;
+
+public interface Transformer<F, T> {
+    /**
+     * Translate data from {@code from} type to {@code to} type.
+     *
+     * @param from Data to translate
+     * @return Result
+     */
+    T translate(F from);
+}

common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java

@@ -1,6 +1,8 @@
 package com.dfsek.terra.api.transform;
 
 
+import com.dfsek.terra.api.transform.exception.TransformException;
+
 import java.util.Objects;
 
 public interface Validator<T> {

common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.transform;
+package com.dfsek.terra.api.transform.exception;
 
 import com.dfsek.terra.api.util.GlueList;
 

common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.transform;
+package com.dfsek.terra.api.transform.exception;
 
 public class TransformException extends Exception {
     private static final long serialVersionUID = -6661338369581162084L;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.math;
+package com.dfsek.terra.api.util;
 
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.world.generation.math.samplers.Sampler;