organize azalea_core and re-export it from azalea

5 files changed, 9 insertions, 9 deletions

diff --git a/azalea-world/src/chunk_storage.rs b/azalea-world/src/chunk_storage.rs
index 8d894d9a..f7800d2b 100755
--- a/azalea-world/src/chunk_storage.rs
+++ b/azalea-world/src/chunk_storage.rs
@@ -4,7 +4,7 @@ use crate::palette::PalettedContainer;
 use crate::palette::PalettedContainerKind;
 use azalea_block::BlockState;
 use azalea_buf::{BufReadError, McBufReadable, McBufWritable};
-use azalea_core::{BlockPos, ChunkBlockPos, ChunkPos, ChunkSectionBlockPos};
+use azalea_core::position::{BlockPos, ChunkBlockPos, ChunkPos, ChunkSectionBlockPos};
 use azalea_nbt::NbtCompound;
 use log::{debug, trace, warn};
 use parking_lot::RwLock;
diff --git a/azalea-world/src/container.rs b/azalea-world/src/container.rs
index 79cf2105..471e1d5e 100644
--- a/azalea-world/src/container.rs
+++ b/azalea-world/src/container.rs
@@ -1,4 +1,4 @@
-use azalea_core::ResourceLocation;
+use azalea_core::resource_location::ResourceLocation;
 use bevy_ecs::{component::Component, system::Resource};
 use derive_more::{Deref, DerefMut};
 use log::error;
diff --git a/azalea-world/src/heightmap.rs b/azalea-world/src/heightmap.rs
index 5fa3f260..12aaa159 100644
--- a/azalea-world/src/heightmap.rs
+++ b/azalea-world/src/heightmap.rs
@@ -1,7 +1,7 @@
 use std::{fmt::Display, str::FromStr};
 
 use azalea_block::BlockState;
-use azalea_core::{math, ChunkBlockPos};
+use azalea_core::{math, position::ChunkBlockPos};
 use azalea_registry::tags::blocks::LEAVES;
 
 use crate::{chunk_storage::get_block_state_from_sections, BitStorage, Section};
diff --git a/azalea-world/src/iterators.rs b/azalea-world/src/iterators.rs
index c7290781..acb76cf6 100644
--- a/azalea-world/src/iterators.rs
+++ b/azalea-world/src/iterators.rs
@@ -1,12 +1,12 @@
 //! Iterators for iterating over Minecraft blocks and chunks, based on
 //! [prismarine-world's iterators](https://github.com/PrismarineJS/prismarine-world/blob/master/src/iterators.js).
 
-use azalea_core::{BlockPos, ChunkPos};
+use azalea_core::position::{BlockPos, ChunkPos};
 
 /// An octahedron iterator, useful for iterating over blocks in a world.
 ///
 /// ```
-/// # use azalea_core::BlockPos;
+/// # use azalea_core::position::BlockPos;
 /// # use azalea_world::iterators::BlockIterator;
 ///
 /// let mut iter = BlockIterator::new(BlockPos::default(), 4);
@@ -81,7 +81,7 @@ impl Iterator for BlockIterator {
 /// `ChunkIterator` to sort by x+y+z (Manhattan) distance.
 ///
 /// ```
-/// # use azalea_core::ChunkPos;
+/// # use azalea_core::position::ChunkPos;
 /// # use azalea_world::iterators::SquareChunkIterator;
 ///
 /// let mut iter = SquareChunkIterator::new(ChunkPos::default(), 4);
@@ -118,7 +118,7 @@ impl SquareChunkIterator {
     /// Change the distance that this iterator won't go past.
     ///
     /// ```
-    /// # use azalea_core::ChunkPos;
+    /// # use azalea_core::position::ChunkPos;
     /// # use azalea_world::iterators::SquareChunkIterator;
     ///
     /// let mut iter = SquareChunkIterator::new(ChunkPos::default(), 2);
@@ -169,7 +169,7 @@ impl Iterator for SquareChunkIterator {
 /// A diagonal spiral iterator, useful for iterating over chunks in a world.
 ///
 /// ```
-/// # use azalea_core::ChunkPos;
+/// # use azalea_core::position::ChunkPos;
 /// # use azalea_world::iterators::ChunkIterator;
 ///
 /// let mut iter = ChunkIterator::new(ChunkPos::default(), 4);
diff --git a/azalea-world/src/world.rs b/azalea-world/src/world.rs
index df462be4..63e1d770 100644
--- a/azalea-world/src/world.rs
+++ b/azalea-world/src/world.rs
@@ -1,6 +1,6 @@
 use crate::{iterators::ChunkIterator, palette::Palette, ChunkStorage, PartialChunkStorage};
 use azalea_block::{BlockState, BlockStates, FluidState};
-use azalea_core::{BlockPos, ChunkPos};
+use azalea_core::position::{BlockPos, ChunkPos};
 use bevy_ecs::{component::Component, entity::Entity};
 use derive_more::{Deref, DerefMut};
 use nohash_hasher::IntMap;