diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cacbf0..8bc5b57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,8 +20,8 @@ Crate: ### Breaking: Protocols: - Valve: The rules field is now a `HashMap` instead of a `Vec` (where the `ServerRule` structure had a name and a value fields). -- Valve: `ServerInfo`'s `players`, `max_players` and `bots` have been renamed to `players_online`, `players_maximum` and `players_bots` respectively. -- Valve: `Response`'s `players`, `max_players` and `bots` have been renamed to `players_online`, `players_maximum` and `players_bots` respectively. +- Valve: Structs that contained the `players`, `max_players` and `bots` fields have been renamed to `players_online`, `players_maximum` and `players_bots` respectively. +- Minecraft: Structs that contained the `online_players`, `max_players` and `sample_players` fields have been renamed to `players_online`, `players_maximum` and `players_sample` respectively. Errors: - Besides the `BadGame` error, now no other errors returns details about what happened (as it was quite pointless). diff --git a/src/protocols/minecraft/protocol/bedrock.rs b/src/protocols/minecraft/protocol/bedrock.rs index b731cb0..33abbef 100644 --- a/src/protocols/minecraft/protocol/bedrock.rs +++ b/src/protocols/minecraft/protocol/bedrock.rs @@ -83,8 +83,8 @@ impl Bedrock { name: status[1].to_string(), version_name: status[3].to_string(), version_protocol: status[2].to_string(), - max_players: status[5].parse().map_err(|_| TypeParse)?, - online_players: status[4].parse().map_err(|_| TypeParse)?, + players_maximum: status[5].parse().map_err(|_| TypeParse)?, + players_online: status[4].parse().map_err(|_| TypeParse)?, id: status.get(6).and_then(|v| Some(v.to_string())), map: status.get(7).and_then(|v| Some(v.to_string())), game_mode: match status.get(8) { diff --git a/src/protocols/minecraft/protocol/java.rs b/src/protocols/minecraft/protocol/java.rs index a2611e6..1d95c03 100644 --- a/src/protocols/minecraft/protocol/java.rs +++ b/src/protocols/minecraft/protocol/java.rs @@ -110,9 +110,9 @@ impl Java { Ok(Response { version_name, version_protocol, - max_players, - online_players, - sample_players, + players_maximum: max_players, + players_online: online_players, + players_sample: sample_players, description: value_response["description"].to_string(), favicon: value_response["favicon"].as_str().map(str::to_string), previews_chat: value_response["previewsChat"].as_bool(), diff --git a/src/protocols/minecraft/protocol/legacy_bv1_8.rs b/src/protocols/minecraft/protocol/legacy_bv1_8.rs index caa251c..e02e7dc 100644 --- a/src/protocols/minecraft/protocol/legacy_bv1_8.rs +++ b/src/protocols/minecraft/protocol/legacy_bv1_8.rs @@ -51,9 +51,9 @@ impl LegacyBV1_8 { Ok(Response { version_name: "Beta 1.8+".to_string(), version_protocol: -1, - max_players, - online_players, - sample_players: None, + players_maximum: max_players, + players_online: online_players, + players_sample: None, description, favicon: None, previews_chat: None, diff --git a/src/protocols/minecraft/protocol/legacy_v1_4.rs b/src/protocols/minecraft/protocol/legacy_v1_4.rs index e201dd1..cdd5a95 100644 --- a/src/protocols/minecraft/protocol/legacy_v1_4.rs +++ b/src/protocols/minecraft/protocol/legacy_v1_4.rs @@ -56,9 +56,9 @@ impl LegacyV1_4 { Ok(Response { version_name: "1.4+".to_string(), version_protocol: -1, - max_players, - online_players, - sample_players: None, + players_maximum: max_players, + players_online: online_players, + players_sample: None, description, favicon: None, previews_chat: None, diff --git a/src/protocols/minecraft/protocol/legacy_v1_6.rs b/src/protocols/minecraft/protocol/legacy_v1_6.rs index 0f80e44..da86356 100644 --- a/src/protocols/minecraft/protocol/legacy_v1_6.rs +++ b/src/protocols/minecraft/protocol/legacy_v1_6.rs @@ -64,9 +64,9 @@ impl LegacyV1_6 { Ok(Response { version_name, version_protocol, - max_players, - online_players, - sample_players: None, + players_maximum: max_players, + players_online: online_players, + players_sample: None, description, favicon: None, previews_chat: None, diff --git a/src/protocols/minecraft/types.rs b/src/protocols/minecraft/types.rs index e95e098..b974b73 100644 --- a/src/protocols/minecraft/types.rs +++ b/src/protocols/minecraft/types.rs @@ -46,11 +46,11 @@ pub struct Response { /// Version protocol, example: 760 (for 1.19.2). pub version_protocol: i32, /// Number of server capacity. - pub max_players: u32, + pub players_maximum: u32, /// Number of online players. - pub online_players: u32, + pub players_online: u32, /// Some online players (can be missing). - pub sample_players: Option>, + pub players_sample: Option>, /// Server's description or MOTD. pub description: String, /// The favicon (can be missing). @@ -75,9 +75,9 @@ pub struct BedrockResponse { /// Version protocol, example: 760 (for 1.19.2). pub version_protocol: String, /// Number of server capacity. - pub max_players: u32, + pub players_maximum: u32, /// Number of online players. - pub online_players: u32, + pub players_online: u32, /// Server id. pub id: Option, /// The map. @@ -93,9 +93,9 @@ impl Response { Self { version_name: response.version_name, version_protocol: 0, - max_players: response.max_players, - online_players: response.online_players, - sample_players: None, + players_maximum: response.players_maximum, + players_online: response.players_online, + players_sample: None, description: response.name, favicon: None, previews_chat: None,