Finish observe and mutate

Mubelotix · Nov 11, 2023 · 154dbbe · 154dbbe
1 parent 1dcc179
commit 154dbbe
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/minecraft-entities/src/lib.rs b/minecraft-entities/src/lib.rs
@@ -66,8 +66,8 @@ pub trait TryAsEntityRef<T> {
 
 
 pub trait EntityWorldInterface {
-    fn observe_entity(&self, eid: Eid, observer: &dyn FnOnce(&AnyEntity)) -> Pin<Box<dyn std::future::Future<Output = ()>>>;
-    fn mutate_entity(&self, eid: Eid, mutator: &dyn FnOnce(&mut AnyEntity)) -> Pin<Box<dyn std::future::Future<Output = ()>>>;
+    fn observe_entity(&'static self, eid: Eid, observer: Box<dyn FnOnce(&AnyEntity)>) -> Pin<Box<dyn std::future::Future<Output = ()>>>;
+    fn mutate_entity(&'static self, eid: Eid, mutator: Box<dyn FnOnce(&mut AnyEntity)>) -> Pin<Box<dyn std::future::Future<Output = ()>>>;
 }
 
 pub struct Handler<T> where AnyEntity: TryAsEntityRef<T> {
@@ -76,7 +76,7 @@ pub struct Handler<T> where AnyEntity: TryAsEntityRef<T> {
     entity: std::marker::PhantomData<T>,
 }
 
-impl<T> Handler<T> where AnyEntity: TryAsEntityRef<T> {
+impl<T: 'static> Handler<T> where AnyEntity: TryAsEntityRef<T> {
     pub fn assume(id: Eid, world: &'static dyn EntityWorldInterface) -> Self {
         Self {
             eid: id,
@@ -93,16 +93,16 @@ impl<T> Handler<T> where AnyEntity: TryAsEntityRef<T> {
         }
     }
 
-    pub async fn observe(&self, observer: fn(&T)) {
-        self.world.observe_entity(self.eid, &|entity| {
+    pub async fn observe(&self, observer: impl FnOnce(&T) + 'static) {
+        self.world.observe_entity(self.eid, Box::new(move |entity| {
             observer(entity.try_as_entity_ref().unwrap())
-        }).await;
+        })).await;
     }
 
-    pub async fn mutate(&self, mutator: fn(&mut T)) {
-        self.world.mutate_entity(self.eid, &|entity| {
+    pub async fn mutate(&self, mutator: impl FnOnce(&mut T) + 'static) {
+        self.world.mutate_entity(self.eid, Box::new(move |entity| {
             mutator(entity.try_as_entity_mut().unwrap())
-        }).await;
+        })).await;
     }
 }
 

diff --git a/minecraft-server/src/ecs.rs b/minecraft-server/src/ecs.rs
@@ -53,13 +53,3 @@ impl Entities {
         self.entities.write().await.remove(&eid)
     }
 }
-
-impl EntityWorldInterface for World {
-    fn observe_entity(&self, eid: Eid, observer: &dyn FnOnce(&AnyEntity)) -> Pin<Box<dyn std::future::Future<Output = ()>>> {
-        todo!()
-    }
-
-    fn mutate_entity(&self, eid: Eid, mutator: &dyn FnOnce(&mut AnyEntity)) -> Pin<Box<dyn std::future::Future<Output = ()>>> {
-        todo!()
-    }
-}
diff --git a/minecraft-server/src/world/mod.rs b/minecraft-server/src/world/mod.rs
@@ -79,6 +79,20 @@ impl World {
     }
 }
 
+impl EntityWorldInterface for World {    
+    fn observe_entity(&'static self, eid: Eid, observer: Box<dyn FnOnce(&AnyEntity)>) -> Pin<Box<dyn std::future::Future<Output = ()>>> {
+        Box::pin(async move {
+            self.entities.observe_entity(eid, observer).await;
+        })
+    }
+
+    fn mutate_entity(&'static self, eid: Eid, mutator: Box<dyn FnOnce(&mut AnyEntity)>) -> Pin<Box<dyn std::future::Future<Output = ()>>> {
+        Box::pin(async move {
+            self.entities.mutate_entity(eid, mutator).await;
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;