Merge branch 'main' of https://github.com/Adrian8115/bedrock-rs

Cargo.toml

@@ -23,6 +23,9 @@ bedrockrs_form = { path = "crates/form" }
 bedrockrs_world = { path = "crates/world", optional = true }
 bedrockrs_paletted_storage = { path = "crates/paletted_storage", optional = true }
 
+bedrockrs_play_fab = { path = "crates/play_fab" }
+bedrockrs_xsapi = { path = "crates/xsapi" }
+
 [features]
 full = ["addons", "proto", "world"]
 

crates/play_fab/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "bedrockrs_play_fab"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

crates/play_fab/src/lib.rs

@@ -0,0 +1,14 @@
+pub fn add(left: u64, right: u64) -> u64 {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}

crates/proto_macros/src/lib.rs

@@ -189,39 +189,27 @@ pub fn gamepackets(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let variants = args.packets.clone();
     let variants = variants.iter().map(|(name, value)| {
         if let Some(value) = value {
-            quote! {
-                #name(#value),
-            }
+            quote! { #name(#value), }
         } else {
-            quote! {
-                #name(),
-            }
+            quote! { #name(), }
         }
     });
 
     let compress = args.packets.clone();
     let compress = compress.iter().map(|(name, value)| {
         if let Some(v) = value {
-            quote! {
-                GamePackets::#name(_) => { return <#v as ::bedrockrs_proto_core::GamePacket>::COMPRESS; },
-            }       
+            quote! { GamePackets::#name(_) => { return <#v as ::bedrockrs_proto_core::GamePacket>::COMPRESS; }, }
         } else {
-            quote! {
-                GamePackets::#name() => { todo!("impl GamePackets::{}", stringify!(name)); },
-            }
+            quote! { GamePackets::#name() => { todo!("impl GamePackets::{}", stringify!(name)); }, }
         }
     });
 
     let encrypt = args.packets.clone();
     let encrypt = encrypt.iter().map(|(name, value)| {
         if let Some(v) = value {
-            quote! {
-                GamePackets::#name(_) => { return <#v as ::bedrockrs_proto_core::GamePacket>::ENCRYPT; },
-            }
+            quote! { GamePackets::#name(_) => { return <#v as ::bedrockrs_proto_core::GamePacket>::ENCRYPT; }, }
         } else {
-            quote! {
-                GamePackets::#name() => { todo!("impl GamePackets::{}", stringify!(name)); },
-            }
+            quote! { GamePackets::#name() => { todo!("impl GamePackets::{}", stringify!(name)); }, }
         }
     });
 
@@ -231,17 +219,17 @@ pub fn gamepackets(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
             quote! {
                 GamePackets::#name(pk) => {
                     let mut buf = Vec::new();
-                    
+
                     match <#v as bedrockrs_proto_core::ProtoCodec>::proto_serialize(pk, &mut buf) {
                         Ok(_) => {},
                         Err(err) => return Err(err),
                     };
-                    
+
                     let len: u32 = match buf.len().try_into() {
                         Ok(len) => len,
                         Err(err) => return Err(::bedrockrs_proto_core::error::ProtoCodecError::FromIntError(err)),
                     };
-                    
+
                     match write_gamepacket_header(stream, len, <#v as ::bedrockrs_proto_core::GamePacket>::ID, subclient_sender_id, subclient_target_id) {
                         Ok(_) => {},
                         Err(err) => return Err(err),

crates/xsapi/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "bedrockrs_xsapi"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }

crates/xsapi/src/lib.rs

@@ -0,0 +1 @@
+mod session;

crates/xsapi/src/session/mod.rs

@@ -0,0 +1,20 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Session {
+    pub properties: SessionProperties,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct SessionProperties {
+    pub system: SessionPropertiesSystem,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct SessionPropertiesSystem {
+    #[serde(rename = "joinRestriction")]
+    pub join_restriction: String,
+    #[serde(rename = "readRestriction")]
+    pub read_restriction: String,
+    pub closed: bool,
+}

src/lib.rs

@@ -11,6 +11,7 @@ pub mod nbt {
 #[cfg(feature = "proto")]
 pub mod proto {
     pub use ::bedrockrs_proto::*;
+    pub use ::bedrockrs_proto_core::GamePacket;
 
     pub mod codec {
         pub use ::bedrockrs_proto_core::error::ProtoCodecError;