feat: 1.21.4 (#2)

Zxnii · web-flow · commit 0a040a281839 · 2025-02-10T21:25:45.000-07:00
diff --git a/assets/blocks.json b/assets/blocks.json
diff --git a/assets/more_registries.json b/assets/more_registries.json
diff --git a/assets/registries.json b/assets/registries.json
diff --git a/assets/tags.json b/assets/tags.json
diff --git a/src/main.rs b/src/main.rs
@@ -37,8 +37,8 @@ mod server;
 mod state;
 mod world;
 
-const VERSION: &str = "1.21.1";
-const VERSION_NUM: i32 = 767;
+const VERSION: &str = "1.21.4";
+const VERSION_NUM: i32 = 769;
 const TICK_RATE: u8 = 20;
 
 type CrawlState = Arc<state::State>;
diff --git a/src/net/cache.rs b/src/net/cache.rs
@@ -25,14 +25,15 @@ use crate::{
     protocol::{
         datatypes::VarInt,
         packets::{
-            login::registry::{AllRegistries, Registry},
+            login::registry::{AllRegistries, Registry, AllTags},
             play::ChunkDataUpdateLightC,
         },
         Encoder,
     },
     world::{blocks::Blocks, BlockEntity, Container, World},
     CrawlState,
 };
+use crate::protocol::packets::login::registry::RegistryItem;
 
 #[derive(Debug)]
 pub struct WorldCache {
@@ -123,6 +124,25 @@ impl WorldCache {
     }
 }
 
+#[derive(Debug)]
+pub struct TagCache {
+    pub encoded: Vec<u8>,
+}
+
+impl From<&AllTags> for TagCache {
+    fn from(tags: &AllTags) -> Self {
+        let mut encoder = Encoder::new();
+
+        encoder
+            .append_packet(tags)
+            .expect("Failed to encode tags");
+
+        Self {
+            encoded: encoder.take().to_vec()
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct RegistryCache {
     pub encoded: Vec<u8>,
diff --git a/src/net/player.rs b/src/net/player.rs
@@ -245,7 +245,6 @@ impl SharedPlayer {
             uuid,
             username: Bounded(&username),
             properties: Vec::new(),
-            strict_error_handling: false,
         };
 
         {
@@ -263,6 +262,7 @@ impl SharedPlayer {
         self.0.io.rx::<KnownPacksS>().await?;
 
         self.0.io.tx_raw(&state.registry_cache.encoded).await?;
+        self.0.io.tx_raw(&state.tag_cache.encoded).await?;
 
         self.0.io.tx(&FinishConfigurationC).await?;
         self.0.io.rx::<FinishConfigurationAckS>().await?;
@@ -313,6 +313,7 @@ impl SharedPlayer {
             is_superflat: false,
             death_location: None,
             portal_cooldown: VarInt(0),
+            sea_level: VarInt(64),
             enforces_secure_chat: false,
         };
 
@@ -435,7 +436,7 @@ impl SharedPlayer {
             };
         }
 
-        let tp = SynchronisePositionC::new(x, y, z, yaw, pitch);
+        let tp = SynchronisePositionC::new(x, y, z, 0.0, 0.0, 0.0, yaw, pitch);
         {
             let mut tp_state = self.0.tp_state.write().await;
             // player will be given 5 (FIVE) SECONDS TO ACK!!!!!
diff --git a/src/protocol/packets/login/login.rs b/src/protocol/packets/login/login.rs
@@ -49,7 +49,6 @@ pub struct LoginSuccessC<'a> {
     pub uuid: Uuid,
     pub username: Bounded<&'a str, 16>,
     pub properties: Vec<Property<'a>>,
-    pub strict_error_handling: bool,
 }
 
 impl Packet for LoginSuccessC<'_> {
@@ -64,7 +63,6 @@ impl<'a> Encode for LoginSuccessC<'a> {
         self.username.encode(&mut w)?;
         properties_len.encode(&mut w)?;
         self.properties.encode(&mut w)?;
-        self.strict_error_handling.encode(&mut w)?;
 
         Ok(())
     }
diff --git a/src/protocol/packets/login/registry/biome.rs b/src/protocol/packets/login/registry/biome.rs
@@ -44,7 +44,8 @@ struct Effects {
     ambient_sound: Option<StringOrCompound<AmbientSound>>,
     mood_sound: Option<MoodSound>,
     additions_sound: Option<AdditionsSound>,
-    music: Option<Music>,
+    music: Option<Vec<Music>>,
+    music_volume: Option<f32>
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
@@ -81,6 +82,12 @@ struct AdditionsSound {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 struct Music {
+    data: MusicData,
+    weight: f32,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+struct MusicData {
     sound: String,
     min_delay: i32,
     max_delay: i32,
diff --git a/src/protocol/packets/login/registry/dimension.rs b/src/protocol/packets/login/registry/dimension.rs
@@ -19,25 +19,33 @@
 
 use serde::{Deserialize, Serialize};
 
-use super::RegistryItem;
+use super::{RegistryItem, deserialize_bool};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DimensionType {
     fixed_time: Option<i64>,
+    #[serde(deserialize_with = "deserialize_bool")]
     has_skylight: i8,
+    #[serde(deserialize_with = "deserialize_bool")]
     has_ceiling: i8,
+    #[serde(deserialize_with = "deserialize_bool")]
     ultrawarm: i8,
+    #[serde(deserialize_with = "deserialize_bool")]
     natural: i8,
     coordinate_scale: f64,
+    #[serde(deserialize_with = "deserialize_bool")]
     bed_works: i8,
+    #[serde(deserialize_with = "deserialize_bool")]
     respawn_anchor_works: i8,
     min_y: i32,
     height: i32,
     logical_height: i32,
     infiniburn: String,
     effects: String,
     ambient_light: f32,
+    #[serde(deserialize_with = "deserialize_bool")]
     piglin_safe: i8,
+    #[serde(deserialize_with = "deserialize_bool")]
     has_raids: i8,
     monster_spawn_light_level: IntOrLightLevel,
     monster_spawn_block_light_limit: i32,
diff --git a/src/protocol/packets/login/registry/mod.rs b/src/protocol/packets/login/registry/mod.rs
@@ -32,6 +32,7 @@ mod dimension;
 mod painting;
 mod trim;
 mod wolf;
+mod tags;
 
 pub use banner::*;
 pub use biome::*;
@@ -41,12 +42,18 @@ pub use dimension::*;
 pub use painting::*;
 pub use trim::*;
 pub use wolf::*;
+pub use tags::*;
 
 pub static ALL_REGISTRIES: LazyLock<AllRegistries> = LazyLock::new(|| {
     serde_json::from_str(include_str!("../../../../../assets/registries.json"))
         .expect("registries.json should be parseable")
 });
 
+pub static TAGS: LazyLock<AllTags> = LazyLock::new(|| {
+    serde_json::from_str(include_str!("../../../../../assets/tags.json"))
+        .expect("tags.json should be parseable")
+});
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct Registry<T: RegistryItem> {
     registry_id: String,
diff --git a/src/protocol/packets/login/registry/tags.rs b/src/protocol/packets/login/registry/tags.rs
@@ -0,0 +1,39 @@
+use std::collections::HashMap;
+use crate::protocol::{Encode, Packet};
+use crate::protocol::datatypes::{Bounded, VarInt};
+
+#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+pub struct AllTags(pub HashMap<String, Tags>);
+
+#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+pub struct Tags(pub HashMap<String, Vec<String>>);
+
+impl Packet for AllTags {
+    const ID: i32 = 0x0D;
+}
+
+impl Encode for AllTags {
+    fn encode(&self, mut w: impl std::io::Write) -> color_eyre::Result<()> {
+        VarInt(self.0.len() as i32).encode(&mut w)?;
+
+        for (registry, tags) in self.0.clone() {
+            Bounded::<&'_ str>(registry.as_str()).encode(&mut w)?;
+            tags.encode(&mut w)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl Encode for Tags {
+    fn encode(&self, mut w: impl std::io::Write) -> color_eyre::Result<()> {
+        VarInt(self.0.len() as i32).encode(&mut w)?;
+
+        for (name, _) in self.0.clone() {
+            Bounded::<&'_ str>(name.as_str()).encode(&mut w)?;
+            VarInt(0).encode(&mut w)?;
+        }
+
+        Ok(())
+    }
+}
diff --git a/src/protocol/packets/login/registry/trim.rs b/src/protocol/packets/login/registry/trim.rs
@@ -25,7 +25,6 @@ use super::{RegistryItem, StringOrCompound};
 pub struct TrimMaterial {
     asset_name: String,
     ingredient: String,
-    item_model_index: f32,
     description: StringOrCompound<TrimDescription>,
 }
 
diff --git a/src/protocol/packets/play/container.rs b/src/protocol/packets/play/container.rs
@@ -33,7 +33,7 @@ pub struct OpenScreenC {
 }
 
 impl Packet for OpenScreenC {
-    const ID: i32 = 0x33;
+    const ID: i32 = 0x35;
 }
 
 impl Encode for OpenScreenC {
diff --git a/src/protocol/packets/play/game_event.rs b/src/protocol/packets/play/game_event.rs
@@ -28,7 +28,7 @@ pub struct GameEventC {
 }
 
 impl Packet for GameEventC {
-    const ID: i32 = 0x22;
+    const ID: i32 = 0x23;
 }
 
 impl Encode for GameEventC {
diff --git a/src/protocol/packets/play/interactions.rs b/src/protocol/packets/play/interactions.rs
@@ -93,7 +93,7 @@ impl TryFrom<VarInt> for Face {
 }
 
 impl Packet for UseItemOnS {
-    const ID: i32 = 0x38;
+    const ID: i32 = 0x3C;
 }
 
 impl Decode<'_> for UseItemOnS {
diff --git a/src/protocol/packets/play/keepalive.rs b/src/protocol/packets/play/keepalive.rs
@@ -23,7 +23,7 @@ use crate::protocol::{Decode, Encode, Packet};
 pub struct KeepAliveC(pub i64);
 
 impl Packet for KeepAliveC {
-    const ID: i32 = 0x26;
+    const ID: i32 = 0x27;
 }
 
 impl Encode for KeepAliveC {
@@ -37,7 +37,7 @@ impl Encode for KeepAliveC {
 pub struct KeepAliveS(i64);
 
 impl Packet for KeepAliveS {
-    const ID: i32 = 0x18;
+    const ID: i32 = 0x1A;
 }
 
 impl<'a> Decode<'a> for KeepAliveS {
diff --git a/src/protocol/packets/play/login.rs b/src/protocol/packets/play/login.rs
@@ -52,6 +52,7 @@ pub struct LoginPlayC<'a> {
     pub is_superflat: bool,
     pub death_location: Option<DeathLocation<'a>>,
     pub portal_cooldown: VarInt,
+    pub sea_level: VarInt,
     pub enforces_secure_chat: bool,
 }
 
@@ -92,7 +93,7 @@ pub struct DeathLocation<'a> {
 }
 
 impl Packet for LoginPlayC<'_> {
-    const ID: i32 = 0x2B;
+    const ID: i32 = 0x2C;
 }
 
 impl<'a> Encode for LoginPlayC<'a> {
@@ -132,6 +133,7 @@ impl<'a> Encode for LoginPlayC<'a> {
         }
 
         self.portal_cooldown.encode(&mut w)?;
+        self.sea_level.encode(&mut w)?;
         self.enforces_secure_chat.encode(&mut w)?;
 
         Ok(())
diff --git a/src/protocol/packets/play/position.rs b/src/protocol/packets/play/position.rs
@@ -30,7 +30,7 @@ pub struct SetPlayerPositionS {
 }
 
 impl Packet for SetPlayerPositionS {
-    const ID: i32 = 0x1A;
+    const ID: i32 = 0x1C;
 }
 
 impl Decode<'_> for SetPlayerPositionS {
@@ -58,7 +58,7 @@ pub struct SetPlayerPositionAndRotationS {
 }
 
 impl Packet for SetPlayerPositionAndRotationS {
-    const ID: i32 = 0x1B;
+    const ID: i32 = 0x1D;
 }
 
 impl Decode<'_> for SetPlayerPositionAndRotationS {
diff --git a/src/protocol/packets/play/status.rs b/src/protocol/packets/play/status.rs
@@ -55,7 +55,7 @@ enum PlayerAction<'a> {
 }
 
 impl Packet for PlayerInfoUpdateC<'_> {
-    const ID: i32 = 0x3E;
+    const ID: i32 = 0x40;
 }
 
 // "I'm a Never-Nester"
diff --git a/src/protocol/packets/play/teleport.rs b/src/protocol/packets/play/teleport.rs
diff --git a/src/protocol/packets/play/tick.rs b/src/protocol/packets/play/tick.rs
diff --git a/src/protocol/packets/play/world.rs b/src/protocol/packets/play/world.rs
diff --git a/src/state.rs b/src/state.rs

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ pub struct LoginSuccessC<'a> {`
`49`	`49`	`pub uuid: Uuid,`
`50`	`50`	`pub username: Bounded<&'a str, 16>,`
`51`	`51`	`pub properties: Vec<Property<'a>>,`
`52`		`- pub strict_error_handling: bool,`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`impl Packet for LoginSuccessC<'_> {`
`@@ -64,7 +63,6 @@ impl<'a> Encode for LoginSuccessC<'a> {`
`64`	`63`	`self.username.encode(&mut w)?;`
`65`	`64`	`properties_len.encode(&mut w)?;`
`66`	`65`	`self.properties.encode(&mut w)?;`
`67`		`- self.strict_error_handling.encode(&mut w)?;`
`68`	`66`
`69`	`67`	`Ok(())`
`70`	`68`	`}`