Refactor API

2026-04-07 00:06:12 +00:00 · 2020-12-18 19:57:42 -07:00
parent 53c554f25c
commit 24697ae60f
155 changed files with 317 additions and 317 deletions
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit;

+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.bukkit.world.block.BukkitBlock;

 public class BukkitChunk implements Chunk {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit;

+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemHandle;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;

 public class BukkitItemHandle implements ItemHandle {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.bukkit;

+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;

 public class BukkitItemStack implements ItemStack {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit;

 import com.dfsek.terra.api.Player;
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.math.vector.Location;

 public class BukkitPlayer implements Player {
    private final org.bukkit.entity.Player delegate;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.bukkit;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.bukkit.util.BukkitConversions;
 import com.dfsek.terra.util.MaterialSet;
 import org.bukkit.TreeType;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java
@@ -1,11 +1,11 @@
 package com.dfsek.terra.bukkit;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
 import com.dfsek.terra.bukkit.world.block.BukkitBlock;

--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java
@@ -2,10 +2,10 @@ package com.dfsek.terra.bukkit;

 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.bukkit.world.block.BukkitBlockData;
 import com.dfsek.terra.bukkit.world.block.BukkitMaterialData;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -6,12 +6,12 @@ import com.dfsek.terra.api.GenericLoaders;
 import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.platform.TerraPlugin;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemHandle;
 import com.dfsek.terra.api.platform.world.Biome;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.bukkit.command.command.TerraCommand;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.command.command.geometry;

 import com.dfsek.terra.api.math.FastNoiseLite;
-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitPlayer;
 import com.dfsek.terra.bukkit.BukkitWorld;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.command.command.geometry;

-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitPlayer;
 import com.dfsek.terra.bukkit.BukkitWorld;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.command.command.geometry;

-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitCommandSender;
 import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.command.PlayerCommand;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.bukkit.generator;

+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.generator.BlockPopulator;
 import com.dfsek.terra.api.platform.world.BiomeGrid;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.api.world.generation.TerraChunkGenerator;
 import com.dfsek.terra.bukkit.BukkitBiomeGrid;
 import com.dfsek.terra.bukkit.BukkitWorld;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java
@@ -1,16 +1,16 @@
 package com.dfsek.terra.bukkit.structure;

-import com.dfsek.terra.api.platform.world.block.Axis;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.Directional;
-import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
-import com.dfsek.terra.api.platform.world.block.data.Orientable;
-import com.dfsek.terra.api.platform.world.block.data.Rail;
-import com.dfsek.terra.api.platform.world.block.data.RedstoneWire;
-import com.dfsek.terra.api.platform.world.block.data.Rotatable;
-import com.dfsek.terra.api.platform.world.block.data.Wall;
-import com.dfsek.terra.api.platform.world.vector.Vector2;
+import com.dfsek.terra.api.math.vector.Vector2;
+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.data.Directional;
+import com.dfsek.terra.api.platform.block.data.MultipleFacing;
+import com.dfsek.terra.api.platform.block.data.Orientable;
+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.Rotatable;
+import com.dfsek.terra.api.platform.block.data.Wall;
 import com.dfsek.terra.structure.Rotation;
 import net.jafama.FastMath;

--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.util;

-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import com.dfsek.terra.bukkit.BukkitWorld;
 import org.bukkit.Location;
 import org.bukkit.util.Vector;
@@ -10,7 +10,7 @@ public final class BukkitConversions {
        return new Vector3(bukkit.getX(), bukkit.getY(), bukkit.getZ());
    }

-    public static Location toBukkitLocation(com.dfsek.terra.api.platform.world.vector.Location terra) {
+    public static Location toBukkitLocation(com.dfsek.terra.api.math.vector.Location terra) {
        return new Location(((BukkitWorld) terra.getWorld()).getHandle(), terra.getX(), terra.getY(), terra.getZ());
    }
 }
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.bukkit.world.block;

-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
-import com.dfsek.terra.api.platform.world.vector.Location;
+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.MaterialData;
 import com.dfsek.terra.bukkit.BukkitWorld;
 import com.dfsek.terra.bukkit.world.block.data.TerraEnumAdapter;

--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block;

-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;

 public class BukkitBlockData implements BlockData {
    private org.bukkit.block.data.BlockData delegate;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block;

-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import org.bukkit.Material;

 public class BukkitMaterialData implements MaterialData {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.bukkit.world.block.data;


-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.Bisected;
-import com.dfsek.terra.api.platform.world.block.data.Slab;
-import com.dfsek.terra.api.platform.world.block.data.Stairs;
+import com.dfsek.terra.api.platform.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;

 /**
 * Utility class to adapt Bukkit enums to Terra enums.
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

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

 import java.util.Set;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.block.data;

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

 public class BukkitSlab extends BukkitWaterlogged implements Slab {
    public BukkitSlab(org.bukkit.block.data.type.Slab delegate) {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;

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

 public class BukkitStairs extends BukkitBlockData implements Stairs {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.bukkit.world.block.data;

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

 public class BukkitWaterlogged extends BukkitBlockData implements Waterlogged {
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.world.block.data;


-import com.dfsek.terra.api.platform.world.block.BlockFace;
+import com.dfsek.terra.api.platform.block.BlockFace;
 import org.bukkit.block.data.Bisected;
 import org.bukkit.block.data.type.Slab;
 import org.bukkit.block.data.type.Stairs;
@@ -10,7 +10,7 @@ import org.bukkit.block.data.type.Stairs;
 * Utility class to adapt Terra enums to Bukkit enums
 */
 public final class TerraEnumAdapter {
-    public static Stairs.Shape fromTerraStair(com.dfsek.terra.api.platform.world.block.data.Stairs.Shape shape) {
+    public static Stairs.Shape fromTerraStair(com.dfsek.terra.api.platform.block.data.Stairs.Shape shape) {
        switch(shape) {
            case STRAIGHT:
                return Stairs.Shape.STRAIGHT;
@@ -27,7 +27,7 @@ public final class TerraEnumAdapter {
        }
    }

-    public static Bisected.Half fromTerraHalf(com.dfsek.terra.api.platform.world.block.data.Bisected.Half half) {
+    public static Bisected.Half fromTerraHalf(com.dfsek.terra.api.platform.block.data.Bisected.Half half) {
        switch(half) {
            case TOP:
                return Bisected.Half.TOP;
@@ -83,7 +83,7 @@ public final class TerraEnumAdapter {
        }
    }

-    public static Slab.Type fromTerraSlabType(com.dfsek.terra.api.platform.world.block.data.Slab.Type type) {
+    public static Slab.Type fromTerraSlabType(com.dfsek.terra.api.platform.block.data.Slab.Type type) {
        switch(type) {
            case TOP:
                return Slab.Type.TOP;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -5,11 +5,11 @@ import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.api.GenericLoaders;
 import com.dfsek.terra.api.lang.Language;
 import com.dfsek.terra.api.platform.TerraPlugin;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemHandle;
 import com.dfsek.terra.api.platform.world.World;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.api.transform.MapTransform;
 import com.dfsek.terra.api.transform.NotNullValidator;
 import com.dfsek.terra.api.transform.Transformer;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.inventory;

+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemHandle;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
-import com.dfsek.terra.api.platform.world.block.MaterialData;

 public class FabricItemHandle implements ItemHandle {
    @Override
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.inventory;

+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.inventory.ItemStack;
 import com.dfsek.terra.api.platform.inventory.item.ItemMeta;
-import com.dfsek.terra.api.platform.world.block.MaterialData;

 public class FabricItemStack implements ItemStack {
    net.minecraft.item.ItemStack delegate;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.world;

-import com.dfsek.terra.api.platform.world.vector.Vector3;
+import com.dfsek.terra.api.math.vector.Vector3;
 import net.minecraft.util.math.BlockPos;

 public final class FabricAdapters {
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.world;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Tree;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
-import com.dfsek.terra.api.platform.world.vector.Location;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
 import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.fabric.world;

 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import com.dfsek.terra.api.platform.world.WorldHandle;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
 import com.dfsek.terra.api.transform.Transformer;
 import com.dfsek.terra.fabric.world.block.FabricBlockData;
 import com.dfsek.terra.fabric.world.block.FabricMaterialData;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.fabric.world.block;

-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
-import com.dfsek.terra.api.platform.world.vector.Location;
+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.MaterialData;
 import com.dfsek.terra.fabric.world.FabricAdapters;
 import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
 import net.minecraft.util.math.BlockPos;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.world.block;

-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import net.minecraft.block.BlockState;

 public class FabricBlockData implements BlockData {
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.world.block;

-import com.dfsek.terra.api.platform.world.block.BlockData;
-import com.dfsek.terra.api.platform.world.block.MaterialData;
+import com.dfsek.terra.api.platform.block.BlockData;
+import com.dfsek.terra.api.platform.block.MaterialData;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.fabric.world.block.data;

-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.Bisected;
-import com.dfsek.terra.api.platform.world.block.data.Slab;
-import com.dfsek.terra.api.platform.world.block.data.Stairs;
+import com.dfsek.terra.api.platform.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 net.minecraft.block.enums.BlockHalf;
 import net.minecraft.block.enums.SlabType;
 import net.minecraft.block.enums.StairShape;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.world.block.data;

-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.MultipleFacing;
+import com.dfsek.terra.api.platform.block.BlockFace;
+import com.dfsek.terra.api.platform.block.data.MultipleFacing;
 import com.dfsek.terra.fabric.world.block.FabricBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.world.block.data;

-import com.dfsek.terra.api.platform.world.block.data.Slab;
+import com.dfsek.terra.api.platform.block.data.Slab;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.world.block.data;

-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.Stairs;
+import com.dfsek.terra.api.platform.block.BlockFace;
+import com.dfsek.terra.api.platform.block.data.Stairs;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.fabric.world.block.data;

-import com.dfsek.terra.api.platform.world.block.data.Waterlogged;
+import com.dfsek.terra.api.platform.block.data.Waterlogged;
 import com.dfsek.terra.fabric.world.block.FabricBlockData;
 import net.minecraft.block.BlockState;
 import net.minecraft.state.property.Properties;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java
@@ -1,9 +1,9 @@
 package com.dfsek.terra.fabric.world.block.data;

-import com.dfsek.terra.api.platform.world.block.BlockFace;
-import com.dfsek.terra.api.platform.world.block.data.Bisected;
-import com.dfsek.terra.api.platform.world.block.data.Slab;
-import com.dfsek.terra.api.platform.world.block.data.Stairs;
+import com.dfsek.terra.api.platform.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 net.minecraft.block.enums.BlockHalf;
 import net.minecraft.block.enums.SlabType;
 import net.minecraft.block.enums.StairShape;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.fabric.world.generator;

+import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
-import com.dfsek.terra.api.platform.world.block.BlockData;
 import com.dfsek.terra.fabric.world.block.FabricBlockData;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.chunk.Chunk;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java
@@ -1,12 +1,12 @@
 package com.dfsek.terra.fabric.world.handles;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.fabric.world.handles.chunk.FabricChunk;
 import net.minecraft.server.world.ServerWorld;

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.world.handles.chunk;

+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;

 public class FabricChunk implements Chunk {
    private final net.minecraft.world.chunk.Chunk chunk;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java
@@ -1,8 +1,8 @@
 package com.dfsek.terra.fabric.world.handles.chunk;

+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess;
 import net.minecraft.util.math.BlockPos;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java
@@ -1,12 +1,12 @@
 package com.dfsek.terra.fabric.world.handles.world;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
 import net.minecraft.util.math.BlockPos;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java
@@ -1,12 +1,12 @@
 package com.dfsek.terra.fabric.world.handles.world;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
 import net.minecraft.util.math.BlockPos;
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java
@@ -1,12 +1,12 @@
 package com.dfsek.terra.fabric.world.handles.world;

+import com.dfsek.terra.api.math.vector.Location;
 import com.dfsek.terra.api.platform.Entity;
 import com.dfsek.terra.api.platform.Tree;
+import com.dfsek.terra.api.platform.block.Block;
 import com.dfsek.terra.api.platform.generator.ChunkGenerator;
 import com.dfsek.terra.api.platform.world.Chunk;
 import com.dfsek.terra.api.platform.world.World;
-import com.dfsek.terra.api.platform.world.block.Block;
-import com.dfsek.terra.api.platform.world.vector.Location;
 import com.dfsek.terra.fabric.world.block.FabricBlock;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator;
 import net.minecraft.util.math.BlockPos;