fix: correctly lock fastanvil to git, remove global block states

Cargo.toml

@@ -30,7 +30,7 @@ bytes = "1.8.0"
 cfb8 = { version = "0.8.1", optional = true }
 clap = { version = "4.5.20", features = ["derive"] }
 color-eyre = "0.6.3"
-fastanvil = "0.31.0"
+fastanvil = { git = "https://github.com/owengage/fastnbt.git" }
 fastnbt = { git = "https://github.com/owengage/fastnbt.git" }
 rand = "0.8.5"
 rayon = "1.10.0"

flake.nix

@@ -62,6 +62,7 @@
 
           packages = with pkgs; [
             rust-analyzer
+            valgrind
           ];
         };
 
@@ -72,6 +73,7 @@
               inherit version;
               src = ./.;
               cargoLock.lockFile = ./Cargo.lock;
+              cargoLock.outputHashes."fastanvil-0.31.0" = "E4WI6SZgkjqUOtbfXfKGfpFH7btEh5V0KpMXSIsuh08=";
               cargoLock.outputHashes."fastnbt-2.5.0" = "E4WI6SZgkjqUOtbfXfKGfpFH7btEh5V0KpMXSIsuh08=";
               inherit buildType;
               dontStrip = buildType == "debug";

src/main.rs

@@ -25,7 +25,7 @@ use color_eyre::eyre::Result;
 use net::cache::WorldCache;
 use server::Server;
 use tracing_subscriber::{layer::SubscriberExt, prelude::*, EnvFilter};
-use world::{blocks::ALL_BLOCKS, read_world};
+use world::read_world;
 
 #[macro_use]
 extern crate tracing;
@@ -76,10 +76,6 @@ async fn main() -> Result<()> {
     let world = read_world(&args.map_dir)?;
     info!("Done.");
 
-    info!("Loading blocks");
-    let _ = *ALL_BLOCKS;
-    info!("Done.");
-
     info!("Generating world chunk packets");
     let world_cache = WorldCache::from(world);
     info!("Done.");

src/net/cache.rs

@@ -30,7 +30,7 @@ use crate::{
         },
         Encoder,
     },
-    world::World,
+    world::{blocks::Blocks, World},
 };
 
 #[derive(Debug)]
@@ -50,9 +50,11 @@ impl From<World> for WorldCache {
             }
         });
 
+        let block_states = Blocks::new();
+
         let chunks = chunks
             .par_iter()
-            .map(|(_, c)| ChunkDataUpdateLightC::from(*c))
+            .map(|(_, c)| ChunkDataUpdateLightC::new(c, &block_states))
             .collect::<Vec<ChunkDataUpdateLightC<'_>>>();
 
         let encoded = chunks

src/protocol/packets/play/world.rs

@@ -27,7 +27,7 @@ use crate::{
     protocol::{datatypes::VarInt, Encode, Packet},
     world::{
         self,
-        blocks::BlockState,
+        blocks::{BlockState, Blocks},
     },
 };
 
@@ -189,7 +189,7 @@ impl Encode for ChunkDataUpdateLightC<'_> {
 }
 
 impl ChunkSection {
-    pub fn anvil_to_sec(value: &world::Section) -> Self {
+    pub fn anvil_to_sec(value: &world::Section, block_states: &Blocks) -> Self {
         let mut blocks: [i16; 16 * 16 * 16] = [0; 16 * 16 * 16];
         let bit_length = (64 - (value.block_states.palette.len() as u64).leading_zeros()).max(4);
         let blocks_per_long = 64 / bit_length;
@@ -214,7 +214,7 @@ impl ChunkSection {
             .block_states
             .palette
             .iter()
-            .map(|b| BlockState::try_from(b).unwrap_or(BlockState::AIR))
+            .map(|b| BlockState::parse_state(b, block_states).unwrap_or(BlockState::AIR))
             .collect::<Vec<_>>();
 
         let blocks: Vec<u16> = blocks
@@ -297,12 +297,12 @@ impl ChunkSection {
     }
 }
 
-impl From<&world::Chunk> for ChunkDataUpdateLightC<'_> {
-    fn from(value: &world::Chunk) -> Self {
+impl ChunkDataUpdateLightC<'_> {
+    pub fn new(value: &world::Chunk, block_states: &Blocks) -> Self {
         let data = value
             .sections
             .iter()
-            .map(ChunkSection::anvil_to_sec)
+            .map(|sec| ChunkSection::anvil_to_sec(sec, block_states))
             .collect::<Vec<_>>();
 
         Self {