Skip to content

Commit

Permalink
Bedrock protocol changes (#730)
Browse files Browse the repository at this point in the history
* Fixed types for packet_player_auth_input 1.17.x

Changed block_position from vec3i to BlockCoordinates in TransactionUseItem (types.yml)
- The y value for block_position needs to be varint and not zigzag32
- The face value needs be zigzag32 and not varint

Changed position from BlockCoordinates to vec3i in packet_player_auth_input.input_data.block_action (proto.yml)
- The y value for position needs to be zigzag32 and not varint

* Fixed types for packet_player_auth_input 1.18.x

Changed block_position from vec3i to BlockCoordinates in TransactionUseItem (types.yml)
- The y value for block_position needs to be varint and not zigzag32
- The face value needs be zigzag32 and not varint

Changed position from BlockCoordinates to vec3i in packet_player_auth_input.input_data.block_action (proto.yml)
- The y value for position needs to be zigzag32 and not varint

* Fixed types for packet_player_auth_input 1.19.x

Changed block_position from vec3i to BlockCoordinates in TransactionUseItem (types.yml)
- The y value for block_position needs to be varint and not zigzag32
- The face value needs be zigzag32 and not varint

Changed position from BlockCoordinates to vec3i in packet_player_auth_input.input_data.block_action (proto.yml)
- The y value for position needs to be zigzag32 and not varint

* Fixed types for packet_player_auth_input 1.20.x

Changed block_position from vec3i to BlockCoordinates in TransactionUseItem (types.yml)
- The y value for block_position needs to be varint and not zigzag32
- The face value needs be zigzag32 and not varint

Changed position from BlockCoordinates to vec3i in packet_player_auth_input.input_data.block_action (proto.yml)
- The y value for position needs to be zigzag32 and not varint

* Fixed types for packet_player_auth_input 1.16.x
  • Loading branch information
irkmandeer committed Jul 9, 2023
1 parent 8f1ba18 commit f00c2cc
Show file tree
Hide file tree
Showing 63 changed files with 208 additions and 208 deletions.
2 changes: 1 addition & 1 deletion data/bedrock/1.16.210/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2271,7 +2271,7 @@ packet_player_auth_input:
if start_break or abort_break or crack_break or predict_break or continue_break:
# BlockPosition is the position of the target block, if the action with the ActionType set concerned a
# block. If that is not the case, the block position will be zero.
position: BlockCoordinates
position: vec3i
# BlockFace is the face of the target block that was touched. If the action with the ActionType set
# concerned a block. If not, the face is always 0.
face: zigzag32
Expand Down
12 changes: 6 additions & 6 deletions data/bedrock/1.16.210/protocol.json
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@
},
{
"name": "face",
"type": "varint"
"type": "zigzag32"
},
{
"name": "hotbar_slot",
Expand Down Expand Up @@ -7229,7 +7229,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -7242,7 +7242,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -7255,7 +7255,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -7268,7 +7268,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -7281,7 +7281,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand Down
2 changes: 1 addition & 1 deletion data/bedrock/1.16.210/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ TransactionUseItem:
block_position: BlockCoordinates
# BlockFace is the face of the block that was interacted with. When clicking the block, it is the face
# clicked. When breaking the block, it is the face that was last being hit until the block broke.
face: varint
face: zigzag32
# HotBarSlot is the hot bar slot that the player was holding while clicking the block. It should be used
# to ensure that the hot bar slot and held item are correctly synchronised with the server.
hotbar_slot: varint
Expand Down
2 changes: 1 addition & 1 deletion data/bedrock/1.16.220/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2723,7 +2723,7 @@ packet_player_auth_input:
if start_break or abort_break or crack_break or predict_break or continue_break:
# BlockPosition is the position of the target block, if the action with the ActionType set concerned a
# block. If that is not the case, the block position will be zero.
position: BlockCoordinates
position: vec3i
# BlockFace is the face of the target block that was touched. If the action with the ActionType set
# concerned a block. If not, the face is always 0.
face: zigzag32
Expand Down
14 changes: 7 additions & 7 deletions data/bedrock/1.16.220/protocol.json
Original file line number Diff line number Diff line change
Expand Up @@ -936,11 +936,11 @@
},
{
"name": "block_position",
"type": "vec3i"
"type": "BlockCoordinates"
},
{
"name": "face",
"type": "varint"
"type": "zigzag32"
},
{
"name": "hotbar_slot",
Expand Down Expand Up @@ -8072,7 +8072,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8085,7 +8085,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8098,7 +8098,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8111,7 +8111,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8124,7 +8124,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand Down
4 changes: 2 additions & 2 deletions data/bedrock/1.16.220/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,10 @@ TransactionUseItem:
2: break_block
# BlockPosition is the position of the block that was interacted with. This is only really a correct
# block position if ActionType is not UseItemActionClickAir.
block_position: vec3i
block_position: BlockCoordinates
# BlockFace is the face of the block that was interacted with. When clicking the block, it is the face
# clicked. When breaking the block, it is the face that was last being hit until the block broke.
face: varint
face: zigzag32
# HotBarSlot is the hot bar slot that the player was holding while clicking the block. It should be used
# to ensure that the hot bar slot and held item are correctly synchronised with the server.
hotbar_slot: varint
Expand Down
2 changes: 1 addition & 1 deletion data/bedrock/1.17.0/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2725,7 +2725,7 @@ packet_player_auth_input:
if start_break or abort_break or crack_break or predict_break or continue_break:
# BlockPosition is the position of the target block, if the action with the ActionType set concerned a
# block. If that is not the case, the block position will be zero.
position: BlockCoordinates
position: vec3i
# BlockFace is the face of the target block that was touched. If the action with the ActionType set
# concerned a block. If not, the face is always 0.
face: zigzag32
Expand Down
14 changes: 7 additions & 7 deletions data/bedrock/1.17.0/protocol.json
Original file line number Diff line number Diff line change
Expand Up @@ -939,11 +939,11 @@
},
{
"name": "block_position",
"type": "vec3i"
"type": "BlockCoordinates"
},
{
"name": "face",
"type": "varint"
"type": "zigzag32"
},
{
"name": "hotbar_slot",
Expand Down Expand Up @@ -8151,7 +8151,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8164,7 +8164,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8177,7 +8177,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8190,7 +8190,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8203,7 +8203,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand Down
4 changes: 2 additions & 2 deletions data/bedrock/1.17.0/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@ TransactionUseItem:
2: break_block
# BlockPosition is the position of the block that was interacted with. This is only really a correct
# block position if ActionType is not UseItemActionClickAir.
block_position: vec3i
block_position: BlockCoordinates
# BlockFace is the face of the block that was interacted with. When clicking the block, it is the face
# clicked. When breaking the block, it is the face that was last being hit until the block broke.
face: varint
face: zigzag32
# HotBarSlot is the hot bar slot that the player was holding while clicking the block. It should be used
# to ensure that the hot bar slot and held item are correctly synchronised with the server.
hotbar_slot: varint
Expand Down
2 changes: 1 addition & 1 deletion data/bedrock/1.17.10/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2822,7 +2822,7 @@ packet_player_auth_input:
if start_break or abort_break or crack_break or predict_break or continue_break:
# BlockPosition is the position of the target block, if the action with the ActionType set concerned a
# block. If that is not the case, the block position will be zero.
position: BlockCoordinates
position: vec3i
# BlockFace is the face of the target block that was touched. If the action with the ActionType set
# concerned a block. If not, the face is always 0.
face: zigzag32
Expand Down
14 changes: 7 additions & 7 deletions data/bedrock/1.17.10/protocol.json
Original file line number Diff line number Diff line change
Expand Up @@ -939,11 +939,11 @@
},
{
"name": "block_position",
"type": "vec3i"
"type": "BlockCoordinates"
},
{
"name": "face",
"type": "varint"
"type": "zigzag32"
},
{
"name": "hotbar_slot",
Expand Down Expand Up @@ -8267,7 +8267,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8280,7 +8280,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8293,7 +8293,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8306,7 +8306,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8319,7 +8319,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand Down
4 changes: 2 additions & 2 deletions data/bedrock/1.17.10/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@ TransactionUseItem:
2: break_block
# BlockPosition is the position of the block that was interacted with. This is only really a correct
# block position if ActionType is not UseItemActionClickAir.
block_position: vec3i
block_position: BlockCoordinates
# BlockFace is the face of the block that was interacted with. When clicking the block, it is the face
# clicked. When breaking the block, it is the face that was last being hit until the block broke.
face: varint
face: zigzag32
# HotBarSlot is the hot bar slot that the player was holding while clicking the block. It should be used
# to ensure that the hot bar slot and held item are correctly synchronised with the server.
hotbar_slot: varint
Expand Down
2 changes: 1 addition & 1 deletion data/bedrock/1.17.30/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2851,7 +2851,7 @@ packet_player_auth_input:
if start_break or abort_break or crack_break or predict_break or continue_break:
# BlockPosition is the position of the target block, if the action with the ActionType set concerned a
# block. If that is not the case, the block position will be zero.
position: BlockCoordinates
position: vec3i
# BlockFace is the face of the target block that was touched. If the action with the ActionType set
# concerned a block. If not, the face is always 0.
face: zigzag32
Expand Down
14 changes: 7 additions & 7 deletions data/bedrock/1.17.30/protocol.json
Original file line number Diff line number Diff line change
Expand Up @@ -939,11 +939,11 @@
},
{
"name": "block_position",
"type": "vec3i"
"type": "BlockCoordinates"
},
{
"name": "face",
"type": "varint"
"type": "zigzag32"
},
{
"name": "hotbar_slot",
Expand Down Expand Up @@ -8467,7 +8467,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8480,7 +8480,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8493,7 +8493,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8506,7 +8506,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand All @@ -8519,7 +8519,7 @@
[
{
"name": "position",
"type": "BlockCoordinates"
"type": "vec3i"
},
{
"name": "face",
Expand Down
4 changes: 2 additions & 2 deletions data/bedrock/1.17.30/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,10 @@ TransactionUseItem:
2: break_block
# BlockPosition is the position of the block that was interacted with. This is only really a correct
# block position if ActionType is not UseItemActionClickAir.
block_position: vec3i
block_position: BlockCoordinates
# BlockFace is the face of the block that was interacted with. When clicking the block, it is the face
# clicked. When breaking the block, it is the face that was last being hit until the block broke.
face: varint
face: zigzag32
# HotBarSlot is the hot bar slot that the player was holding while clicking the block. It should be used
# to ensure that the hot bar slot and held item are correctly synchronised with the server.
hotbar_slot: varint
Expand Down
Loading

0 comments on commit f00c2cc

Please sign in to comment.