From a411f949dfe5cf2dbf3f8cac831a2e49e4c7f195 Mon Sep 17 00:00:00 2001 From: ice_iix Date: Sat, 27 Jun 2020 17:39:44 -0700 Subject: [PATCH] Split UseEntity_Hand --- protocol/src/protocol/packet.rs | 10 +++++----- protocol/src/protocol/versions/v15w39c.rs | 2 +- protocol/src/protocol/versions/v18w50a.rs | 2 +- protocol/src/protocol/versions/v19w02a.rs | 2 +- protocol/src/protocol/versions/v1_10_2.rs | 2 +- protocol/src/protocol/versions/v1_11_2.rs | 2 +- protocol/src/protocol/versions/v1_12_2.rs | 2 +- protocol/src/protocol/versions/v1_13_2.rs | 2 +- protocol/src/protocol/versions/v1_14.rs | 2 +- protocol/src/protocol/versions/v1_14_1.rs | 2 +- protocol/src/protocol/versions/v1_14_2.rs | 2 +- protocol/src/protocol/versions/v1_14_3.rs | 2 +- protocol/src/protocol/versions/v1_14_4.rs | 2 +- protocol/src/protocol/versions/v1_15.rs | 2 +- protocol/src/protocol/versions/v1_16_1.rs | 2 +- protocol/src/protocol/versions/v1_9.rs | 2 +- protocol/src/protocol/versions/v1_9_2.rs | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/protocol/src/protocol/packet.rs b/protocol/src/protocol/packet.rs index 42bdafe..5f39487 100644 --- a/protocol/src/protocol/packet.rs +++ b/protocol/src/protocol/packet.rs @@ -179,13 +179,13 @@ state_packets!( } /// UseEntity is sent when the user interacts (right clicks) or attacks /// (left clicks) an entity. - packet UseEntity { + packet UseEntity_Hand { field target_id: VarInt =, field ty: VarInt =, - field target_x: f32 = when(|p: &UseEntity| p.ty.0 == 2), - field target_y: f32 = when(|p: &UseEntity| p.ty.0 == 2), - field target_z: f32 = when(|p: &UseEntity| p.ty.0 == 2), - field hand: VarInt = when(|p: &UseEntity| p.ty.0 == 0 || p.ty.0 == 2), + field target_x: f32 = when(|p: &UseEntity_Hand| p.ty.0 == 2), + field target_y: f32 = when(|p: &UseEntity_Hand| p.ty.0 == 2), + field target_z: f32 = when(|p: &UseEntity_Hand| p.ty.0 == 2), + field hand: VarInt = when(|p: &UseEntity_Hand| p.ty.0 == 0 || p.ty.0 == 2), } packet UseEntity_Handsfree { field target_id: VarInt =, diff --git a/protocol/src/protocol/versions/v15w39c.rs b/protocol/src/protocol/versions/v15w39c.rs index dd4e34b..a5b16fc 100644 --- a/protocol/src/protocol/versions/v15w39c.rs +++ b/protocol/src/protocol/versions/v15w39c.rs @@ -17,7 +17,7 @@ protocol_packet_ids!( 0x06 => ClickWindow_u8 0x07 => CloseWindow 0x08 => PluginMessageServerbound - 0x09 => UseEntity + 0x09 => UseEntity_Hand 0x0a => KeepAliveServerbound_VarInt 0x0b => PlayerPosition 0x0c => PlayerPositionLook diff --git a/protocol/src/protocol/versions/v18w50a.rs b/protocol/src/protocol/versions/v18w50a.rs index e597cd9..c1d5ebb 100644 --- a/protocol/src/protocol/versions/v18w50a.rs +++ b/protocol/src/protocol/versions/v18w50a.rs @@ -21,7 +21,7 @@ protocol_packet_ids!( 0x0a => PluginMessageServerbound 0x0b => EditBook 0x0c => QueryEntityNBT - 0x0d => UseEntity + 0x0d => UseEntity_Hand 0x0e => KeepAliveServerbound_i64 0x0f => Player 0x10 => PlayerPosition diff --git a/protocol/src/protocol/versions/v19w02a.rs b/protocol/src/protocol/versions/v19w02a.rs index 0b2f614..d79cfa6 100644 --- a/protocol/src/protocol/versions/v19w02a.rs +++ b/protocol/src/protocol/versions/v19w02a.rs @@ -21,7 +21,7 @@ protocol_packet_ids!( 0x0a => PluginMessageServerbound 0x0b => EditBook 0x0c => QueryEntityNBT - 0x0d => UseEntity + 0x0d => UseEntity_Hand 0x0e => KeepAliveServerbound_i64 0x0f => Player 0x10 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_10_2.rs b/protocol/src/protocol/versions/v1_10_2.rs index e049b8c..3c62d10 100644 --- a/protocol/src/protocol/versions/v1_10_2.rs +++ b/protocol/src/protocol/versions/v1_10_2.rs @@ -18,7 +18,7 @@ protocol_packet_ids!( 0x07 => ClickWindow 0x08 => CloseWindow 0x09 => PluginMessageServerbound - 0x0a => UseEntity + 0x0a => UseEntity_Hand 0x0b => KeepAliveServerbound_VarInt 0x0c => PlayerPosition 0x0d => PlayerPositionLook diff --git a/protocol/src/protocol/versions/v1_11_2.rs b/protocol/src/protocol/versions/v1_11_2.rs index e3c46cb..70fb092 100644 --- a/protocol/src/protocol/versions/v1_11_2.rs +++ b/protocol/src/protocol/versions/v1_11_2.rs @@ -18,7 +18,7 @@ protocol_packet_ids!( 0x07 => ClickWindow 0x08 => CloseWindow 0x09 => PluginMessageServerbound - 0x0a => UseEntity + 0x0a => UseEntity_Hand 0x0b => KeepAliveServerbound_VarInt 0x0c => PlayerPosition 0x0d => PlayerPositionLook diff --git a/protocol/src/protocol/versions/v1_12_2.rs b/protocol/src/protocol/versions/v1_12_2.rs index 9fcd6f4..334237f 100644 --- a/protocol/src/protocol/versions/v1_12_2.rs +++ b/protocol/src/protocol/versions/v1_12_2.rs @@ -18,7 +18,7 @@ protocol_packet_ids!( 0x07 => ClickWindow 0x08 => CloseWindow 0x09 => PluginMessageServerbound - 0x0a => UseEntity + 0x0a => UseEntity_Hand 0x0b => KeepAliveServerbound_i64 0x0c => Player 0x0d => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_13_2.rs b/protocol/src/protocol/versions/v1_13_2.rs index ff71cbc..027d80a 100644 --- a/protocol/src/protocol/versions/v1_13_2.rs +++ b/protocol/src/protocol/versions/v1_13_2.rs @@ -21,7 +21,7 @@ protocol_packet_ids!( 0x0a => PluginMessageServerbound 0x0b => EditBook 0x0c => QueryEntityNBT - 0x0d => UseEntity + 0x0d => UseEntity_Hand 0x0e => KeepAliveServerbound_i64 0x0f => Player 0x10 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_14.rs b/protocol/src/protocol/versions/v1_14.rs index d7732c6..23291c6 100644 --- a/protocol/src/protocol/versions/v1_14.rs +++ b/protocol/src/protocol/versions/v1_14.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity + 0x0e => UseEntity_Hand 0x0f => KeepAliveServerbound_i64 0x10 => LockDifficulty 0x11 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_14_1.rs b/protocol/src/protocol/versions/v1_14_1.rs index d7732c6..23291c6 100644 --- a/protocol/src/protocol/versions/v1_14_1.rs +++ b/protocol/src/protocol/versions/v1_14_1.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity + 0x0e => UseEntity_Hand 0x0f => KeepAliveServerbound_i64 0x10 => LockDifficulty 0x11 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_14_2.rs b/protocol/src/protocol/versions/v1_14_2.rs index d7732c6..23291c6 100644 --- a/protocol/src/protocol/versions/v1_14_2.rs +++ b/protocol/src/protocol/versions/v1_14_2.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity + 0x0e => UseEntity_Hand 0x0f => KeepAliveServerbound_i64 0x10 => LockDifficulty 0x11 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_14_3.rs b/protocol/src/protocol/versions/v1_14_3.rs index d30ac34..b3da2f5 100644 --- a/protocol/src/protocol/versions/v1_14_3.rs +++ b/protocol/src/protocol/versions/v1_14_3.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity + 0x0e => UseEntity_Hand 0x0f => KeepAliveServerbound_i64 0x10 => LockDifficulty 0x11 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_14_4.rs b/protocol/src/protocol/versions/v1_14_4.rs index 2a89ed7..e153dc7 100644 --- a/protocol/src/protocol/versions/v1_14_4.rs +++ b/protocol/src/protocol/versions/v1_14_4.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity + 0x0e => UseEntity_Hand 0x0f => KeepAliveServerbound_i64 0x10 => LockDifficulty 0x11 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_15.rs b/protocol/src/protocol/versions/v1_15.rs index 357d047..bd28b32 100644 --- a/protocol/src/protocol/versions/v1_15.rs +++ b/protocol/src/protocol/versions/v1_15.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity + 0x0e => UseEntity_Hand 0x0f => KeepAliveServerbound_i64 0x10 => LockDifficulty 0x11 => PlayerPosition diff --git a/protocol/src/protocol/versions/v1_16_1.rs b/protocol/src/protocol/versions/v1_16_1.rs index 6c63576..bf7836d 100644 --- a/protocol/src/protocol/versions/v1_16_1.rs +++ b/protocol/src/protocol/versions/v1_16_1.rs @@ -22,7 +22,7 @@ protocol_packet_ids!( 0x0b => PluginMessageServerbound 0x0c => EditBook 0x0d => QueryEntityNBT - 0x0e => UseEntity // TODO + 0x0e => UseEntity_Hand // TODO //0x0f => GenerateStructure // TODO 0x10 => KeepAliveServerbound_i64 0x11 => LockDifficulty diff --git a/protocol/src/protocol/versions/v1_9.rs b/protocol/src/protocol/versions/v1_9.rs index fbfda80..48b61fb 100644 --- a/protocol/src/protocol/versions/v1_9.rs +++ b/protocol/src/protocol/versions/v1_9.rs @@ -18,7 +18,7 @@ protocol_packet_ids!( 0x07 => ClickWindow 0x08 => CloseWindow 0x09 => PluginMessageServerbound - 0x0a => UseEntity + 0x0a => UseEntity_Hand 0x0b => KeepAliveServerbound_VarInt 0x0c => PlayerPosition 0x0d => PlayerPositionLook diff --git a/protocol/src/protocol/versions/v1_9_2.rs b/protocol/src/protocol/versions/v1_9_2.rs index 4a10424..cac5945 100644 --- a/protocol/src/protocol/versions/v1_9_2.rs +++ b/protocol/src/protocol/versions/v1_9_2.rs @@ -18,7 +18,7 @@ protocol_packet_ids!( 0x07 => ClickWindow 0x08 => CloseWindow 0x09 => PluginMessageServerbound - 0x0a => UseEntity + 0x0a => UseEntity_Hand 0x0b => KeepAliveServerbound_VarInt 0x0c => PlayerPosition 0x0d => PlayerPositionLook