Generator choosing

pumpkin-config/src/generator.rs

@@ -0,0 +1,10 @@
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub enum Generator {
+    Test,
+    BeautifulPlains,
+    Superflat,
+    Void,
+    Custom,
+}

pumpkin-config/src/lib.rs

@@ -1,3 +1,4 @@
+use generator::Generator;
 use log::warn;
 use logging::LoggingConfig;
 use pumpkin_util::{Difficulty, GameMode, PermissionLvl};
@@ -25,6 +26,7 @@ pub use pvp::PVPConfig;
 pub use server_links::ServerLinksConfig;
 
 mod commands;
+pub mod generator;
 
 pub mod op;
 mod pvp;
@@ -63,6 +65,8 @@ pub struct BasicConfiguration {
     pub server_address: SocketAddr,
     /// The seed for world generation.
     pub seed: String,
+    /// The world generator for generation.
+    pub generator: Generator,
     /// The maximum number of players allowed on the server. Specifying `0` disables the limit.
     pub max_players: u32,
     /// The maximum view distance for players.
@@ -99,6 +103,7 @@ impl Default for BasicConfiguration {
         Self {
             server_address: SocketAddr::new(Ipv4Addr::new(0, 0, 0, 0).into(), 25565),
             seed: "".to_string(),
+            generator: Generator::Test,
             max_players: 100000,
             view_distance: NonZeroU8::new(10).unwrap(),
             simulation_distance: NonZeroU8::new(10).unwrap(),

pumpkin-world/src/generation/mod.rs

@@ -17,16 +17,22 @@ mod seed;
 pub use generator::WorldGenerator;
 use implementation::{
     //overworld::biome::plains::PlainsGenerator,
+    overworld::biome::plains::PlainsGenerator,
     test::{TestBiomeGenerator, TestGenerator, TestTerrainGenerator},
 };
+use pumpkin_config::{generator::Generator, BASIC_CONFIG};
 pub use seed::Seed;
 
 use generator::GeneratorInit;
 
 pub fn get_world_gen(seed: Seed) -> Box<dyn WorldGenerator> {
-    // TODO decide which WorldGenerator to pick based on config.
-    //Box::new(PlainsGenerator::new(seed))
-    Box::new(TestGenerator::<TestBiomeGenerator, TestTerrainGenerator>::new(seed))
+    match BASIC_CONFIG.generator {
+        Generator::Test => {
+            Box::new(TestGenerator::<TestBiomeGenerator, TestTerrainGenerator>::new(seed))
+        }
+        Generator::BeautifulPlains => Box::new(PlainsGenerator::new(seed)),
+        _ => todo!(),
+    }
 }
 
 pub mod section_coords {