Block editing #150

ReCore-sys · 2024-12-31T06:45:56Z

This PR implements block editing and some basic terrain generation.

Description

This is a fairly large PR that implements a lot of different things, the main ones being the set_block() function as well as some simple terrain generation.
The set_block() method uses some bitwise manipulation to modify the block in a chunk. It has been tested relatively well and is unlikely to break under normal circumstances. It is currently unable to use the direct palette format but that shouldn't really be an issue for now.
There is also some very basic terrain gen implemented using OpenSimplex noise, but should absolutely be expanded on later.
There is certainly room for optimizations, but these were largely ignored for the sake of getting this core feature implemented as soon as possible.
One important note is that breaking blocks works for the client, but placing blocks is very half-baked. Inventories will need to be implemented for placing different blocks and currently the default placing of stone blocks with right click is exceptionally buggy, so this should be sorted out when inventories get done.

Motivation and Context

Block editing is a fundamental part of minecraft, both for player interactions with the world and for terrain generation. This PR is vital for minecraft being at all playable.

How has this been tested?

Tested manually and with unit tests

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Refactor (restructuring code, without changing its behavior)

Checklist:

My code follows the code style of this project.
I have added tests to cover my changes.
All new and existing tests passed.
Clippy passes with no warnings.

Sweattypalms · 2024-12-31T07:12:29Z

src/lib/net/src/utils/broadcast.rs

-        .get_entities_with::<ChunkReceiver>()
+        .get_entities_with::<PlayerIdentity>()


Keep this as a ChunkReceiver, since you don't want to send play packets to someone in login state.

There has to be a better solution that that. Also why would a player during login have a player identity?

You're more than welcome to find a better solution, but, player receives the PlayerIdentity component during login start packet.
Oh wait, you also add ChunkReceiver during login start? Add it when login process is completed, and keep this as is. So 'everyone' would be players that could receive chunks I suppose?

0xnim · 2025-01-04T04:56:12Z

src/lib/utils/general_purpose/src/data_packing/i32.rs

