Pumpkin-MC/Pumpkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lets try fix CI

Browse Source
This commit is contained in:
Alexander Medvedev 2025-10-02 16:54:48 +02:00
parent 58b4c6593a
commit 932512b5d6
22 changed files with 109 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/rust.yml vendored
View File

@ -20,6 +20,7 @@ jobs:
steps:
- uses: actions/checkout@v5
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- run: rustup component add rustfmt --toolchain ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo fmt --check
clippy:
@ -32,6 +33,7 @@ jobs:
steps:
- uses: actions/checkout@v5
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- run: rustup component add clippy --toolchain ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo clippy --all-targets --all-features
build_and_test:
@ -45,6 +47,7 @@ jobs:
steps:
- uses: actions/checkout@v5
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- run: rustup component add rustfmt --toolchain ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo test --verbose
build_release:
@ -59,6 +62,7 @@ jobs:
- uses: actions/checkout@v5
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- run: rustup component add rustfmt --toolchain ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo build --verbose --release
- name: Export executable
@ -77,5 +81,6 @@ jobs:
steps:
- uses: actions/checkout@v5
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
- run: rustup component add clippy --toolchain ${{ matrix.toolchain }}
- uses: Swatinem/rust-cache@v2
- run: cargo clippy --release --all-targets --all-features

147
Cargo.lock generated
View File

