diff --git a/core/src/io/minecraft/export/writer.rs b/core/src/io/minecraft/export/writer.rs index a85fa4f..09a738c 100644 --- a/core/src/io/minecraft/export/writer.rs +++ b/core/src/io/minecraft/export/writer.rs @@ -5,13 +5,12 @@ use std::fs; use std::path::Path; use crate::io::layer_export::LayerExport; -use crate::io::minecraft::{Result, data_version}; +use crate::io::minecraft::{data_version, Result}; use crate::model::tile::Tile; use crate::model::world::World; use super::chunk::{build_chunk_nbt, build_chunk_nbt_with_layers}; -#[allow(clippy::type_complexity)] type RegionTiles<'a> = BTreeMap<(i32, i32), Vec<(&'a (i32, i32), &'a Tile)>>; fn dim_region_path(output_path: &Path, dim_name: &str) -> std::path::PathBuf { diff --git a/core/src/model/world/mod.rs b/core/src/model/world/mod.rs index e4ed8a1..ff56185 100644 --- a/core/src/model/world/mod.rs +++ b/core/src/model/world/mod.rs @@ -1,5 +1,5 @@ pub mod dimension; -pub mod world; +mod world_impl; pub use dimension::*; -pub use world::*; +pub use world_impl::*; diff --git a/core/src/model/world/world.rs b/core/src/model/world/world_impl.rs similarity index 100% rename from core/src/model/world/world.rs rename to core/src/model/world/world_impl.rs diff --git a/crates/fastanvil/src/io/chunk/chunk.rs b/crates/fastanvil/src/io/chunk/chunk_impl.rs similarity index 100% rename from crates/fastanvil/src/io/chunk/chunk.rs rename to crates/fastanvil/src/io/chunk/chunk_impl.rs diff --git a/crates/fastanvil/src/io/chunk/chunk_write.rs b/crates/fastanvil/src/io/chunk/chunk_write.rs index 852b9f1..558ec11 100644 --- a/crates/fastanvil/src/io/chunk/chunk_write.rs +++ b/crates/fastanvil/src/io/chunk/chunk_write.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use super::chunk::{Chunk, ChunkSection}; +use super::chunk_impl::{Chunk, ChunkSection}; impl Chunk { /// Serialize this chunk back to an NBT Compound tag. diff --git a/crates/fastanvil/src/io/chunk/mod.rs b/crates/fastanvil/src/io/chunk/mod.rs index 02d123a..6647e39 100644 --- a/crates/fastanvil/src/io/chunk/mod.rs +++ b/crates/fastanvil/src/io/chunk/mod.rs @@ -1,4 +1,4 @@ -mod chunk; +mod chunk_impl; mod chunk_write; -pub use chunk::*; +pub use chunk_impl::*; diff --git a/crates/fastanvil/src/io/region/mod.rs b/crates/fastanvil/src/io/region/mod.rs index fc92064..e130fae 100644 --- a/crates/fastanvil/src/io/region/mod.rs +++ b/crates/fastanvil/src/io/region/mod.rs @@ -1,4 +1,4 @@ -mod region; +mod region_impl; mod region_write; -pub use region::*; +pub use region_impl::*; diff --git a/crates/fastanvil/src/io/region/region.rs b/crates/fastanvil/src/io/region/region_impl.rs similarity index 100% rename from crates/fastanvil/src/io/region/region.rs rename to crates/fastanvil/src/io/region/region_impl.rs diff --git a/crates/fastanvil/src/io/region/region_write.rs b/crates/fastanvil/src/io/region/region_write.rs index 326dc1c..6fc43a0 100644 --- a/crates/fastanvil/src/io/region/region_write.rs +++ b/crates/fastanvil/src/io/region/region_write.rs @@ -1,6 +1,6 @@ use crate::compression::{self, CompressionType}; -use super::region::{Region, Result}; +use super::region_impl::{Region, Result}; impl Region { /// Serialize region back to .mca bytes. diff --git a/crates/palette-compress/src/palette/mod.rs b/crates/palette-compress/src/palette/mod.rs index b45dad2..6104401 100644 --- a/crates/palette-compress/src/palette/mod.rs +++ b/crates/palette-compress/src/palette/mod.rs @@ -1,4 +1,4 @@ -mod palette; +mod palette_impl; mod palette_io; -pub use palette::*; +pub use palette_impl::*; diff --git a/crates/palette-compress/src/palette/palette.rs b/crates/palette-compress/src/palette/palette_impl.rs similarity index 100% rename from crates/palette-compress/src/palette/palette.rs rename to crates/palette-compress/src/palette/palette_impl.rs diff --git a/crates/palette-compress/src/palette/palette_io.rs b/crates/palette-compress/src/palette/palette_io.rs index 16f3aca..8a19401 100644 --- a/crates/palette-compress/src/palette/palette_io.rs +++ b/crates/palette-compress/src/palette/palette_io.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use terrafier_nbt::Tag; -use super::palette::{BlockPalette, BlockState}; +use super::palette_impl::{BlockPalette, BlockState}; impl BlockState { /// Parse from `TAG_Compound` with `"Name"` and optional `"Properties"`. @@ -73,7 +73,7 @@ impl BlockPalette { #[cfg(test)] mod tests { - use super::super::palette::{BlockPalette, BlockState}; + use super::super::palette_impl::{BlockPalette, BlockState}; use terrafier_nbt::Tag; #[test]