From 64e084934e110bbf4187fdbb44d870381ac6a816 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 28 Apr 2023 17:00:20 +0000 Subject: 23w17a --- README.md | 2 +- azalea-language/src/en_us.json | 17 +++++++++++++++++ .../game/clientbound_level_chunk_with_light_packet.rs | 10 +++++----- .../game/clientbound_section_blocks_update_packet.rs | 3 ++- azalea-protocol/src/packets/mod.rs | 2 +- azalea-registry/src/lib.rs | 10 +++++++++- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 330d13a3..e9f9a528 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.

-*Currently supported Minecraft version: `23w16a`.* +*Currently supported Minecraft version: `23w17a`.* ## ⚠️ 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 8cfda68a..fbd6549e 100755 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -19,6 +19,10 @@ "advancements.adventure.avoid_vibration.title": "Sneak 100", "advancements.adventure.bullseye.description": "Hit the bullseye of a Target block from at least 30 meters away", "advancements.adventure.bullseye.title": "Bullseye", + "advancements.adventure.craft_decorated_pot_using_only_sherds.description": "Make a Decorated Pot out of 4 Pottery Sherds", + "advancements.adventure.craft_decorated_pot_using_only_sherds.title": "Careful restoration", + "advancements.adventure.trim_with_any_armor_pattern.description": "Craft a trimmed armor at a Smithing Table", + "advancements.adventure.trim_with_any_armor_pattern.title": "Crafting a new look", "advancements.adventure.fall_from_world_height.description": "Free fall from the top of the world (build limit) to the bottom of the world and survive", "advancements.adventure.fall_from_world_height.title": "Caves & Cliffs", "advancements.adventure.hero_of_the_village.description": "Successfully defend a village from a raid", @@ -37,12 +41,16 @@ "advancements.adventure.ol_betsy.title": "Ol' Betsy", "advancements.adventure.play_jukebox_in_meadows.description": "Make the Meadows come alive with the sound of music from a Jukebox", "advancements.adventure.play_jukebox_in_meadows.title": "Sound of Music", + "advancements.adventure.salvage_sherd.description": "Brush a Suspicious block to obtain a Pottery Sherd", + "advancements.adventure.salvage_sherd.title": "Respecting the remnants", "advancements.adventure.root.description": "Adventure, exploration and combat", "advancements.adventure.root.title": "Adventure", "advancements.adventure.shoot_arrow.description": "Shoot something with an Arrow", "advancements.adventure.shoot_arrow.title": "Take Aim", "advancements.adventure.sleep_in_bed.description": "Sleep in a Bed to change your respawn point", "advancements.adventure.sleep_in_bed.title": "Sweet Dreams", + "advancements.adventure.trim_with_all_exclusive_armor_patterns.description": "Apply these smithing templates at least once: Spire, Snout, Rib, Ward, Silence, Vex, Tide, Wayfinder", + "advancements.adventure.trim_with_all_exclusive_armor_patterns.title": "Smithing with style", "advancements.adventure.sniper_duel.description": "Kill a Skeleton from at least 50 meters away", "advancements.adventure.sniper_duel.title": "Sniper Duel", "advancements.adventure.spyglass_at_dragon.description": "Look at the Ender Dragon through a Spyglass", @@ -104,6 +112,8 @@ "advancements.husbandry.breed_an_animal.title": "The Parrots and the Bats", "advancements.husbandry.complete_catalogue.description": "Tame all Cat variants!", "advancements.husbandry.complete_catalogue.title": "A Complete Catalogue", + "advancements.husbandry.feed_snifflet.description": "Feed a Snifflet", + "advancements.husbandry.feed_snifflet.title": "Little sniffs", "advancements.husbandry.fishy_business.description": "Catch a fish", "advancements.husbandry.fishy_business.title": "Fishy Business", "advancements.husbandry.froglights.description": "Have all Froglights in your inventory", @@ -116,8 +126,12 @@ "advancements.husbandry.make_a_sign_glow.title": "Glow and Behold!", "advancements.husbandry.netherite_hoe.description": "Use a Netherite Ingot to upgrade a Hoe, and then reevaluate your life choices", "advancements.husbandry.netherite_hoe.title": "Serious Dedication", + "advancements.husbandry.obtain_sniffer_egg.description": "Obtain a Sniffer Egg", + "advancements.husbandry.obtain_sniffer_egg.title": "Smells interesting", "advancements.husbandry.plant_seed.description": "Plant a seed and watch it grow", "advancements.husbandry.plant_seed.title": "A Seedy Place", + "advancements.husbandry.plant_any_sniffer_seed.description": "Plant any Sniffer seed", + "advancements.husbandry.plant_any_sniffer_seed.title": "Planting the past", "advancements.husbandry.ride_a_boat_with_a_goat.description": "Get in a Boat and float with a Goat", "advancements.husbandry.ride_a_boat_with_a_goat.title": "Whatever Floats Your Goat!", "advancements.husbandry.root.description": "The world is full of friends and food", @@ -3789,6 +3803,8 @@ "item.minecraft.music_disc_otherside.desc": "Lena Raine - otherside", "item.minecraft.music_disc_pigstep": "Music Disc", "item.minecraft.music_disc_pigstep.desc": "Lena Raine - Pigstep", + "item.minecraft.music_disc_relic": "Music Disc", + "item.minecraft.music_disc_relic.desc": "Aaron Cherof - Relic", "item.minecraft.music_disc_stal": "Music Disc", "item.minecraft.music_disc_stal.desc": "C418 - stal", "item.minecraft.music_disc_strad": "Music Disc", @@ -4532,6 +4548,7 @@ "multiplayer.disconnect.invalid_player_data": "Invalid player data", "multiplayer.disconnect.invalid_player_movement": "Invalid move player packet received", "multiplayer.disconnect.invalid_public_key_signature": "Invalid signature for profile public key.\nTry restarting your game.", + "multiplayer.disconnect.invalid_public_key_signature.new": "Invalid signature for profile public key.\nTry restarting your game.", "multiplayer.disconnect.invalid_vehicle_movement": "Invalid move vehicle packet received", "multiplayer.disconnect.ip_banned": "You have been IP banned from this server", "multiplayer.disconnect.kicked": "Kicked by an operator", diff --git a/azalea-protocol/src/packets/game/clientbound_level_chunk_with_light_packet.rs b/azalea-protocol/src/packets/game/clientbound_level_chunk_with_light_packet.rs index 30813013..2fc00f83 100755 --- a/azalea-protocol/src/packets/game/clientbound_level_chunk_with_light_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_level_chunk_with_light_packet.rs @@ -1,4 +1,5 @@ use azalea_buf::McBuf; +use azalea_nbt::Nbt; use azalea_protocol_macros::ClientboundGamePacket; use super::clientbound_light_update_packet::ClientboundLightUpdatePacketData; @@ -13,8 +14,8 @@ pub struct ClientboundLevelChunkWithLightPacket { #[derive(Clone, Debug, McBuf)] pub struct ClientboundLevelChunkPacketData { - pub heightmaps: azalea_nbt::Nbt, - // we can't parse the data in azalea-protocol because it dependso on context from other packets + pub heightmaps: Nbt, + // we can't parse the data in azalea-protocol because it depends on context from other packets pub data: Vec, pub block_entities: Vec, } @@ -23,7 +24,6 @@ pub struct ClientboundLevelChunkPacketData { pub struct BlockEntity { pub packed_xz: u8, pub y: u16, - #[var] - pub type_: i32, - pub data: azalea_nbt::Nbt, + pub kind: azalea_registry::BlockEntityKind, + pub data: Nbt, } diff --git a/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs b/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs index 1ea9f676..4b830fd5 100755 --- a/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs @@ -1,10 +1,11 @@ +use std::io::{Cursor, Write}; + use azalea_block::BlockState; use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; use azalea_core::{ChunkSectionBlockPos, ChunkSectionPos}; use azalea_protocol_macros::ClientboundGamePacket; -use std::io::{Cursor, Write}; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] pub struct ClientboundSectionBlocksUpdatePacket { diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 1ed87b1b..62530927 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 = 1073741955; +pub const PROTOCOL_VERSION: u32 = 1073741956; #[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 1cea7afd..e6493cb5 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -2823,6 +2823,7 @@ enum Item { MusicDisc11 => "minecraft:music_disc_11", MusicDiscWait => "minecraft:music_disc_wait", MusicDiscOtherside => "minecraft:music_disc_otherside", + MusicDiscRelic => "minecraft:music_disc_relic", MusicDisc5 => "minecraft:music_disc_5", MusicDiscPigstep => "minecraft:music_disc_pigstep", DiscFragment5 => "minecraft:disc_fragment_5", @@ -4317,6 +4318,7 @@ enum SoundEvent { MusicDiscWait => "minecraft:music_disc.wait", MusicDiscWard => "minecraft:music_disc.ward", MusicDiscOtherside => "minecraft:music_disc.otherside", + MusicDiscRelic => "minecraft:music_disc.relic", MusicDragon => "minecraft:music.dragon", MusicEnd => "minecraft:music.end", MusicGame => "minecraft:music.game", @@ -4329,7 +4331,7 @@ enum SoundEvent { MusicOverworldJaggedPeaks => "minecraft:music.overworld.jagged_peaks", MusicOverworldLushCaves => "minecraft:music.overworld.lush_caves", MusicOverworldSwamp => "minecraft:music.overworld.swamp", - MusicOverworldJungleAndForest => "minecraft:music.overworld.jungle_and_forest", + MusicOverworldForest => "minecraft:music.overworld.forest", MusicOverworldOldGrowthTaiga => "minecraft:music.overworld.old_growth_taiga", MusicOverworldMeadow => "minecraft:music.overworld.meadow", MusicOverworldCherryGrove => "minecraft:music.overworld.cherry_grove", @@ -4339,6 +4341,12 @@ enum SoundEvent { MusicNetherSoulSandValley => "minecraft:music.nether.soul_sand_valley", MusicOverworldStonyPeaks => "minecraft:music.overworld.stony_peaks", MusicNetherWarpedForest => "minecraft:music.nether.warped_forest", + MusicOverworldFlowerForest => "minecraft:music.overworld.flower_forest", + MusicOverworldDesert => "minecraft:music.overworld.desert", + MusicOverworldBadlands => "minecraft:music.overworld.badlands", + MusicOverworldJungle => "minecraft:music.overworld.jungle", + MusicOverworldSparseJungle => "minecraft:music.overworld.sparse_jungle", + MusicOverworldBambooJungle => "minecraft:music.overworld.bamboo_jungle", MusicUnderWater => "minecraft:music.under_water", BlockNetherBricksBreak => "minecraft:block.nether_bricks.break", BlockNetherBricksStep => "minecraft:block.nether_bricks.step", -- cgit v1.2.3