neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-07-02 13:59:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

world: process sign data, prepare for serialization

Browse source
This commit is contained in:
Matthias Schiffer 2023-11-25 20:34:50 +01:00
parent 638d5046c9
commit f0e0db63d3
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
5 changed files with 130 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/world/chunk.rs
View file

@ -10,7 +10,7 @@ use std::{
use anyhow::{bail, Context, Result};
use super::{de, section::*};
use super::{block_entity::BlockEntity, de, section::*};
use crate::{
resource::{BiomeTypes, BlockTypes},
types::*,
@ -55,6 +55,8 @@ pub enum ChunkInner<'a> {
pub struct Chunk<'a> {
/// Version-specific data
inner: ChunkInner<'a>,
/// Unprocessed block entities
block_entities: &'a Vec<de::BlockEntity>,
}
impl<'a> Chunk<'a> {
@ -66,17 +68,27 @@ impl<'a> Chunk<'a> {
) -> Result<(Self, bool)> {
let data_version = data.data_version.unwrap_or_default();
let (inner, has_unknown) = match &data.chunk {
let ((inner, has_unknown), block_entities) = match &data.chunk {
de::ChunkVariant::V1_18 {
sections,
block_entities: _,
} => Self::new_v1_18(data_version, sections, block_types, biome_types)?,
de::ChunkVariant::V0 { level } => {
Self::new_v0(data_version, level, block_types, biome_types)?
}
block_entities,
} => (
Self::new_v1_18(data_version, sections, block_types, biome_types)?,
block_entities,
),
de::ChunkVariant::V0 { level } => (
Self::new_v0(data_version, level, block_types, biome_types)?,
&level.tile_entities,
),
};
Ok((Chunk { inner }, has_unknown))
Ok((
Chunk {
inner,
block_entities,
},
has_unknown,
))
}
/// [Chunk::new] implementation for Minecraft v1.18+ chunks
@ -230,6 +242,14 @@ impl<'a> Chunk<'a> {
},
}
}
/// Processes all of the chunk's block entities
pub fn block_entities(&self) -> Vec<BlockEntity> {
self.block_entities
.iter()
.filter_map(BlockEntity::new)
.collect()
}
}
/// Reference to block, biome and block light data of a section