Skip to content

Commit

Permalink
Merge pull request #333 from Oleg4260/main
Browse files Browse the repository at this point in the history
Add landuse for quarry and landfills + add one advice in FAQ
  • Loading branch information
louis-e authored Jan 25, 2025
2 parents 938a2d7 + 04d9d52 commit acf1234
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ The project is named after the smallest city in Germany, Arnis[^2]. The city's s
- *I don't have Minecraft installed but want to generate a world for my kids. How?*<br>
When selecting a world, click on 'Select existing world' and choose a directory. The world will be generated there.
- *Arnis instantly closes again or the window is empty!*<br>
If you're on Windows, please install the [Evergreen Bootstrapper from Microsoft](https://developer.microsoft.com/en-us/microsoft-edge/webview2/?form=MA13LH#download).
If you're on Windows, please install the [Evergreen Bootstrapper from Microsoft](https://developer.microsoft.com/en-us/microsoft-edge/webview2/?form=MA13LH#download).

If you're on Linux, your system might be missing the webkit2gtk-4.1 library, install the corresponding package using your distro's package manager.
- *What Minecraft version should I use?*<br>
Please use Minecraft version 1.21.4 for the best results. Minecraft version 1.16.5 and below is currently not supported, but we are working on it!
- *The generation did finish, but there's nothing in the world!*<br>
Expand Down
7 changes: 7 additions & 0 deletions src/block_definitions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ impl Block {
114 => "andesite_wall",
115 => "stone_brick_wall",
116..=125 => "rail",
126 => "coarse_dirt",
127 => "iron_ore",
128 => "coal_ore",
_ => panic!("Invalid id"),
}
}
Expand Down Expand Up @@ -405,6 +408,10 @@ pub const RAIL_NORTH_WEST: Block = Block::new(123);
pub const RAIL_SOUTH_EAST: Block = Block::new(124);
pub const RAIL_SOUTH_WEST: Block = Block::new(125);

pub const COARSE_DIRT: Block = Block::new(126);
pub const IRON_ORE: Block = Block::new(127);
pub const COAL_ORE: Block = Block::new(128);

// Variations for building corners
pub fn building_corner_variations() -> Vec<Block> {
vec![
Expand Down
10 changes: 10 additions & 0 deletions src/element_processing/landuse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ pub fn generate_landuse(
"industrial" => COBBLESTONE,
"military" => GRAY_CONCRETE,
"railway" => GRAVEL,
"landfill" => {
// Gravel if man_made = spoil_heap, coarse dirt else
let manmade = element.tags.get("man_made").unwrap_or(&binding);
if manmade == "spoil_heap" {
GRAVEL
} else {
COARSE_DIRT
}
}
"quarry" => STONE, // TODO: add ores
_ => {
if args.winter {
SNOW_BLOCK
Expand Down

0 comments on commit acf1234

Please sign in to comment.