mirror of
https://github.com/Pumpkin-MC/Pumpkin.git
synced 2026-08-30 20:14:23 +00:00
feat: desert pyramid (#1815)
* pyramid * cleanup wrapper functions * replace old add_pending_block_entity --------- Signed-off-by: ChocoDev <100467857+chocodev11@users.noreply.github.com> Co-authored-by: chocodev11 <chocodev11@users.noreply.github.com>
This commit is contained in:
ChocoDev
@@ -209,19 +209,17 @@ impl GenerationCache for Cache {
|
||||
fn add_block_entity(&mut self, pos: &Vector3<i32>, nbt: NbtCompound) {
|
||||
let dx = (pos.x >> 4) - self.x;
|
||||
let dz = (pos.z >> 4) - self.z;
|
||||
// debug_assert!(dx < self.size && dz < self.size);
|
||||
// debug_assert!(dx >= 0 && dz >= 0);
|
||||
if !(dx < self.size && dz < self.size && dx >= 0 && dz >= 0) {
|
||||
// breakpoint here
|
||||
debug!(
|
||||
"illegal set_block_state {pos:?} cache pos ({}, {}) size {}",
|
||||
"illegal add_block_entity {pos:?} cache pos ({}, {}) size {}",
|
||||
self.x, self.z, self.size
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
match &mut self.chunks[(dx * self.size + dz) as usize] {
|
||||
Chunk::Level(_data) => {
|
||||
todo!()
|
||||
Chunk::Level(_) => {
|
||||
debug!("add_block_entity on non-proto chunk at {pos:?}");
|
||||
}
|
||||
Chunk::Proto(data) => {
|
||||
data.add_block_entity(nbt);
|
||||
|
||||
@@ -9,7 +9,8 @@ use crate::{
|
||||
biome_coords,
|
||||
structure::structures::{
|
||||
StructureGenerator, StructureGeneratorContext, StructurePosition,
|
||||
buried_treasure::BuriedTreasureGenerator, create_chunk_random, igloo::IglooGenerator,
|
||||
buried_treasure::BuriedTreasureGenerator, create_chunk_random,
|
||||
desert_pyramid::DesertPyramidGenerator, igloo::IglooGenerator,
|
||||
nether_fortress::NetherFortressGenerator, nether_fossil::NetherFossilGenerator,
|
||||
stronghold::StrongholdGenerator, swamp_hut::SwampHutGenerator,
|
||||
},
|
||||
@@ -56,6 +57,7 @@ pub fn try_generate_structure(
|
||||
NetherFossilGenerator::get_structure_position(&NetherFossilGenerator, context)
|
||||
}
|
||||
StructureKeys::Igloo => IglooGenerator::get_structure_position(&IglooGenerator, context),
|
||||
StructureKeys::DesertPyramid => DesertPyramidGenerator.get_structure_position(context),
|
||||
// TODO: Implement other structure types
|
||||
_ => None,
|
||||
};
|
||||
|
||||
@@ -0,0 +1,796 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use pumpkin_data::{
|
||||
Block, BlockState,
|
||||
block_properties::{BlockProperties, HorizontalFacing, OakStairsLikeProperties},
|
||||
};
|
||||
use pumpkin_nbt::compound::NbtCompound;
|
||||
use pumpkin_util::{
|
||||
BlockDirection, HeightMap,
|
||||
math::{block_box::BlockBox, position::BlockPos},
|
||||
random::{RandomDeriverImpl, RandomGenerator, RandomImpl},
|
||||
};
|
||||
|
||||
use crate::{
|
||||
ProtoChunk,
|
||||
generation::{
|
||||
positions::chunk_pos::{start_block_x, start_block_z},
|
||||
structure::{
|
||||
piece::StructurePieceType,
|
||||
structures::{
|
||||
StructureGenerator, StructureGeneratorContext, StructurePiece, StructurePieceBase,
|
||||
StructurePiecesCollector, StructurePosition,
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
const WIDTH: i32 = 21;
|
||||
const HEIGHT: i32 = 15;
|
||||
const DEPTH: i32 = 21;
|
||||
|
||||
pub struct DesertPyramidGenerator;
|
||||
|
||||
impl StructureGenerator for DesertPyramidGenerator {
|
||||
fn get_structure_position(
|
||||
&self,
|
||||
mut context: StructureGeneratorContext,
|
||||
) -> Option<StructurePosition> {
|
||||
let x = start_block_x(context.chunk_x);
|
||||
let z = start_block_z(context.chunk_z);
|
||||
|
||||
let facing = BlockDirection::get_random_horizontal_direction(&mut context.random);
|
||||
|
||||
let mut piece = StructurePiece::new(
|
||||
StructurePieceType::DesertTemple,
|
||||
BlockBox::create_box(x, 64, z, facing.get_axis(), WIDTH, HEIGHT, DEPTH),
|
||||
0,
|
||||
);
|
||||
piece.set_facing(Some(facing));
|
||||
|
||||
let mut collector = StructurePiecesCollector::default();
|
||||
collector.add_piece(Box::new(DesertPyramidPiece {
|
||||
piece,
|
||||
height_adjusted: false,
|
||||
has_placed_chest: [false; 4],
|
||||
}));
|
||||
|
||||
Some(StructurePosition {
|
||||
start_pos: BlockPos::new(x + (WIDTH / 2), 64, z + (DEPTH / 2)),
|
||||
collector: Arc::new(collector.into()),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct DesertPyramidPiece {
|
||||
piece: StructurePiece,
|
||||
height_adjusted: bool,
|
||||
has_placed_chest: [bool; 4],
|
||||
}
|
||||
|
||||
impl DesertPyramidPiece {
|
||||
fn sandstone_stairs(facing: HorizontalFacing) -> &'static BlockState {
|
||||
let mut props = OakStairsLikeProperties::default(&Block::SANDSTONE_STAIRS);
|
||||
props.facing = facing;
|
||||
BlockState::from_id(props.to_state_id(&Block::SANDSTONE_STAIRS))
|
||||
}
|
||||
|
||||
fn adjust_height(&mut self, chunk: &ProtoChunk, random: &mut RandomGenerator) -> bool {
|
||||
if self.height_adjusted {
|
||||
return true;
|
||||
}
|
||||
|
||||
let ground_offset = -(random.next_bounded_i32(3));
|
||||
let bb = self.piece.bounding_box;
|
||||
let mut lowest = i32::MAX;
|
||||
|
||||
for z in bb.min.z..=bb.max.z {
|
||||
for x in bb.min.x..=bb.max.x {
|
||||
let y = chunk.get_top_y(&HeightMap::MotionBlockingNoLeaves, x, z);
|
||||
lowest = lowest.min(y);
|
||||
}
|
||||
}
|
||||
|
||||
if lowest == i32::MAX {
|
||||
return false;
|
||||
}
|
||||
|
||||
let shift_y = lowest - self.piece.bounding_box.min.y + ground_offset;
|
||||
self.piece.bounding_box.move_pos(0, shift_y, 0);
|
||||
self.height_adjusted = true;
|
||||
true
|
||||
}
|
||||
|
||||
fn place_sand(&self, chunk: &mut ProtoChunk, bb: &BlockBox, x: i32, y: i32, z: i32) {
|
||||
self.piece
|
||||
.add_block(chunk, Block::SAND.default_state, x, y, z, bb);
|
||||
}
|
||||
|
||||
#[expect(clippy::too_many_arguments)]
|
||||
fn place_sand_box(
|
||||
&self,
|
||||
chunk: &mut ProtoChunk,
|
||||
bb: &BlockBox,
|
||||
x0: i32,
|
||||
y0: i32,
|
||||
z0: i32,
|
||||
x1: i32,
|
||||
y1: i32,
|
||||
z1: i32,
|
||||
) {
|
||||
for y in y0..=y1 {
|
||||
for x in x0..=x1 {
|
||||
for z in z0..=z1 {
|
||||
self.place_sand(chunk, bb, x, y, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn place_collapsed_roof_piece(
|
||||
&self,
|
||||
chunk: &mut ProtoChunk,
|
||||
bb: &BlockBox,
|
||||
random: &mut RandomGenerator,
|
||||
x: i32,
|
||||
y: i32,
|
||||
z: i32,
|
||||
) {
|
||||
let state = if random.next_f32() < 0.33 {
|
||||
Block::SANDSTONE.default_state
|
||||
} else {
|
||||
Block::SAND.default_state
|
||||
};
|
||||
|
||||
self.piece.add_block(chunk, state, x, y, z, bb);
|
||||
}
|
||||
|
||||
#[expect(clippy::too_many_arguments)]
|
||||
fn place_collapsed_roof(
|
||||
&self,
|
||||
chunk: &mut ProtoChunk,
|
||||
bb: &BlockBox,
|
||||
random: &mut RandomGenerator,
|
||||
x0: i32,
|
||||
y0: i32,
|
||||
z0: i32,
|
||||
x1: i32,
|
||||
z1: i32,
|
||||
) {
|
||||
for x in x0..=x1 {
|
||||
for z in z0..=z1 {
|
||||
self.place_collapsed_roof_piece(chunk, bb, random, x, y0, z);
|
||||
}
|
||||
}
|
||||
// TODO: Pick a random collapsed roof position for sus sand placement in
|
||||
// the structure-level afterPlace pass when brushable support exists.
|
||||
}
|
||||
|
||||
fn try_place_chest(
|
||||
&mut self,
|
||||
chunk: &mut ProtoChunk,
|
||||
bb: &BlockBox,
|
||||
index: usize,
|
||||
x: i32,
|
||||
y: i32,
|
||||
z: i32,
|
||||
) {
|
||||
if self.has_placed_chest[index] {
|
||||
return;
|
||||
}
|
||||
|
||||
let world_pos = self.piece.offset_pos(x, y, z);
|
||||
if !bb.contains_pos(&world_pos) {
|
||||
return;
|
||||
}
|
||||
|
||||
self.piece
|
||||
.add_block(chunk, Block::CHEST.default_state, x, y, z, bb);
|
||||
|
||||
let mut nbt = NbtCompound::new();
|
||||
nbt.put_int("x", world_pos.x);
|
||||
nbt.put_int("y", world_pos.y);
|
||||
nbt.put_int("z", world_pos.z);
|
||||
nbt.put_string("id", "minecraft:chest".to_string());
|
||||
// TODO: attach desert_pyramid loot table once structure container loot exists.
|
||||
chunk.add_block_entity(nbt);
|
||||
self.has_placed_chest[index] = true;
|
||||
}
|
||||
|
||||
fn add_cellar(&self, chunk: &mut ProtoChunk, bb: &BlockBox, random: &mut RandomGenerator) {
|
||||
self.add_cellar_stairs(chunk, bb, random);
|
||||
self.add_cellar_room(chunk, bb, random);
|
||||
}
|
||||
|
||||
fn add_cellar_stairs(
|
||||
&self,
|
||||
chunk: &mut ProtoChunk,
|
||||
bb: &BlockBox,
|
||||
random: &mut RandomGenerator,
|
||||
) {
|
||||
let west_stairs = Self::sandstone_stairs(HorizontalFacing::West);
|
||||
self.piece.add_block(chunk, west_stairs, 13, -1, 17, bb);
|
||||
self.piece.add_block(chunk, west_stairs, 14, -2, 17, bb);
|
||||
self.piece.add_block(chunk, west_stairs, 15, -3, 17, bb);
|
||||
|
||||
let sand = Block::SAND.default_state;
|
||||
let sandstone = Block::SANDSTONE.default_state;
|
||||
let (x, y, z) = (16, -4, 13);
|
||||
let variant = random.next_bool();
|
||||
|
||||
self.piece.add_block(chunk, sand, x - 4, y + 4, z + 4, bb);
|
||||
self.piece.add_block(chunk, sand, x - 3, y + 4, z + 4, bb);
|
||||
self.piece.add_block(chunk, sand, x - 2, y + 4, z + 4, bb);
|
||||
self.piece.add_block(chunk, sand, x - 1, y + 4, z + 4, bb);
|
||||
self.piece.add_block(chunk, sand, x, y + 4, z + 4, bb);
|
||||
self.piece.add_block(chunk, sand, x - 2, y + 3, z + 4, bb);
|
||||
self.piece.add_block(
|
||||
chunk,
|
||||
if variant { sand } else { sandstone },
|
||||
x - 1,
|
||||
y + 3,
|
||||
z + 4,
|
||||
bb,
|
||||
);
|
||||
self.piece.add_block(
|
||||
chunk,
|
||||
if variant { sandstone } else { sand },
|
||||
x,
|
||||
y + 3,
|
||||
z + 4,
|
||||
bb,
|
||||
);
|
||||
self.piece.add_block(chunk, sand, x - 1, y + 2, z + 4, bb);
|
||||
self.piece.add_block(chunk, sandstone, x, y + 2, z + 4, bb);
|
||||
self.piece.add_block(chunk, sand, x, y + 1, z + 4, bb);
|
||||
}
|
||||
|
||||
fn add_cellar_room(&self, chunk: &mut ProtoChunk, bb: &BlockBox, random: &mut RandomGenerator) {
|
||||
let (x, y, z) = (16, -4, 13);
|
||||
let cut = Block::CUT_SANDSTONE.default_state;
|
||||
let chiseled = Block::CHISELED_SANDSTONE.default_state;
|
||||
let orange = Block::ORANGE_TERRACOTTA.default_state;
|
||||
let blue = Block::BLUE_TERRACOTTA.default_state;
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
y + 1,
|
||||
z - 3,
|
||||
x - 3,
|
||||
y + 1,
|
||||
z + 2,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x + 3,
|
||||
y + 1,
|
||||
z - 3,
|
||||
x + 3,
|
||||
y + 1,
|
||||
z + 2,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
y + 1,
|
||||
z - 3,
|
||||
x + 3,
|
||||
y + 1,
|
||||
z - 2,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
y + 1,
|
||||
z + 3,
|
||||
x + 3,
|
||||
y + 1,
|
||||
z + 3,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
y + 2,
|
||||
z - 3,
|
||||
x - 3,
|
||||
y + 2,
|
||||
z + 2,
|
||||
chiseled,
|
||||
chiseled,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x + 3,
|
||||
y + 2,
|
||||
z - 3,
|
||||
x + 3,
|
||||
y + 2,
|
||||
z + 2,
|
||||
chiseled,
|
||||
chiseled,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
y + 2,
|
||||
z - 3,
|
||||
x + 3,
|
||||
y + 2,
|
||||
z - 2,
|
||||
chiseled,
|
||||
chiseled,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
y + 2,
|
||||
z + 3,
|
||||
x + 3,
|
||||
y + 2,
|
||||
z + 3,
|
||||
chiseled,
|
||||
chiseled,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
-1,
|
||||
z - 3,
|
||||
x - 3,
|
||||
-1,
|
||||
z + 2,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x + 3,
|
||||
-1,
|
||||
z - 3,
|
||||
x + 3,
|
||||
-1,
|
||||
z + 2,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
-1,
|
||||
z - 3,
|
||||
x + 3,
|
||||
-1,
|
||||
z - 2,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
true,
|
||||
x - 3,
|
||||
-1,
|
||||
z + 3,
|
||||
x + 3,
|
||||
-1,
|
||||
z + 3,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
|
||||
self.place_sand_box(chunk, bb, x - 2, y + 1, z - 2, x + 2, y + 3, z + 2);
|
||||
self.place_collapsed_roof(chunk, bb, random, x - 2, y + 4, z - 2, x + 2, z + 2);
|
||||
self.piece.add_block(chunk, blue, x, y, z, bb);
|
||||
self.piece.add_block(chunk, orange, x + 1, y, z - 1, bb);
|
||||
self.piece.add_block(chunk, orange, x + 1, y, z + 1, bb);
|
||||
self.piece.add_block(chunk, orange, x - 1, y, z - 1, bb);
|
||||
self.piece.add_block(chunk, orange, x - 1, y, z + 1, bb);
|
||||
self.piece.add_block(chunk, orange, x + 2, y, z, bb);
|
||||
self.piece.add_block(chunk, orange, x - 2, y, z, bb);
|
||||
self.piece.add_block(chunk, orange, x, y, z + 2, bb);
|
||||
self.piece.add_block(chunk, orange, x, y, z - 2, bb);
|
||||
|
||||
self.piece.add_block(chunk, orange, x + 3, y, z, bb);
|
||||
self.place_sand(chunk, bb, x + 3, y + 1, z);
|
||||
self.place_sand(chunk, bb, x + 3, y + 2, z);
|
||||
self.piece.add_block(chunk, cut, x + 4, y + 1, z, bb);
|
||||
self.piece.add_block(chunk, chiseled, x + 4, y + 2, z, bb);
|
||||
|
||||
self.piece.add_block(chunk, orange, x - 3, y, z, bb);
|
||||
self.place_sand(chunk, bb, x - 3, y + 1, z);
|
||||
self.place_sand(chunk, bb, x - 3, y + 2, z);
|
||||
self.piece.add_block(chunk, cut, x - 4, y + 1, z, bb);
|
||||
self.piece.add_block(chunk, chiseled, x - 4, y + 2, z, bb);
|
||||
|
||||
self.piece.add_block(chunk, orange, x, y, z + 3, bb);
|
||||
self.place_sand(chunk, bb, x, y + 1, z + 3);
|
||||
self.place_sand(chunk, bb, x, y + 2, z + 3);
|
||||
|
||||
self.piece.add_block(chunk, orange, x, y, z - 3, bb);
|
||||
self.place_sand(chunk, bb, x, y + 1, z - 3);
|
||||
self.place_sand(chunk, bb, x, y + 2, z - 3);
|
||||
self.piece.add_block(chunk, cut, x, y + 1, z - 4, bb);
|
||||
self.piece.add_block(chunk, chiseled, x, -2, z - 4, bb);
|
||||
}
|
||||
}
|
||||
|
||||
impl StructurePieceBase for DesertPyramidPiece {
|
||||
fn clone_box(&self) -> Box<dyn StructurePieceBase> {
|
||||
Box::new(self.clone())
|
||||
}
|
||||
|
||||
fn get_structure_piece(&self) -> &StructurePiece {
|
||||
&self.piece
|
||||
}
|
||||
|
||||
fn get_structure_piece_mut(&mut self) -> &mut StructurePiece {
|
||||
&mut self.piece
|
||||
}
|
||||
|
||||
#[expect(clippy::too_many_lines)]
|
||||
fn place(
|
||||
&mut self,
|
||||
chunk: &mut ProtoChunk,
|
||||
random: &mut RandomGenerator,
|
||||
seed: i64,
|
||||
chunk_box: &BlockBox,
|
||||
) {
|
||||
use pumpkin_util::random::xoroshiro128::Xoroshiro;
|
||||
|
||||
if !self.adjust_height(chunk, random) {
|
||||
return;
|
||||
}
|
||||
|
||||
let origin = self.piece.bounding_box.min;
|
||||
let mut level_random = RandomGenerator::Xoroshiro(Xoroshiro::from_seed(seed as u64));
|
||||
let splitter = level_random.next_splitter();
|
||||
let mut level_random = splitter.split_pos(origin.x, origin.y, origin.z);
|
||||
|
||||
let bb = chunk_box;
|
||||
let ss = Block::SANDSTONE.default_state;
|
||||
let air = Block::AIR.default_state;
|
||||
let cut = Block::CUT_SANDSTONE.default_state;
|
||||
let chiseled = Block::CHISELED_SANDSTONE.default_state;
|
||||
let orange = Block::ORANGE_TERRACOTTA.default_state;
|
||||
let blue = Block::BLUE_TERRACOTTA.default_state;
|
||||
let slab = Block::SANDSTONE_SLAB.default_state;
|
||||
|
||||
let north_stairs = Self::sandstone_stairs(HorizontalFacing::North);
|
||||
let south_stairs = Self::sandstone_stairs(HorizontalFacing::South);
|
||||
let east_stairs = Self::sandstone_stairs(HorizontalFacing::East);
|
||||
let west_stairs = Self::sandstone_stairs(HorizontalFacing::West);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 0, -4, 0, WIDTH - 1, 0, DEPTH - 1, ss, ss);
|
||||
|
||||
for pos in 1..=9 {
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
false,
|
||||
pos,
|
||||
pos,
|
||||
pos,
|
||||
WIDTH - 1 - pos,
|
||||
pos,
|
||||
DEPTH - 1 - pos,
|
||||
ss,
|
||||
ss,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
false,
|
||||
pos + 1,
|
||||
pos,
|
||||
pos + 1,
|
||||
WIDTH - 2 - pos,
|
||||
pos,
|
||||
DEPTH - 2 - pos,
|
||||
air,
|
||||
air,
|
||||
);
|
||||
}
|
||||
|
||||
for x in 0..WIDTH {
|
||||
for z in 0..DEPTH {
|
||||
self.piece.fill_downwards(chunk, ss, x, -5, z, bb);
|
||||
}
|
||||
}
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 0, 0, 0, 4, 9, 4, ss, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 1, 10, 1, 3, 10, 3, ss, ss);
|
||||
self.piece.add_block(chunk, north_stairs, 2, 10, 0, bb);
|
||||
self.piece.add_block(chunk, south_stairs, 2, 10, 4, bb);
|
||||
self.piece.add_block(chunk, east_stairs, 0, 10, 2, bb);
|
||||
self.piece.add_block(chunk, west_stairs, 4, 10, 2, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 5, 0, 0, WIDTH - 1, 9, 4, ss, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 4, 10, 1, WIDTH - 2, 10, 3, ss, ss);
|
||||
self.piece
|
||||
.add_block(chunk, north_stairs, WIDTH - 3, 10, 0, bb);
|
||||
self.piece
|
||||
.add_block(chunk, south_stairs, WIDTH - 3, 10, 4, bb);
|
||||
self.piece
|
||||
.add_block(chunk, east_stairs, WIDTH - 5, 10, 2, bb);
|
||||
self.piece
|
||||
.add_block(chunk, west_stairs, WIDTH - 1, 10, 2, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, 0, 0, 12, 4, 4, ss, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 9, 1, 0, 11, 3, 4, air, air);
|
||||
self.piece.add_block(chunk, cut, 9, 1, 1, bb);
|
||||
self.piece.add_block(chunk, cut, 9, 2, 1, bb);
|
||||
self.piece.add_block(chunk, cut, 9, 3, 1, bb);
|
||||
self.piece.add_block(chunk, cut, 10, 3, 1, bb);
|
||||
self.piece.add_block(chunk, cut, 11, 3, 1, bb);
|
||||
self.piece.add_block(chunk, cut, 11, 2, 1, bb);
|
||||
self.piece.add_block(chunk, cut, 11, 1, 1, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 4, 1, 1, 8, 3, 3, ss, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 4, 1, 2, 8, 2, 2, air, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 12, 1, 1, 16, 3, 3, ss, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 12, 1, 2, 16, 2, 2, air, air);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 5, 4, 5, WIDTH - 6, 4, DEPTH - 6, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 9, 4, 9, 11, 4, 11, air, air);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, 1, 8, 8, 3, 8, cut, cut);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 12, 1, 8, 12, 3, 8, cut, cut);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, 1, 12, 8, 3, 12, cut, cut);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 12, 1, 12, 12, 3, 12, cut, cut);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 1, 1, 5, 4, 4, 11, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 5, 1, 5, WIDTH - 2, 4, 11, ss, ss);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 6, 7, 9, 6, 7, 11, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 7, 7, 9, WIDTH - 7, 7, 11, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 5, 5, 9, 5, 7, 11, cut, cut);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
false,
|
||||
WIDTH - 6,
|
||||
5,
|
||||
9,
|
||||
WIDTH - 6,
|
||||
7,
|
||||
11,
|
||||
cut,
|
||||
cut,
|
||||
);
|
||||
|
||||
self.piece.add_block(chunk, air, 5, 5, 10, bb);
|
||||
self.piece.add_block(chunk, air, 5, 6, 10, bb);
|
||||
self.piece.add_block(chunk, air, 6, 6, 10, bb);
|
||||
self.piece.add_block(chunk, air, WIDTH - 6, 5, 10, bb);
|
||||
self.piece.add_block(chunk, air, WIDTH - 6, 6, 10, bb);
|
||||
self.piece.add_block(chunk, air, WIDTH - 7, 6, 10, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 2, 4, 4, 2, 6, 4, air, air);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 3, 4, 4, WIDTH - 3, 6, 4, air, air);
|
||||
self.piece.add_block(chunk, north_stairs, 2, 4, 5, bb);
|
||||
self.piece.add_block(chunk, north_stairs, 2, 3, 4, bb);
|
||||
self.piece
|
||||
.add_block(chunk, north_stairs, WIDTH - 3, 4, 5, bb);
|
||||
self.piece
|
||||
.add_block(chunk, north_stairs, WIDTH - 3, 3, 4, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 1, 1, 3, 2, 2, 3, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 3, 1, 3, WIDTH - 2, 2, 3, ss, ss);
|
||||
self.piece.add_block(chunk, ss, 1, 1, 2, bb);
|
||||
self.piece.add_block(chunk, ss, WIDTH - 2, 1, 2, bb);
|
||||
self.piece.add_block(chunk, slab, 1, 2, 2, bb);
|
||||
self.piece.add_block(chunk, slab, WIDTH - 2, 2, 2, bb);
|
||||
self.piece.add_block(chunk, west_stairs, 2, 1, 2, bb);
|
||||
self.piece
|
||||
.add_block(chunk, east_stairs, WIDTH - 3, 1, 2, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 4, 3, 5, 4, 3, 17, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, WIDTH - 5, 3, 5, WIDTH - 5, 3, 17, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 3, 1, 5, 4, 2, 16, air, air);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
false,
|
||||
WIDTH - 6,
|
||||
1,
|
||||
5,
|
||||
WIDTH - 5,
|
||||
2,
|
||||
16,
|
||||
air,
|
||||
air,
|
||||
);
|
||||
|
||||
for z in (5..=17).step_by(2) {
|
||||
self.piece.add_block(chunk, cut, 4, 1, z, bb);
|
||||
self.piece.add_block(chunk, chiseled, 4, 2, z, bb);
|
||||
self.piece.add_block(chunk, cut, WIDTH - 5, 1, z, bb);
|
||||
self.piece.add_block(chunk, chiseled, WIDTH - 5, 2, z, bb);
|
||||
}
|
||||
|
||||
self.piece.add_block(chunk, orange, 10, 0, 7, bb);
|
||||
self.piece.add_block(chunk, orange, 10, 0, 8, bb);
|
||||
self.piece.add_block(chunk, orange, 9, 0, 9, bb);
|
||||
self.piece.add_block(chunk, orange, 11, 0, 9, bb);
|
||||
self.piece.add_block(chunk, orange, 8, 0, 10, bb);
|
||||
self.piece.add_block(chunk, orange, 12, 0, 10, bb);
|
||||
self.piece.add_block(chunk, orange, 7, 0, 10, bb);
|
||||
self.piece.add_block(chunk, orange, 13, 0, 10, bb);
|
||||
self.piece.add_block(chunk, orange, 9, 0, 11, bb);
|
||||
self.piece.add_block(chunk, orange, 11, 0, 11, bb);
|
||||
self.piece.add_block(chunk, orange, 10, 0, 12, bb);
|
||||
self.piece.add_block(chunk, orange, 10, 0, 13, bb);
|
||||
self.piece.add_block(chunk, blue, 10, 0, 10, bb);
|
||||
|
||||
for x in [0, WIDTH - 1] {
|
||||
self.piece.add_block(chunk, cut, x, 2, 1, bb);
|
||||
self.piece.add_block(chunk, orange, x, 2, 2, bb);
|
||||
self.piece.add_block(chunk, cut, x, 2, 3, bb);
|
||||
self.piece.add_block(chunk, cut, x, 3, 1, bb);
|
||||
self.piece.add_block(chunk, orange, x, 3, 2, bb);
|
||||
self.piece.add_block(chunk, cut, x, 3, 3, bb);
|
||||
self.piece.add_block(chunk, orange, x, 4, 1, bb);
|
||||
self.piece.add_block(chunk, chiseled, x, 4, 2, bb);
|
||||
self.piece.add_block(chunk, orange, x, 4, 3, bb);
|
||||
self.piece.add_block(chunk, cut, x, 5, 1, bb);
|
||||
self.piece.add_block(chunk, orange, x, 5, 2, bb);
|
||||
self.piece.add_block(chunk, cut, x, 5, 3, bb);
|
||||
self.piece.add_block(chunk, orange, x, 6, 1, bb);
|
||||
self.piece.add_block(chunk, chiseled, x, 6, 2, bb);
|
||||
self.piece.add_block(chunk, orange, x, 6, 3, bb);
|
||||
self.piece.add_block(chunk, orange, x, 7, 1, bb);
|
||||
self.piece.add_block(chunk, orange, x, 7, 2, bb);
|
||||
self.piece.add_block(chunk, orange, x, 7, 3, bb);
|
||||
self.piece.add_block(chunk, cut, x, 8, 1, bb);
|
||||
self.piece.add_block(chunk, cut, x, 8, 2, bb);
|
||||
self.piece.add_block(chunk, cut, x, 8, 3, bb);
|
||||
}
|
||||
|
||||
for x in [2, WIDTH - 3] {
|
||||
self.piece.add_block(chunk, cut, x - 1, 2, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x, 2, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x + 1, 2, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x - 1, 3, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x, 3, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x + 1, 3, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x - 1, 4, 0, bb);
|
||||
self.piece.add_block(chunk, chiseled, x, 4, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x + 1, 4, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x - 1, 5, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x, 5, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x + 1, 5, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x - 1, 6, 0, bb);
|
||||
self.piece.add_block(chunk, chiseled, x, 6, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x + 1, 6, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x - 1, 7, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x, 7, 0, bb);
|
||||
self.piece.add_block(chunk, orange, x + 1, 7, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x - 1, 8, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x, 8, 0, bb);
|
||||
self.piece.add_block(chunk, cut, x + 1, 8, 0, bb);
|
||||
}
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, 4, 0, 12, 6, 0, cut, cut);
|
||||
self.piece.add_block(chunk, air, 8, 6, 0, bb);
|
||||
self.piece.add_block(chunk, air, 12, 6, 0, bb);
|
||||
self.piece.add_block(chunk, orange, 9, 5, 0, bb);
|
||||
self.piece.add_block(chunk, chiseled, 10, 5, 0, bb);
|
||||
self.piece.add_block(chunk, orange, 11, 5, 0, bb);
|
||||
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, -14, 8, 12, -11, 12, cut, cut);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, -10, 8, 12, -10, 12, chiseled, chiseled);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, -9, 8, 12, -9, 12, cut, cut);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 8, -8, 8, 12, -1, 12, ss, ss);
|
||||
self.piece
|
||||
.fill_with_outline(chunk, bb, false, 9, -11, 9, 11, -1, 11, air, air);
|
||||
self.piece.add_block(
|
||||
chunk,
|
||||
Block::STONE_PRESSURE_PLATE.default_state,
|
||||
10,
|
||||
-11,
|
||||
10,
|
||||
bb,
|
||||
);
|
||||
self.piece.fill_with_outline(
|
||||
chunk,
|
||||
bb,
|
||||
false,
|
||||
9,
|
||||
-13,
|
||||
9,
|
||||
11,
|
||||
-13,
|
||||
11,
|
||||
Block::TNT.default_state,
|
||||
air,
|
||||
);
|
||||
|
||||
self.piece.add_block(chunk, air, 8, -11, 10, bb);
|
||||
self.piece.add_block(chunk, air, 8, -10, 10, bb);
|
||||
self.piece.add_block(chunk, chiseled, 7, -10, 10, bb);
|
||||
self.piece.add_block(chunk, cut, 7, -11, 10, bb);
|
||||
self.piece.add_block(chunk, air, 12, -11, 10, bb);
|
||||
self.piece.add_block(chunk, air, 12, -10, 10, bb);
|
||||
self.piece.add_block(chunk, chiseled, 13, -10, 10, bb);
|
||||
self.piece.add_block(chunk, cut, 13, -11, 10, bb);
|
||||
self.piece.add_block(chunk, air, 10, -11, 8, bb);
|
||||
self.piece.add_block(chunk, air, 10, -10, 8, bb);
|
||||
self.piece.add_block(chunk, chiseled, 10, -10, 7, bb);
|
||||
self.piece.add_block(chunk, cut, 10, -11, 7, bb);
|
||||
self.piece.add_block(chunk, air, 10, -11, 12, bb);
|
||||
self.piece.add_block(chunk, air, 10, -10, 12, bb);
|
||||
self.piece.add_block(chunk, chiseled, 10, -10, 13, bb);
|
||||
self.piece.add_block(chunk, cut, 10, -11, 13, bb);
|
||||
|
||||
for (index, x, z) in [(0, 10, 12), (1, 8, 10), (2, 10, 8), (3, 12, 10)] {
|
||||
self.try_place_chest(chunk, bb, index, x, -11, z);
|
||||
}
|
||||
|
||||
self.add_cellar(chunk, bb, &mut level_random);
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,7 @@ use crate::{
|
||||
};
|
||||
|
||||
pub mod buried_treasure;
|
||||
pub mod desert_pyramid;
|
||||
pub mod igloo;
|
||||
pub mod nether_fortress;
|
||||
pub mod nether_fossil;
|
||||
@@ -288,7 +289,15 @@ impl StructurePiece {
|
||||
}
|
||||
}
|
||||
|
||||
/// Fills downwards from a relative point until the bottom of the world.
|
||||
fn is_replaceable_by_structures(state: &BlockState, block: &Block) -> bool {
|
||||
state.is_air()
|
||||
|| state.is_liquid()
|
||||
|| block == &Block::GLOW_LICHEN
|
||||
|| block == &Block::SEAGRASS
|
||||
|| block == &Block::TALL_SEAGRASS
|
||||
}
|
||||
|
||||
/// Fills downwards while the column stays structure-replaceable.
|
||||
pub fn fill_downwards(
|
||||
&self,
|
||||
chunk: &mut ProtoChunk,
|
||||
@@ -298,17 +307,26 @@ impl StructurePiece {
|
||||
z: i32,
|
||||
box_limit: &BlockBox,
|
||||
) {
|
||||
// We transform the starting point to world space to get the real Y
|
||||
let world_pos = self.offset_pos(x, y, z);
|
||||
let start_y = world_pos.y;
|
||||
let end_y = chunk.bottom_y() as i32;
|
||||
if !box_limit.contains_pos(&world_pos) {
|
||||
return;
|
||||
}
|
||||
|
||||
for current_y in (end_y..=start_y).rev() {
|
||||
// We bypass add_block here because add_block transforms X/Z again.
|
||||
// We use the already-transformed world X/Z but iterate Y manually.
|
||||
if box_limit.contains(world_pos.x, current_y, world_pos.z) {
|
||||
chunk.set_block_state(world_pos.x, current_y, world_pos.z, state);
|
||||
let min_fill_y = chunk.bottom_y() as i32 + 1;
|
||||
let mut current_y = world_pos.y;
|
||||
|
||||
while current_y > min_fill_y {
|
||||
let block_pos = Vector3::new(world_pos.x, current_y, world_pos.z);
|
||||
let current_state = chunk.get_block_state(&block_pos);
|
||||
if !Self::is_replaceable_by_structures(
|
||||
current_state.to_state(),
|
||||
current_state.to_block(),
|
||||
) {
|
||||
break;
|
||||
}
|
||||
|
||||
chunk.set_block_state(world_pos.x, current_y, world_pos.z, state);
|
||||
current_y -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user