1.18.2 protocol (758) (iceiix#706)

Minor protocol update https://minecraft.fandom.com/wiki/Java_Edition_1.18.2 https://wiki.vg/index.php?title=Protocol&oldid=17499 1.18.2 (758) https://wiki.vg/index.php?title=Protocol&diff=17499&oldid=17341 1.18.1 (757) vs 1.18.2 (758) * Add EntityRemoveEffect_VarInt, split i8 variant * Add UpdateScore_VarInt, split u8 variant * Add EntityEffect_VarInt, split i8 variant
nathanruiz · Aug 7, 2022 · 069a391 · 069a391
1 parent adb71c7
commit 069a391
Show file tree

Hide file tree

Showing 25 changed files with 280 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ Discussion forum: [https://github.com/iceiix/stevenarella/discussions](https://g
 
 | Game version | Protocol version | Supported? |
 | ------ | --- | --- |
+| 1.18.2 | 758 | ✓ |
 | 1.18.1 | 757 | ✓ |
 | 1.17.1 | 756 | ✓ |
 | 1.16.5 | 754 | ✓ |

diff --git a/protocol/src/protocol/mod.rs b/protocol/src/protocol/mod.rs
@@ -39,9 +39,9 @@ use std::io::{Read, Write};
 use std::net::TcpStream;
 use std::sync::atomic::{AtomicBool, AtomicI32, Ordering};
 
-pub const SUPPORTED_PROTOCOLS: [i32; 26] = [
-    757, 756, 754, 753, 751, 736, 735, 578, 575, 498, 490, 485, 480, 477, 452, 451, 404, 340, 316,
-    315, 210, 109, 107, 74, 47, 5,
+pub const SUPPORTED_PROTOCOLS: [i32; 27] = [
+    758, 757, 756, 754, 753, 751, 736, 735, 578, 575, 498, 490, 485, 480, 477, 452, 451, 404, 340,
+    316, 315, 210, 109, 107, 74, 47, 5,
 ];
 
 static CURRENT_PROTOCOL_VERSION: AtomicI32 = AtomicI32::new(SUPPORTED_PROTOCOLS[0]);

diff --git a/protocol/src/protocol/packet.rs b/protocol/src/protocol/packet.rs
@@ -1796,7 +1796,11 @@ state_packets!(
                 field entity_ids: LenPrefixed<u8, i32> =,
             }
             /// EntityRemoveEffect removes an effect from an entity.
-            packet EntityRemoveEffect {
+            packet EntityRemoveEffect_VarInt {
+                field entity_id: VarInt =,
+                field effect_id: VarInt =,
+            }
+            packet EntityRemoveEffect_i8 {
                 field entity_id: VarInt =,
                 field effect_id: i8 =,
             }
@@ -2062,17 +2066,23 @@ state_packets!(
             }
             /// UpdateScore is used to update or remove an item from a scoreboard
             /// objective.
-            packet UpdateScore {
+            packet UpdateScore_VarInt {
+                field name: String =,
+                field action: VarInt =,
+                field object_name: String =,
+                field value: Option<VarInt> = when(|p: &UpdateScore_VarInt| p.action.0 != 1),
+            }
+            packet UpdateScore_u8 {
                 field name: String =,
                 field action: u8 =,
                 field object_name: String =,
-                field value: Option<VarInt> = when(|p: &UpdateScore| p.action != 1),
+                field value: Option<VarInt> = when(|p: &UpdateScore_u8| p.action != 1),
             }
             packet UpdateScore_i32 {
                 field name: String =,
                 field action: u8 =,
                 field object_name: String =,
-                field value: Option<i32 > = when(|p: &UpdateScore_i32| p.action != 1),
+                field value: Option<i32> = when(|p: &UpdateScore_i32| p.action != 1),
             }
             /// UpdateSimulationDistance is used to set how far the client will process entities.
             packet UpdateSimulationDistance {
@@ -2255,7 +2265,14 @@ state_packets!(
                 field properties: LenPrefixed<i32, packet::EntityProperty_i16> =,
             }
             /// EntityEffect applies a status effect to an entity for a given duration.
-            packet EntityEffect {
+            packet EntityEffect_VarInt {
+                field entity_id: VarInt =,
+                field effect_id: VarInt =,
+                field amplifier: i8 =,
+                field duration: VarInt =,
+                field hide_particles: bool =,
+            }
+            packet EntityEffect_i8 {
                 field entity_id: VarInt =,
                 field effect_id: i8 =,
                 field amplifier: i8 =,

diff --git a/protocol/src/protocol/versions.rs b/protocol/src/protocol/versions.rs
@@ -17,6 +17,7 @@ mod v1_16_1;
 mod v1_16_4;
 mod v1_17_1;
 mod v1_18_1;
+mod v1_18_2;
 mod v1_7_10;
 mod v1_8_9;
 mod v1_9;
@@ -28,6 +29,7 @@ mod v1_9_2;
 pub fn protocol_name_to_protocol_version(s: String) -> i32 {
     match s.as_ref() {
         "" => SUPPORTED_PROTOCOLS[0],
+        "1.18.2" => 758,
         "1.18.1" => 757,
         "1.17.1" => 756,
         "1.16.5" => 754,
@@ -73,6 +75,7 @@ pub fn translate_internal_packet_id_for_version(
     to_internal: bool,
 ) -> i32 {
     match version {
+        758 => v1_18_2::translate_internal_packet_id(state, dir, id, to_internal),
         757 => v1_18_1::translate_internal_packet_id(state, dir, id, to_internal),
         756 => v1_17_1::translate_internal_packet_id(state, dir, id, to_internal),
         754 | 753 | 751 => v1_16_4::translate_internal_packet_id(state, dir, id, to_internal),

diff --git a/protocol/src/protocol/versions/v15w39c.rs b/protocol/src/protocol/versions/v15w39c.rs
@@ -86,7 +86,7 @@ protocol_packet_ids!(
             0x2e => TeleportPlayer_NoConfirm
             0x2f => EntityUsedBed
             0x30 => EntityDestroy
-            0x31 => EntityRemoveEffect
+            0x31 => EntityRemoveEffect_i8
             0x32 => ResourcePackSend
             0x33 => Respawn_Gamemode
             0x34 => EntityHeadLook
@@ -102,7 +102,7 @@ protocol_packet_ids!(
             0x3e => UpdateHealth
             0x3f => ScoreboardObjective
             0x40 => Teams_u8
-            0x41 => UpdateScore
+            0x41 => UpdateScore_u8
             0x42 => SpawnPosition_NoAngle
             0x43 => TimeUpdate
             0x44 => Title_notext_component
@@ -111,7 +111,7 @@ protocol_packet_ids!(
             0x47 => CollectItem_nocount
             0x48 => EntityTeleport_i32
             0x49 => EntityProperties_VarInt
-            0x4a => EntityEffect
+            0x4a => EntityEffect_i8
         }
     }
     login Login {

diff --git a/protocol/src/protocol/versions/v18w50a.rs b/protocol/src/protocol/versions/v18w50a.rs
@@ -108,7 +108,7 @@ protocol_packet_ids!(
             0x34 => EntityUsedBed
             0x35 => UnlockRecipes_WithSmelting
             0x36 => EntityDestroy
-            0x37 => EntityRemoveEffect
+            0x37 => EntityRemoveEffect_i8
             0x38 => ResourcePackSend
             0x39 => Respawn_Gamemode
             0x3a => EntityHeadLook
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x46 => ScoreboardObjective
             0x47 => SetPassengers
             0x48 => Teams_u8
-            0x49 => UpdateScore
+            0x49 => UpdateScore_u8
             0x4a => SpawnPosition_NoAngle
             0x4b => TimeUpdate
             0x4d => StopSound
@@ -137,7 +137,7 @@ protocol_packet_ids!(
             0x52 => EntityTeleport_f64
             0x53 => Advancements
             0x54 => EntityProperties_VarInt
-            0x55 => EntityEffect
+            0x55 => EntityEffect_i8
             0x56 => DeclareRecipes
             0x57 => Tags_WithEntities
             0x58 => UpdateLight_NoTrust

diff --git a/protocol/src/protocol/versions/v19w02a.rs b/protocol/src/protocol/versions/v19w02a.rs
@@ -108,7 +108,7 @@ protocol_packet_ids!(
             0x34 => EntityUsedBed
             0x35 => UnlockRecipes_WithSmelting
             0x36 => EntityDestroy
-            0x37 => EntityRemoveEffect
+            0x37 => EntityRemoveEffect_i8
             0x38 => ResourcePackSend
             0x39 => Respawn_Gamemode
             0x3a => EntityHeadLook
@@ -126,7 +126,7 @@ protocol_packet_ids!(
             0x46 => ScoreboardObjective
             0x47 => SetPassengers
             0x48 => Teams_u8
-            0x49 => UpdateScore
+            0x49 => UpdateScore_u8
             0x4a => SpawnPosition_NoAngle
             0x4b => TimeUpdate
             0x4d => StopSound
@@ -137,7 +137,7 @@ protocol_packet_ids!(
             0x52 => EntityTeleport_f64
             0x53 => Advancements
             0x54 => EntityProperties_VarInt
-            0x55 => EntityEffect
+            0x55 => EntityEffect_i8
             0x56 => DeclareRecipes
             0x57 => Tags_WithEntities
             0x58 => UpdateLight_NoTrust

diff --git a/protocol/src/protocol/versions/v1_10_2.rs b/protocol/src/protocol/versions/v1_10_2.rs
@@ -89,7 +89,7 @@ protocol_packet_ids!(
             0x2e => TeleportPlayer_WithConfirm
             0x2f => EntityUsedBed
             0x30 => EntityDestroy
-            0x31 => EntityRemoveEffect
+            0x31 => EntityRemoveEffect_i8
             0x32 => ResourcePackSend
             0x33 => Respawn_Gamemode
             0x34 => EntityHeadLook
@@ -106,7 +106,7 @@ protocol_packet_ids!(
             0x3f => ScoreboardObjective
             0x40 => SetPassengers
             0x41 => Teams_u8
-            0x42 => UpdateScore
+            0x42 => UpdateScore_u8
             0x43 => SpawnPosition_NoAngle
             0x44 => TimeUpdate
             0x45 => Title_notext
@@ -115,7 +115,7 @@ protocol_packet_ids!(
             0x48 => CollectItem_nocount
             0x49 => EntityTeleport_f64
             0x4a => EntityProperties_VarInt
-            0x4b => EntityEffect
+            0x4b => EntityEffect_i8
         }
     }
     login Login {

diff --git a/protocol/src/protocol/versions/v1_11_2.rs b/protocol/src/protocol/versions/v1_11_2.rs
@@ -89,7 +89,7 @@ protocol_packet_ids!(
             0x2e => TeleportPlayer_WithConfirm
             0x2f => EntityUsedBed
             0x30 => EntityDestroy
-            0x31 => EntityRemoveEffect
+            0x31 => EntityRemoveEffect_i8
             0x32 => ResourcePackSend
             0x33 => Respawn_Gamemode
             0x34 => EntityHeadLook
@@ -106,7 +106,7 @@ protocol_packet_ids!(
             0x3f => ScoreboardObjective
             0x40 => SetPassengers
             0x41 => Teams_u8
-            0x42 => UpdateScore
+            0x42 => UpdateScore_u8
             0x43 => SpawnPosition_NoAngle
             0x44 => TimeUpdate
             0x45 => Title
@@ -115,7 +115,7 @@ protocol_packet_ids!(
             0x48 => CollectItem
             0x49 => EntityTeleport_f64
             0x4a => EntityProperties_VarInt
-            0x4b => EntityEffect
+            0x4b => EntityEffect_i8
         }
     }
     login Login {

diff --git a/protocol/src/protocol/versions/v1_12_2.rs b/protocol/src/protocol/versions/v1_12_2.rs
@@ -94,7 +94,7 @@ protocol_packet_ids!(
             0x30 => EntityUsedBed
             0x31 => UnlockRecipes_NoSmelting
             0x32 => EntityDestroy
-            0x33 => EntityRemoveEffect
+            0x33 => EntityRemoveEffect_i8
             0x34 => ResourcePackSend
             0x35 => Respawn_Gamemode
             0x36 => EntityHeadLook
@@ -112,7 +112,7 @@ protocol_packet_ids!(
             0x42 => ScoreboardObjective
             0x43 => SetPassengers
             0x44 => Teams_u8
-            0x45 => UpdateScore
+            0x45 => UpdateScore_u8
             0x46 => SpawnPosition_NoAngle
             0x47 => TimeUpdate
             0x48 => Title
@@ -122,7 +122,7 @@ protocol_packet_ids!(
             0x4c => EntityTeleport_f64
             0x4d => Advancements
             0x4e => EntityProperties_VarInt
-            0x4f => EntityEffect
+            0x4f => EntityEffect_i8
         }
     }
     login Login {

diff --git a/protocol/src/protocol/versions/v1_13_2.rs b/protocol/src/protocol/versions/v1_13_2.rs
@@ -107,7 +107,7 @@ protocol_packet_ids!(
             0x33 => EntityUsedBed
             0x34 => UnlockRecipes_WithSmelting
             0x35 => EntityDestroy
-            0x36 => EntityRemoveEffect
+            0x36 => EntityRemoveEffect_i8
             0x37 => ResourcePackSend
             0x38 => Respawn_Gamemode
             0x39 => EntityHeadLook
@@ -125,7 +125,7 @@ protocol_packet_ids!(
             0x45 => ScoreboardObjective
             0x46 => SetPassengers
             0x47 => Teams_VarInt
-            0x48 => UpdateScore
+            0x48 => UpdateScore_u8
             0x49 => SpawnPosition_NoAngle
             0x4a => TimeUpdate
             0x4c => StopSound
@@ -135,7 +135,7 @@ protocol_packet_ids!(
             0x50 => EntityTeleport_f64
             0x51 => Advancements
             0x52 => EntityProperties_VarInt
-            0x53 => EntityEffect
+            0x53 => EntityEffect_i8
             0x54 => DeclareRecipes
             0x55 => Tags
         }

diff --git a/protocol/src/protocol/versions/v1_14.rs b/protocol/src/protocol/versions/v1_14.rs
@@ -112,7 +112,7 @@ protocol_packet_ids!(
             0x35 => TeleportPlayer_WithConfirm
             0x36 => UnlockRecipes_WithSmelting
             0x37 => EntityDestroy
-            0x38 => EntityRemoveEffect
+            0x38 => EntityRemoveEffect_i8
             0x39 => ResourcePackSend
             0x3a => Respawn_Gamemode
             0x3b => EntityHeadLook
@@ -132,7 +132,7 @@ protocol_packet_ids!(
             0x49 => ScoreboardObjective
             0x4a => SetPassengers
             0x4b => Teams_VarInt
-            0x4c => UpdateScore
+            0x4c => UpdateScore_u8
             0x4d => SpawnPosition_NoAngle
             0x4e => TimeUpdate
             0x4f => Title
@@ -145,7 +145,7 @@ protocol_packet_ids!(
             0x56 => EntityTeleport_f64
             0x57 => Advancements
             0x58 => EntityProperties_VarInt
-            0x59 => EntityEffect
+            0x59 => EntityEffect_i8
             0x5a => DeclareRecipes
             0x5b => Tags_WithEntities
         }

diff --git a/protocol/src/protocol/versions/v1_14_1.rs b/protocol/src/protocol/versions/v1_14_1.rs
@@ -112,7 +112,7 @@ protocol_packet_ids!(
             0x35 => TeleportPlayer_WithConfirm
             0x36 => UnlockRecipes_WithSmelting
             0x37 => EntityDestroy
-            0x38 => EntityRemoveEffect
+            0x38 => EntityRemoveEffect_i8
             0x39 => ResourcePackSend
             0x3a => Respawn_Gamemode
             0x3b => EntityHeadLook
@@ -132,7 +132,7 @@ protocol_packet_ids!(
             0x49 => ScoreboardObjective
             0x4a => SetPassengers
             0x4b => Teams_VarInt
-            0x4c => UpdateScore
+            0x4c => UpdateScore_u8
             0x4d => SpawnPosition_NoAngle
             0x4e => TimeUpdate
             0x4f => Title
@@ -145,7 +145,7 @@ protocol_packet_ids!(
             0x56 => EntityTeleport_f64
             0x57 => Advancements
             0x58 => EntityProperties_VarInt
-            0x59 => EntityEffect
+            0x59 => EntityEffect_i8
             0x5a => DeclareRecipes
             0x5b => Tags_WithEntities
         }

diff --git a/protocol/src/protocol/versions/v1_14_2.rs b/protocol/src/protocol/versions/v1_14_2.rs
@@ -112,7 +112,7 @@ protocol_packet_ids!(
             0x35 => TeleportPlayer_WithConfirm
             0x36 => UnlockRecipes_WithSmelting
             0x37 => EntityDestroy
-            0x38 => EntityRemoveEffect
+            0x38 => EntityRemoveEffect_i8
             0x39 => ResourcePackSend
             0x3a => Respawn_Gamemode
             0x3b => EntityHeadLook
@@ -132,7 +132,7 @@ protocol_packet_ids!(
             0x49 => ScoreboardObjective
             0x4a => SetPassengers
             0x4b => Teams_VarInt
-            0x4c => UpdateScore
+            0x4c => UpdateScore_u8
             0x4d => SpawnPosition_NoAngle
             0x4e => TimeUpdate
             0x4f => Title
@@ -145,7 +145,7 @@ protocol_packet_ids!(
             0x56 => EntityTeleport_f64
             0x57 => Advancements
             0x58 => EntityProperties_VarInt
-            0x59 => EntityEffect
+            0x59 => EntityEffect_i8
             0x5a => DeclareRecipes
             0x5b => Tags_WithEntities
         }

diff --git a/protocol/src/protocol/versions/v1_14_3.rs b/protocol/src/protocol/versions/v1_14_3.rs
@@ -112,7 +112,7 @@ protocol_packet_ids!(
             0x35 => TeleportPlayer_WithConfirm
             0x36 => UnlockRecipes_WithSmelting
             0x37 => EntityDestroy
-            0x38 => EntityRemoveEffect
+            0x38 => EntityRemoveEffect_i8
             0x39 => ResourcePackSend
             0x3a => Respawn_Gamemode
             0x3b => EntityHeadLook
@@ -132,7 +132,7 @@ protocol_packet_ids!(
             0x49 => ScoreboardObjective
             0x4a => SetPassengers
             0x4b => Teams_VarInt
-            0x4c => UpdateScore
+            0x4c => UpdateScore_u8
             0x4d => SpawnPosition_NoAngle
             0x4e => TimeUpdate
             0x4f => Title
@@ -145,7 +145,7 @@ protocol_packet_ids!(
             0x56 => EntityTeleport_f64
             0x57 => Advancements
             0x58 => EntityProperties_VarInt
-            0x59 => EntityEffect
+            0x59 => EntityEffect_i8
             0x5a => DeclareRecipes
             0x5b => Tags_WithEntities
         }