1.20-pre5

5 files changed, 15 insertions, 16 deletions

diff --git a/README.md b/README.md
index c9328ea3..5867fddb 100755
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.
 </p>
 
 <!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->
-*Currently supported Minecraft version: `1.20-pre2`.*
+*Currently supported Minecraft version: `1.20-pre5`.*
 
 ## ⚠️ Azalea is still very unfinished, though most crates are in a somewhat useable state
 
diff --git a/azalea-language/src/en_us.json b/azalea-language/src/en_us.json
index ef51d242..0888fa83 100755
--- a/azalea-language/src/en_us.json
+++ b/azalea-language/src/en_us.json
@@ -2237,7 +2237,7 @@
   "commands.banip.invalid": "Invalid IP address or unknown player",
   "commands.banip.success": "Banned IP %s: %s",
   "commands.banlist.entry": "%s was banned by %s: %s",
-  "commands.banlist.list": "There is/are %s ban(s):",
+  "commands.banlist.list": "There are %s ban(s):",
   "commands.banlist.none": "There are no bans",
   "commands.bossbar.create.failed": "A bossbar already exists with the ID '%s'",
   "commands.bossbar.create.success": "Created custom bossbar %s",
@@ -2248,7 +2248,7 @@
   "commands.bossbar.get.visible.hidden": "Custom bossbar %s is currently hidden",
   "commands.bossbar.get.visible.visible": "Custom bossbar %s is currently shown",
   "commands.bossbar.list.bars.none": "There are no custom bossbars active",
-  "commands.bossbar.list.bars.some": "There is/are %s custom bossbar(s) active: %s",
+  "commands.bossbar.list.bars.some": "There are %s custom bossbar(s) active: %s",
   "commands.bossbar.remove.success": "Removed custom bossbar %s",
   "commands.bossbar.set.color.success": "Custom bossbar %s has changed color",
   "commands.bossbar.set.color.unchanged": "Nothing changed. That's already the color of this bossbar",
@@ -2302,9 +2302,9 @@
   "commands.datapack.enable.failed": "Pack '%s' is already enabled!",
   "commands.datapack.enable.failed.no_flags": "Pack '%s' cannot be enabled, since required flags are not enabled in this world: %s!",
   "commands.datapack.list.available.none": "There are no more data packs available",
-  "commands.datapack.list.available.success": "There is/are %s data pack(s) available: %s",
+  "commands.datapack.list.available.success": "There are %s data pack(s) available: %s",
   "commands.datapack.list.enabled.none": "There are no data packs enabled",
-  "commands.datapack.list.enabled.success": "There is/are %s data pack(s) enabled: %s",
+  "commands.datapack.list.enabled.success": "There are %s data pack(s) enabled: %s",
   "commands.datapack.modify.disable": "Disabling data pack %s",
   "commands.datapack.modify.enable": "Enabling data pack %s",
   "commands.datapack.unknown": "Unknown data pack '%s'",
@@ -2487,7 +2487,7 @@
   "commands.scoreboard.objectives.display.cleared": "Cleared any objectives in display slot %s",
   "commands.scoreboard.objectives.display.set": "Set display slot %s to show objective %s",
   "commands.scoreboard.objectives.list.empty": "There are no objectives",
-  "commands.scoreboard.objectives.list.success": "There is/are %s objective(s): %s",
+  "commands.scoreboard.objectives.list.success": "There are %s objective(s): %s",
   "commands.scoreboard.objectives.modify.displayname": "Changed the display name of %s to %s",
   "commands.scoreboard.objectives.modify.rendertype": "Changed the render type of objective %s",
   "commands.scoreboard.objectives.remove.success": "Removed objective %s",
@@ -2503,7 +2503,7 @@
   "commands.scoreboard.players.list.entity.empty": "%s has no scores to show",
   "commands.scoreboard.players.list.entity.entry": "%s: %s",
   "commands.scoreboard.players.list.entity.success": "%s has %s score(s):",
-  "commands.scoreboard.players.list.success": "There is/are %s tracked entity/entities: %s",
+  "commands.scoreboard.players.list.success": "There are %s tracked entity/entities: %s",
   "commands.scoreboard.players.operation.success.multiple": "Updated %s for %s entities",
   "commands.scoreboard.players.operation.success.single": "Set %s for %s to %s",
   "commands.scoreboard.players.remove.success.multiple": "Removed %s from %s for %s entities",
