From b5f20db9ab6dae34f8748052219a7314d3e295f7 Mon Sep 17 00:00:00 2001 From: Jonni Liljamo Date: Tue, 10 Jan 2023 13:48:07 +0200 Subject: [PATCH] fix(sdbclient): remove lua things from playscreen --- sdbclient/assets/scripts/ui_play.lua | 2 -- sdbclient/src/lua/mod.rs | 2 +- sdbclient/src/plugins/menu/playscreen.rs | 15 +-------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/sdbclient/assets/scripts/ui_play.lua b/sdbclient/assets/scripts/ui_play.lua index 7069489..40453a4 100644 --- a/sdbclient/assets/scripts/ui_play.lua +++ b/sdbclient/assets/scripts/ui_play.lua @@ -9,6 +9,4 @@ function on_start() print_to_console("hello from lua") print("hello from lua") - - print(world) end diff --git a/sdbclient/src/lua/mod.rs b/sdbclient/src/lua/mod.rs index 7d80291..6dcb35d 100644 --- a/sdbclient/src/lua/mod.rs +++ b/sdbclient/src/lua/mod.rs @@ -18,8 +18,8 @@ pub struct LuaPlugin; impl Plugin for LuaPlugin { fn build(&self, app: &mut App) { app.add_startup_system(load_scripts) - .add_script_handler_stage::, _, 0, 30>(CoreStage::PostUpdate) .add_script_host::, _>(CoreStage::PostUpdate) + .add_script_handler_stage::, _, 0, 0>(CoreStage::PostUpdate) .add_api_provider::>(Box::new(LuaAPIProvider)) .add_api_provider::>(Box::new(LuaBevyAPIProvider)); } diff --git a/sdbclient/src/plugins/menu/playscreen.rs b/sdbclient/src/plugins/menu/playscreen.rs index 52a639c..8150421 100644 --- a/sdbclient/src/plugins/menu/playscreen.rs +++ b/sdbclient/src/plugins/menu/playscreen.rs @@ -10,7 +10,6 @@ use bevy::{ prelude::*, ui::{JustifyContent, Size, Style, Val}, }; -use bevy_mod_scripting::prelude::*; use crate::constants::TEXT_COLOR; @@ -20,19 +19,7 @@ use super::{MenuButtonAction, NORMAL_BUTTON}; #[derive(Component)] pub struct OnPlayScreen; -pub fn play_setup( - mut commands: Commands, - asset_server: Res, - mut lua_writer: PriorityEventWriter>, -) { - let event = LuaEvent { - hook_name: "on_start".to_string(), - args: (), - recipients: Recipients::All, - }; - - lua_writer.send(event, 0); - +pub fn play_setup(mut commands: Commands, asset_server: Res) { let font = asset_server.load("fonts/FiraMono-Regular.ttf"); let button_style = Style { -- 2.44.1