Moved Difficulty into pumpkin-core

This commit is contained in:
DaniD3v
2024-08-31 18:18:32 +02:00
parent 2fbf450ed3
commit a17ed23b00
3 changed files with 11 additions and 12 deletions

View File

@@ -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,
}

View File

@@ -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;

View File

@@ -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,
}