Merge pull request #1 from CatilGrass/developHEADmain

完善 MessageEncoder

2 files changed, 22 insertions, 5 deletions

diff --git a/core/test/src/bin/console_client.rs b/core/test/src/bin/console_client.rs
index 80bf28c..578a5b5 100644
--- a/core/test/src/bin/console_client.rs
+++ b/core/test/src/bin/console_client.rs
@@ -1,11 +1,23 @@
-use there_is_nopads_core::pads_player::{PadClient, PadClientEvent, PlayerInfo};
-use there_is_nopads_core::pads_server::ServerMessage;
+use there_is_nopads_core::client::client::PadClient;
+use there_is_nopads_core::client::client_event::PadClientEvent;
+use there_is_nopads_core::messages::ServerMessage;
+use there_is_nopads_core::player::player_info::PlayerInfo;
 
 fn main() {
+    // 客户端
     let client = PadClient::default();
+
+    // 玩家
     let mut player = PlayerInfo::default();
+
+    // 设置玩家信息
     player.name(String::from("Player"), String::from("catilgrass"));
-    println!("{}", player.name_hash);
+
+    // 输出玩家 Hash
+    println!("Hash : {}", player.name_hash);
+
+    // 连接到测试服务器
+    client.connect_server();
 }
 
 struct Event;
diff --git a/core/test/src/bin/console_server.rs b/core/test/src/bin/console_server.rs
index 4536c74..26476fa 100644
--- a/core/test/src/bin/console_server.rs
+++ b/core/test/src/bin/console_server.rs
@@ -1,8 +1,13 @@
-use there_is_nopads_core::pads_player::{PlayerInfo, PlayerMessage};
-use there_is_nopads_core::pads_server::{PadServer, PadServerEvent};
+use there_is_nopads_core::messages::PlayerMessage;
+use there_is_nopads_core::player::player_info::PlayerInfo;
+use there_is_nopads_core::server::server::PadServer;
+use there_is_nopads_core::server::server_event::PadServerEvent;
 
 fn main() {
+    // 服务端
     let server = PadServer::default();
+
+    // 开始监听
     server.start_listening(Event);
 }