refactor API

common/src/main/java/com/dfsek/terra/addon/AddonClassLoader.java

@@ -1,7 +1,7 @@
-package com.dfsek.terra.addons.loading;
+package com.dfsek.terra.addon;
 
-import com.dfsek.terra.addons.addon.TerraAddon;
-import com.dfsek.terra.addons.annotations.Addon;
+import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.addons.annotations.Addon;
 
 import java.io.File;
 import java.io.IOException;

common/src/main/java/com/dfsek/terra/addon/AddonPool.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.addons.loading.pre;
+package com.dfsek.terra.addon;
 
-import com.dfsek.terra.addons.loading.AddonLoadException;
+import com.dfsek.terra.addon.exception.AddonLoadException;
 
 import java.util.HashMap;
 import java.util.HashSet;

common/src/main/java/com/dfsek/terra/addon/PreLoadAddon.java

@@ -1,11 +1,11 @@
-package com.dfsek.terra.addons.loading.pre;
+package com.dfsek.terra.addon;
 
-import com.dfsek.terra.addons.addon.TerraAddon;
-import com.dfsek.terra.addons.annotations.Addon;
-import com.dfsek.terra.addons.annotations.Depends;
-import com.dfsek.terra.addons.loading.AddonLoadException;
-import com.dfsek.terra.addons.loading.pre.exception.CircularDependencyException;
-import com.dfsek.terra.addons.loading.pre.exception.DependencyMissingException;
+import com.dfsek.terra.addon.exception.AddonLoadException;
+import com.dfsek.terra.addon.exception.CircularDependencyException;
+import com.dfsek.terra.addon.exception.DependencyMissingException;
+import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.addons.annotations.Addon;
+import com.dfsek.terra.api.addons.annotations.Depends;
 
 import java.util.ArrayList;
 import java.util.Arrays;

