cargo fmt

crates/proto/src/adapter/mod.rs

@@ -0,0 +1,18 @@
+use crate::v662::types::ActorRuntimeID;
+use xuid::Xuid;
+
+pub enum GamePacketEvents {
+    EmoteEvent(EmotePacketEvent),
+}
+
+pub struct EmotePacketEvent {
+    pub actor_runtime_id: ActorRuntimeID,
+    pub emote_id: String,
+    pub xuid: Xuid,
+}
+
+impl From<crate::v748::gamepackets::GamePackets> for GamePacketEvents {
+    fn from(packet: crate::v748::gamepackets::GamePackets) -> Self {
+        todo!()
+    }
+}

crates/proto/src/lib.rs

@@ -1,3 +1,4 @@
+mod adapter;
 pub mod codec;
 pub mod compression;
 pub mod connection;

crates/server/src/error.rs

@@ -15,6 +15,4 @@ pub enum LoginError {
     FormatError(&'static str),
 }
 
-pub enum ServerError {
-
-}
+pub enum ServerError {}

crates/server/src/events/events/mod.rs

@@ -6,4 +6,3 @@ macro_rules! export {
 }
 
 export!(spawn);
-

crates/server/src/events/handle/mod.rs

@@ -1,5 +1,5 @@
-mod player;
 mod entity;
+mod player;
 
-pub use player::*;
 pub use entity::*;
+pub use player::*;

crates/server/src/events/handle/player.rs

@@ -6,6 +6,4 @@ impl PlayerHandle {
     pub fn id(&self) -> EntityId {
         self.0
     }
-
-
 }

crates/server/src/events/mod.rs

@@ -1,16 +1,14 @@
 use crate::events::handle::PlayerHandle;
 
-mod handle;
 mod events;
+mod handle;
 
 pub trait EventListener {
     type Event;
-    
+
     async fn handle(&self, event: &Self::Event);
 }
 
 pub enum Event {
-    PlayerSpawn {
-        player: PlayerHandle,
-    }
+    PlayerSpawn { player: PlayerHandle },
 }

crates/server/src/lib.rs

@@ -1,8 +1,8 @@
+pub mod components;
 pub mod error;
+mod events;
 pub mod login;
 mod server;
-pub mod components;
 pub mod systems;
-mod events;
 
 pub use server::*;

crates/server/src/server/builder.rs

@@ -1,11 +1,11 @@
 use crate::server::Server;
+use crate::systems::movement::movement_system;
+use crate::{ServerHandle, ShutdownKind};
 use bedrockrs_proto::listener::Listener;
+use shipyard::{IntoWorkload, World};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::Arc;
-use shipyard::{IntoWorkload, World};
 use tokio::sync::{oneshot, Notify};
-use crate::{ServerHandle, ShutdownKind};
-use crate::systems::movement::movement_system;
 
 pub struct ServerBuilder {
     name: String,
@@ -53,22 +53,22 @@ impl ServerBuilder {
             )
         }
 
-        let world= World::new();
+        let world = World::new();
 
         world.add_workload(|| (movement_system).into_workload());
 
         let notify = Arc::new(Notify::new());
         let (sender, receiver) = oneshot::channel::<ShutdownKind>();
-        
+
         let server = Server {
             listeners,
             world,
             shutdown_notify: notify.clone(),
             shutdown_recv: receiver,
         };
-        
+
         let handle = ServerHandle::new(sender, notify.clone());
-        
+
         (server, handle)
     }
 }

crates/server/src/server/handle.rs

@@ -1,6 +1,6 @@
-use std::sync::Arc;
-use tokio::sync::{Notify, oneshot::Sender};
 use bedrockrs_proto::listener::Listener;
