fix: structures

Author: Snowiiii

pumpkin-util/src/noise/perlin.rs

@@ -477,7 +477,7 @@ mod tests {
     use crate::{
         assert_eq_delta,
         noise::perlin::{OctavePerlinNoiseSampler, PerlinNoiseSampler},
-        random::{RandomDeriverImpl, RandomImpl, legacy_rand::LegacyRand, xoroshiro128::Xoroshiro},
+        random::{RandomImpl, legacy_rand::LegacyRand, xoroshiro128::Xoroshiro},
         read_data_from_file,
     };
 

pumpkin-util/src/random/xoroshiro128.rs

@@ -126,6 +126,13 @@ impl Xoroshiro {
         self.hi = m.rotate_left(28);
         n
     }
+
+    pub const fn next_splitter(&mut self) -> XoroshiroSplitter {
+        XoroshiroSplitter {
+            lo: self.next_random(),
+            hi: self.next_random(),
+        }
+    }
 }
 
 impl GaussianGenerator for Xoroshiro {
@@ -160,10 +167,7 @@ impl RandomImpl for Xoroshiro {
     }
 
     fn next_splitter(&mut self) -> RandomDeriver {
-        RandomDeriver::Xoroshiro(XoroshiroSplitter {
-            lo: self.next_random(),
-            hi: self.next_random(),
-        })
+        RandomDeriver::Xoroshiro(self.next_splitter())
     }
 
     fn next_i32(&mut self) -> i32 {
@@ -220,25 +224,36 @@ pub struct XoroshiroSplitter {
     hi: u64,
 }
 
-impl RandomDeriverImpl for XoroshiroSplitter {
-    fn split_string(&self, seed: &str) -> RandomGenerator {
+impl XoroshiroSplitter {
+    #[must_use]
+    pub fn split_string(&self, seed: &str) -> Xoroshiro {
         let bytes = md5::compute(seed.as_bytes());
         let l = u64::from_be_bytes(bytes[0..8].try_into().expect("incorrect length"));
         let m = u64::from_be_bytes(bytes[8..16].try_into().expect("incorrect length"));
 
-        RandomGenerator::Xoroshiro(Xoroshiro::new(l ^ self.lo, m ^ self.hi))
+        Xoroshiro::new(l ^ self.lo, m ^ self.hi)
+    }
+
+    #[must_use]
+    pub fn split_pos(&self, x: i32, y: i32, z: i32) -> Xoroshiro {
+        let l = hash_block_pos(x, y, z) as u64;
+        let m = l ^ self.lo;
+
+        Xoroshiro::new(m, self.hi)
+    }
+}
+
+impl RandomDeriverImpl for XoroshiroSplitter {
+    fn split_string(&self, seed: &str) -> RandomGenerator {
+        RandomGenerator::Xoroshiro(self.split_string(seed))
     }
 
     fn split_u64(&self, seed: u64) -> RandomGenerator {
         RandomGenerator::Xoroshiro(Xoroshiro::new(seed ^ self.lo, seed ^ self.hi))
     }
 
-    #[expect(clippy::many_single_char_names)]
     fn split_pos(&self, x: i32, y: i32, z: i32) -> RandomGenerator {
-        let l = hash_block_pos(x, y, z) as u64;
-        let m = l ^ self.lo;
-
-        RandomGenerator::Xoroshiro(Xoroshiro::new(m, self.hi))
+        RandomGenerator::Xoroshiro(self.split_pos(x, y, z))
     }
 }
 

pumpkin-world/benches/chunk.rs

@@ -11,7 +11,7 @@ use pumpkin_world::{
 
 fn bench_terrain_gen(c: &mut Criterion) {
     let seed = 0;
-    let random_config = GlobalRandomConfig::new(seed, false);
+    let random_config = GlobalRandomConfig::new(seed);
     let base_router = ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
     let surface_config = GenerationSettings::from_dimension(&Dimension::OVERWORLD);
     let terrain_cache = TerrainCache::from_random(&random_config);

pumpkin-world/benches/noise_router.rs

@@ -11,7 +11,7 @@ use std::hint::black_box;
 
 fn bench_noise_router_creation(c: &mut Criterion) {
     let base_routers = &OVERWORLD_BASE_NOISE_ROUTER;
-    let random_config = GlobalRandomConfig::new(0, false);
+    let random_config = GlobalRandomConfig::new(0);
 
     let proto_routers = ProtoNoiseRouters::generate(base_routers, &random_config);
     let proto_noise_router = proto_routers.noise;

pumpkin-world/src/biome/mod.rs

@@ -73,7 +73,7 @@ mod test {
     #[test]
     fn biome_desert() {
         let seed = 13579;
-        let random_config = GlobalRandomConfig::new(seed, false);
+        let random_config = GlobalRandomConfig::new(seed);
         let noise_router =
             ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
         let multi_noise_config = MultiNoiseSamplerBuilderOptions::new(1, 1, 1);
@@ -101,7 +101,7 @@ mod test {
             read_data_from_file!("../../assets/biome_no_blend_no_beard_0.json");
 
         let seed = 0;
-        let random_config = GlobalRandomConfig::new(seed, false);
+        let random_config = GlobalRandomConfig::new(seed);
         let noise_router =
             ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
         let surface_settings = GenerationSettings::from_dimension(&Dimension::OVERWORLD);

pumpkin-world/src/biome/multi_noise.rs

@@ -66,7 +66,7 @@ mod test {
         let chunk_x = 0;
         let chunk_z = 0;
 
-        let random_config = GlobalRandomConfig::new(seed, false);
+        let random_config = GlobalRandomConfig::new(seed);
         let noise_router =
             ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
 
@@ -112,7 +112,7 @@ mod test {
             read_data_from_file!("../../assets/multi_noise_biome_source_test.json");
 
         let seed = 0;
-        let random_config = GlobalRandomConfig::new(seed, false);
+        let random_config = GlobalRandomConfig::new(seed);
         let noise_router =
             ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
 

pumpkin-world/src/chunk_system/chunk_holder.rs

@@ -4,6 +4,11 @@ use slotmap::Key;
 
 pub struct ChunkHolder {
     pub target_stage: StagedChunkEnum,
+    /// Minimum stage required by generation dependencies (e.g. StructureReferences neighbors).
+    /// May exceed `target_stage` when this chunk is needed by a neighbor's generation task
+    /// but isn't in the player's view radius. Tasks up to this stage are scheduled but the
+    /// chunk is not made public and is unloaded once the dependency is satisfied.
+    pub dependency_stage: StagedChunkEnum,
     pub current_stage: StagedChunkEnum,
     pub chunk: Option<Chunk>,
     pub occupied: NodeKey,
@@ -16,6 +21,7 @@ impl Default for ChunkHolder {
     fn default() -> Self {
         Self {
             target_stage: StagedChunkEnum::None,
+            dependency_stage: StagedChunkEnum::None,
             current_stage: StagedChunkEnum::None,
             chunk: None,
             occupied: NodeKey::null(),

pumpkin-world/src/chunk_system/chunk_state.rs

@@ -115,7 +115,7 @@ impl StagedChunkEnum {
         match self {
             Self::Empty => 0,
             Self::StructureStart => 0,
-            Self::StructureReferences => 0,
+            Self::StructureReferences => 8,
             Self::Biomes => 0,
             Self::Noise => 0,
             Self::Surface => 0,
@@ -131,7 +131,7 @@ impl StagedChunkEnum {
         match self {
             Self::Empty => 0,
             Self::StructureStart => 0,
-            Self::StructureReferences => 0,
+            Self::StructureReferences => 8,
             Self::Biomes => 0,
             Self::Noise => 0,
             Self::Surface => 0,
@@ -148,7 +148,17 @@ impl StagedChunkEnum {
             // the Biome Step, this should be more efficient
             Self::Biomes => &[Self::Empty],
             Self::StructureStart => &[Self::Biomes],
-            Self::StructureReferences => &[Self::StructureStart],
+            Self::StructureReferences => &[
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+                Self::StructureStart,
+            ],
             Self::Noise => &[Self::StructureReferences],
             Self::Surface => &[Self::Noise],
             Self::Features => &[Self::Surface, Self::Surface],