Move utils file

common/src/comp/states/basic_attack.rs

@@ -1,8 +1,8 @@
+use super::utils::*;
 use crate::comp::{
     ActionState::Attack, AttackKind::BasicAttack, EcsStateData, ItemKind::Tool, StateHandler,
     StateUpdate, ToolData,
 };
-use crate::util::state_utils::*;
 use std::time::Duration;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)]

common/src/comp/states/basic_block.rs

@@ -1,5 +1,5 @@
+use super::utils::*;
 use crate::comp::{EcsStateData, StateHandler, StateUpdate};
-use crate::util::state_utils::*;
 use std::time::Duration;
 use vek::Vec2;
 

common/src/comp/states/charge_attack.rs

@@ -1,9 +1,9 @@
+use super::utils::*;
 use crate::comp::{
     ActionState::Attack, AttackKind::Charge, EcsStateData, HealthChange, HealthSource,
     ItemKind::Tool, MoveState::Run, StateHandler, StateUpdate, ToolData,
 };
 use crate::event::ServerEvent;
-use crate::util::state_utils::*;
 use std::time::Duration;
 use vek::Vec3;
 

common/src/comp/states/fall.rs

@@ -1,6 +1,6 @@
 use crate::comp::{ActionState, EcsStateData, MoveState, StateHandler, StateUpdate};
 
-use crate::util::state_utils::*;
+use super::utils::*;
 use vek::{Vec2, Vec3};
 
 const HUMANOID_AIR_ACCEL: f32 = 10.0;

common/src/comp/states/mod.rs

@@ -12,6 +12,7 @@ pub mod run;
 pub mod sit;
 pub mod stand;
 pub mod swim;
+pub mod utils;
 pub mod wield;
 
 use super::{
@@ -31,7 +32,7 @@ use super::{
 ///
 /// ## Example Implementation:
 /// ```
-/// use crate::util::state_utils::*;
+/// use super::utils::*;
 ///
 /// #[derive(Clone, Copy, Default, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)]
 /// pub struct RunState {

common/src/comp/states/roll.rs

@@ -1,8 +1,8 @@
+use super::utils::*;
 use crate::comp::{
     ActionState::Dodge, DodgeKind::Roll, EcsStateData, ItemKind::Tool, StateHandler, StateUpdate,
     ToolData,
 };
-use crate::util::state_utils::*;
 use std::time::Duration;
 use vek::Vec3;
 

common/src/comp/states/run.rs

@@ -1,5 +1,5 @@
+use super::utils::*;
 use crate::comp::{ActionState, EcsStateData, MoveState, StateHandler, StateUpdate};
-use crate::util::state_utils::*;
 use vek::vec::{Vec2, Vec3};
 
 const HUMANOID_ACCEL: f32 = 50.0;

common/src/comp/states/sit.rs

@@ -1,5 +1,5 @@
+use super::utils::*;
 use crate::comp::{ActionState, EcsStateData, MoveState, StateHandler, StateUpdate};
-use crate::util::state_utils::*;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)]
 pub struct State;

common/src/comp/states/stand.rs

@@ -1,5 +1,5 @@
+use super::utils::*;
 use crate::comp::{EcsStateData, MoveState, StateHandler, StateUpdate};
-use crate::util::state_utils::*;
 
 #[derive(Clone, Copy, Default, Debug, PartialEq, Serialize, Deserialize, Eq, Hash)]
 pub struct State;

common/src/comp/states/utils.rs

@@ -62,7 +62,7 @@ pub fn determine_move_from_grounded_state(
 
 /// _Returns an ActionState based on whether character has a weapon equipped._
 pub fn attempt_wield(stats: &Stats) -> ActionState {
-    if let Some(Tool(data)) = stats.equipment.main.as_ref().map(|i| &i.kind) {
+    if let Some(Tool(_)) = stats.equipment.main.as_ref().map(|i| &i.kind) {
         Wield(None)
     } else {
         Idle(None)

common/src/util/mod.rs

@@ -7,8 +7,6 @@ lazy_static::lazy_static! {
 
 use vek::{Mat3, Rgb, Rgba, Vec3};
 
-pub mod state_utils;
-
 /// TODO: Move these to a named utils folder. Are they even being used? I couldnt find references.
 /// This is a fast approximation of powf. This should only be used when minor accuracy loss is acceptable.
 #[inline(always)]