common/src/main/java/com/dfsek/terra/addon/exception/AddonLoadException.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.loading;
+package com.dfsek.terra.addon.exception;
 
 public class AddonLoadException extends Exception {
     private static final long serialVersionUID = -4949084729296580176L;

common/src/main/java/com/dfsek/terra/addon/exception/CircularDependencyException.java

@@ -1,6 +1,4 @@
-package com.dfsek.terra.addons.loading.pre.exception;
-
-import com.dfsek.terra.addons.loading.AddonLoadException;
+package com.dfsek.terra.addon.exception;
 
 public class CircularDependencyException extends AddonLoadException {
     private static final long serialVersionUID = 7398510879124125121L;

common/src/main/java/com/dfsek/terra/addon/exception/DependencyMissingException.java

@@ -1,6 +1,4 @@
-package com.dfsek.terra.addons.loading.pre.exception;
-
-import com.dfsek.terra.addons.loading.AddonLoadException;
+package com.dfsek.terra.addon.exception;
 
 public class DependencyMissingException extends AddonLoadException {
     private static final long serialVersionUID = -8419489102208521583L;

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

@@ -1,22 +1,24 @@
-package com.dfsek.terra.api.core;
+package com.dfsek.terra.api;
 
-import com.dfsek.terra.addons.addon.TerraAddon;
-import com.dfsek.terra.api.LoaderRegistrar;
-import com.dfsek.terra.api.core.event.EventManager;
+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.platform.handle.WorldHandle;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.registry.CheckedRegistry;
+import com.dfsek.terra.api.registry.LockedRegistry;
+import com.dfsek.terra.api.util.DebugLogger;
 import com.dfsek.terra.config.PluginConfig;
 import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.debug.DebugLogger;
-import com.dfsek.terra.registry.CheckedRegistry;
-import com.dfsek.terra.registry.LockedRegistry;
 import com.dfsek.terra.world.TerraWorld;
 
 import java.io.File;
 import java.util.logging.Logger;
 
+/**
+ * Represents a Terra mod/plugin instance.
+ */
 public interface TerraPlugin extends LoaderRegistrar {
     WorldHandle getWorldHandle();
 

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

@@ -1,9 +1,9 @@
-package com.dfsek.terra.addons.addon;
+package com.dfsek.terra.api.addons;
 
 
-import com.dfsek.terra.addons.annotations.Addon;
-import com.dfsek.terra.addons.annotations.Author;
-import com.dfsek.terra.addons.annotations.Version;
+import com.dfsek.terra.api.addons.annotations.Addon;
+import com.dfsek.terra.api.addons.annotations.Author;
+import com.dfsek.terra.api.addons.annotations.Version;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class TerraAddon {

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

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

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

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

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

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

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

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

common/src/main/java/com/dfsek/terra/api/core/event/EventListener.java

@@ -1,4 +0,0 @@
-package com.dfsek.terra.api.core.event;
-
-public interface EventListener {
-}

common/src/main/java/com/dfsek/terra/api/core/event/events/Event.java

@@ -1,4 +0,0 @@
-package com.dfsek.terra.api.core.event.events;
-
-public interface Event {
-}

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

@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.event;
+
+public interface EventListener {
+}

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

@@ -1,7 +1,7 @@
-package com.dfsek.terra.api.core.event;
+package com.dfsek.terra.api.event;
 
-import com.dfsek.terra.addons.addon.TerraAddon;
-import com.dfsek.terra.api.core.event.events.Event;
+import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.event.events.Event;
 
 public interface EventManager {
     /**

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

@@ -1,12 +1,12 @@
-package com.dfsek.terra.api.core.event;
+package com.dfsek.terra.api.event;
 
-import com.dfsek.terra.addons.addon.TerraAddon;
-import com.dfsek.terra.api.core.TerraPlugin;
-import com.dfsek.terra.api.core.event.annotations.Global;
-import com.dfsek.terra.api.core.event.annotations.Priority;
-import com.dfsek.terra.api.core.event.events.Cancellable;
-import com.dfsek.terra.api.core.event.events.Event;
-import com.dfsek.terra.api.core.event.events.PackEvent;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.addons.TerraAddon;
+import com.dfsek.terra.api.event.annotations.Global;
+import com.dfsek.terra.api.event.annotations.Priority;
+import com.dfsek.terra.api.event.events.Cancellable;
+import com.dfsek.terra.api.event.events.Event;
+import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.api.util.ReflectionUtil;
 
 import java.io.PrintWriter;

common/src/main/java/com/dfsek/terra/api/event/annotations/Global.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.core.event.annotations;
+package com.dfsek.terra.api.event.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

common/src/main/java/com/dfsek/terra/api/event/annotations/Priority.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.core.event.annotations;
+package com.dfsek.terra.api.event.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

common/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.core.event.events;
+package com.dfsek.terra.api.event.events;
 
 /**
  * Events that implement this interface may be cancelled.

common/src/main/java/com/dfsek/terra/api/event/events/Event.java

@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.event.events;
+
+public interface Event {
+}

common/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.core.event.events;
+package com.dfsek.terra.api.event.events;
 
 import com.dfsek.terra.config.pack.ConfigPack;
 

common/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackLoadEvent.java

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.core.event.events.config;
+package com.dfsek.terra.api.event.events.config;
 
-import com.dfsek.terra.api.core.event.events.PackEvent;
+import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.config.pack.ConfigPack;
 
 public abstract class ConfigPackLoadEvent implements PackEvent {

common/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPostLoadEvent.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.core.event.events.config;
+package com.dfsek.terra.api.event.events.config;
 
 import com.dfsek.terra.config.pack.ConfigPack;
 

common/src/main/java/com/dfsek/terra/api/event/events/config/ConfigPackPreLoadEvent.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.core.event.events.config;
+package com.dfsek.terra.api.event.events.config;
 
 import com.dfsek.terra.config.pack.ConfigPack;
 

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

@@ -1,6 +1,6 @@
-package com.dfsek.terra.api.core.event.events.world;
+package com.dfsek.terra.api.event.events.world;
 
-import com.dfsek.terra.api.core.event.events.PackEvent;
+import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.world.TerraWorld;
 

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

@@ -1,5 +1,7 @@
-package com.dfsek.terra.addons.injection;
+package com.dfsek.terra.api.injection;
 
+import com.dfsek.terra.api.injection.annotations.Inject;
+import com.dfsek.terra.api.injection.exception.InjectionException;
 import com.dfsek.terra.api.util.ReflectionUtil;
 
 import java.lang.reflect.Field;

common/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.injection;
+package com.dfsek.terra.api.injection.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

common/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.addons.injection;
+package com.dfsek.terra.api.injection.exception;
 
 public class InjectionException extends Exception {
     private static final long serialVersionUID = -6929631447064215387L;

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

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

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

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

common/src/main/java/com/dfsek/terra/api/platform/package-info.java

@@ -1,4 +1,6 @@
 /**
  * API for platform implementations. Mostly interfaces to be implemented by platform delegates.
+ * <p>
+ * Interfaces in this package generally should <b>not</b> be implemented by addons.
  */
 package com.dfsek.terra.api.platform;

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

@@ -1,7 +1,8 @@
-package com.dfsek.terra.registry;
+package com.dfsek.terra.api.registry;
 
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.registry.OpenRegistry;
 import com.dfsek.terra.registry.exception.DuplicateEntryException;
 
 import java.lang.reflect.Type;

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

@@ -1,7 +1,8 @@
-package com.dfsek.terra.registry;
+package com.dfsek.terra.api.registry;
 
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.ConfigLoader;
+import com.dfsek.terra.registry.OpenRegistry;
 
 import java.lang.reflect.Type;
 import java.util.Set;

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.registry;
+package com.dfsek.terra.api.registry;
 
 import com.dfsek.tectonic.loading.TypeLoader;
 

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.loot;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.structures.loot.functions.AmountFunction;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.loot;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.platform.inventory.Inventory;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.util.GlueList;

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

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

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.loot.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.Enchantment;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.structures.parser.Parser;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/BiomeFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.api.structures.script.functions.BiomeFunction;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/BlockFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.constants.BooleanConstant;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/CheckFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/EntityFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/LootFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
 import com.dfsek.terra.api.structures.script.functions.LootFunction;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/PullFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/StateFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;

common/src/main/java/com/dfsek/terra/api/structures/script/builders/StructureFunctionBuilder.java

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.builders;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
 import com.dfsek.terra.api.structures.parser.lang.Returnable;
 import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.entity.EntityType;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.structures.loot.LootTable;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.structures.script.functions;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.dfsek.terra.debug;
+package com.dfsek.terra.api.util;
 
 import java.util.logging.Logger;
 

common/src/main/java/com/dfsek/terra/api/util/collections/MaterialSet.java

@@ -1,4 +1,4 @@
-package com.dfsek.terra.api.util.world;
+package com.dfsek.terra.api.util.collections;
 
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;

common/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollection.java

@@ -1,19 +1,23 @@
-package com.dfsek.terra.api.math;
+package com.dfsek.terra.api.util.collections;
 
+import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
+import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
 @SuppressWarnings("unchecked")
-public class ProbabilityCollection<E> {
+public class ProbabilityCollection<E> implements Collection<E> {
     private final Set<E> cont = new HashSet<>();
     private Object[] array = new Object[0];
     private int size;
 
-    public com.dfsek.terra.api.math.ProbabilityCollection<E> add(E item, int probability) {
+    public ProbabilityCollection<E> add(E item, int probability) {
         if(!cont.contains(item)) size++;
         cont.add(item);
         int oldLength = array.length;
@@ -43,10 +47,81 @@ public class ProbabilityCollection<E> {
         return array.length;
     }
 
+    @Override
     public int size() {
         return size;
     }
 
+    @Override
+    public boolean isEmpty() {
+        return array.length == 0;
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return cont.contains(o);
+    }
+
+    @NotNull
+    @Override
+    public Iterator<E> iterator() {
+        return cont.iterator();
+    }
+
+    @NotNull
+    @Override
+    public Object[] toArray() {
+        return cont.toArray();
+    }
+
+    @SuppressWarnings("SuspiciousToArrayCall")
+    @NotNull
+    @Override
+    public <T> T[] toArray(@NotNull T[] a) {
+        return cont.toArray(a);
+    }
+
+    /**
+     * Adds an item with probability of 1.
+     */
+    @Override
+    public boolean add(E e) {
+        add(e, 1);
+        return true; // Since this adds the item with a probability, the collection will always have changed.
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        throw new UnsupportedOperationException("Cannot remove item from ProbabilityCollection!");
+    }
+
+    @Override
+    public boolean containsAll(@NotNull Collection<?> c) {
+        return cont.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(@NotNull Collection<? extends E> c) {
+        c.forEach(this::add);
+        return true;
+    }
+
+    @Override
+    public boolean removeAll(@NotNull Collection<?> c) {
+        throw new UnsupportedOperationException("Cannot remove item from ProbabilityCollection!");
+    }
+
+    @Override
+    public boolean retainAll(@NotNull Collection<?> c) {
+        throw new UnsupportedOperationException("Cannot remove item from ProbabilityCollection!");
+    }
+
+    @Override
+    public void clear() {
+        cont.clear();
+        array = new Object[0];
+    }
+
     public Set<E> getContents() {
         return new HashSet<>(cont);
     }

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

@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.util.mutable;
 
+import org.jetbrains.annotations.NotNull;
+
 public class MutableBoolean implements MutablePrimitive<Boolean> {
     private boolean value;
 
@@ -17,4 +19,9 @@ public class MutableBoolean implements MutablePrimitive<Boolean> {
         value = !value;
         return value;
     }
+
+    @Override
+    public int compareTo(@NotNull Boolean o) {
+        return Boolean.compare(value, o);
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.util.mutable;
 
+import org.jetbrains.annotations.NotNull;
+
 public class MutableDouble extends MutableNumber<Double> {
     private static final long serialVersionUID = -2218110876763640053L;
 
@@ -36,4 +38,9 @@ public class MutableDouble extends MutableNumber<Double> {
     public void divide(Double divide) {
         value /= divide;
     }
+
+    @Override
+    public int compareTo(@NotNull Double o) {
+        return Double.compare(value, o);
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.dfsek.terra.api.util.mutable;
 
+import org.jetbrains.annotations.NotNull;
+
 public class MutableInteger extends MutableNumber<Integer> {
     private static final long serialVersionUID = -4427935901819632745L;
 
@@ -38,4 +40,9 @@ public class MutableInteger extends MutableNumber<Integer> {
     public void add(int add) {
         value += add;
     }
+
+    @Override
+    public int compareTo(@NotNull Integer o) {
+        return Integer.compare(value, o);
+    }
 }

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

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

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

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

common/src/main/java/com/dfsek/terra/api/util/seeded/SeededBuilder.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.api.util.seeded;
 
 import java.util.function.Function;
 
+@FunctionalInterface
 public interface SeededBuilder<T> extends Function<Long, T> {
 
 }

common/src/main/java/com/dfsek/terra/api/util/seeded/SourceSeeded.java

@@ -2,5 +2,6 @@ package com.dfsek.terra.api.util.seeded;
 
 import com.dfsek.terra.api.world.biome.pipeline.source.BiomeSource;
 
+@FunctionalInterface
 public interface SourceSeeded extends SeededBuilder<BiomeSource> {
 }

common/src/main/java/com/dfsek/terra/api/util/seeded/StageSeeded.java

@@ -2,5 +2,6 @@ package com.dfsek.terra.api.util.seeded;
 
 import com.dfsek.terra.api.world.biome.pipeline.stages.Stage;
 
+@FunctionalInterface
 public interface StageSeeded extends SeededBuilder<Stage> {
 }

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.biome;
 
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 
 import java.util.Set;
 

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

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.biome;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.config.builder.GeneratorBuilder;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 

common/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderListMutator.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 import java.util.Map;

common/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderMutator.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 public class BorderMutator implements BiomeMutator {

common/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceListMutator.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 import java.util.Map;

common/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceMutator.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.mutator;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 public class ReplaceMutator implements BiomeMutator {

common/src/main/java/com/dfsek/terra/api/world/biome/pipeline/source/RandomSource.java

@@ -1,7 +1,7 @@
 package com.dfsek.terra.api.world.biome.pipeline.source;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 
 public class RandomSource implements BiomeSource {

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.biome.provider;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.math.vector.Vector2;
 import com.dfsek.terra.api.world.biome.TerraBiome;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.api.world.generation;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.generator.ChunkData;

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

@@ -1,6 +1,6 @@
-package com.dfsek.terra.async;
+package com.dfsek.terra.api.world.locate;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.world.biome.TerraBiome;

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

@@ -1,6 +1,6 @@
-package com.dfsek.terra.async;
+package com.dfsek.terra.api.world.locate;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.world.World;

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

@@ -1,6 +1,6 @@
-package com.dfsek.terra.async;
+package com.dfsek.terra.api.world.locate;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;

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

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

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

@@ -1,8 +1,8 @@
 package com.dfsek.terra.api.world.palette.holder;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.noise.NoiseSampler;
 import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import org.jetbrains.annotations.NotNull;
 
 public class PaletteLayerHolder {

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

@@ -1,11 +1,11 @@
 package com.dfsek.terra.api.world.tree.fractal;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.entity.Entity;
 import com.dfsek.terra.api.platform.entity.EntityType;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 
 import java.util.Random;
 import java.util.function.Consumer;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 
 import java.util.Random;
 

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 
 import java.util.Random;

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

@@ -1,12 +1,12 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
-import com.dfsek.terra.api.math.ProbabilityCollection;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import net.jafama.FastMath;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 
 import java.util.Random;

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

@@ -1,12 +1,12 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
-import com.dfsek.terra.api.math.ProbabilityCollection;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import net.jafama.FastMath;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 
 import java.util.Random;

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

@@ -1,12 +1,12 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
-import com.dfsek.terra.api.math.ProbabilityCollection;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import net.jafama.FastMath;

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

@@ -1,10 +1,10 @@
 package com.dfsek.terra.api.world.tree.fractal.trees;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.api.world.tree.fractal.FractalTree;
 import com.dfsek.terra.api.world.tree.fractal.TreeGeometry;
 import net.jafama.FastMath;

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

@@ -1,6 +1,6 @@
 package com.dfsek.terra.carving;
 
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.MathUtil;
 import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.api.platform.world.World;

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

@@ -1,9 +1,9 @@
 package com.dfsek.terra.carving;
 
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.MaterialData;
-import com.dfsek.terra.api.util.world.MaterialSet;
+import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 
 import java.util.Map;
 import java.util.TreeMap;

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

@@ -4,7 +4,7 @@ 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.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
 import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;

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

@@ -1,17 +1,17 @@
 package com.dfsek.terra.config;
 
 import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.addons.addon.TerraAddon;
 import com.dfsek.terra.api.LoaderRegistrar;
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.addons.TerraAddon;
 import com.dfsek.terra.api.math.GridSpawn;
-import com.dfsek.terra.api.math.ProbabilityCollection;
 import com.dfsek.terra.api.math.Range;
 import com.dfsek.terra.api.math.noise.samplers.ImageSampler;
 import com.dfsek.terra.api.math.noise.samplers.noise.CellularSampler;
+import com.dfsek.terra.api.util.collections.MaterialSet;
+import com.dfsek.terra.api.util.collections.ProbabilityCollection;
 import com.dfsek.terra.api.util.seeded.SourceSeeded;
 import com.dfsek.terra.api.util.seeded.StageSeeded;
-import com.dfsek.terra.api.util.world.MaterialSet;
 import com.dfsek.terra.api.world.biome.pipeline.stages.ExpanderStage;
 import com.dfsek.terra.api.world.biome.pipeline.stages.MutatorStage;
 import com.dfsek.terra.api.world.biome.provider.BiomeProvider;

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

@@ -5,7 +5,7 @@ import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.config.ConfigTemplate;
 import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.loading.ConfigLoader;
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.util.JarUtil;
 
 import java.io.File;

common/src/main/java/com/dfsek/terra/config/exception/FileMissingException.java

@@ -1,15 +0,0 @@
-package com.dfsek.terra.config.exception;
-
-import com.dfsek.tectonic.exception.ConfigException;
-
-public class FileMissingException extends ConfigException {
-    private static final long serialVersionUID = 4489395640246760802L;
-
-    public FileMissingException(String message) {
-        super(message);
-    }
-
-    public FileMissingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

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

@@ -1,7 +1,7 @@
 package com.dfsek.terra.config.factories;
 
 import com.dfsek.paralithic.eval.parser.Scope;
-import com.dfsek.terra.api.core.TerraPlugin;
+import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.world.biome.TerraBiome;
 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
 import com.dfsek.terra.config.builder.GeneratorBuilder;