merge

Author: makspll

crates/languages/bevy_mod_scripting_lua/src/bindings/providers/bevy_a11y.rs

@@ -21,14 +21,6 @@ use crate::{
     bms_lua_path = "crate",
     functions[r#"
 
-    #[lua(as_trait = "std::clone::Clone")]
-    fn clone(
-        _self: LuaReflectRefProxy<bevy::core::prelude::Name>,
-    ) -> LuaReflectValProxy<bevy::core::prelude::Name>;
-
-"#,
-    r#"
-
     #[lua(
         as_trait = "std::cmp::PartialEq::<bevy::core::prelude::Name>",
         composite = "eq",
@@ -38,6 +30,14 @@ use crate::{
         other: LuaReflectRefProxy<bevy::core::prelude::Name>,
     ) -> bool;
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone")]
+    fn clone(
+        _self: LuaReflectRefProxy<bevy::core::prelude::Name>,
+    ) -> LuaReflectValProxy<bevy::core::prelude::Name>;
+
 "#,
     r#"
 #[lua(metamethod="ToString")]

crates/languages/bevy_mod_scripting_lua/src/bindings/providers/bevy_core.rs

@@ -20,10 +20,14 @@ use crate::{
     bms_lua_path = "crate",
     functions[r#"
 
-    #[lua(as_trait = "std::clone::Clone")]
-    fn clone(
+    #[lua(
+        as_trait = "std::cmp::PartialEq::<bevy::ecs::entity::Entity>",
+        composite = "eq",
+    )]
+    fn eq(
         _self: LuaReflectRefProxy<bevy::ecs::entity::Entity>,
-    ) -> LuaReflectValProxy<bevy::ecs::entity::Entity>;
+        other: LuaReflectRefProxy<bevy::ecs::entity::Entity>,
+    ) -> bool;
 
 "#,
     r#"
@@ -82,14 +86,10 @@ use crate::{
 "#,
     r#"
 
-    #[lua(
-        as_trait = "std::cmp::PartialEq::<bevy::ecs::entity::Entity>",
-        composite = "eq",
-    )]
-    fn eq(
+    #[lua(as_trait = "std::clone::Clone")]
+    fn clone(
         _self: LuaReflectRefProxy<bevy::ecs::entity::Entity>,
-        other: LuaReflectRefProxy<bevy::ecs::entity::Entity>,
-    ) -> bool;
+    ) -> LuaReflectValProxy<bevy::ecs::entity::Entity>;
 
 "#,
     r#"
@@ -158,6 +158,22 @@ pub struct OnReplace {}
     bms_core_path = "bevy_mod_scripting_core",
     bms_lua_path = "crate",
     functions[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.
+
+    #[lua()]
+    fn new(index: usize) -> LuaReflectValProxy<bevy::ecs::component::ComponentId>;
+
+"#,
+    r#"
+/// Returns the index of the current component.
+
+    #[lua()]
+    fn index(_self: LuaReflectValProxy<bevy::ecs::component::ComponentId>) -> usize;
+
+"#,
+    r#"
 
     #[lua(as_trait = "std::clone::Clone")]
     fn clone(
@@ -184,22 +200,6 @@ pub struct OnReplace {}
         _self: LuaReflectRefProxy<bevy::ecs::component::ComponentId>,
     ) -> ();
 
-"#,
-    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.
-
-    #[lua()]
-    fn new(index: usize) -> LuaReflectValProxy<bevy::ecs::component::ComponentId>;
-
-"#,
-    r#"
-/// Returns the index of the current component.
-
-    #[lua()]
-    fn index(_self: LuaReflectValProxy<bevy::ecs::component::ComponentId>) -> usize;
-
 "#,
     r#"
 #[lua(metamethod="ToString")]
@@ -221,6 +221,26 @@ pub struct ComponentId();
         _self: LuaReflectRefProxy<bevy::ecs::component::Tick>,
     ) -> LuaReflectValProxy<bevy::ecs::component::Tick>;
 
+"#,
+    r#"
+
+    #[lua(
+        as_trait = "std::cmp::PartialEq::<bevy::ecs::component::Tick>",
+        composite = "eq",
+    )]
+    fn eq(
+        _self: LuaReflectRefProxy<bevy::ecs::component::Tick>,
+        other: LuaReflectRefProxy<bevy::ecs::component::Tick>,
+    ) -> bool;
+
+"#,
+    r#"
+
+    #[lua(as_trait = "std::cmp::Eq")]
+    fn assert_receiver_is_total_eq(
+        _self: LuaReflectRefProxy<bevy::ecs::component::Tick>,
+    ) -> ();
+
 "#,
     r#"
 /// Creates a new [`Tick`] wrapping the given value.
@@ -254,26 +274,6 @@ pub struct ComponentId();
         this_run: LuaReflectValProxy<bevy::ecs::component::Tick>,
     ) -> bool;
 
-"#,
-    r#"
-
-    #[lua(as_trait = "std::cmp::Eq")]
-    fn assert_receiver_is_total_eq(
-        _self: LuaReflectRefProxy<bevy::ecs::component::Tick>,
-    ) -> ();
-
-"#,
-    r#"
-
-    #[lua(
-        as_trait = "std::cmp::PartialEq::<bevy::ecs::component::Tick>",
-        composite = "eq",
-    )]
-    fn eq(
-        _self: LuaReflectRefProxy<bevy::ecs::component::Tick>,
-        other: LuaReflectRefProxy<bevy::ecs::component::Tick>,
-    ) -> bool;
-
 "#,
     r#"
 #[lua(metamethod="ToString")]
