further clean up

Author: makspll

crates/bevy_mod_scripting_core/src/event.rs

@@ -55,8 +55,8 @@ macro_rules! callback_labels {
 
         $(
             pub struct $name;
-            impl IntoCallbackLabel for $name {
-                fn into_callback_label() -> CallbackLabel {
+            impl $crate::event::IntoCallbackLabel for $name {
+                fn into_callback_label() -> $crate::event::CallbackLabel {
                     $label.into()
                 }
             }

crates/languages/bevy_mod_scripting_lua/tests/lua_tests.rs

@@ -16,11 +16,10 @@ use bevy_mod_scripting_core::{
 use bevy_mod_scripting_functions::ScriptFunctionsPlugin;
 use bevy_mod_scripting_lua::{
     bindings::{reference::LuaReflectReference, world::GetWorld},
-    lua_context_load, lua_handler,
-    prelude::{Lua, LuaFunction},
-    LuaScriptingPlugin,
+    lua_context_load, lua_handler, LuaScriptingPlugin,
 };
 use libtest_mimic::{Arguments, Failed, Trial};
+use mlua::{Function, Lua};
 use std::{
     fs::{self, DirEntry},
     io, panic,
@@ -88,7 +87,7 @@ fn init_lua_test_utils(_script_name: &str, lua: &mut Lua) -> Result<(), ScriptEr
         .unwrap();
 
     let assert_throws = lua
-        .create_function(|lua, (f, regex): (LuaFunction, String)| {
+        .create_function(|lua, (f, regex): (Function, String)| {
             let world = lua.get_world();
 
             let result = f.call::<()>(());

examples/lua/game_of_life.rs

@@ -1,10 +1,6 @@
 #![allow(deprecated)]
-use std::sync::{Arc, Mutex};
 
-use ansi_parser::AnsiParser;
-use asset::ScriptAsset;
 use bevy::{
-    diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
     image::ImageSampler,
     log::LogPlugin,
     prelude::*,
@@ -15,17 +11,14 @@ use bevy::{
     },
     window::{PrimaryWindow, WindowResized},
 };
-
-use bevy_console::{
-    make_layer, send_log_buffer_to_console, AddConsoleCommand, ConsoleCommand,
-    ConsoleConfiguration, ConsoleOpen, ConsolePlugin, PrintConsoleLine,
+use bevy_console::{make_layer, AddConsoleCommand, ConsoleCommand, ConsoleOpen, ConsolePlugin};
+use bevy_mod_scripting::{NamespaceBuilder, ScriptFunctionsPlugin};
+use bevy_mod_scripting_core::{
+    asset::ScriptAsset, bindings::script_value::ScriptValue, callback_labels,
+    event::ScriptCallbackEvent, script::ScriptComponent, systems::event_handler,
 };
-use bevy_mod_scripting::{prelude::*, NamespaceBuilder, ScriptFunctionsPlugin};
 use bevy_mod_scripting_lua::LuaScriptingPlugin;
-use bindings::script_value::ScriptValue;
 use clap::Parser;
-use commands::DeleteScript;
-use script::ScriptComponent;
 
 // CONSOLE SETUP