+use std::sync::Arc;
+use tokio::sync::{oneshot::Sender, Notify};
 
 pub struct ServerHandle {
     shutdown_sender: Sender<ShutdownKind>,
@@ -14,10 +14,16 @@ pub enum ShutdownKind {
 }
 
 impl ServerHandle {
-    pub fn new(shutdown_sender: Sender<ShutdownKind>, shutdown_notify: Arc<Notify>) -> ServerHandle {
-        Self { shutdown_sender, shutdown_notify }
+    pub fn new(
+        shutdown_sender: Sender<ShutdownKind>,
+        shutdown_notify: Arc<Notify>,
+    ) -> ServerHandle {
+        Self {
+            shutdown_sender,
+            shutdown_notify,
+        }
     }
-    
+
     /// Initiates a graceful shutdown and waits for completion.
     pub async fn shutdown_graceful(self) {
         let _ = self.shutdown_sender.send(ShutdownKind::Graceful);
@@ -39,7 +45,7 @@ impl ServerHandle {
     pub fn shutdown_forceful_now(self) {
         let _ = self.shutdown_sender.send(ShutdownKind::Forceful);
     }
-    
+
     pub fn add_listener(&mut self, listener: Listener) {
         todo!()
     }

crates/server/src/server/mod.rs

@@ -15,7 +15,7 @@ pub struct Server {
     listeners: Vec<Listener>,
     world: World,
     shutdown_notify: Arc<Notify>,
-    shutdown_recv: Receiver<ShutdownKind>
+    shutdown_recv: Receiver<ShutdownKind>,
 }
 
 impl Server {
@@ -24,36 +24,36 @@ impl Server {
 
     pub async fn run(&mut self) {
         self.load().await;
-        
+
         for listener in &mut self.listeners {
             listener.start().await.unwrap();
         }
-        
+
         loop {
             if let Ok(kind) = self.shutdown_recv.try_recv() {
                 if kind == ShutdownKind::Graceful {
                     self.save().await;
                 }
-                
+
                 break;
             };
 
             let tick_start = Instant::now();
 
             self.tick();
-            
+
             println!("TICK");
 
             let elapsed = tick_start.elapsed();
-            
+
             if elapsed < Self::TICK_DURATION {
                 sleep(Self::TICK_DURATION - elapsed).await;
             }
         }
-        
+
         self.shutdown_notify.notify_one();
     }
-    
+
     fn tick(&mut self) {
         self.world.run_default_workload().unwrap()
     }

crates/server/src/systems/movement.rs

@@ -7,7 +7,6 @@ pub struct Pos(pub Vec3<f32>);
 #[derive(Component)]
 pub struct Vel(pub Vec3<f32>);
 
-
 pub fn movement_system(v_vel: View<Vel>, mut v_pos: ViewMut<Pos>) {
     println!("- MOVEMENT");
     for (pos, vel) in (&mut v_pos, &v_vel).iter() {

crates/server/src/systems/packet.rs

@@ -1,6 +1,6 @@
-use shipyard::{Component, ViewMut};
 use bedrockrs_proto::connection::shard::arc::ConnectionShared;
 use bedrockrs_proto::ProtoHelper;
+use shipyard::{Component, ViewMut};
 
 #[derive(Component)]
 pub struct Connected<T: ProtoHelper + 'static>
@@ -10,11 +10,14 @@ where
     pub connection: ConnectionShared<T>,
 }
 
-pub fn packet_recv_system<T: ProtoHelper>(v_con: ViewMut<Connected<T>>) where <T as ProtoHelper>::GamePacketType: Sync {
-
+pub fn packet_recv_system<T: ProtoHelper>(v_con: ViewMut<Connected<T>>)
+where
+    <T as ProtoHelper>::GamePacketType: Sync,
+{
 }
 
-pub fn packet_send_system<T: ProtoHelper>(v_con: ViewMut<Connected<T>>) where <T as ProtoHelper>::GamePacketType: Sync {
-
+pub fn packet_send_system<T: ProtoHelper>(v_con: ViewMut<Connected<T>>)
+where
+    <T as ProtoHelper>::GamePacketType: Sync,
+{
 }
-

examples/server_simple.rs

@@ -9,17 +9,17 @@ async fn main() {
         .sub_name("bedrock-rs")
         .build()
         .await;
-    
+
     println!("Server started");
-    
+
     tokio::spawn(async move {
         println!("Server starting");
         server.run().await
     });
-    
+
     sleep(Duration::from_secs(5)).await;
-    
+
     handle.shutdown_graceful().await;
-    
+
     println!("server shutdown");
 }