@@ -289,14 +289,6 @@ pub struct Tick {}
     bms_core_path = "bevy_mod_scripting_core",
     bms_lua_path = "crate",
     functions[r#"
-
-    #[lua(as_trait = "std::clone::Clone")]
-    fn clone(
-        _self: LuaReflectRefProxy<bevy::ecs::component::ComponentTicks>,
-    ) -> LuaReflectValProxy<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).
 
@@ -321,21 +313,12 @@ pub struct Tick {}
 
 "#,
     r#"
-/// Returns the tick recording the time this component or resource was most recently changed.
-
-    #[lua()]
-    fn last_changed_tick(
-        _self: LuaReflectRefProxy<bevy::ecs::component::ComponentTicks>,
-    ) -> LuaReflectValProxy<bevy::ecs::component::Tick>;
-
-"#,
-    r#"
-/// Returns the tick recording the time this component or resource was added.
+/// Creates a new instance with the same change tick for `added` and `changed`.
 
     #[lua()]
-    fn added_tick(
-        _self: LuaReflectRefProxy<bevy::ecs::component::ComponentTicks>,
-    ) -> LuaReflectValProxy<bevy::ecs::component::Tick>;
+    fn new(
+        change_tick: LuaReflectValProxy<bevy::ecs::component::Tick>,
+    ) -> LuaReflectValProxy<bevy::ecs::component::ComponentTicks>;
 
 "#,
     r#"
@@ -357,6 +340,14 @@ pub struct Tick {}
         change_tick: LuaReflectValProxy<bevy::ecs::component::Tick>,
     ) -> ();
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone")]
+    fn clone(
+        _self: LuaReflectRefProxy<bevy::ecs::component::ComponentTicks>,
+    ) -> LuaReflectValProxy<bevy::ecs::component::ComponentTicks>;
+
 "#,
     r#"
 #[lua(metamethod="ToString")]
@@ -365,22 +356,17 @@ fn index(&self) -> String {
 }
 "#]
 )]
-pub struct ComponentTicks {}
+pub struct ComponentTicks {
+    added: bevy::ecs::component::Tick,
+    changed: bevy::ecs::component::Tick,
+}
 #[derive(bevy_mod_scripting_derive::LuaProxy)]
 #[proxy(
     remote = "bevy::ecs::identifier::Identifier",
     bms_core_path = "bevy_mod_scripting_core",
     bms_lua_path = "crate",
     functions[r#"
 
-    #[lua(as_trait = "std::clone::Clone")]
-    fn clone(
-        _self: LuaReflectRefProxy<bevy::ecs::identifier::Identifier>,
-    ) -> LuaReflectValProxy<bevy::ecs::identifier::Identifier>;
-
-"#,
-    r#"
-
     #[lua(
         as_trait = "std::cmp::PartialEq::<bevy::ecs::identifier::Identifier>",
         composite = "eq",
@@ -421,6 +407,14 @@ pub struct ComponentTicks {}
     #[lua()]
     fn from_bits(value: u64) -> LuaReflectValProxy<bevy::ecs::identifier::Identifier>;
 
+"#,
+    r#"
+
+    #[lua(as_trait = "std::clone::Clone")]
+    fn clone(
+        _self: LuaReflectRefProxy<bevy::ecs::identifier::Identifier>,
+    ) -> LuaReflectValProxy<bevy::ecs::identifier::Identifier>;
+
 "#,
     r#"
 #[lua(metamethod="ToString")]
@@ -490,6 +484,11 @@ impl crate::tealr::mlu::ExportInstances for Globals {
             )?;
         instances
             .add_instance("Tick", crate::tealr::mlu::UserDataProxy::<LuaTick>::new)?;
+        instances
+            .add_instance(
+                "ComponentTicks",
+                crate::tealr::mlu::UserDataProxy::<LuaComponentTicks>::new,
+            )?;
         instances
             .add_instance(
                 "Identifier",
@@ -540,6 +539,9 @@ impl bevy::app::Plugin for BevyEcsScriptingPlugin {
                         .process_type::<LuaTick>()
                         .process_type::<crate::tealr::mlu::UserDataProxy<LuaTick>>()
                         .process_type::<LuaComponentTicks>()
+                        .process_type::<
+                            crate::tealr::mlu::UserDataProxy<LuaComponentTicks>,
+                        >()
                         .process_type::<LuaIdentifier>()
                         .process_type::<
                             crate::tealr::mlu::UserDataProxy<LuaIdentifier>,

crates/languages/bevy_mod_scripting_lua/src/bindings/providers/bevy_ecs.rs

@@ -79,6 +79,14 @@ pub struct Parent();
     bms_lua_path = "crate",
     functions[r#"
 
+    #[lua(as_trait = "std::clone::Clone")]
+    fn clone(
+        _self: LuaReflectRefProxy<bevy::hierarchy::HierarchyEvent>,
+    ) -> LuaReflectValProxy<bevy::hierarchy::HierarchyEvent>;
+
+"#,
+    r#"
+
     #[lua(
         as_trait = "std::cmp::PartialEq::<bevy::hierarchy::HierarchyEvent>",
         composite = "eq",
@@ -88,14 +96,6 @@ pub struct Parent();
         other: LuaReflectRefProxy<bevy::hierarchy::HierarchyEvent>,
     ) -> bool;
 
-"#,
-    r#"
-
-    #[lua(as_trait = "std::clone::Clone")]
-    fn clone(
-        _self: LuaReflectRefProxy<bevy::hierarchy::HierarchyEvent>,
-    ) -> LuaReflectValProxy<bevy::hierarchy::HierarchyEvent>;
-
 "#,
     r#"