diff --git a/src/world/chunk.rs b/src/world/chunk.rs index aa6c9a7..026276a 100644 --- a/src/world/chunk.rs +++ b/src/world/chunk.rs @@ -17,7 +17,7 @@ use crate::{ pub enum Chunk<'a> { /// Minecraft v1.18+ chunk with biome data moved into sections V1_18 { - section_map: BTreeMap, BiomesV18<'a>, BlockLight<'a>)>, + section_map: BTreeMap, BiomesV1_18<'a>, BlockLight<'a>)>, }, /// Minecraft v1.13+ chunk /// @@ -45,7 +45,7 @@ pub enum Chunk<'a> { enum SectionIterInner<'a> { /// Iterator over sections of [Chunk::V1_18] V1_18 { - iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV18<'a>, BlockLight<'a>)>, + iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>, }, /// Iterator over sections of [Chunk::V1_13] V1_13 { @@ -104,7 +104,7 @@ impl<'a> Chunk<'a> { block_types, ) .with_context(|| format!("Failed to load section at Y={}", section.y))?, - BiomesV18::new( + BiomesV1_18::new( section.biomes.data.as_deref(), §ion.biomes.palette, biome_types, diff --git a/src/world/section.rs b/src/world/section.rs index c943e11..f960d16 100644 --- a/src/world/section.rs +++ b/src/world/section.rs @@ -175,13 +175,13 @@ impl<'a> Section for SectionV0<'a> { /// the biomes laid out as an array of indices into a palette, similar to the /// v1.13+ block data. #[derive(Debug)] -pub struct BiomesV18<'a> { +pub struct BiomesV1_18<'a> { _biomes: Option<&'a [i64]>, _palette: &'a [String], _bits: u8, } -impl<'a> BiomesV18<'a> { +impl<'a> BiomesV1_18<'a> { /// Constructs a new [BiomesV18] from deserialized data structures pub fn new( biomes: Option<&'a [i64]>, @@ -198,7 +198,7 @@ impl<'a> BiomesV18<'a> { } } - Ok(BiomesV18 { + Ok(BiomesV1_18 { _biomes: biomes, _palette: palette, _bits: bits,