Moved Difficulty into pumpkin-core
This commit is contained in:
parent
2fbf450ed3
commit
a17ed23b00
@ -3,3 +3,13 @@ pub mod random;
|
|||||||
pub mod text;
|
pub mod text;
|
||||||
|
|
||||||
pub use gamemode::GameMode;
|
pub use gamemode::GameMode;
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(PartialEq, Serialize, Deserialize)]
|
||||||
|
pub enum Difficulty {
|
||||||
|
Peaceful,
|
||||||
|
Easy,
|
||||||
|
Normal,
|
||||||
|
Hard,
|
||||||
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
use log::warn;
|
use log::warn;
|
||||||
use pumpkin_core::GameMode;
|
use pumpkin_core::{Difficulty, GameMode};
|
||||||
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
use serde::{de::DeserializeOwned, Deserialize, Serialize};
|
||||||
|
|
||||||
use std::{
|
use std::{
|
||||||
@ -9,8 +9,6 @@ use std::{
|
|||||||
sync::LazyLock,
|
sync::LazyLock,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::server::Difficulty;
|
|
||||||
|
|
||||||
pub mod auth;
|
pub mod auth;
|
||||||
pub mod proxy;
|
pub mod proxy;
|
||||||
pub mod resource_pack;
|
pub mod resource_pack;
|
||||||
|
|||||||
@ -22,7 +22,6 @@ use pumpkin_world::dimension::Dimension;
|
|||||||
|
|
||||||
use pumpkin_registry::Registry;
|
use pumpkin_registry::Registry;
|
||||||
use rsa::{traits::PublicKeyParts, RsaPrivateKey, RsaPublicKey};
|
use rsa::{traits::PublicKeyParts, RsaPrivateKey, RsaPublicKey};
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
client::Client,
|
client::Client,
|
||||||
@ -214,11 +213,3 @@ impl Server {
|
|||||||
(pub_key, priv_key)
|
(pub_key, priv_key)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(PartialEq, Serialize, Deserialize)]
|
|
||||||
pub enum Difficulty {
|
|
||||||
Peaceful,
|
|
||||||
Easy,
|
|
||||||
Normal,
|
|
||||||
Hard,
|
|
||||||
}
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user