Merge pull request #454 from Miro-Andrin/Chunk

Small refactor, moving chunk related files into a module.

feather/common/src/chunk_loading.rs → feather/common/src/chunk/loading.rs

@@ -12,7 +12,7 @@ use ecs::{Entity, SysResult, SystemExecutor};
 use utils::vec_remove_item;
 
 use crate::{
-    chunk_worker::LoadRequest,
+    chunk::worker::LoadRequest,
     events::{EntityRemoveEvent, ViewUpdateEvent},
     Game,
 };

feather/common/src/chunk/mod.rs

@@ -0,0 +1,4 @@
+pub mod cache;
+pub mod entities;
+pub mod loading;
+pub mod worker;

feather/common/src/game.rs

@@ -9,7 +9,7 @@ use quill_common::{entities::Player, entity_init::EntityInit};
 
 use crate::{
     chat::{ChatKind, ChatMessage},
-    chunk_entities::ChunkEntities,
+    chunk::entities::ChunkEntities,
     events::{BlockChangeEvent, EntityCreateEvent, EntityRemoveEvent, PlayerJoinEvent},
     ChatBox, World,
 };

feather/common/src/lib.rs

@@ -19,18 +19,12 @@ pub use window::Window;
 
 pub mod events;
 
-pub mod chunk_worker;
+pub mod chunk;
 mod region_worker;
 
-pub mod chunk_cache;
-
 pub mod world;
 pub use world::World;
 
-mod chunk_loading;
-
-mod chunk_entities;
-
 pub mod chat;
 pub use chat::ChatBox;
 
@@ -41,8 +35,8 @@ pub mod interactable;
 /// Registers gameplay systems with the given `Game` and `SystemExecutor`.
 pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
     view::register(game, systems);
-    chunk_loading::register(game, systems);
-    chunk_entities::register(systems);
+    chunk::loading::register(game, systems);
+    chunk::entities::register(systems);
     interactable::register(game);
 
     game.add_entity_spawn_callback(entities::add_entity_components);

feather/common/src/region_worker.rs

@@ -11,7 +11,7 @@ use base::anvil::{
 };
 use flume::{Receiver, Sender};
 
-use crate::chunk_worker::{ChunkLoadResult, LoadRequest, LoadedChunk, SaveRequest, WorkerRequest};
+use crate::chunk::worker::{ChunkLoadResult, LoadRequest, LoadedChunk, SaveRequest, WorkerRequest};
 
 /// Duration to keep a region file open when not in use.
 const CACHE_TIME: Duration = Duration::from_secs(60);

feather/common/src/world.rs

@@ -7,8 +7,8 @@ use std::{path::PathBuf, sync::Arc};
 use worldgen::{ComposableGenerator, WorldGenerator};
 
 use crate::{
-    chunk_cache::ChunkCache,
-    chunk_worker::{ChunkWorker, LoadRequest, SaveRequest},
+    chunk::cache::ChunkCache,
+    chunk::worker::{ChunkWorker, LoadRequest, SaveRequest},
     events::ChunkLoadEvent,
 };