From db6de810ff1eccf9923febdcbdefb1a416407f94 Mon Sep 17 00:00:00 2001
From: Jonni Liljamo <jonni@liljamo.com>
Date: Tue, 20 Dec 2022 11:54:19 +0200
Subject: [PATCH] Move menu to plugins mod

---
 sdbclient/src/main.rs                                      | 3 +--
 sdbclient/src/{ => plugins}/menu/accountloginui.rs         | 0
 sdbclient/src/{ => plugins}/menu/accountregisterui.rs      | 0
 sdbclient/src/{ => plugins}/menu/accountscreenloggedin.rs  | 0
 sdbclient/src/{ => plugins}/menu/accountscreenloggedout.rs | 0
 sdbclient/src/{ => plugins}/menu/mainmenuscreen.rs         | 0
 sdbclient/src/{ => plugins}/menu/mod.rs                    | 2 +-
 sdbclient/src/{ => plugins}/menu/settingsaudioscreen.rs    | 0
 sdbclient/src/{ => plugins}/menu/settingsdisplayscreen.rs  | 0
 sdbclient/src/{ => plugins}/menu/settingsmenuscreen.rs     | 0
 sdbclient/src/{ => plugins}/menu/settingsmiscscreen.rs     | 0
 sdbclient/src/plugins/mod.rs                               | 1 +
 12 files changed, 3 insertions(+), 3 deletions(-)
 rename sdbclient/src/{ => plugins}/menu/accountloginui.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/accountregisterui.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/accountscreenloggedin.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/accountscreenloggedout.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/mainmenuscreen.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/mod.rs (99%)
 rename sdbclient/src/{ => plugins}/menu/settingsaudioscreen.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/settingsdisplayscreen.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/settingsmenuscreen.rs (100%)
 rename sdbclient/src/{ => plugins}/menu/settingsmiscscreen.rs (100%)

diff --git a/sdbclient/src/main.rs b/sdbclient/src/main.rs
index 534f180..aa72c13 100644
--- a/sdbclient/src/main.rs
+++ b/sdbclient/src/main.rs
@@ -15,7 +15,6 @@ use bevy_egui::EguiPlugin;
 use bevy_inspector_egui::WorldInspectorPlugin;
 
 mod cfg;
-mod menu;
 mod plugins;
 mod util;
 
@@ -92,7 +91,7 @@ fn main() {
     app.add_startup_system(setup).add_state(GameState::Splash);
 
     app.add_plugin(plugins::splash::SplashPlugin)
-        .add_plugin(menu::MenuPlugin);
+        .add_plugin(plugins::menu::MenuPlugin);
 
     app.run();
 }
diff --git a/sdbclient/src/menu/accountloginui.rs b/sdbclient/src/plugins/menu/accountloginui.rs
similarity index 100%
rename from sdbclient/src/menu/accountloginui.rs
rename to sdbclient/src/plugins/menu/accountloginui.rs
diff --git a/sdbclient/src/menu/accountregisterui.rs b/sdbclient/src/plugins/menu/accountregisterui.rs
similarity index 100%
rename from sdbclient/src/menu/accountregisterui.rs
rename to sdbclient/src/plugins/menu/accountregisterui.rs
diff --git a/sdbclient/src/menu/accountscreenloggedin.rs b/sdbclient/src/plugins/menu/accountscreenloggedin.rs
similarity index 100%
rename from sdbclient/src/menu/accountscreenloggedin.rs
rename to sdbclient/src/plugins/menu/accountscreenloggedin.rs
diff --git a/sdbclient/src/menu/accountscreenloggedout.rs b/sdbclient/src/plugins/menu/accountscreenloggedout.rs
similarity index 100%
rename from sdbclient/src/menu/accountscreenloggedout.rs
rename to sdbclient/src/plugins/menu/accountscreenloggedout.rs
diff --git a/sdbclient/src/menu/mainmenuscreen.rs b/sdbclient/src/plugins/menu/mainmenuscreen.rs
similarity index 100%
rename from sdbclient/src/menu/mainmenuscreen.rs
rename to sdbclient/src/plugins/menu/mainmenuscreen.rs
diff --git a/sdbclient/src/menu/mod.rs b/sdbclient/src/plugins/menu/mod.rs
similarity index 99%
rename from sdbclient/src/menu/mod.rs
rename to sdbclient/src/plugins/menu/mod.rs
index 67ea7ef..071bdd3 100644
--- a/sdbclient/src/menu/mod.rs
+++ b/sdbclient/src/plugins/menu/mod.rs
@@ -10,7 +10,7 @@ use bevy::{app::AppExit, prelude::*};
 
 use crate::cfg::CfgUser;
 
-use super::{despawn_screen, GameState};
+use crate::{despawn_screen, GameState};
 
 mod mainmenuscreen;
 use mainmenuscreen::*;
diff --git a/sdbclient/src/menu/settingsaudioscreen.rs b/sdbclient/src/plugins/menu/settingsaudioscreen.rs
similarity index 100%
rename from sdbclient/src/menu/settingsaudioscreen.rs
rename to sdbclient/src/plugins/menu/settingsaudioscreen.rs
diff --git a/sdbclient/src/menu/settingsdisplayscreen.rs b/sdbclient/src/plugins/menu/settingsdisplayscreen.rs
similarity index 100%
rename from sdbclient/src/menu/settingsdisplayscreen.rs
rename to sdbclient/src/plugins/menu/settingsdisplayscreen.rs
diff --git a/sdbclient/src/menu/settingsmenuscreen.rs b/sdbclient/src/plugins/menu/settingsmenuscreen.rs
similarity index 100%
rename from sdbclient/src/menu/settingsmenuscreen.rs
rename to sdbclient/src/plugins/menu/settingsmenuscreen.rs
diff --git a/sdbclient/src/menu/settingsmiscscreen.rs b/sdbclient/src/plugins/menu/settingsmiscscreen.rs
similarity index 100%
rename from sdbclient/src/menu/settingsmiscscreen.rs
rename to sdbclient/src/plugins/menu/settingsmiscscreen.rs
diff --git a/sdbclient/src/plugins/mod.rs b/sdbclient/src/plugins/mod.rs
index b8fb186..ca72e9f 100644
--- a/sdbclient/src/plugins/mod.rs
+++ b/sdbclient/src/plugins/mod.rs
@@ -6,4 +6,5 @@
  * See LICENSE for licensing information.
  */
 
+pub mod menu;
 pub mod splash;
-- 
2.44.1