rename ResourceLocation to Identifier ahead of mojmap changes

1 files changed, 7 insertions, 7 deletions

diff --git a/azalea-core/src/data_registry.rs b/azalea-core/src/data_registry.rs
index 6e2c29ff..d3fae125 100644
--- a/azalea-core/src/data_registry.rs
+++ b/azalea-core/src/data_registry.rs
@@ -3,23 +3,23 @@ use std::{io::Cursor, str::FromStr};
 use azalea_registry::DataRegistry;
 use simdnbt::owned::NbtCompound;
 
-use crate::{registry_holder::RegistryHolder, resource_location::ResourceLocation};
+use crate::{identifier::Identifier, registry_holder::RegistryHolder};
 
 pub trait ResolvableDataRegistry: DataRegistry {
-    fn resolve_name(&self, registries: &RegistryHolder) -> Option<ResourceLocation> {
+    fn resolve_name(&self, registries: &RegistryHolder) -> Option<Identifier> {
         self.resolve(registries).map(|(name, _)| name.clone())
     }
     fn resolve<'a>(
         &self,
         registries: &'a RegistryHolder,
-    ) -> Option<(&'a ResourceLocation, &'a NbtCompound)> {
-        let name_resourcelocation = ResourceLocation::from_str(Self::NAME).unwrap_or_else(|_| {
+    ) -> Option<(&'a Identifier, &'a NbtCompound)> {
+        let name_ident = Identifier::from_str(Self::NAME).unwrap_or_else(|_| {
             panic!(
-                "Name for registry should be a valid ResourceLocation: {}",
+                "Name for registry should be a valid Identifier: {}",
                 Self::NAME
             )
         });
-        let registry_values = registries.map.get(&name_resourcelocation)?;
+        let registry_values = registries.map.get(&name_ident)?;
         let resolved = registry_values.get_index(self.protocol_id() as usize)?;
         Some(resolved)
     }
@@ -27,7 +27,7 @@ pub trait ResolvableDataRegistry: DataRegistry {
     fn resolve_and_deserialize<T: simdnbt::Deserialize>(
         &self,
         registries: &RegistryHolder,
-    ) -> Option<Result<(ResourceLocation, T), simdnbt::DeserializeError>> {
+    ) -> Option<Result<(Identifier, T), simdnbt::DeserializeError>> {
         let (name, value) = self.resolve(registries)?;
 
         let mut nbt_bytes = Vec::new();