organize azalea_core and re-export it from azalea

7 files changed, 27 insertions, 11 deletions

diff --git a/azalea-physics/src/clip.rs b/azalea-physics/src/clip.rs
index d6e0f6bb..8c2d0c8f 100644
--- a/azalea-physics/src/clip.rs
+++ b/azalea-physics/src/clip.rs
@@ -1,5 +1,10 @@
 use azalea_block::BlockState;
-use azalea_core::{math::lerp, BlockHitResult, BlockPos, Direction, Vec3, EPSILON};
+use azalea_core::{
+    block_hit_result::BlockHitResult,
+    direction::Direction,
+    math::{lerp, EPSILON},
+    position::{BlockPos, Vec3},
+};
 use azalea_inventory::ItemSlot;
 use azalea_world::ChunkStorage;
 use bevy_ecs::entity::Entity;
diff --git a/azalea-physics/src/collision/discrete_voxel_shape.rs b/azalea-physics/src/collision/discrete_voxel_shape.rs
index 2bcd1f61..f63b7c2a 100755
--- a/azalea-physics/src/collision/discrete_voxel_shape.rs
+++ b/azalea-physics/src/collision/discrete_voxel_shape.rs
@@ -1,5 +1,9 @@
+use azalea_core::{
+    bitset::BitSet,
+    direction::{Axis, AxisCycle},
+};
+
 use super::mergers::IndexMerger;
-use azalea_core::{Axis, AxisCycle, BitSet};
 
 pub trait IntLineConsumer = FnMut(u32, u32, u32, u32, u32, u32);
 
diff --git a/azalea-physics/src/collision/mergers.rs b/azalea-physics/src/collision/mergers.rs
index e2381c49..7bb472a1 100755
--- a/azalea-physics/src/collision/mergers.rs
+++ b/azalea-physics/src/collision/mergers.rs
@@ -1,10 +1,7 @@
 use std::{cmp::Ordering, convert::TryInto};
 
 use super::CubePointRange;
-use azalea_core::{
-    math::{gcd, lcm},
-    EPSILON,
-};
+use azalea_core::math::{gcd, lcm, EPSILON};
 
 #[derive(Debug)]
 pub enum IndexMerger {
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs
index 53ade2b2..1a8f4441 100644
--- a/azalea-physics/src/collision/mod.rs
+++ b/azalea-physics/src/collision/mod.rs
@@ -6,7 +6,7 @@ mod world_collisions;
 
 use std::ops::Add;
 
-use azalea_core::{Axis, Vec3, AABB, EPSILON};
+use azalea_core::{aabb::AABB, direction::Axis, math::EPSILON, position::Vec3};
 use azalea_world::{Instance, MoveEntityError};
 use bevy_ecs::world::Mut;
 pub use blocks::BlockWithShape;
diff --git a/azalea-physics/src/collision/shape.rs b/azalea-physics/src/collision/shape.rs
index a39a86cf..156f5869 100755
--- a/azalea-physics/src/collision/shape.rs
+++ b/azalea-physics/src/collision/shape.rs
@@ -1,7 +1,10 @@
 use super::mergers::IndexMerger;
 use crate::collision::{BitSetDiscreteVoxelShape, DiscreteVoxelShape, AABB};
 use azalea_core::{
-    math::binary_search, Axis, AxisCycle, BlockHitResult, BlockPos, Direction, Vec3, EPSILON,
+    block_hit_result::BlockHitResult,
+    direction::{Axis, AxisCycle, Direction},
+    math::{binary_search, EPSILON},
+    position::{BlockPos, Vec3},
 };
 use std::{cmp, num::NonZeroU32};
 
diff --git a/azalea-physics/src/collision/world_collisions.rs b/azalea-physics/src/collision/world_collisions.rs
index 414b4c58..f5d1b650 100644
--- a/azalea-physics/src/collision/world_collisions.rs
+++ b/azalea-physics/src/collision/world_collisions.rs
@@ -1,7 +1,11 @@
 use super::Shapes;
 use crate::collision::{BlockWithShape, VoxelShape, AABB};
 use azalea_block::BlockState;
-use azalea_core::{ChunkPos, ChunkSectionPos, Cursor3d, CursorIterationType, EPSILON};
+use azalea_core::{
+    cursor3d::{Cursor3d, CursorIterationType},
+    math::EPSILON,
+    position::{ChunkPos, ChunkSectionPos},
+};
 use azalea_world::{Chunk, Instance};
 use parking_lot::RwLock;
 use std::sync::Arc;
diff --git a/azalea-physics/src/lib.rs b/azalea-physics/src/lib.rs
index 5fe7d218..53818ed3 100644
--- a/azalea-physics/src/lib.rs
+++ b/azalea-physics/src/lib.rs
@@ -5,7 +5,10 @@ pub mod clip;
 pub mod collision;
 
 use azalea_block::{Block, BlockState};
-use azalea_core::{math, BlockPos, Vec3};
+use azalea_core::{
+    math,
+    position::{BlockPos, Vec3},
+};
 use azalea_entity::{
     metadata::Sprinting, move_relative, Attributes, InLoadedChunk, Jumping, LocalEntity,
     LookDirection, Physics, Position,
@@ -334,7 +337,7 @@ mod tests {
     use std::time::Duration;
 
     use super::*;
-    use azalea_core::{ChunkPos, ResourceLocation};
+    use azalea_core::{position::ChunkPos, resource_location::ResourceLocation};
     use azalea_entity::{EntityBundle, EntityPlugin};
     use azalea_world::{Chunk, MinecraftEntityId, PartialInstance};
     use bevy_app::App;