From fbaae39cdf9c5a7a34005a51a37b85f7cdd5ea00 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 13 Nov 2025 12:34:47 +0930 Subject: rename ResourceLocation to Identifier ahead of mojmap changes --- azalea/src/lib.rs | 5 ++++- azalea/src/pathfinder/simulation.rs | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'azalea/src') diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs index 069837b3..f4f0844d 100644 --- a/azalea/src/lib.rs +++ b/azalea/src/lib.rs @@ -21,10 +21,13 @@ pub use azalea_buf as buf; pub use azalea_chat::FormattedText; pub use azalea_client::*; pub use azalea_core as core; +#[deprecated(note = "renamed to `Identifier`.")] +#[expect(deprecated)] +pub use azalea_core::resource_location::ResourceLocation; // these are re-exported on this level because they're very common pub use azalea_core::{ + identifier::Identifier, position::{BlockPos, Vec3}, - resource_location::ResourceLocation, }; pub use azalea_entity as entity; pub use azalea_physics as physics; diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs index 94836d3b..3b8a46cc 100644 --- a/azalea/src/pathfinder/simulation.rs +++ b/azalea/src/pathfinder/simulation.rs @@ -6,9 +6,7 @@ use azalea_client::{ PhysicsState, interact::BlockStatePredictionHandler, inventory::Inventory, local_player::LocalGameMode, mining::MineBundle, }; -use azalea_core::{ - game_type::GameMode, position::Vec3, resource_location::ResourceLocation, tick::GameTick, -}; +use azalea_core::{game_type::GameMode, identifier::Identifier, position::Vec3, tick::GameTick}; use azalea_entity::{ Attributes, LookDirection, Physics, Position, default_attributes, dimensions::EntityDimensions, }; @@ -44,8 +42,8 @@ impl SimulatedPlayerBundle { } } -fn simulation_instance_name() -> ResourceLocation { - ResourceLocation::new("azalea:simulation") +fn simulation_instance_name() -> Identifier { + Identifier::new("azalea:simulation") } fn create_simulation_instance(chunks: ChunkStorage) -> (App, Arc>) { -- cgit v1.2.3