moved status to types folder

Author: SubAt0m1c

server/src/network/client.rs

@@ -10,7 +10,7 @@ use crate::network::protocol::login::serverbound::LoginStart;
 use crate::network::protocol::play::serverbound::Play;
 use crate::network::protocol::status::clientbound::{StatusPong, StatusResponse};
 use crate::network::protocol::status::serverbound::StatusPing;
-use crate::network::status::StatusBytes;
+use crate::types::status::StatusBytes;
 use crate::player::player::{ClientId, GameProfile};
 use crate::GameProfileProperty;
 use anyhow::bail;

server/src/network/internal_packets.rs

@@ -1,6 +1,6 @@
 use crate::network::protocol::play::serverbound::Play;
-use crate::network::status::StatusUpdate;
 use crate::player::player::{ClientId, GameProfile};
+use crate::types::status::StatusUpdate;
 use bytes::Bytes;
 
 pub enum NetworkThreadMessage {

server/src/network/mod.rs

@@ -4,5 +4,4 @@ pub mod network;
 pub mod connection_state;
 pub mod internal_packets;
 pub mod protocol;
-pub mod binary;
-pub mod status;
+pub mod binary;

server/src/network/network.rs

@@ -1,8 +1,7 @@
 use crate::network::client::handle_client;
-use crate::network::status::Status;
+use crate::types::status::Status;
 use core::panic;
 use std::collections::HashMap;
-use std::sync::Arc;
 use tokio::net::TcpListener;
 use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
 

server/src/types/mod.rs

@@ -3,4 +3,5 @@ pub mod block_position;
 pub mod direction;
 pub mod aabb;
 pub mod chat_component;
-pub mod sized_string_mut;
+pub mod sized_string_mut;
+pub mod status;

server/src/network/status.rs server/src/types/status.rsserver/src/network/status.rs renamed to server/src/types/status.rs

@@ -1,31 +1,21 @@
 use bytes::Bytes;
 use crate::types::chat_component::ChatComponent;
 
-#[derive(Debug, Clone)]
-pub struct StatusBytes(Bytes);
-impl StatusBytes {
-    #[inline(always)]
-    pub fn get_str(&self) -> &str {
-        // SAFETY: These should always be constructed from a String.
-        unsafe { str::from_utf8_unchecked(&self.0) }
-    }
-}
-
 pub struct Status {
     players: u32,
     max_players: u32,
-    
+
     serialized_info: String,
     icon: &'static str,
-    
+
     cached: Option<StatusBytes>,
 }
 
 impl Status {
     pub fn new(players: u32, max_players: u32, info: ChatComponent, icon: &'static str) -> Self {
         Self { players, max_players, serialized_info: info.serialize(), icon, cached: None, }
     }
-    
+
     pub fn set(&mut self, update: StatusUpdate) {
         match update {
             StatusUpdate::Players(count) => self.players = count,
@@ -35,7 +25,7 @@ impl Status {
         }
         self.cached = None;
     }
-    
+
     pub fn get(&mut self) -> StatusBytes {
         self.cached.get_or_insert_with(|| {
             StatusBytes(Bytes::from(format!(r#"{{
@@ -59,4 +49,14 @@ pub enum StatusUpdate {
     MaxPlayers(u32),
     Info(ChatComponent),
     Icon(&'static str),
-}
+}
+
+#[derive(Debug, Clone)]
+pub struct StatusBytes(Bytes);
+impl StatusBytes {
+    #[inline(always)]
+    pub fn get_str(&self) -> &str {
+        // SAFETY: These should always be constructed from a String.
+        unsafe { str::from_utf8_unchecked(&self.0) }
+    }
+}

src/main.rs

@@ -10,7 +10,7 @@ use server::entity::entity_metadata::{EntityMetadata, EntityVariant};
 use server::inventory::menu::OpenContainer;
 use server::network::internal_packets::NetworkThreadMessage;
 use server::network::network::start_network;
-use server::network::status::Status;
+use server::types::status::Status;
 use server::types::chat_component::{ChatComponent, MCColors};
 use server::utils::seeded_rng::{seeded_rng, SeededRng};
 use server::world::world::World;
@@ -88,10 +88,10 @@ async fn main() -> anyhow::Result<()> {
     let status = Status::new(1, 0, text, get_assets().icon_data);
     let (tx, mut rx) = start_network("127.0.0.1:4972", status);
 
-    let mut tick_interval = tokio::time::interval(Duration::from_millis(50));
     let mut world = initialize_world(tx)?;
     spawn_mort(&mut world);
 
+    let mut tick_interval = tokio::time::interval(Duration::from_millis(50));
     loop {
         tick_interval.tick().await;
         // let start = std::time::Instant::now();