1.16.4-1.14: fix Particle_f64/Data packet fields, closes #377

This commit is contained in:
ice_iix 2020-12-28 11:57:59 -08:00
parent 80887eec91
commit 5a38ea1091
3 changed files with 32 additions and 14 deletions

View File

@ -1173,12 +1173,12 @@ state_packets!(
field offset_z: f32 =,
field speed: f32 =,
field count: i32 =,
field block_state: VarInt = when(|p: &Particle_f64| p.particle_id == 3 || p.particle_id == 20),
field red: f32 = when(|p: &Particle_f64| p.particle_id == 11),
field green: f32 = when(|p: &Particle_f64| p.particle_id == 11),
field blue: f32 = when(|p: &Particle_f64| p.particle_id == 11),
field scale: f32 = when(|p: &Particle_f64| p.particle_id == 11),
field item: Option<nbt::NamedTag> = when(|p: &Particle_f64| p.particle_id == 27),
field block_state: VarInt = when(|p: &Particle_f64| p.particle_id == 3 || p.particle_id == 23),
field red: f32 = when(|p: &Particle_f64| p.particle_id == 14),
field green: f32 = when(|p: &Particle_f64| p.particle_id == 14),
field blue: f32 = when(|p: &Particle_f64| p.particle_id == 14),
field scale: f32 = when(|p: &Particle_f64| p.particle_id == 14),
field item: Option<nbt::NamedTag> = when(|p: &Particle_f64| p.particle_id == 32),
}
packet Particle_Data {
field particle_id: i32 =,
@ -1191,12 +1191,30 @@ state_packets!(
field offset_z: f32 =,
field speed: f32 =,
field count: i32 =,
field block_state: VarInt = when(|p: &Particle_Data| p.particle_id == 3 || p.particle_id == 20),
field red: f32 = when(|p: &Particle_Data| p.particle_id == 11),
field green: f32 = when(|p: &Particle_Data| p.particle_id == 11),
field blue: f32 = when(|p: &Particle_Data| p.particle_id == 11),
field scale: f32 = when(|p: &Particle_Data| p.particle_id == 11),
field item: Option<nbt::NamedTag> = when(|p: &Particle_Data| p.particle_id == 27),
field block_state: VarInt = when(|p: &Particle_Data| p.particle_id == 3 || p.particle_id == 23),
field red: f32 = when(|p: &Particle_Data| p.particle_id == 14),
field green: f32 = when(|p: &Particle_Data| p.particle_id == 14),
field blue: f32 = when(|p: &Particle_Data| p.particle_id == 14),
field scale: f32 = when(|p: &Particle_Data| p.particle_id == 14),
field item: Option<nbt::NamedTag> = when(|p: &Particle_Data| p.particle_id == 32),
}
packet Particle_Data13 {
field particle_id: i32 =,
field long_distance: bool =,
field x: f32 =,
field y: f32 =,
field z: f32 =,
field offset_x: f32 =,
field offset_y: f32 =,
field offset_z: f32 =,
field speed: f32 =,
field count: i32 =,
field block_state: VarInt = when(|p: &Particle_Data13| p.particle_id == 3 || p.particle_id == 20),
field red: f32 = when(|p: &Particle_Data13| p.particle_id == 11),
field green: f32 = when(|p: &Particle_Data13| p.particle_id == 11),
field blue: f32 = when(|p: &Particle_Data13| p.particle_id == 11),
field scale: f32 = when(|p: &Particle_Data13| p.particle_id == 11),
field item: Option<nbt::NamedTag> = when(|p: &Particle_Data13| p.particle_id == 27),
}
packet Particle_VarIntArray {
field particle_id: i32 =,

View File

@ -89,7 +89,7 @@ protocol_packet_ids!(
0x21 => KeepAliveClientbound_i64
0x22 => ChunkData_HeightMap
0x23 => Effect
0x24 => Particle_Data
0x24 => Particle_Data13
0x25 => JoinGame_i32
0x26 => Maps
0x27 => Entity

View File

@ -89,7 +89,7 @@ protocol_packet_ids!(
0x21 => KeepAliveClientbound_i64
0x22 => ChunkData
0x23 => Effect
0x24 => Particle_Data
0x24 => Particle_Data13
0x25 => JoinGame_i32
0x26 => Maps
0x27 => Entity