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.

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
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
Use consistent names for Tags packet variants
  • Loading branch information
iceiix committed Sep 5, 2021
commit 181821d968326286f33367eb489fd879d21384bf
4 changes: 2 additions & 2 deletions protocol/src/protocol/packet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2189,13 +2189,13 @@ state_packets!(
field item_tags: LenPrefixed<VarInt, packet::Tags> =,
field fluid_tags: LenPrefixed<VarInt, packet::Tags> =,
}
packet TagsWithEntities {
packet Tags_WithEntities {
field block_tags: LenPrefixed<VarInt, packet::Tags> =,
field item_tags: LenPrefixed<VarInt, packet::Tags> =,
field fluid_tags: LenPrefixed<VarInt, packet::Tags> =,
field entity_tags: LenPrefixed<VarInt, packet::Tags> =,
}
packet TagsNested {
packet Tags_Nested {
field tags: LenPrefixed<VarInt, packet::TagsGroup> =,
}
packet AcknowledgePlayerDigging {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v18w50a.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protocol_packet_ids!(
0x54 => EntityProperties_VarInt
0x55 => EntityEffect
0x56 => DeclareRecipes
0x57 => TagsWithEntities
0x57 => Tags_WithEntities
0x58 => UpdateLight_NoTrust
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v19w02a.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protocol_packet_ids!(
0x54 => EntityProperties_VarInt
0x55 => EntityEffect
0x56 => DeclareRecipes
0x57 => TagsWithEntities
0x57 => Tags_WithEntities
0x58 => UpdateLight_NoTrust
0x59 => WindowOpen_VarInt
0x5a => TradeList_WithoutRestock // TODO: without 1.14 added fields
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_14_4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
0x5c => AcknowledgePlayerDigging
}
}
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_15.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ protocol_packet_ids!(
0x59 => EntityProperties_VarInt
0x5a => EntityEffect
0x5b => DeclareRecipes
0x5c => TagsWithEntities
0x5c => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_16_1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_16_4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ protocol_packet_ids!(
0x58 => EntityProperties_VarInt
0x59 => EntityEffect
0x5a => DeclareRecipes
0x5b => TagsWithEntities
0x5b => Tags_WithEntities
}
}
login Login {
Expand Down
2 changes: 1 addition & 1 deletion protocol/src/protocol/versions/v1_17_1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ protocol_packet_ids!(
0x63 => EntityProperties_VarIntVarInt
0x64 => EntityEffect
0x65 => DeclareRecipes
0x66 => TagsNested
0x66 => Tags_Nested
}
}
login Login {
Expand Down