made dungeon position correctly in the world

Author: Stivais

src/dungeon/dungeon.rs

@@ -16,7 +16,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 // The top leftmost corner of the dungeon
-pub const DUNGEON_ORIGIN: (i32, i32) = (0, 0);
+pub const DUNGEON_ORIGIN: (i32, i32) = (-200, -200);
 
 // The positions of the doors in the world
 pub const DOOR_POSITIONS: [(i32, i32); 60] = [(DUNGEON_ORIGIN.0 + 31, DUNGEON_ORIGIN.1 + 15), (DUNGEON_ORIGIN.0 + 63, DUNGEON_ORIGIN.1 + 15), (DUNGEON_ORIGIN.0 + 95, DUNGEON_ORIGIN.1 + 15), (DUNGEON_ORIGIN.0 + 127, DUNGEON_ORIGIN.1 + 15), (DUNGEON_ORIGIN.0 + 159, DUNGEON_ORIGIN.1 + 15), (DUNGEON_ORIGIN.0 + 15, DUNGEON_ORIGIN.1 + 31), (DUNGEON_ORIGIN.0 + 47, DUNGEON_ORIGIN.1 + 31), (DUNGEON_ORIGIN.0 + 79, DUNGEON_ORIGIN.1 + 31), (DUNGEON_ORIGIN.0 + 111, DUNGEON_ORIGIN.1 + 31), (DUNGEON_ORIGIN.0 + 143, DUNGEON_ORIGIN.1 + 31), (DUNGEON_ORIGIN.0 + 175, DUNGEON_ORIGIN.1 + 31), (DUNGEON_ORIGIN.0 + 31, DUNGEON_ORIGIN.1 + 47), (DUNGEON_ORIGIN.0 + 63, DUNGEON_ORIGIN.1 + 47), (DUNGEON_ORIGIN.0 + 95, DUNGEON_ORIGIN.1 + 47), (DUNGEON_ORIGIN.0 + 127, DUNGEON_ORIGIN.1 + 47), (DUNGEON_ORIGIN.0 + 159, DUNGEON_ORIGIN.1 + 47), (DUNGEON_ORIGIN.0 + 15, DUNGEON_ORIGIN.1 + 63), (DUNGEON_ORIGIN.0 + 47, DUNGEON_ORIGIN.1 + 63), (DUNGEON_ORIGIN.0 + 79, DUNGEON_ORIGIN.1 + 63), (DUNGEON_ORIGIN.0 + 111, DUNGEON_ORIGIN.1 + 63), (DUNGEON_ORIGIN.0 + 143, DUNGEON_ORIGIN.1 + 63), (DUNGEON_ORIGIN.0 + 175, DUNGEON_ORIGIN.1 + 63), (DUNGEON_ORIGIN.0 + 31, DUNGEON_ORIGIN.1 + 79), (DUNGEON_ORIGIN.0 + 63, DUNGEON_ORIGIN.1 + 79), (DUNGEON_ORIGIN.0 + 95, DUNGEON_ORIGIN.1 + 79), (DUNGEON_ORIGIN.0 + 127, DUNGEON_ORIGIN.1 + 79), (DUNGEON_ORIGIN.0 + 159, DUNGEON_ORIGIN.1 + 79), (DUNGEON_ORIGIN.0 + 15, DUNGEON_ORIGIN.1 + 95), (DUNGEON_ORIGIN.0 + 47, DUNGEON_ORIGIN.1 + 95), (DUNGEON_ORIGIN.0 + 79, DUNGEON_ORIGIN.1 + 95), (DUNGEON_ORIGIN.0 + 111, DUNGEON_ORIGIN.1 + 95), (DUNGEON_ORIGIN.0 + 143, DUNGEON_ORIGIN.1 + 95), (DUNGEON_ORIGIN.0 + 175, DUNGEON_ORIGIN.1 + 95), (DUNGEON_ORIGIN.0 + 31, DUNGEON_ORIGIN.1 + 111), (DUNGEON_ORIGIN.0 + 63, DUNGEON_ORIGIN.1 + 111), (DUNGEON_ORIGIN.0 + 95, DUNGEON_ORIGIN.1 + 111), (DUNGEON_ORIGIN.0 + 127, DUNGEON_ORIGIN.1 + 111), (DUNGEON_ORIGIN.0 + 159, DUNGEON_ORIGIN.1 + 111), (DUNGEON_ORIGIN.0 + 15, DUNGEON_ORIGIN.1 + 127), (DUNGEON_ORIGIN.0 + 47, DUNGEON_ORIGIN.1 + 127), (DUNGEON_ORIGIN.0 + 79, DUNGEON_ORIGIN.1 + 127), (DUNGEON_ORIGIN.0 + 111, DUNGEON_ORIGIN.1 + 127), (DUNGEON_ORIGIN.0 + 143, DUNGEON_ORIGIN.1 + 127), (DUNGEON_ORIGIN.0 + 175, DUNGEON_ORIGIN.1 + 127), (DUNGEON_ORIGIN.0 + 31, DUNGEON_ORIGIN.1 + 143), (DUNGEON_ORIGIN.0 + 63, DUNGEON_ORIGIN.1 + 143), (DUNGEON_ORIGIN.0 + 95, DUNGEON_ORIGIN.1 + 143), (DUNGEON_ORIGIN.0 + 127, DUNGEON_ORIGIN.1 + 143), (DUNGEON_ORIGIN.0 + 159, DUNGEON_ORIGIN.1 + 143), (DUNGEON_ORIGIN.0 + 15, DUNGEON_ORIGIN.1 + 159), (DUNGEON_ORIGIN.0 + 47, DUNGEON_ORIGIN.1 + 159), (DUNGEON_ORIGIN.0 + 79, DUNGEON_ORIGIN.1 + 159), (DUNGEON_ORIGIN.0 + 111, DUNGEON_ORIGIN.1 + 159), (DUNGEON_ORIGIN.0 + 143, DUNGEON_ORIGIN.1 + 159), (DUNGEON_ORIGIN.0 + 175, DUNGEON_ORIGIN.1 + 159), (DUNGEON_ORIGIN.0 + 31, DUNGEON_ORIGIN.1 + 175), (DUNGEON_ORIGIN.0 + 63, DUNGEON_ORIGIN.1 + 175), (DUNGEON_ORIGIN.0 + 95, DUNGEON_ORIGIN.1 + 175), (DUNGEON_ORIGIN.0 + 127, DUNGEON_ORIGIN.1 + 175), (DUNGEON_ORIGIN.0 + 159, DUNGEON_ORIGIN.1 + 175)];

