Bump bevy & bevy console (#153)

* bump bevy console * bump rest of bevy * remove bevy_gltf
makspll · Dec 3, 2024 · c222a03 · c222a03
1 parent 1dfe12e
commit c222a03
Show file tree

Hide file tree

Showing 17 changed files with 4,082 additions and 5,979 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -70,15 +70,15 @@ bevy_script_api = { path = "crates/bevy_script_api", version = "0.8.0-alpha.1",
 
 
 [workspace.dependencies]
-bevy = { version = "0.15.0-rc.3", default-features = false }
+bevy = { version = "0.15.0", default-features = false }
 bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.8.0-alpha.1" }
 bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.8.0-alpha.1" }
 
 [dev-dependencies]
 bevy = { workspace = true, default-features = true }
 clap = { version = "4.1", features = ["derive"] }
 rand = "0.8.5"
-bevy_console = "0.12"
+bevy_console = "0.13"
 rhai-rand = "0.1"
 
 [workspace]
@@ -111,26 +111,25 @@ codegen-units = 8
 incremental = false
 debug = false
 
-# TODO: bump once bevy is released and the lib is updated
-# [[example]]
-# name = "console_integration_lua"
-# path = "examples/lua/console_integration.rs"
-# required-features = [
-#     "lua54",
-#     "lua_script_api",
-#     "bevy/file_watcher",
-#     "bevy/multi_threaded",
-# ]
-
-# [[example]]
-# name = "console_integration_rhai"
-# path = "examples/rhai/console_integration.rs"
-# required-features = [
-#     "rhai",
-#     "rhai_script_api",
-#     "bevy/file_watcher",
-#     "bevy/multi_threaded",
-# ]
+[[example]]
+name = "console_integration_lua"
+path = "examples/lua/console_integration.rs"
+required-features = [
+    "lua54",
+    "lua_script_api",
+    "bevy/file_watcher",
+    "bevy/multi_threaded",
+]
+
+[[example]]
+name = "console_integration_rhai"
+path = "examples/rhai/console_integration.rs"
+required-features = [
+    "rhai",
+    "rhai_script_api",
+    "bevy/file_watcher",
+    "bevy/multi_threaded",
+]
 
 [[example]]
 name = "complex_game_loop_lua"

diff --git a/crates/bevy_mod_scripting_core/Cargo.toml b/crates/bevy_mod_scripting_core/Cargo.toml
@@ -23,7 +23,6 @@ doc_always = []
 [dependencies]
 bevy = { workspace = true, default-features = false, features = [
     "bevy_asset",
-    "bevy_gltf",
     "bevy_animation",
     "bevy_core_pipeline",
     "bevy_ui",

diff --git a/crates/bevy_script_api/src/providers/bevy_a11y.rs b/crates/bevy_script_api/src/providers/bevy_a11y.rs
diff --git a/crates/bevy_script_api/src/providers/bevy_core.rs b/crates/bevy_script_api/src/providers/bevy_core.rs
@@ -14,12 +14,6 @@ use bevy_script_api::{
     remote = "bevy::core::prelude::Name",
     functions[r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::core::prelude::Name;
-
-"#,
-    r#"
-
     #[lua(
         as_trait = "std::cmp::PartialEq",
         kind = "MetaFunction",
@@ -28,6 +22,12 @@ use bevy_script_api::{
     )]
     fn eq(&self, #[proxy] other: &name::Name) -> bool;
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::core::prelude::Name;
+
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]

diff --git a/crates/bevy_script_api/src/providers/bevy_ecs.rs b/crates/bevy_script_api/src/providers/bevy_ecs.rs
@@ -13,8 +13,13 @@ use bevy_script_api::{
     remote = "bevy::ecs::entity::Entity",
     functions[r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::entity::Entity;
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
+    fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
 
 "#,
     r#"
@@ -73,13 +78,8 @@ use bevy_script_api::{
 "#,
     r#"
 
-    #[lua(
-        as_trait = "std::cmp::PartialEq",
-        kind = "MetaFunction",
-        composite = "eq",
-        metamethod = "Eq",
-    )]
-    fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::entity::Entity;
 
 "#,
     r#"
@@ -143,17 +143,6 @@ struct OnReplace {}
     derive(clone),
     remote = "bevy::ecs::component::ComponentId",
     functions[r#"
-
-    #[lua(
-        as_trait = "std::cmp::PartialEq",
-        kind = "MetaFunction",
-        composite = "eq",
-        metamethod = "Eq",
-    )]
-    fn eq(&self, #[proxy] other: &component::ComponentId) -> bool;
-
-"#,
-    r#"
 /// Creates a new [`ComponentId`].
 /// The `index` is a unique value associated with each type of component in a given world.
 /// Usually, this value is taken from a counter incremented for each type of component registered with the world.
@@ -174,6 +163,17 @@ struct OnReplace {}
     #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
     fn clone(&self) -> bevy::ecs::component::ComponentId;
 
+"#,
+    r#"
+
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
+    fn eq(&self, #[proxy] other: &component::ComponentId) -> bool;
+
 "#,
     r#"
 
@@ -195,8 +195,8 @@ struct ComponentId();
     remote = "bevy::ecs::component::Tick",
     functions[r#"
 
-    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
-    fn assert_receiver_is_total_eq(&self) -> ();
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::component::Tick;
 
 "#,
     r#"
@@ -212,8 +212,8 @@ struct ComponentId();
 "#,
     r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::component::Tick;
+    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
+    fn assert_receiver_is_total_eq(&self) -> ();
 
 "#,
     r#"
@@ -264,12 +264,6 @@ struct Tick {}
     derive(clone),
     remote = "bevy::ecs::component::ComponentTicks",
     functions[r#"
-
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::component::ComponentTicks;
-
-"#,
-    r#"
 /// Returns `true` if the component or resource was added after the system last ran
 /// (or the system is running for the first time).
 
@@ -298,17 +292,13 @@ struct Tick {}
 
 "#,
     r#"
-/// Returns the tick recording the time this component or resource was most recently changed.
+/// Creates a new instance with the same change tick for `added` and `changed`.
 
-    #[lua(kind = "Method", output(proxy))]
-    fn last_changed_tick(&self) -> bevy::ecs::component::Tick;
-
-"#,
-    r#"
-/// Returns the tick recording the time this component or resource was added.
-
-    #[lua(kind = "Method", output(proxy))]
-    fn added_tick(&self) -> bevy::ecs::component::Tick;
+    #[lua(kind = "Function", output(proxy))]
+    fn new(
+        #[proxy]
+        change_tick: bevy::ecs::component::Tick,
+    ) -> bevy::ecs::component::ComponentTicks;
 
 "#,
     r#"
@@ -327,6 +317,12 @@ struct Tick {}
     #[lua(kind = "MutatingMethod")]
     fn set_changed(&mut self, #[proxy] change_tick: bevy::ecs::component::Tick) -> ();
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::component::ComponentTicks;
+
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]
@@ -335,19 +331,18 @@ fn index(&self) -> String {
 }
 "#]
 )]
-struct ComponentTicks {}
+struct ComponentTicks {
+    #[lua(output(proxy))]
+    added: bevy::ecs::component::Tick,
+    #[lua(output(proxy))]
+    changed: bevy::ecs::component::Tick,
+}
 #[derive(bevy_mod_scripting_lua_derive::LuaProxy)]
 #[proxy(
     derive(clone),
     remote = "bevy::ecs::identifier::Identifier",
     functions[r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::identifier::Identifier;
-
-"#,
-    r#"
-
     #[lua(
         as_trait = "std::cmp::PartialEq",
         kind = "MetaFunction",
@@ -387,6 +382,12 @@ struct ComponentTicks {}
     #[lua(kind = "Function", output(proxy))]
     fn from_bits(value: u64) -> bevy::ecs::identifier::Identifier;
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::identifier::Identifier;
+
 "#,
     r#"
 #[lua(kind="MetaMethod", metamethod="ToString")]
@@ -451,6 +452,13 @@ impl bevy_mod_scripting_lua::tealr::mlu::ExportInstances for Globals {
                 "Tick",
                 bevy_mod_scripting_lua::tealr::mlu::UserDataProxy::<LuaTick>::new,
             )?;
+        instances
+            .add_instance(
+                "ComponentTicks",
+                bevy_mod_scripting_lua::tealr::mlu::UserDataProxy::<
+                    LuaComponentTicks,
+                >::new,
+            )?;
         instances
             .add_instance(
                 "Identifier",
@@ -500,6 +508,11 @@ impl bevy_mod_scripting_core::hosts::APIProvider for BevyEcsAPIProvider {
                             bevy_mod_scripting_lua::tealr::mlu::UserDataProxy<LuaTick>,
                         >()
                         .process_type::<LuaComponentTicks>()
+                        .process_type::<
+                            bevy_mod_scripting_lua::tealr::mlu::UserDataProxy<
+                                LuaComponentTicks,
+                            >,
+                        >()
                         .process_type::<LuaIdentifier>()
                         .process_type::<
                             bevy_mod_scripting_lua::tealr::mlu::UserDataProxy<

diff --git a/crates/bevy_script_api/src/providers/bevy_hierarchy.rs b/crates/bevy_script_api/src/providers/bevy_hierarchy.rs
@@ -70,8 +70,8 @@ struct Parent();
     remote = "bevy::hierarchy::HierarchyEvent",
     functions[r#"
 
-    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
-    fn assert_receiver_is_total_eq(&self) -> ();
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::hierarchy::HierarchyEvent;
 
 "#,
     r#"
@@ -87,8 +87,8 @@ struct Parent();
 "#,
     r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::hierarchy::HierarchyEvent;
+    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
+    fn assert_receiver_is_total_eq(&self) -> ();
 
 "#,
     r#"