1 files changed, 14 insertions, 12 deletions

diff --git a/ecs/src/lib.rs b/ecs/src/lib.rs
index 53abc6b..979b517 100644
--- a/ecs/src/lib.rs
+++ b/ecs/src/lib.rs
@@ -18,7 +18,7 @@ use crate::component::{
     Parts as ComponentParts,
     Sequence as ComponentSequence,
 };
-use crate::entity::CREATE_STATIC_ENTITIES;
+use crate::entity::Declaration as EntityDeclaration;
 use crate::event::component::{
     Added as ComponentAddedEvent,
     Removed as ComponentRemovedEvent,
@@ -56,9 +56,6 @@ pub mod tuple;
 pub mod uid;
 pub mod util;
 
-#[doc(hidden)]
-pub mod private;
-
 mod lock;
 
 pub use ecs_macros::{Component, Sole};
@@ -84,30 +81,30 @@ impl World
             is_first_tick: AtomicBool::new(false),
         };
 
-        world.add_sole(Stats::default()).ok();
+        crate::phase::spawn_entities(&mut world);
 
-        for create_static_entity in CREATE_STATIC_ENTITIES {
-            create_static_entity(&mut world);
-        }
+        world.add_sole(Stats::default()).ok();
 
         world
     }
 
-    /// Creates a new entity with the given components.
+    /// Creates a entity with the given components. A new unique [`Uid`] will be generated
+    /// for this entity.
     pub fn create_entity<Comps>(&mut self, components: Comps) -> Uid
     where
         Comps: ComponentSequence,
     {
         let entity_uid = Uid::new_unique(UidKind::Entity);
 
-        self.create_entity_with_uid(components, entity_uid);
+        self.create_entity_with_uid(entity_uid, components);
 
         entity_uid
     }
 
+    /// Creates a entity with the given components. The entity will have the specified
+    /// [`Uid`].
     #[tracing::instrument(skip_all)]
-    #[doc(hidden)]
-    pub fn create_entity_with_uid<Comps>(&mut self, components: Comps, entity_uid: Uid)
+    pub fn create_entity_with_uid<Comps>(&mut self, entity_uid: Uid, components: Comps)
     where
         Comps: ComponentSequence,
     {
@@ -129,6 +126,11 @@ impl World
         }
     }
 
+    pub fn create_declared_entity(&mut self, entity_decl: &EntityDeclaration)
+    {
+        entity_decl.create(self);
+    }
+
     /// Adds a globally shared singleton value.
     ///
     /// # Errors