diff --git a/Cargo.lock b/Cargo.lock index 371040d9..3fe71ccb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -215,7 +215,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "azalea" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "anyhow", "azalea-auth", @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "azalea-auth" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf", "azalea-crypto", @@ -275,7 +275,7 @@ dependencies = [ [[package]] name = "azalea-block" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-block-macros", "azalea-buf", @@ -284,7 +284,7 @@ dependencies = [ [[package]] name = "azalea-block-macros" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "proc-macro2", "quote", @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "azalea-brigadier" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf", "azalea-chat", @@ -304,7 +304,7 @@ dependencies = [ [[package]] name = "azalea-buf" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf-macros", "byteorder", @@ -317,7 +317,7 @@ dependencies = [ [[package]] name = "azalea-buf-macros" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "proc-macro2", "quote", @@ -326,7 +326,7 @@ dependencies = [ [[package]] name = "azalea-chat" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf", "azalea-language", @@ -339,7 +339,7 @@ dependencies = [ [[package]] name = "azalea-client" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "anyhow", "async-compat", @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "azalea-core" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf", "azalea-chat", @@ -392,7 +392,7 @@ dependencies = [ [[package]] name = "azalea-crypto" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "aes", "azalea-buf", @@ -409,7 +409,7 @@ dependencies = [ [[package]] name = "azalea-entity" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-block", "azalea-buf", @@ -432,7 +432,7 @@ dependencies = [ [[package]] name = "azalea-inventory" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf", "azalea-chat", @@ -447,7 +447,7 @@ dependencies = [ [[package]] name = "azalea-inventory-macros" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "proc-macro2", "quote", @@ -456,7 +456,7 @@ dependencies = [ [[package]] name = "azalea-language" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "compact_str", "serde", @@ -465,7 +465,7 @@ dependencies = [ [[package]] name = "azalea-physics" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-block", "azalea-core", @@ -483,7 +483,7 @@ dependencies = [ [[package]] name = "azalea-protocol" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "anyhow", "async-recursion", @@ -519,7 +519,7 @@ dependencies = [ [[package]] name = "azalea-protocol-macros" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "proc-macro2", "quote", @@ -528,7 +528,7 @@ dependencies = [ [[package]] name = "azalea-registry" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-buf", "azalea-registry-macros", @@ -538,7 +538,7 @@ dependencies = [ [[package]] name = "azalea-registry-macros" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "quote", "syn", @@ -546,7 +546,7 @@ dependencies = [ [[package]] name = "azalea-world" -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" dependencies = [ "azalea-block", "azalea-buf", diff --git a/Cargo.toml b/Cargo.toml index 50e08267..9e6e3711 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ resolver = "2" # --- Workspace Settings --- [workspace.package] -version = "0.12.0+mc25w21a" +version = "0.12.0+mc1.21.6-pre2" edition = "2024" license = "MIT" repository = "https://github.com/azalea-rs/azalea" diff --git a/README.md b/README.md index 732faafe..03a78262 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools. -_Currently supported Minecraft version: `25w21a`._ +_Currently supported Minecraft version: `1.21.6-pre2`._ > [!WARNING] > Azalea is still unfinished, though most crates are in a useable state diff --git a/azalea-language/src/en_us.json b/azalea-language/src/en_us.json index 0ae7dfd1..b9482b2d 100644 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -2553,6 +2553,7 @@ "commands.data.storage.modified": "Modified storage %s", "commands.data.storage.query": "Storage %s has the following contents: %s", "commands.datapack.create.already_exists": "Pack with name '%s' already exists", + "commands.datapack.create.invalid_full_name": "Invalid new pack name '%s'", "commands.datapack.create.invalid_name": "Invalid characters in new pack name '%s'", "commands.datapack.create.io_failure": "Can't create pack with name '%s', check logs", "commands.datapack.create.metadata_encode_failure": "Failed to encode metadata for pack with name '%s': %s", @@ -3947,6 +3948,8 @@ "gui.toTitle": "Back to Title Screen", "gui.toWorld": "Back to World List", "gui.up": "Up", + "gui.waitingForResponse.button.inactive": "Back (%ss)", + "gui.waitingForResponse.title": "Waiting for Server", "gui.yes": "Yes", "hanging_sign.edit": "Edit Hanging Sign Message", "instrument.minecraft.admire_goat_horn": "Admire", @@ -4878,6 +4881,7 @@ "key.mouse.right": "Right Button", "key.pickItem": "Pick Block", "key.playerlist": "List Players", + "key.quickActions": "Quick Actions", "key.right": "Strafe Right", "key.saveToolbarActivator": "Save Hotbar Activator", "key.screenshot": "Take Screenshot", @@ -5278,6 +5282,8 @@ "menu.playdemo": "Play Demo World", "menu.playerReporting": "Player Reporting", "menu.preparingSpawn": "Preparing spawn area: %s%%", + "menu.quick_actions": "Quick Actions...", + "menu.quick_actions.title": "Quick Actions", "menu.quit": "Quit Game", "menu.reportBugs": "Report Bugs", "menu.resetdemo": "Reset Demo World", @@ -6137,10 +6143,10 @@ "snbt.parser.undescore_not_allowed": "Underscore characters are not allowed at the start or end of a number", "soundCategory.ambient": "Ambient/Environment", "soundCategory.block": "Blocks", - "soundCategory.hostile": "Hostile Creatures", + "soundCategory.hostile": "Hostile Mobs", "soundCategory.master": "Master Volume", "soundCategory.music": "Music", - "soundCategory.neutral": "Friendly Creatures", + "soundCategory.neutral": "Friendly Mobs", "soundCategory.player": "Players", "soundCategory.record": "Jukebox/Note Blocks", "soundCategory.voice": "Voice/Speech", diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 64302017..3d1b06ab 100644 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -11,8 +11,8 @@ use azalea_buf::{AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError}; use crate::read::ReadPacketError; -pub const PROTOCOL_VERSION: i32 = 1073742075; -pub const VERSION_NAME: &str = "25w21a"; +pub const PROTOCOL_VERSION: i32 = 1073742077; +pub const VERSION_NAME: &str = "1.21.6-pre2"; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum ConnectionProtocol { diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index 0d06ea35..a31743b1 100644 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -6819,8 +6819,6 @@ enum DialogKind { ServerLinks => "minecraft:server_links", DialogList => "minecraft:dialog_list", MultiAction => "minecraft:multi_action", - MultiActionInputForm => "minecraft:multi_action_input_form", - SimpleInputForm => "minecraft:simple_input_form", Confirmation => "minecraft:confirmation", } } @@ -6835,9 +6833,15 @@ enum InputControlKind { } registry! { -enum SubmitMethodKind { - CommandTemplate => "minecraft:command_template", - CustomTemplate => "minecraft:custom_template", - CustomForm => "minecraft:custom_form", +enum DialogActionKind { + OpenUrl => "minecraft:open_url", + RunCommand => "minecraft:run_command", + SuggestCommand => "minecraft:suggest_command", + ShowDialog => "minecraft:show_dialog", + ChangePage => "minecraft:change_page", + CopyToClipboard => "minecraft:copy_to_clipboard", + Custom => "minecraft:custom", + DynamicRunCommand => "minecraft:dynamic/run_command", + DynamicCustom => "minecraft:dynamic/custom", } }