@@ -2560,7 +2560,7 @@
   "commands.team.list.members.empty": "There are no members on team %s",
   "commands.team.list.members.success": "Team %s has %s member(s): %s",
   "commands.team.list.teams.empty": "There are no teams",
-  "commands.team.list.teams.success": "There is/are %s team(s): %s",
+  "commands.team.list.teams.success": "There are %s team(s): %s",
   "commands.team.option.collisionRule.success": "Collision rule for team %s is now \"%s\"",
   "commands.team.option.collisionRule.unchanged": "Nothing changed. Collision rule is already that value",
   "commands.team.option.color.success": "Updated the color for team %s to %s",
@@ -2616,7 +2616,7 @@
   "commands.whitelist.alreadyOn": "Whitelist is already turned on",
   "commands.whitelist.disabled": "Whitelist is now turned off",
   "commands.whitelist.enabled": "Whitelist is now turned on",
-  "commands.whitelist.list": "There is/are %s whitelisted player(s): %s",
+  "commands.whitelist.list": "There are %s whitelisted player(s): %s",
   "commands.whitelist.none": "There are no whitelisted players",
   "commands.whitelist.reloaded": "Reloaded the whitelist",
   "commands.whitelist.remove.failed": "Player is not whitelisted",
@@ -4246,7 +4246,7 @@
   "key.keyboard.slash": "/",
   "key.keyboard.space": "Space",
   "key.keyboard.tab": "Tab",
-  "key.keyboard.unknown": "Not bound",
+  "key.keyboard.unknown": "Not Bound",
   "key.keyboard.up": "Up Arrow",
   "key.keyboard.world.1": "World 1",
   "key.keyboard.world.2": "World 2",
@@ -4367,6 +4367,7 @@
   "mco.configure.world.name": "Realm name",
   "mco.configure.world.opening": "Opening the realm...",
   "mco.configure.world.players.error": "A player with the provided name does not exist",
+  "mco.configure.world.players.inviting": "Inviting player...",
   "mco.configure.world.players.title": "Players",
   "mco.configure.world.pvp": "PVP",
   "mco.configure.world.reset.question.line1": "Your world will be regenerated and your current world will be lost",
@@ -4449,8 +4450,8 @@
   "mco.errorMessage.6008": "Invalid Realm name",
   "mco.errorMessage.6009": "Invalid Realm description",
   "mco.errorMessage.connectionFailure": "An error occurred, please try again later.",
-  "mco.errorMessage.generic": "An error occured: ",
-  "mco.errorMessage.realmsService": "An error occured (%s):",
+  "mco.errorMessage.generic": "An error occurred: ",
+  "mco.errorMessage.realmsService": "An error occurred (%s):",
   "mco.errorMessage.realmsService.realmsError": "Realms (%s):",
   "mco.errorMessage.serviceBusy": "Realms is busy at the moment.\nPlease try connecting to your Realm again in a couple of minutes.",
   "mco.gui.button": "Button",
diff --git a/azalea-protocol/src/packets/game/clientbound_player_combat_end_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_combat_end_packet.rs
index 67d29e93..dafb839f 100755
--- a/azalea-protocol/src/packets/game/clientbound_player_combat_end_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_player_combat_end_packet.rs
@@ -1,10 +1,9 @@
 use azalea_buf::McBuf;
 use azalea_protocol_macros::ClientboundGamePacket;
 
-/// Unused in vanilla.
+/// Unused by the client in vanilla.
 #[derive(Clone, Debug, McBuf, ClientboundGamePacket)]
 pub struct ClientboundPlayerCombatEndPacket {
     #[var]
     pub duration: u32,
-    pub killer_id: u32,
 }
diff --git a/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs
index eae96f65..c309342f 100755
--- a/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_player_combat_kill_packet.rs
@@ -7,6 +7,5 @@ use azalea_protocol_macros::ClientboundGamePacket;
 pub struct ClientboundPlayerCombatKillPacket {
     #[var]
     pub player_id: u32,
-    pub killer_id: u32,
     pub message: FormattedText,
 }
diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs
index 98e0d091..814fe121 100755
--- a/azalea-protocol/src/packets/mod.rs
+++ b/azalea-protocol/src/packets/mod.rs
@@ -10,7 +10,7 @@ use std::io::{Cursor, Write};
 // TODO: rename the packet files to just like clientbound_add_entity instead of
 // clientbound_add_entity_packet
 
-pub const PROTOCOL_VERSION: u32 = 1073741959;
+pub const PROTOCOL_VERSION: u32 = 1073741962;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ConnectionProtocol {