diff options
| -rwxr-xr-x | README.md | 2 | ||||
| -rwxr-xr-x | azalea-language/src/en_us.json | 47 | ||||
| -rwxr-xr-x | azalea-protocol/src/packets/mod.rs | 2 | ||||
| -rwxr-xr-x | azalea-registry/src/lib.rs | 67 |
4 files changed, 70 insertions, 48 deletions
@@ -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: `23w14a`.* +*Currently supported Minecraft version: `23w16a`.* ## ⚠️ 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 72a9ea42..8cfda68a 100755 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -2363,7 +2363,9 @@ "commands.forceload.removed.single": "Unmarked chunk %s in %s for force loading", "commands.forceload.toobig": "Too many chunks in the specified area (maximum %s, specified %s)", "commands.function.success.multiple": "Executed %s command(s) from %s functions", + "commands.function.success.multiple.result": "Executed %s functions", "commands.function.success.single": "Executed %s command(s) from function '%s'", + "commands.function.success.single.result": "Function '%2$s' returned %1$s", "commands.gamemode.success.other": "Set %s's game mode to %s", "commands.gamemode.success.self": "Set own game mode to %s", "commands.gamerule.query": "Gamerule %s is currently set to: %s", @@ -3857,26 +3859,26 @@ "item.minecraft.potion.effect.water": "Water Bottle", "item.minecraft.potion.effect.water_breathing": "Potion of Water Breathing", "item.minecraft.potion.effect.weakness": "Potion of Weakness", - "item.minecraft.angler_pottery_shard": "Angler Pottery Shard", - "item.minecraft.archer_pottery_shard": "Archer Pottery Shard", - "item.minecraft.arms_up_pottery_shard": "Arms Up Pottery Shard", - "item.minecraft.blade_pottery_shard": "Blade Pottery Shard", - "item.minecraft.brewer_pottery_shard": "Brewer Pottery Shard", - "item.minecraft.burn_pottery_shard": "Burn Pottery Shard", - "item.minecraft.danger_pottery_shard": "Danger Pottery Shard", - "item.minecraft.explorer_pottery_shard": "Explorer Pottery Shard", - "item.minecraft.friend_pottery_shard": "Friend Pottery Shard", - "item.minecraft.heart_pottery_shard": "Heart Pottery Shard", - "item.minecraft.heartbreak_pottery_shard": "Heartbreak Pottery Shard", - "item.minecraft.howl_pottery_shard": "Howl Pottery Shard", - "item.minecraft.miner_pottery_shard": "Miner Pottery Shard", - "item.minecraft.mourner_pottery_shard": "Mourner Pottery Shard", - "item.minecraft.plenty_pottery_shard": "Plenty Pottery Shard", - "item.minecraft.prize_pottery_shard": "Prize Pottery Shard", - "item.minecraft.sheaf_pottery_shard": "Sheaf Pottery Shard", - "item.minecraft.shelter_pottery_shard": "Shelter Pottery Shard", - "item.minecraft.skull_pottery_shard": "Skull Pottery Shard", - "item.minecraft.snort_pottery_shard": "Snort Pottery Shard", + "item.minecraft.angler_pottery_sherd": "Angler Pottery Sherd", + "item.minecraft.archer_pottery_sherd": "Archer Pottery Sherd", + "item.minecraft.arms_up_pottery_sherd": "Arms Up Pottery Sherd", + "item.minecraft.blade_pottery_sherd": "Blade Pottery Sherd", + "item.minecraft.brewer_pottery_sherd": "Brewer Pottery Sherd", + "item.minecraft.burn_pottery_sherd": "Burn Pottery Sherd", + "item.minecraft.danger_pottery_sherd": "Danger Pottery Sherd", + "item.minecraft.explorer_pottery_sherd": "Explorer Pottery Sherd", + "item.minecraft.friend_pottery_sherd": "Friend Pottery Sherd", + "item.minecraft.heart_pottery_sherd": "Heart Pottery Sherd", + "item.minecraft.heartbreak_pottery_sherd": "Heartbreak Pottery Sherd", + "item.minecraft.howl_pottery_sherd": "Howl Pottery Sherd", + "item.minecraft.miner_pottery_sherd": "Miner Pottery Sherd", + "item.minecraft.mourner_pottery_sherd": "Mourner Pottery Sherd", + "item.minecraft.plenty_pottery_sherd": "Plenty Pottery Sherd", + "item.minecraft.prize_pottery_sherd": "Prize Pottery Sherd", + "item.minecraft.sheaf_pottery_sherd": "Sheaf Pottery Sherd", + "item.minecraft.shelter_pottery_sherd": "Shelter Pottery Sherd", + "item.minecraft.skull_pottery_sherd": "Skull Pottery Sherd", + "item.minecraft.snort_pottery_sherd": "Snort Pottery Sherd", "item.minecraft.powder_snow_bucket": "Powder Snow Bucket", "item.minecraft.prismarine_crystals": "Prismarine Crystals", "item.minecraft.prismarine_shard": "Prismarine Shard", @@ -5355,8 +5357,9 @@ "subtitles.block.sign.waxed_interact_fail": "Sign wobbles", "subtitles.block.smithing_table.use": "Smithing Table used", "subtitles.block.smoker.smoke": "Smoker smokes", - "subtitles.block.sniffer.egg_crack": "Sniffer Egg cracks", - "subtitles.block.sniffer.egg_hatch": "Sniffer Egg hatches", + "subtitles.block.sniffer_egg.plop": "Sniffer plops", + "subtitles.block.sniffer_egg.crack": "Sniffer Egg cracks", + "subtitles.block.sniffer_egg.hatch": "Sniffer Egg hatches", "subtitles.block.sweet_berry_bush.pick_berries": "Berries pop", "subtitles.block.trapdoor.toggle": "Trapdoor creaks", "subtitles.block.tripwire.attach": "Tripwire attaches", diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 7639378e..1ed87b1b 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 = 1073741954; +pub const PROTOCOL_VERSION: u32 = 1073741955; #[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 acdcd676..1cea7afd 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -1243,11 +1243,10 @@ enum ChunkStatus { Noise => "minecraft:noise", Surface => "minecraft:surface", Carvers => "minecraft:carvers", - LiquidCarvers => "minecraft:liquid_carvers", Features => "minecraft:features", + InitializeLight => "minecraft:initialize_light", Light => "minecraft:light", Spawn => "minecraft:spawn", - Heightmaps => "minecraft:heightmaps", Full => "minecraft:full", } } @@ -2923,26 +2922,26 @@ enum Item { SilenceArmorTrimSmithingTemplate => "minecraft:silence_armor_trim_smithing_template", RaiserArmorTrimSmithingTemplate => "minecraft:raiser_armor_trim_smithing_template", HostArmorTrimSmithingTemplate => "minecraft:host_armor_trim_smithing_template", - AnglerPotteryShard => "minecraft:angler_pottery_shard", - ArcherPotteryShard => "minecraft:archer_pottery_shard", - ArmsUpPotteryShard => "minecraft:arms_up_pottery_shard", - BladePotteryShard => "minecraft:blade_pottery_shard", - BrewerPotteryShard => "minecraft:brewer_pottery_shard", - BurnPotteryShard => "minecraft:burn_pottery_shard", - DangerPotteryShard => "minecraft:danger_pottery_shard", - ExplorerPotteryShard => "minecraft:explorer_pottery_shard", - FriendPotteryShard => "minecraft:friend_pottery_shard", - HeartPotteryShard => "minecraft:heart_pottery_shard", - HeartbreakPotteryShard => "minecraft:heartbreak_pottery_shard", - HowlPotteryShard => "minecraft:howl_pottery_shard", - MinerPotteryShard => "minecraft:miner_pottery_shard", - MournerPotteryShard => "minecraft:mourner_pottery_shard", - PlentyPotteryShard => "minecraft:plenty_pottery_shard", - PrizePotteryShard => "minecraft:prize_pottery_shard", - SheafPotteryShard => "minecraft:sheaf_pottery_shard", - ShelterPotteryShard => "minecraft:shelter_pottery_shard", - SkullPotteryShard => "minecraft:skull_pottery_shard", - SnortPotteryShard => "minecraft:snort_pottery_shard", + AnglerPotterySherd => "minecraft:angler_pottery_sherd", + ArcherPotterySherd => "minecraft:archer_pottery_sherd", + ArmsUpPotterySherd => "minecraft:arms_up_pottery_sherd", + BladePotterySherd => "minecraft:blade_pottery_sherd", + BrewerPotterySherd => "minecraft:brewer_pottery_sherd", + BurnPotterySherd => "minecraft:burn_pottery_sherd", + DangerPotterySherd => "minecraft:danger_pottery_sherd", + ExplorerPotterySherd => "minecraft:explorer_pottery_sherd", + FriendPotterySherd => "minecraft:friend_pottery_sherd", + HeartPotterySherd => "minecraft:heart_pottery_sherd", + HeartbreakPotterySherd => "minecraft:heartbreak_pottery_sherd", + HowlPotterySherd => "minecraft:howl_pottery_sherd", + MinerPotterySherd => "minecraft:miner_pottery_sherd", + MournerPotterySherd => "minecraft:mourner_pottery_sherd", + PlentyPotterySherd => "minecraft:plenty_pottery_sherd", + PrizePotterySherd => "minecraft:prize_pottery_sherd", + SheafPotterySherd => "minecraft:sheaf_pottery_sherd", + ShelterPotterySherd => "minecraft:shelter_pottery_sherd", + SkullPotterySherd => "minecraft:skull_pottery_sherd", + SnortPotterySherd => "minecraft:snort_pottery_sherd", } } @@ -4748,8 +4747,9 @@ enum SoundEvent { EntitySnifferDigging => "minecraft:entity.sniffer.digging", EntitySnifferDiggingStop => "minecraft:entity.sniffer.digging_stop", EntitySnifferHappy => "minecraft:entity.sniffer.happy", - BlockSnifferEggCrack => "minecraft:block.sniffer.egg_crack", - BlockSnifferEggHatch => "minecraft:block.sniffer.egg_hatch", + BlockSnifferEggPlop => "minecraft:block.sniffer_egg.plop", + BlockSnifferEggCrack => "minecraft:block.sniffer_egg.crack", + BlockSnifferEggHatch => "minecraft:block.sniffer_egg.hatch", EntitySnowballThrow => "minecraft:entity.snowball.throw", BlockSnowBreak => "minecraft:block.snow.break", BlockSnowFall => "minecraft:block.snow.fall", @@ -5421,3 +5421,22 @@ enum RuleBlockEntityModifier { AppendLoot => "minecraft:append_loot", } } + +registry! { +enum CreativeModeTab { + BuildingBlocks => "minecraft:building_blocks", + ColoredBlocks => "minecraft:colored_blocks", + NaturalBlocks => "minecraft:natural_blocks", + FunctionalBlocks => "minecraft:functional_blocks", + RedstoneBlocks => "minecraft:redstone_blocks", + Hotbar => "minecraft:hotbar", + Search => "minecraft:search", + ToolsAndUtilities => "minecraft:tools_and_utilities", + Combat => "minecraft:combat", + FoodAndDrinks => "minecraft:food_and_drinks", + Ingredients => "minecraft:ingredients", + SpawnEggs => "minecraft:spawn_eggs", + OpBlocks => "minecraft:op_blocks", + Inventory => "minecraft:inventory", +} +} |