First attempt

minecraft-entities-derive/src/lib.rs

@@ -194,7 +194,7 @@ pub fn MinecraftEntity(attr: proc_macro::TokenStream, item: proc_macro::TokenStr
         let code: TokenStream = code.into_iter().collect();
         codes.push(code);
 
-        let code = quote! {
+        let mut code = quote! {
             impl From<#this> for AnyEntity {
                 fn from(val: #this) -> Self {
                     AnyEntity::#this(val)
@@ -210,6 +210,15 @@ pub fn MinecraftEntity(attr: proc_macro::TokenStream, item: proc_macro::TokenStr
                 assert!(#parent_snake.is_some(), "Please add {} to {} list", stringify!(#this), stringify!(#parent));
             }
         };
+        if struct_name == "Player" {
+            code = quote! {
+                impl From<#this> for AnyEntity {
+                    fn from(val: #this) -> Self {
+                        AnyEntity::#this(val)
+                    }
+                }
+            }
+        }
         codes.push(code);
     }
 

minecraft-protocol/src/components/gamemode.rs

@@ -2,7 +2,7 @@ use crate::*;
 
 #[derive(PartialEq)]
 #[minecraft_enum(u8)]
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum Gamemode {
     Survival,
     Creative,

minecraft-server/src/player_handler/connect.rs

@@ -14,9 +14,8 @@ pub async fn handle_connection(
             let player_info = login(&mut stream, addr).await?;
             let (player_info, change_receiver) = handshake(&mut stream, player_info, world).await?;
             let uuid = player_info.uuid;
-            let r = handle_player(stream, player_info, server_msg_rcvr, world, change_receiver).await;
-            world.remove_loader(uuid).await;
-            r
+            let eid = Player::spawn_player(world, stream, player_info, server_msg_rcvr, change_receiver).await;
+            Ok(())
         },
         ConnectionState::Status => {
             status(&mut stream).await;

minecraft-server/src/player_handler/handshake.rs

@@ -1,17 +1,17 @@
 use super::*;
 
 pub struct PlayerInfo {
-    pub(super) addr: SocketAddr,
-    pub(super) username: String,
-    pub(super) uuid: u128,
-    pub(super) locale: String,
-    pub(super) render_distance: usize,
-    pub(super) chat_mode: ChatMode,
-    pub(super) chat_colors: bool,
-    pub(super) displayed_skin_parts: u8,
-    pub(super) main_hand: MainHand,
-    pub(super) enable_text_filtering: bool,
-    pub(super) allow_server_listing: bool,
+    pub addr: SocketAddr,
+    pub username: String,
+    pub uuid: u128,
+    pub locale: String,
+    pub render_distance: usize,
+    pub chat_mode: ChatMode,
+    pub chat_colors: bool,
+    pub displayed_skin_parts: u8,
+    pub main_hand: MainHand,
+    pub enable_text_filtering: bool,
+    pub allow_server_listing: bool,
 }
 
 pub async fn handshake(stream: &mut TcpStream, logged_in_player_info: LoggedInPlayerInfo, world: &'static World) -> Result<(PlayerInfo, MpscReceiver<WorldChange>), ()> {

minecraft-server/src/player_handler/mod.rs

@@ -8,8 +8,6 @@ mod login;
 pub use login::*;
 mod network;
 pub use network::*;
-mod play;
-pub use play::*;
 mod status;
 pub use status::*;