2 files changed, 38 insertions, 8 deletions

diff --git a/mingling_core/src/asset/dispatcher.rs b/mingling_core/src/asset/dispatcher.rs
index 8f04955..cb0987d 100644
--- a/mingling_core/src/asset/dispatcher.rs
+++ b/mingling_core/src/asset/dispatcher.rs
@@ -32,22 +32,48 @@ where
     C: ProgramCollect<Enum = C>,
 {
     /// Adds a dispatcher to the program.
-    #[cfg(not(feature = "dispatch_tree"))]
-    pub fn with_dispatcher<Disp>(&mut self, dispatcher: Disp)
+    #[cfg_attr(
+        feature = "dispatch_tree",
+        deprecated(
+            note = "When the `dispatch_tree` feature is enabled, the `dispatcher` field no longer exists inside Program. All types are collected at compile time by the `gen_program!()` macro, so the `with_dispatcher` function is no longer needed"
+        )
+    )]
+    pub fn with_dispatcher<Disp>(&mut self, dispatcher: Disp) -> &mut Self
     where
         Disp: Dispatcher<C> + Send + Sync + 'static,
     {
-        self.dispatcher.push(Box::new(dispatcher));
+        #[cfg(not(feature = "dispatch_tree"))]
+        {
+            self.dispatcher.push(Box::new(dispatcher));
+        }
+        #[cfg(feature = "dispatch_tree")]
+        {
+            let _ = dispatcher;
+        }
+        self
     }
 
     /// Add some dispatchers to the program.
-    #[cfg(not(feature = "dispatch_tree"))]
-    pub fn with_dispatchers<D>(&mut self, dispatchers: D)
+    #[cfg_attr(
+        feature = "dispatch_tree",
+        deprecated(
+            note = "When the `dispatch_tree` feature is enabled, the `dispatcher` field no longer exists inside Program. All types are collected at compile time by the `gen_program!()` macro, so the `with_dispatcher` function is no longer needed"
+        )
+    )]
+    pub fn with_dispatchers<D>(&mut self, dispatchers: D) -> &mut Self
     where
         D: Into<Dispatchers<C>>,
     {
-        let dispatchers = dispatchers.into();
-        self.dispatcher.extend(dispatchers.dispatcher);
+        #[cfg(not(feature = "dispatch_tree"))]
+        {
+            let dispatchers = dispatchers.into();
+            self.dispatcher.extend(dispatchers.dispatcher);
+        }
+        #[cfg(feature = "dispatch_tree")]
+        {
+            let _ = dispatchers;
+        }
+        self
     }
 }
 
diff --git a/mingling_core/src/asset/global_resource.rs b/mingling_core/src/asset/global_resource.rs
index 29e1136..a610378 100644
--- a/mingling_core/src/asset/global_resource.rs
+++ b/mingling_core/src/asset/global_resource.rs
@@ -13,10 +13,14 @@ where
     C: ProgramCollect<Enum = C>,
 {
     /// Insert a resource of the given type, cloning the provided value into the store
-    pub fn with_resource<Res: 'static + Send + Sync + ResourceMarker>(&mut self, res: Res) {
+    pub fn with_resource<Res: 'static + Send + Sync + ResourceMarker>(
+        &mut self,
+        res: Res,
+    ) -> &mut Self {
         if let Ok(mut guard) = self.resources.lock() {
             guard.insert(TypeId::of::<Res>(), Box::new(Arc::new(res)));
         }
+        self
     }
 
     /// Modify a resource by type, applying a closure to the resource if present