@@ -9,16 +9,17 @@ use crate::{
99use bevy:: {
1010 app:: { App , PreUpdate } ,
1111 asset:: { Asset , AssetEvent , AssetId , AssetLoader , AssetPath , Assets } ,
12- ecs :: system :: Resource ,
12+ prelude :: Resource ,
1313 log:: { debug, info, trace, warn} ,
1414 prelude:: {
15- Commands , Event , EventReader , EventWriter , IntoSystemConfigs , IntoSystemSetConfigs , Res ,
15+ Commands , Event , EventReader , EventWriter , Res ,
1616 ResMut ,
1717 } ,
1818 reflect:: TypePath ,
19- utils :: hashbrown :: HashMap ,
19+ platform :: collections :: HashMap ,
2020} ;
2121use std:: borrow:: Cow ;
22+ use bevy:: prelude:: IntoScheduleConfigs ;
2223
2324/// Represents a scripting language. Languages which compile into another language should use the target language as their language.
2425#[ derive( Debug , Clone , PartialEq , Eq , PartialOrd , Ord , Default ) ]
@@ -142,7 +143,7 @@ impl Default for ScriptAssetSettings {
142143 fn default ( ) -> Self {
143144 Self {
144145 script_id_mapper : AssetPathToScriptIdMapper {
145- map : ( |path : & AssetPath | path. path ( ) . to_string_lossy ( ) . into_owned ( ) . into ( ) ) ,
146+ map : |path : & AssetPath | path. path ( ) . to_string_lossy ( ) . into_owned ( ) . into ( ) ,
146147 } ,
147148 extension_to_language_map : HashMap :: from_iter ( vec ! [
148149 ( "lua" , Language :: Lua ) ,
@@ -231,7 +232,7 @@ pub(crate) fn dispatch_script_asset_events(
231232 language,
232233 } ;
233234 debug ! ( "Script loaded, populating metadata: {:?}:" , metadata) ;
234- script_asset_events. send ( ScriptAssetEvent :: Added ( metadata. clone ( ) ) ) ;
235+ script_asset_events. write ( ScriptAssetEvent :: Added ( metadata. clone ( ) ) ) ;
235236 metadata_store. insert ( * id, metadata) ;
236237 } else {
237238 warn ! ( "A script was added but it's asset was not found, failed to compute metadata. This script will not be loaded. Did you forget to store `Handle<ScriptAsset>` somewhere?. {}" , id) ;
@@ -241,15 +242,15 @@ pub(crate) fn dispatch_script_asset_events(
241242 AssetEvent :: Removed { id } => {
242243 if let Some ( metadata) = metadata_store. get ( * id) {
243244 debug ! ( "Script removed: {:?}" , metadata) ;
244- script_asset_events. send ( ScriptAssetEvent :: Removed ( metadata. clone ( ) ) ) ;
245+ script_asset_events. write ( ScriptAssetEvent :: Removed ( metadata. clone ( ) ) ) ;
245246 } else {
246247 warn ! ( "Script metadata not found for removed script asset: {}. Cannot properly clean up script" , id) ;
247248 }
248249 }
249250 AssetEvent :: Modified { id } => {
250251 if let Some ( metadata) = metadata_store. get ( * id) {
251252 debug ! ( "Script modified: {:?}" , metadata) ;
252- script_asset_events. send ( ScriptAssetEvent :: Modified ( metadata. clone ( ) ) ) ;
253+ script_asset_events. write ( ScriptAssetEvent :: Modified ( metadata. clone ( ) ) ) ;
253254 } else {
254255 warn ! ( "Script metadata not found for modified script asset: {}. Cannot properly update script" , id) ;
255256 }
@@ -572,9 +573,9 @@ mod tests {
572573 struct DummyPlugin ;
573574
574575 impl IntoScriptPluginParams for DummyPlugin {
575- type R = ( ) ;
576- type C = ( ) ;
577576 const LANGUAGE : Language = Language :: Lua ;
577+ type C = ( ) ;
578+ type R = ( ) ;
578579
579580 fn build_runtime ( ) -> Self :: R { }
580581 }
0 commit comments