Skip to content

Commit 99b6fb4

Browse files
extremeheatextremeheat
authored
bedrock: fix aim assist presets packet (#983)
* Update proto.yml * Update proto.yml * Update proto.yml * Update protocol.json * Update protocol.json
1 parent 97d62e4 commit 99b6fb4

File tree

4 files changed

+110
-180
lines changed

4 files changed

+110
-180
lines changed

‎data/bedrock/1.21.50/proto.yml

+12-17
Original file line numberDiff line numberDiff line change
@@ -4374,26 +4374,21 @@ packet_camera_aim_assist_presets:
43744374
!id: 0x140
43754375
!bound: client
43764376
# CategoryGroups is a list of groups of categories which can be referenced by one of the Presets.
4377-
category_groups: []varint
4377+
categories: []varint
43784378
# Identifier is the unique identifier of the group.
4379-
id: string
4380-
# Categories is a list of categories within this group.
4381-
categories: []varint
4382-
name: string
4383-
# Priorities represents the block and entity specific priorities for targetting. The aim
4384-
# assist will select the block or entity with the highest priority within the specified thresholds.
4385-
priorities:
4386-
entities: []varint
4387-
id: string
4388-
priority: li32
4389-
blocks: []varint
4390-
id: string
4391-
priority: li32
4392-
entity_default?: li32
4393-
block_default?: li32
4379+
name: string
4380+
# Priorities represents the block and entity specific priorities for targetting. The aim
4381+
# assist will select the block or entity with the highest priority within the specified thresholds.
4382+
entity_priorities: []varint
4383+
id: string
4384+
priority: li32
4385+
block_priorities: []varint
4386+
id: string
4387+
priority: li32
4388+
entity_default?: li32
4389+
block_default?: li32
43944390
presets: []varint
43954391
id: string
4396-
categories: string
43974392
exclude_blocks: string[]varint
43984393
target_liquids: string[]varint
43994394
item_settings: []varint

‎data/bedrock/1.21.50/protocol.json

+43-73
Original file line numberDiff line numberDiff line change
@@ -12864,7 +12864,7 @@
1286412864
"container",
1286512865
[
1286612866
{
12867-
"name": "category_groups",
12867+
"name": "categories",
1286812868
"type": [
1286912869
"array",
1287012870
{
@@ -12873,11 +12873,11 @@
1287312873
"container",
1287412874
[
1287512875
{
12876-
"name": "id",
12876+
"name": "name",
1287712877
"type": "string"
1287812878
},
1287912879
{
12880-
"name": "categories",
12880+
"name": "entity_priorities",
1288112881
"type": [
1288212882
"array",
1288312883
{
@@ -12886,79 +12886,53 @@
1288612886
"container",
1288712887
[
1288812888
{
12889-
"name": "name",
12889+
"name": "id",
1289012890
"type": "string"
1289112891
},
1289212892
{
12893-
"name": "priorities",
12894-
"type": [
12895-
"container",
12896-
[
12897-
{
12898-
"name": "entities",
12899-
"type": [
12900-
"array",
12901-
{
12902-
"countType": "varint",
12903-
"type": [
12904-
"container",
12905-
[
12906-
{
12907-
"name": "id",
12908-
"type": "string"
12909-
},
12910-
{
12911-
"name": "priority",
12912-
"type": "li32"
12913-
}
12914-
]
12915-
]
12916-
}
12917-
]
12918-
},
12919-
{
12920-
"name": "blocks",
12921-
"type": [
12922-
"array",
12923-
{
12924-
"countType": "varint",
12925-
"type": [
12926-
"container",
12927-
[
12928-
{
12929-
"name": "id",
12930-
"type": "string"
12931-
},
12932-
{
12933-
"name": "priority",
12934-
"type": "li32"
12935-
}
12936-
]
12937-
]
12938-
}
12939-
]
12940-
},
12941-
{
12942-
"name": "entity_default",
12943-
"type": [
12944-
"option",
12945-
"li32"
12946-
]
12947-
},
12948-
{
12949-
"name": "block_default",
12950-
"type": [
12951-
"option",
12952-
"li32"
12953-
]
12954-
}
12955-
]
12956-
]
12893+
"name": "priority",
12894+
"type": "li32"
12895+
}
12896+
]
12897+
]
12898+
}
12899+
]
12900+
},
12901+
{
12902+
"name": "block_priorities",
12903+
"type": [
12904+
"array",
12905+
{
12906+
"countType": "varint",
12907+
"type": [
12908+
"container",
12909+
[
12910+
{
12911+
"name": "id",
12912+
"type": "string"
12913+
},
12914+
{
12915+
"name": "priority",
12916+
"type": "li32"
1295712917
}
1295812918
]
1295912919
]
1296012920
}
1296112921
]
12922+
},
12923+
{
12924+
"name": "entity_default",
12925+
"type": [
12926+
"option",
12927+
"li32"
12928+
]
12929+
},
12930+
{
12931+
"name": "block_default",
12932+
"type": [
12933+
"option",
12934+
"li32"
12935+
]
1296212936
}
1296312937
]
1296412938
]
@@ -12978,10 +12952,6 @@
1297812952
"name": "id",
1297912953
"type": "string"
1298012954
},
12981-
{
12982-
"name": "categories",
12983-
"type": "string"
12984-
},
1298512955
{
1298612956
"name": "exclude_blocks",
1298712957
"type": [
@@ -13046,4 +13016,4 @@
1304613016
]
1304713017
]
1304813018
}
13049-
}
13019+
}

