allow any component names

Author: makspll

crates/bevy_mod_scripting_core/src/bindings/script_component.rs

@@ -73,13 +73,6 @@ impl WorldAccessGuard<'_> {
         &self,
         component_name: String,
     ) -> Result<ScriptComponentRegistration, InteropError> {
-        if !component_name.starts_with("Script") {
-            return Err(InteropError::unsupported_operation(
-                None,
-                None,
-                "script registered component name must start with 'Script'",
-            ));
-        }
         let component_registry = self.component_registry();
         let component_registry_read = component_registry.read();
         if component_registry_read.get(&component_name).is_some() {

crates/bevy_mod_scripting_core/src/bindings/world.rs

@@ -24,7 +24,7 @@ use super::{
 use crate::{
     bindings::{
         function::{from::FromScript, from_ref::FromScriptRef},
-        with_access_read, with_access_write, ScriptComponent,
+        with_access_read, with_access_write,
     },
     error::InteropError,
     reflection_extensions::PartialReflectExt,
@@ -978,39 +978,21 @@ impl WorldAccessGuard<'_> {
     pub fn get_component(
         &self,
         entity: Entity,
-        component_id: ComponentId,
+        component_registration: ScriptComponentRegistration,
     ) -> Result<Option<ReflectReference>, InteropError> {
         let cell = self.as_unsafe_world_cell()?;
         let entity = cell
             .get_entity(entity)
             .ok_or_else(|| InteropError::missing_entity(entity))?;
 
-        let component_info = cell
-            .components()
-            .get_info(component_id)
-            .ok_or_else(|| InteropError::invalid_component(component_id))?;
-
-        if entity.contains_id(component_id) {
-            let type_id = component_info.type_id().or_else(|| {
-                // check its a script component
-                component_info
-                    .name()
-                    .starts_with("Script")
-                    .then_some(TypeId::of::<ScriptComponent>())
-            });
+        if entity.contains_id(component_registration.component_id) {
             Ok(Some(ReflectReference {
                 base: ReflectBaseType {
-                    type_id: type_id.ok_or_else(|| {
-                        InteropError::unsupported_operation(
-                            None,
-                            None,
-                            format!(
-                                "Component {} does not have a type id. Such components are not supported by BMS.",
-                                component_id.display_without_world()
-                            ),
-                        )
-                    })?,
-                    base_id: ReflectBase::Component(entity.id(), component_id),
+                    type_id: component_registration.type_registration().type_id(),
+                    base_id: ReflectBase::Component(
+                        entity.id(),
+                        component_registration.component_id,
+                    ),
                 },
                 reflect_path: ParsedPath(vec![]),
             }))

crates/bevy_mod_scripting_functions/src/core.rs

@@ -116,7 +116,7 @@ impl World {
     ) -> Result<Option<ReflectReference>, InteropError> {
         profiling::function_scope!("get_component");
         let world = ctxt.world()?;
-        let val = world.get_component(*entity, registration.component_id())?;
+        let val = world.get_component(*entity, registration.into_inner())?;
         Ok(val)
     }
 
@@ -449,14 +449,14 @@ impl World {
     /// Registers a new component type with the world.
     ///
     /// The component will behave like any other native component for all intents and purposes.
-    /// The type that will be instantiated to back this component will be `ScriptComponent` which contains two fields:
+    /// The type that will be instantiated to back this component will be `ScriptComponent` which contains just one field:
     /// - `data`
     ///
     /// This field can be set to any value and modified freely.
     ///
     /// Arguments:
     /// * `ctxt`: The function call context.
-    /// * `name`: The name of the component type. The name MUST begin with `Script` or an error will be thrown
+    /// * `name`: The name of the component type
     /// Returns:
     /// * `registration`: The registration of the new component type if successful.
     fn register_new_component(