Fix compile issues not seen when using as branch

Author: alexparlett

Cargo.toml

@@ -84,6 +84,9 @@ bevy_mod_scripting_derive = { workspace = true }
 
 [workspace.dependencies]
 profiling = { version = "1.0" }
+bevy_math = { version = "0.16.0", default-features = false }
+bevy_reflect = { version = "0.16.0", default-features = false }
+bevy_input = { version = "0.16.0", default-features = false }
 bevy = { version = "0.16.0", default-features = false }
 bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "0.13.0" }
 bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.13.0", default-features = false }

crates/bevy_mod_scripting_core/src/bindings/reference.rs

@@ -214,7 +214,7 @@ impl ReflectReference {
 
         self.with_reflect(world.clone(), |r| {
             <dyn PartialReflect>::from_reflect_or_clone(r, world.clone())
-        })
+        })?
     }
 
     /// The way to access the value of the reference, that is the pointed-to value.

crates/bevy_mod_scripting_core/src/bindings/script_system.rs

@@ -28,7 +28,7 @@ use bevy::{
         query::{Access, FilteredAccess, FilteredAccessSet, QueryState},
         reflect::AppTypeRegistry,
         schedule::{
-            SystemSet, Infallible, graph::GraphInfo,
+            SystemSet, Infallible
         },
         system::{IntoSystem, System, SystemParamValidationError},
         world::{unsafe_world_cell::UnsafeWorldCell, World},

crates/bevy_mod_scripting_core/src/bindings/world.rs

@@ -818,10 +818,10 @@ impl WorldAccessGuard<'_> {
         // try to construct type from reflect
         // TODO: it would be nice to have a <dyn PartialReflect>::from_reflect_with_fallback equivalent, that does exactly that
         // only using this as it's already there and convenient, the clone variant hitting will be confusing to end users
-        Ok(<dyn PartialReflect>::from_reflect_or_clone(
+        <dyn PartialReflect>::from_reflect_or_clone(
             dynamic.as_ref(),
             self.clone(),
-        ))
+        )
     }
 
     /// Spawns a new entity in the world

crates/bevy_mod_scripting_core/src/extractors.rs

@@ -11,7 +11,7 @@ use bevy::{
         event::{Event, EventCursor, EventIterator, Events},
         query::{Access, AccessConflicts},
         storage::SparseSetIndex,
-        system::{Local, SystemParam, SystemState},
+        system::{Local, SystemParam, SystemState, SystemParamValidationError},
         world::World,
     },
     prelude::Resource
@@ -368,8 +368,8 @@ unsafe impl<T: SystemParam> SystemParam for WithWorldGuard<'_, '_, T> {
         state: &Self::State,
         system_meta: &bevy::ecs::system::SystemMeta,
         world: bevy::ecs::world::unsafe_world_cell::UnsafeWorldCell,
-    ) -> bool {
-        T::validate_param(&state.0, system_meta, world).is_ok()
+    ) -> Result<(), SystemParamValidationError> {
+        T::validate_param(&state.0, system_meta, world)
     }
 }
 

crates/bevy_mod_scripting_core/src/reflection_extensions.rs

@@ -4,11 +4,14 @@ use crate::{
     bindings::{ReflectReference, WorldGuard},
     error::InteropError,
 };
-use bevy::reflect::{PartialReflect, Reflect, ReflectFromReflect, ReflectMut, TypeInfo};
+use bevy::reflect::{
+    PartialReflect, Reflect, ReflectFromReflect, ReflectMut, TypeInfo,
+};
 use std::{
     any::{Any, TypeId},
     cmp::max,
 };
+
 /// Extension trait for [`PartialReflect`] providing additional functionality for working with specific types.
 pub trait PartialReflectExt {
     /// Try to get a reference to the given key in an underyling map, if the type is a map.
@@ -30,7 +33,7 @@ pub trait PartialReflectExt {
     fn from_reflect_or_clone(
         reflect: &dyn PartialReflect,
         world: WorldGuard,
-    ) -> Box<dyn PartialReflect>;
+    ) -> Result<Box<dyn PartialReflect>, InteropError>;
 
     /// Allocate a new boxed reflect reference from a boxed reflect.
     fn allocate(boxed: Box<dyn Reflect>, world: WorldGuard) -> ReflectReference;
@@ -424,11 +427,19 @@ impl<T: PartialReflect + ?Sized> PartialReflectExt for T {
     fn from_reflect_or_clone(
         reflect: &dyn PartialReflect,
         world: WorldGuard,
-    ) -> Box<dyn PartialReflect> {
+    ) -> Result<Box<dyn PartialReflect>, InteropError> {
         // try from reflect
         match <dyn PartialReflect>::from_reflect(reflect, world.clone()) {
-            Ok(v) => v.into_partial_reflect(),
-            Err(_) => reflect.clone_value(),
+            Ok(v) => Ok(v.into_partial_reflect()),
+            Err(_) => reflect
+                .reflect_clone()
+                .map(|v| v.into_partial_reflect())
+                .map_err(|e| {
+                    InteropError::failed_from_reflect(
+                        reflect.get_represented_type_info().map(|ti| ti.type_id()),
+                        e.to_string(),
+                    )
+                }),
         }
     }
 
@@ -667,7 +678,7 @@ mod test {
         let mut map =
             std::collections::HashMap::<i32, std::collections::HashMap<i32, i32>>::default();
         let value = DynamicMap::from_iter(vec![(1, 2), (2, 3), (3, 4)]);
-        let value_ref: Box<dyn PartialReflect> = Box::new(value.clone_dynamic());
+        let value_ref: Box<dyn PartialReflect> = Box::new(value.to_dynamic_map());
         map.insert(1, std::collections::HashMap::<i32, i32>::default());
         map.insert(2, std::collections::HashMap::<i32, i32>::default());
         map.insert(3, std::collections::HashMap::<i32, i32>::default());

crates/bevy_mod_scripting_functions/Cargo.toml

@@ -28,6 +28,9 @@ rhai_bindings = ["bevy_mod_scripting_rhai"]
 
 [dependencies]
 bevy = { workspace = true }
+bevy_math = { workspace = true, features = ["curve"]}
+bevy_reflect = { workspace = true, features = ["smol_str"]}
+bevy_input = { workspace = true, features = ["smol_str"]}
 profiling = { workspace = true }
 uuid = "1.11"
 smol_str = "0.2.2"

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_math.rs

@@ -4560,7 +4560,7 @@ impl bevy::math::bounding::BoundingSphereCast {
     bms_core_path = "bevy_mod_scripting_core",
     generated
 )]
-impl bevy::math::curve::interval::Interval {
+impl bevy::math::curve::Interval {
     ///  Clamp the given `value` to lie within this interval.
     fn clamp(_self: Val<bevy::math::curve::interval::Interval>, value: f32) -> f32 {
         let output: f32 = bevy::math::curve::interval::Interval::clamp(

crates/bevy_system_reflection/Cargo.toml

@@ -12,7 +12,7 @@ categories = ["game-development"]
 readme = "readme.md"
 
 [dependencies]
-bevy = { workspace = true, default-features = false }
+bevy = { workspace = true, default-features = false, features = ["bevy_log"]}
 dot-writer = "0.1.4"