From 077d168655ca7ca198d7c6b3e03864107d97e582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80lex=20Rom=C3=A0n?= <eirexe123@gmail.com>
Date: Sat, 29 Aug 2026 17:49:38 +0200
Subject: [PATCH] Cleanup

---
 src/fighter/debug.rs           | 4 +---
 src/fighter/mod.rs             | 2 +-
 src/fighter/state/air_dodge.rs | 8 ++------
 src/fighter/state/dash.rs      | 1 -
 src/fighter/state/jump.rs      | 1 -
 src/fighter/state/land.rs      | 2 --
 src/fighter/state/mod.rs       | 2 +-
 src/fighter/state/run.rs       | 1 -
 src/fighter/state/turn.rs      | 4 +---
 src/fighter/state/wait.rs      | 8 +++-----
 src/fighter/state/walk.rs      | 1 -
 src/input/debug.rs             | 4 ++--
 src/input/gamepad.rs           | 2 +-
 src/lib.rs                     | 2 +-
 src/match_loading.rs           | 2 +-
 src/stage/manifest.rs          | 2 +-
 src/stage/scene.rs             | 7 +------
 17 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/src/fighter/debug.rs b/src/fighter/debug.rs
index c2cdda8..1445ef0 100644
--- a/src/fighter/debug.rs
+++ b/src/fighter/debug.rs
@@ -7,15 +7,13 @@ use bevy_egui::{EguiContexts, egui};
 use crate::fighter::animation::FighterAnimationFrame;
 use crate::fighter::baked_animation::BakedFighterAnimations;
 use crate::fighter::ecb::FighterPreviousECB;
-use crate::fighter::manifest::{FighterManifest, FighterManifestRegistry};
 use crate::fighter::state::StateNameDebug;
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
-    Fighter, FighterECB, FighterFacingDirection, FighterPreviousTranslation, FighterTranslation,
+    FighterECB, FighterPreviousTranslation, FighterTranslation,
     FighterVelocity,
 };
 use crate::input::FighterInput;
