Move some constants to common module

src/common/custom_ipc.rs

@@ -1,8 +1,7 @@
 use binrw::binrw;
 
 use crate::{
-    CHAR_NAME_MAX_LENGTH,
+    common::{CHAR_NAME_MAX_LENGTH, read_string},
-    common::read_string,
     lobby::ipc::CharacterDetails,
     packet::{IpcSegment, ReadWriteIpcSegment},
 };

src/common/mod.rs

@@ -14,6 +14,12 @@ use crate::config::get_config;
 
 pub mod custom_ipc;
 
+/// An invalid actor/object id.
+pub const INVALID_OBJECT_ID: u32 = 0xE0000000;
+
+/// Maxmimum length of a character's name.
+pub const CHAR_NAME_MAX_LENGTH: usize = 32;
+
 pub(crate) fn read_string(byte_stream: Vec<u8>) -> String {
     let str = String::from_utf8(byte_stream).unwrap();
     str.trim_matches(char::from(0)).to_string() // trim \0 from the end of strings

src/lib.rs

@@ -26,11 +26,6 @@ pub mod packet;
 /// Logic server-specific code.
 pub mod login;
 
-pub const INVALID_OBJECT_ID: u32 = 0xE0000000;
-
-/// Maxmimum length of a character's name.
-pub const CHAR_NAME_MAX_LENGTH: usize = 32;
-
 pub fn setup_default_environment() -> Environment<'static> {
     let mut env = Environment::new();
     env.add_template("admin.html", include_str!("../templates/admin.html"))

src/lobby/ipc/character_action.rs

@@ -1,6 +1,6 @@
 use binrw::binrw;
 
-use crate::CHAR_NAME_MAX_LENGTH;
+use crate::common::CHAR_NAME_MAX_LENGTH;
 
 use super::{read_string, write_string};
 

src/lobby/ipc/character_list.rs

@@ -1,6 +1,6 @@
 use binrw::binrw;
 
-use crate::CHAR_NAME_MAX_LENGTH;
+use crate::common::CHAR_NAME_MAX_LENGTH;
 
 use super::{read_string, write_string};
 

src/world/chat_handler.rs

@@ -1,6 +1,5 @@
 use crate::{
-    INVALID_OBJECT_ID,
+    common::{CustomizeData, INVALID_OBJECT_ID, timestamp_secs},
-    common::{CustomizeData, timestamp_secs},
     config::get_config,
     packet::{PacketSegment, SegmentType},
     world::ipc::{

src/world/ipc/common_spawn.rs

@@ -1,7 +1,6 @@
 use binrw::binrw;
 
-use crate::CHAR_NAME_MAX_LENGTH;
+use crate::common::{CHAR_NAME_MAX_LENGTH, CustomizeData, read_string, write_string};
-use crate::common::{CustomizeData, read_string, write_string};
 
 use super::StatusEffect;
 use super::position::Position;

src/world/ipc/player_setup.rs

@@ -1,9 +1,6 @@
 use binrw::binrw;
 
-use crate::{
+use crate::common::{CHAR_NAME_MAX_LENGTH, read_string, write_string};
-    CHAR_NAME_MAX_LENGTH,
-    common::{read_string, write_string},
-};
 
 #[binrw]
 #[derive(Debug, Clone, Default)]

src/world/ipc/social_list.rs

@@ -1,9 +1,6 @@
 use binrw::binrw;
 
-use crate::{
+use crate::common::{CHAR_NAME_MAX_LENGTH, read_string, write_string};
-    CHAR_NAME_MAX_LENGTH,
-    common::{read_string, write_string},
-};
 
 #[binrw]
 #[brw(repr = u8)]