diff --git a/crates/pumpkin-util/src/lib.rs b/crates/pumpkin-util/src/lib.rs index f544e8aeb..a73fbdaf4 100644 --- a/crates/pumpkin-util/src/lib.rs +++ b/crates/pumpkin-util/src/lib.rs @@ -57,6 +57,8 @@ macro_rules! global_path { ($path:expr) => {{ use std::path::Path; Path::new(env!("CARGO_MANIFEST_DIR")) + .parent() + .unwrap() .parent() .unwrap() .join(file!()) diff --git a/crates/pumpkin-world/src/biome/mod.rs b/crates/pumpkin-world/src/biome/mod.rs index 44bfc94b2..34167f55b 100644 --- a/crates/pumpkin-world/src/biome/mod.rs +++ b/crates/pumpkin-world/src/biome/mod.rs @@ -91,7 +91,7 @@ mod test { } let expected_data: Vec = - read_data_from_file!("../../../assets/tests/biome_no_blend_no_beard_0.json"); + read_data_from_file!("../../../../assets/tests/biome_no_blend_no_beard_0.json"); let seed = 0; let world_gen = WorldGenerator::Noise(Box::new(VanillaGenerator::new( diff --git a/crates/pumpkin-world/src/biome/multi_noise.rs b/crates/pumpkin-world/src/biome/multi_noise.rs index 4fea01008..bb1b7bc01 100644 --- a/crates/pumpkin-world/src/biome/multi_noise.rs +++ b/crates/pumpkin-world/src/biome/multi_noise.rs @@ -46,8 +46,9 @@ mod test { use crate::generation::{biome_coords, positions::chunk_pos}; use pumpkin_util::world_seed::Seed; type PosToPoint = (i32, i32, i32, i64, i64, i64, i64, i64, i64); - let expected_data: Vec = - read_data_from_file!("../../../assets/multi_noise_sample_no_blend_no_beard_0_0_0.json"); + let expected_data: Vec = read_data_from_file!( + "../../../../assets/multi_noise_sample_no_blend_no_beard_0_0_0.json" + ); let seed = 0; let chunk_x = 0; diff --git a/crates/pumpkin-world/src/chunk/format/anvil.rs b/crates/pumpkin-world/src/chunk/format/anvil.rs index 69d379d69..7b05e63f4 100644 --- a/crates/pumpkin-world/src/chunk/format/anvil.rs +++ b/crates/pumpkin-world/src/chunk/format/anvil.rs @@ -1292,6 +1292,8 @@ mod tests { fs::create_dir(&level_folder.region_folder).unwrap(); fs::copy( Path::new(env!("CARGO_MANIFEST_DIR")) + .parent() + .unwrap() .parent() .unwrap() .join(file!()) diff --git a/crates/pumpkin-world/src/generation/biome.rs b/crates/pumpkin-world/src/generation/biome.rs index f708479a6..e795ca629 100644 --- a/crates/pumpkin-world/src/generation/biome.rs +++ b/crates/pumpkin-world/src/generation/biome.rs @@ -192,7 +192,7 @@ mod test { #[test] fn chunk_wide_blend() { let data: Vec<(i32, i32, i32, i32, i32, i32)> = - read_data_from_file!("../../../assets/tests/biome_mixer.json"); + read_data_from_file!("../../../../assets/tests/biome_mixer.json"); let seed = hash_seed((-777i64) as u64); for (i, (x, y, z, result_x, result_y, result_z)) in data.into_iter().enumerate() { diff --git a/crates/pumpkin-world/src/generation/proto_chunk_test.rs b/crates/pumpkin-world/src/generation/proto_chunk_test.rs index 4ce718d24..e45ffc338 100644 --- a/crates/pumpkin-world/src/generation/proto_chunk_test.rs +++ b/crates/pumpkin-world/src/generation/proto_chunk_test.rs @@ -212,7 +212,7 @@ mod test { #[test] fn no_blend_no_beard_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_0_0.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_0_0.chunk" ); verify_chunk_noise( 0, @@ -227,7 +227,7 @@ mod test { #[test] fn no_blend_no_beard_7_4() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_7_4.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_7_4.chunk" ); verify_chunk_noise( 0, @@ -242,7 +242,7 @@ mod test { #[test] fn no_blend_no_beard_only_cell_cache_interpolated_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_only_cell_cache_interpolated_0_0.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_only_cell_cache_interpolated_0_0.chunk" ); verify_chunk_noise( 0, @@ -257,7 +257,7 @@ mod test { #[test] fn no_blend_no_beard_badlands_minus595_544() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_-595_544.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_-595_544.chunk" ); verify_chunk_noise( 0, @@ -272,7 +272,7 @@ mod test { #[test] fn no_blend_no_beard_frozen_ocean_minus119_183() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_-119_183.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_-119_183.chunk" ); verify_chunk_noise( 0, @@ -287,7 +287,7 @@ mod test { #[test] fn no_blend_no_beard_13579_minus6_11() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_13579_-6_11.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_13579_-6_11.chunk" ); verify_chunk_noise( 13579, @@ -302,7 +302,7 @@ mod test { #[test] fn no_blend_no_beard_13579_minus2_15() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_13579_-2_15.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_13579_-2_15.chunk" ); verify_chunk_noise( 13579, @@ -317,7 +317,7 @@ mod test { #[test] fn no_blend_no_beard_13579_minus7_9() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_no_blend_no_beard_13579_-7_9.chunk" + "../../../../assets/tests/noise_no_blend_no_beard_13579_-7_9.chunk" ); verify_chunk_noise( 13579, @@ -332,7 +332,7 @@ mod test { #[test] fn nether_noise_no_blend_no_beard_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_nether_no_blend_no_beard_0_0.chunk" + "../../../../assets/tests/noise_nether_no_blend_no_beard_0_0.chunk" ); verify_chunk_noise( 0, @@ -347,7 +347,7 @@ mod test { #[test] fn nether_noise_no_blend_no_beard_7_4() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_nether_no_blend_no_beard_7_4.chunk" + "../../../../assets/tests/noise_nether_no_blend_no_beard_7_4.chunk" ); verify_chunk_noise( 0, @@ -362,7 +362,7 @@ mod test { #[test] fn end_noise_no_blend_no_beard_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_end_no_blend_no_beard_0_0.chunk" + "../../../../assets/tests/noise_end_no_blend_no_beard_0_0.chunk" ); verify_chunk_noise( 0, @@ -377,7 +377,7 @@ mod test { #[test] fn end_noise_no_blend_no_beard_7_4() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/noise_end_no_blend_no_beard_7_4.chunk" + "../../../../assets/tests/noise_end_no_blend_no_beard_7_4.chunk" ); verify_chunk_noise( 0, @@ -392,7 +392,7 @@ mod test { #[test] fn no_blend_no_beard_surface_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/no_blend_no_beard_surface_0_0.chunk" + "../../../../assets/tests/no_blend_no_beard_surface_0_0.chunk" ); verify_chunk_surface( 0, @@ -407,7 +407,7 @@ mod test { #[test] fn no_blend_no_beard_surface_badlands_minus595_544() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/no_blend_no_beard_surface_badlands_-595_544.chunk" + "../../../../assets/tests/no_blend_no_beard_surface_badlands_-595_544.chunk" ); verify_chunk_surface( 0, @@ -422,7 +422,7 @@ mod test { #[test] fn no_blend_no_beard_surface_frozen_ocean_minus119_183() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/no_blend_no_beard_surface_frozen_ocean_-119_183.chunk" + "../../../../assets/tests/no_blend_no_beard_surface_frozen_ocean_-119_183.chunk" ); verify_chunk_surface( 0, @@ -437,7 +437,7 @@ mod test { #[test] fn nether_surface_no_blend_no_beard_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/nether_surface_no_blend_no_beard_0_0.chunk" + "../../../../assets/tests/nether_surface_no_blend_no_beard_0_0.chunk" ); verify_chunk_surface( 0, @@ -452,7 +452,7 @@ mod test { #[test] fn nether_surface_no_blend_no_beard_7_4() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/nether_surface_no_blend_no_beard_7_4.chunk" + "../../../../assets/tests/nether_surface_no_blend_no_beard_7_4.chunk" ); verify_chunk_surface( 0, @@ -467,7 +467,7 @@ mod test { #[test] fn end_surface_no_blend_no_beard_0_0() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/end_surface_no_blend_no_beard_0_0.chunk" + "../../../../assets/tests/end_surface_no_blend_no_beard_0_0.chunk" ); verify_chunk_surface( 0, @@ -482,7 +482,7 @@ mod test { #[test] fn end_surface_no_blend_no_beard_7_4() { let expected: Vec = pumpkin_util::read_data_from_file!( - "../../../assets/tests/end_surface_no_blend_no_beard_7_4.chunk" + "../../../../assets/tests/end_surface_no_blend_no_beard_7_4.chunk" ); verify_chunk_surface( 0, diff --git a/crates/pumpkin-world/src/lib.rs b/crates/pumpkin-world/src/lib.rs index ff3f294f9..fa24fc60f 100644 --- a/crates/pumpkin-world/src/lib.rs +++ b/crates/pumpkin-world/src/lib.rs @@ -30,6 +30,8 @@ macro_rules! global_path { ($path:expr) => {{ use std::path::Path; Path::new(env!("CARGO_MANIFEST_DIR")) + .parent() + .unwrap() .parent() .unwrap() .join(file!())