diff --git a/Cargo.lock b/Cargo.lock index fdaaac3b..0aa19914 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,7 +209,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "azalea" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "anyhow", "azalea-auth", @@ -249,7 +249,7 @@ dependencies = [ [[package]] name = "azalea-auth" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf", "azalea-crypto", @@ -269,7 +269,7 @@ dependencies = [ [[package]] name = "azalea-block" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-block-macros", "azalea-buf", @@ -278,7 +278,7 @@ dependencies = [ [[package]] name = "azalea-block-macros" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "proc-macro2", "quote", @@ -287,7 +287,7 @@ dependencies = [ [[package]] name = "azalea-brigadier" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf", "azalea-chat", @@ -298,7 +298,7 @@ dependencies = [ [[package]] name = "azalea-buf" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf-macros", "byteorder", @@ -311,7 +311,7 @@ dependencies = [ [[package]] name = "azalea-buf-macros" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "proc-macro2", "quote", @@ -320,7 +320,7 @@ dependencies = [ [[package]] name = "azalea-chat" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf", "azalea-language", @@ -333,7 +333,7 @@ dependencies = [ [[package]] name = "azalea-client" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "anyhow", "async-compat", @@ -370,7 +370,7 @@ dependencies = [ [[package]] name = "azalea-core" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf", "azalea-chat", @@ -386,7 +386,7 @@ dependencies = [ [[package]] name = "azalea-crypto" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "aes", "azalea-buf", @@ -403,7 +403,7 @@ dependencies = [ [[package]] name = "azalea-entity" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-block", "azalea-buf", @@ -426,7 +426,7 @@ dependencies = [ [[package]] name = "azalea-inventory" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf", "azalea-chat", @@ -441,7 +441,7 @@ dependencies = [ [[package]] name = "azalea-inventory-macros" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "proc-macro2", "quote", @@ -450,7 +450,7 @@ dependencies = [ [[package]] name = "azalea-language" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "compact_str", "serde", @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "azalea-physics" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-block", "azalea-core", @@ -477,7 +477,7 @@ dependencies = [ [[package]] name = "azalea-protocol" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "anyhow", "async-recursion", @@ -513,7 +513,7 @@ dependencies = [ [[package]] name = "azalea-protocol-macros" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "proc-macro2", "quote", @@ -522,7 +522,7 @@ dependencies = [ [[package]] name = "azalea-registry" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-buf", "azalea-registry-macros", @@ -532,7 +532,7 @@ dependencies = [ [[package]] name = "azalea-registry-macros" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "quote", "syn", @@ -540,7 +540,7 @@ dependencies = [ [[package]] name = "azalea-world" -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" dependencies = [ "azalea-block", "azalea-buf", diff --git a/Cargo.toml b/Cargo.toml index ea5da33e..faec34e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ resolver = "2" # --- Workspace Settings --- [workspace.package] -version = "0.13.0+mc1.21.6" +version = "0.13.0+mc1.21.7-rc1" edition = "2024" license = "MIT" repository = "https://github.com/azalea-rs/azalea" diff --git a/README.md b/README.md index 5ac72b45..9b51c0ef 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: `1.21.6`._ +_Currently supported Minecraft version: `1.21.7-rc1`._ > [!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 32f997bf..dcce9a30 100644 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -4355,6 +4355,8 @@ "item.minecraft.music_disc_creator.desc": "Lena Raine - Creator", "item.minecraft.music_disc_far": "Music Disc", "item.minecraft.music_disc_far.desc": "C418 - far", + "item.minecraft.music_disc_lava_chicken": "Music Disc", + "item.minecraft.music_disc_lava_chicken.desc": "Hyper Potions - Lava Chicken", "item.minecraft.music_disc_mall": "Music Disc", "item.minecraft.music_disc_mall.desc": "C418 - mall", "item.minecraft.music_disc_mellohi": "Music Disc", @@ -4751,6 +4753,7 @@ "jukebox_song.minecraft.creator": "Lena Raine - Creator", "jukebox_song.minecraft.creator_music_box": "Lena Raine - Creator (Music Box)", "jukebox_song.minecraft.far": "C418 - far", + "jukebox_song.minecraft.lava_chicken": "Hyper Potions - Lava Chicken", "jukebox_song.minecraft.mall": "C418 - mall", "jukebox_song.minecraft.mellohi": "C418 - mellohi", "jukebox_song.minecraft.otherside": "Lena Raine - otherside", @@ -5816,6 +5819,8 @@ "painting.minecraft.courbet.title": "Bonjour Monsieur Courbet", "painting.minecraft.creebet.author": "Kristoffer Zetterstrand", "painting.minecraft.creebet.title": "Creebet", + "painting.minecraft.dennis.author": "Sarah Boeving", + "painting.minecraft.dennis.title": "Dennis", "painting.minecraft.donkey_kong.author": "Kristoffer Zetterstrand", "painting.minecraft.donkey_kong.title": "Kong", "painting.minecraft.earth.author": "Mojang", diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 09426b8d..1768db33 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 = 771; -pub const VERSION_NAME: &str = "1.21.6"; +pub const PROTOCOL_VERSION: i32 = 1073742081; +pub const VERSION_NAME: &str = "1.21.7-rc1"; #[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 8607426d..8ab12853 100644 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -3158,6 +3158,7 @@ enum Item { MusicDiscCreator => "minecraft:music_disc_creator", MusicDiscCreatorMusicBox => "minecraft:music_disc_creator_music_box", MusicDiscFar => "minecraft:music_disc_far", + MusicDiscLavaChicken => "minecraft:music_disc_lava_chicken", MusicDiscMall => "minecraft:music_disc_mall", MusicDiscMellohi => "minecraft:music_disc_mellohi", MusicDiscStal => "minecraft:music_disc_stal", @@ -4831,6 +4832,7 @@ enum SoundEvent { MusicDiscCat => "minecraft:music_disc.cat", MusicDiscChirp => "minecraft:music_disc.chirp", MusicDiscFar => "minecraft:music_disc.far", + MusicDiscLavaChicken => "minecraft:music_disc.lava_chicken", MusicDiscMall => "minecraft:music_disc.mall", MusicDiscMellohi => "minecraft:music_disc.mellohi", MusicDiscPigstep => "minecraft:music_disc.pigstep", diff --git a/codegen/lib/download.py b/codegen/lib/download.py index a557b523..bc2383ef 100644 --- a/codegen/lib/download.py +++ b/codegen/lib/download.py @@ -234,5 +234,5 @@ def clear_version_cache(): pumpkin_path = get_dir_location("__cache__/pumpkin-extractor") if os.path.exists(pumpkin_path): os.system( - f"cd {pumpkin_path} && git add . && git stash && git pull && git stash pop" + f"cd {pumpkin_path} && git add . && git stash && git pull && git stash pop && git checkout HEAD -- src/main/resources/fabric.mod.json" )