From 659c5fea1451c041e2dcf6d8dc3ab7bb8fd0d38c Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 30 Mar 2023 18:18:13 +0000 Subject: 23w13a --- azalea-registry/src/lib.rs | 117 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 98 insertions(+), 19 deletions(-) (limited to 'azalea-registry/src') diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index 19af0eea..eaeb6147 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -184,6 +184,7 @@ enum Block { SuspiciousSand => "minecraft:suspicious_sand", RedSand => "minecraft:red_sand", Gravel => "minecraft:gravel", + SuspiciousGravel => "minecraft:suspicious_gravel", GoldOre => "minecraft:gold_ore", DeepslateGoldOre => "minecraft:deepslate_gold_ore", IronOre => "minecraft:iron_ore", @@ -744,6 +745,8 @@ enum Block { PurpurStairs => "minecraft:purpur_stairs", EndStoneBricks => "minecraft:end_stone_bricks", TorchflowerCrop => "minecraft:torchflower_crop", + PitcherCrop => "minecraft:pitcher_crop", + PitcherPlant => "minecraft:pitcher_plant", Beetroots => "minecraft:beetroots", DirtPath => "minecraft:dirt_path", EndGateway => "minecraft:end_gateway", @@ -825,6 +828,7 @@ enum Block { KelpPlant => "minecraft:kelp_plant", DriedKelpBlock => "minecraft:dried_kelp_block", TurtleEgg => "minecraft:turtle_egg", + SnifferEgg => "minecraft:sniffer_egg", DeadTubeCoralBlock => "minecraft:dead_tube_coral_block", DeadBrainCoralBlock => "minecraft:dead_brain_coral_block", DeadBubbleCoralBlock => "minecraft:dead_bubble_coral_block", @@ -1056,6 +1060,7 @@ enum Block { TintedGlass => "minecraft:tinted_glass", PowderSnow => "minecraft:powder_snow", SculkSensor => "minecraft:sculk_sensor", + CalibratedSculkSensor => "minecraft:calibrated_sculk_sensor", Sculk => "minecraft:sculk", SculkVein => "minecraft:sculk_vein", SculkCatalyst => "minecraft:sculk_catalyst", @@ -1187,10 +1192,11 @@ enum BlockEntityKind { Campfire => "minecraft:campfire", Beehive => "minecraft:beehive", SculkSensor => "minecraft:sculk_sensor", + CalibratedSculkSensor => "minecraft:calibrated_sculk_sensor", SculkCatalyst => "minecraft:sculk_catalyst", SculkShrieker => "minecraft:sculk_shrieker", ChiseledBookshelf => "minecraft:chiseled_bookshelf", - SuspiciousSand => "minecraft:suspicious_sand", + BrushableBlock => "minecraft:brushable_block", DecoratedPot => "minecraft:decorated_pot", } } @@ -1594,7 +1600,6 @@ enum GameEvent { BlockPlace => "minecraft:block_place", ContainerClose => "minecraft:container_close", ContainerOpen => "minecraft:container_open", - DispenseFail => "minecraft:dispense_fail", Drink => "minecraft:drink", Eat => "minecraft:eat", ElytraGlide => "minecraft:elytra_glide", @@ -1619,8 +1624,6 @@ enum GameEvent { JukeboxStopPlay => "minecraft:jukebox_stop_play", LightningStrike => "minecraft:lightning_strike", NoteBlockPlay => "minecraft:note_block_play", - PistonContract => "minecraft:piston_contract", - PistonExtend => "minecraft:piston_extend", PrimeFuse => "minecraft:prime_fuse", ProjectileLand => "minecraft:projectile_land", ProjectileShoot => "minecraft:projectile_shoot", @@ -1631,6 +1634,21 @@ enum GameEvent { Step => "minecraft:step", Swim => "minecraft:swim", Teleport => "minecraft:teleport", + Resonate1 => "minecraft:resonate_1", + Resonate2 => "minecraft:resonate_2", + Resonate3 => "minecraft:resonate_3", + Resonate4 => "minecraft:resonate_4", + Resonate5 => "minecraft:resonate_5", + Resonate6 => "minecraft:resonate_6", + Resonate7 => "minecraft:resonate_7", + Resonate8 => "minecraft:resonate_8", + Resonate9 => "minecraft:resonate_9", + Resonate10 => "minecraft:resonate_10", + Resonate11 => "minecraft:resonate_11", + Resonate12 => "minecraft:resonate_12", + Resonate13 => "minecraft:resonate_13", + Resonate14 => "minecraft:resonate_14", + Resonate15 => "minecraft:resonate_15", } } @@ -1717,6 +1735,7 @@ enum Item { Bedrock => "minecraft:bedrock", Sand => "minecraft:sand", SuspiciousSand => "minecraft:suspicious_sand", + SuspiciousGravel => "minecraft:suspicious_gravel", RedSand => "minecraft:red_sand", Gravel => "minecraft:gravel", CoalOre => "minecraft:coal_ore", @@ -1880,6 +1899,7 @@ enum Item { LilyOfTheValley => "minecraft:lily_of_the_valley", WitherRose => "minecraft:wither_rose", Torchflower => "minecraft:torchflower", + PitcherPlant => "minecraft:pitcher_plant", SporeBlossom => "minecraft:spore_blossom", BrownMushroom => "minecraft:brown_mushroom", RedMushroom => "minecraft:red_mushroom", @@ -2235,6 +2255,7 @@ enum Item { RedConcretePowder => "minecraft:red_concrete_powder", BlackConcretePowder => "minecraft:black_concrete_powder", TurtleEgg => "minecraft:turtle_egg", + SnifferEgg => "minecraft:sniffer_egg", DeadTubeCoralBlock => "minecraft:dead_tube_coral_block", DeadBrainCoralBlock => "minecraft:dead_brain_coral_block", DeadBubbleCoralBlock => "minecraft:dead_bubble_coral_block", @@ -2322,6 +2343,7 @@ enum Item { LightningRod => "minecraft:lightning_rod", DaylightDetector => "minecraft:daylight_detector", SculkSensor => "minecraft:sculk_sensor", + CalibratedSculkSensor => "minecraft:calibrated_sculk_sensor", TripwireHook => "minecraft:tripwire_hook", TrappedChest => "minecraft:trapped_chest", Tnt => "minecraft:tnt", @@ -2774,6 +2796,7 @@ enum Item { ChorusFruit => "minecraft:chorus_fruit", PoppedChorusFruit => "minecraft:popped_chorus_fruit", TorchflowerSeeds => "minecraft:torchflower_seeds", + PitcherPod => "minecraft:pitcher_pod", Beetroot => "minecraft:beetroot", BeetrootSeeds => "minecraft:beetroot_seeds", BeetrootSoup => "minecraft:beetroot_soup", @@ -2895,10 +2918,31 @@ enum Item { SnoutArmorTrimSmithingTemplate => "minecraft:snout_armor_trim_smithing_template", RibArmorTrimSmithingTemplate => "minecraft:rib_armor_trim_smithing_template", SpireArmorTrimSmithingTemplate => "minecraft:spire_armor_trim_smithing_template", - PotteryShardArcher => "minecraft:pottery_shard_archer", - PotteryShardPrize => "minecraft:pottery_shard_prize", - PotteryShardArmsUp => "minecraft:pottery_shard_arms_up", - PotteryShardSkull => "minecraft:pottery_shard_skull", + WayfinderArmorTrimSmithingTemplate => "minecraft:wayfinder_armor_trim_smithing_template", + ShaperArmorTrimSmithingTemplate => "minecraft:shaper_armor_trim_smithing_template", + 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", } } @@ -3114,7 +3158,6 @@ enum Menu { Loom => "minecraft:loom", Merchant => "minecraft:merchant", ShulkerBox => "minecraft:shulker_box", - LegacySmithing => "minecraft:legacy_smithing", Smithing => "minecraft:smithing", Smoker => "minecraft:smoker", CartographyTable => "minecraft:cartography_table", @@ -3226,9 +3269,7 @@ enum ParticleKind { Firework => "minecraft:firework", Fishing => "minecraft:fishing", Flame => "minecraft:flame", - DrippingCherryLeaves => "minecraft:dripping_cherry_leaves", - FallingCherryLeaves => "minecraft:falling_cherry_leaves", - LandingCherryLeaves => "minecraft:landing_cherry_leaves", + CherryLeaves => "minecraft:cherry_leaves", SculkSoul => "minecraft:sculk_soul", SculkCharge => "minecraft:sculk_charge", SculkChargePop => "minecraft:sculk_charge_pop", @@ -3293,6 +3334,7 @@ enum ParticleKind { ElectricSpark => "minecraft:electric_spark", Scrape => "minecraft:scrape", Shriek => "minecraft:shriek", + EggCrack => "minecraft:egg_crack", } } @@ -3406,7 +3448,6 @@ enum RecipeSerializer { Smoking => "minecraft:smoking", CampfireCooking => "minecraft:campfire_cooking", Stonecutting => "minecraft:stonecutting", - Smithing => "minecraft:smithing", SmithingTransform => "minecraft:smithing_transform", SmithingTrim => "minecraft:smithing_trim", CraftingDecoratedPot => "minecraft:crafting_decorated_pot", @@ -3508,6 +3549,7 @@ enum SoundEvent { BlockAmethystBlockFall => "minecraft:block.amethyst_block.fall", BlockAmethystBlockHit => "minecraft:block.amethyst_block.hit", BlockAmethystBlockPlace => "minecraft:block.amethyst_block.place", + BlockAmethystBlockResonate => "minecraft:block.amethyst_block.resonate", BlockAmethystBlockStep => "minecraft:block.amethyst_block.step", BlockAmethystClusterBreak => "minecraft:block.amethyst_cluster.break", BlockAmethystClusterFall => "minecraft:block.amethyst_cluster.fall", @@ -3640,8 +3682,11 @@ enum SoundEvent { ItemBottleFill => "minecraft:item.bottle.fill", ItemBottleFillDragonbreath => "minecraft:item.bottle.fill_dragonbreath", BlockBrewingStandBrew => "minecraft:block.brewing_stand.brew", - ItemBrushBrushing => "minecraft:item.brush.brushing", - ItemBrushBrushSandCompleted => "minecraft:item.brush.brush_sand_completed", + ItemBrushBrushingGeneric => "minecraft:item.brush.brushing.generic", + ItemBrushBrushingSand => "minecraft:item.brush.brushing.sand", + ItemBrushBrushingGravel => "minecraft:item.brush.brushing.gravel", + ItemBrushBrushingSandComplete => "minecraft:item.brush.brushing.sand.complete", + ItemBrushBrushingGravelComplete => "minecraft:item.brush.brushing.gravel.complete", BlockBubbleColumnBubblePop => "minecraft:block.bubble_column.bubble_pop", BlockBubbleColumnUpwardsAmbient => "minecraft:block.bubble_column.upwards_ambient", BlockBubbleColumnUpwardsInside => "minecraft:block.bubble_column.upwards_inside", @@ -3952,6 +3997,11 @@ enum SoundEvent { BlockSuspiciousSandPlace => "minecraft:block.suspicious_sand.place", BlockSuspiciousSandHit => "minecraft:block.suspicious_sand.hit", BlockSuspiciousSandFall => "minecraft:block.suspicious_sand.fall", + BlockSuspiciousGravelBreak => "minecraft:block.suspicious_gravel.break", + BlockSuspiciousGravelStep => "minecraft:block.suspicious_gravel.step", + BlockSuspiciousGravelPlace => "minecraft:block.suspicious_gravel.place", + BlockSuspiciousGravelHit => "minecraft:block.suspicious_gravel.hit", + BlockSuspiciousGravelFall => "minecraft:block.suspicious_gravel.fall", BlockFroglightBreak => "minecraft:block.froglight.break", BlockFroglightFall => "minecraft:block.froglight.fall", BlockFroglightHit => "minecraft:block.froglight.hit", @@ -4696,6 +4746,8 @@ enum SoundEvent { EntitySnifferDigging => "minecraft:entity.sniffer.digging", EntitySnifferDiggingStop => "minecraft:entity.sniffer.digging_stop", EntitySnifferHappy => "minecraft:entity.sniffer.happy", + EntitySnifferEggCrack => "minecraft:entity.sniffer.egg_crack", + EntitySnifferEggHatch => "minecraft:entity.sniffer.egg_hatch", EntitySnowballThrow => "minecraft:entity.snowball.throw", BlockSnowBreak => "minecraft:block.snow.break", BlockSnowFall => "minecraft:block.snow.fall", @@ -4848,6 +4900,7 @@ enum SoundEvent { EntityWardenSonicCharge => "minecraft:entity.warden.sonic_charge", EntityWardenStep => "minecraft:entity.warden.step", EntityWardenTendrilClicks => "minecraft:entity.warden.tendril_clicks", + BlockSignWaxedInteractFail => "minecraft:block.sign.waxed_interact_fail", BlockWaterAmbient => "minecraft:block.water.ambient", WeatherRain => "minecraft:weather.rain", WeatherRainAbove => "minecraft:weather.rain.above", @@ -5281,6 +5334,7 @@ enum WorldgenStructureProcessor { BlackstoneReplace => "minecraft:blackstone_replace", LavaSubmergedBlock => "minecraft:lava_submerged_block", ProtectedBlocks => "minecraft:protected_blocks", + Capped => "minecraft:capped", } } @@ -5332,11 +5386,36 @@ enum WorldgenTrunkPlacerKind { registry! { enum DecoratedPotPatterns { - PotteryPatternArcher => "minecraft:pottery_pattern_archer", - PotteryPatternPrize => "minecraft:pottery_pattern_prize", - PotteryPatternArmsUp => "minecraft:pottery_pattern_arms_up", - PotteryPatternSkull => "minecraft:pottery_pattern_skull", DecoratedPotSide => "minecraft:decorated_pot_side", + AnglerPotteryPattern => "minecraft:angler_pottery_pattern", + ArcherPotteryPattern => "minecraft:archer_pottery_pattern", + ArmsUpPotteryPattern => "minecraft:arms_up_pottery_pattern", + BladePotteryPattern => "minecraft:blade_pottery_pattern", + BrewerPotteryPattern => "minecraft:brewer_pottery_pattern", + BurnPotteryPattern => "minecraft:burn_pottery_pattern", + DangerPotteryPattern => "minecraft:danger_pottery_pattern", + ExplorerPotteryPattern => "minecraft:explorer_pottery_pattern", + FriendPotteryPattern => "minecraft:friend_pottery_pattern", + HeartPotteryPattern => "minecraft:heart_pottery_pattern", + HeartbreakPotteryPattern => "minecraft:heartbreak_pottery_pattern", + HowlPotteryPattern => "minecraft:howl_pottery_pattern", + MinerPotteryPattern => "minecraft:miner_pottery_pattern", + MournerPotteryPattern => "minecraft:mourner_pottery_pattern", + PlentyPotteryPattern => "minecraft:plenty_pottery_pattern", + PrizePotteryPattern => "minecraft:prize_pottery_pattern", + SheafPotteryPattern => "minecraft:sheaf_pottery_pattern", + ShelterPotteryPattern => "minecraft:shelter_pottery_pattern", + SkullPotteryPattern => "minecraft:skull_pottery_pattern", + SnortPotteryPattern => "minecraft:snort_pottery_pattern", DecoratedPotBase => "minecraft:decorated_pot_base", } } + +registry! { +enum RuleBlockEntityModifier { + Clear => "minecraft:clear", + Passthrough => "minecraft:passthrough", + AppendStatic => "minecraft:append_static", + AppendLoot => "minecraft:append_loot", +} +} -- cgit v1.2.3 From 5121bf9ee1b665168280d2df3f995efe1aa1cd35 Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 10 Apr 2023 17:19:33 +0000 Subject: 23w14a --- README.md | 2 +- azalea-language/src/en_us.json | 11 +++++++++-- azalea-protocol/src/packets/mod.rs | 2 +- azalea-registry/src/lib.rs | 6 ++++-- 4 files changed, 15 insertions(+), 6 deletions(-) (limited to 'azalea-registry/src') diff --git a/README.md b/README.md index 1a43f9cf..58ecc24f 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: `23w13a`.* +*Currently supported Minecraft version: `23w14a`.* ## ⚠️ 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 f9a7fc53..72a9ea42 100755 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -3472,7 +3472,9 @@ "gui.socialInteractions.tooltip.show": "Show messages", "gui.stats": "Statistics", "gui.toMenu": "Back to Server List", + "gui.toRealms": "Back to Realms List", "gui.toTitle": "Back to Title Screen", + "gui.toWorld": "Back to World List", "gui.up": "Up", "gui.yes": "Yes", "hanging_sign.edit": "Edit Hanging Sign Message", @@ -4951,6 +4953,10 @@ "potion.withAmplifier": "%s %s", "potion.withDuration": "%s (%s)", "predicate.unknown": "Unknown predicate: %s", + "quickplay.error.title": "Failed to Quick Play", + "quickplay.error.invalid_identifier": "Could not find world with the provided identifier", + "quickplay.error.realm_connect": "Could not connect to Realm", + "quickplay.error.realm_permission": "Lacking permission to connect to this Realm", "realms.missing.module.error.text": "Realms could not be opened right now, please try again later", "realms.missing.snapshot.error.text": "Realms is currently not supported in snapshots", "recipe.notFound": "Unknown recipe: %s", @@ -5346,8 +5352,11 @@ "subtitles.block.sculk.spread": "Sculk spreads", "subtitles.block.shulker_box.close": "Shulker closes", "subtitles.block.shulker_box.open": "Shulker opens", + "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.sweet_berry_bush.pick_berries": "Berries pop", "subtitles.block.trapdoor.toggle": "Trapdoor creaks", "subtitles.block.tripwire.attach": "Tripwire attaches", @@ -5779,8 +5788,6 @@ "subtitles.entity.sniffer.searching": "Sniffer searches", "subtitles.entity.sniffer.sniffing": "Sniffer sniffs", "subtitles.entity.sniffer.step": "Sniffer steps", - "subtitles.entity.sniffer.egg_crack": "Sniffer Egg cracks", - "subtitles.entity.sniffer.egg_hatch": "Sniffer Egg hatches", "subtitles.entity.snow_golem.death": "Snow Golem dies", "subtitles.entity.snow_golem.hurt": "Snow Golem hurts", "subtitles.entity.snowball.throw": "Snowball flies", diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 6c11139a..7639378e 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 = 1073741952; +pub const PROTOCOL_VERSION: u32 = 1073741954; #[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 eaeb6147..acdcd676 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -2995,6 +2995,7 @@ enum LootFunctionKind { SetBannerPattern => "minecraft:set_banner_pattern", SetPotion => "minecraft:set_potion", SetInstrument => "minecraft:set_instrument", + Reference => "minecraft:reference", } } @@ -3510,6 +3511,7 @@ enum SensorKind { FrogAttackables => "minecraft:frog_attackables", IsInWater => "minecraft:is_in_water", WardenEntitySensor => "minecraft:warden_entity_sensor", + SnifferTemptations => "minecraft:sniffer_temptations", } } @@ -4746,8 +4748,8 @@ enum SoundEvent { EntitySnifferDigging => "minecraft:entity.sniffer.digging", EntitySnifferDiggingStop => "minecraft:entity.sniffer.digging_stop", EntitySnifferHappy => "minecraft:entity.sniffer.happy", - EntitySnifferEggCrack => "minecraft:entity.sniffer.egg_crack", - EntitySnifferEggHatch => "minecraft:entity.sniffer.egg_hatch", + 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", -- cgit v1.2.3 From c4c5edf80b364b9e1281e04b26446cdff499a8b5 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 20 Apr 2023 17:11:52 +0000 Subject: 23w16a --- README.md | 2 +- azalea-language/src/en_us.json | 47 +++++++++++++------------- azalea-protocol/src/packets/mod.rs | 2 +- azalea-registry/src/lib.rs | 67 ++++++++++++++++++++++++-------------- 4 files changed, 70 insertions(+), 48 deletions(-) (limited to 'azalea-registry/src') diff --git a/README.md b/README.md index 58ecc24f..330d13a3 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: `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", +} +} -- cgit v1.2.3 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(-) (limited to 'azalea-registry/src') 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 From ff6d43458cef8ac6a23e6e8accd4b71c2a04aef6 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 4 May 2023 20:30:56 +0000 Subject: 23w18a --- README.md | 2 +- azalea-language/src/en_us.json | 28 ++++++++++++++++------ .../game/clientbound_update_advancements_packet.rs | 7 +++--- azalea-protocol/src/packets/mod.rs | 2 +- azalea-registry/src/lib.rs | 3 ++- 5 files changed, 29 insertions(+), 13 deletions(-) (limited to 'azalea-registry/src') diff --git a/README.md b/README.md index e9f9a528..ac90de49 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: `23w17a`.* +*Currently supported Minecraft version: `23w18a`.* ## ⚠️ 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 fbd6549e..cdf9e931 100755 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -20,9 +20,9 @@ "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.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.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", @@ -42,7 +42,9 @@ "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.salvage_sherd.title": "Respecting the Remnants", + "advancements.adventure.read_power_from_chiseled_bookshelf.description": "Read the power signal of a Chiseled Bookshelf using a Comparator", + "advancements.adventure.read_power_from_chiseled_bookshelf.title": "The Power of Books", "advancements.adventure.root.description": "Adventure, exploration and combat", "advancements.adventure.root.title": "Adventure", "advancements.adventure.shoot_arrow.description": "Shoot something with an Arrow", @@ -50,7 +52,7 @@ "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.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", @@ -113,7 +115,7 @@ "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.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", @@ -127,11 +129,11 @@ "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.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.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", @@ -6029,6 +6031,10 @@ "telemetry_info.property_title": "Included Data", "telemetry_info.screen.description": "Collecting this data helps us improve Minecraft by guiding us in directions that are relevant to our players.\nYou can also send in additional feedback to help us keep improving Minecraft.", "telemetry_info.screen.title": "Telemetry Data Collection", + "telemetry.event.advancement_made.title": "Advancement Made", + "telemetry.event.advancement_made.description": "Understanding the context behind receiving an advancement can help us better understand and improve the progression of the game", + "telemetry.event.game_load_times.title": "Game Load Times", + "telemetry.event.game_load_times.description": "This event can help us figure out where improvements to startup performance are needed by measuring execution times of the startup phases", "telemetry.event.optional": "%s (Optional)", "telemetry.event.performance_metrics.description": "Knowing the overall performance profile of Minecraft helps us tune and optimize the game for a wide range of machine specifications and operating systems. \nGame version is included to help us compare the performance profile for new versions of Minecraft.", "telemetry.event.performance_metrics.title": "Performance Metrics", @@ -6039,6 +6045,8 @@ "telemetry.event.world_loaded.title": "World Loaded", "telemetry.event.world_unloaded.description": "This event is paired with the World Loaded event to calculate how long the world session has lasted.\nThe duration (in seconds and ticks) is measured when a world session has ended (quitting to title, disconnecting from a server).", "telemetry.event.world_unloaded.title": "World Unloaded", + "telemetry.property.advancement_id.title": "Advancement ID", + "telemetry.property.advancement_game_time.title": "Game Time (Ticks)", "telemetry.property.client_id.title": "Client ID", "telemetry.property.client_modded.title": "Client Modded", "telemetry.property.dedicated_memory_kb.title": "Dedicated Memory (kB)", @@ -6046,12 +6054,18 @@ "telemetry.property.frame_rate_samples.title": "Frame Rate Samples (FPS)", "telemetry.property.game_mode.title": "Game Mode", "telemetry.property.game_version.title": "Game Version", + "telemetry.property.launcher_name.title": "Launcher Name", + "telemetry.property.load_time_bootstrap_ms.title": "Bootstrap Time (Milliseconds)", + "telemetry.property.load_time_loading_overlay_ms.title": "Time in Loading Screen (Milliseconds)", + "telemetry.property.load_time_pre_window_ms.title": "Time Before Window Opens (Milliseconds)", + "telemetry.property.load_time_total_time_ms.title": "Total Load Time (Milliseconds)", "telemetry.property.minecraft_session_id.title": "Minecraft Session ID", "telemetry.property.new_world.title": "New World", "telemetry.property.number_of_samples.title": "Sample Count", "telemetry.property.operating_system.title": "Operating System", "telemetry.property.opt_in.title": "Opt-In", "telemetry.property.platform.title": "Platform", + "telemetry.property.realms_map_content.title": "Realms Map Content (Minigame Name)", "telemetry.property.render_distance.title": "Render Distance", "telemetry.property.render_time_samples.title": "Render Time Samples", "telemetry.property.seconds_since_load.title": "Time Since Load (Seconds)", diff --git a/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs index dcc6332a..76f1412c 100755 --- a/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs @@ -1,6 +1,7 @@ use azalea_buf::McBuf; use azalea_chat::FormattedText; -use azalea_core::{ResourceLocation, Slot}; +use azalea_core::ResourceLocation; +use azalea_inventory::ItemSlot; use azalea_protocol_macros::ClientboundGamePacket; use std::collections::HashMap; use std::io::Cursor; @@ -25,7 +26,7 @@ pub struct Advancement { pub struct DisplayInfo { pub title: FormattedText, pub description: FormattedText, - pub icon: Slot, + pub icon: ItemSlot, pub frame: FrameType, pub show_toast: bool, pub hidden: bool, @@ -130,7 +131,7 @@ mod tests { display: Some(DisplayInfo { title: FormattedText::from("title".to_string()), description: FormattedText::from("description".to_string()), - icon: Slot::Empty, + icon: ItemSlot::Empty, frame: FrameType::Task, show_toast: true, hidden: false, diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 62530927..b3b81131 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 = 1073741956; +pub const PROTOCOL_VERSION: u32 = 1073741957; #[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 e6493cb5..2467ecf9 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -2949,7 +2949,8 @@ enum Item { registry! { enum LootConditionKind { Inverted => "minecraft:inverted", - Alternative => "minecraft:alternative", + AnyOf => "minecraft:any_of", + AllOf => "minecraft:all_of", RandomChance => "minecraft:random_chance", RandomChanceWithLooting => "minecraft:random_chance_with_looting", EntityProperties => "minecraft:entity_properties", -- cgit v1.2.3