Add all login, status, and handshake packets for 1.15.2

caelunshun · caelunshun · commit a39d1f8ebee2 · 2020-08-15T11:49:06.000-06:00
diff --git a/src/io.rs b/src/io.rs
@@ -320,3 +320,36 @@ where
         LengthPrefixedVec(Cow::Borrowed(slice))
     }
 }
+
+/// A vector of bytes which consumes all remaining bytes in this packet.
+/// This is used by the plugin messaging packets, for one.
+pub struct LengthInferredVecU8<'a>(pub Cow<'a, [u8]>);
+
+impl<'a> Readable for LengthInferredVecU8<'a> {
+    fn read(buffer: &mut Cursor<&[u8]>, _version: ProtocolVersion) -> anyhow::Result<Self>
+    where
+        Self: Sized,
+    {
+        let mut vec = Vec::new();
+        buffer.read_to_end(&mut vec)?;
+        Ok(LengthInferredVecU8(Cow::Owned(vec)))
+    }
+}
+
+impl<'a> Writeable for LengthInferredVecU8<'a> {
+    fn write(&self, buffer: &mut Vec<u8>, _version: ProtocolVersion) {
+        buffer.extend_from_slice(&*self.0);
+    }
+}
+
+impl<'a> From<&'a [u8]> for LengthInferredVecU8<'a> {
+    fn from(slice: &'a [u8]) -> Self {
+        LengthInferredVecU8(Cow::Borrowed(slice))
+    }
+}
+
+impl<'a> From<LengthInferredVecU8<'a>> for Vec<u8> {
+    fn from(x: LengthInferredVecU8<'a>) -> Self {
+        x.0.into_owned()
+    }
+}
diff --git a/src/packets.rs b/src/packets.rs
@@ -5,6 +5,9 @@ macro_rules! user_type {
     (LengthPrefixedVec <$inner:ident>) => {
         Vec<$inner>
     };
+    (LengthInferredVecU8) => {
+        Vec<u8>
+    };
     ($typ:ty) => {
         $typ
     };
@@ -17,6 +20,9 @@ macro_rules! user_type_convert_to_writeable {
     (LengthPrefixedVec <$inner:ident>, $e:expr) => {
         LengthPrefixedVec::from($e.as_slice())
     };
+    (LengthInferredVecU8, $e:expr) => {
+        LengthInferredVecU8::from($e.as_slice())
+    };
     ($typ:ty, $e:expr) => {
         $e
     };
@@ -29,8 +35,8 @@ macro_rules! packets {
                 $(
                     $field:ident $typ:ident $(<$generics:ident>)?
                 );* $(;)?
-            }
-        ),* $(,)?
+            } $(,)?
+        )*
     ) => {
         $(
             #[derive(Debug, Clone)]
@@ -40,6 +46,7 @@ macro_rules! packets {
                 )*
             }
 
+            #[allow(unused_imports, unused_variables)]
             impl crate::Readable for $packet {
                 fn read(buffer: &mut ::std::io::Cursor<&[u8]>, version: crate::ProtocolVersion) -> anyhow::Result<Self>
                 where
@@ -60,6 +67,7 @@ macro_rules! packets {
                 }
             }
 
+            #[allow(unused_variables)]
             impl crate::Writeable for $packet {
                 fn write(&self, buffer: &mut Vec<u8>, version: crate::ProtocolVersion) {
                     $(
@@ -163,7 +171,7 @@ macro_rules! def_enum {
     };
 }
 
-use crate::io::{LengthPrefixedVec, VarInt};
+use crate::io::{LengthInferredVecU8, LengthPrefixedVec, VarInt};
 
-pub mod handshake;
-pub mod login;
+pub mod client;
+pub mod server;
diff --git a/src/packets/client.rs b/src/packets/client.rs
@@ -0,0 +1,13 @@
+//! Packets sent from client to server.
+
+use super::*;
+
+mod handshake;
+mod login;
+mod play;
+mod status;
+
+pub use handshake::*;
+pub use login::*;
+pub use play::*;
+pub use status::*;
diff --git a/src/packets/client/handshake.rs b/src/packets/client/handshake.rs
diff --git a/src/packets/client/login.rs b/src/packets/client/login.rs
@@ -0,0 +1,18 @@
+use super::*;
+
+packets! {
+    LoginStart {
+        name String;
+    }
+
+    EncryptionResponse {
+        shared_secret LengthPrefixedVec<u8>;
+        verify_token LengthPrefixedVec<u8>;
+    }
+
+    LoginPluginResponse {
+        message_id VarInt;
+        successful bool;
+        data LengthInferredVecU8;
+    }
+}
diff --git a/src/packets/client/play.rs b/src/packets/client/play.rs
@@ -0,0 +1 @@
+
diff --git a/src/packets/client/status.rs b/src/packets/client/status.rs
@@ -0,0 +1,7 @@
+packets! {
+    Request {}
+
+    Ping {
+        payload i64;
+    }
+}
diff --git a/src/packets/login.rs b/src/packets/login.rs
diff --git a/src/packets/server.rs b/src/packets/server.rs
@@ -0,0 +1,11 @@
+//! Packets sent from server to client;
+
+use super::*;
+
+mod login;
+mod play;
+mod status;
+
+pub use login::*;
+pub use play::*;
+pub use status::*;
diff --git a/src/packets/server/login.rs b/src/packets/server/login.rs
@@ -0,0 +1,28 @@
+use super::*;
+
+packets! {
+    Disconnect {
+        reason String;
+    }
+
+    EncryptionRequest {
+        server_id String;
+        public_key LengthPrefixedVec<u8>;
+        verify_token LengthPrefixedVec<u8>;
+    }
+
+    LoginSuccess {
+        uuid String;
+        username String;
+    }
+
+    SetCompression {
+        threshold VarInt;
+    }
+
+    LoginPluginRequest {
+        message_id VarInt;
+        successful bool;
+        data LengthInferredVecU8;
+    }
+}
diff --git a/src/packets/server/play.rs b/src/packets/server/play.rs
@@ -0,0 +1 @@
+
diff --git a/src/packets/server/status.rs b/src/packets/server/status.rs
@@ -0,0 +1,9 @@
+packets! {
+    Response {
+        response String;
+    }
+
+    Pong {
+        payload i64;
+    }
+}
