make it compile

Snowiiii · Snowiiii · commit 6a82e27dab19 · 2025-03-16T22:21:57.000+01:00
diff --git a/pumpkin-world/src/chunk/mod.rs b/pumpkin-world/src/chunk/mod.rs
@@ -4,11 +4,13 @@ use serde::{Deserialize, Serialize};
 use std::iter::repeat_with;
 use thiserror::Error;
 
-use crate::{WORLD_HEIGHT, coordinates::ChunkRelativeBlockCoordinates};
+use crate::coordinates::ChunkRelativeBlockCoordinates;
 
 pub mod format;
 pub mod io;
 
+// TODO
+const WORLD_HEIGHT: usize = 384;
 pub const CHUNK_AREA: usize = 16 * 16;
 pub const SUBCHUNK_VOLUME: usize = CHUNK_AREA * 16;
 pub const SUBCHUNKS_COUNT: usize = WORLD_HEIGHT / 16;
diff --git a/pumpkin-world/src/generation/chunk_noise.rs b/pumpkin-world/src/generation/chunk_noise.rs
@@ -27,6 +27,8 @@ use super::{
 pub const LAVA_BLOCK: ChunkBlockState = block_state!("lava");
 pub const WATER_BLOCK: ChunkBlockState = block_state!("water");
 
+pub const CHUNK_DIM: u8 = 16;
+
 pub enum BlockStateSampler {
     Aquifer(AquiferSampler),
     Ore(OreVeinSampler),
diff --git a/pumpkin-world/src/generation/generic_generator.rs b/pumpkin-world/src/generation/generic_generator.rs
@@ -2,7 +2,7 @@ use noise::{NoiseFn, Perlin};
 use pumpkin_util::math::vector2::Vector2;
 
 use crate::{
-    chunk::{ChunkData, Subchunks},
+    chunk::{ChunkBlocks, ChunkData},
     coordinates::{ChunkRelativeBlockCoordinates, ChunkRelativeXZBlockCoordinates},
 };
 
@@ -33,7 +33,7 @@ impl<B: BiomeGenerator + GeneratorInit, T: PerlinTerrainGenerator + GeneratorIni
 
 impl<B: BiomeGenerator, T: PerlinTerrainGenerator> WorldGenerator for GenericGenerator<B, T> {
     fn generate_chunk(&self, at: Vector2<i32>) -> ChunkData {
-        let mut subchunks = Subchunks::Single(0);
+        let mut blocks = ChunkBlocks::Homogeneous(0);
         self.terrain_generator.prepare_chunk(&at, &self.perlin);
         let noise_value = self.perlin.get([at.x as f64 / 16.0, at.z as f64 / 16.0]);
 
@@ -64,7 +64,7 @@ impl<B: BiomeGenerator, T: PerlinTerrainGenerator> WorldGenerator for GenericGen
                     self.terrain_generator.generate_block(
                         coordinates,
                         coordinates.with_chunk_coordinates(at),
-                        &mut subchunks,
+                        &mut blocks,
                         chunk_height,
                         biome,
                     );
@@ -73,9 +73,11 @@ impl<B: BiomeGenerator, T: PerlinTerrainGenerator> WorldGenerator for GenericGen
         }
 
         ChunkData {
-            subchunks,
+            blocks,
             heightmap: Default::default(),
             position: at,
+            // This chunk was just created! We want to say its been changed
+            dirty: true,
         }
     }
 }
diff --git a/pumpkin-world/src/generation/implementation/mod.rs b/pumpkin-world/src/generation/implementation/mod.rs
@@ -3,7 +3,7 @@ pub mod superflat;
 use pumpkin_util::math::{vector2::Vector2, vector3::Vector3};
 
 use crate::{
-    chunk::{ChunkData, Subchunks},
+    chunk::{ChunkBlocks, ChunkData},
     coordinates::ChunkRelativeBlockCoordinates,
     generation::{
         GlobalRandomConfig, Seed, WorldGenerator, generator::GeneratorInit,
@@ -35,7 +35,7 @@ impl GeneratorInit for VanillaGenerator {
 
 impl WorldGenerator for VanillaGenerator {
     fn generate_chunk(&self, at: Vector2<i32>) -> ChunkData {
-        let mut subchunks = Subchunks::Single(0);
+        let mut blocks = ChunkBlocks::Homogeneous(0);
         // TODO: This is bad, but it works
         let generation_settings = GENERATION_SETTINGS
             .get(&GeneratorSetting::Overworld)
@@ -67,15 +67,16 @@ impl WorldGenerator for VanillaGenerator {
                         continue;
                     }
 
-                    subchunks.set_block(coordinates, block.state_id);
+                    blocks.set_block(coordinates, block.state_id);
                 }
             }
         }
 
         ChunkData {
-            subchunks,
+            blocks,
             heightmap: Default::default(),
             position: at,
+            dirty: true,
         }
     }
 }
diff --git a/pumpkin-world/src/generation/proto_chunk.rs b/pumpkin-world/src/generation/proto_chunk.rs
@@ -4,15 +4,15 @@ use pumpkin_util::math::{vector2::Vector2, vector3::Vector3};
 use crate::{
     biome::{BiomeSupplier, MultiNoiseBiomeSupplier},
     block::{ChunkBlockState, registry::get_state_by_state_id},
-    chunk::{CHUNK_AREA, CHUNK_WIDTH},
+    chunk::CHUNK_AREA,
     generation::{biome, positions::chunk_pos},
 };
 
 use super::{
     GlobalRandomConfig,
     aquifer_sampler::{FluidLevel, FluidLevelSampler, FluidLevelSamplerImpl},
     biome_coords,
-    chunk_noise::{ChunkNoiseGenerator, LAVA_BLOCK, WATER_BLOCK},
+    chunk_noise::{CHUNK_DIM, ChunkNoiseGenerator, LAVA_BLOCK, WATER_BLOCK},
     height_limit::HeightLimitView,
     noise_router::{
         multi_noise_sampler::{MultiNoiseSampler, MultiNoiseSamplerBuilderOptions},
@@ -106,8 +106,7 @@ impl<'a> ProtoChunk<'a> {
     ) -> Self {
         let generation_shape = &settings.noise;
 
-        let horizontal_cell_count =
-            CHUNK_WIDTH / generation_shape.horizontal_cell_block_count() as usize;
+        let horizontal_cell_count = CHUNK_DIM / generation_shape.horizontal_cell_block_count();
 
         // TODO: Customize these
         let sampler = FluidLevelSampler::Chunk(StandardChunkFluidLevelSampler::new(
@@ -122,7 +121,7 @@ impl<'a> ProtoChunk<'a> {
         let sampler = ChunkNoiseGenerator::new(
             base_router,
             random_config,
-            horizontal_cell_count,
+            horizontal_cell_count as usize,
             start_x,
             start_z,
             generation_shape,
@@ -136,16 +135,19 @@ impl<'a> ProtoChunk<'a> {
             biome_coords::from_block(start_z),
         );
         let horizontal_biome_end = biome_coords::from_block(
-            horizontal_cell_count * generation_shape.horizontal_cell_block_count() as usize,
+            horizontal_cell_count * generation_shape.horizontal_cell_block_count(),
+        );
+        let multi_noise_config = MultiNoiseSamplerBuilderOptions::new(
+            biome_pos.x,
+            biome_pos.z,
+            horizontal_biome_end as usize,
         );
-        let multi_noise_config =
-            MultiNoiseSamplerBuilderOptions::new(biome_pos.x, biome_pos.z, horizontal_biome_end);
         let multi_noise_sampler = MultiNoiseSampler::generate(base_router, &multi_noise_config);
 
         let surface_config = SurfaceHeightSamplerBuilderOptions::new(
             biome_pos.x,
             biome_pos.z,
-            horizontal_biome_end,
+            horizontal_biome_end as usize,
             generation_shape.min_y as i32,
             generation_shape.max_y() as i32,
             generation_shape.vertical_cell_block_count() as usize,
@@ -166,8 +168,8 @@ impl<'a> ProtoChunk<'a> {
                 .into_boxed_slice(),
             flat_biome_map: vec![
                 Biome::Plains;
-                biome_coords::from_block(CHUNK_WIDTH)
-                    * biome_coords::from_block(CHUNK_WIDTH)
+                biome_coords::from_block(CHUNK_DIM as usize)
+                    * biome_coords::from_block(CHUNK_DIM as usize)
                     * biome_coords::from_block(height as usize)
             ]
             .into_boxed_slice(),
@@ -182,8 +184,8 @@ impl<'a> ProtoChunk<'a> {
             assert!(local_pos.y < self.noise_sampler.height() as i32 && local_pos.y >= 0);
             assert!(local_pos.z >= 0 && local_pos.z <= 15);
         }
-        self.noise_sampler.height() as usize * CHUNK_WIDTH * local_pos.x as usize
-            + CHUNK_WIDTH * local_pos.y as usize
+        self.noise_sampler.height() as usize * CHUNK_DIM as usize * local_pos.x as usize
+            + CHUNK_DIM as usize * local_pos.y as usize
             + local_pos.z as usize
     }
 
@@ -200,9 +202,9 @@ impl<'a> ProtoChunk<'a> {
         }
 
         biome_coords::from_block(self.noise_sampler.height() as usize)
-            * biome_coords::from_block(CHUNK_WIDTH)
+            * biome_coords::from_block(CHUNK_DIM as usize)
             * local_biome_pos.x as usize
-            + biome_coords::from_block(CHUNK_WIDTH) * local_biome_pos.y as usize
+            + biome_coords::from_block(CHUNK_DIM as usize) * local_biome_pos.y as usize
             + local_biome_pos.z as usize
     }
 
@@ -266,7 +268,7 @@ impl<'a> ProtoChunk<'a> {
             let block_y = section_coords::section_to_block(i);
             let start_y = biome_coords::from_block(block_y);
 
-            let biomes_per_section = biome_coords::from_block(CHUNK_WIDTH) as i32;
+            let biomes_per_section = biome_coords::from_block(CHUNK_DIM) as i32;
             for x in 0..biomes_per_section {
                 for y in 0..biomes_per_section {
                     for z in 0..biomes_per_section {
@@ -300,7 +302,7 @@ impl<'a> ProtoChunk<'a> {
         let horizontal_cell_block_count = self.noise_sampler.horizontal_cell_block_count();
         let vertical_cell_block_count = self.noise_sampler.vertical_cell_block_count();
 
-        let horizontal_cells = (CHUNK_WIDTH / horizontal_cell_block_count as usize) as u8;
+        let horizontal_cells = (CHUNK_DIM / horizontal_cell_block_count) as u8;
 
         let min_y = self.noise_sampler.min_y();
         let minimum_cell_y = min_y / vertical_cell_block_count as i8;
diff --git a/pumpkin/src/net/packet/play.rs b/pumpkin/src/net/packet/play.rs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ pub mod superflat;`
`3`	`3`	`use pumpkin_util::math::{vector2::Vector2, vector3::Vector3};`
`4`	`4`
`5`	`5`	`use crate::{`
`6`		`- chunk::{ChunkData, Subchunks},`
	`6`	`+ chunk::{ChunkBlocks, ChunkData},`
`7`	`7`	`coordinates::ChunkRelativeBlockCoordinates,`
`8`	`8`	`generation::{`
`9`	`9`	`GlobalRandomConfig, Seed, WorldGenerator, generator::GeneratorInit,`
`@@ -35,7 +35,7 @@ impl GeneratorInit for VanillaGenerator {`
`35`	`35`
`36`	`36`	`impl WorldGenerator for VanillaGenerator {`
`37`	`37`	`fn generate_chunk(&self, at: Vector2<i32>) -> ChunkData {`
`38`		`- let mut subchunks = Subchunks::Single(0);`
	`38`	`+ let mut blocks = ChunkBlocks::Homogeneous(0);`
`39`	`39`	`// TODO: This is bad, but it works`
`40`	`40`	`let generation_settings = GENERATION_SETTINGS`
`41`	`41`	`.get(&GeneratorSetting::Overworld)`
`@@ -67,15 +67,16 @@ impl WorldGenerator for VanillaGenerator {`
`67`	`67`	`continue;`
`68`	`68`	`}`
`69`	`69`
`70`		`- subchunks.set_block(coordinates, block.state_id);`
	`70`	`+ blocks.set_block(coordinates, block.state_id);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`ChunkData {`
`76`		`- subchunks,`
	`76`	`+ blocks,`
`77`	`77`	`heightmap: Default::default(),`
`78`	`78`	`position: at,`
	`79`	`+ dirty: true,`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`	`}`