move glam dep to protocol crate

7 files changed, 13 insertions, 13 deletions

diff --git a/server/src/customer/mod.rs b/server/src/customer/mod.rs
index c11a1aec..10788206 100644
--- a/server/src/customer/mod.rs
+++ b/server/src/customer/mod.rs
@@ -21,8 +21,7 @@ mod pathfinding;
 use crate::{data::Gamedata, game::Tile};
 use anyhow::{anyhow, Result};
 use fake::{faker, Fake};
-use glam::IVec2;
-use hurrycurry_protocol::{DemandIndex, Message, PacketS, PlayerID};
+use hurrycurry_protocol::{glam::IVec2, DemandIndex, Message, PacketS, PlayerID};
 use log::debug;
 use movement::MovementBase;
 use pathfinding::{find_path, Path};
diff --git a/server/src/customer/movement.rs b/server/src/customer/movement.rs
index 4da76de7..34ed5b16 100644
--- a/server/src/customer/movement.rs
+++ b/server/src/customer/movement.rs
@@ -16,8 +16,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 */
-use glam::{IVec2, Vec2};
-use hurrycurry_protocol::PacketS;
+use hurrycurry_protocol::{glam::{IVec2, Vec2}, PacketS};
 use std::collections::HashSet;
 
 const PLAYER_SIZE: f32 = 0.4;
diff --git a/server/src/customer/pathfinding.rs b/server/src/customer/pathfinding.rs
index a2623e5c..29ee4e00 100644
--- a/server/src/customer/pathfinding.rs
+++ b/server/src/customer/pathfinding.rs
@@ -16,8 +16,10 @@
 
 */
 use super::movement::MovementBase;
-use glam::{IVec2, Vec2};
-use hurrycurry_protocol::PacketS;
+use hurrycurry_protocol::{
+    glam::{IVec2, Vec2},
+    PacketS,
+};
 use log::debug;
 use std::{
     cmp::Ordering,
diff --git a/server/src/data.rs b/server/src/data.rs
index fd028c94..9fd3e95c 100644
--- a/server/src/data.rs
+++ b/server/src/data.rs
@@ -21,8 +21,10 @@ use crate::{
     interaction::Recipe,
 };
 use anyhow::{anyhow, bail, Result};
-use glam::{IVec2, Vec2};
-use hurrycurry_protocol::{DemandIndex, ItemIndex, RecipeIndex, TileIndex};
+use hurrycurry_protocol::{
+    glam::{IVec2, Vec2},
+    DemandIndex, ItemIndex, RecipeIndex, TileIndex,
+};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{HashMap, HashSet},
diff --git a/server/src/entity/conveyor.rs b/server/src/entity/conveyor.rs
index f4692f6d..4d11ffe1 100644
--- a/server/src/entity/conveyor.rs
+++ b/server/src/entity/conveyor.rs
@@ -21,8 +21,7 @@ use crate::{
     game::{interact_effect, Tile},
 };
 use anyhow::{anyhow, Result};
-use glam::IVec2;
-use hurrycurry_protocol::{ItemLocation, PacketC};
+use hurrycurry_protocol::{glam::IVec2, ItemLocation, PacketC};
 use std::collections::{HashMap, VecDeque};
 
 #[derive(Debug, Default, Clone)]
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index 1bc558b1..925ed5f4 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -19,8 +19,7 @@ pub mod conveyor;
 use crate::{data::Gamedata, game::Tile};
 use anyhow::{anyhow, Result};
 use conveyor::Conveyor;
-use glam::IVec2;
-use hurrycurry_protocol::PacketC;
+use hurrycurry_protocol::{glam::IVec2, PacketC};
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, VecDeque};
 
diff --git a/server/src/game.rs b/server/src/game.rs
index daf08ad3..74bc9d45 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -22,8 +22,8 @@ use crate::{
     interaction::{interact, tick_slot, InteractEffect, TickEffect},
 };
 use anyhow::{anyhow, bail, Result};
-use glam::{IVec2, Vec2};
 use hurrycurry_protocol::{
+    glam::{IVec2, Vec2},
     ClientGamedata, ItemIndex, ItemLocation, Message, PacketC, PacketS, PlayerID, RecipeIndex,
     TileIndex,
 };