M sdbclient/Cargo.toml => sdbclient/Cargo.toml +9 -4
@@ 12,19 12,24 @@ license = "GPL-3.0-only"
[dependencies]
bevy = { version = "0.9.1" }
-# 0.18.0 breaks inspector, but not a major issue right now
-bevy_egui = "0.17"
-bevy-inspector-egui = "0.14"
-bevy_console = "0.6.0"
+bevy-inspector-egui = "0.17.0"
+# NOTE: using own branch till pr goes through
+#bevy_console = "0.6.0"
+bevy_console = { git = "https://github.com/QuendirSkye/bevy-console", branch = "bump-bevy-egui" }
+
+# lua scripting
bevy_mod_scripting = { version = "0.2.1", features = ["lua", "lua54", "lua_script_api"] }
# http requests
reqwest = { version = "0.11.13", features = ["blocking", "json"] }
+# (de)serialization
serde = { version = "1.0.151", features = ["derive"] }
serde_json = "1.0.91"
+# futures for async
futures-lite = "1.12.0"
+# get dirs for saving data
directories = "4.0.1"
M sdbclient/src/main.rs => sdbclient/src/main.rs +2 -4
@@ 12,8 12,7 @@ use bevy::{
};
use bevy_console::{ConsoleConfiguration, ConsolePlugin, ToggleConsoleKey};
-use bevy_egui::EguiPlugin;
-use bevy_inspector_egui::WorldInspectorPlugin;
+use bevy_inspector_egui::quick::WorldInspectorPlugin;
use bevy_mod_scripting::prelude::*;
@@ 64,8 63,7 @@ fn main() {
..Default::default()
}));
- app.add_plugin(EguiPlugin);
- app.add_plugin(WorldInspectorPlugin::new());
+ app.add_plugin(WorldInspectorPlugin);
app.add_plugin(ConsolePlugin);
app.insert_resource(ConsoleConfiguration {
keys: vec![
M => +1 -1
@@ 7,7 7,7 @@
*/
use bevy::prelude::*;
use bevy_egui::{egui, EguiContext};
use bevy_inspector_egui::bevy_egui::{egui, EguiContext};
use crate::util::eguipwd;
M => +1 -1
@@ 7,7 7,7 @@
*/
use bevy::prelude::*;
use bevy_egui::{egui, EguiContext};
use bevy_inspector_egui::bevy_egui::{egui, EguiContext};
use crate::util::eguipwd;
M sdbclient/src/util/eguipwd.rs => sdbclient/src/util/eguipwd.rs +1 -1
@@ 6,7 6,7 @@
* See LICENSE for licensing information.
*/
-use bevy_egui::egui;
+use bevy_inspector_egui::bevy_egui::egui;
fn password_ui(ui: &mut egui::Ui, password: &mut String) -> egui::Response {
let state_id = ui.id().with("show_plaintext");