-use crate::match_loading::MatchPlayer;
 
 pub fn debug_draw_ecb(
     ecbs: Query<(
diff --git a/src/fighter/mod.rs b/src/fighter/mod.rs
index 8539c56..6239499 100644
--- a/src/fighter/mod.rs
+++ b/src/fighter/mod.rs
@@ -171,7 +171,7 @@ pub fn spawn_fighter(
     player_handle: usize,
     spawn_position: FGVec2,
     manifest: (Handle<FighterManifest>, &FighterManifest),
-    attributes: FighterAttributes,
+    _attributes: FighterAttributes,
     animations: FighterAnimations,
     visual_root: WorldAssetRoot,
 ) {
diff --git a/src/fighter/state/air_dodge.rs b/src/fighter/state/air_dodge.rs
index d4f5073..cf1f6e4 100644
--- a/src/fighter/state/air_dodge.rs
+++ b/src/fighter/state/air_dodge.rs
@@ -1,18 +1,14 @@
-use std::time::Duration;
 
-use bevy::prelude::*;
 
 use crate::{
     fighter::{
         animation::AnimKind,
         collision,
         state::{
-            FighterState, FighterStateContext, FighterStateImpl, air, dash,
+            FighterState, FighterStateContext, FighterStateImpl, air,
             fall::FallState,
-            ground::{self, GroundedMotionResult, GroundedStateCommon},
+            ground::GroundedStateCommon,
             land::LandingState,
-            wait::WaitState,
-            walk,
         },
     },
     input,
diff --git a/src/fighter/state/dash.rs b/src/fighter/state/dash.rs
index c95f89f..b8bec3d 100644
--- a/src/fighter/state/dash.rs
+++ b/src/fighter/state/dash.rs
@@ -1,5 +1,4 @@
 use std::hash::{Hash, Hasher};
-use std::time::Duration;
 
 use bevy::prelude::*;
 
diff --git a/src/fighter/state/jump.rs b/src/fighter/state/jump.rs
index 49fa736..39a48b7 100644
--- a/src/fighter/state/jump.rs
+++ b/src/fighter/state/jump.rs
@@ -1,4 +1,3 @@
-use std::time::Duration;
 
 use bevy::prelude::*;
 
diff --git a/src/fighter/state/land.rs b/src/fighter/state/land.rs
index dbc98df..b39fb05 100644
--- a/src/fighter/state/land.rs
+++ b/src/fighter/state/land.rs
@@ -1,4 +1,3 @@
-use std::time::Duration;
 
 use bevy::prelude::*;
 
@@ -11,7 +10,6 @@ use crate::fighter::{
             self, GroundedMotionResult, GroundedStateCommon,
             grounded_movement_standstill_common_interrupts,
         },
-        wait::WaitState,
         walk,
     },
 };
diff --git a/src/fighter/state/mod.rs b/src/fighter/state/mod.rs
index 32ff01d..f146689 100644
--- a/src/fighter/state/mod.rs
+++ b/src/fighter/state/mod.rs
@@ -11,7 +11,7 @@ use crate::fighter::ecb::FighterPreviousECB;
 use crate::fighter::manifest::FighterManifest;
 use crate::fighter::visual::FighterAnimations;
 use crate::fighter::{
-    Fighter, FighterAttributes, FighterECB, FighterFacingDirection, FighterPreviousTranslation,
+    Fighter, FighterECB, FighterFacingDirection, FighterPreviousTranslation,
     FighterTranslation, FighterVelocity,
 };
 use crate::game_settings::GameSettings;
diff --git a/src/fighter/state/run.rs b/src/fighter/state/run.rs
index 629b5a5..2ac75e7 100644
--- a/src/fighter/state/run.rs
+++ b/src/fighter/state/run.rs
@@ -1,4 +1,3 @@
-use std::time::Duration;
 
 use bevy::prelude::*;
 
diff --git a/src/fighter/state/turn.rs b/src/fighter/state/turn.rs
index bc4a83d..1a3fe66 100644
--- a/src/fighter/state/turn.rs
+++ b/src/fighter/state/turn.rs
@@ -1,10 +1,8 @@
 use super::{FighterStateContext, FighterStateImpl};
 use crate::fighter::animation::AnimKind;
-use crate::fighter::collision;
 use crate::fighter::state::fall::FallState;
 use crate::fighter::state::ground::{self, GroundedMotionResult, GroundedStateCommon};
-use crate::fighter::state::land::LandingState;
-use crate::fighter::state::{air, dash, jump, wait, walk, FighterState};
+use crate::fighter::state::{dash, jump, wait, walk, FighterState};
 
 #[derive(Debug, Clone, Hash)]
 pub struct TurnState {
diff --git a/src/fighter/state/wait.rs b/src/fighter/state/wait.rs
index c0c9cec..3b97de4 100644
--- a/src/fighter/state/wait.rs
+++ b/src/fighter/state/wait.rs
@@ -1,14 +1,12 @@
-use std::time::Duration;
 
-use bevy::prelude::*;
 
-use super::{FighterStateContext, FighterStateImpl, ground, walk};
+use super::{FighterStateContext, FighterStateImpl, ground};
 use crate::fighter::animation::AnimKind;
 use crate::fighter::state::fall::FallState;
 use crate::fighter::state::ground::{
-    GroundedMotionResult, GroundedStateCommon, grounded_movement_common_interrupts,
+    GroundedMotionResult, GroundedStateCommon,
 };
-use crate::fighter::state::{FighterState, dash, turn};
+use crate::fighter::state::FighterState;
 
 #[derive(Debug, Clone, Hash)]
 pub struct WaitState {
diff --git a/src/fighter/state/walk.rs b/src/fighter/state/walk.rs
index 970859d..4e84fca 100644
--- a/src/fighter/state/walk.rs
+++ b/src/fighter/state/walk.rs
@@ -1,4 +1,3 @@
-use std::time::Duration;
 
 use bevy::prelude::*;
 
diff --git a/src/input/debug.rs b/src/input/debug.rs
index 1bd8843..4ee399b 100644
--- a/src/input/debug.rs
+++ b/src/input/debug.rs
@@ -1,9 +1,9 @@
-use bevy_egui::{egui::Color32, prelude::*};
+use bevy_egui::prelude::*;
 
 use crate::input::FighterInput;
 use bevy::prelude::*;
 
-pub fn input_debug(mut contexts: EguiContexts, query: Query<(&FighterInput)>) -> Result {
+pub fn input_debug(mut contexts: EguiContexts, query: Query<&FighterInput>) -> Result {
     for (i, input) in query.iter().enumerate() {
         const STICK_SIZE: f32 = 50.0;
         const STICK_SIZE_FRACTION: f32 = 0.75;
diff --git a/src/input/gamepad.rs b/src/input/gamepad.rs
index 35a147f..8a017ec 100644
--- a/src/input/gamepad.rs
+++ b/src/input/gamepad.rs
@@ -8,7 +8,7 @@ use crate::input::{BaseInputMap, FighterInputFrame, InputMapAction};
 use crate::math::int::FGi32;
 use crate::math::vec::FGVec2;
 
-pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap, game_settings: &GameSettings) -> FighterInputFrame {
+pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap, _game_settings: &GameSettings) -> FighterInputFrame {
     let mut input_frame = FighterInputFrame::default();
     let mut movement = Vec2::ZERO;
 
diff --git a/src/lib.rs b/src/lib.rs
index 4e165d8..0b2614f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -28,7 +28,7 @@ use clap::Parser;
 use jackdaw_runtime::EditorCategory;
 
 use crate::{
-    camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::{StageManifest, StageManifestAssets},
+    camera::MatchCameraPlugin, fighter::manifest::FighterManifest, game_settings::GameSettings, schedule::GameplaySchedulePlugin, stage::manifest::StageManifest,
 };
 
 mod args;
diff --git a/src/match_loading.rs b/src/match_loading.rs
index 49ca5c4..bb4216a 100644
--- a/src/match_loading.rs
+++ b/src/match_loading.rs
@@ -286,7 +286,7 @@ pub fn prepare_match(
 
     for (
         index,
-        (player, (scene, animations, attributes, camera_profile, manifest, manifest_handle)),
+        (player, (scene, animations, attributes, _camera_profile, manifest, manifest_handle)),
     ) in request.players.iter().zip(prepared).enumerate()
     {
         let spawn_x = (index as i32 * 2 + 1 - request.players.len() as i32) * 5;
diff --git a/src/stage/manifest.rs b/src/stage/manifest.rs
index 99d4908..ca9ea7c 100644
--- a/src/stage/manifest.rs
+++ b/src/stage/manifest.rs
@@ -8,7 +8,7 @@ use strum_macros::EnumIter;
 use crate::{
     AppState,
     game_settings::GameSettings,
-    math::{int::FGi32, vec::FGVec2},
+    math::vec::FGVec2,
     stage::{
         StagePoly,
         line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
diff --git a/src/stage/scene.rs b/src/stage/scene.rs
index 67088be..ffba321 100644
--- a/src/stage/scene.rs
+++ b/src/stage/scene.rs
@@ -3,14 +3,9 @@
 use std::f32::consts::PI;
 
 use bevy::prelude::*;
-use serde::{Deserialize, Serialize};
 
 use crate::{
-    camera::MatchCamera,
-    math::{int::FGi32, vec::FGVec2}, stage::{
-        StagePoly,
-        line::{StageCollision, StagePolyLineSegmentType, StagePolyType},
-    },
+    camera::MatchCamera, stage::line::StageCollision,
 };
 
 pub fn spawn_stage_support(