Merge pull request #11 from shekohex/improvements

core/codec/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tq-codec"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

core/crypto/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tq-crypto"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

core/crypto/src/rc5.rs

@@ -92,8 +92,8 @@ impl crate::Cipher for TQRC5 {
         dst.copy_from_slice(src);
         // Decrypt the buffer
         for word in 0..src_len {
-            let mut chunk_a = &dst[8 * word as usize..];
-            let mut chunk_b = &dst[(8 * word + 4) as usize..];
+            let mut chunk_a = &dst[8 * word..];
+            let mut chunk_b = &dst[(8 * word + 4)..];
             let mut a = chunk_a.get_u32_le();
             let mut b = chunk_b.get_u32_le();
             let rounds = self.rounds;
@@ -106,13 +106,13 @@ impl crate::Cipher for TQRC5 {
                 a = (a.wrapping_sub(sub[(2 * round) as usize])).rotate_right(b)
                     ^ b;
             }
-            let chunk_a = &mut dst[(8 * word as usize)..];
+            let chunk_a = &mut dst[(8 * word)..];
             let mut wtr_a = vec![];
             wtr_a.put_u32_le(a.wrapping_sub(sub[0]));
             for (i, b) in wtr_a.iter().enumerate() {
                 chunk_a[i] = *b;
             }
-            let chunk_b = &mut dst[(8 * word + 4) as usize..];
+            let chunk_b = &mut dst[(8 * word + 4)..];
             let mut wtr_b = vec![];
             wtr_b.put_u32_le(b.wrapping_sub(sub[1]));
 

core/math/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tq-math"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

core/network/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tq-network"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

core/primitives/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "primitives"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

core/primitives/src/lib.rs

@@ -9,7 +9,7 @@ pub struct Size<I: PrimInt> {
 }
 
 impl<I: PrimInt> Size<I> {
-    pub fn new(width: I, height: I) -> Self { Self { width, height } }
+    pub const fn new(width: I, height: I) -> Self { Self { width, height } }
 
     pub fn area(&self) -> I { self.width * self.height }
 }

core/serde/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tq-serde"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

macros/derive-packethandler/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "derive-packethandler"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [lib]

macros/derive-packetid/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "derive-packetid"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [lib]

server/auth/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "auth-server"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 [dependencies]

server/auth/src/state.rs

@@ -31,7 +31,7 @@ impl State {
 
     /// Get access to the global state.
     pub fn global() -> Result<&'static Self, Error> {
-        STATE.get().ok_or({
+        STATE.get().ok_or_else(|| {
             Error::State(
                 "State is uninialized, did you forget to call State::init()!",
             )

server/game/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "game-server"
 version = "0.1.0"
-authors = ["Shady Khalifa <[email protected]>"]
+authors = ["Shady Khalifa <[email protected]>"]
 edition = "2018"
 
 
@@ -18,11 +18,13 @@ tracing = "0.1"
 tracing-futures = "0.2"
 dotenv = "0.15"
 once_cell = "1.4"
-fastrand = "1.3"
 encoding = "0.2"
 bitflags = "1.2"
 argh = "0.1"
 tokio-stream = "0.1.8"
+rand = "0.8"
+fastrand = "1.8"
+chrono = "0.4"
 
 # Utils
 num_enum = { version = "0.5.1", default-features = false }

server/game/src/errors.rs

@@ -1,6 +1,6 @@
 use bytes::Bytes;
 use thiserror::Error;
-use tokio::sync::mpsc::error::SendError;
+use tokio::sync::{mpsc, oneshot};
 use tq_network::{ErrorPacket, PacketEncode};
 
 #[derive(Debug, Error)]
@@ -17,8 +17,10 @@ pub enum Error {
     Db(#[from] sqlx::Error),
     #[error("State Error: {}", _0)]
     State(&'static str),
-    #[error("Actor State Send Error!")]
+    #[error("Channel Send Error!")]
     SendError,
+    #[error("Channel Recv Error!")]
+    RecvError,
     #[error(transparent)]
     ParseInt(#[from] std::num::ParseIntError),
     #[error(transparent)]
@@ -29,8 +31,12 @@ pub enum Error {
     Msg(u16, Bytes),
 }
 
-impl<T> From<SendError<T>> for Error {
-    fn from(_: SendError<T>) -> Self { Self::SendError }
+impl<T> From<mpsc::error::SendError<T>> for Error {
+    fn from(_: mpsc::error::SendError<T>) -> Self { Self::SendError }
+}
+
+impl From<oneshot::error::RecvError> for Error {
+    fn from(_: oneshot::error::RecvError) -> Self { Self::RecvError }
 }
 
 impl<T: PacketEncode> From<ErrorPacket<T>> for Error {

server/game/src/packets/mod.rs

@@ -27,3 +27,6 @@ pub use msg_player::MsgPlayer;
 
 mod msg_item_info;
 pub use msg_item_info::*;
+
+mod msg_data;
+pub use msg_data::MsgData;