Add empty world generator as a config option (feather-rs#519)

leElvyn · Jan 18, 2022 · 3779032 · 3779032
1 parent c754e4f
commit 3779032
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/feather/server/config.toml b/feather/server/config.toml
@@ -31,7 +31,7 @@ hash = ""
 # The name of the directory containing the world.
 name = "world"
 # The generator to use if the world does not exist.
-# Implemented values are: default, flat
+# Implemented values are: default, flat, void
 generator = "default"
 # The seed to use if the world does not exist.
 # Leaving this value empty will generate a random seed.

diff --git a/feather/server/src/main.rs b/feather/server/src/main.rs
@@ -6,7 +6,7 @@ use common::{Game, TickLoop, World};
 use ecs::SystemExecutor;
 use feather_server::{config::Config, Server};
 use plugin_host::PluginManager;
-use worldgen::{ComposableGenerator, SuperflatWorldGenerator, WorldGenerator};
+use worldgen::{ComposableGenerator, SuperflatWorldGenerator, VoidWorldGenerator, WorldGenerator};
 
 mod logging;
 
@@ -70,6 +70,7 @@ fn init_world_source(game: &mut Game, config: &Config) {
         "flat" => Arc::new(SuperflatWorldGenerator::new(
             SuperflatGeneratorOptions::default(),
         )),
+        "void" => Arc::new(VoidWorldGenerator),
         _ => Arc::new(ComposableGenerator::default_with_seed(seed)),
     };
     game.world = World::with_gen_and_path(generator, config.world.name.clone());

diff --git a/feather/worldgen/src/lib.rs b/feather/worldgen/src/lib.rs
@@ -41,9 +41,9 @@ pub trait WorldGenerator: Send + Sync {
     fn generate_chunk(&self, position: ChunkPosition) -> Chunk;
 }
 
-pub struct EmptyWorldGenerator {}
+pub struct VoidWorldGenerator;
 
-impl WorldGenerator for EmptyWorldGenerator {
+impl WorldGenerator for VoidWorldGenerator {
     fn generate_chunk(&self, position: ChunkPosition) -> Chunk {
         Chunk::new(position)
     }
@@ -408,9 +408,9 @@ mod tests {
     }
 
     #[test]
-    pub fn test_worldgen_empty() {
+    pub fn test_worldgen_void() {
         let chunk_pos = ChunkPosition { x: 1, z: 2 };
-        let generator = EmptyWorldGenerator {};
+        let generator = VoidWorldGenerator;
         let chunk = generator.generate_chunk(chunk_pos);
 
         // No sections have been generated