@ -125,15 +125,13 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
[[package]]
name = "async-compression"
version = "0.4.29"
version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bee399cc3a623ec5a2db2c5b90ee0190a2260241fbe0c023ac8f7bab426aaf8"
checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0"
dependencies = [
"compression-codecs",
"compression-core",
"flate2",
"futures-core",
"memchr",
"pin-project-lite",
"tokio",
]
@ -271,9 +269,9 @@ checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
[[package]]
name = "bitflags"
version = "2.9.3"
version = "2.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
[[package]]
name = "block-buffer"
@ -319,9 +317,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
version = "1.2.30"
version = "1.2.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
dependencies = [
"shlex",
]
@ -343,9 +341,9 @@ dependencies = [
[[package]]
name = "cfg-if"
version = "1.0.1"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
[[package]]
name = "ciborium"
@ -426,15 +424,12 @@ dependencies = [
[[package]]
name = "compression-codecs"
version = "0.4.29"
version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7eea68f0e02c2b0aa8856e9a9478444206d4b6828728e7b0697c0f8cca265cb"
checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23"
dependencies = [
"compression-core",
"flate2",
"futures-core",
"memchr",
"pin-project-lite",
]
[[package]]
@ -552,9 +547,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]]
name = "crc-fast"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec9f79df9b0383475ae6df8fcf35d4e29528441706385339daf0fe3f4cce040b"
checksum = "61dd931a9d071dc6e36b8735c501601428c5aa5dfd6d2506b935498ef57e0098"
dependencies = [
"crc",
"digest 0.10.7",
@ -765,9 +760,9 @@ dependencies = [
[[package]]
name = "deranged"
version = "0.4.0"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
dependencies = [
"powerfmt",
]
@ -916,7 +911,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
dependencies = [
"libc",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -1075,7 +1070,7 @@ dependencies = [
"cfg-if",
"libc",
"r-efi",
"wasi 0.14.2+wasi-0.2.4",
"wasi 0.14.3+wasi-0.2.4",
]
[[package]]
@ -1425,9 +1420,9 @@ dependencies = [
[[package]]
name = "io-uring"
version = "0.7.9"
version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
dependencies = [
"bitflags",
"cfg-if",
@ -1556,15 +1551,15 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.27"
version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
[[package]]
name = "lru"
version = "0.16.0"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed"
checksum = "bfe949189f46fabb938b3a9a0be30fdd93fd8a09260da863399a8cf3db756ec8"
dependencies = [
"hashbrown 0.15.5",
]
@ -1796,9 +1791,9 @@ dependencies = [
[[package]]
name = "percent-encoding"
version = "2.3.1"
version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]]
name = "pest"
@ -2002,9 +1997,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.96"
version = "1.0.101"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "beef09f85ae72cea1ef96ba6870c51e6382ebfa4f0e85b643459331f3daa5be0"
checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
dependencies = [
"unicode-ident",
]
@ -2362,14 +2357,14 @@ dependencies = [
[[package]]
name = "regex"
version = "1.11.1"
version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata 0.4.9",
"regex-syntax 0.8.5",
"regex-automata 0.4.10",
"regex-syntax 0.8.6",
]
[[package]]
@ -2383,13 +2378,13 @@ dependencies = [
[[package]]
name = "regex-automata"
version = "0.4.9"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax 0.8.5",
"regex-syntax 0.8.6",
]
[[package]]
@ -2400,9 +2395,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
version = "0.8.5"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
[[package]]
name = "ring"
@ -2475,7 +2470,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -2524,9 +2519,9 @@ dependencies = [
[[package]]
name = "rustversion"
version = "1.0.21"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "rustyline-async"
@ -2595,9 +2590,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.142"
version = "1.0.143"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
dependencies = [
"itoa",
"memchr",
@ -2755,12 +2750,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
[[package]]
name = "slab"
version = "0.4.9"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
dependencies = [
"autocfg",
]
checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
[[package]]
name = "smallvec"
@ -2818,9 +2810,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
version = "2.0.104"
version = "2.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
dependencies = [
"proc-macro2",
"quote",
@ -2858,14 +2850,14 @@ checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
[[package]]
name = "tempfile"
version = "3.21.0"
version = "3.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
dependencies = [
"fastrand",
"once_cell",
"rustix",
"windows-sys 0.59.0",
"windows-sys 0.60.2",
]
[[package]]
@ -2924,12 +2916,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.3.41"
version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
dependencies = [
"deranged",
"itoa",
"libc",
"num-conv",
"num_threads",
@ -2941,15 +2932,15 @@ dependencies = [
[[package]]
name = "time-core"
version = "0.1.4"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
[[package]]
name = "time-macros"
version = "0.2.22"
version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
dependencies = [
"num-conv",
"time-core",
@ -3253,9 +3244,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "ureq"
version = "3.1.0"
version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00432f493971db5d8e47a65aeb3b02f8226b9b11f1450ff86bb772776ebadd70"
checksum = "99ba1025f18a4a3fc3e9b48c868e9beb4f24f4b4b1a325bada26bd4119f46537"
dependencies = [
"base64 0.22.1",
"cookie_store",
@ -3274,9 +3265,9 @@ dependencies = [
[[package]]
name = "ureq-proto"
version = "0.5.0"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5b6cabebbecc4c45189ab06b52f956206cea7d8c8a20851c35a85cb169224cc"
checksum = "60b4531c118335662134346048ddb0e54cc86bd7e81866757873055f0e38f5d2"
dependencies = [
"base64 0.22.1",
"http",
@ -3365,11 +3356,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
name = "wasi"
version = "0.14.2+wasi-0.2.4"
version = "0.14.3+wasi-0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95"
dependencies = [
"wit-bindgen-rt",
"wit-bindgen",
]
[[package]]
@ -3488,6 +3479,15 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-sys"
version = "0.60.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
dependencies = [
"windows-targets 0.53.2",
]
[[package]]
name = "windows-targets"
version = "0.52.6"
@ -3623,13 +3623,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
[[package]]
name = "wit-bindgen-rt"
version = "0.39.0"
name = "wit-bindgen"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [
"bitflags",
]
checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814"
[[package]]
name = "writeable"

2
Cargo.toml
View File

@ -57,5 +57,5 @@ serde_json = "1.0"
async-trait = "0.1"
tempfile = { version = "3.21.0", default-features = false }
tempfile = { version = "3.23.0", default-features = false }
proc-macro-error2 = "2"

2
pumpkin-data/Cargo.toml
View File

@ -10,7 +10,7 @@ pumpkin-util = { path = "../pumpkin-util" }
pumpkin-nbt = { path = "../pumpkin-nbt" }
serde.workspace = true
crc-fast = "1.4.0"
crc-fast = "1.5.0"
[build-dependencies]
pumpkin-util = { path = "../pumpkin-util" }

2
pumpkin-data/build/loot.rs
View File

@ -6,7 +6,7 @@ use quote::{ToTokens, quote};
use serde::Deserialize;
use syn::LitStr;
/// These are required to be defined twice because serde can't deseralize into static context for obvious reasons.
/// These are required to be defined twice because serde can't deserialize into static context for obvious reasons.
#[derive(Deserialize, Clone, Debug)]
pub struct LootTableStruct {
r#type: LootTableTypeStruct,

4
pumpkin-protocol/Cargo.toml
View File

@ -27,10 +27,10 @@ aes = "0.8"
cfb8 = "0.8"
# compression
async-compression = { version = "0.4.29", features = ["tokio", "zlib"] }
async-compression = { version = "0.4.32", features = ["tokio", "zlib"] }
take_mut = "0.2.2"
bitflags = "2.9.3"
bitflags = "2.9.4"
[dev-dependencies]
# Validate correctness

4
pumpkin-world/Cargo.toml
View File

@ -26,7 +26,7 @@ crossbeam.workspace = true
num-derive = "0.4"
sha2 = "0.10"
bitflags = "2.9.3"
bitflags = "2.9.4"
dashmap = "6.1"
@ -42,7 +42,7 @@ enum_dispatch = "0.3"
derive-getters = "0.5.0"
thread_local = "1.1.9"
lru = "0.16.0"
lru = "0.16.1"
tokio-util = { version = "0.7.16", features = ["rt"] }
rand = "0.9.2"

4
pumpkin-world/src/biome/multi_noise.rs
View File

@ -58,7 +58,7 @@ mod test {
let seed = 0;
let chunk_pos = Vector2::new(0, 0);
let random_config = GlobalRandomConfig::new(seed, false);
let noise_rounter =
let noise_router =
ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
let surface_config = GENERATION_SETTINGS
@ -67,7 +67,7 @@ mod test {
let terrain_cache = TerrainCache::from_random(&random_config);
let mut chunk = ProtoChunk::new(
chunk_pos,
&noise_rounter,
&noise_router,
&random_config,
surface_config,
&terrain_cache,

10
pumpkin-world/src/block/entities/furnace.rs
View File

@ -96,11 +96,11 @@ impl FurnaceBlockEntity {
}
async fn craft_recipe(&self, recipe: Option<&CookingRecipe>) -> bool {
let can_accepet_output = self
let can_accept_output = self
.can_accept_recipe_output(recipe, self.get_max_count_per_stack())
.await;
if let Some(recipe) = recipe {
if can_accepet_output {
if can_accept_output {
let mut side_items = self.items[2].lock().await;
let output_item = match Item::from_registry_key(
recipe.result.id.strip_prefix("minecraft:").unwrap(),
@ -171,13 +171,13 @@ impl BlockEntity for FurnaceBlockEntity {
let furnace_recipe = Self::get_furnace_cooking_recipe(top_items.item);
drop(top_items);
let can_accepet_output = self
let can_accept_output = self
.can_accept_recipe_output(furnace_recipe, self.get_max_count_per_stack())
.await;
let bottom_items_is_empty = self.items[1].lock().await.is_empty();
if self.is_burning() || !bottom_items_is_empty && !is_top_items_empty {
if !self.is_burning() && can_accepet_output {
if !self.is_burning() && can_accept_output {
let mut bottom_items = self.items[1].lock().await;
let fuel_ticks = get_item_burn_ticks(bottom_items.item.id).unwrap_or(0);
@ -199,7 +199,7 @@ impl BlockEntity for FurnaceBlockEntity {
}
}
if self.is_burning() && can_accepet_output {
if self.is_burning() && can_accept_output {
self.cooking_time_spent.fetch_add(1, Ordering::Relaxed);
if self.cooking_time_spent.load(Ordering::Relaxed)

8
pumpkin-world/src/generation/noise/router/multi_noise_sampler.rs
View File

@ -240,11 +240,11 @@ mod test {
fn test_sample() {
let seed = 123;
let random_config = GlobalRandomConfig::new(seed, false);
let noise_rounter =
let noise_router =
ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
let multi_noise_config = MultiNoiseSamplerBuilderOptions::new(1, 1, 1);
let mut sampler =
MultiNoiseSampler::generate(&noise_rounter.multi_noise, &multi_noise_config);
MultiNoiseSampler::generate(&noise_router.multi_noise, &multi_noise_config);
let expected = NoiseValuePoint {
temperature: -5727,
humidity: 55,
@ -261,11 +261,11 @@ mod test {
// we use a different seed
let seed = 13579;
let random_config = GlobalRandomConfig::new(seed, false);
let noise_rounter =
let noise_router =
ProtoNoiseRouters::generate(&OVERWORLD_BASE_NOISE_ROUTER, &random_config);
let multi_noise_config = MultiNoiseSamplerBuilderOptions::new(1, 1, 1);
let mut sampler =
MultiNoiseSampler::generate(&noise_rounter.multi_noise, &multi_noise_config);
MultiNoiseSampler::generate(&noise_router.multi_noise, &multi_noise_config);
let expected = NoiseValuePoint {
temperature: 7489,
humidity: 3502,

2
pumpkin/Cargo.toml
View File

@ -54,7 +54,7 @@ rsa = { version = "=0.10.0-rc.5", features = ["sha1"] }
rsa-der = "0.3"
# authentication
ureq = { version = "3.1.0", features = [
ureq = { version = "3.1.2", features = [
"json",
] }

0
pumpkin/src/block/blocks/abstruct_wall_mounting.rs → pumpkin/src/block/blocks/abstract_wall_mounting.rs
View File

2
pumpkin/src/block/blocks/grindstone.rs
View File

@ -11,7 +11,7 @@ use crate::block::BlockBehaviour;
use crate::block::CanPlaceAtArgs;
use crate::block::{GetStateForNeighborUpdateArgs, OnPlaceArgs};
use super::abstruct_wall_mounting::WallMountedBlock;
use super::abstract_wall_mounting::WallMountedBlock;
#[pumpkin_block("minecraft:grindstone")]
pub struct GrindstoneBlock;

4
pumpkin/src/block/blocks/mod.rs
View File

@ -64,6 +64,6 @@ pub mod smoker;
pub mod ender_chest;
// abstruct
pub mod abstruct_wall_mounting;
// abstract
pub mod abstract_wall_mounting;
pub mod lectern;

0
pumpkin/src/block/blocks/redstone/abstruct_redstone_gate.rs → pumpkin/src/block/blocks/redstone/abstract_redstone_gate.rs
View File

2
pumpkin/src/block/blocks/redstone/buttons.rs
View File

@ -23,7 +23,7 @@ use crate::block::GetStateForNeighborUpdateArgs;
use crate::block::OnPlaceArgs;
use crate::block::OnScheduledTickArgs;
use crate::block::OnStateReplacedArgs;
use crate::block::blocks::abstruct_wall_mounting::WallMountedBlock;
use crate::block::blocks::abstract_wall_mounting::WallMountedBlock;
use crate::block::blocks::redstone::lever::LeverLikePropertiesExt;
use crate::block::registry::BlockActionResult;
use crate::block::{BlockBehaviour, NormalUseArgs};

4
pumpkin/src/block/blocks/redstone/comparator.rs
View File

@ -28,7 +28,7 @@ use crate::{
world::World,
};
use super::abstruct_redstone_gate::{self, RedstoneGateBlock, RedstoneGateBlockProperties};
use super::abstract_redstone_gate::{self, RedstoneGateBlock, RedstoneGateBlockProperties};
#[pumpkin_block("minecraft:comparator")]
pub struct ComparatorBlock;
@ -209,7 +209,7 @@ impl RedstoneGateBlock<ComparatorLikeProperties> for ComparatorBlock {
state: &BlockState,
block: &Block,
) -> u8 {
let redstone_level = abstruct_redstone_gate::get_power::<ComparatorLikeProperties>(
let redstone_level = abstract_redstone_gate::get_power::<ComparatorLikeProperties>(
world, pos, state.id, block,
)
.await;

2
pumpkin/src/block/blocks/redstone/lever.rs
View File

@ -1,7 +1,7 @@
use std::sync::Arc;
use crate::block::{
blocks::abstruct_wall_mounting::WallMountedBlock,
blocks::abstract_wall_mounting::WallMountedBlock,
{
CanPlaceAtArgs, EmitsRedstonePowerArgs, GetRedstonePowerArgs,
GetStateForNeighborUpdateArgs, OnPlaceArgs, OnStateReplacedArgs,

4
pumpkin/src/block/blocks/redstone/mod.rs
View File

@ -27,8 +27,8 @@ pub mod tripwire;
pub mod tripwire_hook;
pub mod turbo;
// abstruct
pub mod abstruct_redstone_gate;
// abstract
pub mod abstract_redstone_gate;
pub mod dispenser;
pub async fn update_wire_neighbors(world: &Arc<World>, pos: &BlockPos) {

2
pumpkin/src/block/blocks/redstone/repeater.rs
View File

@ -22,7 +22,7 @@ use crate::{
world::World,
};
use super::abstruct_redstone_gate::{RedstoneGateBlock, RedstoneGateBlockProperties};
use super::abstract_redstone_gate::{RedstoneGateBlock, RedstoneGateBlockProperties};
type RepeaterProperties = pumpkin_data::block_properties::RepeaterLikeProperties;

4
pumpkin/src/block/blocks/redstone/turbo.rs
View File

@ -217,7 +217,7 @@ impl RedstoneWireTurbo {
self.orient_neighbors(&neighbor_nodes, upd1, heading);
}
const REORDING: [[usize; 24]; 4] = [
const REORDERING: [[usize; 24]; 4] = [
[
2, 3, 16, 19, 0, 4, 1, 5, 7, 8, 17, 20, 12, 13, 18, 21, 6, 9, 22, 14, 11, 10, 23, 15,
],
@ -235,7 +235,7 @@ impl RedstoneWireTurbo {
fn orient_neighbors(&mut self, src: &[NodeId], dst_id: NodeId, heading: usize) {
let dst = &mut self.nodes[dst_id.index];
let mut neighbors = Vec::with_capacity(24);
let re = Self::REORDING[heading];
let re = Self::REORDERING[heading];
for i in &re {
neighbors.push(src[*i]);
}

2
pumpkin/src/net/java/play.rs
View File

@ -1623,7 +1623,7 @@ impl JavaClient {
}
}
if let Some(equippable) = held.get_data_component::<EquippableImpl>() {
// If it can be equipped we want to makr sure we can actually equip it
// If it can be equipped we want to make sure we can actually equip it
player
.enqueue_equipment_change(equippable.slot, &held)
.await;