From 0d7419d9bb4cb4b66ecc5a469ae363c982affc96 Mon Sep 17 00:00:00 2001
From: AlephCubed <jothebro500@gmail.com>
Date: Thu, 27 Mar 2025 14:06:41 -0700
Subject: [PATCH] Changed `bevy_butler` to `bevy::butler` in macro crate.

---
 immediate_stats/Cargo.toml                                  | 2 +-
 immediate_stats/src/bevy.rs                                 | 2 +-
 immediate_stats_macros/Cargo.toml                           | 3 ++-
 immediate_stats_macros/src/bevy.rs                          | 2 ++
 .../src/{bevy_butler.rs => bevy/butler.rs}                  | 2 +-
 immediate_stats_macros/src/lib.rs                           | 6 +++---
 6 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 immediate_stats_macros/src/bevy.rs
 rename immediate_stats_macros/src/{bevy_butler.rs => bevy/butler.rs} (95%)

diff --git a/immediate_stats/Cargo.toml b/immediate_stats/Cargo.toml
index a38bbc3..73d6b93 100644
--- a/immediate_stats/Cargo.toml
+++ b/immediate_stats/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 authors = ["AlephCubed"]
 
 [features]
-bevy = ["bevy_ecs", "bevy_app", "bevy_reflect"]
+bevy = ["bevy_ecs", "bevy_app", "bevy_reflect", "immediate_stats_macros/bevy"]
 bevy_butler = ["bevy", "bevy-butler", "immediate_stats_macros/bevy_butler"]
 
 [dependencies]
diff --git a/immediate_stats/src/bevy.rs b/immediate_stats/src/bevy.rs
index 98328f9..6d952d7 100644
--- a/immediate_stats/src/bevy.rs
+++ b/immediate_stats/src/bevy.rs
@@ -1,5 +1,5 @@
 #[cfg(feature = "bevy_butler")]
-mod butler;
+pub mod butler;
 
 use crate::StatContainer;
 use bevy_ecs::prelude::{Component, ResMut};
diff --git a/immediate_stats_macros/Cargo.toml b/immediate_stats_macros/Cargo.toml
index 7938777..86be4dd 100644
--- a/immediate_stats_macros/Cargo.toml
+++ b/immediate_stats_macros/Cargo.toml
@@ -13,7 +13,8 @@ authors = ["AlephCubed"]
 proc-macro = true
 
 [features]
-bevy_butler = []
+bevy = []
+bevy_butler = ["bevy"]
 
 [dependencies]
 proc-macro2 = "1.0"
diff --git a/immediate_stats_macros/src/bevy.rs b/immediate_stats_macros/src/bevy.rs
new file mode 100644
index 0000000..25b1eaa
--- /dev/null
+++ b/immediate_stats_macros/src/bevy.rs
@@ -0,0 +1,2 @@
+#[cfg(feature = "bevy_butler")]
+pub mod butler;
diff --git a/immediate_stats_macros/src/bevy_butler.rs b/immediate_stats_macros/src/bevy/butler.rs
similarity index 95%
rename from immediate_stats_macros/src/bevy_butler.rs
rename to immediate_stats_macros/src/bevy/butler.rs
index 59bff56..3e393fc 100644
--- a/immediate_stats_macros/src/bevy_butler.rs
+++ b/immediate_stats_macros/src/bevy/butler.rs
@@ -2,7 +2,7 @@ use proc_macro2::TokenStream;
 use quote::quote;
 use syn::{DeriveInput, Token};
 
-pub(super) fn register_butler_systems(tree: &DeriveInput) -> TokenStream {
+pub(crate) fn register_butler_systems(tree: &DeriveInput) -> TokenStream {
     let mut systems = Vec::new();
 
     for attr in &tree.attrs {
diff --git a/immediate_stats_macros/src/lib.rs b/immediate_stats_macros/src/lib.rs
index dd6052c..55c5710 100644
--- a/immediate_stats_macros/src/lib.rs
+++ b/immediate_stats_macros/src/lib.rs
@@ -1,5 +1,5 @@
-#[cfg(feature = "bevy_butler")]
-mod bevy_butler;
+#[cfg(feature = "bevy")]
+mod bevy;
 
 use proc_macro_error::{
     emit_call_site_error, emit_call_site_warning, emit_warning, proc_macro_error,
@@ -32,7 +32,7 @@ pub fn stat_container_derive(item: proc_macro::TokenStream) -> proc_macro::Token
 
     #[cfg(feature = "bevy_butler")]
     {
-        let systems = bevy_butler::register_butler_systems(&tree);
+        let systems = bevy::butler::register_butler_systems(&tree);
         quote! { #result #systems }.into()
     }
 
-- 
2.51.2