From 0530c5757925c615d0529926b1550da05f0669d9 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 26 May 2022 17:55:07 -0500 Subject: Fixes --- azalea-core/src/lib.rs | 4 +++- azalea-core/src/position.rs | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'azalea-core/src') diff --git a/azalea-core/src/lib.rs b/azalea-core/src/lib.rs index d2a2d558..cdb32ea9 100755 --- a/azalea-core/src/lib.rs +++ b/azalea-core/src/lib.rs @@ -11,7 +11,9 @@ mod slot; pub use slot::{Slot, SlotData}; mod position; -pub use position::{BlockPos, ChunkBlockPos, ChunkPos, ChunkSectionBlockPos, ChunkSectionPos}; +pub use position::{ + BlockPos, ChunkBlockPos, ChunkPos, ChunkSectionBlockPos, ChunkSectionPos, GlobalPos, +}; mod direction; pub use direction::Direction; diff --git a/azalea-core/src/position.rs b/azalea-core/src/position.rs index 9c7cd132..d5c97eab 100644 --- a/azalea-core/src/position.rs +++ b/azalea-core/src/position.rs @@ -1,5 +1,7 @@ use std::ops::Rem; +use crate::resource_location::ResourceLocation; + #[derive(Clone, Copy, Debug, Default)] pub struct BlockPos { pub x: i32, @@ -137,6 +139,14 @@ impl From<&ChunkBlockPos> for ChunkSectionBlockPos { } } +/// A block pos with an attached dimension +#[derive(Debug, Clone)] +pub struct GlobalPos { + pub pos: BlockPos, + // this is actually a ResourceKey in Minecraft, but i don't think it matters? + pub dimension: ResourceLocation, +} + #[cfg(test)] mod tests { use super::*; -- cgit v1.2.3