cleanup imports

src/collision.rs

@@ -1,10 +1,6 @@
 use crate::{
-    droid::DroidOverloadMarker,
-    particle::ColorGenerator,
-    player::{PlayerMarker, PlayerState},
-    prelude::*,
-    ship::ShipMarker,
-    weapon::Projectile,
+    droid::DroidOverloadMarker, particle::ColorGenerator, player::PlayerMarker, prelude::*,
+    ship::ShipMarker, weapon::Projectile,
 };
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;

src/game.rs

@@ -4,11 +4,10 @@ use hexagon_tiles::hexagon::Hex;
 
 use crate::{
     droid::{ai::new_shooting_droid_ai, AiDroidBundle, DroidBundle},
-    player::{PlayerMarker, PlayerState},
+    player::PlayerMarker,
     portal::Portal,
     prelude::*,
     ship::{ShipBundle, SHIP_VERTICES},
-    state::GameState,
 };
 
 #[derive(Resource)]

src/input.rs

@@ -1,7 +1,6 @@
 use crate::{
     droid::{AttackRequest, TargetDirection},
     hexton::HextonInput,
-    player::PlayerState,
     portal::PortalToggleRequest,
     prelude::*,
     ship::ShipInput,

src/lib.rs

@@ -14,12 +14,11 @@ use hexagon_tiles::{
     point::Point,
 };
 use menu::MenuState;
-use state::GameState;
 
 use crate::{
     debug_ui::DebugUiPlugin, game::GamePlugin, hexton::HextonPlugin, menu::MenuPlugin,
-    particle::ParticlePlugin, player::PlayerPlugin, portal::PortalPlugin, ship::ShipPlugin,
-    state::StatePlugin, weapon::WeaponPlugin,
+    particle::ParticlePlugin, player::PlayerPlugin, portal::PortalPlugin, prelude::*,
+    ship::ShipPlugin, state::StatePlugin, weapon::WeaponPlugin,
 };
 
 pub mod collision;
@@ -290,6 +289,7 @@ pub mod prelude {
     pub use crate::collision::CollisionFxType;
     pub use crate::colors::*;
     pub use crate::particle::{ParticleDirection, ParticleSource};
+    pub use crate::player::PlayerState;
     pub use crate::state::{GameDespawn, GameState};
     pub use crate::tiles::{TileCache, TilePos, TileType, TilesState};
     pub use crate::tunables::default_stroke;

src/menu.rs

@@ -1,9 +1,6 @@
 use bevy::{app::AppExit, prelude::*};
 
-use crate::{
-    game::GameSpawnInfo,
-    state::{AutoStart, GameState},
-};
+use crate::{game::GameSpawnInfo, prelude::*, state::AutoStart};
 // Tag component used to tag entities added on the main menu screen
 #[derive(Component)]
 struct OnMainMenuScreen;

src/particle.rs

@@ -1,6 +1,6 @@
 use std::f32::consts::TAU;
 
-use crate::{prelude::*, state::GameState};
+use crate::prelude::*;
 use bevy::{
     diagnostic::{Diagnostic, DiagnosticId, Diagnostics, RegisterDiagnostic},
     prelude::*,