superbasic generation

Author: cyteon

src/net/packet.rs

@@ -1,4 +1,9 @@
-include!(concat!(env!("OUT_DIR"), "/packets.rs"));
+pub use packets::*;
+
+#[allow(unused)]
+mod packets {
+    include!(concat!(env!("OUT_DIR"), "/packets.rs"));
+}
 
 use tokio::io::AsyncReadExt;
 use std::collections::HashMap;

src/types/blocks.rs

@@ -1 +1,6 @@
-include!(concat!(env!("OUT_DIR"), "/blocks.rs"));
+pub use blocks::*;
+
+#[allow(unused)]
+mod blocks {
+    include!(concat!(env!("OUT_DIR"), "/blocks.rs"));
+}

src/world/chunks.rs

@@ -79,11 +79,11 @@ pub struct Chunk {
 }
 
 impl Chunk {
-    pub fn set_block(&mut self, x: u8, y: u8, z: u8, block_id: u16) {
-        let section_idx = (y as i32) / 16;
+    pub fn set_block(&mut self, x: u8, y: i32, z: u8, block_id: u16) {
+        let section_idx = y.div_euclid(16) + 4;
 
         if let Some(section) = self.sections.get_mut(section_idx as usize) {
-            section.set_block(x, y % 16, z, block_id);
+            section.set_block(x, (y & 15) as u8, z, block_id);
         }
     }
 }

src/world/worldgen/mod.rs

@@ -49,5 +49,23 @@ pub fn generate(x: i32, z: i32) -> Chunk {
 }
 
 fn place_column(chunk: &mut Chunk, x: u8, z: u8, height: i32) {
-    chunk.set_block(x, 0, z, crate::types::blocks::BEDROCK);
+    chunk.set_block(x, -64, z, crate::types::blocks::BEDROCK);
+
+    for y in -63..height {
+        let block_id = match y {
+            y if y >= SEA_LEVEL && y == height => crate::types::blocks::GRASS_BLOCK,
+            y if y < SEA_LEVEL && y == height => crate::types::blocks::SAND,
+            y if y < SEA_LEVEL && y > height - 4 => crate::types::blocks::SAND,
+            y if y > height - 4 => crate::types::blocks::DIRT,
+            _ => crate::types::blocks::STONE,
+        };
+
+        chunk.set_block(x, y, z, block_id);
+    }
+
+    if height < SEA_LEVEL {
+        for y in height..SEA_LEVEL {
+            chunk.set_block(x, y, z, crate::types::blocks::WATER);
+        }
+    }
 }