Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.17.1 (756) protocol #605

Merged
merged 32 commits into from
Sep 5, 2021
Merged

1.17.1 (756) protocol #605

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
480d923
Copy from 1.16.4
iceiix Aug 29, 2021
7f89a72
1.17.1 packet id shifts, new packets
iceiix Aug 29, 2021
27b5eab
Add TagsNested packet variant
iceiix Aug 29, 2021
4e5cb66
Fix TagsNested missing tag_type, add TagsGroup
iceiix Aug 29, 2021
ca139d5
Add TeleportPlayer_WithDismount packet variant
iceiix Aug 29, 2021
8c8ddc7
Add ChunkData_Biomes3D_Bitmasks packet variant, bitmask is now an arr…
iceiix Aug 29, 2021
4f9e1ca
world: begin handling on_chunk_data_biomes3d_bitmasks
iceiix Aug 29, 2021
030e552
cargo fmt
iceiix Aug 30, 2021
f63d6c3
Merge branch 'master' into 1.17.1
iceiix Sep 2, 2021
be81947
Add WindowItems_StateCarry variant, split WindowItems_i16
iceiix Sep 2, 2021
05faeee
Add WindowSetSlot_State
iceiix Sep 2, 2021
1982431
Add Explosion_VarInt packet variant
iceiix Sep 5, 2021
b871f0c
Add WorldBorderInit 0x20 https://wiki.vg/index.php?title=Protocol&old…
iceiix Sep 5, 2021
b5a0d0c
Add UpdateLight_Arrays variant https://wiki.vg/index.php?title=Protoc…
iceiix Sep 5, 2021
5e7c121
Add ResourcePackSend_Prompt variant https://wiki.vg/index.php?title=P…
iceiix Sep 5, 2021
0fdec69
Add SpawnPosition_Angle variant, https://wiki.vg/index.php?title=Prot…
iceiix Sep 5, 2021
ba264e1
Add EntityProperties_VarIntVarInt variant, using VarInts in both fiel…
iceiix Sep 5, 2021
181821d
Use consistent names for Tags packet variants
iceiix Sep 5, 2021
a5d849e
Add ClientSettings_Filtering variant https://wiki.vg/index.php?title=…
iceiix Sep 5, 2021
fa2e0f0
Add 'Pong' packet (unknown: https://wiki.vg/index.php?title=Protocol&…
iceiix Sep 5, 2021
4b58731
Add ClickWindow_State variant, https://wiki.vg/index.php?title=Protoc…
iceiix Sep 5, 2021
8c7655c
Cargo fmt
iceiix Sep 5, 2021
aaca31b
world: add num_sections to self.load_chunk19_or_115
iceiix Sep 5, 2021
dd9155d
protocol: update Cargo.lock for serde_json 1.0.130
iceiix Sep 5, 2021
99e62b8
world: load_chunk19_to_117: accept 64-bit mask
iceiix Sep 5, 2021
7128010
metadata: add PoseData::LongJumping
iceiix Sep 5, 2021
fbd4aba
Fix many Particle packet variant definitions
iceiix Sep 5, 2021
c121f7a
server: handle TeleportPlayer_WithDismount, fixes world loading
iceiix Sep 5, 2021
a04cda6
build: pin to wasm-pack 0.10.0
iceiix Sep 5, 2021
fb4f60b
protocol: rename to WindowPong to clarify related purpose
iceiix Sep 5, 2021
c627852
readme: add 1.17.1 (756)
iceiix Sep 5, 2021
dd40909
Add EditBook packet variant https://wiki.vg/index.php?title=Protocol&…
iceiix Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add EntityProperties_VarIntVarInt variant, using VarInts in both fields 
https://wiki.vg/index.php?title=Protocol&oldid=16918#Entity_Properties
  • Loading branch information
@iceiix
iceiix committed Sep 5, 2021
commit ba264e13c740e35edc8fa224b12894d4e80cf0a4
6 changes: 5 additions & 1 deletion protocol/src/protocol/packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,11 @@ state_packets!(
*/
}
/// EntityProperties updates the properties for an entity.
packet EntityProperties {
packet EntityProperties_VarIntVarInt {
field entity_id: VarInt =,
field properties: LenPrefixed<VarInt, packet::EntityProperty> =,
}
packet EntityProperties_VarInt {
field entity_id: VarInt =,
field properties: LenPrefixed<i32, packet::EntityProperty> =,
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v15w39c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ protocol_packet_ids!(
0x46 => PlayerListHeaderFooter
0x47 => CollectItem_nocount
0x48 => EntityTeleport_i32
0x49 => EntityProperties
0x49 => EntityProperties_VarInt
0x4a => EntityEffect
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v18w50a.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ protocol_packet_ids!(
0x51 => CollectItem
0x52 => EntityTeleport_f64
0x53 => Advancements
0x54 => EntityProperties
0x54 => EntityProperties_VarInt
0x55 => EntityEffect
0x56 => DeclareRecipes
0x57 => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v19w02a.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ protocol_packet_ids!(
0x51 => CollectItem
0x52 => EntityTeleport_f64
0x53 => Advancements
0x54 => EntityProperties
0x54 => EntityProperties_VarInt
0x55 => EntityEffect
0x56 => DeclareRecipes
0x57 => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_10_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ protocol_packet_ids!(
0x47 => PlayerListHeaderFooter
0x48 => CollectItem_nocount
0x49 => EntityTeleport_f64
0x4a => EntityProperties
0x4a => EntityProperties_VarInt
0x4b => EntityEffect
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_11_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ protocol_packet_ids!(
0x47 => PlayerListHeaderFooter
0x48 => CollectItem
0x49 => EntityTeleport_f64
0x4a => EntityProperties
0x4a => EntityProperties_VarInt
0x4b => EntityEffect
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_12_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ protocol_packet_ids!(
0x4b => CollectItem
0x4c => EntityTeleport_f64
0x4d => Advancements
0x4e => EntityProperties
0x4e => EntityProperties_VarInt
0x4f => EntityEffect
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_13_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ protocol_packet_ids!(
0x4f => CollectItem
0x50 => EntityTeleport_f64
0x51 => Advancements
0x52 => EntityProperties
0x52 => EntityProperties_VarInt
0x53 => EntityEffect
0x54 => DeclareRecipes
0x55 => Tags
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_4.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_15.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ protocol_packet_ids!(
0x56 => CollectItem
0x57 => EntityTeleport_f64
0x58 => Advancements
0x59 => EntityProperties
0x59 => EntityProperties_VarInt
0x5a => EntityEffect
0x5b => DeclareRecipes
0x5c => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_16_1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_16_4.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ protocol_packet_ids!(
0x55 => CollectItem
0x56 => EntityTeleport_f64
0x57 => Advancements
0x58 => EntityProperties
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_17_1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protocol_packet_ids!(
0x60 => CollectItem
0x61 => EntityTeleport_f64
0x62 => Advancements
0x63 => EntityProperties
0x63 => EntityProperties_VarIntVarInt
0x64 => EntityEffect
0x65 => DeclareRecipes
0x66 => TagsNested
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_8_9.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protocol_packet_ids!(
0x1d => EntityEffect
0x1e => EntityRemoveEffect
0x1f => SetExperience
0x20 => EntityProperties
0x20 => EntityProperties_VarInt
0x21 => ChunkData_NoEntities_u16
0x22 => MultiBlockChange_VarInt
0x23 => BlockChange_VarInt
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_9.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protocol_packet_ids!(
0x48 => PlayerListHeaderFooter
0x49 => CollectItem_nocount
0x4a => EntityTeleport_f64
0x4b => EntityProperties
0x4b => EntityProperties_VarInt
0x4c => EntityEffect
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_9_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protocol_packet_ids!(
0x48 => PlayerListHeaderFooter
0x49 => CollectItem_nocount
0x4a => EntityTeleport_f64
0x4b => EntityProperties
0x4b => EntityProperties_VarInt
0x4c => EntityEffect
}
}
Expand Down