majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load-level–based Chunk System (#1157)

Browse Source 
* Make protochunk not have a lifetime

* Staged chunks

* fix

* new generation system init

* small optimize

* fix warning

* fmt

* new get chunk

* use write_radius

* save stage in protochunk

* clean up

* clean old fn

* fix bug

* support saving but broke shutdown

* fail to fix shutdown and still many problems need to solve

* fix shutdown

* fix chunk unload; give highest priority to get_chunk

* fix tick deadlock

* fix chunk level

* drop old channel

* rewrite run_decrease_update; fix a stupid error

* Update chunk_system.rs

* remove some log

* lighter dependency

* clean up

* fix ci

* clean up & merge

* Update chunk_system.rs

* fix a bug

* Proto Chunk Saving, safer io and remove debug output

Port Proto Chunk Saving From #1164

* fix a bug

* fetching chunk message level set to debug

* Update multi_noise.rs

---------

Co-authored-by: 4lve <72332750+4lve@users.noreply.github.com>
Co-authored-by: Alexander Medvedev <lilalexmed@proton.me>
This commit is contained in:
spr-equinox
2025-10-11 03:52:56 +08:00
committed by GitHub
parent 0c2b647a45
commit e71bccf564
80 changed files with 3607 additions and 1679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pumpkin-world/src/generation/feature/features/tree/mod.rs
View File

@@ -1,5 +1,3 @@
use std::sync::Arc;
use decorator::TreeDecorator;
use foliage::FoliagePlacer;
use pumpkin_data::tag;
@@ -8,11 +6,8 @@ use pumpkin_util::{math::position::BlockPos, random::RandomGenerator};
use serde::Deserialize;
use trunk::TrunkPlacer;
use crate::{
ProtoChunk,
generation::{block_state_provider::BlockStateProvider, feature::size::FeatureSize},
level::Level,
};
use crate::generation::proto_chunk::GenerationCache;
use crate::generation::{block_state_provider::BlockStateProvider, feature::size::FeatureSize};
mod decorator;
mod foliage;
@@ -38,11 +33,9 @@ pub struct TreeNode {
}
impl TreeFeature {
#[expect(clippy::too_many_arguments)]
pub fn generate(
pub fn generate<T: GenerationCache>(
&self,
chunk: &mut ProtoChunk<'_>,
level: &Arc<Level>,
chunk: &mut T,
min_y: i8,
height: u16,
feature_name: &str, // This placed feature
@@ -50,8 +43,7 @@ impl TreeFeature {
pos: BlockPos,
) -> bool {
// TODO
let log_positions =
self.generate_main(chunk, level, min_y, height, feature_name, random, pos);
let log_positions = self.generate_main(chunk, min_y, height, feature_name, random, pos);
for decorator in &self.decorators {
decorator.generate(chunk, random, Vec::new(), log_positions.clone());
@@ -71,11 +63,9 @@ impl TreeFeature {
state.is_air() || block.is_tagged_with_by_tag(&tag::Block::MINECRAFT_REPLACEABLE_BY_TREES)
}
#[expect(clippy::too_many_arguments)]
fn generate_main(
fn generate_main<T: GenerationCache>(
&self,
chunk: &mut ProtoChunk<'_>,
level: &Arc<Level>,
chunk: &mut T,
_min_y: i8,
_height: u16,
_feature_name: &str, // This placed feature
@@ -96,7 +86,6 @@ impl TreeFeature {
top,
pos,
chunk,
level,
random,
self.force_dirt,
dirt_state,
@@ -113,7 +102,6 @@ impl TreeFeature {
for node in nodes {
self.foliage_placer.generate(
chunk,
level,
random,
&node,
foliage_height,
@@ -124,13 +112,13 @@ impl TreeFeature {
logs
}
fn get_top(&self, height: u32, chunk: &ProtoChunk, init_pos: BlockPos) -> u32 {
fn get_top<T: GenerationCache>(&self, height: u32, chunk: &T, init_pos: BlockPos) -> u32 {
for y in 0..=height + 1 {
let j = self.minimum_size.r#type.get_radius(height, y as i32);
for x in -j..=j {
for z in -j..=j {
let pos = BlockPos(init_pos.0.add_raw(x, y as i32, z));
let rstate = chunk.get_block_state(&pos.0);
let rstate = GenerationCache::get_block_state(chunk, &pos.0);
let block = rstate.to_block();
if Self::can_replace_or_log(rstate.to_state(), block)
&& (self.ignore_vines || block != &Block::VINE)