+///    Reads an n-bit integer from a packed `i64`.
+pub fn read_nbit_i32(
+    word: &i64,
+    bit_size: usize,


you state earlier that this must be 32 or less. so why not just u8?

Also teleports you way up in the sky, no more spawning in the ground

…ome reason

Sweattypalms · 2025-03-08T13:02:01Z

src/bin/src/main.rs

+    if !global_state.world.chunk_exists(0, 0, "overworld").await? {
+        info!("No overworld spawn chunk found, generating spawn chunks...");
+        // Generate a 12x12 chunk area around the spawn point
+        let mut chunks = Vec::new();
+        for x in -12..12 {
+            for z in -12..12 {
+                chunks.push((x, z));
+            }
+        }
+        let generated_chunks: Vec<Result<Chunk, WorldGenError>> = chunks
+            .chunks(72)
+            .par_bridge()
+            .map(|chunk_coord_arr| {
+                let mut generated_chunks = Vec::new();
+                for (x, z) in chunk_coord_arr {
+                    let state = global_state.clone();
+                    generated_chunks.push(state.terrain_generator.generate_chunk(*x, *z));
+                }
+                generated_chunks
+            })
+            .flatten()
+            .collect();
+        for chunk in generated_chunks {
+            let chunk = chunk.map_err(|e| {
+                error!("Error generating chunk: {:?}", e);
+                BinaryError::Custom("Error generating chunk".to_string())
+            })?;
+            global_state.world.save_chunk(chunk).await?;
+        }
+        info!("Finished generating spawn chunks...");
+    }


Why not make this into a function, why just put it directly in the main function?

Originally it was a lot smaller but yeah you raise a good point

Sweattypalms · 2025-03-08T13:07:08Z

src/bin/src/systems/chunk_fetcher.rs

+fn generate_chunk(x: i32, z: i32) -> Chunk {
+    let mut new_chunk = Chunk::new(x, z, "overworld".to_string());
+    for x in 0..16 {
+        for z in 0..16 {
+            let mut base_y = (x as f64).sin() / 32.0;
+            base_y += (z as f64).cos() / 32.0;
+            let scaled_y = ((base_y + 1.0) * 64.0) as i32;
+            for y in 0..scaled_y {
+                new_chunk
+                    .set_block(
+                        x,
+                        y,
+                        z,
+                        BlockData {
+                            name: "minecraft:stone".to_string(),
+                            properties: None,
+                        },
+                    )
+                    .unwrap();
+            }
+        }
+    }
+    new_chunk
+}
+


magic numbers?

That's kinda just how terrain gen is. You kinda just gotta play around with numbers until it looks how you want. This function will be removed though and should use the proper terrain gen algorithms

Sweattypalms · 2025-03-08T13:10:05Z

src/bin/src/systems/chunk_fetcher.rs

@@ -41,27 +69,42 @@ impl System for ChunkFetcher {
                        let mut copied_chunks = HashMap::new();
                        for chunk in chunk_recv.needed_chunks.iter() {
                            let (key, chunk) = chunk;
-                            if chunk.is_none() {
+                            if let Fetching = chunk {


is that a capital F, and what is that even doing

It's an enum variant, and yeah its pretty messy. Will be redoing this entire thing.

Sweattypalms · 2025-03-08T13:10:24Z

src/bin/src/systems/chunk_fetcher.rs

@@ -79,7 +122,7 @@ impl System for ChunkFetcher {
                    }
                }
            }
-            tokio::time::sleep(std::time::Duration::from_millis(5)).await;
+            tokio::time::sleep(std::time::Duration::from_millis(45)).await;


We need to rework the polling chunk system

100%. Was going to leave it to a later PR but you are right, this is terrible.

yeah that's a good idea. merge this pr for now. let's fix it in a different pr. otherwise it'll get too much for a single pr

Nah, I did it anyway. Leaving it until later is a a great way for us to have an unusable codebase.

Sweattypalms · 2025-03-08T13:11:13Z

src/lib/net/crates/codec/src/net_types/bitset.rs

@@ -9,7 +9,7 @@ pub struct BitSet(Vec<u64>);

 impl BitSet {
    pub fn new(size: usize) -> Self {
-        let num_blocks = (size + 63) / 64;
+        let num_blocks = size.div_ceil(64);


magic number?

It's a 64 bit unsigned int. I wouldn't call 64 a magic number in this context.

Sweattypalms · 2025-03-08T13:17:53Z

src/lib/world_gen/src/biomes/plains.rs

+impl BiomeGenerator for PlainsBiome {
+    fn _biome_id(&self) -> u8 {
+        0
+    }
+
+    fn _biome_name(&self) -> String {
+        "plains".to_string()
+    }
+
+    fn generate_chunk(
+        &self,
+        x: i32,
+        z: i32,
+        noise: &NoiseGenerator,
+    ) -> Result<Chunk, WorldGenError> {
+        let mut chunk = Chunk::new(x, z, "overworld".to_string());
+        let mut heights = vec![];
+        let stone = BlockData {
+            name: "minecraft:stone".to_string(),
+            properties: None,
+        };
+
+        // Fill with water first
+        for section_y in -4..4 {
+            chunk.set_section(
+                section_y as i8,
+                BlockData {
+                    name: "minecraft:water".to_string(),
+                    properties: Some(BTreeMap::from([("level".to_string(), "0".to_string())])),
+                },
+            )?;
+        }
+
+        // Then generate some heights
+        for chunk_x in 0..16i64 {
+            for chunk_z in 0..16i64 {
+                let global_x = i64::from(x) * 16 + chunk_x;
+                let global_z = i64::from(z) * 16 + chunk_z;
+                let height = noise.get_noise(global_x as f64, global_z as f64);
+                let height = (height * 64.0) as i32 + 64;
+                heights.push((global_x, global_z, height));
+            }
+        }
+
+        // Fill in the sections that consist of only stone first with the set_section method since
+        // it's faster than set_block
+        let y_min = heights.iter().min_by(|a, b| a.2.cmp(&b.2)).unwrap().2;
+        let heighst_full_section = y_min / 16;
+        for section_y in -4..heighst_full_section {
+            chunk.set_section(section_y as i8, stone.clone())?;
+        }
+        let above_filled_sections = (heighst_full_section * 16) - 1;
+        for (global_x, global_z, height) in heights {
+            if height > above_filled_sections {
+                let height = height - above_filled_sections;
+                for y in 0..height {
+                    if y + above_filled_sections <= 64 {
+                        chunk.set_block(
+                            global_x as i32 & 0xF,
+                            y + above_filled_sections,
+                            global_z as i32 & 0xF,
+                            BlockData {
+                                name: "minecraft:sand".to_string(),
+                                properties: None,
+                            },
+                        )?;
+                    } else {
+                        chunk.set_block(
+                            global_x as i32 & 0xF,
+                            y + above_filled_sections,
+                            global_z as i32 & 0xF,
+                            BlockData {
+                                name: "minecraft:grass_block".to_string(),
+                                properties: Some(BTreeMap::from([(
+                                    "snowy".to_string(),
+                                    "false".to_string(),
+                                )])),
+                            },
+                        )?;
+                    }
+                }
+            }
+        }
+
+        Ok(chunk)
+    }
+}


underscored function names? not used?
Also would be nice to make this function into smaller functions, right now, it's a huge function.

Underscored because they are currently not used and clippy tries to kill me if i don't underscore them. And yeah should probably break it down, but since this is just a very simple proof of concept terrain gen system, it'll need to be ripped up and replaced soon anyway.

ReCore-sys added 9 commits December 16, 2024 18:29

Block reading somewhat working

dc2206c

now works more reliably

2c88410

Block reading fixed

5efed7e

Block count tracking + dependency cleanup

af982e2

Added packet generator script

26f30d5

Merge branch 'master' into feature/block-edits

6fed35f

Now correctly resizes sections

8ad1965

Clippy + fmt

7acc227

Fix tests

aaf5d34

Sweattypalms reviewed Dec 31, 2024

View reviewed changes

0xnim reviewed Jan 4, 2025

View reviewed changes

ReCore-sys added 19 commits January 21, 2025 13:45

Merge branch 'master' into feature/block-edits

bb5d93e

Now prints blocks clicked

a4e8ad9

Also teleports you way up in the sky, no more spawning in the ground

Now sets blocks correctly

75a2f04

Breaking blocks and removing empty palette entries

bf07482

clippy

f881224

Added collision checking and fixed double packet bug

d3f5bec

Fixed bug with missing palette entries

f0da9e7

Clippy

01d8d4d

Acknowledge block breaking

78b8b31

Basic world gen, but block edits don't work on generated worlds for s…

c189603

…ome reason

Clippy + fmt

2b1082c

Switched the chunk format to an enum for different palette types

2f4aa8a

wtf

e78f426

Now works a little bit more, still broken af

6127c07

No longer crashes on editing a corner block

51947cc

Updates non-air blocks. Doesn't fix it but can't make it worse

e823621

It works!

677ea51

clippy

68067ae

Basic world gen

0cf0de8

Added more unit tests

a9b2c28

ReCore-sys changed the title ~~WIP: Block editing~~ Block editing Mar 8, 2025

ReCore-sys marked this pull request as ready for review March 8, 2025 11:17

Sweattypalms requested changes Mar 8, 2025

View reviewed changes

ReCore-sys added 3 commits March 10, 2025 16:42

Removed the sketchy polling chunk sender

3c70ce2

clippy

4a6a9b7

Small changes

3a0b992

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Block editing #150

Block editing #150

ReCore-sys commented Dec 31, 2024 •

edited

Loading

Sweattypalms Dec 31, 2024

ReCore-sys Dec 31, 2024

Sweattypalms Dec 31, 2024

0xnim Jan 4, 2025

Sweattypalms Mar 8, 2025

ReCore-sys Mar 9, 2025

Sweattypalms Mar 8, 2025

ReCore-sys Mar 9, 2025

Sweattypalms Mar 8, 2025

ReCore-sys Mar 9, 2025

Sweattypalms Mar 8, 2025

ReCore-sys Mar 9, 2025

Sweattypalms Mar 9, 2025

ReCore-sys Mar 10, 2025

Sweattypalms Mar 8, 2025

ReCore-sys Mar 9, 2025

Sweattypalms Mar 8, 2025

ReCore-sys Mar 9, 2025

		.get_entities_with::<ChunkReceiver>()
		.get_entities_with::<PlayerIdentity>()

Block editing #150

Are you sure you want to change the base?

Block editing #150

Conversation

ReCore-sys commented Dec 31, 2024 • edited Loading

Description

Motivation and Context

How has this been tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ReCore-sys commented Dec 31, 2024 •

edited

Loading