Skip to content

Commit

Permalink
Merge pull request #102 from StripedMonkey/spell_checker
Browse files Browse the repository at this point in the history
  • Loading branch information
lukas0008 authored Sep 19, 2024
2 parents 810ecbe + 229be05 commit 8a48241
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 28 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ codegen-units = 1
[workspace.dependencies]
log = "0.4"
tokio = { version = "1.40", features = [
"net",
"macros",
"rt-multi-thread",
"fs",
"io-util",
"macros",
"net",
"rt-multi-thread",
"sync",
] }

Expand Down
1 change: 0 additions & 1 deletion pumpkin-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ serde.workspace = true
log.workspace = true

toml = "0.8"

2 changes: 1 addition & 1 deletion pumpkin-inventory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition.workspace = true

[dependencies]
# For items
pumpkin-world = { path = "../pumpkin-world"}
pumpkin-world = { path = "../pumpkin-world" }

num-traits = "0.2"
num-derive = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition.workspace = true

[dependencies]
pumpkin-macros = { path = "../pumpkin-macros" }
pumpkin-world = { path = "../pumpkin-world" }
pumpkin-world = { path = "../pumpkin-world" }
pumpkin-core = { path = "../pumpkin-core" }

bytes = "1.7"
Expand Down
8 changes: 4 additions & 4 deletions pumpkin-protocol/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ pub trait ServerPacket: Packet + Sized {
pub struct StatusResponse {
/// The version on which the Server is running. Optional
pub version: Option<Version>,
/// Informations about currently connected Players. Optional
/// Information about currently connected Players. Optional
pub players: Option<Players>,
/// The description displayed also called MOTD (Message of the day). Optional
pub description: String,
/// The icon displayed, Optional
pub favicon: Option<String>,
/// Players are forced to use Secure chat
pub enforece_secure_chat: bool,
pub enforce_secure_chat: bool,
}
#[derive(Serialize)]
pub struct Version {
Expand All @@ -216,7 +216,7 @@ pub struct Players {
pub max: u32,
/// The current online player count
pub online: u32,
/// Informations about currently connected players.
/// Information about currently connected players.
/// Note player can disable listing here.
pub sample: Vec<Sample>,
}
Expand All @@ -229,7 +229,7 @@ pub struct Sample {
pub id: String,
}

// basicly game profile
// basically game profile
#[derive(Serialize, Deserialize, Clone, Debug)]
pub struct Property {
pub name: String,
Expand Down
4 changes: 2 additions & 2 deletions pumpkin-registry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version.workspace = true
edition.workspace = true

[dependencies]
pumpkin-protocol = { path = "../pumpkin-protocol"}
pumpkin-core = { path = "../pumpkin-core"}
pumpkin-protocol = { path = "../pumpkin-protocol" }
pumpkin-core = { path = "../pumpkin-core" }

# nbt
fastnbt = { git = "https://github.com/owengage/fastnbt.git" }
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version.workspace = true
edition.workspace = true

[dependencies]
pumpkin-core = { path = "../pumpkin-core"}
pumpkin-core = { path = "../pumpkin-core" }

fastnbt = { git = "https://github.com/owengage/fastnbt.git" }
tokio.workspace = true
Expand Down
25 changes: 15 additions & 10 deletions pumpkin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ plugins = ["pumpkin-plugin/plugins"]

[dependencies]
# pumpkin
pumpkin-core = { path = "../pumpkin-core"}
pumpkin-core = { path = "../pumpkin-core" }
pumpkin-config = { path = "../pumpkin-config" }
pumpkin-plugin = { path = "../pumpkin-plugin"}
pumpkin-inventory = { path = "../pumpkin-inventory"}
pumpkin-world = { path = "../pumpkin-world"}
pumpkin-entity = { path = "../pumpkin-entity"}
pumpkin-protocol = { path = "../pumpkin-protocol"}
pumpkin-registry = { path = "../pumpkin-registry"}
pumpkin-plugin = { path = "../pumpkin-plugin" }
pumpkin-inventory = { path = "../pumpkin-inventory" }
pumpkin-world = { path = "../pumpkin-world" }
pumpkin-entity = { path = "../pumpkin-entity" }
pumpkin-protocol = { path = "../pumpkin-protocol" }
pumpkin-registry = { path = "../pumpkin-registry" }

itertools = "0.13.0"

Expand All @@ -40,7 +40,12 @@ rsa = "0.9.6"
rsa-der = "0.3.0"

# authentication
reqwest = { version = "0.12.7", default-features= false, features = ["json", "rustls-tls", "http2", "macos-system-configuration"]}
reqwest = { version = "0.12.7", default-features = false, features = [
"http2",
"json",
"macos-system-configuration",
"rustls-tls",
] }

sha1 = "0.10.6"
digest = "=0.11.0-pre.9"
Expand All @@ -53,14 +58,14 @@ thiserror = "1.0"

# icon loading
base64 = "0.22.1"
image = { version = "0.25", default-features = false, features = ["png"]}
image = { version = "0.25", default-features = false, features = ["png"] }

# logging
simple_logger = "5.0.0"
log.workspace = true

# networking
mio = { version = "1.0.2", features = ["os-poll", "net"]}
mio = { version = "1.0.2", features = ["net", "os-poll"] }

parking_lot.workspace = true
crossbeam.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl Default for PlayerConfig {
}
}

/// Everything which makes a Conection with our Server is a `Client`.
/// Everything which makes a Connection with our Server is a `Client`.
/// Client will become Players when they reach the `Play` state
pub struct Client {
/// The client's game profile information.
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/entity/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ impl Entity {

/// Kills the Entity
///
/// This is simliar to `kill` but Spawn Particles, Animation and plays death sound
/// This is similar to `kill` but Spawn Particles, Animation and plays death sound
pub fn kill(&self) {
// Spawns death smoke particles
self.world
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/entity/player.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ impl Player {
"Setting the same gamemode as already is"
);
self.gamemode.store(gamemode);
// So a little story time. I actually made an abitlties_from_gamemode function. I looked at vanilla and they always send the abilties from the gamemode. But the funny thing actually is. That the client
// So a little story time. I actually made an abilties_from_gamemode function. I looked at vanilla and they always send the abilties from the gamemode. But the funny thing actually is. That the client
// does actually use the same method and set the abilties when receiving the CGameEvent gamemode packet. Just Mojang nonsense
self.entity
.world
Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/server/connection_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ impl CachedStatus {
}),
description: config.motd.clone(),
favicon: icon,
enforece_secure_chat: false,
enforce_secure_chat: false,
}
}

Expand Down
2 changes: 1 addition & 1 deletion pumpkin/src/world/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ impl World {
.client
.send_packet(&CGameEvent::new(GameEvent::StartWaitingChunks, 0.0));

// Spawn in inital chunks
// Spawn in initial chunks
player_chunker::player_join(self, player.clone()).await;
}

Expand Down

0 comments on commit 8a48241

Please sign in to comment.