diff --git a/pumpkin-core/src/lib.rs b/pumpkin-core/src/lib.rs index d7f4f5837..ac5bdb4a5 100644 --- a/pumpkin-core/src/lib.rs +++ b/pumpkin-core/src/lib.rs @@ -3,3 +3,13 @@ pub mod random; pub mod text; pub use gamemode::GameMode; + +use serde::{Deserialize, Serialize}; + +#[derive(PartialEq, Serialize, Deserialize)] +pub enum Difficulty { + Peaceful, + Easy, + Normal, + Hard, +} diff --git a/pumpkin/src/config/mod.rs b/pumpkin/src/config/mod.rs index 6f2cb88d5..f24ca2810 100644 --- a/pumpkin/src/config/mod.rs +++ b/pumpkin/src/config/mod.rs @@ -1,5 +1,5 @@ use log::warn; -use pumpkin_core::GameMode; +use pumpkin_core::{Difficulty, GameMode}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use std::{ @@ -9,8 +9,6 @@ use std::{ sync::LazyLock, }; -use crate::server::Difficulty; - pub mod auth; pub mod proxy; pub mod resource_pack; diff --git a/pumpkin/src/server.rs b/pumpkin/src/server.rs index 00da103c9..e37f4ea0e 100644 --- a/pumpkin/src/server.rs +++ b/pumpkin/src/server.rs @@ -22,7 +22,6 @@ use pumpkin_world::dimension::Dimension; use pumpkin_registry::Registry; use rsa::{traits::PublicKeyParts, RsaPrivateKey, RsaPublicKey}; -use serde::{Deserialize, Serialize}; use crate::{ client::Client, @@ -214,11 +213,3 @@ impl Server { (pub_key, priv_key) } } - -#[derive(PartialEq, Serialize, Deserialize)] -pub enum Difficulty { - Peaceful, - Easy, - Normal, - Hard, -}