organize azalea_core and re-export it from azalea

6 files changed, 19 insertions, 6 deletions

diff --git a/azalea-entity/src/data.rs b/azalea-entity/src/data.rs
index 9b210400..54487ef1 100755
--- a/azalea-entity/src/data.rs
+++ b/azalea-entity/src/data.rs
@@ -4,7 +4,11 @@ use azalea_buf::{
     BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable,
 };
 use azalea_chat::FormattedText;
-use azalea_core::{particle::Particle, BlockPos, Direction, GlobalPos, Vec3};
+use azalea_core::{
+    direction::Direction,
+    particle::Particle,
+    position::{BlockPos, GlobalPos, Vec3},
+};
 use azalea_inventory::ItemSlot;
 use bevy_ecs::component::Component;
 use derive_more::Deref;
diff --git a/azalea-entity/src/dimensions.rs b/azalea-entity/src/dimensions.rs
index ab5a1808..b5a3f310 100755
--- a/azalea-entity/src/dimensions.rs
+++ b/azalea-entity/src/dimensions.rs
@@ -1,4 +1,4 @@
-use azalea_core::{Vec3, AABB};
+use azalea_core::{aabb::AABB, position::Vec3};
 
 #[derive(Debug, Default, Clone)]
 pub struct EntityDimensions {
diff --git a/azalea-entity/src/lib.rs b/azalea-entity/src/lib.rs
index dbec425b..45213fc1 100644
--- a/azalea-entity/src/lib.rs
+++ b/azalea-entity/src/lib.rs
@@ -12,7 +12,12 @@ mod plugin;
 use self::attributes::AttributeInstance;
 pub use attributes::Attributes;
 use azalea_block::BlockState;
-use azalea_core::{math, BlockPos, ChunkPos, ResourceLocation, Vec3, AABB};
+use azalea_core::{
+    aabb::AABB,
+    math,
+    position::{BlockPos, ChunkPos, Vec3},
+    resource_location::ResourceLocation,
+};
 use azalea_world::{ChunkStorage, InstanceName};
 use bevy_ecs::{bundle::Bundle, component::Component};
 pub use data::*;
diff --git a/azalea-entity/src/metadata.rs b/azalea-entity/src/metadata.rs
index 8f63951f..39ba9527 100644
--- a/azalea-entity/src/metadata.rs
+++ b/azalea-entity/src/metadata.rs
@@ -8,7 +8,11 @@ use super::{
     SnifferState, VillagerData,
 };
 use azalea_chat::FormattedText;
-use azalea_core::{particle::Particle, BlockPos, Direction, Vec3};
+use azalea_core::{
+    direction::Direction,
+    particle::Particle,
+    position::{BlockPos, Vec3},
+};
 use azalea_inventory::ItemSlot;
 use bevy_ecs::{bundle::Bundle, component::Component};
 use derive_more::{Deref, DerefMut};
diff --git a/azalea-entity/src/plugin/indexing.rs b/azalea-entity/src/plugin/indexing.rs
index f9c210a3..297949f6 100644
--- a/azalea-entity/src/plugin/indexing.rs
+++ b/azalea-entity/src/plugin/indexing.rs
@@ -1,6 +1,6 @@
 //! Stuff related to entity indexes and keeping track of entities in the world.
 
-use azalea_core::ChunkPos;
+use azalea_core::position::ChunkPos;
 use azalea_world::{Instance, InstanceContainer, InstanceName, MinecraftEntityId};
 use bevy_ecs::{
     component::Component,
diff --git a/azalea-entity/src/plugin/mod.rs b/azalea-entity/src/plugin/mod.rs
index 0e24a1a7..2e5a3244 100644
--- a/azalea-entity/src/plugin/mod.rs
+++ b/azalea-entity/src/plugin/mod.rs
@@ -3,7 +3,7 @@ mod relative_updates;
 
 use std::collections::HashSet;
 
-use azalea_core::{BlockPos, ChunkPos, Vec3};
+use azalea_core::position::{BlockPos, ChunkPos, Vec3};
 use azalea_world::{InstanceContainer, InstanceName, MinecraftEntityId};
 use bevy_app::{App, Plugin, PreUpdate, Update};
 use bevy_ecs::prelude::*;