make mc display version dynamic

bedrock-crustaceans · Sep 17, 2024 · b6f2f11 · b6f2f11
1 parent bd57c7e
commit b6f2f11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/crates/proto/src/info.rs b/crates/proto/src/info.rs
@@ -1,6 +1,5 @@
 pub const RAKNET_GAME_PACKET_ID: u8 = 0xfe;
 pub const PROTOCOL_VERSION: i32 = 685;
-pub const MINECRAFT_VERSION: &'static str = "1.21.0";
 pub const MINECRAFT_EDITION_MOTD: &'static str = "MCPE";
 
 pub const MAGIC: [u8; 16] = [

diff --git a/crates/proto/src/listener.rs b/crates/proto/src/listener.rs
@@ -13,8 +13,8 @@ pub struct Listener {
  listener: TransportLaterListener,
  name: String,
  sub_name: String,
- player_count_max: u32,
- player_count_current: u32,
+ player_max: u32,
+ player_count: u32,
  socket_addr: SocketAddr,
  guid: u64,
 }
@@ -23,8 +23,9 @@ impl Listener {
  pub async fn new_raknet(
  name: String,
  sub_name: String,
- player_count_max: u32,
- player_count_current: u32,
+ display_version: String,
+ player_max: u32,
+ player_count: u32,
  socket_addr: SocketAddr,
  nintendo_limited: bool,
  ) -> Result<Self, ListenerError> {
@@ -47,11 +48,11 @@ impl Listener {
  // Setup the motd
  rak_listener.motd = Motd {
  edition: String::from(MINECRAFT_EDITION_MOTD),
- version: String::from(MINECRAFT_VERSION),
+ version: display_version,
  name: name.clone(),
  sub_name: sub_name.clone(),
- player_max: player_count_max,
- player_count: player_count_current,
+ player_max,
+ player_count,
  protocol: PROTOCOL_VERSION as u16,
  server_guid: guid,
  gamemode: Gamemode::Survival,
@@ -64,8 +65,8 @@ impl Listener {
  listener: TransportLaterListener::RaknetUDP(rak_listener),
  name,
  sub_name,
- player_count_max,
- player_count_current,
+ player_max,
+ player_count,
  socket_addr,
  guid,
  })