From b5b27885c767430bb66f9036a2de41f921a06bc8 Mon Sep 17 00:00:00 2001
From: DaniD3v <sch220233@spengergasse.at>
Date: Tue, 27 Aug 2024 22:45:55 +0200
Subject: [PATCH] Added ChunkStatus to check if a chunk is fully generated yet.

When loading a partially generated world there's some
incomplete chunks that might not have a heightmap yet.

If that is the case we return a ChunkNotGeneratedError
to indicate that it's ok to (re-)generate it.
---
 pumpkin-world/src/chunk.rs | 41 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/pumpkin-world/src/chunk.rs b/pumpkin-world/src/chunk.rs
index 677990594..d57b1ae18 100644
--- a/pumpkin-world/src/chunk.rs
+++ b/pumpkin-world/src/chunk.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     block::BlockId,
     coordinates::{ChunkCoordinates, ChunkRelativeBlockCoordinates, Height},
-    level::WorldError,
+    level::{ChunkNotGeneratedError, WorldError},
     WORLD_HEIGHT,
 };
 
@@ -70,6 +70,37 @@ struct ChunkNbt {
     heightmaps: ChunkHeightmaps,
 }
 
+#[derive(Deserialize, Debug, PartialEq, Eq)]
+#[serde(tag = "Status")]
+enum ChunkStatus {
+    #[serde(rename = "minecraft:empty")]
+    Empty,
+    #[serde(rename = "minecraft:structure_starts")]
+    StructureStarts,
+    #[serde(rename = "minecraft:structure_references")]
+    StructureReferences,
+    #[serde(rename = "minecraft:biomes")]
+    Biomes,
+    #[serde(rename = "minecraft:noise")]
+    Noise,
+    #[serde(rename = "minecraft:surface")]
+    Surface,
+    #[serde(rename = "minecraft:carvers")]
+    Carvers,
+    #[serde(rename = "minecraft:liquid_carvers")]
+    LiquidCarvers,
+    #[serde(rename = "minecraft:features")]
+    Features,
+    #[serde(rename = "minecraft:initialize_light")]
+    Light,
+    #[serde(rename = "minecraft:spawn")]
+    Spawn,
+    #[serde(rename = "minecraft:heightmaps")]
+    Heightmaps,
+    #[serde(rename = "minecraft:full")]
+    Full,
+}
+
 /// The Heightmap for a completely empty chunk
 impl Default for ChunkHeightmaps {
     fn default() -> Self {
@@ -150,6 +181,14 @@ impl Index<ChunkRelativeBlockCoordinates> for ChunkBlocks {
 
 impl ChunkData {
     pub fn from_bytes(chunk_data: Vec<u8>, at: ChunkCoordinates) -> Result<Self, WorldError> {
+        if fastnbt::from_bytes::<ChunkStatus>(&chunk_data).expect("Failed reading chunk status.")
+            != ChunkStatus::Full
+        {
+            return Err(WorldError::ChunkNotGenerated(
+                ChunkNotGeneratedError::IncompleteGeneration,
+            ));
+        }
+
         let chunk_data = match fastnbt::from_bytes::<ChunkNbt>(chunk_data.as_slice()) {
             Ok(v) => v,
             Err(err) => return Err(WorldError::ErrorDeserializingChunk(err.to_string())),