diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2022-12-07 21:09:58 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 21:09:58 -0600 |
| commit | 7d901e39bc10a855b545d7b6c167f45148a1fb0a (patch) | |
| tree | 88fe0a8f2f04f49f4df90e2f5462aa35a4278c68 /azalea-block | |
| parent | 9f5e5c092be9167e4d5222fdee4a1d2c419e5052 (diff) | |
| download | azalea-drasl-7d901e39bc10a855b545d7b6c167f45148a1fb0a.tar.xz | |
1.19.3 (#34)
* start updating to 22w42a
* work a bit more on 22w42a
* player chat packet
* serverbound hello packet
* Update mod.rs
* add more stuff to clientbound player chat packet
* ClientboundPlayerInfoUpdatePacket
* features enabled and container closed
* serverbound chat packets
* make it compile
* 22w43a
* ServerboundChatSessionUpdatePacket
* profile_public_key isn't Option anymore
* Update bitset.rs
* joining a server works
* fix entitydatavalue
* backtraces + fix clientbound chat message
* fix some warnings and add more ecomments
* 22w44a
* generate en_us.json
* add updating guide to codegen/readme
* fix some markdown
* update list of generated things
* metadata stuff
* Replace PJS generator mod with PixLyzer (#38)
* pixlizer extractor
* start working on shape extraction
* fix generating language
* fix pixlyzer shape generation
* use empty_shape
* generate blocks and shapes
* update pixlyzer dir
* Revert "update pixlyzer dir"
This reverts commit ee9a0e7a49936dd8569c610ba9b6455895eeff71.
* fix
* fix
* Revert "fix"
This reverts commit ad12ddcb009ccc4eeb13ddef0871db1d9322ab7d.
* fix
* detect pixlyzer fail
* fix pixlyzer
* 22w45a
* gen entities
* add async-trait dep
* update codegen/readme.md
* explain when rust_log should be used
* remove some unused code
* start fixing pixlyzer issues
* fix a thing in codegen
* almost fixed
* more progress towards 1.19.3
* 1.19.3-pre2
* fixes
* revert some hardcoded property names
* Delete clientbound_player_info_packet.rs
* handle 1.19.3 player info packets
* handle playerinforemove
* start updating to 1.19.3-rc1
* optional registries work
* fix some issues with 1.19.3
chat doesn't work yet
* aaaaaaaaaaaaaaaaa
* oh
* ignore unused shapes
* uncomment generate_blocks
* fix migrate
* 1.19.3-rc2
* fix clippy warnings
* 1.19.3-rc3
* split the azalea-buf macro into separate modules
* improve Recipe in protocol
* 1.19.3
Diffstat (limited to 'azalea-block')
| -rwxr-xr-x | azalea-block/src/blocks.rs | 428 |
1 files changed, 420 insertions, 8 deletions
diff --git a/azalea-block/src/blocks.rs b/azalea-block/src/blocks.rs index 10779937..226542dc 100755 --- a/azalea-block/src/blocks.rs +++ b/azalea-block/src/blocks.rs @@ -178,7 +178,7 @@ make_block_states! { Down, }, "triggered" => bool, - "instrument" => Instrument { + "instrument" => Sound { Harp, Basedrum, Snare, @@ -195,6 +195,13 @@ make_block_states! { Bit, Banjo, Pling, + Zombie, + Skeleton, + Creeper, + Dragon, + WitherSkeleton, + Piglin, + CustomHead, }, "note" => NoteBlockNote { _0, @@ -254,6 +261,12 @@ make_block_states! { }, "short" => bool, "unstable" => bool, + "slot_0_occupied" => bool, + "slot_1_occupied" => bool, + "slot_2_occupied" => bool, + "slot_3_occupied" => bool, + "slot_4_occupied" => bool, + "slot_5_occupied" => bool, "age" => FireAge { _0, _1, @@ -478,6 +491,24 @@ make_block_states! { _14, _15, }, + "rotation" => BambooSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, "hinge" => Hinge { Left, Right, @@ -495,6 +526,187 @@ make_block_states! { NorthWest, NorthEast, }, + "attached" => bool, + "rotation" => OakHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => SpruceHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => BirchHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => AcaciaHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => JungleHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => DarkOakHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => CrimsonHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => WarpedHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => MangroveHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, + "rotation" => BambooHangingSignRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, "face" => Face { Floor, Wall, @@ -588,7 +800,11 @@ make_block_states! { _6, _7, }, - "berries" => bool, + "down" => bool, + "north" => bool, + "south" => bool, + "up" => bool, + "west" => bool, "in_wall" => bool, "age" => NetherWartAge { _0, @@ -613,7 +829,6 @@ make_block_states! { _1, _2, }, - "attached" => bool, "disarmed" => bool, "conditional" => bool, "east" => EastWall { @@ -764,6 +979,24 @@ make_block_states! { _14, _15, }, + "rotation" => PiglinHeadRotation { + _0, + _1, + _2, + _3, + _4, + _5, + _6, + _7, + _8, + _9, + _10, + _11, + _12, + _13, + _14, + _15, + }, "power" => LightWeightedPressurePlatePower { _0, _1, @@ -1535,6 +1768,8 @@ make_block_states! { Active, Cooldown, }, + "south" => bool, + "west" => bool, "bloom" => bool, "can_summon" => bool, "shrieking" => bool, @@ -1549,7 +1784,7 @@ make_block_states! { Up, Down, }, - "age" => _0_1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20_21_22_23_24_25 { + "age" => CaveVinesAge { _0, _1, _2, @@ -1577,13 +1812,14 @@ make_block_states! { _24, _25, }, + "berries" => bool, "tilt" => Tilt { None, Unstable, Partial, Full, }, - "axis" => XYZ { + "axis" => CacheSize { X, Y, Z, @@ -1614,6 +1850,8 @@ make_block_states! { acacia_planks => BlockBehavior::default(), {}, dark_oak_planks => BlockBehavior::default(), {}, mangrove_planks => BlockBehavior::default(), {}, + bamboo_planks => BlockBehavior::default(), {}, + bamboo_mosaic => BlockBehavior::default(), {}, oak_sapling => BlockBehavior::default(), { stage: OakSaplingStage::_0, }, @@ -1682,6 +1920,9 @@ make_block_states! { muddy_mangrove_roots => BlockBehavior::default(), { axis: Axis::Y, }, + bamboo_block => BlockBehavior::default(), { + axis: Axis::Y, + }, stripped_spruce_log => BlockBehavior::default(), { axis: Axis::Y, }, @@ -1703,6 +1944,9 @@ make_block_states! { stripped_mangrove_log => BlockBehavior::default(), { axis: Axis::Y, }, + stripped_bamboo_block => BlockBehavior::default(), { + axis: Axis::Y, + }, oak_wood => BlockBehavior::default(), { axis: Axis::Y, }, @@ -1804,7 +2048,7 @@ make_block_states! { chiseled_sandstone => BlockBehavior::default(), {}, cut_sandstone => BlockBehavior::default(), {}, note_block => BlockBehavior::default(), { - instrument: Instrument::Harp, + instrument: Sound::Harp, note: NoteBlockNote::_0, powered: false, }, @@ -1961,6 +2205,15 @@ make_block_states! { unstable: false, }, bookshelf => BlockBehavior::default(), {}, + chiseled_bookshelf => BlockBehavior::default(), { + facing: FacingCardinal::North, + slot_0_occupied: false, + slot_1_occupied: false, + slot_2_occupied: false, + slot_3_occupied: false, + slot_4_occupied: false, + slot_5_occupied: false, + }, mossy_cobblestone => BlockBehavior::default(), {}, obsidian => BlockBehavior::default(), {}, torch => BlockBehavior::default(), {}, @@ -2037,6 +2290,10 @@ make_block_states! { rotation: MangroveSignRotation::_0, waterlogged: false, }, + bamboo_sign => BlockBehavior::default(), { + rotation: BambooSignRotation::_0, + waterlogged: false, + }, oak_door => BlockBehavior::default(), { facing: FacingCardinal::North, half: Half::Lower, @@ -2086,6 +2343,100 @@ make_block_states! { facing: FacingCardinal::North, waterlogged: false, }, + bamboo_wall_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + oak_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: OakHangingSignRotation::_0, + waterlogged: false, + }, + spruce_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: SpruceHangingSignRotation::_0, + waterlogged: false, + }, + birch_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: BirchHangingSignRotation::_0, + waterlogged: false, + }, + acacia_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: AcaciaHangingSignRotation::_0, + waterlogged: false, + }, + jungle_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: JungleHangingSignRotation::_0, + waterlogged: false, + }, + dark_oak_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: DarkOakHangingSignRotation::_0, + waterlogged: false, + }, + crimson_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: CrimsonHangingSignRotation::_0, + waterlogged: false, + }, + warped_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: WarpedHangingSignRotation::_0, + waterlogged: false, + }, + mangrove_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: MangroveHangingSignRotation::_0, + waterlogged: false, + }, + bamboo_hanging_sign => BlockBehavior::default(), { + attached: false, + rotation: BambooHangingSignRotation::_0, + waterlogged: false, + }, + oak_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + spruce_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + birch_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + acacia_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + jungle_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + dark_oak_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + mangrove_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + crimson_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + warped_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, + bamboo_wall_hanging_sign => BlockBehavior::default(), { + facing: FacingCardinal::North, + waterlogged: false, + }, lever => BlockBehavior::default(), { face: Face::Wall, facing: FacingCardinal::North, @@ -2122,6 +2473,9 @@ make_block_states! { mangrove_pressure_plate => BlockBehavior::default(), { powered: false, }, + bamboo_pressure_plate => BlockBehavior::default(), { + powered: false, + }, redstone_ore => BlockBehavior::default(), { lit: false, }, @@ -2260,6 +2614,13 @@ make_block_states! { powered: false, waterlogged: false, }, + bamboo_trapdoor => BlockBehavior::default(), { + facing: FacingCardinal::North, + half: TopBottom::Bottom, + open: false, + powered: false, + waterlogged: false, + }, stone_bricks => BlockBehavior::default(), {}, mossy_stone_bricks => BlockBehavior::default(), {}, cracked_stone_bricks => BlockBehavior::default(), {}, @@ -2549,6 +2910,11 @@ make_block_states! { facing: FacingCardinal::North, powered: false, }, + bamboo_button => BlockBehavior::default(), { + face: Face::Wall, + facing: FacingCardinal::North, + powered: false, + }, skeleton_skull => BlockBehavior::default(), { rotation: SkeletonSkullRotation::_0, }, @@ -2585,6 +2951,12 @@ make_block_states! { dragon_wall_head => BlockBehavior::default(), { facing: FacingCardinal::North, }, + piglin_head => BlockBehavior::default(), { + rotation: PiglinHeadRotation::_0, + }, + piglin_wall_head => BlockBehavior::default(), { + facing: FacingCardinal::North, + }, anvil => BlockBehavior::default(), { facing: FacingCardinal::North, }, @@ -2786,6 +3158,18 @@ make_block_states! { shape: StairShape::Straight, waterlogged: false, }, + bamboo_stairs => BlockBehavior::default(), { + facing: FacingCardinal::North, + half: TopBottom::Bottom, + shape: StairShape::Straight, + waterlogged: false, + }, + bamboo_mosaic_stairs => BlockBehavior::default(), { + facing: FacingCardinal::North, + half: TopBottom::Bottom, + shape: StairShape::Straight, + waterlogged: false, + }, slime_block => BlockBehavior::default(), {}, barrier => BlockBehavior::default(), {}, light => BlockBehavior::default(), { @@ -3006,6 +3390,14 @@ make_block_states! { kind: Type::Bottom, waterlogged: false, }, + bamboo_slab => BlockBehavior::default(), { + kind: Type::Bottom, + waterlogged: false, + }, + bamboo_mosaic_slab => BlockBehavior::default(), { + kind: Type::Bottom, + waterlogged: false, + }, stone_slab => BlockBehavior::default(), { kind: Type::Bottom, waterlogged: false, @@ -3102,6 +3494,12 @@ make_block_states! { open: false, powered: false, }, + bamboo_fence_gate => BlockBehavior::default(), { + facing: FacingCardinal::North, + in_wall: false, + open: false, + powered: false, + }, spruce_fence => BlockBehavior::default(), { east: false, north: false, @@ -3144,6 +3542,13 @@ make_block_states! { waterlogged: false, west: false, }, + bamboo_fence => BlockBehavior::default(), { + east: false, + north: false, + south: false, + waterlogged: false, + west: false, + }, spruce_door => BlockBehavior::default(), { facing: FacingCardinal::North, half: Half::Lower, @@ -3186,6 +3591,13 @@ make_block_states! { open: false, powered: false, }, + bamboo_door => BlockBehavior::default(), { + facing: FacingCardinal::North, + half: Half::Lower, + hinge: Hinge::Left, + open: false, + powered: false, + }, end_rod => BlockBehavior::default(), { facing: FacingCubic::Up, }, @@ -4355,7 +4767,7 @@ make_block_states! { }, dripstone_block => BlockBehavior::default(), {}, cave_vines => BlockBehavior::default(), { - age: _0_1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20_21_22_23_24_25::_0, + age: CaveVinesAge::_0, berries: false, }, cave_vines_plant => BlockBehavior::default(), { @@ -4468,7 +4880,7 @@ make_block_states! { cracked_deepslate_bricks => BlockBehavior::default(), {}, cracked_deepslate_tiles => BlockBehavior::default(), {}, infested_deepslate => BlockBehavior::default(), { - axis: XYZ::Y, + axis: CacheSize::Y, }, smooth_basalt => BlockBehavior::default(), {}, raw_iron_block => BlockBehavior::default(), {}, |
