2 files changed, 15 insertions, 35 deletions

diff --git a/ecs/src/component/storage.rs b/ecs/src/component/storage.rs
index 1e45f63..7361caf 100644
--- a/ecs/src/component/storage.rs
+++ b/ecs/src/component/storage.rs
@@ -88,7 +88,7 @@ impl Storage
         search_terms: ArchetypeSearchTerms<'search_terms>,
     ) -> ArchetypeRefIter<'_, 'search_terms>
     {
-        let archetype_id = ArchetypeId::new(&search_terms.required_components);
+        let archetype_id = ArchetypeId::new(search_terms.required_components);
 
         if search_terms.contains_conflicting() {
             return ArchetypeRefIter {
@@ -148,7 +148,7 @@ impl Storage
             return Err(Error::EntityAlreadyExists(uid));
         }
 
-        let empty_archetype_id = ArchetypeId::from_components_metadata(&[]);
+        let empty_archetype_id = ArchetypeId::new_empty();
 
         let archetype_node = self.graph.get_or_create_node(empty_archetype_id, &[]);
 
@@ -366,7 +366,7 @@ impl Storage
     ) -> Vec<ArchetypeId>
     {
         let Some(mut search_iter) =
-            self.graph.dfs_archetype_add_edges(ArchetypeId::new(&[]))
+            self.graph.dfs_archetype_add_edges(ArchetypeId::new_empty())
         else {
             // If the root archetype doesn't exist, no other archetype can exist either
             //
@@ -768,7 +768,7 @@ mod tests
 
         let archetype_node = new_storage
             .graph
-            .get_node_by_id(ArchetypeId::from_components_metadata(&[]))
+            .get_node_by_id(ArchetypeId::new_empty())
             .expect("Archetype for entities with no component doesn't exist");
 
         assert_eq!(archetype_node.archetype().component_cnt(), 0);
@@ -776,7 +776,7 @@ mod tests
 
         assert_eq!(
             new_storage.entity_archetype_lookup.get(&uid).copied(),
-            Some(ArchetypeId::from_components_metadata(&[]))
+            Some(ArchetypeId::new_empty())
         );
     }
 }
diff --git a/ecs/src/component/storage/archetype.rs b/ecs/src/component/storage/archetype.rs
index 56dd5ae..a88e0e8 100644
--- a/ecs/src/component/storage/archetype.rs
+++ b/ecs/src/component/storage/archetype.rs
@@ -7,7 +7,6 @@ use std::slice::Iter as SliceIter;
 
 use hashbrown::HashMap;
 
-use crate::component::Metadata as ComponentMetadata;
 use crate::lock::Lock;
 use crate::uid::{Kind as UidKind, Uid};
 use crate::util::{Either, HashMapExt};
@@ -353,52 +352,33 @@ pub struct Id
 
 impl Id
 {
-    pub fn new(component_ids: &impl AsRef<[Uid]>) -> Self
+    pub fn new_empty() -> Self
     {
-        if component_ids.as_ref().is_empty() {
-            return Self { hash: 0 };
-        }
-
-        debug_assert!(
-            component_ids.as_ref().is_sorted(),
-            "Cannot create archetype ID from unsorted component IDs"
-        );
-
-        let mut hasher = DefaultHasher::new();
-
-        for component_id in component_ids.as_ref() {
-            component_id.hash(&mut hasher);
-        }
-
-        Self { hash: hasher.finish() }
+        Self { hash: 0 }
     }
 
-    pub fn from_components_metadata<'a>(
-        components_metadata: impl IntoIterator<Item = &'a ComponentMetadata>,
-    ) -> Self
+    pub fn new<'a>(component_ids: impl IntoIterator<Item = &'a Uid>) -> Self
     {
         let mut hasher = DefaultHasher::new();
 
         let mut prev_component_id: Option<Uid> = None;
 
-        let mut comp_metadata_iter = components_metadata.into_iter().peekable();
+        let mut component_id_iter = component_ids.into_iter().peekable();
 
-        if comp_metadata_iter.peek().is_none() {
-            return Self { hash: 0 };
+        if component_id_iter.peek().is_none() {
+            return Self::new_empty();
         }
 
-        for comp_metadata in comp_metadata_iter {
-            if prev_component_id
-                .is_some_and(|prev_comp_id| comp_metadata.id < prev_comp_id)
-            {
+        for comp_id in component_id_iter {
+            if prev_component_id.is_some_and(|prev_comp_id| *comp_id < prev_comp_id) {
                 panic!(
                     "Cannot create archetype ID from a unsorted component metadata list"
                 );
             }
 
-            prev_component_id = Some(comp_metadata.id);
+            prev_component_id = Some(*comp_id);
 
-            comp_metadata.id.hash(&mut hasher);
+            comp_id.hash(&mut hasher);
         }
 
         Self { hash: hasher.finish() }