src/main.rs

@@ -30,7 +30,6 @@ use indoc::formatdoc;
 use rand::seq::IndexedRandom;
 use std::collections::HashMap;
 use std::env;
-use std::mem::take;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 use tokio::sync::mpsc::unbounded_channel;
 
@@ -214,14 +213,14 @@ async fn main() -> Result<()> {
                     match diff {
                         ChunkDiff::New => {
                             if let Some(chunk) = player.world_mut().chunk_grid.get_chunk(x, z) {
-                                player.packet_buffer.write_packet(&chunk.get_chunk_data(true));
+                                player.packet_buffer.write_packet(&chunk.get_chunk_data(x, z,true));
                             } else {
-                                let chunk_data = Chunk::new(x, z).get_chunk_data(true);
+                                let chunk_data = Chunk::new().get_chunk_data(x, z, true);
                                 player.write_packet(&chunk_data)
                             };
                         },
                         ChunkDiff::Old => {
-                            let chunk_data = Chunk::new(x, z).get_chunk_data(true);
+                            let chunk_data = Chunk::new().get_chunk_data(x, z, true);
                             player.write_packet(&chunk_data)
                         },
                     }

src/server/chunk/chunk.rs

@@ -6,8 +6,6 @@ use crate::server::chunk::chunk_section::ChunkSection;
 ///
 /// A chunk is composed of 16 [chunk sections][ChunkSection].
 pub struct Chunk {
-    pub pos_x: i32,
-    pub pos_z: i32,
     pub chunk_sections: [Option<ChunkSection>; 16],
     pub packet_buffer: PacketBuffer,
 }
@@ -17,10 +15,8 @@ impl Chunk {
     /// Creates an empty chunk at the X and Z coordinates provided.
     ///
     /// The chunk is entirely empty, and block data must be added with chunk sections.
-    pub fn new(pos_x: i32, pos_z: i32) -> Chunk {
+    pub fn new() -> Chunk {
         Self {
-            pos_x,
-            pos_z,
             chunk_sections: [
                 None, None, None, None, None, None, None, None,
                 None, None, None, None, None, None, None, None,
@@ -49,7 +45,7 @@ impl Chunk {
     }
 
 
-    pub fn get_chunk_data(&self, new: bool) -> ChunkData {
+    pub fn get_chunk_data(&self, x: i32, z: i32, new: bool) -> ChunkData {
         let mut bitmask = 0u16;
 
         for section_index in 0..16 {
@@ -93,10 +89,9 @@ impl Chunk {
                 offset += 1;
             }
         }
-
         ChunkData {
-            chunk_x: self.pos_x,
-            chunk_z: self.pos_z,
+            chunk_x: x,
+            chunk_z: z,
             is_new_chunk: new,
             bitmask,
             data,

src/server/chunk/chunk_grid.rs

@@ -10,20 +10,23 @@ use crate::server::world::VIEW_DISTANCE;
 pub struct ChunkGrid {
     pub chunks: Vec<Chunk>,
     pub size: usize,
+
+    index_offset_x: usize,
+    index_offset_z: usize,
 }
 
 impl ChunkGrid {
 
-    pub fn new(size: usize) -> ChunkGrid {
-        let mut vec = Vec::with_capacity(size * size);
-        for z in 0..size {
-            for x in 0..size {
-                vec.push(Chunk::new(x as i32, z as i32))
-            }
+    pub fn new(size: usize, offset_x: usize, offset_z: usize) -> ChunkGrid {
+        let mut chunks = Vec::with_capacity(size * size);
+        for _ in 0..size * size {
+            chunks.push(Chunk::new());
         }
         ChunkGrid {
-            chunks: vec,
+            chunks,
             size,
+            index_offset_x: offset_x,
+            index_offset_z: offset_z,
         }
     }
 
@@ -71,19 +74,30 @@ impl ChunkGrid {
     /// checks is block is a valid block within the chunk grid.
     fn is_block_valid(&self, x: i32, y: i32, z: i32) -> bool {
         let size = self.size as i32;
-        x >= 0 && (x >> 4) < size && y >= 0 && y < 256 && z >= 0 && (z >> 4) < size
+        let chunk_x = (x >> 4) + self.index_offset_x as i32;
+        let chunk_z = (z >> 4) + self.index_offset_z as i32;
+        y >= 0 && y < 256 && chunk_x >= 0 && chunk_x < size && chunk_z >= 0 && chunk_z < size
     }
 
     /// returns the chunk at the x and z coordinates provided, none if no chunk is present
     pub fn get_chunk(&self, chunk_x: i32, chunk_z: i32) -> Option<&Chunk> {
-        if chunk_x < 0 || chunk_z < 0 { 
+        let size = self.size as i32;
+        let x = chunk_x + self.index_offset_x as i32;
+        let z = chunk_z + self.index_offset_z as i32;
+        if x < 0 || z < 0 || x >= size || z >= size {
             return None
         }
-        self.chunks.get(chunk_z as usize * self.size + chunk_x as usize)
+        self.chunks.get(z as usize * self.size + x as usize)
     }
 
     fn get_chunk_mut(&mut self, chunk_x: i32, chunk_z: i32) -> Option<&mut Chunk> {
-        self.chunks.get_mut(chunk_z as usize * self.size + chunk_x as usize)
+        let size = self.size as i32;
+        let x = chunk_x + self.index_offset_x as i32;
+        let z = chunk_z + self.index_offset_z as i32;
+        if x < 0 || z < 0 || x >= size || z >= size {
+            return None
+        }
+        self.chunks.get_mut(z as usize * self.size + x as usize)
     }
 }
 

src/server/server.rs

@@ -89,7 +89,7 @@ impl Server {
                 for x in (chunk_x - view_distance)..(chunk_x + view_distance) {
                     for z in (chunk_z - view_distance)..(chunk_z + view_distance) {
                         if let Some(chunk) = self.world.chunk_grid.get_chunk(x, z) {
-                            player.write_packet(&chunk.get_chunk_data(true))
+                            player.write_packet(&chunk.get_chunk_data(x, z, true))
                         }
                     }
                 }

src/server/world.rs

@@ -44,7 +44,7 @@ impl World {
         World {
             server: std::ptr::null_mut(),
 
-            chunk_grid: ChunkGrid::new(14),
+            chunk_grid: ChunkGrid::new(16, 13, 13),
             interactable_blocks: HashMap::new(),
 
             player_info: PlayerList::new(),