mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-06 11:15:46 -06:00
chore: remove wildcard/prelude imports, remove unused functions
This commit is contained in:
@@ -24,8 +24,7 @@ use crate::systems::{
|
|||||||
use crate::texture::animated::AnimatedTexture;
|
use crate::texture::animated::AnimatedTexture;
|
||||||
use bevy_ecs::event::EventRegistry;
|
use bevy_ecs::event::EventRegistry;
|
||||||
use bevy_ecs::observer::Trigger;
|
use bevy_ecs::observer::Trigger;
|
||||||
use bevy_ecs::prelude::SystemSet;
|
use bevy_ecs::schedule::{IntoScheduleConfigs, Schedule, SystemSet};
|
||||||
use bevy_ecs::schedule::{IntoScheduleConfigs, Schedule};
|
|
||||||
use bevy_ecs::system::{NonSendMut, Res, ResMut};
|
use bevy_ecs::system::{NonSendMut, Res, ResMut};
|
||||||
use bevy_ecs::world::World;
|
use bevy_ecs::world::World;
|
||||||
use sdl2::image::LoadTexture;
|
use sdl2::image::LoadTexture;
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ use std::cmp::Ordering;
|
|||||||
use crate::constants::BOARD_PIXEL_OFFSET;
|
use crate::constants::BOARD_PIXEL_OFFSET;
|
||||||
use crate::map::builder::Map;
|
use crate::map::builder::Map;
|
||||||
use crate::systems::{BackbufferResource, Collider, CursorPosition, Position, SystemTimings};
|
use crate::systems::{BackbufferResource, Collider, CursorPosition, Position, SystemTimings};
|
||||||
use bevy_ecs::prelude::*;
|
use bevy_ecs::resource::Resource;
|
||||||
|
use bevy_ecs::system::{NonSendMut, Query, Res};
|
||||||
use glam::{IVec2, UVec2, Vec2};
|
use glam::{IVec2, UVec2, Vec2};
|
||||||
use sdl2::pixels::Color;
|
use sdl2::pixels::Color;
|
||||||
use sdl2::rect::{Point, Rect};
|
use sdl2::rect::{Point, Rect};
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
use bevy_ecs::{event::EventReader, prelude::*, query::With, system::Query};
|
use bevy_ecs::{
|
||||||
|
entity::Entity,
|
||||||
|
event::{EventReader, EventWriter},
|
||||||
|
query::With,
|
||||||
|
system::{Commands, Query, Res, ResMut},
|
||||||
|
};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
events::GameEvent,
|
events::GameEvent,
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
use bevy_ecs::{
|
use bevy_ecs::{
|
||||||
component::Component,
|
component::Component,
|
||||||
event::{EventReader, EventWriter},
|
event::{EventReader, EventWriter},
|
||||||
prelude::ResMut,
|
|
||||||
query::With,
|
query::With,
|
||||||
system::{Query, Res},
|
system::{Query, Res, ResMut},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use bevy_ecs::prelude::Resource;
|
use bevy_ecs::system::IntoSystem;
|
||||||
use bevy_ecs::system::{IntoSystem, System};
|
use bevy_ecs::{resource::Resource, system::System};
|
||||||
use circular_buffer::CircularBuffer;
|
use circular_buffer::CircularBuffer;
|
||||||
use micromap::Map;
|
use micromap::Map;
|
||||||
use parking_lot::{Mutex, RwLock};
|
use parking_lot::{Mutex, RwLock};
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ use crate::texture::sprite::SpriteAtlas;
|
|||||||
use crate::texture::text::TextTexture;
|
use crate::texture::text::TextTexture;
|
||||||
use bevy_ecs::entity::Entity;
|
use bevy_ecs::entity::Entity;
|
||||||
use bevy_ecs::event::EventWriter;
|
use bevy_ecs::event::EventWriter;
|
||||||
use bevy_ecs::prelude::{Changed, Or, RemovedComponents, With, Without};
|
use bevy_ecs::query::{Changed, Or, With, Without};
|
||||||
|
use bevy_ecs::removal_detection::RemovedComponents;
|
||||||
use bevy_ecs::resource::Resource;
|
use bevy_ecs::resource::Resource;
|
||||||
use bevy_ecs::system::{NonSendMut, Query, Res, ResMut};
|
use bevy_ecs::system::{NonSendMut, Query, Res, ResMut};
|
||||||
use sdl2::pixels::Color;
|
use sdl2::pixels::Color;
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
use bevy_ecs::{
|
use bevy_ecs::{
|
||||||
prelude::{Commands, Entity, Query, With},
|
entity::Entity,
|
||||||
|
query::With,
|
||||||
resource::Resource,
|
resource::Resource,
|
||||||
system::ResMut,
|
system::{Commands, Query, ResMut},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::systems::{Frozen, GhostCollider, PlayerControlled};
|
use crate::systems::{Frozen, GhostCollider, PlayerControlled};
|
||||||
@@ -36,16 +37,6 @@ impl StartupSequence {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns true if the timer is still active (not in GameActive state)
|
|
||||||
pub fn is_active(&self) -> bool {
|
|
||||||
!matches!(self, StartupSequence::GameActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns true if we're in the game active stage
|
|
||||||
pub fn is_game_active(&self) -> bool {
|
|
||||||
matches!(self, StartupSequence::GameActive)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Ticks the timer by one frame, returning transition information if state changes
|
/// Ticks the timer by one frame, returning transition information if state changes
|
||||||
pub fn tick(&mut self) -> Option<(StartupSequence, StartupSequence)> {
|
pub fn tick(&mut self) -> Option<(StartupSequence, StartupSequence)> {
|
||||||
match self {
|
match self {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use bevy_ecs::{event::Events, prelude::*, system::RunSystemOnce, world::World};
|
use bevy_ecs::{entity::Entity, event::Events, system::RunSystemOnce, world::World};
|
||||||
|
|
||||||
use pacman::{
|
use pacman::{
|
||||||
error::GameError,
|
error::GameError,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use bevy_ecs::{event::Events, prelude::*, system::RunSystemOnce, world::World};
|
use bevy_ecs::{entity::Entity, event::Events, system::RunSystemOnce, world::World};
|
||||||
|
|
||||||
use pacman::{
|
use pacman::{
|
||||||
events::GameEvent,
|
events::GameEvent,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use bevy_ecs::{event::Events, prelude::*, system::RunSystemOnce, world::World};
|
use bevy_ecs::{entity::Entity, event::Events, system::RunSystemOnce, world::World};
|
||||||
|
|
||||||
use pacman::{
|
use pacman::{
|
||||||
events::{GameCommand, GameEvent},
|
events::{GameCommand, GameEvent},
|
||||||
|
|||||||
Reference in New Issue
Block a user