begin refactor

2026-06-17 14:21:08 +00:00 · 2021-06-23 09:42:17 -07:00
parent cf214cc274
commit 7495a6b4a1
515 changed files with 1917 additions and 2018 deletions
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit;

-import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.entity.CommandSender;
 import org.bukkit.ChatColor;

 public class BukkitCommandSender implements CommandSender {
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.entity.Entity;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitEntity implements Entity {
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitPlayer implements Player {
@@ -2,20 +2,20 @@ package com.dfsek.terra.bukkit;

 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addons.TerraAddon;
-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 com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.event.EventManager;
-import com.dfsek.terra.api.event.TerraEventManager;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.platform.world.Biome;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.event.EventManagerImpl;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.handle.WorldHandle;
+import com.dfsek.terra.api.world.biome.Biome;
+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.logging.DebugLogger;
@@ -79,7 +79,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
    private DebugLogger debugLogger;


-    private final EventManager eventManager = new TerraEventManager(this);
+    private final EventManager eventManager = new EventManagerImpl(this);
    public static final BukkitVersion BUKKIT_VERSION;

    static {
@@ -4,8 +4,8 @@ import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
-import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;

@Command
@@ -2,7 +2,7 @@ package com.dfsek.terra.bukkit.command;

 import com.dfsek.terra.api.command.CommandTemplate;
 import com.dfsek.terra.api.command.annotation.Command;
-import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
 import com.dfsek.terra.config.lang.LangUtil;

@@ -1,12 +1,12 @@
 package com.dfsek.terra.bukkit.generator;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.generator.ChunkData;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.world.generator.ChunkData;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;

-public class BukkitChunkGenerator implements com.dfsek.terra.api.platform.world.generator.ChunkGenerator {
+public class BukkitChunkGenerator implements com.dfsek.terra.api.world.generator.ChunkGenerator {
    private final ChunkGenerator delegate;

    public BukkitChunkGenerator(ChunkGenerator delegate) {
@@ -1,13 +1,12 @@
 package com.dfsek.terra.bukkit.generator;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.population.PopulationManager;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
-import com.dfsek.terra.world.TerraWorld;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
@@ -23,7 +22,7 @@ import java.util.Random;

 public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements GeneratorWrapper {

-    private static final Map<com.dfsek.terra.api.platform.world.World, PopulationManager> popMap = new HashMap<>();
+    private static final Map<com.dfsek.terra.api.world.World, PopulationManager> popMap = new HashMap<>();

    private final PopulationManager popMan;

@@ -42,7 +41,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener


    public static synchronized void saveAll() {
-        for(Map.Entry<com.dfsek.terra.api.platform.world.World, PopulationManager> e : popMap.entrySet()) {
+        for(Map.Entry<com.dfsek.terra.api.world.World, PopulationManager> e : popMap.entrySet()) {
            try {
                e.getValue().saveBlocks(e.getKey());
            } catch(IOException ioException) {
@@ -56,7 +55,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
        popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld());
    }

-    private void load(com.dfsek.terra.api.platform.world.World w) {
+    private void load(com.dfsek.terra.api.world.World w) {
        try {
            popMan.loadBlocks(w);
        } catch(FileNotFoundException ignore) {
@@ -70,7 +69,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener

    @Override
    public @NotNull ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
-        com.dfsek.terra.api.platform.world.World bukkitWorld = BukkitAdapter.adapt(world);
+        com.dfsek.terra.api.world.World bukkitWorld = BukkitAdapter.adapt(world);
        if(needsLoad) load(bukkitWorld); // Load population data for world.
        delegate.generateBiomes(bukkitWorld, random, x, z, new BukkitBiomeGrid(biome));
        return (ChunkData) delegate.generateChunkData(bukkitWorld, random, x, z, new BukkitChunkGenerator.BukkitChunkData(createChunkData(world))).getHandle();
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.handles;

-import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.inventory.Item;
-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.item.Enchantment;
 import com.dfsek.terra.bukkit.util.MinecraftUtils;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.Material;
@@ -1,10 +1,10 @@
 package com.dfsek.terra.bukkit.handles;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.entity.EntityType;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.bukkit.structure.WorldEditUtil;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
@@ -1,11 +1,11 @@
 package com.dfsek.terra.bukkit.listeners;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.Tree;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.world.Tree;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
-import com.dfsek.terra.api.transform.Transformer;
+import com.dfsek.terra.api.transform.TransformerImpl;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.config.pack.WorldConfig;
@@ -29,7 +29,7 @@ public class CommonListener implements Listener {
        this.main = main;
    }

-    private static final Transformer<TreeType, String> TREE_TYPE_STRING_TRANSFORMER = new Transformer.Builder<TreeType, String>()
+    private static final TransformerImpl<TreeType, String> TREE_TYPE_STRING_TRANSFORMER = new TransformerImpl.Builder<TreeType, String>()
            .addTransform(new MapTransform<TreeType, String>()
                    .add(TreeType.COCOA_TREE, "JUNGLE_COCOA")
                    .add(TreeType.BIG_TREE, "LARGE_OAK")
@@ -5,10 +5,10 @@ import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.platform.world.Tree;
+import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitTree;
-import com.dfsek.terra.registry.exception.DuplicateEntryException;
+import com.dfsek.terra.api.registry.DuplicateEntryException;
 import org.bukkit.TreeType;

 public class TerraListener implements EventListener {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.population;


-import com.dfsek.terra.api.platform.world.Chunk;
+import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.bukkit.world.BukkitWorld;

 import java.io.Serializable;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.population;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.generation.Chunkified;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
@@ -1,23 +1,24 @@
 package com.dfsek.terra.bukkit.world;


-import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.api.platform.block.data.Bisected;
-import com.dfsek.terra.api.platform.block.data.Rail;
-import com.dfsek.terra.api.platform.block.data.RedstoneWire;
-import com.dfsek.terra.api.platform.block.data.Slab;
-import com.dfsek.terra.api.platform.block.data.Stairs;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.vector.Vector3Impl;
+import com.dfsek.terra.api.entity.CommandSender;
+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.BlockType;
+import com.dfsek.terra.api.block.data.Bisected;
+import com.dfsek.terra.api.block.data.Rail;
+import com.dfsek.terra.api.block.data.RedstoneWire;
+import com.dfsek.terra.api.block.data.Slab;
+import com.dfsek.terra.api.block.data.Stairs;
+import com.dfsek.terra.api.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.item.Enchantment;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.transform.MapTransform;
-import com.dfsek.terra.api.transform.Transformer;
+import com.dfsek.terra.api.transform.TransformerImpl;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitEntity;
 import com.dfsek.terra.bukkit.BukkitPlayer;
@@ -36,7 +37,7 @@ import org.bukkit.util.Vector;
 * Utility class to adapt Bukkit enums to Terra enums.
 */
 public final class BukkitAdapter {
-    public static Transformer<TreeType, String> TREE_TRANSFORMER = new Transformer.Builder<TreeType, String>()
+    public static TransformerImpl<TreeType, String> TREE_TRANSFORMER = new TransformerImpl.Builder<TreeType, String>()
            .addTransform(new MapTransform<TreeType, String>()
                    .add(TreeType.COCOA_TREE, "JUNGLE_COCOA")
                    .add(TreeType.BIG_TREE, "LARGE_OAK")
@@ -336,12 +337,12 @@ public final class BukkitAdapter {
        }
    }

-    public static Location adapt(com.dfsek.terra.api.math.vector.Location location) {
+    public static Location adapt(com.dfsek.terra.api.vector.Location location) {
        return new Location(((BukkitWorld) location.getWorld()).getHandle(), location.getX(), location.getY(), location.getZ());
    }

-    public static com.dfsek.terra.api.math.vector.Location adapt(Location location) {
-        return new com.dfsek.terra.api.math.vector.Location(adapt(location.getWorld()), location.getX(), location.getY(), location.getZ());
+    public static com.dfsek.terra.api.vector.Location adapt(Location location) {
+        return new com.dfsek.terra.api.vector.Location(adapt(location.getWorld()), location.getX(), location.getY(), location.getZ());
    }

    public static Vector adapt(Vector3 vector3) {
@@ -349,7 +350,7 @@ public final class BukkitAdapter {
    }

    public static Vector3 adapt(Vector vector) {
-        return new Vector3(vector.getX(), vector.getY(), vector.getZ());
+        return new Vector3Impl(vector.getX(), vector.getY(), vector.getZ());
    }

    public static CommandSender adapt(org.bukkit.command.CommandSender sender) {
@@ -386,11 +387,11 @@ public final class BukkitAdapter {
        return ((BukkitEnchantment) enchantment).getHandle();
    }

-    public static Player adapt(com.dfsek.terra.api.platform.entity.Player player) {
+    public static Player adapt(com.dfsek.terra.api.entity.Player player) {
        return ((BukkitPlayer) player).getHandle();
    }

-    public static com.dfsek.terra.api.platform.entity.Player adapt(Player player) {
+    public static com.dfsek.terra.api.entity.Player adapt(Player player) {
        return new BukkitPlayer(player);
    }

@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world;

-import com.dfsek.terra.api.platform.world.Biome;
+import com.dfsek.terra.api.world.biome.Biome;

 public class BukkitBiome implements Biome {
    private final org.bukkit.block.Biome biome;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world;

-import com.dfsek.terra.api.platform.world.Biome;
-import com.dfsek.terra.api.platform.world.BiomeGrid;
+import com.dfsek.terra.api.world.biome.Biome;
+import com.dfsek.terra.api.world.BiomeGrid;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;

@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world;

-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.block.BukkitBlock;
 import org.jetbrains.annotations.NotNull;

@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.platform.world.Tree;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.handle.WorldHandle;
+import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.profiler.ProfileFrame;
 import org.bukkit.TreeType;
@@ -1,12 +1,12 @@
 package com.dfsek.terra.bukkit.world;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.entity.Entity;
-import com.dfsek.terra.api.platform.entity.EntityType;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.generator.ChunkGenerator;
 import com.dfsek.terra.bukkit.BukkitEntity;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
 import com.dfsek.terra.bukkit.world.block.BukkitBlock;
@@ -1,11 +1,11 @@
 package com.dfsek.terra.bukkit.world.block;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.api.platform.block.state.BlockState;
+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.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState;
@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.world.block;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.api.platform.inventory.Item;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockType;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.ItemStack;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.Material;

@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.data.AnaloguePowerable;
+import com.dfsek.terra.api.block.data.AnaloguePowerable;

 public class BukkitAnaloguePowerable extends BukkitBlockData implements AnaloguePowerable {
    public BukkitAnaloguePowerable(org.bukkit.block.data.AnaloguePowerable delegate) {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockType;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.Material;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Directional;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Directional;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitDirectional extends BukkitBlockData implements Directional {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.MultipleFacing;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.MultipleFacing;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 import java.util.Set;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.data.Orientable;
+import com.dfsek.terra.api.block.Axis;
+import com.dfsek.terra.api.block.data.Orientable;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 import java.util.Set;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.data.Rail;
+import com.dfsek.terra.api.block.data.Rail;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitRail extends BukkitBlockData implements Rail {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.RedstoneWire;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.RedstoneWire;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 import java.util.Set;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Rotatable;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Rotatable;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitRotatable extends BukkitBlockData implements Rotatable {
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.data.Slab;
+import com.dfsek.terra.api.block.data.Slab;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitSlab extends BukkitWaterlogged implements Slab {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Stairs;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Stairs;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitStairs extends BukkitBlockData implements Stairs {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Wall;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Wall;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitWall extends BukkitWaterlogged implements Wall {
@@ -19,7 +19,7 @@ public class BukkitWall extends BukkitWaterlogged implements Wall {
        ((org.bukkit.block.data.type.Wall) getHandle()).setUp(up);
    }

-    public static org.bukkit.block.data.type.Wall.Height adapt(com.dfsek.terra.api.platform.block.data.Wall.Height height) {
+    public static org.bukkit.block.data.type.Wall.Height adapt(com.dfsek.terra.api.block.data.Wall.Height height) {
        switch(height) {
            case NONE:
                return org.bukkit.block.data.type.Wall.Height.NONE;
@@ -32,14 +32,14 @@ public class BukkitWall extends BukkitWaterlogged implements Wall {
        }
    }

-    public static com.dfsek.terra.api.platform.block.data.Wall.Height adapt(org.bukkit.block.data.type.Wall.Height height) {
+    public static com.dfsek.terra.api.block.data.Wall.Height adapt(org.bukkit.block.data.type.Wall.Height height) {
        switch(height) {
            case TALL:
-                return com.dfsek.terra.api.platform.block.data.Wall.Height.TALL;
+                return com.dfsek.terra.api.block.data.Wall.Height.TALL;
            case LOW:
-                return com.dfsek.terra.api.platform.block.data.Wall.Height.LOW;
+                return com.dfsek.terra.api.block.data.Wall.Height.LOW;
            case NONE:
-                return com.dfsek.terra.api.platform.block.data.Wall.Height.NONE;
+                return com.dfsek.terra.api.block.data.Wall.Height.NONE;
            default:
                throw new IllegalStateException();
        }
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.block.data;

-import com.dfsek.terra.api.platform.block.data.Waterlogged;
+import com.dfsek.terra.api.block.data.Waterlogged;

 public class BukkitWaterlogged extends BukkitBlockData implements Waterlogged {
    public BukkitWaterlogged(org.bukkit.block.data.Waterlogged delegate) {
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.world.block.state;

-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.state.BlockState;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.bukkit.world.block.BukkitBlock;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
 import org.bukkit.block.Container;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.state;

-import com.dfsek.terra.api.platform.block.state.Container;
-import com.dfsek.terra.api.platform.inventory.Inventory;
+import com.dfsek.terra.api.block.state.Container;
+import com.dfsek.terra.api.inventory.Inventory;
 import com.dfsek.terra.bukkit.world.inventory.BukkitInventory;

 public class BukkitContainer extends BukkitBlockState implements Container {
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.world.block.state;

-import com.dfsek.terra.api.platform.block.state.MobSpawner;
-import com.dfsek.terra.api.platform.block.state.SerialState;
-import com.dfsek.terra.api.platform.entity.EntityType;
+import com.dfsek.terra.api.block.state.MobSpawner;
+import com.dfsek.terra.api.block.state.SerialState;
+import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 import org.bukkit.block.CreatureSpawner;
 import org.jetbrains.annotations.NotNull;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.state;

-import com.dfsek.terra.api.platform.block.state.SerialState;
-import com.dfsek.terra.api.platform.block.state.Sign;
+import com.dfsek.terra.api.block.state.SerialState;
+import com.dfsek.terra.api.block.state.Sign;
 import org.jetbrains.annotations.NotNull;

@SuppressWarnings("deprecation")
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.entity;

-import com.dfsek.terra.api.platform.entity.EntityType;
+import com.dfsek.terra.api.entity.EntityType;

 public class BukkitEntityType implements EntityType {
    private final org.bukkit.entity.EntityType delegate;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.inventory;

-import com.dfsek.terra.api.platform.inventory.Inventory;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.Inventory;
+import com.dfsek.terra.api.inventory.ItemStack;

 public class BukkitInventory implements Inventory {
    private final org.bukkit.inventory.Inventory delegate;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.inventory;

-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
-import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
+import com.dfsek.terra.api.inventory.item.Enchantment;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitDamageable;
 import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit.world.inventory;

-import com.dfsek.terra.api.platform.inventory.Item;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
-import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

 public class BukkitItemStack implements ItemStack {
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.inventory.meta;

-import com.dfsek.terra.api.platform.inventory.item.Damageable;
+import com.dfsek.terra.api.inventory.item.Damageable;
 import com.dfsek.terra.bukkit.world.inventory.BukkitItemMeta;
 import org.bukkit.inventory.meta.ItemMeta;

@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.inventory.meta;

-import com.dfsek.terra.api.platform.inventory.ItemStack;
-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
+import com.dfsek.terra.api.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.item.Enchantment;
 import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack;

 public class BukkitEnchantment implements Enchantment {
@@ -4,28 +4,28 @@ import com.dfsek.tectonic.exception.ConfigException;
 import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.addons.TerraAddon;
-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 com.dfsek.terra.api.addon.TerraAddon;
+import com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.event.EventListener;
 import com.dfsek.terra.api.event.EventManager;
-import com.dfsek.terra.api.event.TerraEventManager;
+import com.dfsek.terra.api.event.EventManagerImpl;
 import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.platform.world.Tree;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.handle.WorldHandle;
+import com.dfsek.terra.api.world.Tree;
+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.transform.Transformer;
+import com.dfsek.terra.api.transform.TransformerImpl;
 import com.dfsek.terra.api.transform.Validator;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.util.logging.DebugLogger;
@@ -37,7 +37,6 @@ import com.dfsek.terra.config.builder.BiomeBuilder;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.lang.Language;
 import com.dfsek.terra.config.pack.ConfigPack;
-import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
 import com.dfsek.terra.fabric.generation.PopulatorFeature;
 import com.dfsek.terra.fabric.generation.TerraBiomeSource;
@@ -45,18 +44,13 @@ import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions;
 import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions;
 import com.dfsek.terra.fabric.event.BiomeRegistrationEvent;
 import com.dfsek.terra.fabric.event.GameInitializationEvent;
-import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
-import com.dfsek.terra.fabric.generation.PopulatorFeature;
-import com.dfsek.terra.fabric.generation.TerraBiomeSource;
 import com.dfsek.terra.fabric.handle.FabricItemHandle;
 import com.dfsek.terra.fabric.handle.FabricWorldHandle;
-import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
-import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor;
 import com.dfsek.terra.fabric.util.FabricUtil;
 import com.dfsek.terra.fabric.util.ProtoBiome;
 import com.dfsek.terra.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
-import com.dfsek.terra.registry.exception.DuplicateEntryException;
+import com.dfsek.terra.api.registry.DuplicateEntryException;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
 import com.dfsek.terra.world.TerraWorld;
@@ -97,7 +91,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
        return worldMap;
    }

-    private final EventManager eventManager = new TerraEventManager(this);
+    private final EventManager eventManager = new EventManagerImpl(this);
    private final GenericLoaders genericLoaders = new GenericLoaders(this);

    private final Profiler profiler = new ProfilerImpl();
@@ -131,7 +125,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {

    private final PluginConfig config = new PluginConfig();

-    private final Transformer<String, ProtoBiome> biomeFixer = new Transformer.Builder<String, ProtoBiome>()
+    private final TransformerImpl<String, ProtoBiome> biomeFixer = new TransformerImpl.Builder<String, ProtoBiome>()
            .addTransform(this::parseBiome, Validator.notNull())
            .addTransform(id -> parseBiome("minecraft:" + id.toLowerCase()), Validator.notNull()).build();

@@ -245,7 +239,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
        genericLoaders.register(registry);
        registry
                .registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o))
-                .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> biomeFixer.translate((String) o))
+                .registerLoader(com.dfsek.terra.api.world.Biome.class, (t, o, l) -> biomeFixer.translate((String) o))
                .registerLoader(Identifier.class, (t, o, l) -> {
                    Identifier identifier = Identifier.tryParse((String) o);
                    if(identifier == null) throw new LoadException("Invalid identifier: " + o);
@@ -1,12 +1,12 @@
 package com.dfsek.terra.fabric.block;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.api.platform.block.state.BlockState;
-import com.dfsek.terra.api.platform.world.World;
+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.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.FluidBlock;
 import net.minecraft.util.math.BlockPos;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockType;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.fabric.mixin.access.StateAccessor;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.data.AnaloguePowerable;
+import com.dfsek.terra.api.block.data.AnaloguePowerable;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.block.BlockState;

@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Directional;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Directional;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.MultipleFacing;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.MultipleFacing;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.data.Orientable;
+import com.dfsek.terra.api.block.Axis;
+import com.dfsek.terra.api.block.data.Orientable;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Rotatable;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Rotatable;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.data.Slab;
+import com.dfsek.terra.api.block.data.Slab;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Stairs;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Stairs;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.block.data;

-import com.dfsek.terra.api.platform.block.data.Waterlogged;
+import com.dfsek.terra.api.block.data.Waterlogged;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.generation;

-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.generator.ChunkData;
-import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.generator.ChunkData;
+import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.util.FastRandom;
 import com.dfsek.terra.api.world.generation.Chunkified;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
@@ -153,7 +153,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
            delegate.generateChunkData(world, new FastRandom(), chunk.getPos().x, chunk.getPos().z, (ChunkData) chunk);
            delegate.getPopulators().forEach(populator -> {
                if(populator instanceof Chunkified) {
-                    populator.populate(world, (com.dfsek.terra.api.platform.world.Chunk) world);
+                    populator.populate(world, (com.dfsek.terra.api.world.Chunk) world);
                }
            });
            return chunk;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.generation;

-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.generation.Chunkified;
 import com.mojang.serialization.Codec;
 import net.minecraft.world.StructureWorldAccess;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.generation;

 import com.dfsek.terra.api.world.biome.UserDefinedBiome;
-import com.dfsek.terra.api.world.biome.provider.BiomeProvider;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.util.FabricUtil;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.handle;

-import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.inventory.Item;
-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.item.Enchantment;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import net.minecraft.command.argument.ItemStackArgumentType;
@@ -1,9 +1,9 @@
 package com.dfsek.terra.fabric.handle;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.entity.EntityType;
-import com.dfsek.terra.api.platform.entity.Player;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.entity.Player;
+import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.util.FabricAdapter;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.mixin;

 import com.dfsek.terra.api.command.exception.CommandException;
-import com.dfsek.terra.api.platform.CommandSender;
-import com.dfsek.terra.api.platform.entity.Entity;
+import com.dfsek.terra.api.entity.CommandSender;
+import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -27,7 +27,7 @@ public abstract class ServerWorldMixin {
    @Inject(method = "<init>", at = @At(value = "RETURN"))
    public void injectConstructor(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> registryKey, DimensionType dimensionType, WorldGenerationProgressListener worldGenerationProgressListener, ChunkGenerator chunkGenerator, boolean debugWorld, long l, List<Spawner> list, boolean bl, CallbackInfo ci) {
        if(chunkGenerator instanceof FabricChunkGeneratorWrapper) {
-            TerraFabricPlugin.getInstance().getWorldMap().put(dimensionType, Pair.of((ServerWorld) (Object) this, new TerraWorld((com.dfsek.terra.api.platform.world.World) this, ((FabricChunkGeneratorWrapper) chunkGenerator).getPack(), TerraFabricPlugin.getInstance())));
+            TerraFabricPlugin.getInstance().getWorldMap().put(dimensionType, Pair.of((ServerWorld) (Object) this, new TerraWorld((com.dfsek.terra.api.world.World) this, ((FabricChunkGeneratorWrapper) chunkGenerator).getPack(), TerraFabricPlugin.getInstance())));
            ((FabricChunkGeneratorWrapper) chunkGenerator).setDimensionType(dimensionType);
            TerraFabricPlugin.getInstance().logger().info("Registered world " + this + " to dimension type " + dimensionType);
        }
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;

@Mixin(Biome.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.world.Biome.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.world.Biome.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class BiomeMixin {
    @Intrinsic
    public Object terra$getHandle() {
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;

@Mixin(ChunkGenerator.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.world.generator.ChunkGenerator.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.world.generator.ChunkGenerator.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class ChunkGeneratorMixin {
    @Intrinsic
    public Object terra$getHandle() {
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.Tree;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.util.collections.MaterialSet;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.profiler.ProfileFrame;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.mixin.implementations.block;

-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.state.BlockState;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.state.BlockState;
 import com.dfsek.terra.fabric.block.FabricBlock;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.entity.BlockEntity;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.block;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockType;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.block.state;

-import com.dfsek.terra.api.platform.block.state.Container;
-import com.dfsek.terra.api.platform.inventory.Inventory;
+import com.dfsek.terra.api.block.state.Container;
+import com.dfsek.terra.api.inventory.Inventory;
 import com.dfsek.terra.fabric.mixin.implementations.block.BlockEntityMixin;
 import net.minecraft.block.entity.LootableContainerBlockEntity;
 import org.spongepowered.asm.mixin.Implements;
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.mixin.implementations.block.state;

-import com.dfsek.terra.api.platform.block.state.MobSpawner;
-import com.dfsek.terra.api.platform.block.state.SerialState;
-import com.dfsek.terra.api.platform.entity.EntityType;
+import com.dfsek.terra.api.block.state.MobSpawner;
+import com.dfsek.terra.api.block.state.SerialState;
+import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.mixin.access.MobSpawnerLogicAccessor;
 import net.minecraft.block.BlockState;
@@ -12,7 +12,6 @@ import net.minecraft.block.entity.MobSpawnerBlockEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.MobSpawnerLogic;
-import net.minecraft.world.World;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.block.state;

-import com.dfsek.terra.api.platform.block.state.SerialState;
-import com.dfsek.terra.api.platform.block.state.Sign;
+import com.dfsek.terra.api.block.state.SerialState;
+import com.dfsek.terra.api.block.state.Sign;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
@@ -1,9 +1,9 @@
 package com.dfsek.terra.fabric.mixin.implementations.chunk;

-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.fabric.block.FabricBlock;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.util.math.BlockPos;
@@ -1,9 +1,9 @@
 package com.dfsek.terra.fabric.mixin.implementations.chunk;

-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.fabric.block.FabricBlock;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.util.math.BlockPos;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.chunk.data;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.world.generator.ChunkData;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.world.generator.ChunkData;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.entity;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.fabric.util.FabricAdapter;
 import net.minecraft.entity.Entity;
 import net.minecraft.text.LiteralText;
@@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import java.util.UUID;

@Mixin(Entity.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.entity.Entity.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.entity.Entity.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class EntityMixin {
    @Shadow
    public net.minecraft.world.World world;
@@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;

@Mixin(EntityType.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.entity.EntityType.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.entity.EntityType.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class EntityTypeMixin {
    @Intrinsic
    public Object terra$getHandle() {
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.mixin.implementations.entity;

-import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.entity.Player;
 import net.minecraft.entity.player.PlayerEntity;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.mixin.implementations.entity;

-import com.dfsek.terra.api.platform.CommandSender;
+import com.dfsek.terra.api.entity.CommandSender;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.inventory;

-import com.dfsek.terra.api.platform.inventory.Inventory;
-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.Inventory;
+import com.dfsek.terra.api.inventory.ItemStack;
 import net.minecraft.block.entity.LockableContainerBlockEntity;
 import net.minecraft.item.Items;
 import org.spongepowered.asm.mixin.Implements;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.mixin.implementations.inventory.item;

-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.ItemStack;
 import net.minecraft.item.Item;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

@Mixin(Item.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.inventory.Item.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.inventory.Item.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class ItemMixin {
    @Shadow
    public abstract int getMaxDamage();
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.inventory.item;

-import com.dfsek.terra.api.platform.inventory.Item;
-import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
+import com.dfsek.terra.api.inventory.Item;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import org.jetbrains.annotations.Nullable;
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

@Mixin(ItemStack.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.inventory.ItemStack.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.inventory.ItemStack.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class ItemStackMixin {
    @Shadow
    public abstract int getCount();
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;

-import com.dfsek.terra.api.platform.inventory.ItemStack;
+import com.dfsek.terra.api.inventory.ItemStack;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.util.registry.Registry;
 import org.spongepowered.asm.mixin.Implements;
@@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Shadow;
 import java.util.Objects;

@Mixin(Enchantment.class)
-@Implements(@Interface(iface = com.dfsek.terra.api.platform.inventory.item.Enchantment.class, prefix = "terra$", remap = Interface.Remap.NONE))
+@Implements(@Interface(iface = com.dfsek.terra.api.inventory.item.Enchantment.class, prefix = "terra$", remap = Interface.Remap.NONE))
 public abstract class EnchantmentMixin {
    @Shadow
    public abstract boolean isAcceptableItem(net.minecraft.item.ItemStack stack);
@@ -34,7 +34,7 @@ public abstract class EnchantmentMixin {
        return Objects.requireNonNull(Registry.ENCHANTMENT.getId((Enchantment) (Object) this)).toString();
    }

-    public boolean terra$conflictsWith(com.dfsek.terra.api.platform.inventory.item.Enchantment other) {
+    public boolean terra$conflictsWith(com.dfsek.terra.api.inventory.item.Enchantment other) {
        return !canCombine((Enchantment) other);
    }
 }
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;

-import com.dfsek.terra.api.platform.inventory.item.Damageable;
+import com.dfsek.terra.api.inventory.item.Damageable;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.mixin.implementations.inventory.meta;

-import com.dfsek.terra.api.platform.inventory.item.Enchantment;
-import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
+import com.dfsek.terra.api.inventory.item.Enchantment;
+import com.dfsek.terra.api.inventory.item.ItemMeta;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
@@ -1,13 +1,13 @@
 package com.dfsek.terra.fabric.mixin.implementations.world;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.entity.Entity;
-import com.dfsek.terra.api.platform.entity.EntityType;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
-import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.fabric.block.FabricBlock;
 import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
@@ -1,19 +1,18 @@
 package com.dfsek.terra.fabric.mixin.implementations.world;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.entity.Entity;
-import com.dfsek.terra.api.platform.entity.EntityType;
-import com.dfsek.terra.api.platform.world.Chunk;
-import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.generator.ChunkGenerator;
-import com.dfsek.terra.api.platform.world.generator.GeneratorWrapper;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.block.Block;
+import com.dfsek.terra.api.entity.Entity;
+import com.dfsek.terra.api.entity.EntityType;
+import com.dfsek.terra.api.world.Chunk;
+import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.generator.ChunkGenerator;
+import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.fabric.block.FabricBlock;
 import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ChunkRegion;
 import net.minecraft.world.ServerWorldAccess;
 import org.spongepowered.asm.mixin.Implements;
 import org.spongepowered.asm.mixin.Interface;
@@ -1,14 +1,15 @@
 package com.dfsek.terra.fabric.util;

-import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Bisected;
-import com.dfsek.terra.api.platform.block.data.Slab;
-import com.dfsek.terra.api.platform.block.data.Stairs;
-import com.dfsek.terra.api.platform.block.state.Container;
-import com.dfsek.terra.api.platform.block.state.MobSpawner;
-import com.dfsek.terra.api.platform.block.state.Sign;
+import com.dfsek.terra.api.vector.Vector3;
+import com.dfsek.terra.vector.Vector3Impl;
+import com.dfsek.terra.api.block.Axis;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Bisected;
+import com.dfsek.terra.api.block.data.Slab;
+import com.dfsek.terra.api.block.data.Stairs;
+import com.dfsek.terra.api.block.state.Container;
+import com.dfsek.terra.api.block.state.MobSpawner;
+import com.dfsek.terra.api.block.state.Sign;
 import com.dfsek.terra.fabric.block.FabricBlockData;
 import com.dfsek.terra.fabric.block.data.FabricDirectional;
 import com.dfsek.terra.fabric.block.data.FabricMultipleFacing;
@@ -38,7 +39,7 @@ public final class FabricAdapter {
    }

    public static Vector3 adapt(BlockPos pos) {
-        return new Vector3(pos.getX(), pos.getY(), pos.getZ());
+        return new Vector3Impl(pos.getX(), pos.getY(), pos.getZ());
    }

    public static FabricBlockData adapt(BlockState state) {
@@ -81,7 +82,7 @@ public final class FabricAdapter {
    }


-    public static com.dfsek.terra.api.platform.block.state.BlockState adapt(com.dfsek.terra.api.platform.block.Block block) {
+    public static com.dfsek.terra.api.block.state.BlockState adapt(com.dfsek.terra.api.block.Block block) {
        WorldAccess worldAccess = (WorldAccess) block.getLocation().getWorld();

        BlockEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector()));
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.util;

-import com.dfsek.terra.api.platform.world.Biome;
+import com.dfsek.terra.api.world.biome.Biome;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;

@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.util;

-import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.entity.Player;
+import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.WorldEdit;
@@ -1,10 +1,10 @@
 package com.dfsek.terra.forge;

 import com.dfsek.terra.api.math.vector.Vector3;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.state.Container;
-import com.dfsek.terra.api.platform.block.state.MobSpawner;
-import com.dfsek.terra.api.platform.block.state.Sign;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.state.Container;
+import com.dfsek.terra.api.block.state.MobSpawner;
+import com.dfsek.terra.api.block.state.Sign;
 import com.dfsek.terra.forge.block.ForgeBlockData;
 import com.dfsek.terra.forge.block.data.ForgeDirectional;
 import com.dfsek.terra.forge.block.data.ForgeMultipleFacing;
@@ -55,7 +55,7 @@ public final class ForgeAdapter {
        return new ForgeBlockData(state);
    }

-    public static com.dfsek.terra.api.platform.block.state.BlockState adapt(com.dfsek.terra.api.platform.block.Block block) {
+    public static com.dfsek.terra.api.block.state.BlockState adapt(com.dfsek.terra.api.block.Block block) {
        IWorld worldAccess = (IWorld) block.getLocation().getWorld();

        TileEntity entity = worldAccess.getBlockEntity(adapt(block.getLocation().toVector()));
@@ -5,9 +5,9 @@ import com.dfsek.tectonic.exception.LoadException;
 import com.dfsek.tectonic.loading.TypeRegistry;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.addons.TerraAddon;
-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 com.dfsek.terra.api.addon.annotations.Addon;
+import com.dfsek.terra.api.addon.annotations.Author;
+import com.dfsek.terra.api.addon.annotations.Version;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.TerraCommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
@@ -18,11 +18,11 @@ import com.dfsek.terra.api.event.annotations.Global;
 import com.dfsek.terra.api.event.annotations.Priority;
 import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.handle.ItemHandle;
-import com.dfsek.terra.api.platform.handle.WorldHandle;
-import com.dfsek.terra.api.platform.world.Tree;
-import com.dfsek.terra.api.platform.world.World;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.handle.ItemHandle;
+import com.dfsek.terra.api.handle.WorldHandle;
+import com.dfsek.terra.api.world.Tree;
+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.transform.Transformer;
@@ -291,7 +291,7 @@ public class TerraForgePlugin implements TerraPlugin {
        genericLoaders.register(registry);
        registry
                .registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o))
-                .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> biomeFixer.translate((String) o))
+                .registerLoader(com.dfsek.terra.api.world.Biome.class, (t, o, l) -> biomeFixer.translate((String) o))
                .registerLoader(ResourceLocation.class, (t, o, l) -> {
                    ResourceLocation identifier = ResourceLocation.tryParse((String) o);
                    if(identifier == null) throw new LoadException("Invalid identifier: " + o);
@@ -1,12 +1,12 @@
 package com.dfsek.terra.forge.block;

 import com.dfsek.terra.api.math.vector.Location;
-import com.dfsek.terra.api.platform.block.Block;
-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.api.platform.block.state.BlockState;
-import com.dfsek.terra.api.platform.world.World;
+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.block.BlockType;
+import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.forge.ForgeAdapter;
 import net.minecraft.block.FlowingFluidBlock;
 import net.minecraft.util.math.BlockPos;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.forge.block;

-import com.dfsek.terra.api.platform.block.BlockData;
-import com.dfsek.terra.api.platform.block.BlockType;
+import com.dfsek.terra.api.block.BlockData;
+import com.dfsek.terra.api.block.BlockType;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.state.Property;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.data.AnaloguePowerable;
+import com.dfsek.terra.api.block.data.AnaloguePowerable;
 import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;

@@ -1,7 +1,7 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Directional;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Directional;
 import com.dfsek.terra.forge.ForgeAdapter;
 import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
@@ -1,10 +1,10 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Bisected;
-import com.dfsek.terra.api.platform.block.data.Slab;
-import com.dfsek.terra.api.platform.block.data.Stairs;
+import com.dfsek.terra.api.block.Axis;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Bisected;
+import com.dfsek.terra.api.block.data.Slab;
+import com.dfsek.terra.api.block.data.Stairs;
 import net.minecraft.state.properties.Half;
 import net.minecraft.state.properties.SlabType;
 import net.minecraft.state.properties.StairsShape;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.MultipleFacing;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.MultipleFacing;
 import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.Axis;
-import com.dfsek.terra.api.platform.block.data.Orientable;
+import com.dfsek.terra.api.block.Axis;
+import com.dfsek.terra.api.block.data.Orientable;
 import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.EnumProperty;
@@ -1,7 +1,7 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Rotatable;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Rotatable;
 import com.dfsek.terra.forge.block.ForgeBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;
@@ -1,6 +1,6 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.data.Slab;
+import com.dfsek.terra.api.block.data.Slab;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;

@@ -1,7 +1,7 @@
 package com.dfsek.terra.forge.block.data;

-import com.dfsek.terra.api.platform.block.BlockFace;
-import com.dfsek.terra.api.platform.block.data.Stairs;
+import com.dfsek.terra.api.block.BlockFace;
+import com.dfsek.terra.api.block.data.Stairs;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.properties.BlockStateProperties;

--- a/Show More
+++ b/Show More