From ef357fdf3667f3ded03203fc0f7cdec48a01ad8f Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Tue, 25 Mar 2025 11:17:39 -0500 Subject: 1.21.5 (#198) * 25w02a * move item_components codegen to a different module * remove outdated test * 25w03a * start updating to 24w09b * 1.21.5-pre2 * fix broken packets * 1.21.5-rc2 * merge main * delete unused acket_handling * 1.21.5 --- azalea-block/src/generated.rs | 47 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) (limited to 'azalea-block') diff --git a/azalea-block/src/generated.rs b/azalea-block/src/generated.rs index afc131c3..886b9dcc 100755 --- a/azalea-block/src/generated.rs +++ b/azalea-block/src/generated.rs @@ -326,7 +326,11 @@ make_block_states! { "south" => South(bool), "up" => Up(bool), "west" => West(bool), - "active" => Active(bool), + "creaking_heart_state" => CreakingHeartState { + Uprooted, + Dormant, + Awake, + }, "natural" => Natural(bool), "half" => TopBottom { Top, @@ -1694,7 +1698,7 @@ make_block_states! { _14, _15, }, - "mode" => Mode { + "mode" => StructureMode { Save, Load, Corner, @@ -1714,6 +1718,12 @@ make_block_states! { NorthUp, SouthUp, }, + "mode" => TestMode { + Start, + Log, + Fail, + Accept, + }, "level" => ComposterLevel { _0, _1, @@ -1958,6 +1968,18 @@ make_block_states! { _3, _4, }, + "flower_amount" => WildflowersFlowerAmount { + _1, + _2, + _3, + _4, + }, + "segment_amount" => LeafLitterSegmentAmount { + _1, + _2, + _3, + _4, + }, "tilt" => Tilt { None, Unstable, @@ -2356,6 +2378,9 @@ make_block_states! { short_grass => BlockBehavior::new(), {}, fern => BlockBehavior::new(), {}, dead_bush => BlockBehavior::new(), {}, + bush => BlockBehavior::new(), {}, + short_dry_grass => BlockBehavior::new(), {}, + tall_dry_grass => BlockBehavior::new(), {}, seagrass => BlockBehavior::new(), {}, tall_seagrass => BlockBehavior::new(), { "half": Half::Lower, @@ -2438,8 +2463,8 @@ make_block_states! { soul_fire => BlockBehavior::new(), {}, spawner => BlockBehavior::new().requires_correct_tool_for_drops().strength(5.0, 5.0), {}, creaking_heart => BlockBehavior::new(), { - "active": Active(false), "axis": Axis::Y, + "creaking_heart_state": CreakingHeartState::Uprooted, "natural": Natural(false), }, oak_stairs => BlockBehavior::new().strength(2.0, 3.0), { @@ -2754,6 +2779,7 @@ make_block_states! { cactus => BlockBehavior::new().strength(0.4, 0.4), { "age": CactusAge::_0, }, + cactus_flower => BlockBehavior::new(), {}, clay => BlockBehavior::new().strength(0.6, 0.6), {}, sugar_cane => BlockBehavior::new(), { "age": SugarCaneAge::_0, @@ -4771,11 +4797,15 @@ make_block_states! { "waterlogged": Waterlogged(false), }, structure_block => BlockBehavior::new().requires_correct_tool_for_drops().strength(-1.0, 3600000.0), { - "mode": Mode::Load, + "mode": StructureMode::Load, }, jigsaw => BlockBehavior::new().requires_correct_tool_for_drops().strength(-1.0, 3600000.0), { "orientation": Orientation::NorthUp, }, + test_block => BlockBehavior::new(), { + "mode": TestMode::Start, + }, + test_instance_block => BlockBehavior::new(), {}, composter => BlockBehavior::new().strength(0.6, 0.6), { "level": ComposterLevel::_0, }, @@ -5419,6 +5449,14 @@ make_block_states! { "facing": FacingCardinal::North, "flower_amount": PinkPetalsFlowerAmount::_1, }, + wildflowers => BlockBehavior::new(), { + "facing": FacingCardinal::North, + "flower_amount": WildflowersFlowerAmount::_1, + }, + leaf_litter => BlockBehavior::new(), { + "facing": FacingCardinal::North, + "segment_amount": LeafLitterSegmentAmount::_1, + }, moss_block => BlockBehavior::new().strength(0.1, 0.1), {}, big_dripleaf => BlockBehavior::new().strength(0.1, 0.1).force_solid(false), { "facing": FacingCardinal::North, @@ -5578,5 +5616,6 @@ make_block_states! { closed_eyeblossom => BlockBehavior::new(), {}, potted_open_eyeblossom => BlockBehavior::new(), {}, potted_closed_eyeblossom => BlockBehavior::new(), {}, + firefly_bush => BlockBehavior::new(), {}, } } -- cgit v1.2.3