crates/border-wars/src/lib.rs

@@ -2,11 +2,11 @@
 
 use bevy::prelude::*;
 
-pub mod menus;
+pub mod scenes;
 
-/// The state of the game.
+/// The current scene of the game.
 #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
-pub enum GameState {
+pub enum CurrentScene {
     /// When we are in the main menu.
     #[default]
     Menu,

crates/border-wars/src/main.rs

@@ -1,13 +1,11 @@
 //! The main entry point of the game.
 
 use bevy::prelude::*;
-use border_wars::menus::MenusPlugin;
-use border_wars::GameState;
+use border_wars::scenes::ScenesPlugin;
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_state::<GameState>()
-        .add_plugins(MenusPlugin)
+        .add_plugins(ScenesPlugin)
         .run();
 }

crates/border-wars/src/menus/mod.rs

@@ -1,20 +0,0 @@
-//! The file containing all menu programs.
-
-use bevy::prelude::*;
-use bevy_egui::EguiPlugin;
-
-use self::lobby::LobbyPlugin;
-
-pub mod lobby;
-pub mod menu;
-
-/// The plugin for all menus.
-pub struct MenusPlugin;
-
-impl Plugin for MenusPlugin {
-    fn build(&self, app: &mut App) {
-        app.add_plugins(EguiPlugin)
-            .add_plugins(menu::MenuPlugin)
-            .add_plugins(LobbyPlugin);
-    }
-}

crates/border-wars/src/scenes/lobby.rs

@@ -3,22 +3,19 @@
 use bevy::prelude::*;
 use bevy_egui::{egui, EguiContexts};
 
-use crate::GameState;
+use crate::CurrentScene;
 
 /// The plugin for the lobby.
 pub struct LobbyPlugin;
 
 impl Plugin for LobbyPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(
-            Update,
-            lobby_ui.run_if(state_exists_and_equals(GameState::Lobby)),
-        );
+        app.add_systems(Update, lobby_ui.run_if(in_state(CurrentScene::Lobby)));
     }
 }
 
 /// Display the UI of the menu to host a game or join one.
-fn lobby_ui(mut ctx: EguiContexts, mut next_state: ResMut<NextState<GameState>>) {
+fn lobby_ui(mut ctx: EguiContexts, mut next_scene: ResMut<NextState<CurrentScene>>) {
     egui::CentralPanel::default().show(ctx.ctx_mut(), |ui| {
         ui.heading("Border Wars");
 
@@ -33,7 +30,7 @@ fn lobby_ui(mut ctx: EguiContexts, mut next_state: ResMut<NextState<GameState>>)
         ui.separator();
 
         if ui.button("Run the game").clicked() {
-            next_state.set(GameState::Game);
+            next_scene.set(CurrentScene::Game);
             // TODO: run the game
         }
     });

crates/border-wars/src/scenes/menu.rs

@@ -3,24 +3,21 @@
 use bevy::prelude::*;
 use bevy_egui::{egui, EguiContexts};
 
-use crate::GameState;
+use crate::CurrentScene;
 
 /// The plugin for the menu.
 pub struct MenuPlugin;
 
 impl Plugin for MenuPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(
-            Update,
-            menu_ui.run_if(state_exists_and_equals(GameState::Menu)),
-        );
+        app.add_systems(Update, menu_ui.run_if(in_state(CurrentScene::Menu)));
     }
 }
 /// Display the UI of the menu to host a game or join one.
 fn menu_ui(
     mut ctx: EguiContexts,
     mut connection_string: Local<String>,
-    mut next_state: ResMut<NextState<GameState>>,
+    mut next_scene: ResMut<NextState<CurrentScene>>,
 ) {
     egui::CentralPanel::default().show(ctx.ctx_mut(), |ui| {
         ui.heading("Border Wars");
@@ -33,7 +30,7 @@ fn menu_ui(
             ui.text_edit_singleline(&mut *connection_string);
 
             if ui.button("Join").clicked() {
-                next_state.set(GameState::Game);
+                next_scene.set(CurrentScene::Game);
                 // TODO: connect to the game
             }
         });
@@ -41,7 +38,7 @@ fn menu_ui(
         ui.separator();
 
         if ui.button("Create new game").clicked() {
-            next_state.set(GameState::Lobby);
+            next_scene.set(CurrentScene::Lobby);
             // TODO: create a new game
         }
     });

crates/border-wars/src/scenes/mod.rs

@@ -0,0 +1,21 @@
+//! The file containing all scenes programs.
+
+use bevy::prelude::*;
+use bevy_egui::EguiPlugin;
+
+use crate::CurrentScene;
+
+pub mod lobby;
+pub mod menu;
+
+/// The plugin for all scenes.
+pub struct ScenesPlugin;
+
+impl Plugin for ScenesPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_plugins(EguiPlugin)
+            .add_state::<CurrentScene>()
+            .add_plugins(menu::MenuPlugin)
+            .add_plugins(lobby::LobbyPlugin);
+    }
+}