aboutsummaryrefslogtreecommitdiff
path: root/azalea-world/src
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2024-10-26 05:29:26 +0000
committermat <git@matdoes.dev>2024-10-26 05:29:26 +0000
commit6b0fe5bf638079d535e70c3c91e78fe35a5d2a2f (patch)
tree3b65d2984a0cffbe5acb3d44d7e3b8b145c32f95 /azalea-world/src
parentb762575db61cf775d603e11eb2bd27ae13bdc4e9 (diff)
downloadazalea-drasl-6b0fe5bf638079d535e70c3c91e78fe35a5d2a2f.tar.xz
group imports with rustfmt
Diffstat (limited to 'azalea-world/src')
-rwxr-xr-xazalea-world/src/chunk_storage.rs22
-rw-r--r--azalea-world/src/container.rs9
-rw-r--r--azalea-world/src/find_blocks.rs3
-rwxr-xr-xazalea-world/src/palette.rs3
-rw-r--r--azalea-world/src/world.rs14
5 files changed, 28 insertions, 23 deletions
diff --git a/azalea-world/src/chunk_storage.rs b/azalea-world/src/chunk_storage.rs
index f1239f8a..5f8b8951 100755
--- a/azalea-world/src/chunk_storage.rs
+++ b/azalea-world/src/chunk_storage.rs
@@ -1,13 +1,3 @@
-use crate::heightmap::Heightmap;
-use crate::heightmap::HeightmapKind;
-use crate::palette::PalettedContainer;
-use crate::palette::PalettedContainerKind;
-use azalea_block::BlockState;
-use azalea_buf::{BufReadError, McBufReadable, McBufWritable};
-use azalea_core::position::{BlockPos, ChunkBlockPos, ChunkPos, ChunkSectionBlockPos};
-use nohash_hasher::IntMap;
-use parking_lot::RwLock;
-use simdnbt::owned::NbtCompound;
use std::collections::hash_map::Entry;
use std::str::FromStr;
use std::{
@@ -16,8 +6,20 @@ use std::{
io::{Cursor, Write},
sync::{Arc, Weak},
};
+
+use azalea_block::BlockState;
+use azalea_buf::{BufReadError, McBufReadable, McBufWritable};
+use azalea_core::position::{BlockPos, ChunkBlockPos, ChunkPos, ChunkSectionBlockPos};
+use nohash_hasher::IntMap;
+use parking_lot::RwLock;
+use simdnbt::owned::NbtCompound;
use tracing::{debug, trace, warn};
+use crate::heightmap::Heightmap;
+use crate::heightmap::HeightmapKind;
+use crate::palette::PalettedContainer;
+use crate::palette::PalettedContainerKind;
+
const SECTION_HEIGHT: u32 = 16;
/// An efficient storage of chunks for a client that has a limited render
diff --git a/azalea-world/src/container.rs b/azalea-world/src/container.rs
index 69b8f908..0b3a13fd 100644
--- a/azalea-world/src/container.rs
+++ b/azalea-world/src/container.rs
@@ -1,13 +1,14 @@
+use std::{
+ collections::HashMap,
+ sync::{Arc, Weak},
+};
+
use azalea_core::{registry_holder::RegistryHolder, resource_location::ResourceLocation};
use bevy_ecs::{component::Component, system::Resource};
use derive_more::{Deref, DerefMut};
use nohash_hasher::IntMap;
use parking_lot::RwLock;
use rustc_hash::FxHashMap;
-use std::{
- collections::HashMap,
- sync::{Arc, Weak},
-};
use tracing::error;
use crate::{ChunkStorage, Instance};
diff --git a/azalea-world/src/find_blocks.rs b/azalea-world/src/find_blocks.rs
index 2d2c6d7a..39f57eec 100644
--- a/azalea-world/src/find_blocks.rs
+++ b/azalea-world/src/find_blocks.rs
@@ -246,9 +246,8 @@ impl<'a> Iterator for FindBlocks<'a> {
mod tests {
use azalea_registry::Block;
- use crate::{Chunk, PartialChunkStorage};
-
use super::*;
+ use crate::{Chunk, PartialChunkStorage};
#[test]
fn find_block() {
diff --git a/azalea-world/src/palette.rs b/azalea-world/src/palette.rs
index 2b3cdc53..27e017c4 100755
--- a/azalea-world/src/palette.rs
+++ b/azalea-world/src/palette.rs
@@ -1,6 +1,7 @@
+use std::io::{Cursor, Write};
+
use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable};
use azalea_core::math;
-use std::io::{Cursor, Write};
use tracing::warn;
use crate::BitStorage;
diff --git a/azalea-world/src/world.rs b/azalea-world/src/world.rs
index 84a5857c..066981e5 100644
--- a/azalea-world/src/world.rs
+++ b/azalea-world/src/world.rs
@@ -1,15 +1,17 @@
-use crate::{ChunkStorage, PartialChunkStorage};
+use std::fmt::Formatter;
+use std::{
+ collections::{HashMap, HashSet},
+ fmt::Debug,
+};
+
use azalea_block::{BlockState, FluidState};
use azalea_core::position::{BlockPos, ChunkPos};
use azalea_core::registry_holder::RegistryHolder;
use bevy_ecs::{component::Component, entity::Entity};
use derive_more::{Deref, DerefMut};
use nohash_hasher::IntMap;
-use std::fmt::Formatter;
-use std::{
- collections::{HashMap, HashSet},
- fmt::Debug,
-};
+
+use crate::{ChunkStorage, PartialChunkStorage};
/// PartialInstances are usually owned by clients, and hold strong references to
/// chunks and entities in [`Instance`]s.