‎data/bedrock/1.21.60/protocol.json

+43-73
Original file line numberDiff line numberDiff line change
@@ -12963,7 +12963,7 @@
1296312963
"container",
1296412964
[
1296512965
{
12966-
"name": "category_groups",
12966+
"name": "categories",
1296712967
"type": [
1296812968
"array",
1296912969
{
@@ -12972,11 +12972,11 @@
1297212972
"container",
1297312973
[
1297412974
{
12975-
"name": "id",
12975+
"name": "name",
1297612976
"type": "string"
1297712977
},
1297812978
{
12979-
"name": "categories",
12979+
"name": "entity_priorities",
1298012980
"type": [
1298112981
"array",
1298212982
{
@@ -12985,79 +12985,53 @@
1298512985
"container",
1298612986
[
1298712987
{
12988-
"name": "name",
12988+
"name": "id",
1298912989
"type": "string"
1299012990
},
1299112991
{
12992-
"name": "priorities",
12993-
"type": [
12994-
"container",
12995-
[
12996-
{
12997-
"name": "entities",
12998-
"type": [
12999-
"array",
13000-
{
13001-
"countType": "varint",
13002-
"type": [
13003-
"container",
13004-
[
13005-
{
13006-
"name": "id",
13007-
"type": "string"
13008-
},
13009-
{
13010-
"name": "priority",
13011-
"type": "li32"
13012-
}
13013-
]
13014-
]
13015-
}
13016-
]
13017-
},
13018-
{
13019-
"name": "blocks",
13020-
"type": [
13021-
"array",
13022-
{
13023-
"countType": "varint",
13024-
"type": [
13025-
"container",
13026-
[
13027-
{
13028-
"name": "id",
13029-
"type": "string"
13030-
},
13031-
{
13032-
"name": "priority",
13033-
"type": "li32"
13034-
}
13035-
]
13036-
]
13037-
}
13038-
]
13039-
},
13040-
{
13041-
"name": "entity_default",
13042-
"type": [
13043-
"option",
13044-
"li32"
13045-
]
13046-
},
13047-
{
13048-
"name": "block_default",
13049-
"type": [
13050-
"option",
13051-
"li32"
13052-
]
13053-
}
13054-
]
13055-
]
12992+
"name": "priority",
12993+
"type": "li32"
12994+
}
12995+
]
12996+
]
12997+
}
12998+
]
12999+
},
13000+
{
13001+
"name": "block_priorities",
13002+
"type": [
13003+
"array",
13004+
{
13005+
"countType": "varint",
13006+
"type": [
13007+
"container",
13008+
[
13009+
{
13010+
"name": "id",
13011+
"type": "string"
13012+
},
13013+
{
13014+
"name": "priority",
13015+
"type": "li32"
1305613016
}
1305713017
]
1305813018
]
1305913019
}
1306013020
]
13021+
},
13022+
{
13023+
"name": "entity_default",
13024+
"type": [
13025+
"option",
13026+
"li32"
13027+
]
13028+
},
13029+
{
13030+
"name": "block_default",
13031+
"type": [
13032+
"option",
13033+
"li32"
13034+
]
1306113035
}
1306213036
]
1306313037
]
@@ -13077,10 +13051,6 @@
1307713051
"name": "id",
1307813052
"type": "string"
1307913053
},
13080-
{
13081-
"name": "categories",
13082-
"type": "string"
13083-
},
1308413054
{
1308513055
"name": "exclude_blocks",
1308613056
"type": [
@@ -13241,4 +13211,4 @@
1324113211
]
1324213212
]
1324313213
}
13244-
}
13214+
}

‎data/bedrock/latest/proto.yml

+12-17
Original file line numberDiff line numberDiff line change
@@ -4411,26 +4411,21 @@ packet_camera_aim_assist_presets:
44114411
!id: 0x140
44124412
!bound: client
44134413
# CategoryGroups is a list of groups of categories which can be referenced by one of the Presets.
4414-
category_groups: []varint
4414+
categories: []varint
44154415
# Identifier is the unique identifier of the group.
4416-
id: string
4417-
# Categories is a list of categories within this group.
4418-
categories: []varint
4419-
name: string
4420-
# Priorities represents the block and entity specific priorities for targetting. The aim
4421-
# assist will select the block or entity with the highest priority within the specified thresholds.
4422-
priorities:
4423-
entities: []varint
4424-
id: string
4425-
priority: li32
4426-
blocks: []varint
4427-
id: string
4428-
priority: li32
4429-
entity_default?: li32
4430-
block_default?: li32
4416+
name: string
4417+
# Priorities represents the block and entity specific priorities for targetting. The aim
4418+
# assist will select the block or entity with the highest priority within the specified thresholds.
4419+
entity_priorities: []varint
4420+
id: string
4421+
priority: li32
4422+
block_priorities: []varint
4423+
id: string
4424+
priority: li32
4425+
entity_default?: li32
4426+
block_default?: li32
44314427
presets: []varint
44324428
id: string
4433-
categories: string
44344429
exclude_blocks: string[]varint
44354430
target_liquids: string[]varint
44364431
item_settings: []varint

0 commit comments

Comments
 (0)