Fix fmt

Update leisure and highway element processing

.github/ISSUE_TEMPLATE/bug_report.md

@@ -20,4 +20,4 @@ Please tell us what version of Arnis and Minecraft you used.
 If applicable, add screenshots to help explain your problem.
 
 **Additional context**
-Add any other context about the problem here. If you used any more custom settings, please provide them here too.
+Add any other context about the problem here. If you used any more custom settings, please provide them here too. If you experienced any issue with the application itself like a crash, please provide the log file which can be found at C:\Users\USERNAME\AppData\Local\com.louisdev.arnis\logs

.github/workflows/ci-build.yml

@@ -1,13 +1,21 @@
 name: CI Build
 
-# Trigger on pull request creation, update, and on pushes to the main branch
+# Trigger CI on pull requests and pushes to main, when relevant files change
 on:
   pull_request:
     branches:
       - main
+    paths:
+      - 'src/**'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
   push:
     branches:
       - main
+    paths:
+      - 'src/**'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
   workflow_dispatch:
 
 jobs:
@@ -39,6 +47,17 @@ jobs:
         sudo apt install -y libgtk-3-dev build-essential pkg-config libglib2.0-dev libsoup-3.0-dev libwebkit2gtk-4.1-dev
         echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
 
+    - name: Set up cache for Cargo
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-
+
     - name: Check formatting
       run: cargo fmt -- --check
 
@@ -48,5 +67,8 @@ jobs:
     - name: Install Rust dependencies
       run: cargo fetch
 
-    - name: Build
-      run: cargo build --release
+    - name: Build (all targets, all features)
+      run: cargo build --all-targets --all-features --release
+
+    - name: Run unit tests
+      run: cargo test --all-targets --all-features

.github/workflows/pr-benchmark.yml

@@ -0,0 +1,103 @@
+name: PR Benchmark
+
+on:
+  pull_request:
+    types: [opened, reopened]
+  issue_comment:
+    types: [created]
+
+jobs:
+  benchmark:
+    if: |
+      github.event_name == 'pull_request' ||
+      (github.event_name == 'issue_comment' &&
+       github.event.issue.pull_request != null &&
+       contains(github.event.comment.body, 'retrigger-benchmark'))
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@v1
+        with:
+          toolchain: stable
+          components: clippy
+
+      - name: Create dummy Minecraft world directory
+        run: |
+          mkdir -p "./world/region"
+
+      - name: Start timer
+        id: start_time
+        run: echo "start_time=$(date +%s)" >> $GITHUB_OUTPUT
+
+      - name: Run benchmark command with memory tracking
+        id: benchmark
+        run: |
+          /usr/bin/time -v cargo run --release --no-default-features -- --path="./world" --terrain --bbox="48.117861,11.541996,48.154520,11.604824" 2> benchmark_log.txt
+          grep "Maximum resident set size" benchmark_log.txt | awk '{print $6}' > peak_mem_kb.txt
+          peak_kb=$(cat peak_mem_kb.txt)
+          peak_mb=$((peak_kb / 1024))
+          echo "peak_memory=${peak_mb}" >> $GITHUB_OUTPUT
+
+      - name: End timer and calculate duration
+        id: end_time
+        run: |
+          end_time=$(date +%s)
+          start_time=${{ steps.start_time.outputs.start_time }}
+          duration=$((end_time - start_time))
+          echo "duration=$duration" >> $GITHUB_OUTPUT
+
+      - name: Format duration and generate summary
+        id: comment_body
+        run: |
+          duration=${{ steps.end_time.outputs.duration }}
+          minutes=$((duration / 60))
+          seconds=$((duration % 60))
+          peak_mem=${{ steps.benchmark.outputs.peak_memory }}
+
+          baseline_time=130
+          diff=$((duration - baseline_time))
+          abs_diff=${diff#-}
+
+          if [ "$diff" -lt -10 ]; then
+            verdict="✅ This PR **improves generation time**."
+          elif [ "$abs_diff" -le 7 ]; then
+            verdict="🟢 Generation time is unchanged."
+          elif [ "$diff" -le 25 ]; then
+            verdict="⚠️ This PR **slightly worsens generation time**."
+          else
+            verdict="🚨 This PR **drastically worsens generation time**."
+          fi
+
+          baseline_mem=1960
+          mem_annotation=""
+          if [ "$peak_mem" -gt 2000 ]; then
+            mem_diff=$((peak_mem - baseline_mem))
+            mem_percent=$((mem_diff * 100 / baseline_mem))
+            mem_annotation=" (↗ ${mem_percent}% more)"
+          fi
+
+          {
+            echo "summary<<EOF"
+            echo "⏱️ Benchmark run finished in **${minutes}m ${seconds}s**"
+            echo "🧠 Peak memory usage: **${peak_mem} MB**${mem_annotation}"
+            echo ""
+            echo "📈 Compared against baseline: **${baseline_time}s**"
+            echo "🧮 Delta: **${diff}s**"
+            echo "🔢 Commit: [\`${GITHUB_SHA:0:7}\`](https://github.com/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA})"
+            echo ""
+            echo "${verdict}"
+            echo ""
+            echo "_You can retrigger the benchmark by commenting \`retrigger-benchmark\`._"
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - name: Comment build time on PR
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          message: ${{ steps.comment_body.outputs.summary }}
+          comment-tag: benchmark-report
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/prerelease.yml.disabled

@@ -1,4 +1,4 @@
-name: Pre-release Dev Build
+name: [DISABLED] Pre-release Dev Build
 
 on:
   push:
@@ -80,8 +80,8 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           tag: "dev-build-${{ github.run_number }}"
-          name: "Dev Build #${{ github.run_number }}"
-          body: "Automated pre-release for testing purposes. This build may contain experimental features. For the latest official version, please download the latest stable release."
+          name: "Experimental Development Build #${{ github.run_number }}"
+          body: "Automated pre-release built from the main branch for testing purposes. This build may contain experimental features. For the latest official version, please download the latest stable release."
           draft: false
           prerelease: true
           makeLatest: false

.github/workflows/release.yml

@@ -12,11 +12,15 @@ jobs:
           - os: windows-latest
             target: x86_64-pc-windows-msvc
             binary_name: arnis.exe
-            asset_name: arnis-windows-x64.exe
+            asset_name: arnis-windows.exe
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             binary_name: arnis
-            asset_name: arnis-linux-x64
+            asset_name: arnis-linux
+          - os: macos-latest
+            target: x86_64-apple-darwin
+            binary_name: arnis
+            asset_name: arnis-mac
 
     runs-on: ${{ matrix.os }}
 
@@ -47,11 +51,42 @@ jobs:
     - name: Build
       run: cargo build --release
 
+    - name: Rename binary for release
+      run: mv target/release/${{ matrix.binary_name }} target/release/${{ matrix.asset_name }}
+
+    - name: Install Windows SDK
+      if: matrix.os == 'windows-latest'
+      run: |
+        choco install windows-sdk-10.1 -y
+        $env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\x64"
+      shell: powershell
+
+    - name: Locate signtool.exe
+      if: matrix.os == 'windows-latest'
+      id: locate_signtool
+      run: |
+        $env:ProgramFilesX86 = [System.Environment]::GetFolderPath('ProgramFilesX86')
+        $signtoolPath = Get-ChildItem -Path "$env:ProgramFilesX86\Windows Kits\10\bin" -Recurse -Filter signtool.exe | Where-Object { $_.FullName -match '\\x64\\' } | Select-Object -First 1 -ExpandProperty FullName
+        if (-not $signtoolPath) { throw "signtool.exe not found." }
+        echo "signtool=$signtoolPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+      shell: powershell
+    
+    - name: Self-sign Windows executable
+      if: matrix.os == 'windows-latest'
+      run: |
+        $password = ConvertTo-SecureString -String $env:WINDOWS_CERT_PASSWORD -Force -AsPlainText
+        $cert = New-SelfSignedCertificate -Type CodeSigningCert -Subject 'CN=Arnis' -CertStoreLocation Cert:\CurrentUser\My -NotAfter (Get-Date).AddYears(5)
+        Export-PfxCertificate -Cert $cert -FilePath arnis-cert.pfx -Password $password
+        & $env:signtool sign /f arnis-cert.pfx /p $env:WINDOWS_CERT_PASSWORD /t http://timestamp.digicert.com target/release/${{ matrix.asset_name }}
+      env:
+        WINDOWS_CERT_PASSWORD: ${{ secrets.WINDOWS_CERT_PASSWORD }}
+      shell: powershell
+
     - name: Upload artifact
       uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.os }}-build
-        path: target/release/${{ matrix.binary_name }}
+        path: target/release/${{ matrix.asset_name }}
 
   release:
     needs: build
@@ -72,14 +107,23 @@ jobs:
         name: ubuntu-latest-build
         path: ./builds/linux
 
-    - name: Make Linux binary executable
-      run: chmod +x ./builds/linux/arnis
+    - name: Download macOS build artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: macos-latest-build
+        path: ./builds/macos
+
+    - name: Make Linux and macOS binaries executable
+      run: |
+        chmod +x ./builds/linux/arnis-linux
+        chmod +x ./builds/macos/arnis-mac
 
     - name: Create GitHub Release
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          builds/windows/arnis.exe
-          builds/linux/arnis
+          builds/windows/arnis-windows.exe
+          builds/linux/arnis-linux
+          builds/macos/arnis-mac
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}

.gitignore

@@ -27,6 +27,7 @@ Thumbs.db
 # Generated files
 /export.json
 /parsed_osm_data.txt
+/elevation_debug.png
 /gen/
 /build/
 *.rmeta

Cargo.lock

@@ -168,22 +168,24 @@ dependencies = [
 
 [[package]]
 name = "arnis"
-version = "2.1.3"
+version = "2.2.0"
 dependencies = [
  "clap",
  "colored",
- "dirs",
+ "dirs 6.0.0",
  "fastanvil",
  "fastnbt",
  "flate2",
  "fnv",
  "fs2",
  "geo",
+ "image 0.24.9",
  "indicatif",
  "itertools 0.14.0",
  "log",
  "once_cell",
  "rand 0.8.5",
+ "rayon",
  "reqwest",
  "rfd",
  "semver",
@@ -194,6 +196,7 @@ dependencies = [
  "tauri-plugin-log",
  "tauri-plugin-shell",
  "tokio",
+ "windows 0.61.1",
 ]
 
 [[package]]
@@ -683,9 +686,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.7"
+version = "1.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
 dependencies = [
  "shlex",
 ]
@@ -826,11 +829,10 @@ checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "colored"
-version = "2.2.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
+checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "lazy_static",
  "windows-sys 0.59.0",
 ]
 
@@ -952,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -984,6 +986,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1105,7 +1113,16 @@ version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.4.1",
+]
+
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys 0.5.0",
 ]
 
 [[package]]
@@ -1116,10 +1133,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users",
+ "redox_users 0.4.6",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users 0.5.0",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -1346,6 +1375,21 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "exr"
+version = "1.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
+dependencies = [
+ "bit_field",
+ "half",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
 [[package]]
 name = "fastanvil"
 version = "0.31.0"
@@ -1356,7 +1400,7 @@ dependencies = [
  "byteorder",
  "fastnbt",
  "flate2",
- "image",
+ "image 0.23.14",
  "log",
  "num_enum 0.5.11",
  "once_cell",
@@ -1425,9 +1469,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.35"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1788,6 +1832,16 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "gif"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
 [[package]]
 name = "gimli"
 version = "0.31.1"
@@ -1961,6 +2015,16 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
 [[package]]
 name = "hash32"
 version = "0.3.1"
@@ -2391,6 +2455,24 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "image"
+version = "0.24.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "exr",
+ "gif",
+ "jpeg-decoder",
+ "num-traits",
+ "png",
+ "qoi",
+ "tiff",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -2541,6 +2623,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+dependencies = [
+ "rayon",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.76"
@@ -2603,6 +2694,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
 [[package]]
 name = "libappindicator"
 version = "0.9.0"
@@ -2694,9 +2791,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 dependencies = [
  "value-bag",
 ]
@@ -2759,9 +2856,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -3213,9 +3310,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "open"
@@ -3231,9 +3328,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.68"
+version = "0.10.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
@@ -3263,9 +3360,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07"
 dependencies = [
  "cc",
  "libc",
@@ -3689,6 +3786,15 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "quick-xml"
 version = "0.32.0"
@@ -3849,6 +3955,17 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "redox_users"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.9",
+]
+
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -3960,15 +4077,14 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
  "getrandom 0.2.15",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -4519,12 +4635,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -4694,7 +4804,7 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
  "windows-version",
  "x11-dl",
@@ -4741,7 +4851,7 @@ checksum = "2e2e3349fbb2be7af9fad1b43d61ac83ba55ab48d47fbe1b2732f0c8211610a9"
 dependencies = [
  "anyhow",
  "bytes",
- "dirs",
+ "dirs 5.0.1",
  "dunce",
  "embed_plist",
  "futures-util",
@@ -4780,7 +4890,7 @@ dependencies = [
  "webkit2gtk",
  "webview2-com",
  "window-vibrancy",
- "windows",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -4791,7 +4901,7 @@ checksum = "b274ec7239ada504deb615f1c8abd7ba99631e879709e6f10e5d17217058d976"
 dependencies = [
  "anyhow",
  "cargo_toml",
- "dirs",
+ "dirs 5.0.1",
  "glob",
  "heck 0.5.0",
  "json-patch",
@@ -4865,16 +4975,16 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-log"
-version = "2.2.0"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eddd784c138c08a43954bc3e735402e6b2b2ee8d8c254a7391f4e77c01273dd5"
+checksum = "4e106ce75445f592879022757789ccd41c6d2829cd3043f2bf24379b52dc8710"
 dependencies = [
  "android_logger",
  "byte-unit",
- "cocoa",
  "fern",
  "log",
- "objc",
+ "objc2",
+ "objc2-foundation",
  "serde",
  "serde_json",
  "serde_repr",
@@ -4887,9 +4997,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-shell"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c50a63e60fb8925956cc5b7569f4b750ac197a4d39f13b8dd46ea8e2bad79"
+checksum = "69d5eb3368b959937ad2aeaf6ef9a8f5d11e01ffe03629d3530707bbcb27ff5d"
 dependencies = [
  "encoding_rs",
  "log",
@@ -4922,7 +5032,7 @@ dependencies = [
  "tauri-utils",
  "thiserror 2.0.9",
  "url",
- "windows",
+ "windows 0.58.0",
 ]
 
 [[package]]
@@ -4947,7 +5057,7 @@ dependencies = [
  "url",
  "webkit2gtk",
  "webview2-com",
- "windows",
+ "windows 0.58.0",
  "wry",
 ]
 
@@ -5069,6 +5179,17 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "tiff"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
 [[package]]
 name = "time"
 version = "0.3.37"
@@ -5129,9 +5250,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
@@ -5147,9 +5268,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5325,7 +5446,7 @@ checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b"
 dependencies = [
  "core-graphics",
  "crossbeam-channel",
- "dirs",
+ "dirs 5.0.1",
  "libappindicator",
  "muda",
  "objc2",
@@ -5789,10 +5910,10 @@ checksum = "823e7ebcfaea51e78f72c87fc3b65a1e602c321f407a0b36dbb327d7bb7cd921"
 dependencies = [
  "webview2-com-macros",
  "webview2-com-sys",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
- "windows-implement",
- "windows-interface",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
 ]
 
 [[package]]
@@ -5813,10 +5934,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a82bce72db6e5ee83c68b5de1e2cd6ea195b9fbff91cb37df5884cbe3222df4"
 dependencies = [
  "thiserror 1.0.69",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
 ]
 
+[[package]]
+name = "weezl"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -5872,6 +5999,28 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows"
+version = "0.61.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
+dependencies = [
+ "windows-collections",
+ "windows-core 0.61.0",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.0",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.52.0"
@@ -5887,13 +6036,36 @@ version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-result",
- "windows-strings",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
+ "windows-result 0.2.0",
+ "windows-strings 0.1.0",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
+dependencies = [
+ "windows-implement 0.60.0",
+ "windows-interface 0.59.1",
+ "windows-link",
+ "windows-result 0.3.2",
+ "windows-strings 0.4.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
+dependencies = [
+ "windows-core 0.61.0",
+ "windows-link",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.58.0"
@@ -5905,6 +6077,17 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "windows-interface"
 version = "0.58.0"
@@ -5916,14 +6099,41 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core 0.61.0",
+ "windows-link",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
- "windows-result",
- "windows-strings",
+ "windows-result 0.2.0",
+ "windows-strings 0.1.0",
  "windows-targets 0.52.6",
 ]
 
@@ -5936,16 +6146,34 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-strings"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
- "windows-result",
+ "windows-result 0.2.0",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-strings"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
@@ -6246,7 +6474,7 @@ dependencies = [
  "webkit2gtk",
  "webkit2gtk-sys",
  "webview2-com",
- "windows",
+ "windows 0.58.0",
  "windows-core 0.58.0",
  "windows-version",
  "x11-dl",
@@ -6449,6 +6677,15 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
+
 [[package]]
 name = "zvariant"
 version = "5.1.0"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "arnis"
-version = "2.1.3"
+version = "2.2.0"
 edition = "2021"
 description = "Arnis - Generate real life cities in Minecraft"
 homepage = "https://github.com/louis-e/arnis"
@@ -11,30 +11,39 @@ readme = "README.md"
 [profile.release]
 lto = "thin"
 
+[features]
+default = ["gui"]
+gui = ["tauri", "tauri-plugin-log", "tauri-plugin-shell", "tokio", "rfd", "dirs", "tauri-build"]
+
 [build-dependencies]
-tauri-build = "2"
+tauri-build = {version = "2", optional = true}
 
 [dependencies]
 clap = { version = "4.1", features = ["derive"] }
-colored = "2.1.0"
-dirs = "5.0.1"
+colored = "3.0.0"
+dirs = {version = "6.0.0", optional = true }
 fastanvil = "0.31.0"
 fastnbt = "2.5.0"
-flate2 = "1.0"
+flate2 = "1.1"
 fnv = "1.0.7"
 fs2 = "0.4"
 geo = "0.29.3"
+image = "0.24"
 indicatif = "0.17.8"
 itertools = "0.14.0"
-log = "0.4.22"
-once_cell = "1.19.0"
+log = "0.4.27"
+once_cell = "1.21.3"
 rand = "0.8.5"
+rayon = "1.10.0"
 reqwest = { version = "0.12.7", features = ["blocking", "json"] }
-rfd = "0.15.1"
+rfd = { version = "0.15.1", optional = true }
 semver = "1.0.23"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tauri = "2"
-tauri-plugin-log = { version = "2.2.0" }
-tauri-plugin-shell = "2"
-tokio = { version = "1.42.0", features = ["full"] }
+tauri = { version = "2", optional = true }
+tauri-plugin-log = { version = "2.2.2", optional = true }
+tauri-plugin-shell = { version = "2", optional = true }
+tokio = { version = "1.44.2", features = ["full"], optional = true }
+
+[target.'cfg(windows)'.dependencies]
+windows = { version = "0.61.1", features = ["Win32_System_Console"] }

README.md

@@ -4,27 +4,26 @@
 
 # Arnis [![CI Build Status](https://github.com/louis-e/arnis/actions/workflows/ci-build.yml/badge.svg)](https://github.com/louis-e/arnis/actions) [<img alt="GitHub Release" src="https://img.shields.io/github/v/release/louis-e/arnis" />](https://github.com/louis-e/arnis/releases) [<img alt="GitHub Downloads (all assets, all releases" src="https://img.shields.io/github/downloads/louis-e/arnis/total" />](https://github.com/louis-e/arnis/releases)
 
-This open source project written in Rust generates any chosen location from the real world in Minecraft Java Edition with a high level of detail.
+Arnis creates complex and accurate Minecraft Java Edition worlds that reflect real-world geography and architecture using OpenStreetMap.
 
 ###### ⚠️ This Github page is the official project website. Do not download Arnis from any other website.
 
 ## :desktop_computer: Example
 ![Minecraft Preview](https://github.com/louis-e/arnis/blob/main/gitassets/mc.gif?raw=true)
 
-By leveraging geospatial data from OpenStreetMap and utilizing the powerful capabilities of Rust, Arnis provides an efficient and robust solution for creating complex and accurate Minecraft worlds that reflect real-world geography and architecture.
-
-Arnis is designed to handle large-scale data and generate rich, immersive environments that bring real-world cities, landmarks, and natural features into the Minecraft universe. Whether you're looking to replicate your hometown, explore urban environments, or simply build something unique and realistic, Arnis generates your vision.
+Arnis is designed to handle large-scale data and generate rich, immersive environments that bring real-world cities, landmarks, and natural features into Minecraft. Whether you're looking to replicate your hometown, explore urban environments, or simply build something unique and realistic, Arnis generates your vision.
 
 ## :keyboard: Usage
 <img width="60%" src="https://github.com/louis-e/arnis/blob/main/gitassets/gui.png?raw=true"><br>
 Download the [latest release](https://github.com/louis-e/arnis/releases/) or [compile](#trophy-open-source) the project on your own.
  
-Choose your area in Arnis using the rectangle tool and select your Minecraft world - then simply click on 'Start Generation'!
-The world will always be generated starting from the Minecraft coordinates 0 0 0 (/tp 0 0 0). This is the top left of your selected area.
+Choose your area using the rectangle tool and select your Minecraft world - then simply click on 'Start Generation'!
 
-If you choose to select an own world, make sure to generate a new flat world in advance in Minecraft.
+> The world will always be generated starting from the Minecraft coordinates 0 0 0 (/tp 0 0 0). This is the top left of your selected area.
+Minecraft version 1.16.5 and below is currently not supported, but we are working on it! For the best results, use Minecraft version 1.21.4 or above.
+If you choose to select an own world, be aware that Arnis will overwrite certain areas.
 
-Minecraft version 1.16.5 and below is currently not supported, but we are working on it! For the best results, use Minecraft version 1.21.4.
+[[Arch Linux AUR package](https://aur.archlinux.org/packages/arnis)]
 
 ## :floppy_disk: How it works
 ![CLI Generation](https://github.com/louis-e/arnis/blob/main/gitassets/cli.gif?raw=true)
@@ -43,7 +42,7 @@ The raw data obtained from the API *[(see FAQ)](#question-faq)* includes each el
 - *Wasn't this written in Python before?*<br>
 Yes! Arnis was initially developed in Python, which benefited from Python's open-source friendliness and ease of readability. This is why we strive for clear, well-documented code in the Rust port of this project to find the right balance. I decided to port the project to Rust to learn more about the language and push the algorithm's performance further. We were nearing the limits of optimization in Python, and Rust's capabilities allow for even better performance and efficiency. The old Python implementation is still available in the python-legacy branch.
 - *Where does the data come from?*<br>
-The geographic data is sourced from OpenStreetMap (OSM)[^1], a free, collaborative mapping project that serves as an open-source alternative to commercial mapping services. The data is accessed via the Overpass API, which queries OSM's database.
+The geographic data is sourced from OpenStreetMap (OSM)[^1], a free, collaborative mapping project that serves as an open-source alternative to commercial mapping services. The data is accessed via the Overpass API, which queries OSM's database. Other services like Google Maps do not provide data like this, which makes OSM perfect for this project.
 - *How does the Minecraft world generation work?*<br>
 The script uses the [fastnbt](https://github.com/owengage/fastnbt) cargo package to interact with Minecraft's world format. This library allows Arnis to manipulate Minecraft region files, enabling the generation of real-world locations. The section 'Processing Pipeline' goes a bit further into the details and steps of the generation process itself.
 - *Where does the name come from?*<br>
@@ -51,13 +50,15 @@ 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>
 Make sure to teleport to the generation starting point (/tp 0 0 0). If there is still nothing, you might need to travel a bit further into the positive X and positive Z direction.
 - *What features are in the world generation settings?*<br>
-**Winter Mode:** This setting changes the generation style to a snowy theme and adds snow layers to the ground.<br>
+**Terrain:** Make sure to enable this feature to generate your world with elevation data included.<br>
 **Scale Factor:** The scale factor determines the size of the generated world.<br>
 **Custom BBOX Input:** This setting allows you to manually input the bounding box coordinates for the area you want to generate.<br>
 **Floodfill-Timeout (Sec):** This setting determines the maximum time the floodfill algorithm is allowed to run before being terminated. Increasing this value may improve the generation of large water areas but may also increase processing time.<br>
@@ -65,26 +66,26 @@ Make sure to teleport to the generation starting point (/tp 0 0 0). If there is
 
 ## :memo: ToDo and Known Bugs
 Feel free to choose an item from the To-Do or Known Bugs list, or bring your own idea to the table. Bug reports shall be raised as a Github issue. Contributions are highly welcome and appreciated!
-- [ ] Fix compilation for Linux
-- [ ] Rotate maps (https://github.com/louis-e/arnis/issues/97)
+- [ ] Fix compilation for Linux and Mac
 - [ ] Fix coastal cities generation duration time (water_areas.rs)
-- [ ] Add street names as signs
+- [ ] Rotate maps (https://github.com/louis-e/arnis/issues/97)
 - [ ] Add support for older Minecraft versions (<=1.16.5) (https://github.com/louis-e/arnis/issues/124, https://github.com/louis-e/arnis/issues/137)
 - [ ] Mapping real coordinates to Minecraft coordinates (https://github.com/louis-e/arnis/issues/29)
 - [ ] Add interior to buildings
 - [ ] Implement house roof types
-- [ ] Evaluate and implement elevation (https://github.com/louis-e/arnis/issues/66)
+- [ ] Add street names as signs
 - [ ] Add support for inner attribute in multipolygons and multipolygon elements other than buildings
-- [ ] Fix Github Action Workflow for releasing MacOS Binary
-- [ ] Evaluate and implement faster region saving
 - [ ] Refactor bridges implementation
-- [ ] Refactor railway implementation
 - [ ] Better code documentation
 - [ ] Refactor fountain structure implementation
 - [ ] Luanti Support (https://github.com/louis-e/arnis/issues/120)
 - [ ] Minecraft Bedrock Edition Support (https://github.com/louis-e/arnis/issues/148)
+- [x] Evaluate and implement elevation (https://github.com/louis-e/arnis/issues/66)
+- [x] Refactor railway implementation
+- [x] Evaluate and implement faster region saving
 - [x] Support multipolygons (https://github.com/louis-e/arnis/issues/112, https://github.com/louis-e/arnis/issues/114)
 - [x] Memory optimization
+- [x] Fix Github Action Workflow for releasing MacOS Binary
 - [x] Design and implement a GUI
 - [x] Automatic new world creation instead of using an existing world
 - [x] Fix faulty empty chunks ([https://github.com/owengage/fastnbt/issues/120](https://github.com/owengage/fastnbt/issues/120)) (workaround found)
@@ -93,17 +94,19 @@ Feel free to choose an item from the To-Do or Known Bugs list, or bring your own
 ## :trophy: Open Source
 #### Key objectives of this project
 - **Modularity**: Ensure that all components (e.g., data fetching, processing, and world generation) are cleanly separated into distinct modules for better maintainability and scalability.
-- **Performance Optimization**: Utilize Rust’s memory safety and concurrency features to optimize the performance of the world generation process.
+- **Performance Optimization**: We aim to keep a good performance and speed of the world generation process.
 - **Comprehensive Documentation**: Detailed in-code documentation for a clear structure and logic.
 - **User-Friendly Experience**: Focus on making the project easy to use for end users.
-- **Cross-Platform Support**: Ensure the project runs smoothly on Windows, macOS, and Linux.
+- **Cross-Platform Support**: We want this project to run smoothly on Windows, macOS, and Linux.
 
 #### How to contribute
-This project is open source and welcomes contributions from everyone! Whether you're interested in fixing bugs, improving performance, adding new features, or enhancing documentation, your input is valuable. Simply fork the repository, make your changes, and submit a pull request. We encourage discussions and suggestions to ensure the project remains modular, optimized, and easy to use for the community. You can use the parameter --debug to get a more detailed output of the processed values, which can be helpful for debugging and development. Contributions of all levels are appreciated, and your efforts help improve this tool for everyone.
+This project is open source and welcomes contributions from everyone! Whether you're interested in fixing bugs, improving performance, adding new features, or enhancing documentation, your input is valuable. Simply fork the repository, make your changes, and submit a pull request. Please respect the above mentioned key objectives. Contributions of all levels are appreciated, and your efforts help improve this tool for everyone.
 
-Build and run it using: ```cargo run --release -- --path="C:/YOUR_PATH/.minecraft/saves/worldname" --bbox="min_lng,min_lat,max_lng,max_lat"```<br>
+Build and run it using: ```cargo run --release --no-default-features -- --path="C:/YOUR_PATH/.minecraft/saves/worldname" --bbox="min_lng,min_lat,max_lng,max_lat"```<br>
 For the GUI: ```cargo run --release```<br>
 
+> You can use the parameter --debug to get a more detailed output of the processed values, which can be helpful for debugging and development.
+
 After your pull request was merged, I will take care of regularly creating update releases which will include your changes.
 
 ## :star: Star History

build.rs

@@ -1,3 +1,4 @@
 fn main() {
+    #[cfg(feature = "gui")]
     tauri_build::build()
 }

gui-src/arnis.desktop

@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Arnis
+Comment=Generate cities from real life in Minecraft
+Comment[lt]=Sugeneruokite tikrovės miestus „Minecraft“ žaidime
+Comment[de]=Generiere echte Städte in Minecraft
+Comment[fr]=Générez des villes réelles dans Minecraft
+Comment[es]=Genera ciudades reales en Minecraft
+Comment[pt]=Gere cidades reais no Minecraft
+Comment[zh_CN]=在 Minecraft 中生成现实城市
+Icon=icon
+Exec=arnis
+Categories=Game;Education;Geoscience
+Keywords=OSM;OpenStreetMap;Minecraft
+StartupWMClass=arnis

gui-src/css/styles.css

@@ -186,6 +186,7 @@ button:hover {
   button {
     color: #ffffff;
     background-color: #0f0f0f98;
+    border-style: inherit;
   }
   button:active {
     background-color: #0f0f0f69;
@@ -202,39 +203,6 @@ button:hover {
   width: 100%;
 }
 
-.tooltip .tooltiptext {
-  visibility: hidden;
-  width: 90%;
-  background-color: #808080;
-  color: #fff;
-  text-align: center;
-  padding: 5px 0;
-  border-radius: 6px;
-
-  position: absolute;
-  z-index: 1;
-  bottom: -100%;
-  left: 5%;
-  opacity: 0;
-  transition: opacity 0.3s;
-}
-
-.tooltip .tooltiptext::after {
-  content: "";
-  position: absolute;
-  top: -10px;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 5px;
-  border-style: solid;
-  border-color: transparent transparent #808080 transparent;
-}
-
-.tooltip:hover .tooltiptext {
-  visibility: visible;
-  opacity: 1;
-}
-
 .controls-box button {
   width: 100%;
 }
@@ -275,11 +243,19 @@ button:hover {
   color: #ffffff;
 }
 
-#winter-toggle {
+#terrain-toggle {
   accent-color: #fecc44;
 }
 
-.winter-toggle-container, .scale-slider-container {
+.terrain-toggle-container, .scale-slider-container {
+  margin: 15px 0;
+}
+
+#fillground-toggle {
+  accent-color: #fecc44;
+}
+
+.fillground-toggle-container, .scale-slider-container {
   margin: 15px 0;
 }
 

gui-src/index.html

@@ -38,16 +38,13 @@
 
           <!-- Updated Tooltip Structure -->
           <div class="tooltip" style="width: 100%;">
-            <button type="button" onclick="openWorldPicker()" style="padding: 10px; line-height: 1.2; width: 100%;" data-localize="choose_world">
-              Choose World
+            <button type="button" onclick="openWorldPicker()" style="padding: 10px; line-height: 1.2; width: 100%;">
+              <span id="choose_world">Choose World</span>
               <br>
               <span id="selected-world" style="font-size: 0.8em; color: #fecc44; display: block; margin-top: 4px;" data-localize="no_world_selected">
                 No world selected
               </span>
             </button>
-            <span class="tooltiptext" style="font-size: 0.8em; line-height: 1.2;">
-              Please select a Minecraft world that can be overwritten, as the generation process will replace existing structures in the chosen world!
-            </span>
           </div>
           
           <div class="button-container">
@@ -89,10 +86,15 @@
         <span class="close-button" onclick="closeSettings()">&times;</span>
         <h2 data-localize="customization_settings">Customization Settings</h2>
 
-        <!-- Winter Mode Toggle Button -->
-        <div class="winter-toggle-container">
-          <label for="winter-toggle" data-localize="winter_mode">Winter Mode:</label>
-          <input type="checkbox" id="winter-toggle" name="winter-toggle">
+        <!-- Terrain Toggle Button -->
+        <div class="terrain-toggle-container">
+          <label for="terrain-toggle" data-localize="terrain">Terrain:</label>
+          <input type="checkbox" id="terrain-toggle" name="terrain-toggle" checked>
+        </div>
+        <!-- Fill ground Toggle Button -->
+        <div class="fillground-toggle-container">
+          <label for="fillground-toggle" data-localize="fillground">Fill Ground:</label>
+          <input type="checkbox" id="fillground-toggle" name="fillground-toggle">
         </div>
 
         <!-- World Scale Slider -->
@@ -105,7 +107,7 @@
         <!-- Bounding Box Input -->
         <div class="bbox-input-container">
           <label for="bbox-coords" data-localize="custom_bounding_box">Custom Bounding Box:</label>
-          <input type="text" id="bbox-coords" name="bbox-coords" maxlength="55" style="width: 280px;" autocomplete="one-time-code" placeholder="Format: lat,lng,lat,lng">
+          <input type="text" id="bbox-coords" name="bbox-coords" maxlength="55" style="width: 280px;" placeholder="Format: lat,lng,lat,lng">
         </div>
 
         <!-- Floodfill Timeout Input -->
@@ -139,10 +141,10 @@
     <!-- Footer -->
     <footer class="footer">
       <a href="https://github.com/louis-e/arnis" target="_blank" class="footer-link" data-localize="footer_text">
-        © <span id="current-year"></span> Arnis v<span id="version-placeholder">x.x.x</span> by louis-e
+        © {year} Arnis v{version} by louis-e
       </a>
     </footer>
   </main>
 </body>
 
-</html>
+</html>

gui-src/js/license.js

@@ -72,7 +72,7 @@ You may add Your own copyright statement to Your modifications andmay provide ad
 
 END OF TERMS AND CONDITIONS
 
-Copyright 2025 Louis Erbkamm
+Copyright ${new Date().getFullYear()} Louis Erbkamm
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License athttp://www.apache.org/licenses/LICENSE-2.0
 

gui-src/js/main.js

@@ -1,6 +1,15 @@
 import { licenseText } from './license.js';
 
-const { invoke } = window.__TAURI__.core;
+let invoke;
+if (window.__TAURI__) {
+  invoke = window.__TAURI__.core.invoke;
+} else {
+  function dummyFunc() {}
+  window.__TAURI__ = { event: { listen: dummyFunc } };
+  invoke = dummyFunc;
+}
+
+const DEFAULT_LOCALE_PATH = `./locales/en.json`;
 
 // Initialize elements and start the demo progress
 window.addEventListener("DOMContentLoaded", async () => {
@@ -11,151 +20,122 @@ window.addEventListener("DOMContentLoaded", async () => {
   initSettings();
   initWorldPicker();
   handleBboxInput();
-  const language = detectLanguage();
-  const localization = await loadLocalization(language);
+  const localization = await getLocalization();
   await applyLocalization(localization);
   initFooter();
   await checkForUpdates();
 });
 
-async function loadLocalization(language) {
-  const response = await fetch(`./locales/${language}.json`);
+/**
+ * Checks if a JSON response is invalid or falls back to HTML
+ * @param {Response} response - The fetch response object
+ * @returns {boolean} True if the response is invalid JSON
+ */
+function invalidJSON(response) {
+  // Workaround for Tauri always falling back to index.html for asset loading
+  return !response.ok || response.headers.get("Content-Type") === "text/html";
+}
+
+/**
+ * Fetches and returns localization data based on user's language
+ * Falls back to English if requested language is not available
+ * @returns {Promise<Object>} The localization JSON object
+ */
+async function getLocalization() {
+  const lang = navigator.language;
+  let response = await fetch(`./locales/${lang}.json`);
+
+  // Try with only first part of language code
+  if (invalidJSON(response)) {
+    response = await fetch(`./locales/${lang.split('-')[0]}.json`);
+
+    // Fallback to default English localization
+    if (invalidJSON(response)) {
+      response = await fetch(DEFAULT_LOCALE_PATH);
+    }
+  }
+
   const localization = await response.json();
   return localization;
 }
 
+/**
+ * Updates an HTML element with localized text
+ * @param {Object} json - Localization data
+ * @param {Object} elementObject - Object containing element or selector
+ * @param {string} localizedStringKey - Key for the localized string
+ */
+async function localizeElement(json, elementObject, localizedStringKey) {
+  const element =
+    (!elementObject.element || elementObject.element === "")
+    ? document.querySelector(elementObject.selector) : elementObject.element;
+  const attribute = localizedStringKey.startsWith("placeholder_") ? "placeholder" : "textContent";
+
+  if (element) {
+    if (localizedStringKey in json) {
+      element[attribute] = json[localizedStringKey];
+    } else {
+      // Fallback to default (English) string
+      const response = await fetch(DEFAULT_LOCALE_PATH);
+      const defaultJson = await response.json();
+      element[attribute] = defaultJson[localizedStringKey];
+    }
+  }
+}
+
 async function applyLocalization(localization) {
-  const selectLocationElement = document.querySelector("h2[data-localize='select_location']");
-  if (selectLocationElement) {
-    selectLocationElement.textContent = localization.select_location;
-  }
+  const localizationElements = {
+    "h2[data-localize='select_location']": "select_location",
+    "#bbox-text": "zoom_in_and_choose",
+    "h2[data-localize='select_world']": "select_world",
+    "span[id='choose_world']": "choose_world",
+    "#selected-world": "no_world_selected",
+    "#start-button": "start_generation",
+    "h2[data-localize='progress']": "progress",
+    "h2[data-localize='choose_world_modal_title']": "choose_world_modal_title",
+    "button[data-localize='select_existing_world']": "select_existing_world",
+    "button[data-localize='generate_new_world']": "generate_new_world",
+    "h2[data-localize='customization_settings']": "customization_settings",
+    "label[data-localize='world_scale']": "world_scale",
+    "label[data-localize='custom_bounding_box']": "custom_bounding_box",
+    "label[data-localize='floodfill_timeout']": "floodfill_timeout",
+    "label[data-localize='ground_level']": "ground_level",
+    ".footer-link": "footer_text",
+    "button[data-localize='license_and_credits']": "license_and_credits",
+    "h2[data-localize='license_and_credits']": "license_and_credits",
 
-  const bboxTextElement = document.getElementById("bbox-text");
-  if (bboxTextElement) {
-    bboxTextElement.textContent = localization.zoom_in_and_choose;
-  }
+    // Placeholder strings
+    "input[id='bbox-coords']": "placeholder_bbox",
+    "input[id='floodfill-timeout']": "placeholder_floodfill",
+    "input[id='ground-level']": "placeholder_ground"
+  };
 
-  const selectWorldElement = document.querySelector("h2[data-localize='select_world']");
-  if (selectWorldElement) {
-    selectWorldElement.textContent = localization.select_world;
-  }
-
-  const chooseWorldButton = document.querySelector("button[data-localize='choose_world']");
-  if (chooseWorldButton) {
-    chooseWorldButton.firstChild.textContent = localization.choose_world;
-  }
-
-  const selectedWorldElement = document.getElementById("selected-world");
-  if (selectedWorldElement) {
-    selectedWorldElement.textContent = localization.no_world_selected;
-  }
-
-  const startButtonElement = document.getElementById("start-button");
-  if (startButtonElement) {
-    startButtonElement.textContent = localization.start_generation;
-  }
-
-  const progressElement = document.querySelector("h2[data-localize='progress']");
-  if (progressElement) {
-    progressElement.textContent = localization.progress;
-  }
-
-  const chooseWorldModalTitle = document.querySelector("h2[data-localize='choose_world_modal_title']");
-  if (chooseWorldModalTitle) {
-    chooseWorldModalTitle.textContent = localization.choose_world_modal_title;
-  }
-
-  const selectExistingWorldButton = document.querySelector("button[data-localize='select_existing_world']");
-  if (selectExistingWorldButton) {
-    selectExistingWorldButton.textContent = localization.select_existing_world;
-  }
-
-  const generateNewWorldButton = document.querySelector("button[data-localize='generate_new_world']");
-  if (generateNewWorldButton) {
-    generateNewWorldButton.textContent = localization.generate_new_world;
-  }
-
-  const customizationSettingsTitle = document.querySelector("h2[data-localize='customization_settings']");
-  if (customizationSettingsTitle) {
-    customizationSettingsTitle.textContent = localization.customization_settings;
-  }
-
-  const winterModeLabel = document.querySelector("label[data-localize='winter_mode']");
-  if (winterModeLabel) {
-    winterModeLabel.textContent = localization.winter_mode;
-  }
-
-  const worldScaleLabel = document.querySelector("label[data-localize='world_scale']");
-  if (worldScaleLabel) {
-    worldScaleLabel.textContent = localization.world_scale;
-  }
-
-  const customBoundingBoxLabel = document.querySelector("label[data-localize='custom_bounding_box']");
-  if (customBoundingBoxLabel) {
-    customBoundingBoxLabel.textContent = localization.custom_bounding_box;
-  }
-
-  const floodfillTimeoutLabel = document.querySelector("label[data-localize='floodfill_timeout']");
-  if (floodfillTimeoutLabel) {
-    floodfillTimeoutLabel.textContent = localization.floodfill_timeout;
-  }
-
-  const groundLevelLabel = document.querySelector("label[data-localize='ground_level']");
-  if (groundLevelLabel) {
-    groundLevelLabel.textContent = localization.ground_level;
-  }
-
-  const footerLinkElement = document.querySelector(".footer-link");
-  if (footerLinkElement) {
-    footerLinkElement.innerHTML = localization.footer_text.replace("{year}", '<span id="current-year"></span>').replace("{version}", '<span id="version-placeholder"></span>');
+  for (const selector in localizationElements) {
+    localizeElement(localization, { selector: selector }, localizationElements[selector]);
   }
 
   // Update error messages
   window.localization = localization;
 }
 
-function detectLanguage() {
-  const lang = navigator.language || navigator.userLanguage;
-  const langCode = lang.split('-')[0];
-  switch (langCode) {
-    case 'es':
-      return 'es';
-    case 'ru':
-      return 'ru';
-    case 'de':
-      return 'de';
-    case 'zh':
-      return 'zh';
-    case 'uk':
-      return 'ua';
-    case 'pl':
-      return 'pl';
-    case 'ko':
-      return 'ko';
-    case 'sv':
-      return 'sv';
-    default:
-      return 'en';
-  }
-}
-
 // Function to initialize the footer with the current year and version
 async function initFooter() {
   const currentYear = new Date().getFullYear();
-  const currentYearElement = document.getElementById("current-year");
-  if (currentYearElement) {
-    currentYearElement.textContent = currentYear;
-  }
+  let version = "x.x.x";
 
   try {
-    const version = await invoke('gui_get_version');
-    const versionPlaceholder = document.getElementById("version-placeholder");
-    if (versionPlaceholder) {
-      versionPlaceholder.textContent = version;
-    }
+    version = await invoke('gui_get_version');
   } catch (error) {
     console.error("Failed to fetch version:", error);
   }
+
+  const footerElement = document.querySelector(".footer-link");
+  if (footerElement) {
+    footerElement.textContent =
+      footerElement.textContent
+        .replace("{year}", currentYear)
+        .replace("{version}", version);
+  }
 }
 
 // Function to check for updates and display a notification if available
@@ -173,7 +153,7 @@ async function checkForUpdates() {
       updateMessage.style.display = "block";
       updateMessage.style.textDecoration = "none";
 
-      updateMessage.textContent = window.localization.new_version_available;
+      localizeElement(window.localization, { element: updateMessage }, "new_version_available");
       footer.style.marginTop = "15px";
       footer.appendChild(updateMessage);
     }
@@ -294,7 +274,11 @@ function initWorldPicker() {
   window.closeWorldPicker = closeWorldPicker;
 }
 
-// Function to validate and handle bbox input
+/**
+ * Validates and processes bounding box coordinates input
+ * Supports both comma and space-separated formats
+ * Updates the map display when valid coordinates are entered
+ */
 function handleBboxInput() {
   const inputBox = document.getElementById("bbox-coords");
   const bboxInfo = document.getElementById("bbox-info");
@@ -328,8 +312,8 @@ function handleBboxInput() {
               lat2 >= -90 && lat2 <= 90 &&
               lng2 >= -180 && lng2 <= 180
           ) {
-              // Input is valid; trigger the event
-              const bboxText = `${lat1} ${lng1} ${lat2} ${lng2}`;
+              // Input is valid; trigger the event with consistent comma-separated format
+              const bboxText = `${lat1},${lng1},${lat2},${lng2}`;
               window.dispatchEvent(new MessageEvent('message', { data: { bboxText } }));
 
               // Show custom bbox on the map
@@ -338,24 +322,32 @@ function handleBboxInput() {
               map_container.contentWindow.location.reload();
 
               // Update the info text
-              bboxInfo.textContent = window.localization.custom_selection_confirmed;
+              localizeElement(window.localization, { element: bboxInfo }, "custom_selection_confirmed");
               bboxInfo.style.color = "#7bd864";
           } else {
               // Valid numbers but invalid order or range
-              bboxInfo.textContent = window.localization.error_coordinates_out_of_range;
+              localizeElement(window.localization, { element: bboxInfo }, "error_coordinates_out_of_range");
               bboxInfo.style.color = "#fecc44";
               selectedBBox = "";
           }
       } else {
           // Input doesn't match the required format
-          bboxInfo.textContent = window.localization.invalid_format;
+          localizeElement(window.localization, { element: bboxInfo }, "invalid_format");
           bboxInfo.style.color = "#fecc44";
           selectedBBox = "";
       }
   });
 }
 
-// Function to calculate the bounding box "size" in square meters based on latitude and longitude
+/**
+ * Calculates the approximate area of a bounding box in square meters
+ * Uses the Haversine formula for geodesic calculations
+ * @param {number} lng1 - First longitude coordinate
+ * @param {number} lat1 - First latitude coordinate
+ * @param {number} lng2 - Second longitude coordinate
+ * @param {number} lat2 - Second latitude coordinate
+ * @returns {number} Area in square meters
+ */
 function calculateBBoxSize(lng1, lat1, lng2, lat2) {
   // Approximate distance calculation using Haversine formula or geodesic formula
   const toRad = (angle) => (angle * Math.PI) / 180;
@@ -376,7 +368,11 @@ function calculateBBoxSize(lng1, lat1, lng2, lat2) {
   return Math.abs(width * height);
 }
 
-// Function to normalize longitude to the range [-180, 180]
+/**
+ * Normalizes a longitude value to the range [-180, 180]
+ * @param {number} lon - Longitude value to normalize
+ * @returns {number} Normalized longitude value
+ */
 function normalizeLongitude(lon) {
   return ((lon + 180) % 360 + 360) % 360 - 180;
 }
@@ -407,23 +403,26 @@ function displayBboxInfoText(bboxText) {
   const selectedSize = calculateBBoxSize(lng1, lat1, lng2, lat2);
 
   if (selectedSize > threshold2) {
-    bboxInfo.textContent = window.localization.area_too_large;
+    localizeElement(window.localization, { element: bboxInfo }, "area_too_large");
     bboxInfo.style.color = "#fa7878";
   } else if (selectedSize > threshold1) {
-    bboxInfo.textContent = window.localization.area_extensive;
+    localizeElement(window.localization, { element: bboxInfo }, "area_extensive");
     bboxInfo.style.color = "#fecc44";
   } else {
-    bboxInfo.textContent = window.localization.selection_confirmed;
+    localizeElement(window.localization, { element: bboxInfo }, "selection_confirmed");
     bboxInfo.style.color = "#7bd864";
   }
 }
 
 let worldPath = "";
+let isNewWorld = false;
+
 async function selectWorld(generate_new_world) {
   try {
     const worldName = await invoke('gui_select_world', { generateNew: generate_new_world } );
     if (worldName) {
       worldPath = worldName;
+      isNewWorld = generate_new_world;
       const lastSegment = worldName.split(/[\\/]/).pop();
       document.getElementById('selected-world').textContent = lastSegment;
       document.getElementById('selected-world').style.color = "#fecc44";
@@ -435,22 +434,32 @@ async function selectWorld(generate_new_world) {
   closeWorldPicker();
 }
 
+/**
+ * Handles world selection errors and displays appropriate messages
+ * @param {number} errorCode - Error code from the backend
+ */
 function handleWorldSelectionError(errorCode) {
-  const errorMessages = {
-    1: window.localization.minecraft_directory_not_found,
-    2: window.localization.world_in_use,
-    3: window.localization.failed_to_create_world,
-    4: window.localization.no_world_selected_error
+  const errorKeys = {
+    1: "minecraft_directory_not_found",
+    2: "world_in_use",
+    3: "failed_to_create_world",
+    4: "no_world_selected_error"
   };
 
-  const errorMessage = errorMessages[errorCode] || "Unknown error";
-  document.getElementById('selected-world').textContent = errorMessage;
-  document.getElementById('selected-world').style.color = "#fa7878";
+  const errorKey = errorKeys[errorCode] || "unknown_error";
+  const selectedWorld = document.getElementById('selected-world');
+  localizeElement(window.localization, { element: selectedWorld }, errorKey);
+  selectedWorld.style.color = "#fa7878";
   worldPath = "";
-  console.error(error);
+  console.error(errorCode);
 }
 
 let generationButtonEnabled = true;
+/**
+ * Initiates the world generation process
+ * Validates required inputs and sends generation parameters to the backend
+ * @returns {Promise<void>}
+ */
 async function startGeneration() {
   try {
     if (generationButtonEnabled === false) {
@@ -458,18 +467,21 @@ async function startGeneration() {
     }
 
     if (!selectedBBox || selectedBBox == "0.000000 0.000000 0.000000 0.000000") {
-      document.getElementById('bbox-info').textContent = window.localization.select_location_first;
-      document.getElementById('bbox-info').style.color = "#fa7878";
+      const bboxInfo = document.getElementById('bbox-info');
+      localizeElement(window.localization, { element: bboxInfo }, "select_location_first");
+      bboxInfo.style.color = "#fa7878";
       return;
     }
 
     if (!worldPath || worldPath === "") {
-      document.getElementById('selected-world').textContent = window.localization.select_minecraft_world_first;
-      document.getElementById('selected-world').style.color = "#fa7878";
+      const selectedWorld = document.getElementById('selected-world');
+      localizeElement(window.localization, { element: selectedWorld }, "select_minecraft_world_first");
+      selectedWorld.style.color = "#fa7878";
       return;
     }
 
-    var winter_mode = document.getElementById("winter-toggle").checked;
+    var terrain = document.getElementById("terrain-toggle").checked;
+    var fill_ground = document.getElementById("fillground-toggle").checked;
     var scale = parseFloat(document.getElementById("scale-value-slider").value);
     var floodfill_timeout = parseInt(document.getElementById("floodfill-timeout").value, 10);
     var ground_level = parseInt(document.getElementById("ground-level").value, 10);
@@ -484,8 +496,10 @@ async function startGeneration() {
         selectedWorld: worldPath,
         worldScale: scale,
         groundLevel: ground_level,
-        winterMode: winter_mode,
         floodfillTimeout: floodfill_timeout,
+        terrainEnabled: terrain,
+        fillgroundEnabled: fill_ground,
+        isNewWorld: isNewWorld
     });
 
     console.log("Generation process started.");

gui-src/locales/ar.json

@@ -0,0 +1,38 @@
+{
+  "select_location": "اختيار موقع",
+  "zoom_in_and_choose": "قم بالتكبير واختر منطقتك باستخدام أداة المستطيل",
+  "select_world": "تحديد عالم",
+  "choose_world": "اختيار عالم",
+  "no_world_selected": "لم يتم تحديد عالم",
+  "start_generation": "بدء البناء",
+  "progress": "التقدم",
+  "custom_selection_confirmed": "تم تأكيد التحديد المخصص!",
+  "error_coordinates_out_of_range": "خطأ: الإحداثيات خارج النطاق أو مرتبة بشكل غير صحيح (مطلوب خط العرض قبل خط الطول).",
+  "invalid_format": "تنسيق غير صالح. استخدم 'lat,lng,lat,lng' أو 'lat lng lat lng'.",
+  "generation_process_started": "بدأت عملية البناء.",
+  "winter_mode": "وضع الشتاء:",
+  "world_scale": "مقياس العالم:",
+  "custom_bounding_box": "مربع الحدود المخصص:",
+  "floodfill_timeout": "مهلة ملء الفيضان (ثواني):",
+  "ground_level": "مستوى الأرض:",
+  "choose_world_modal_title": "اختيار عالم",
+  "select_existing_world": "اختيار عالم موجود مسبقًا",
+  "generate_new_world": "إنشاء عالم جديد",
+  "customization_settings": "إعدادات التخصيص",
+  "footer_text": "© {year} Arnis v{version} من louis-e",
+  "new_version_available": "هناك نسخة جديدة متاحة! انقر هنا لتنزيلها.",
+  "minecraft_directory_not_found": "لم يتم العثور على مجلد ماين كرافت",
+  "world_in_use": "العالم المحدد قيد الاستخدام حاليًا",
+  "failed_to_create_world": "حدث خطأ عند محاولة إنشاء عالم جديد",
+  "no_world_selected_error": "لم يتم تحديد عالم",
+  "select_minecraft_world_first": "يرجى تحديد عالم ماين كرافت أولاً!",
+  "select_location_first": "يرجى اختيار موقع أولاً!",
+  "area_too_large": "تُعتبر هذه المنطقة كبيرة جدًا وقد تتجاوز حدود الحوسبة النموذجية.",
+  "area_extensive": "المنطقة واسعة جدًا وقد تتطلب الكثير من الوقت والموارد.",
+  "selection_confirmed": "تم تأكيد التحديد!",
+  "unknown_error": "خطأ غير معروف",
+  "license_and_credits": "الرخصة والمساهمون",
+  "placeholder_bbox": "الصيغة: lat,lng,lat,lng",
+  "placeholder_floodfill": "ثوانٍ",
+  "placeholder_ground": "مستوى الأرض"
+}

gui-src/locales/de.json

@@ -9,8 +9,6 @@
   "custom_selection_confirmed": "Benutzerdefinierte Auswahl bestätigt!",
   "error_coordinates_out_of_range": "Fehler: Koordinaten sind außerhalb des Bereichs oder falsch geordnet (Lat vor Lng erforderlich).",
   "invalid_format": "Ungültiges Format. Bitte verwende 'lat,lng,lat,lng' oder 'lat lng lat lng'.",
-  "select_a_location_first": "Wähle zuerst einen Standort aus!",
-  "select_a_minecraft_world_first": "Wähle zuerst eine Minecraft Welt aus!",
   "generation_process_started": "Generierungsprozess gestartet.",
   "winter_mode": "Wintermodus:",
   "world_scale": "Weltmaßstab:",
@@ -31,5 +29,10 @@
   "select_location_first": "Wähle zuerst einen Standort aus!",
   "area_too_large": "Dieses Gebiet ist sehr groß und könnte das Berechnungslimit überschreiten.",
   "area_extensive": "Diese Gebietsgröße könnte längere Zeit für die Generierung benötigen.",
-  "selection_confirmed": "Auswahl bestätigt!"
+  "selection_confirmed": "Auswahl bestätigt!",
+  "unknown_error": "Unknown error",
+  "license_and_credits": "License and Credits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Sekunden",
+  "placeholder_ground": "Bodenhöhe"
 }

gui-src/locales/en-US.json

@@ -0,0 +1,38 @@
+{
+  "select_location": "Select Location",
+  "zoom_in_and_choose": "Zoom in and choose your area using the rectangle tool",
+  "select_world": "Select World",
+  "choose_world": "Choose World",
+  "no_world_selected": "No world selected",
+  "start_generation": "Start Generation",
+  "progress": "Progress",
+  "custom_selection_confirmed": "Custom selection confirmed!",
+  "error_coordinates_out_of_range": "Error: Coordinates are out of range or incorrectly ordered (Lat before Lng required).",
+  "invalid_format": "Invalid format. Please use 'lat,lng,lat,lng' or 'lat lng lat lng'.",
+  "generation_process_started": "Generation process started.",
+  "winter_mode": "Winter Mode:",
+  "world_scale": "World Scale:",
+  "custom_bounding_box": "Custom Bounding Box:",
+  "floodfill_timeout": "Floodfill Timeout (sec):",
+  "ground_level": "Ground Level:",
+  "choose_world_modal_title": "Choose World",
+  "select_existing_world": "Select existing world",
+  "generate_new_world": "Generate new world",
+  "customization_settings": "Customization Settings",
+  "footer_text": "© {year} Arnis v{version} by louis-e",
+  "new_version_available": "There's a new version available! Click here to download it.",
+  "minecraft_directory_not_found": "Minecraft directory not found",
+  "world_in_use": "The selected world is currently in use",
+  "failed_to_create_world": "Failed to create new world",
+  "no_world_selected_error": "No world selected",
+  "select_minecraft_world_first": "Select a Minecraft world first!",
+  "select_location_first": "Select a location first!",
+  "area_too_large": "This area is very large and could exceed typical computing limits.",
+  "area_extensive": "The area is quite extensive and may take significant time and resources.",
+  "selection_confirmed": "Selection confirmed!",
+  "unknown_error": "Unknown error",
+  "license_and_credits": "License and Credits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Seconds",
+  "placeholder_ground": "Ground Level"
+}

gui-src/locales/en.json

@@ -1,35 +0,0 @@
-{
-  "select_location": "Select Location",
-  "zoom_in_and_choose": "Zoom in and choose your area using the rectangle tool",
-  "select_world": "Select World",
-  "choose_world": "Choose World",
-  "no_world_selected": "No world selected",
-  "start_generation": "Start Generation",
-  "progress": "Progress",
-  "custom_selection_confirmed": "Custom selection confirmed!",
-  "error_coordinates_out_of_range": "Error: Coordinates are out of range or incorrectly ordered (Lat before Lng required).",
-  "invalid_format": "Invalid format. Please use 'lat,lng,lat,lng' or 'lat lng lat lng'.",
-  "select_a_location_first": "Select a location first!",
-  "select_a_minecraft_world_first": "Select a Minecraft world first!",
-  "generation_process_started": "Generation process started.",
-  "winter_mode": "Winter Mode:",
-  "world_scale": "World Scale:",
-  "custom_bounding_box": "Custom Bounding Box:",
-  "floodfill_timeout": "Floodfill Timeout (sec):",
-  "ground_level": "Ground Level:",
-  "choose_world_modal_title": "Choose World",
-  "select_existing_world": "Select existing world",
-  "generate_new_world": "Generate new world",
-  "customization_settings": "Customization Settings",
-  "footer_text": "© {year} Arnis v{version} by louis-e",
-  "new_version_available": "There's a new version available! Click here to download it.",
-  "minecraft_directory_not_found": "Minecraft directory not found",
-  "world_in_use": "The selected world is currently in use",
-  "failed_to_create_world": "Failed to create new world",
-  "no_world_selected_error": "No world selected",
-  "select_minecraft_world_first": "Select a Minecraft world first!",
-  "select_location_first": "Select a location first!",
-  "area_too_large": "This area is very large and could exceed typical computing limits.",
-  "area_extensive": "The area is quite extensive and may take significant time and resources.",
-  "selection_confirmed": "Selection confirmed!"
-}

gui-src/locales/en.json

@@ -0,0 +1 @@
+en-US.json

gui-src/locales/es.json

@@ -9,8 +9,6 @@
   "custom_selection_confirmed": "¡Selección personalizada confirmada!",
   "error_coordinates_out_of_range": "Error: Las coordenadas están fuera de rango o están ordenadas incorrectamente (Lat antes de Lng requerido).",
   "invalid_format": "Formato inválido. Por favor, use 'lat,lng,lat,lng' o 'lat lng lat lng'.",
-  "select_a_location_first": "¡Seleccione una ubicación primero!",
-  "select_a_minecraft_world_first": "¡Seleccione un mundo de Minecraft primero!",
   "generation_process_started": "Proceso de generación iniciado.",
   "winter_mode": "Modo invierno:",
   "world_scale": "Escala del mundo:",
@@ -31,5 +29,10 @@
   "select_location_first": "¡Seleccione una ubicación primero!",
   "area_too_large": "Esta área es muy grande y podría exceder los límites típicos de computación.",
   "area_extensive": "El área es bastante extensa y puede requerir mucho tiempo y recursos.",
-  "selection_confirmed": "¡Selección confirmada!"
+  "selection_confirmed": "¡Selección confirmada!",
+  "unknown_error": "Unknown error",
+  "license_and_credits": "License and Credits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Seconds",
+  "placeholder_ground": "Ground Level"
 }

gui-src/locales/fi.json

@@ -0,0 +1,38 @@
+{
+  "select_location": "Valitse paikka",
+  "zoom_in_and_choose": "Zoomaa ja valitse paikka käyttämällä suorakulmatyökalua.",
+  "select_world": "Valitse maailma",
+  "choose_world": "Valitse maailma",
+  "no_world_selected": "Maailmaa ei valittu",
+  "start_generation": "Aloita generointi",
+  "progress": "Edistys",
+  "custom_selection_confirmed": "Mukautettu valinta vahvistettu!",
+  "error_coordinates_out_of_range": "Virhe: Koordinaatit ovat kantaman ulkopuolella tai vääriin aseteltu (Lat ennen Lng vaadittu).",
+  "invalid_format": "Väärä formaatti. Käytä 'lat,lng,lat,lng' tai 'lat lng lat lng'.",
+  "generation_process_started": "Luontiprosessi aloitettu.",
+  "winter_mode": "Talvitila:",
+  "world_scale": "Maailmanskaalaus:",
+  "custom_bounding_box": "Mukautettu rajoituslaatikko:",
+  "floodfill_timeout": "Täytön aikakatkaisu (sec):",
+  "ground_level": "Maataso:",
+  "choose_world_modal_title": "Valitse maailma",
+  "select_existing_world": "Valitse olemassa oleva maailma",
+  "generate_new_world": "Luo uusi maailma",
+  "customization_settings": "Kustomisaatio-asetukset",
+  "footer_text": "© {year} Arnis v{version} tekijänä louis-e",
+  "new_version_available": "Uusi versio on saatavilla! Paina tästä ladataksesi sen.",
+  "minecraft_directory_not_found": "Minecraft-hakemistoa ei löytynyt",
+  "world_in_use": "Valittu maailma käytössä.",
+  "failed_to_create_world": "Uuden maailman luonti epäonnistui",
+  "no_world_selected_error": "Maailmaa ei valittu",
+  "select_minecraft_world_first": "Valitse Minecraft-maailma ensin!",
+  "select_location_first": "Valitse paikka ensin!",
+  "area_too_large": "Tämä alue on todella iso ja voi ylittää tyypilliset laskentarajat.",
+  "area_extensive": "Alue on aika laaja ja voi viedä pitkän ajan ja resursseja.",
+  "selection_confirmed": "Valinta vahvistettu!",
+  "unknown_error": "Tuntematon virhe",
+  "license_and_credits": "Lisenssi ja krediitit",
+  "placeholder_bbox": "Formaatti: lat,lng,lat,lng",
+  "placeholder_floodfill": "Sekuntia",
+  "placeholder_ground": "Maataso"
+}

gui-src/locales/fr-FR.json

@@ -0,0 +1,38 @@
+{
+  "select_location": "Sélectionner une localisation",
+  "zoom_in_and_choose": "Zoomez et choisissez une zone avec l'outil de sélection rectangulaire",
+  "select_world": "Sélectionner un monde",
+  "choose_world": "Choisir un monde",
+  "no_world_selected": "Aucun monde sélectionné",
+  "start_generation": "Commencer la génération",
+  "progress": "Progrès",
+  "custom_selection_confirmed": "Sélection personnalisée confirmée !",
+  "error_coordinates_out_of_range": "Erreur: Coordonnées hors de portée ou dans un ordre incorrect (besoin de la latitude avant la longitude).",
+  "invalid_format": "Format invalide. Utilisez 'lat,lng,lat,lng' ou 'lat lng lat lng'.",
+  "generation_process_started": "Processus de génération commencé.",
+  "winter_mode": "Mode hiver:",
+  "world_scale": "Échelle du monde:",
+  "custom_bounding_box": "Cadre de délimitation personnalisé:",
+  "floodfill_timeout": "Expiration du délai de remplissage (en secondes):",
+  "ground_level": "Niveau du sol:",
+  "choose_world_modal_title": "Choisir un monde",
+  "select_existing_world": "Sélectionner un monde existant",
+  "generate_new_world": "Générer un nouveau monde",
+  "customization_settings": "Paramètres de personnalisation",
+  "footer_text": "© {year} Arnis v{version} par louis-e",
+  "new_version_available": "Une nouvelle version est disponible ! Cliquez ici pour la télécharger.",
+  "minecraft_directory_not_found": "Répertoire Minecraft introuvable",
+  "world_in_use": "Le monde sélectionné est en cours d'utilisation",
+  "failed_to_create_world": "Échec de la création du nouveau monde",
+  "no_world_selected_error": "Aucun monde sélectionné",
+  "select_minecraft_world_first": "Sélectionnez d'abord un monde Minecraft !",
+  "select_location_first": "Sélectionnez d'abord une localisation !",
+  "area_too_large": "Cette zone est très grande et pourrait dépasser les limites de calcul courantes.",
+  "area_extensive": "Cette zone est très étendue et pourrait nécessiter beaucoup de ressources et de temps.",
+  "selection_confirmed": "Sélection confirmée !",
+  "unknown_error": "Erreur inconnue",
+  "license_and_credits": "Licence et crédits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Secondes",
+  "placeholder_ground": "Niveau du sol"
+}

gui-src/locales/hu.json

@@ -0,0 +1,38 @@
+{
+  "select_location": "Hely kiválasztása",
+  "zoom_in_and_choose": "Közelíts és válaszd ki a területet a téglalap eszköz segítségével",
+  "select_world": "Világ kijelölése",
+  "choose_world": "Világ kiválasztása",
+  "no_world_selected": "Nincs világ kiválasztva",
+  "start_generation": "Generálás indítása",
+  "progress": "Haladás",
+  "custom_selection_confirmed": "Egyéni kiválasztás megerősítve",
+  "error_coordinates_out_of_range": "Hiba: A koordináták tartományon kívül vannak vagy hibásan rendezettek (a szélességi foknak a hosszúsági fok előtt kell lennie)",
+  "invalid_format": "Érvénytelen formátum. Kérjük, használja a 'lat,lng,lat,lng' vagy a 'lat lng lat lng' formátumot.'.",
+  "generation_process_started": "Generálási folyamat elkezdődött",
+  "winter_mode": "Téli mód",
+  "world_scale": "Világ nagysága",
+  "custom_bounding_box": "Egyéni határoló keret",
+  "floodfill_timeout": "Floodfill Timeout (sec):",
+  "ground_level": "Földszint",
+  "choose_world_modal_title": "Világ kiválasztása",
+  "select_existing_world": "Már létező világ kiválasztása",
+  "generate_new_world": "Új világ generálása",
+  "customization_settings": "Testreszabási lehetőségek",
+  "footer_text": "© {year} Arnis v{version} by louis-e",
+  "new_version_available": "Egy új verzió elérhető kattints ide hogy letöltsd",
+  "minecraft_directory_not_found": "Minecraft mappa nem található",
+  "world_in_use": "A kiválasztott világ már használatban van",
+  "failed_to_create_world": "Nem sikerült új világot létrehozni",
+  "no_world_selected_error": "Nincs kiválasztott világ",
+  "select_minecraft_world_first": "Válassz ki egy Minecraft világot először!",
+  "select_location_first": "Válassz egy helyet először!",
+  "area_too_large": "Ez a terület nagyon nagy, és meghaladhatja a szokásos számítási korlátokat.",
+  "area_extensive": "A terület meglehetősen kiterjedt, és jelentős időt és erőforrásokat igényelhet.",
+  "selection_confirmed": "Kiválasztás megerősítve",
+  "unknown_error": "Ismeretlen hiba",
+  "license_and_credits": "Licenc és elismerés.",
+  "placeholder_bbox": "Formátum: lat,lng,lat,lng",
+  "placeholder_floodfill": "Másodpercek",
+  "placeholder_ground": "Földszint"
+}

gui-src/locales/ko.json

@@ -1,35 +1,38 @@
 {
-"select_location": "장소 선택",
-"zoom_in_and_choose": "줌 인하고 직사각형 도구를 사용하여 영역을 선택하세요.",
-"select_world": "세계 선택",
-"choose_world": "세계 선택",
-"no_world_selected": "선택된 세계 없음",
-"start_generation": "생성 시작",
-"progress": "진행",
-"custom_selection_confirmed": "사용자 지정 선택이 확인되었습니다!",
-"error_coordinates_out_of_range": "오류: 좌표가 범위를 벗어나거나 잘못된 순서입니다 (Lat이 Lng보다 먼저 필요합니다).",
-"invalid_format": "잘못된 형식입니다. 'lat,lng,lat,lng' 또는 'lat lng lat lng' 형식을 사용하세요.",
-"select_a_location_first": "먼저 위치를 선택하세요!",
-"select_a_minecraft_world_first": "먼저 마인크래프트 세계를 선택하세요!",
-"generation_process_started": "생성 프로세스가 시작되었습니다.",
-"winter_mode": "겨울 모드:",
-"world_scale": "세계 규모:",
-"custom_bounding_box": "사용자 지정 경계 상자:",
-"floodfill_timeout": "채우기 시간 초과 (초):",
-"ground_level": "지면 레벨:",
-"choose_world_modal_title": "세계 선택",
-"select_existing_world": "이미 존재하는 세계 선택",
-"generate_new_world": "새 세계 생성",
-"customization_settings": "사용자 지정 설정",
-"footer_text": "© {year} Arnis v{version} by louis-e",
-"new_version_available": "새로운 버전이 있습니다! 여기를 클릭하여 다운로드하세요.",
-"minecraft_directory_not_found": "마인크래프트 디렉토리가 발견되지 않았습니다",
-"world_in_use": "선택한 세계가 현재 사용 중입니다",
-"failed_to_create_world": "새 세계 생성에 실패했습니다",
-"no_world_selected_error": "선택된 세계 없음 오류",
-"select_minecraft_world_first": "먼저 마인크래프트 세계를 선택하세요!",
-"select_location_first": "먼저 위치를 선택하세요!",
-"area_too_large": "이 지역은 매우 크고, 일반적인 계산 한계를 초과할 수 있습니다.",
-"area_extensive": "이 지역은 꽤 광범위하여 значитель한 시간과 자원이 필요할 수 있습니다.",
-"selection_confirmed": "선택이 확인되었습니다!"
+  "select_location": "장소 선택",
+  "zoom_in_and_choose": "줌 인하고 직사각형 도구를 사용하여 영역을 선택하세요.",
+  "select_world": "세계 선택",
+  "choose_world": "세계 선택",
+  "no_world_selected": "선택된 세계 없음",
+  "start_generation": "생성 시작",
+  "progress": "진행",
+  "custom_selection_confirmed": "사용자 지정 선택이 확인되었습니다!",
+  "error_coordinates_out_of_range": "오류: 좌표가 범위를 벗어나거나 잘못된 순서입니다 (Lat이 Lng보다 먼저 필요합니다).",
+  "invalid_format": "잘못된 형식입니다. 'lat,lng,lat,lng' 또는 'lat lng lat lng' 형식을 사용하세요.",
+  "generation_process_started": "생성 프로세스가 시작되었습니다.",
+  "winter_mode": "겨울 모드:",
+  "world_scale": "세계 규모:",
+  "custom_bounding_box": "사용자 지정 경계 상자:",
+  "floodfill_timeout": "채우기 시간 초과 (초):",
+  "ground_level": "지면 레벨:",
+  "choose_world_modal_title": "세계 선택",
+  "select_existing_world": "이미 존재하는 세계 선택",
+  "generate_new_world": "새 세계 생성",
+  "customization_settings": "사용자 지정 설정",
+  "footer_text": "© {year} Arnis v{version} by louis-e",
+  "new_version_available": "새로운 버전이 있습니다! 여기를 클릭하여 다운로드하세요.",
+  "minecraft_directory_not_found": "마인크래프트 디렉토리가 발견되지 않았습니다",
+  "world_in_use": "선택한 세계가 현재 사용 중입니다",
+  "failed_to_create_world": "새 세계 생성에 실패했습니다",
+  "no_world_selected_error": "선택된 세계 없음 오류",
+  "select_minecraft_world_first": "먼저 마인크래프트 세계를 선택하세요!",
+  "select_location_first": "먼저 위치를 선택하세요!",
+  "area_too_large": "이 지역은 매우 크고, 일반적인 계산 한계를 초과할 수 있습니다.",
+  "area_extensive": "이 지역은 꽤 광범위하여 значитель한 시간과 자원이 필요할 수 있습니다.",
+  "selection_confirmed": "선택이 확인되었습니다!",
+  "unknown_error": "Unknown error",
+  "license_and_credits": "License and Credits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Seconds",
+  "placeholder_ground": "Ground Level"
 }

gui-src/locales/lt.json

@@ -0,0 +1,39 @@
+{
+  "select_location": "Vietos pasirinkimas",
+  "zoom_in_and_choose": "Pasididinkite žemėlapį ir pasirinkite plotą su kvadrato įrankiu",
+  "select_world": "Pasaulio pasirinkimas",
+  "choose_world": "Pasirinkti pasaulį",
+  "no_world_selected": "Pasaulis nepasirinktas",
+  "start_generation": "Pradėti generaciją",
+  "progress": "Progresas",
+  "custom_selection_confirmed": "Rėmo pasirinkimas patvirtintas!",
+  "error_coordinates_out_of_range": "Klaida: Koordinatės yra už ribų arba neteisingai išdėstytos (plat turi būti prieš ilg).",
+  "invalid_format": "Neteisingas formatas. Prašome naudoti 'plat,ilg,plat,ilg' arba 'plat ilg plat ilg'.",
+  "generation_process_started": "Generacijos procesas pradėtas.",
+  "terrain": "Reljefas:",
+  "winter_mode": "Žiemos režimas:",
+  "world_scale": "Pasaulio mastelis:",
+  "custom_bounding_box": "Pasirinktinis ribos rėmas:",
+  "floodfill_timeout": "Užpildymo laiko limitas (sek.):",
+  "ground_level": "Žemės lygis:",
+  "choose_world_modal_title": "Pasaulio pasirinkimas",
+  "select_existing_world": "Pasirinkti esamą pasaulį",
+  "generate_new_world": "Sugeneruoti naują pasaulį",
+  "customization_settings": "Generacijos nustatymai",
+  "footer_text": "© {year} „Arnis“ v{version} sukurta louis-e",
+  "new_version_available": "Surasta nauja versija! Spauskite čia kad ją atsisiųstumėte.",
+  "minecraft_directory_not_found": "Nerastas „Minecraft“ aplankas",
+  "world_in_use": "Pasirinktas pasaulis dabar užimtas",
+  "failed_to_create_world": "Klaida sukuriant naują pasaulį",
+  "no_world_selected_error": "Nėra pasirinktas pasaulis",
+  "select_minecraft_world_first": "Pirma pasirinkite „Minecraft“ pasaulį!",
+  "select_location_first": "Pirma pasirinkite vietą!",
+  "area_too_large": "Šis plotas yra labai didelis ir gali viršyti tipinius resursų limitus.",
+  "area_extensive": "Šis plotas yra pakankamai didelis kuriam reikėtų daug laiko ir resursų.",
+  "selection_confirmed": "Pasirinkimas patvirtintas!",
+  "unknown_error": "Nežinoma klaida",
+  "license_and_credits": "Licencija ir padėkos",
+  "placeholder_bbox": "Formatas: plat,lyg,plat,lyg",
+  "placeholder_floodfill": "Sekundės",
+  "placeholder_ground": "Žemės lygis"
+}

gui-src/locales/pl.json

@@ -1,35 +1,39 @@
 {
-    "select_location": "Wybierz lokalizację",
-    "zoom_in_and_choose": "Przybliż i zaznacz obszar za pomocą prostokątnego narzędzia",
-    "select_world": "Wybierz świat",
-    "choose_world": "Wybierz świat",
-    "no_world_selected": "Nie wybrano świata",
-    "start_generation": "Rozpocznij generowanie",
-    "progress": "Postęp",
-    "custom_selection_confirmed": "Niestandardowy wybór potwierdzony!",
-    "error_coordinates_out_of_range": "Błąd: Współrzędne są poza zakresem lub nieprawidłowo uporządkowane (wymagane Lat przed Lng).",
-    "invalid_format": "Nieprawidłowy format. Użyj 'lat,lng,lat,lng' lub 'lat lng lat lng'.",
-    "select_a_location_first": "Najpierw wybierz lokalizację!",
-    "select_a_minecraft_world_first": "Najpierw wybierz świat Minecrafta!",
-    "generation_process_started": "Proces generowania rozpoczęty.",
-    "winter_mode": "Tryb zimowy:",
-    "world_scale": "Skala świata:",
-    "custom_bounding_box": "Niestandardowe obramowanie obszaru:",
-    "floodfill_timeout": "Limit czasu wypełniania (sek):",
-    "ground_level": "Wysokość obszaru:",
-    "choose_world_modal_title": "Wybierz świat",
-    "select_existing_world": "Wybierz istniejący świat",
-    "generate_new_world": "Generuj nowy świat",
-    "customization_settings": "Ustawienia personalizacji",
-    "footer_text": "© {year} Arnis v{version} przez louis-e",
-    "new_version_available": "Dostępna jest nowa wersja! Kliknij tutaj, aby ją pobrać.",
-    "minecraft_directory_not_found": "Nie znaleziono katalogu Minecrafta",
-    "world_in_use": "Wybrany świat jest obecnie używany",
-    "failed_to_create_world": "Nie udało się utworzyć nowego świata",
-    "no_world_selected_error": "Nie wybrano świata",
-    "select_minecraft_world_first": "Najpierw wybierz świat Minecrafta!",
-    "select_location_first": "Najpierw wybierz lokalizację!",
-    "area_too_large": "Ten obszar jest bardzo duży i może przekroczyć typowe limity obliczeniowe.",
-    "area_extensive": "Ten obszar jest dość rozległy i może wymagać znacznego czasu i zasobów.",
-    "selection_confirmed": "Wybór potwierdzony!"
-  }
+  "select_location": "Wybierz lokalizację",
+  "zoom_in_and_choose": "Przybliż i zaznacz obszar za pomocą prostokąta",
+  "select_world": "Wybierz świat",
+  "choose_world": "Wybierz świat",
+  "no_world_selected": "Nie wybrano świata",
+  "start_generation": "Rozpocznij generowanie",
+  "progress": "Postęp",
+  "custom_selection_confirmed": "Niestandardowy wybór potwierdzony!",
+  "error_coordinates_out_of_range": "Błąd: Współrzędne są poza zakresem lub w złej kolejności (wymagana szerokość przed długością).",
+  "invalid_format": "Nieprawidłowy format. Użyj 'szer.,dł.,szer.,dł.' lub 'szer. dł. szer. dł.'.",
+  "generation_process_started": "Proces generowania rozpoczęty.",
+  "terrain": "Teren:",
+  "winter_mode": "Tryb Zimowy:",
+  "world_scale": "Skala świata:",
+  "custom_bounding_box": "Niestandardowy obszar:",
+  "floodfill_timeout": "Limit czasu wypełniania (sek):",
+  "ground_level": "Wysokość obszaru:",
+  "choose_world_modal_title": "Wybierz świat",
+  "select_existing_world": "Wybierz istniejący świat",
+  "generate_new_world": "Generuj nowy świat",
+  "customization_settings": "Ustawienia personalizacji",
+  "footer_text": "© {year} Arnis v{version} autorstwa louis-e",
+  "new_version_available": "Dostępna jest nowa wersja! Kliknij tutaj, aby ją pobrać.",
+  "minecraft_directory_not_found": "Nie znaleziono katalogu Minecrafta",
+  "world_in_use": "Wybrany świat jest obecnie używany",
+  "failed_to_create_world": "Nie udało się utworzyć świata",
+  "no_world_selected_error": "Nie wybrano świata",
+  "select_minecraft_world_first": "Najpierw wybierz świat Minecrafta!",
+  "select_location_first": "Najpierw wybierz lokalizację!",
+  "area_too_large": "Ten obszar jest bardzo duży i może przekroczyć limity obliczeniowe.",
+  "area_extensive": "Ten obszar jest rozległy i może pochłonąć dużo czasu oraz zasobów.",
+  "selection_confirmed": "Wybór potwierdzony!",
+  "unknown_error": "Nieznany błąd",
+  "license_and_credits": "Licencja i autorzy",
+  "placeholder_bbox": "Format: szer,dł,szer,dł",
+  "placeholder_floodfill": "Sekundy",
+  "placeholder_ground": "Wysokość"
+}

gui-src/locales/ru.json

@@ -9,9 +9,8 @@
   "custom_selection_confirmed": "Пользовательский выбор подтвержден!",
   "error_coordinates_out_of_range": "Ошибка: Координаты находятся вне зоны действия или указаны в неправильном порядке (сначала широта, затем долгота)",
   "invalid_format": "Неверный формат. Используйте 'широта,долгота,широта,долгота' или 'широта долгота широта долгота'",
-  "select_a_location_first": "Сначала выберите местоположение!",
-  "select_a_minecraft_world_first": "Сначала выберите мир Minecraft!",
   "generation_process_started": "Процесс генерации начат",
+  "terrain": "Рельеф",
   "winter_mode": "Зимний режим:",
   "world_scale": "Масштаб мира:",
   "custom_bounding_box": "Пользовательская ограничивающая рамка:",
@@ -31,5 +30,10 @@
   "select_location_first": "Сначала выберите местоположение!",
   "area_too_large": "Эта область слишком велика и может превысить типичные вычислительные ограничения",
   "area_extensive": "Область довольно обширна и может потребовать значительного времени и ресурсов",
-  "selection_confirmed": "Выбор подтвержден!"
+  "selection_confirmed": "Выбор подтвержден!",
+  "unknown_error": "Неизвестная ошибка",
+  "license_and_credits": "Лицензия и авторы",
+  "placeholder_bbox": "Формат: широта,долгота,широта,долгота",
+  "placeholder_floodfill": "Секунды",
+  "placeholder_ground": "Уровень земли"
 }

gui-src/locales/sv.json

@@ -9,8 +9,6 @@
   "custom_selection_confirmed": "Anpassad markering bekräftad!",
   "error_coordinates_out_of_range": "Fel: Koordinater är utanför området eller felaktigt ordnade (Lat före Lng krävs).",
   "invalid_format": "Ogiltigt format. Använd 'lat,lng,lat,lng' eller 'lat lng lat lng'.",
-  "select_a_location_first": "Välj en plats först!",
-  "select_a_minecraft_world_first": "Välj en Minecraft-värld först!",
   "generation_process_started": "Genereringsprocessen startad.",
   "winter_mode": "Vinterläge:",
   "world_scale": "Världsskala:",
@@ -31,5 +29,10 @@
   "select_location_first": "Välj plats först!",
   "area_too_large": "Detta område är mycket stort och kan överskrida vanliga beräkningsgränser.",
   "area_extensive": "Området är ganska extensivt och kan ta betydande tid och resurser.",
-  "selection_confirmed": "Val bekräftat!"
+  "selection_confirmed": "Val bekräftat!",
+  "unknown_error": "Unknown error",
+  "license_and_credits": "License and Credits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Seconds",
+  "placeholder_ground": "Ground Level"
 }

gui-src/locales/ua.json

@@ -9,8 +9,6 @@
   "custom_selection_confirmed": "Користувацький вибір підтверджено!",
   "error_coordinates_out_of_range": "Помилка: Координати поза діапазоном або неправильно впорядковані (потрібно широта перед довгота)",
   "invalid_format": "Неправильний формат. Будь ласка, використовуйте 'широта,довгота,широта,довгота' або 'широта довгота широта довгота'",
-  "select_a_location_first": "Спочатку оберіть місцезнахождення!",
-  "select_a_minecraft_world_first": "Спочатку оберіть світ Minecraft!",
   "generation_process_started": "Процес генерації розпочато",
   "winter_mode": "Зимовий режим:",
   "world_scale": "Масштаб світу:",
@@ -31,5 +29,10 @@
   "select_location_first": "Спочатку виберіть місцезнаходження!",
   "area_too_large": "Ця область дуже велика і може перевищити типові обчислювальні межі",
   "area_extensive": "Область досить велика і може вимагати значного часу та ресурсів",
-  "selection_confirmed": "Вибір підтверджено!"
-}
+  "selection_confirmed": "Вибір підтверджено!",
+  "unknown_error": "Unknown error",
+  "license_and_credits": "License and Credits",
+  "placeholder_bbox": "Format: lat,lng,lat,lng",
+  "placeholder_floodfill": "Seconds",
+  "placeholder_ground": "Ground Level"
+}

gui-src/locales/zh-CN.json

@@ -9,8 +9,6 @@
   "custom_selection_confirmed": "自定义选择已确认！",
   "error_coordinates_out_of_range": "错误：坐标超出范围或顺序不正确（需要先纬度后经度）。",
   "invalid_format": "格式无效。请使用 'lat,lng,lat,lng' 或 'lat lng lat lng'。",
-  "select_a_location_first": "请先选择一个位置！",
-  "select_a_minecraft_world_first": "请先选择一个 Minecraft 世界！",
   "generation_process_started": "生成过程已开始。",
   "winter_mode": "冬季模式：",
   "world_scale": "世界比例：",
@@ -31,5 +29,10 @@
   "select_location_first": "请先选择一个位置！",
   "area_too_large": "该区域非常大，可能会超出典型的计算限制。",
   "area_extensive": "该区域相当广泛，可能需要大量时间和资源。",
-  "selection_confirmed": "选择已确认！"
+  "selection_confirmed": "选择已确认！",
+  "unknown_error": "未知错误",
+  "license_and_credits": "许可证和致谢",
+  "placeholder_bbox": "格式: lat,lng,lat,lng",
+  "placeholder_floodfill": "秒",
+  "placeholder_ground": "地面高度"
 }

src/args.rs

@@ -1,4 +1,5 @@
-use clap::{ArgGroup, Parser};
+use crate::bbox::BBox;
+use clap::Parser;
 use colored::Colorize;
 use std::path::Path;
 use std::process::exit;
@@ -7,22 +8,17 @@ use std::time::Duration;
 /// Command-line arguments parser
 #[derive(Parser, Debug)]
 #[command(author, version, about)]
-#[command(group(
-    ArgGroup::new("location")
-        .required(true)
-        .args(&["bbox", "file"])
-))]
 pub struct Args {
     /// Bounding box of the area (min_lng,min_lat,max_lng,max_lat) (required)
-    #[arg(long, allow_hyphen_values = true)]
-    pub bbox: Option<String>,
+    #[arg(long, allow_hyphen_values = true, value_parser = BBox::from_str)]
+    pub bbox: BBox,
 
     /// JSON file containing OSM data (optional)
-    #[arg(long)]
+    #[arg(long, group = "location")]
     pub file: Option<String>,
 
     /// Path to the Minecraft world (required)
-    #[arg(long, required = true)]
+    #[arg(long)]
     pub path: String,
 
     /// Downloader method (requests/curl/wget) (optional)
@@ -30,19 +26,21 @@ pub struct Args {
     pub downloader: String,
 
     /// World scale to use, in blocks per meter
-    #[arg(long, default_value = "1.0")]
+    #[arg(long, default_value_t = 1.0)]
     pub scale: f64,
 
     /// Ground level to use in the Minecraft world
     #[arg(long, default_value_t = -62)]
     pub ground_level: i32,
 
-    /// Enable winter mode (default: false)
-    #[arg(long, default_value_t = false)]
-    pub winter: bool,
-
+    /// Enable terrain (optional)
+    #[arg(long)]
+    pub terrain: bool,
+    /// Enable filling ground (optional)
+    #[arg(long, default_value_t = false, action = clap::ArgAction::SetFalse)]
+    pub fillground: bool,
     /// Enable debug mode (optional)
-    #[arg(long, default_value_t = false, action = clap::ArgAction::SetTrue)]
+    #[arg(long)]
     pub debug: bool,
 
     /// Set floodfill timeout (seconds) (optional)
@@ -63,41 +61,53 @@ impl Args {
             );
             exit(1);
         }
-
-        // Validating bbox if provided
-        if let Some(bbox) = &self.bbox {
-            if !validate_bounding_box(bbox) {
-                eprintln!("{}", "Error! Invalid bbox input".red().bold());
-                exit(1);
-            }
-        }
     }
 }
 
-/// Validates the bounding box string
-fn validate_bounding_box(bbox: &str) -> bool {
-    let parts: Vec<&str> = bbox.split(',').collect();
-    if parts.len() != 4 {
-        return false;
-    }
-
-    let min_lng: f64 = parts[0].parse().ok().unwrap_or(0.0);
-    let min_lat: f64 = parts[1].parse().ok().unwrap_or(0.0);
-    let max_lng: f64 = parts[2].parse().ok().unwrap_or(0.0);
-    let max_lat: f64 = parts[3].parse().ok().unwrap_or(0.0);
-
-    if !(-180.0..=180.0).contains(&min_lng) || !(-180.0..=180.0).contains(&max_lng) {
-        return false;
-    }
-
-    if !(-90.0..=90.0).contains(&min_lat) || !(-90.0..=90.0).contains(&max_lat) {
-        return false;
-    }
-
-    min_lng < max_lng && min_lat < max_lat
-}
-
 fn parse_duration(arg: &str) -> Result<std::time::Duration, std::num::ParseIntError> {
     let seconds = arg.parse()?;
     Ok(std::time::Duration::from_secs(seconds))
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_flags() {
+        // Test that terrain/debug are SetTrue
+        let cmd = [
+            "arnis",
+            "--path",
+            "",
+            "--bbox",
+            "1,2,3,4",
+            "--terrain",
+            "--debug",
+        ];
+        let args = Args::parse_from(cmd.iter());
+        assert!(args.debug);
+        assert!(args.terrain);
+
+        let cmd = ["arnis", "--path", "", "--bbox", "1,2,3,4"];
+        let args = Args::parse_from(cmd.iter());
+        assert!(!args.debug);
+        assert!(!args.terrain);
+    }
+
+    #[test]
+    fn test_required_options() {
+        let cmd = ["arnis"];
+        assert!(Args::try_parse_from(cmd.iter()).is_err());
+
+        let cmd = ["arnis", "--path", "", "--bbox", "1,2,3,4"];
+        assert!(Args::try_parse_from(cmd.iter()).is_ok());
+
+        let cmd = ["arnis", "--path", "", "--file", ""];
+        assert!(Args::try_parse_from(cmd.iter()).is_err());
+
+        // The --gui flag isn't used here, ugh. TODO clean up main.rs and its argparse usage.
+        // let cmd = ["arnis", "--gui"];
+        // assert!(Args::try_parse_from(cmd.iter()).is_ok());
+    }
+}

src/bbox.rs

@@ -0,0 +1,101 @@
+use crate::geo_coord::GeoCoord;
+
+/// A checked Bounding Box.
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub struct BBox {
+    /// The "bottom-left" vertex of the rectangle
+    min: GeoCoord,
+
+    /// The "top-right" vertex of the rectangle
+    max: GeoCoord,
+}
+
+impl BBox {
+    pub fn new(min_lat: f64, min_lng: f64, max_lat: f64, max_lng: f64) -> Result<Self, String> {
+        let vals_in_order = min_lng < max_lng && min_lat < max_lat;
+
+        if !vals_in_order {
+            return Err("Invalid BBox".to_string());
+        }
+
+        let min = GeoCoord::new(min_lat, min_lng)?;
+        let max = GeoCoord::new(max_lat, max_lng)?;
+
+        Ok(Self { min, max })
+    }
+
+    pub fn from_str(s: &str) -> Result<Self, String> {
+        let [min_lat, min_lng, max_lat, max_lng]: [f64; 4] = s
+            .split([',', ' '])
+            .map(|e| e.parse().unwrap())
+            .collect::<Vec<_>>()
+            .try_into()
+            .unwrap();
+
+        // So, the GUI does Lat/Lng and no GDAL (comma-sep values), which is the exact opposite of
+        // what bboxfinder.com does. :facepalm: (bboxfinder is wrong here: Lat comes first!)
+        // DO NOT MODIFY THIS! It's correct. The CLI/GUI is passing you the numbers incorrectly.
+        Self::new(min_lat, min_lng, max_lat, max_lng)
+    }
+
+    pub fn min(&self) -> GeoCoord {
+        self.min
+    }
+
+    pub fn max(&self) -> GeoCoord {
+        self.max
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_valid_input() {
+        assert!(BBox::new(0., 0., 1., 1.).is_ok());
+
+        assert!(BBox::new(1., 2., 3., 4.).is_ok());
+
+        // Arnis, Germany
+        assert!(BBox::new(9.927928, 54.627053, 9.937563, 54.634902).is_ok());
+    }
+
+    #[test]
+    fn test_from_str_commas() {
+        const ARNIS_STR: &str = "9.927928,54.627053,9.937563,54.634902";
+
+        let bbox_result = BBox::from_str(ARNIS_STR);
+        assert!(bbox_result.is_ok());
+
+        let arnis_correct: BBox = BBox {
+            min: GeoCoord::new(9.927928, 54.627053).unwrap(),
+            max: GeoCoord::new(9.937563, 54.634902).unwrap(),
+        };
+
+        assert_eq!(bbox_result.unwrap(), arnis_correct);
+    }
+
+    #[test]
+    fn test_from_str_spaces() {
+        const ARNIS_SPACE_STR: &str = "9.927928 54.627053 9.937563 54.634902";
+
+        let bbox_result = BBox::from_str(ARNIS_SPACE_STR);
+        assert!(bbox_result.is_ok());
+
+        let arnis_correct: BBox = BBox {
+            min: GeoCoord::new(9.927928, 54.627053).unwrap(),
+            max: GeoCoord::new(9.937563, 54.634902).unwrap(),
+        };
+
+        assert_eq!(bbox_result.unwrap(), arnis_correct);
+    }
+
+    #[test]
+    fn test_out_of_order() {
+        // Violates values in vals_in_order
+        assert!(BBox::new(0., 0., 0., 0.).is_err());
+        assert!(BBox::new(1., 0., 0., 1.).is_err());
+        assert!(BBox::new(0., 1., 1., 0.).is_err());
+    }
+}

src/block_definitions.rs

@@ -22,7 +22,7 @@ impl Block {
     }
 
     pub fn namespace(&self) -> &str {
-        "mincraft"
+        "minecraft"
     }
 
     pub fn name(&self) -> &str {
@@ -56,7 +56,7 @@ impl Block {
             26 => "glowstone",
             27 => "granite",
             28 => "grass_block",
-            29 => "tall_grass",
+            29 => "short_grass",
             30 => "gravel",
             31 => "gray_concrete",
             32 => "gray_terracotta",
@@ -141,12 +141,39 @@ impl Block {
             111 => "snow_block",
             112 => "snow",
             113 => "oak_sign",
+            114 => "andesite_wall",
+            115 => "stone_brick_wall",
+            116..=125 => "rail",
+            126 => "coarse_dirt",
+            127 => "iron_ore",
+            128 => "coal_ore",
+            129 => "gold_ore",
+            130 => "copper_ore",
+            131 => "clay",
+            132 => "dirt_path",
+            133 => "ice",
+            134 => "packed_ice",
+            135 => "mud",
+            136 => "dead_bush",
+            137..=138 => "tall_grass",
             _ => panic!("Invalid id"),
         }
     }
 
     pub fn properties(&self) -> Option<Value> {
         match self.id {
+            3 => Some(Value::Compound({
+                let mut map: HashMap<String, Value> = HashMap::new();
+                map.insert("persistent".to_string(), Value::String("true".to_string()));
+                map
+            })),
+
+            49 => Some(Value::Compound({
+                let mut map: HashMap<String, Value> = HashMap::new();
+                map.insert("persistent".to_string(), Value::String("true".to_string()));
+                map
+            })),
+
             105 => Some(Value::Compound({
                 let mut map: HashMap<String, Value> = HashMap::new();
                 map.insert("age".to_string(), Value::String("7".to_string()));
@@ -187,6 +214,90 @@ impl Block {
                 map
             })),
 
+            116 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert(
+                    "shape".to_string(),
+                    Value::String("north_south".to_string()),
+                );
+                map
+            })),
+
+            117 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("shape".to_string(), Value::String("east_west".to_string()));
+                map
+            })),
+
+            118 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert(
+                    "shape".to_string(),
+                    Value::String("ascending_east".to_string()),
+                );
+                map
+            })),
+
+            119 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert(
+                    "shape".to_string(),
+                    Value::String("ascending_west".to_string()),
+                );
+                map
+            })),
+
+            120 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert(
+                    "shape".to_string(),
+                    Value::String("ascending_north".to_string()),
+                );
+                map
+            })),
+
+            121 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert(
+                    "shape".to_string(),
+                    Value::String("ascending_south".to_string()),
+                );
+                map
+            })),
+
+            122 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("shape".to_string(), Value::String("north_east".to_string()));
+                map
+            })),
+
+            123 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("shape".to_string(), Value::String("north_west".to_string()));
+                map
+            })),
+
+            124 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("shape".to_string(), Value::String("south_east".to_string()));
+                map
+            })),
+
+            125 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("shape".to_string(), Value::String("south_west".to_string()));
+                map
+            })),
+            137 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("half".to_string(), Value::String("lower".to_string()));
+                map
+            })),
+            138 => Some(Value::Compound({
+                let mut map = HashMap::new();
+                map.insert("half".to_string(), Value::String("upper".to_string()));
+                map
+            })),
             _ => None,
         }
     }
@@ -301,6 +412,8 @@ pub const YELLOW_TERRACOTTA: Block = Block::new(104);
 pub const SNOW_BLOCK: Block = Block::new(111);
 pub const SNOW_LAYER: Block = Block::new(112);
 pub const SIGN: Block = Block::new(113);
+pub const ANDESITE_WALL: Block = Block::new(114);
+pub const STONE_BRICK_WALL: Block = Block::new(115);
 
 pub const CARROTS: Block = Block::new(105);
 pub const DARK_OAK_DOOR_LOWER: Block = Block::new(106);
@@ -310,96 +423,115 @@ pub const WHEAT: Block = Block::new(109);
 
 pub const BEDROCK: Block = Block::new(110);
 
+pub const RAIL_NORTH_SOUTH: Block = Block::new(116);
+pub const RAIL_EAST_WEST: Block = Block::new(117);
+pub const RAIL_ASCENDING_EAST: Block = Block::new(118);
+pub const RAIL_ASCENDING_WEST: Block = Block::new(119);
+pub const RAIL_ASCENDING_NORTH: Block = Block::new(120);
+pub const RAIL_ASCENDING_SOUTH: Block = Block::new(121);
+pub const RAIL_NORTH_EAST: Block = Block::new(122);
+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);
+pub const GOLD_ORE: Block = Block::new(129);
+pub const COPPER_ORE: Block = Block::new(130);
+pub const CLAY: Block = Block::new(131);
+pub const DIRT_PATH: Block = Block::new(132);
+pub const ICE: Block = Block::new(133);
+pub const PACKED_ICE: Block = Block::new(134);
+pub const MUD: Block = Block::new(135);
+pub const DEAD_BUSH: Block = Block::new(136);
+pub const TALL_GRASS_BOTTOM: Block = Block::new(137);
+pub const TALL_GRASS_TOP: Block = Block::new(138);
+
 // Variations for building corners
-pub fn building_corner_variations() -> Vec<Block> {
-    vec![
-        STONE_BRICKS,
-        COBBLESTONE,
-        BRICK,
-        MOSSY_COBBLESTONE,
-        SANDSTONE,
-        RED_NETHER_BRICKS,
-        BLACKSTONE,
-        SMOOTH_QUARTZ,
-        CHISELED_STONE_BRICKS,
-        POLISHED_BASALT,
-        CUT_SANDSTONE,
-        POLISHED_BLACKSTONE_BRICKS,
-        ANDESITE,
-        GRANITE,
-        DIORITE,
-        CRACKED_STONE_BRICKS,
-        PRISMARINE,
-        BLUE_TERRACOTTA,
-        NETHER_BRICK,
-        QUARTZ_BRICKS,
-    ]
-}
+pub static BUILDING_CORNER_VARIATIONS: [Block; 20] = [
+    STONE_BRICKS,
+    COBBLESTONE,
+    BRICK,
+    MOSSY_COBBLESTONE,
+    SANDSTONE,
+    RED_NETHER_BRICKS,
+    BLACKSTONE,
+    SMOOTH_QUARTZ,
+    CHISELED_STONE_BRICKS,
+    POLISHED_BASALT,
+    CUT_SANDSTONE,
+    POLISHED_BLACKSTONE_BRICKS,
+    ANDESITE,
+    GRANITE,
+    DIORITE,
+    CRACKED_STONE_BRICKS,
+    PRISMARINE,
+    BLUE_TERRACOTTA,
+    NETHER_BRICK,
+    QUARTZ_BRICKS,
+];
 
 // Variations for building walls
 pub fn building_wall_variations() -> Vec<Block> {
-    building_wall_color_map()
+    BUILDING_WALL_COLOR_MAP
         .into_iter()
         .map(|(_, block)| block)
         .collect()
 }
 
 // https://wiki.openstreetmap.org/wiki/Key:building:colour
-pub fn building_wall_color_map() -> Vec<(RGBTuple, Block)> {
-    vec![
-        ((233, 107, 57), BRICK),
-        ((18, 12, 13), CRACKED_POLISHED_BLACKSTONE_BRICKS),
-        ((76, 127, 153), CYAN_CONCRETE),
-        ((0, 0, 0), DEEPSLATE_BRICKS),
-        ((186, 195, 142), END_STONE_BRICKS),
-        ((57, 41, 35), GRAY_TERRACOTTA),
-        ((112, 108, 138), LIGHT_BLUE_TERRACOTTA),
-        ((122, 92, 66), MUD_BRICKS),
-        ((24, 13, 14), NETHER_BRICKS),
-        ((159, 82, 36), ORANGE_TERRACOTTA),
-        ((128, 128, 128), POLISHED_ANDESITE),
-        ((174, 173, 174), POLISHED_DIORITE),
-        ((141, 101, 142), PURPUR_PILLAR),
-        ((142, 60, 46), RED_TERRACOTTA),
-        ((153, 83, 28), SMOOTH_RED_SANDSTONE),
-        ((224, 216, 175), SMOOTH_SANDSTONE),
-        ((188, 182, 179), SMOOTH_STONE),
-        ((35, 86, 85), WARPED_PLANKS),
-        ((255, 255, 255), WHITE_CONCRETE),
-        ((209, 177, 161), WHITE_TERRACOTTA),
-        ((191, 147, 42), YELLOW_TERRACOTTA),
-    ]
-}
+pub static BUILDING_WALL_COLOR_MAP: [(RGBTuple, Block); 21] = [
+    ((233, 107, 57), BRICK),
+    ((18, 12, 13), CRACKED_POLISHED_BLACKSTONE_BRICKS),
+    ((76, 127, 153), CYAN_CONCRETE),
+    ((0, 0, 0), DEEPSLATE_BRICKS),
+    ((186, 195, 142), END_STONE_BRICKS),
+    ((57, 41, 35), GRAY_TERRACOTTA),
+    ((112, 108, 138), LIGHT_BLUE_TERRACOTTA),
+    ((122, 92, 66), MUD_BRICKS),
+    ((24, 13, 14), NETHER_BRICKS),
+    ((159, 82, 36), ORANGE_TERRACOTTA),
+    ((128, 128, 128), POLISHED_ANDESITE),
+    ((174, 173, 174), POLISHED_DIORITE),
+    ((141, 101, 142), PURPUR_PILLAR),
+    ((142, 60, 46), RED_TERRACOTTA),
+    ((153, 83, 28), SMOOTH_RED_SANDSTONE),
+    ((224, 216, 175), SMOOTH_SANDSTONE),
+    ((188, 182, 179), SMOOTH_STONE),
+    ((35, 86, 85), WARPED_PLANKS),
+    ((255, 255, 255), WHITE_CONCRETE),
+    ((209, 177, 161), WHITE_TERRACOTTA),
+    ((191, 147, 42), YELLOW_TERRACOTTA),
+];
 
 // Variations for building floors
 pub fn building_floor_variations() -> Vec<Block> {
-    building_wall_color_map()
+    BUILDING_WALL_COLOR_MAP
         .into_iter()
         .map(|(_, block)| block)
         .collect()
 }
 
-pub fn building_floor_color_map() -> Vec<(RGBTuple, Block)> {
-    vec![
-        ((181, 101, 59), ACACIA_PLANKS),
-        ((22, 15, 16), BLACKSTONE),
-        ((104, 51, 74), CRIMSON_PLANKS),
-        ((82, 55, 26), DARK_OAK_PLANKS),
-        ((182, 133, 99), JUNGLE_PLANKS),
-        ((33, 128, 185), LIGHT_BLUE_CONCRETE),
-        ((78, 103, 43), MOSS_BLOCK),
-        ((171, 138, 88), OAK_PLANKS),
-        ((0, 128, 0), OXIDIZED_COPPER),
-        ((18, 12, 13), POLISHED_BLACKSTONE),
-        ((64, 64, 64), POLISHED_DEEPSLATE),
-        ((255, 255, 255), POLISHED_DIORITE),
-        ((143, 96, 79), POLISHED_GRANITE),
-        ((141, 101, 142), PURPUR_BLOCK),
-        ((128, 0, 0), RED_NETHER_BRICKS),
-        ((153, 83, 28), SMOOTH_RED_SANDSTONE),
-        ((128, 96, 57), SPRUCE_PLANKS),
-        ((128, 128, 128), STONE_BRICKS),
-        ((150, 93, 68), TERRACOTTA),
-        ((35, 86, 85), WARPED_PLANKS),
-    ]
-}
+pub static BUILDING_FLOOR_COLOR_MAP: [(RGBTuple, Block); 20] = [
+    ((181, 101, 59), ACACIA_PLANKS),
+    ((22, 15, 16), BLACKSTONE),
+    ((104, 51, 74), CRIMSON_PLANKS),
+    ((82, 55, 26), DARK_OAK_PLANKS),
+    ((182, 133, 99), JUNGLE_PLANKS),
+    ((33, 128, 185), LIGHT_BLUE_CONCRETE),
+    ((78, 103, 43), MOSS_BLOCK),
+    ((171, 138, 88), OAK_PLANKS),
+    ((0, 128, 0), OXIDIZED_COPPER),
+    ((18, 12, 13), POLISHED_BLACKSTONE),
+    ((64, 64, 64), POLISHED_DEEPSLATE),
+    ((255, 255, 255), POLISHED_DIORITE),
+    ((143, 96, 79), POLISHED_GRANITE),
+    ((141, 101, 142), PURPUR_BLOCK),
+    ((128, 0, 0), RED_NETHER_BRICKS),
+    ((153, 83, 28), SMOOTH_RED_SANDSTONE),
+    ((128, 96, 57), SPRUCE_PLANKS),
+    ((128, 128, 128), STONE_BRICKS),
+    ((150, 93, 68), TERRACOTTA),
+    ((35, 86, 85), WARPED_PLANKS),
+];

src/bresenham.rs

@@ -8,26 +8,32 @@ pub fn bresenham_line(
     y2: i32,
     z2: i32,
 ) -> Vec<(i32, i32, i32)> {
-    let mut points: Vec<(i32, i32, i32)> = Vec::new();
+    // Calculate max possible points needed
+    let dx = if x2 > x1 { x2 - x1 } else { x1 - x2 };
+    let dy = if y2 > y1 { y2 - y1 } else { y1 - y2 };
+    let dz = if z2 > z1 { z2 - z1 } else { z1 - z2 };
 
-    let dx: i32 = (x2 - x1).abs();
-    let dy: i32 = (y2 - y1).abs();
-    let dz: i32 = (z2 - z1).abs();
+    // Pre-allocate vector with exact size needed
+    let capacity = dx.max(dy).max(dz) + 1;
+    let mut points = Vec::with_capacity(capacity as usize);
+    points.reserve_exact(capacity as usize);
 
-    let xs: i32 = if x1 < x2 { 1 } else { -1 };
-    let ys: i32 = if y1 < y2 { 1 } else { -1 };
-    let zs: i32 = if z1 < z2 { 1 } else { -1 };
+    let xs = if x1 < x2 { 1 } else { -1 };
+    let ys = if y1 < y2 { 1 } else { -1 };
+    let zs = if z1 < z2 { 1 } else { -1 };
 
-    let mut x: i32 = x1;
-    let mut y: i32 = y1;
-    let mut z: i32 = z1;
+    let mut x = x1;
+    let mut y = y1;
+    let mut z = z1;
 
+    // Determine dominant axis once, outside the loop
     if dx >= dy && dx >= dz {
-        let mut p1: i32 = 2 * dy - dx;
-        let mut p2: i32 = 2 * dz - dx;
+        let mut p1 = 2 * dy - dx;
+        let mut p2 = 2 * dz - dx;
 
         while x != x2 {
             points.push((x, y, z));
+
             if p1 >= 0 {
                 y += ys;
                 p1 -= 2 * dx;
@@ -41,11 +47,12 @@ pub fn bresenham_line(
             x += xs;
         }
     } else if dy >= dx && dy >= dz {
-        let mut p1: i32 = 2 * dx - dy;
-        let mut p2: i32 = 2 * dz - dy;
+        let mut p1 = 2 * dx - dy;
+        let mut p2 = 2 * dz - dy;
 
         while y != y2 {
             points.push((x, y, z));
+
             if p1 >= 0 {
                 x += xs;
                 p1 -= 2 * dy;
@@ -59,11 +66,12 @@ pub fn bresenham_line(
             y += ys;
         }
     } else {
-        let mut p1: i32 = 2 * dy - dz;
-        let mut p2: i32 = 2 * dx - dz;
+        let mut p1 = 2 * dy - dz;
+        let mut p2 = 2 * dx - dz;
 
         while z != z2 {
             points.push((x, y, z));
+
             if p1 >= 0 {
                 y += ys;
                 p1 -= 2 * dz;

src/cartesian.rs

@@ -0,0 +1,12 @@
+#[derive(Copy, Clone)]
+pub struct XZPoint {
+    pub x: i32,
+    pub z: i32,
+}
+
+impl XZPoint {
+    #[inline]
+    pub fn new(x: i32, z: i32) -> Self {
+        Self { x, z }
+    }
+}

src/colors.rs

@@ -37,11 +37,11 @@ fn short_hex_color_to_rgb_tuple(text: &str) -> Option<RGBTuple> {
         return None;
     }
     let r: u8 = u8::from_str_radix(&text[1..2], 16).unwrap();
-    let r: u8 = r | r << 4;
+    let r: u8 = r | (r << 4);
     let g: u8 = u8::from_str_radix(&text[2..3], 16).unwrap();
-    let g: u8 = g | g << 4;
+    let g: u8 = g | (g << 4);
     let b: u8 = u8::from_str_radix(&text[3..4], 16).unwrap();
-    let b: u8 = b | b << 4;
+    let b: u8 = b | (b << 4);
     Some((r, g, b))
 }
 

src/data_processing.rs

@@ -1,36 +1,34 @@
 use crate::args::Args;
-use crate::block_definitions::{DIRT, GRASS_BLOCK, SNOW_BLOCK};
+use crate::block_definitions::{BEDROCK, DIRT, GRASS_BLOCK, STONE};
 use crate::element_processing::*;
+use crate::ground::Ground;
 use crate::osm_parser::ProcessedElement;
 use crate::progress::emit_gui_progress_update;
 use crate::world_editor::WorldEditor;
 use colored::Colorize;
 use indicatif::{ProgressBar, ProgressStyle};
 
+pub const MIN_Y: i32 = -64;
+
 pub fn generate_world(
     elements: Vec<ProcessedElement>,
     args: &Args,
     scale_factor_x: f64,
     scale_factor_z: f64,
 ) -> Result<(), String> {
-    println!("{} Processing data...", "[3/5]".bold());
-    emit_gui_progress_update(10.0, "Processing data...");
-
-    let ground_level: i32 = args.ground_level;
     let region_dir: String = format!("{}/region", args.path);
-    let mut editor: WorldEditor =
-        WorldEditor::new(&region_dir, scale_factor_x, scale_factor_z, args);
+    let mut editor: WorldEditor = WorldEditor::new(&region_dir, scale_factor_x, scale_factor_z);
 
-    editor.set_sign(
-        "↑".to_string(),
-        "Generated World".to_string(),
-        "This direction".to_string(),
-        "".to_string(),
-        9,
-        -61,
-        9,
-        6,
-    );
+    println!("{} Processing data...", "[3/5]".bold());
+    if args.terrain {
+        emit_gui_progress_update(10.0, "Fetching elevation...");
+    }
+    let ground: Ground = Ground::new(args);
+
+    // Set ground reference in the editor to enable elevation-aware block placement
+    editor.set_ground(&ground);
+
+    emit_gui_progress_update(11.0, "Processing terrain...");
 
     // Process data
     let elements_count: usize = elements.len();
@@ -40,8 +38,8 @@ pub fn generate_world(
         .unwrap()
         .progress_chars("█▓░"));
 
-    let progress_increment_prcs: f64 = 50.0 / elements_count as f64;
-    let mut current_progress_prcs: f64 = 10.0;
+    let progress_increment_prcs: f64 = 49.0 / elements_count as f64;
+    let mut current_progress_prcs: f64 = 11.0;
     let mut last_emitted_progress: f64 = current_progress_prcs;
 
     for element in &elements {
@@ -65,59 +63,56 @@ pub fn generate_world(
         match element {
             ProcessedElement::Way(way) => {
                 if way.tags.contains_key("building") || way.tags.contains_key("building:part") {
-                    buildings::generate_buildings(&mut editor, way, ground_level, args, None);
+                    buildings::generate_buildings(&mut editor, way, args, None);
                 } else if way.tags.contains_key("highway") {
-                    highways::generate_highways(&mut editor, element, ground_level, args);
+                    highways::generate_highways(&mut editor, element, args);
                 } else if way.tags.contains_key("landuse") {
-                    landuse::generate_landuse(&mut editor, way, ground_level, args);
+                    landuse::generate_landuse(&mut editor, way, args);
                 } else if way.tags.contains_key("natural") {
-                    natural::generate_natural(&mut editor, element, ground_level, args);
+                    natural::generate_natural(&mut editor, element, args);
                 } else if way.tags.contains_key("amenity") {
-                    amenities::generate_amenities(&mut editor, element, ground_level, args);
+                    amenities::generate_amenities(&mut editor, element, args);
                 } else if way.tags.contains_key("leisure") {
-                    leisure::generate_leisure(&mut editor, way, ground_level, args);
+                    leisure::generate_leisure(&mut editor, way, args);
                 } else if way.tags.contains_key("barrier") {
-                    barriers::generate_barriers(&mut editor, element, ground_level);
+                    barriers::generate_barriers(&mut editor, element);
                 } else if way.tags.contains_key("waterway") {
-                    waterways::generate_waterways(&mut editor, way, ground_level);
+                    waterways::generate_waterways(&mut editor, way);
                 } else if way.tags.contains_key("bridge") {
                     //bridges::generate_bridges(&mut editor, way, ground_level); // TODO FIX
-                } else if way.tags.contains_key("railway") {
-                    railways::generate_railways(&mut editor, way, ground_level);
+                } else if way.tags.contains_key("railway") || way.tags.contains_key("subway") {
+                    railways::generate_railways(&mut editor, way);
                 } else if way.tags.contains_key("aeroway") || way.tags.contains_key("area:aeroway")
                 {
-                    highways::generate_aeroway(&mut editor, way, ground_level);
+                    highways::generate_aeroway(&mut editor, way);
                 } else if way.tags.get("service") == Some(&"siding".to_string()) {
-                    highways::generate_siding(&mut editor, way, ground_level);
+                    highways::generate_siding(&mut editor, way);
                 }
             }
             ProcessedElement::Node(node) => {
                 if node.tags.contains_key("door") || node.tags.contains_key("entrance") {
-                    doors::generate_doors(&mut editor, node, ground_level);
+                    doors::generate_doors(&mut editor, node);
                 } else if node.tags.contains_key("natural")
                     && node.tags.get("natural") == Some(&"tree".to_string())
                 {
-                    natural::generate_natural(&mut editor, element, ground_level, args);
+                    natural::generate_natural(&mut editor, element, args);
                 } else if node.tags.contains_key("amenity") {
-                    amenities::generate_amenities(&mut editor, element, ground_level, args);
+                    amenities::generate_amenities(&mut editor, element, args);
                 } else if node.tags.contains_key("barrier") {
-                    barriers::generate_barriers(&mut editor, element, ground_level);
+                    barriers::generate_barriers(&mut editor, element);
                 } else if node.tags.contains_key("highway") {
-                    highways::generate_highways(&mut editor, element, ground_level, args);
+                    highways::generate_highways(&mut editor, element, args);
                 } else if node.tags.contains_key("tourism") {
-                    tourisms::generate_tourisms(&mut editor, node, ground_level);
+                    tourisms::generate_tourisms(&mut editor, node);
                 }
             }
             ProcessedElement::Relation(rel) => {
                 if rel.tags.contains_key("building") || rel.tags.contains_key("building:part") {
-                    buildings::generate_building_from_relation(
-                        &mut editor,
-                        rel,
-                        ground_level,
-                        args,
-                    );
+                    buildings::generate_building_from_relation(&mut editor, rel, args);
                 } else if rel.tags.contains_key("water") {
-                    water_areas::generate_water_areas(&mut editor, rel, ground_level);
+                    water_areas::generate_water_areas(&mut editor, rel);
+                } else if rel.tags.get("leisure") == Some(&"park".to_string()) {
+                    leisure::generate_leisure_from_relation(&mut editor, rel, args);
                 }
             }
         }
@@ -132,8 +127,8 @@ pub fn generate_world(
 
     let mut block_counter: u64 = 0;
 
-    println!("{} Generating ground layer...", "[4/5]".bold());
-    emit_gui_progress_update(60.0, "Generating ground layer...");
+    println!("{} Generating ground...", "[4/5]".bold());
+    emit_gui_progress_update(60.0, "Generating ground...");
 
     let ground_pb: ProgressBar = ProgressBar::new(total_blocks);
     ground_pb.set_style(
@@ -148,12 +143,34 @@ pub fn generate_world(
     let total_iterations_grnd: f64 = (scale_factor_x + 1.0) * (scale_factor_z + 1.0);
     let progress_increment_grnd: f64 = 30.0 / total_iterations_grnd;
 
-    let groundlayer_block = if args.winter { SNOW_BLOCK } else { GRASS_BLOCK };
+    let groundlayer_block = GRASS_BLOCK;
 
     for x in 0..=(scale_factor_x as i32) {
         for z in 0..=(scale_factor_z as i32) {
-            editor.set_block(groundlayer_block, x, ground_level, z, None, None);
-            editor.set_block(DIRT, x, ground_level - 1, z, None, None);
+            // Add default dirt and grass layer if there isn't a stone layer already
+            if !editor.check_for_block(x, 0, z, Some(&[STONE])) {
+                editor.set_block(groundlayer_block, x, 0, z, None, None);
+                editor.set_block(DIRT, x, -1, z, None, None);
+                editor.set_block(DIRT, x, -2, z, None, None);
+            }
+
+            // Fill underground with stone
+            if args.fillground {
+                // Fill from bedrock+1 to 3 blocks below ground with stone
+                editor.fill_blocks_absolute(
+                    STONE,
+                    x,
+                    MIN_Y + 1,
+                    z,
+                    x,
+                    editor.get_absolute_y(x, -3, z),
+                    z,
+                    None,
+                    None,
+                );
+            }
+            // Generate a bedrock level at MIN_Y
+            editor.set_block_absolute(BEDROCK, x, MIN_Y, z, None, Some(&[BEDROCK]));
 
             block_counter += 1;
             if block_counter % batch_size == 0 {
@@ -168,6 +185,18 @@ pub fn generate_world(
         }
     }
 
+    // Set sign for player orientation
+    /*editor.set_sign(
+        "↑".to_string(),
+        "Generated World".to_string(),
+        "This direction".to_string(),
+        "".to_string(),
+        9,
+        -61,
+        9,
+        6,
+    );*/
+
     ground_pb.inc(block_counter % batch_size);
     ground_pb.finish();
 

src/element_processing/amenities.rs

@@ -1,16 +1,12 @@
 use crate::args::Args;
 use crate::block_definitions::*;
 use crate::bresenham::bresenham_line;
+use crate::cartesian::XZPoint;
 use crate::floodfill::flood_fill_area;
 use crate::osm_parser::ProcessedElement;
 use crate::world_editor::WorldEditor;
 
-pub fn generate_amenities(
-    editor: &mut WorldEditor,
-    element: &ProcessedElement,
-    ground_level: i32,
-    args: &Args,
-) {
+pub fn generate_amenities(editor: &mut WorldEditor, element: &ProcessedElement, args: &Args) {
     // Skip if 'layer' or 'level' is negative in the tags
     if let Some(layer) = element.tags().get("layer") {
         if layer.parse::<i32>().unwrap_or(0) < 0 {
@@ -25,21 +21,21 @@ pub fn generate_amenities(
     }
 
     if let Some(amenity_type) = element.tags().get("amenity") {
-        let first_node: Option<(i32, i32)> = element
+        let first_node: Option<XZPoint> = element
             .nodes()
-            .map(|n: &crate::osm_parser::ProcessedNode| (n.x, n.z))
+            .map(|n: &crate::osm_parser::ProcessedNode| XZPoint::new(n.x, n.z))
             .next();
         match amenity_type.as_str() {
             "waste_disposal" | "waste_basket" => {
                 // Place a cauldron for waste disposal or waste basket
-                if let Some((x, z)) = first_node {
-                    editor.set_block(CAULDRON, x, ground_level + 1, z, None, None);
+                if let Some(pt) = first_node {
+                    editor.set_block(CAULDRON, pt.x, 1, pt.z, None, None);
                 }
             }
             "vending_machine" | "atm" => {
-                if let Some((x, z)) = first_node {
-                    editor.set_block(IRON_BLOCK, x, ground_level + 1, z, None, None);
-                    editor.set_block(IRON_BLOCK, x, ground_level + 2, z, None, None);
+                if let Some(pt) = first_node {
+                    editor.set_block(IRON_BLOCK, pt.x, 1, pt.z, None, None);
+                    editor.set_block(IRON_BLOCK, pt.x, 2, pt.z, None, None);
                 }
             }
             "bicycle_parking" => {
@@ -50,50 +46,81 @@ pub fn generate_amenities(
                     .nodes()
                     .map(|n: &crate::osm_parser::ProcessedNode| (n.x, n.z))
                     .collect();
+
+                if polygon_coords.is_empty() {
+                    return;
+                }
+
                 let floor_area: Vec<(i32, i32)> =
                     flood_fill_area(&polygon_coords, args.timeout.as_ref());
 
                 // Fill the floor area
                 for (x, z) in floor_area.iter() {
-                    editor.set_block(ground_block, *x, ground_level, *z, None, None);
+                    editor.set_block(ground_block, *x, 0, *z, None, None);
                 }
 
+                // Place fences and roof slabs at each corner node
+                for node in element.nodes() {
+                    let x: i32 = node.x;
+                    let z: i32 = node.z;
+
+                    // Set ground block and fences
+                    editor.set_block(ground_block, x, 0, z, None, None);
+                    for y in 1..=4 {
+                        editor.set_block(OAK_FENCE, x, y, z, None, None);
+                    }
+                    editor.set_block(roof_block, x, 5, z, None, None);
+                }
+
+                // Flood fill the roof area
+                for (x, z) in floor_area.iter() {
+                    editor.set_block(roof_block, *x, 5, *z, None, None);
+                }
+            }
+            "bench" => {
+                // Place a bench
+                if let Some(pt) = first_node {
+                    editor.set_block(SMOOTH_STONE, pt.x, 1, pt.z, None, None);
+                    editor.set_block(OAK_LOG, pt.x + 1, 1, pt.z, None, None);
+                    editor.set_block(OAK_LOG, pt.x - 1, 1, pt.z, None, None);
+                }
+            }
+            "vending" => {
+                // Place vending machine blocks
+                if let Some(pt) = first_node {
+                    editor.set_block(IRON_BLOCK, pt.x, 1, pt.z, None, None);
+                    editor.set_block(IRON_BLOCK, pt.x, 2, pt.z, None, None);
+                }
+            }
+            "shelter" => {
+                let roof_block: Block = STONE_BRICK_SLAB;
+
+                let polygon_coords: Vec<(i32, i32)> = element
+                    .nodes()
+                    .map(|n: &crate::osm_parser::ProcessedNode| (n.x, n.z))
+                    .collect();
+                let roof_area: Vec<(i32, i32)> =
+                    flood_fill_area(&polygon_coords, args.timeout.as_ref());
+
                 // Place fences and roof slabs at each corner node directly
                 for node in element.nodes() {
                     let x: i32 = node.x;
                     let z: i32 = node.z;
 
-                    for y in 1..=4 {
-                        editor.set_block(ground_block, x, ground_level, z, None, None);
-                        editor.set_block(OAK_FENCE, x, ground_level + y, z, None, None);
+                    for fence_height in 1..=4 {
+                        editor.set_block(OAK_FENCE, x, fence_height, z, None, None);
                     }
-                    editor.set_block(roof_block, x, ground_level + 5, z, None, None);
+                    editor.set_block(roof_block, x, 5, z, None, None);
                 }
 
                 // Flood fill the roof area
-                let roof_height: i32 = ground_level + 5;
-                for (x, z) in floor_area.iter() {
-                    editor.set_block(roof_block, *x, roof_height, *z, None, None);
-                }
-            }
-            "bench" => {
-                // Place a bench
-                if let Some((x, z)) = first_node {
-                    editor.set_block(SMOOTH_STONE, x, ground_level + 1, z, None, None);
-                    editor.set_block(OAK_LOG, x + 1, ground_level + 1, z, None, None);
-                    editor.set_block(OAK_LOG, x - 1, ground_level + 1, z, None, None);
-                }
-            }
-            "vending" => {
-                // Place vending machine blocks
-                if let Some((x, z)) = first_node {
-                    editor.set_block(IRON_BLOCK, x, ground_level + 1, z, None, None);
-                    editor.set_block(IRON_BLOCK, x, ground_level + 2, z, None, None);
+                for (x, z) in roof_area.iter() {
+                    editor.set_block(roof_block, *x, 5, *z, None, None);
                 }
             }
             "parking" | "fountain" => {
                 // Process parking or fountain areas
-                let mut previous_node: Option<(i32, i32)> = None;
+                let mut previous_node: Option<XZPoint> = None;
                 let mut corner_addup: (i32, i32, i32) = (0, 0, 0);
                 let mut current_amenity: Vec<(i32, i32)> = vec![];
 
@@ -102,23 +129,16 @@ pub fn generate_amenities(
                     "parking" => GRAY_CONCRETE,
                     _ => GRAY_CONCRETE,
                 };
+
                 for node in element.nodes() {
-                    let x: i32 = node.x;
-                    let z: i32 = node.z;
+                    let pt: XZPoint = node.xz();
 
                     if let Some(prev) = previous_node {
                         // Create borders for fountain or parking area
                         let bresenham_points: Vec<(i32, i32, i32)> =
-                            bresenham_line(prev.0, ground_level, prev.1, x, ground_level, z);
+                            bresenham_line(prev.x, 0, prev.z, pt.x, 0, pt.z);
                         for (bx, _, bz) in bresenham_points {
-                            editor.set_block(
-                                block_type,
-                                bx,
-                                ground_level,
-                                bz,
-                                Some(&[BLACK_CONCRETE]),
-                                None,
-                            );
+                            editor.set_block(block_type, bx, 0, bz, Some(&[BLACK_CONCRETE]), None);
 
                             // Decorative border around fountains
                             if amenity_type == "fountain" {
@@ -128,7 +148,7 @@ pub fn generate_amenities(
                                             editor.set_block(
                                                 LIGHT_GRAY_CONCRETE,
                                                 bx + dx,
-                                                ground_level,
+                                                0,
                                                 bz + dz,
                                                 None,
                                                 None,
@@ -144,7 +164,7 @@ pub fn generate_amenities(
                             corner_addup.2 += 1;
                         }
                     }
-                    previous_node = Some((x, z));
+                    previous_node = Some(pt);
                 }
 
                 // Flood-fill the interior area for parking or fountains
@@ -157,7 +177,7 @@ pub fn generate_amenities(
                         editor.set_block(
                             block_type,
                             x,
-                            ground_level,
+                            0,
                             z,
                             Some(&[BLACK_CONCRETE, GRAY_CONCRETE]),
                             None,
@@ -168,7 +188,7 @@ pub fn generate_amenities(
                             editor.set_block(
                                 LIGHT_GRAY_CONCRETE,
                                 x,
-                                ground_level,
+                                0,
                                 z,
                                 Some(&[BLACK_CONCRETE, GRAY_CONCRETE]),
                                 None,

src/element_processing/barriers.rs

@@ -3,64 +3,97 @@ use crate::bresenham::bresenham_line;
 use crate::osm_parser::ProcessedElement;
 use crate::world_editor::WorldEditor;
 
-pub fn generate_barriers(editor: &mut WorldEditor, element: &ProcessedElement, ground_level: i32) {
-    if let Some(barrier_type) = element.tags().get("barrier") {
-        if barrier_type == "bollard" {
+pub fn generate_barriers(editor: &mut WorldEditor, element: &ProcessedElement) {
+    // Default values
+    let mut barrier_material: Block = COBBLESTONE_WALL;
+    let mut barrier_height: i32 = 2;
+
+    match element.tags().get("barrier").map(|s| s.as_str()) {
+        Some("bollard") => {
             if let ProcessedElement::Node(node) = element {
-                editor.set_block(
-                    COBBLESTONE_WALL,
-                    node.x,
-                    ground_level + 1,
-                    node.z,
-                    None,
-                    None,
-                );
-                // Place bollard
+                // Place bollard one above ground
+                editor.set_block(COBBLESTONE_WALL, node.x, 1, node.z, None, None);
             }
-        } else if barrier_type == "kerb" {
+            return;
+        }
+        Some("kerb") => {
             // Ignore kerbs
             return;
-        } else if let ProcessedElement::Way(way) = element {
-            // Determine wall height
-            let wall_height: i32 = element
-                .tags()
-                .get("height")
-                .and_then(|height: &String| height.parse::<f32>().ok())
-                .map(|height: f32| f32::min(3.0, height).round() as i32)
-                .unwrap_or(2); // Default height is 2 if not specified or invalid
+        }
+        Some("hedge") => {
+            barrier_material = OAK_LEAVES;
+            barrier_height = 2;
+        }
+        Some("fence") => {
+            // Handle fence sub-types
+            match element.tags().get("fence_type").map(|s| s.as_str()) {
+                Some("railing" | "bars" | "krest") => {
+                    barrier_material = STONE_BRICK_WALL;
+                    barrier_height = 1;
+                }
+                Some("chain_link" | "metal" | "wire" | "barbed_wire" | "corrugated_metal") => {
+                    barrier_material = STONE_BRICK_WALL;
+                    barrier_height = 2;
+                }
+                Some("slatted" | "paling") => {
+                    barrier_material = OAK_FENCE;
+                    barrier_height = 1;
+                }
+                Some("wood" | "split_rail" | "panel" | "pole") => {
+                    barrier_material = OAK_FENCE;
+                    barrier_height = 2;
+                }
+                Some("concrete") => {
+                    barrier_material = ANDESITE_WALL;
+                    barrier_height = 2;
+                }
+                Some("glass") => {
+                    barrier_material = GLASS;
+                    barrier_height = 1;
+                }
+                _ => {}
+            }
+        }
+        _ => {}
+    }
+    // Tagged material takes priority over inferred
+    if let Some(barrier_mat) = element.tags().get("material") {
+        if barrier_mat == "brick" {
+            barrier_material = BRICK;
+        }
+    }
 
-            // Process nodes to create the barrier wall
-            for i in 1..way.nodes.len() {
-                let prev: &crate::osm_parser::ProcessedNode = &way.nodes[i - 1];
-                let x1: i32 = prev.x;
-                let z1: i32 = prev.z;
+    if let ProcessedElement::Way(way) = element {
+        // Determine wall height
+        let wall_height: i32 = element
+            .tags()
+            .get("height")
+            .and_then(|height: &String| height.parse::<f32>().ok())
+            .map(|height: f32| f32::min(3.0, height).round() as i32)
+            .unwrap_or(barrier_height);
 
-                let cur: &crate::osm_parser::ProcessedNode = &way.nodes[i];
-                let x2: i32 = cur.x;
-                let z2: i32 = cur.z;
+        // Process nodes to create the barrier wall
+        for i in 1..way.nodes.len() {
+            let prev: &crate::osm_parser::ProcessedNode = &way.nodes[i - 1];
+            let x1: i32 = prev.x;
+            let z1: i32 = prev.z;
 
-                // Generate the line of coordinates between the two nodes
-                let bresenham_points: Vec<(i32, i32, i32)> =
-                    bresenham_line(x1, ground_level, z1, x2, ground_level, z2);
+            let cur: &crate::osm_parser::ProcessedNode = &way.nodes[i];
+            let x2: i32 = cur.x;
+            let z2: i32 = cur.z;
 
-                for (bx, _, bz) in bresenham_points {
-                    // Build the barrier wall to the specified height
-                    for y in (ground_level + 1)..=(ground_level + wall_height) {
-                        editor.set_block(COBBLESTONE_WALL, bx, y, bz, None, None);
-                        // Barrier wall
-                    }
+            // Generate the line of coordinates between the two nodes
+            let bresenham_points: Vec<(i32, i32, i32)> = bresenham_line(x1, 0, z1, x2, 0, z2);
 
-                    // Add an optional top to the barrier if the height is more than 1
-                    if wall_height > 1 {
-                        editor.set_block(
-                            STONE_BRICK_SLAB,
-                            bx,
-                            ground_level + wall_height + 1,
-                            bz,
-                            None,
-                            None,
-                        ); // Top of the barrier
-                    }
+            for (bx, _, bz) in bresenham_points {
+                // Build the barrier wall to the specified height
+                for y in 1..=wall_height {
+                    editor.set_block(barrier_material, bx, y, bz, None, None);
+                }
+
+                // Add an optional top to the barrier if the height is more than 1
+                if wall_height > 1 {
+                    editor.set_block(STONE_BRICK_SLAB, bx, wall_height + 1, bz, None, None);
                 }
             }
         }

src/element_processing/bridges.rs

@@ -5,14 +5,14 @@ use crate::world_editor::WorldEditor;
 
 // TODO FIX
 #[allow(dead_code)]
-pub fn generate_bridges(editor: &mut WorldEditor, element: &ProcessedWay, ground_level: i32) {
+pub fn generate_bridges(editor: &mut WorldEditor, element: &ProcessedWay) {
     if let Some(_bridge_type) = element.tags.get("bridge") {
         let bridge_height = 3; // Fixed height
 
         for i in 1..element.nodes.len() {
             let prev = &element.nodes[i - 1];
             let cur = &element.nodes[i];
-            let points = bresenham_line(prev.x, ground_level, prev.z, cur.x, ground_level, cur.z);
+            let points = bresenham_line(prev.x, 0, prev.z, cur.x, 0, cur.z);
 
             let total_length = points.len();
             let ramp_length = 6; // Length of ramp at each end
@@ -29,11 +29,9 @@ pub fn generate_bridges(editor: &mut WorldEditor, element: &ProcessedWay, ground
                     bridge_height
                 };
 
-                let bridge_y = ground_level + height as i32;
-
                 // Place bridge blocks
                 for dx in -2..=2 {
-                    editor.set_block(LIGHT_GRAY_CONCRETE, *x + dx, bridge_y, *z, None, None);
+                    editor.set_block(LIGHT_GRAY_CONCRETE, *x + dx, height as i32, *z, None, None);
                 }
             }
         }

src/element_processing/buildings.rs

@@ -12,17 +12,18 @@ use std::time::Duration;
 pub fn generate_buildings(
     editor: &mut WorldEditor,
     element: &ProcessedWay,
-    ground_level: i32,
     args: &Args,
     relation_levels: Option<i32>,
 ) {
-    // Adjust starting height based on building:min_level
+    // Get min_level first so we can use it both for start_level and building height calculations
     let min_level = if let Some(min_level_str) = element.tags.get("building:min_level") {
         min_level_str.parse::<i32>().unwrap_or(0)
     } else {
         0
     };
-    let start_level = ground_level + (min_level * 4);
+
+    // Calculate starting y-offset from min_level
+    let start_y_offset = min_level * 4;
 
     let mut previous_node: Option<(i32, i32)> = None;
     let mut corner_addup: (i32, i32, i32) = (0, 0, 0);
@@ -30,17 +31,17 @@ pub fn generate_buildings(
 
     // Randomly select block variations for corners, walls, and floors
     let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
-    let variation_index_corner: usize = rng.gen_range(0..building_corner_variations().len());
+    let variation_index_corner: usize = rng.gen_range(0..BUILDING_CORNER_VARIATIONS.len());
     let variation_index_wall: usize = rng.gen_range(0..building_wall_variations().len());
     let variation_index_floor: usize = rng.gen_range(0..building_floor_variations().len());
 
-    let corner_block: Block = building_corner_variations()[variation_index_corner];
+    let corner_block: Block = BUILDING_CORNER_VARIATIONS[variation_index_corner];
     let wall_block: Block = element
         .tags
         .get("building:colour")
         .and_then(|building_colour: &String| {
             color_text_to_rgb_tuple(building_colour).map(|rgb: (u8, u8, u8)| {
-                find_nearest_block_in_color_map(&rgb, building_wall_color_map())
+                find_nearest_block_in_color_map(&rgb, &BUILDING_WALL_COLOR_MAP)
             })
         })
         .flatten()
@@ -50,7 +51,7 @@ pub fn generate_buildings(
         .get("roof:colour")
         .and_then(|roof_colour: &String| {
             color_text_to_rgb_tuple(roof_colour).map(|rgb: (u8, u8, u8)| {
-                find_nearest_block_in_color_map(&rgb, building_floor_color_map())
+                find_nearest_block_in_color_map(&rgb, &BUILDING_FLOOR_COLOR_MAP)
             })
         })
         .flatten()
@@ -132,16 +133,15 @@ pub fn generate_buildings(
                 let x: i32 = node.x;
                 let z: i32 = node.z;
 
-                for y in 1..=4 {
-                    editor.set_block(OAK_FENCE, x, ground_level + y, z, None, None);
+                for shelter_y in 1..=4 {
+                    editor.set_block(OAK_FENCE, x, shelter_y, z, None, None);
                 }
-                editor.set_block(roof_block, x, ground_level + 5, z, None, None);
+                editor.set_block(roof_block, x, 5, z, None, None);
             }
 
             // Flood fill the roof area
-            let roof_height: i32 = ground_level + 5;
             for (x, z) in roof_area.iter() {
-                editor.set_block(roof_block, *x, roof_height, *z, None, None);
+                editor.set_block(roof_block, *x, 5, *z, None, None);
             }
 
             return;
@@ -168,7 +168,7 @@ pub fn generate_buildings(
 
                 // Fill the floor area
                 for (x, z) in floor_area.iter() {
-                    editor.set_block(ground_block, *x, ground_level, *z, None, None);
+                    editor.set_block(ground_block, *x, 0, *z, None, None);
                 }
 
                 // Place fences and roof slabs at each corner node directly
@@ -176,17 +176,15 @@ pub fn generate_buildings(
                     let x: i32 = node.x;
                     let z: i32 = node.z;
 
-                    for y in 1..=4 {
-                        editor.set_block(ground_block, x, ground_level, z, None, None);
-                        editor.set_block(OAK_FENCE, x, ground_level + y, z, None, None);
+                    for dy in 1..=4 {
+                        editor.set_block(OAK_FENCE, x, dy, z, None, None);
                     }
-                    editor.set_block(roof_block, x, ground_level + 5, z, None, None);
+                    editor.set_block(roof_block, x, 5, z, None, None);
                 }
 
                 // Flood fill the roof area
-                let roof_height: i32 = ground_level + 5;
                 for (x, z) in floor_area.iter() {
-                    editor.set_block(roof_block, *x, roof_height, *z, None, None);
+                    editor.set_block(roof_block, *x, 5, *z, None, None);
                 }
 
                 return;
@@ -211,7 +209,7 @@ pub fn generate_buildings(
                 flood_fill_area(&polygon_coords, args.timeout.as_ref());
 
             for level in 0..=(building_height / 4) {
-                let current_level = ground_level + level * 4;
+                let current_level_y = level * 4;
 
                 // Build walls
                 for node in &element.nodes {
@@ -219,7 +217,7 @@ pub fn generate_buildings(
                     let z: i32 = node.z;
 
                     // Build walls up to the current level
-                    for y in (current_level + 1)..=(current_level + 4) {
+                    for y in (current_level_y + 1)..=(current_level_y + 4) {
                         editor.set_block(STONE_BRICKS, x, y, z, None, None);
                     }
                 }
@@ -227,16 +225,16 @@ pub fn generate_buildings(
                 // Fill the floor area for each level
                 for (x, z) in &floor_area {
                     if level == 0 {
-                        editor.set_block(SMOOTH_STONE, *x, current_level, *z, None, None);
+                        editor.set_block(SMOOTH_STONE, *x, current_level_y, *z, None, None);
                     } else {
-                        editor.set_block(COBBLESTONE, *x, current_level, *z, None, None);
+                        editor.set_block(COBBLESTONE, *x, current_level_y, *z, None, None);
                     }
                 }
             }
 
             // Outline for each level
             for level in 0..=(building_height / 4) {
-                let current_level = ground_level + level * 4;
+                let current_level_y = level * 4;
 
                 // Use the nodes to create the outline
                 let mut prev_outline = None;
@@ -246,12 +244,12 @@ pub fn generate_buildings(
 
                     if let Some((prev_x, prev_z)) = prev_outline {
                         let outline_points =
-                            bresenham_line(prev_x, current_level, prev_z, x, current_level, z);
+                            bresenham_line(prev_x, current_level_y, prev_z, x, current_level_y, z);
                         for (bx, _, bz) in outline_points {
                             editor.set_block(
                                 SMOOTH_STONE,
                                 bx,
-                                current_level,
+                                current_level_y,
                                 bz,
                                 Some(&[COBBLESTONE, COBBLESTONE_WALL]),
                                 None,
@@ -259,7 +257,7 @@ pub fn generate_buildings(
                             editor.set_block(
                                 STONE_BRICK_SLAB,
                                 bx,
-                                current_level + 2,
+                                current_level_y + 2,
                                 bz,
                                 None,
                                 None,
@@ -268,7 +266,7 @@ pub fn generate_buildings(
                                 editor.set_block(
                                     COBBLESTONE_WALL,
                                     bx,
-                                    current_level + 1,
+                                    current_level_y + 1,
                                     bz,
                                     None,
                                     None,
@@ -282,7 +280,7 @@ pub fn generate_buildings(
 
             return;
         } else if building_type == "roof" {
-            let roof_height: i32 = ground_level + 5;
+            let roof_height: i32 = 5;
 
             // Iterate through the nodes to create the roof edges using Bresenham's line algorithm
             for node in &element.nodes {
@@ -298,7 +296,7 @@ pub fn generate_buildings(
                     }
                 }
 
-                for y in (ground_level + 1)..=(roof_height - 1) {
+                for y in 1..=(roof_height - 1) {
                     editor.set_block(COBBLESTONE_WALL, x, y, z, None, None);
                 }
 
@@ -332,7 +330,7 @@ pub fn generate_buildings(
                 building_height = ((23.0 * scale_factor) as i32).max(3);
             }
         } else if building_type == "bridge" {
-            generate_bridge(editor, element, ground_level, args.timeout.as_ref());
+            generate_bridge(editor, element, args.timeout.as_ref());
             return;
         }
     }
@@ -344,44 +342,32 @@ pub fn generate_buildings(
 
         if let Some(prev) = previous_node {
             // Calculate walls and corners using Bresenham line
-            let bresenham_points: Vec<(i32, i32, i32)> =
-                bresenham_line(prev.0, start_level, prev.1, x, start_level, z);
+            let bresenham_points =
+                bresenham_line(prev.0, start_y_offset, prev.1, x, start_y_offset, z);
             for (bx, _, bz) in bresenham_points {
-                for h in (start_level + 1)..=(start_level + building_height) {
+                for h in (start_y_offset + 1)..=(start_y_offset + building_height) {
                     if element.nodes[0].x == bx && element.nodes[0].x == bz {
-                        editor.set_block(corner_block, bx, h, bz, None, None); // Corner block
+                        // Corner Block
+                        editor.set_block(corner_block, bx, h, bz, None, None);
                     } else {
                         // Add windows to the walls at intervals
-                        if h > start_level + 1 && h % 4 != 0 && (bx + bz) % 6 < 3 {
+                        if h > start_y_offset + 1 && h % 4 != 0 && (bx + bz) % 6 < 3 {
                             editor.set_block(window_block, bx, h, bz, None, None);
-                        // Window block
                         } else {
                             editor.set_block(wall_block, bx, h, bz, None, None);
-                            // Wall block
                         }
                     }
                 }
-                // Ceiling cobblestone
+
                 editor.set_block(
                     COBBLESTONE,
                     bx,
-                    start_level + building_height + 1,
+                    start_y_offset + building_height + 1,
                     bz,
                     None,
                     None,
                 );
 
-                if args.winter {
-                    editor.set_block(
-                        SNOW_LAYER,
-                        x,
-                        start_level + building_height + 2,
-                        z,
-                        None,
-                        None,
-                    );
-                }
-
                 current_building.push((bx, bz));
                 corner_addup = (corner_addup.0 + bx, corner_addup.1 + bz, corner_addup.2 + 1);
             }
@@ -401,42 +387,39 @@ pub fn generate_buildings(
 
         for (x, z) in floor_area {
             if processed_points.insert((x, z)) {
-                editor.set_block(floor_block, x, start_level, z, None, None); // Set floor
+                // Set floor at start_y_offset
+                editor.set_block(floor_block, x, start_y_offset, z, None, None);
 
                 // Set level ceilings if height > 4
                 if building_height > 4 {
-                    for h in (start_level + 2 + 4..start_level + building_height).step_by(4) {
+                    for h in (start_y_offset + 2 + 4..start_y_offset + building_height).step_by(4) {
                         if x % 6 == 0 && z % 6 == 0 {
-                            editor.set_block(GLOWSTONE, x, h, z, None, None); // Light fixtures
+                            // Light fixtures
+                            editor.set_block(GLOWSTONE, x, h, z, None, None);
                         } else {
                             editor.set_block(floor_block, x, h, z, None, None);
                         }
                     }
                 } else if x % 6 == 0 && z % 6 == 0 {
-                    editor.set_block(GLOWSTONE, x, start_level + building_height, z, None, None);
-                    // Light fixtures
-                }
-
-                // Set the house ceiling
-                editor.set_block(
-                    floor_block,
-                    x,
-                    start_level + building_height + 1,
-                    z,
-                    None,
-                    None,
-                );
-
-                if args.winter {
                     editor.set_block(
-                        SNOW_LAYER,
+                        GLOWSTONE,
                         x,
-                        start_level + building_height + 2,
+                        start_y_offset + building_height,
                         z,
                         None,
                         None,
                     );
                 }
+
+                // Set ceiling at proper height
+                editor.set_block(
+                    floor_block,
+                    x,
+                    start_y_offset + building_height + 1,
+                    z,
+                    None,
+                    None,
+                );
             }
         }
     }
@@ -445,7 +428,6 @@ pub fn generate_buildings(
 pub fn generate_building_from_relation(
     editor: &mut WorldEditor,
     relation: &ProcessedRelation,
-    ground_level: i32,
     args: &Args,
 ) {
     // Extract levels from relation tags
@@ -458,13 +440,7 @@ pub fn generate_building_from_relation(
     // Process the outer way to create the building walls
     for member in &relation.members {
         if member.role == ProcessedMemberRole::Outer {
-            generate_buildings(
-                editor,
-                &member.way,
-                ground_level,
-                args,
-                Some(relation_levels),
-            );
+            generate_buildings(editor, &member.way, args, Some(relation_levels));
         }
     }
 
@@ -486,29 +462,21 @@ pub fn generate_building_from_relation(
 
 fn find_nearest_block_in_color_map(
     rgb: &RGBTuple,
-    color_map: Vec<(RGBTuple, Block)>,
+    color_map: &[(RGBTuple, Block)],
 ) -> Option<Block> {
     color_map
-        .into_iter()
+        .iter()
         .min_by_key(|(entry_rgb, _)| rgb_distance(entry_rgb, rgb))
         .map(|(_, block)| block)
+        .copied()
 }
 
 /// Generates a bridge structure, paying attention to the "level" tag.
 fn generate_bridge(
     editor: &mut WorldEditor,
     element: &ProcessedWay,
-    base_level: i32,
     floodfill_timeout: Option<&Duration>,
 ) {
-    // Calculate the bridge level
-    let mut bridge_level: i32 = base_level;
-    if let Some(level_str) = element.tags.get("level") {
-        if let Ok(level) = level_str.parse::<i32>() {
-            bridge_level += (level * 3) + 1; // Adjust height by levels
-        }
-    }
-
     let floor_block: Block = STONE;
     let railing_block: Block = STONE_BRICKS;
 
@@ -518,26 +486,50 @@ fn generate_bridge(
         let x: i32 = node.x;
         let z: i32 = node.z;
 
+        // Calculate bridge level based on the "level" tag
+        let bridge_y_offset = if let Some(level_str) = element.tags.get("level") {
+            if let Ok(level) = level_str.parse::<i32>() {
+                (level * 3) + 1
+            } else {
+                1 // Default elevation
+            }
+        } else {
+            1 // Default elevation
+        };
+
         // Create bridge path using Bresenham's line
         if let Some(prev) = previous_node {
             let bridge_points: Vec<(i32, i32, i32)> =
-                bresenham_line(prev.0, bridge_level, prev.1, x, bridge_level, z);
+                bresenham_line(prev.0, bridge_y_offset, prev.1, x, bridge_y_offset, z);
+
             for (bx, by, bz) in bridge_points {
+                // Place railing blocks
                 editor.set_block(railing_block, bx, by + 1, bz, None, None);
                 editor.set_block(railing_block, bx, by, bz, None, None);
             }
         }
+
         previous_node = Some((x, z));
     }
 
     // Flood fill the area between the bridge path nodes
-    let polygon_coords: Vec<(i32, i32)> = element
-        .nodes
-        .iter()
-        .map(|n: &crate::osm_parser::ProcessedNode| (n.x, n.z))
-        .collect();
+    let polygon_coords: Vec<(i32, i32)> = element.nodes.iter().map(|n| (n.x, n.z)).collect();
+
     let bridge_area: Vec<(i32, i32)> = flood_fill_area(&polygon_coords, floodfill_timeout);
+
+    // Calculate bridge level based on the "level" tag
+    let bridge_y_offset = if let Some(level_str) = element.tags.get("level") {
+        if let Ok(level) = level_str.parse::<i32>() {
+            (level * 3) + 1
+        } else {
+            1 // Default elevation
+        }
+    } else {
+        1 // Default elevation
+    };
+
+    // Place floor blocks
     for (x, z) in bridge_area {
-        editor.set_block(floor_block, x, bridge_level, z, None, None);
+        editor.set_block(floor_block, x, bridge_y_offset, z, None, None);
     }
 }

src/element_processing/doors.rs

@@ -2,7 +2,7 @@ use crate::block_definitions::*;
 use crate::osm_parser::ProcessedNode;
 use crate::world_editor::WorldEditor;
 
-pub fn generate_doors(editor: &mut WorldEditor, element: &ProcessedNode, ground_level: i32) {
+pub fn generate_doors(editor: &mut WorldEditor, element: &ProcessedNode) {
     // Check if the element is a door or entrance
     if element.tags.contains_key("door") || element.tags.contains_key("entrance") {
         // Check for the "level" tag and skip doors that are not at ground level
@@ -18,8 +18,8 @@ pub fn generate_doors(editor: &mut WorldEditor, element: &ProcessedNode, ground_
         let z: i32 = element.z;
 
         // Set the ground block and the door blocks
-        editor.set_block(GRAY_CONCRETE, x, ground_level, z, None, None);
-        editor.set_block(DARK_OAK_DOOR_LOWER, x, ground_level + 1, z, None, None);
-        editor.set_block(DARK_OAK_DOOR_UPPER, x, ground_level + 2, z, None, None);
+        editor.set_block(GRAY_CONCRETE, x, 0, z, None, None);
+        editor.set_block(DARK_OAK_DOOR_LOWER, x, 1, z, None, None);
+        editor.set_block(DARK_OAK_DOOR_UPPER, x, 2, z, None, None);
     }
 }

src/element_processing/highways.rs

@@ -1,26 +1,22 @@
 use crate::args::Args;
 use crate::block_definitions::*;
 use crate::bresenham::bresenham_line;
+use crate::cartesian::XZPoint;
 use crate::floodfill::flood_fill_area;
 use crate::osm_parser::{ProcessedElement, ProcessedWay};
 use crate::world_editor::WorldEditor;
 
-pub fn generate_highways(
-    editor: &mut WorldEditor,
-    element: &ProcessedElement,
-    ground_level: i32,
-    args: &Args,
-) {
+pub fn generate_highways(editor: &mut WorldEditor, element: &ProcessedElement, args: &Args) {
     if let Some(highway_type) = element.tags().get("highway") {
         if highway_type == "street_lamp" {
             // Handle street lamps
             if let ProcessedElement::Node(first_node) = element {
                 let x: i32 = first_node.x;
                 let z: i32 = first_node.z;
-                for y in 1..=4 {
-                    editor.set_block(OAK_FENCE, x, ground_level + y, z, None, None);
+                for dy in 1..=4 {
+                    editor.set_block(OAK_FENCE, x, dy, z, None, None);
                 }
-                editor.set_block(GLOWSTONE, x, ground_level + 5, z, None, None);
+                editor.set_block(GLOWSTONE, x, 5, z, None, None);
             }
         } else if highway_type == "crossing" {
             // Handle traffic signals for crossings
@@ -29,31 +25,28 @@ pub fn generate_highways(
                     if let ProcessedElement::Node(node) = element {
                         let x: i32 = node.x;
                         let z: i32 = node.z;
-                        for y in 1..=3 {
-                            editor.set_block(COBBLESTONE_WALL, x, ground_level + y, z, None, None);
+
+                        for dy in 1..=3 {
+                            editor.set_block(COBBLESTONE_WALL, x, dy, z, None, None);
                         }
 
-                        editor.set_block(GREEN_WOOL, x, ground_level + 4, z, None, None);
-                        editor.set_block(YELLOW_WOOL, x, ground_level + 5, z, None, None);
-                        editor.set_block(RED_WOOL, x, ground_level + 6, z, None, None);
-
-                        if args.winter {
-                            editor.set_block(SNOW_LAYER, x, ground_level + 7, z, None, None);
-                        }
+                        editor.set_block(GREEN_WOOL, x, 4, z, None, None);
+                        editor.set_block(YELLOW_WOOL, x, 5, z, None, None);
+                        editor.set_block(RED_WOOL, x, 6, z, None, None);
                     }
                 }
             }
         } else if highway_type == "bus_stop" {
             // Handle bus stops
             if let ProcessedElement::Node(node) = element {
-                let x: i32 = node.x;
-                let z: i32 = node.z;
-                for y in 1..=3 {
-                    editor.set_block(COBBLESTONE_WALL, x, ground_level + y, z, None, None);
+                let x = node.x;
+                let z = node.z;
+                for dy in 1..=3 {
+                    editor.set_block(COBBLESTONE_WALL, x, dy, z, None, None);
                 }
 
-                editor.set_block(WHITE_WOOL, x, ground_level + 4, z, None, None);
-                editor.set_block(WHITE_WOOL, x + 1, ground_level + 4, z, None, None);
+                editor.set_block(WHITE_WOOL, x, 4, z, None, None);
+                editor.set_block(WHITE_WOOL, x + 1, 4, z, None, None);
             }
         } else if element
             .tags()
@@ -75,14 +68,8 @@ pub fn generate_highways(
                     "wood" => OAK_PLANKS,
                     "asphalt" => BLACK_CONCRETE,
                     "gravel" | "fine_gravel" => GRAVEL,
-                    "grass" => {
-                        if args.winter {
-                            SNOW_BLOCK
-                        } else {
-                            GRASS_BLOCK
-                        }
-                    }
-                    "dirt" => DIRT,
+                    "grass" => GRASS_BLOCK,
+                    "dirt" | "ground" | "earth" => DIRT,
                     "sand" => SAND,
                     "concrete" => LIGHT_GRAY_CONCRETE,
                     _ => STONE, // Default to stone for unknown surfaces
@@ -99,7 +86,7 @@ pub fn generate_highways(
                 flood_fill_area(&polygon_coords, args.timeout.as_ref());
 
             for (x, z) in filled_area {
-                editor.set_block(surface_block, x, ground_level, z, None, None);
+                editor.set_block(surface_block, x, 0, z, None, None);
             }
         } else {
             let mut previous_node: Option<(i32, i32)> = None;
@@ -127,12 +114,15 @@ pub fn generate_highways(
                     block_range = 1;
                 }
                 "path" => {
-                    block_type = LIGHT_GRAY_CONCRETE;
+                    block_type = DIRT_PATH;
                     block_range = 1;
                 }
                 "motorway" | "primary" => {
                     block_range = 5;
-                    add_stripe = true; // Add stripes for motorways and primary roads
+                    add_stripe = true;
+                }
+                "tertiary" => {
+                    add_stripe = true;
                 }
                 "track" => {
                     block_range = 1;
@@ -141,6 +131,22 @@ pub fn generate_highways(
                     block_type = GRAY_CONCRETE;
                     block_range = 2;
                 }
+                "secondary_link" | "tertiary_link" => {
+                    //Exit ramps, sliproads
+                    block_type = BLACK_CONCRETE;
+                    block_range = 1;
+                }
+                "escape" => {
+                    // Sand trap for vehicles on mountainous roads
+                    block_type = SAND;
+                    block_range = 1;
+                }
+                "steps" => {
+                    //TODO: Add correct stairs respecting height, step_count, etc.
+                    block_type = GRAY_CONCRETE;
+                    block_range = 1;
+                }
+
                 _ => {
                     if let Some(lanes) = element.tags().get("lanes") {
                         if lanes == "2" {
@@ -166,8 +172,10 @@ pub fn generate_highways(
                     let z2: i32 = node.z;
 
                     // Generate the line of coordinates between the two nodes
+                    // we don't care about the y because it's going to get overwritten
+                    // I'm not sure if we'll keep it this way
                     let bresenham_points: Vec<(i32, i32, i32)> =
-                        bresenham_line(x1, ground_level, z1, x2, ground_level, z2);
+                        bresenham_line(x1, 0, z1, x2, 0, z2);
 
                     // Variables to manage dashed line pattern
                     let mut stripe_length: i32 = 0;
@@ -192,7 +200,7 @@ pub fn generate_highways(
                                             editor.set_block(
                                                 WHITE_CONCRETE,
                                                 set_x,
-                                                ground_level,
+                                                0,
                                                 set_z,
                                                 Some(&[BLACK_CONCRETE]),
                                                 None,
@@ -201,7 +209,7 @@ pub fn generate_highways(
                                             editor.set_block(
                                                 BLACK_CONCRETE,
                                                 set_x,
-                                                ground_level,
+                                                0,
                                                 set_z,
                                                 None,
                                                 None,
@@ -211,7 +219,7 @@ pub fn generate_highways(
                                         editor.set_block(
                                             WHITE_CONCRETE,
                                             set_x,
-                                            ground_level,
+                                            0,
                                             set_z,
                                             Some(&[BLACK_CONCRETE]),
                                             None,
@@ -220,7 +228,7 @@ pub fn generate_highways(
                                         editor.set_block(
                                             BLACK_CONCRETE,
                                             set_x,
-                                            ground_level,
+                                            0,
                                             set_z,
                                             None,
                                             None,
@@ -230,7 +238,7 @@ pub fn generate_highways(
                                     editor.set_block(
                                         block_type,
                                         set_x,
-                                        ground_level,
+                                        0,
                                         set_z,
                                         None,
                                         Some(&[BLACK_CONCRETE, WHITE_CONCRETE]),
@@ -247,7 +255,7 @@ pub fn generate_highways(
                                 editor.set_block(
                                     WHITE_CONCRETE,
                                     stripe_x,
-                                    ground_level,
+                                    0,
                                     stripe_z,
                                     Some(&[BLACK_CONCRETE]),
                                     None,
@@ -269,48 +277,53 @@ pub fn generate_highways(
 }
 
 /// Generates a siding using stone brick slabs
-pub fn generate_siding(editor: &mut WorldEditor, element: &ProcessedWay, ground_level: i32) {
-    let mut previous_node: Option<(i32, i32)> = None;
+pub fn generate_siding(editor: &mut WorldEditor, element: &ProcessedWay) {
+    let mut previous_node: Option<XZPoint> = None;
     let siding_block: Block = STONE_BRICK_SLAB;
 
     for node in &element.nodes {
-        let x: i32 = node.x;
-        let z: i32 = node.z;
+        let current_node = node.xz();
 
         // Draw the siding using Bresenham's line algorithm between nodes
-        if let Some(prev) = previous_node {
-            let bresenham_points: Vec<(i32, i32, i32)> =
-                bresenham_line(prev.0, ground_level + 1, prev.1, x, ground_level + 1, z);
-            for (bx, by, bz) in bresenham_points {
-                if !editor.check_for_block(
-                    bx,
-                    by - 1,
-                    bz,
-                    None,
-                    Some(&[BLACK_CONCRETE, WHITE_CONCRETE]),
-                ) {
-                    editor.set_block(siding_block, bx, by, bz, None, None);
+        if let Some(prev_node) = previous_node {
+            let bresenham_points: Vec<(i32, i32, i32)> = bresenham_line(
+                prev_node.x,
+                0,
+                prev_node.z,
+                current_node.x,
+                0,
+                current_node.z,
+            );
+
+            for (bx, _, bz) in bresenham_points {
+                if !editor.check_for_block(bx, 0, bz, Some(&[BLACK_CONCRETE, WHITE_CONCRETE])) {
+                    editor.set_block(siding_block, bx, 1, bz, None, None);
                 }
             }
         }
 
-        previous_node = Some((x, z));
+        previous_node = Some(current_node);
     }
 }
 
 /// Generates an aeroway
-pub fn generate_aeroway(editor: &mut WorldEditor, way: &ProcessedWay, ground_level: i32) {
+pub fn generate_aeroway(editor: &mut WorldEditor, way: &ProcessedWay) {
     let mut previous_node: Option<(i32, i32)> = None;
     let surface_block = LIGHT_GRAY_CONCRETE;
 
     for node in &way.nodes {
         if let Some(prev) = previous_node {
-            let points = bresenham_line(prev.0, ground_level, prev.1, node.x, ground_level, node.z);
+            let (x1, z1) = prev;
+            let x2 = node.x;
+            let z2 = node.z;
+            let points = bresenham_line(x1, 0, z1, x2, 0, z2);
 
-            for (x, y, z) in points {
-                for dx in -12..=1 {
-                    for dz in -12..=1 {
-                        editor.set_block(surface_block, x + dx, y, z + dz, None, None);
+            for (x, _, z) in points {
+                for dx in -12..=12 {
+                    for dz in -12..=12 {
+                        let set_x = x + dx;
+                        let set_z = z + dz;
+                        editor.set_block(surface_block, set_x, 0, set_z, None, None);
                     }
                 }
             }

src/element_processing/landuse.rs

@@ -1,385 +1,231 @@
 use crate::args::Args;
 use crate::block_definitions::*;
-use crate::bresenham::bresenham_line;
-use crate::element_processing::tree::create_tree;
+use crate::element_processing::tree::Tree;
 use crate::floodfill::flood_fill_area;
 use crate::osm_parser::ProcessedWay;
 use crate::world_editor::WorldEditor;
 use rand::Rng;
 
-pub fn generate_landuse(
-    editor: &mut WorldEditor,
-    element: &ProcessedWay,
-    ground_level: i32,
-    args: &Args,
-) {
-    let mut previous_node: Option<(i32, i32)> = None;
-    let mut corner_addup: (i32, i32, i32) = (0, 0, 0);
-    let mut current_landuse: Vec<(i32, i32)> = vec![];
-
+pub fn generate_landuse(editor: &mut WorldEditor, element: &ProcessedWay, args: &Args) {
     // Determine block type based on landuse tag
     let binding: String = "".to_string();
     let landuse_tag: &String = element.tags.get("landuse").unwrap_or(&binding);
 
     let block_type = match landuse_tag.as_str() {
-        "greenfield" | "meadow" | "grass" => {
-            if args.winter {
-                SNOW_BLOCK
-            } else {
-                GRASS_BLOCK
-            }
-        }
+        "greenfield" | "meadow" | "grass" | "orchard" | "forest" => GRASS_BLOCK,
         "farmland" => FARMLAND,
-        "forest" => {
-            if args.winter {
-                SNOW_BLOCK
-            } else {
+        "cemetery" => PODZOL,
+        "construction" => COARSE_DIRT,
+        "traffic_island" => STONE_BLOCK_SLAB,
+        "residential" => {
+            let residential_tag = element.tags.get("residential").unwrap_or(&binding);
+            if residential_tag == "rural" {
                 GRASS_BLOCK
+            } else {
+                STONE_BRICKS
             }
         }
-        "cemetery" => PODZOL,
-        "beach" => SAND,
-        "construction" => DIRT,
-        "traffic_island" => STONE_BLOCK_SLAB,
-        "residential" => STONE_BRICKS,
         "commercial" => SMOOTH_STONE,
         "education" => LIGHT_GRAY_CONCRETE,
         "industrial" => COBBLESTONE,
         "military" => GRAY_CONCRETE,
         "railway" => GRAVEL,
-        _ => {
-            if args.winter {
-                SNOW_BLOCK
+        "landfill" => {
+            // Gravel if man_made = spoil_heap or heap, coarse dirt else
+            let manmade_tag = element.tags.get("man_made").unwrap_or(&binding);
+            if manmade_tag == "spoil_heap" || manmade_tag == "heap" {
+                GRAVEL
             } else {
-                GRASS_BLOCK
+                COARSE_DIRT
             }
         }
+        "quarry" => STONE,
+        _ => GRASS_BLOCK,
     };
 
-    let bresenham_block: Block = if args.winter { SNOW_BLOCK } else { GRASS_BLOCK };
+    // Get the area of the landuse element
+    let polygon_coords: Vec<(i32, i32)> = element.nodes.iter().map(|n| (n.x, n.z)).collect();
+    let floor_area: Vec<(i32, i32)> = flood_fill_area(&polygon_coords, args.timeout.as_ref());
 
-    // Process landuse nodes to fill the area
-    for node in &element.nodes {
-        let x: i32 = node.x;
-        let z: i32 = node.z;
+    let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
 
-        if let Some(prev) = previous_node {
-            // Generate the line of coordinates between the two nodes
-            let bresenham_points: Vec<(i32, i32, i32)> =
-                bresenham_line(prev.0, ground_level, prev.1, x, ground_level, z);
-            for (bx, _, bz) in bresenham_points {
-                editor.set_block(bresenham_block, bx, ground_level, bz, None, None);
-            }
-
-            current_landuse.push((x, z));
-            corner_addup = (corner_addup.0 + x, corner_addup.1 + z, corner_addup.2 + 1);
+    for (x, z) in floor_area {
+        if landuse_tag == "traffic_island" {
+            editor.set_block(block_type, x, 1, z, None, None);
+        } else if landuse_tag == "construction" || landuse_tag == "railway" {
+            editor.set_block(block_type, x, 0, z, None, Some(&[SPONGE]));
+        } else {
+            editor.set_block(block_type, x, 0, z, None, None);
         }
 
-        previous_node = Some((x, z));
-    }
-
-    // If there are landuse nodes, flood-fill the area
-    if !current_landuse.is_empty() {
-        let polygon_coords: Vec<(i32, i32)> = element.nodes.iter().map(|n| (n.x, n.z)).collect();
-        let floor_area: Vec<(i32, i32)> = flood_fill_area(&polygon_coords, args.timeout.as_ref());
-
-        let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
-
-        for (x, z) in floor_area {
-            if landuse_tag == "traffic_island" {
-                editor.set_block(block_type, x, ground_level + 1, z, None, None);
-            } else if landuse_tag == "construction" || landuse_tag == "railway" {
-                editor.set_block(block_type, x, ground_level, z, None, Some(&[SPONGE]));
-            } else {
-                editor.set_block(block_type, x, ground_level, z, None, None);
-            }
-
-            // Add specific features for different landuse types
-            match landuse_tag.as_str() {
-                "cemetery" => {
-                    if (x % 3 == 0) && (z % 3 == 0) {
-                        let random_choice: i32 = rng.gen_range(0..100);
-                        if random_choice < 15 {
-                            // Place graves
-                            if editor.check_for_block(x, ground_level, z, Some(&[PODZOL]), None) {
-                                if rng.gen_bool(0.5) {
-                                    editor.set_block(
-                                        COBBLESTONE,
-                                        x - 1,
-                                        ground_level + 1,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                    editor.set_block(
-                                        STONE_BRICK_SLAB,
-                                        x - 1,
-                                        ground_level + 2,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                    editor.set_block(
-                                        STONE_BRICK_SLAB,
-                                        x,
-                                        ground_level + 1,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                    editor.set_block(
-                                        STONE_BRICK_SLAB,
-                                        x + 1,
-                                        ground_level + 1,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                } else {
-                                    editor.set_block(
-                                        COBBLESTONE,
-                                        x,
-                                        ground_level + 1,
-                                        z - 1,
-                                        None,
-                                        None,
-                                    );
-                                    editor.set_block(
-                                        STONE_BRICK_SLAB,
-                                        x,
-                                        ground_level + 2,
-                                        z - 1,
-                                        None,
-                                        None,
-                                    );
-                                    editor.set_block(
-                                        STONE_BRICK_SLAB,
-                                        x,
-                                        ground_level + 1,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                    editor.set_block(
-                                        STONE_BRICK_SLAB,
-                                        x,
-                                        ground_level + 1,
-                                        z + 1,
-                                        None,
-                                        None,
-                                    );
-                                }
-                            }
-                        } else if random_choice < 30 {
-                            if editor.check_for_block(x, ground_level, z, Some(&[PODZOL]), None) {
-                                editor.set_block(RED_FLOWER, x, ground_level + 1, z, None, None);
-                            }
-                        } else if random_choice < 33 {
-                            create_tree(
-                                editor,
-                                x,
-                                ground_level + 1,
-                                z,
-                                rng.gen_range(1..=3),
-                                args.winter,
-                            );
-                        }
-                    }
-                }
-                "forest" => {
-                    if !editor.check_for_block(x, ground_level, z, None, Some(&[WATER])) {
-                        let random_choice: i32 = rng.gen_range(0..21);
-                        if random_choice == 20 {
-                            create_tree(
-                                editor,
-                                x,
-                                ground_level + 1,
-                                z,
-                                rng.gen_range(1..=3),
-                                args.winter,
-                            );
-                        } else if random_choice == 2 {
-                            let flower_block: Block = match rng.gen_range(1..=4) {
-                                1 => RED_FLOWER,
-                                2 => BLUE_FLOWER,
-                                3 => YELLOW_FLOWER,
-                                _ => WHITE_FLOWER,
-                            };
-                            editor.set_block(flower_block, x, ground_level + 1, z, None, None);
-                        } else if random_choice <= 1 {
-                            editor.set_block(GRASS, x, ground_level + 1, z, None, None);
-                        }
-                    }
-                }
-                "farmland" => {
-                    // Check if the current block is not water or another undesired block
-                    if !editor.check_for_block(x, ground_level, z, None, Some(&[WATER])) {
-                        if x % 15 == 0 || z % 15 == 0 {
-                            // Place water on the edges
-                            editor.set_block(WATER, x, ground_level, z, Some(&[FARMLAND]), None);
-                            editor.set_block(
-                                AIR,
-                                x,
-                                ground_level + 1,
-                                z,
-                                Some(&[GRASS, WHEAT, CARROTS, POTATOES]),
-                                None,
-                            );
-                        } else {
-                            // Set the block below as farmland
-                            editor.set_block(FARMLAND, x, ground_level, z, None, None);
-
-                            // If a random condition is met, place a special object
-                            if rng.gen_range(0..76) == 0 {
-                                let special_choice: i32 = rng.gen_range(1..=10);
-                                if special_choice <= 2 {
-                                    create_tree(
-                                        editor,
-                                        x,
-                                        ground_level + 1,
-                                        z,
-                                        rng.gen_range(1..=3),
-                                        args.winter,
-                                    );
-                                } else if special_choice <= 6 {
-                                    editor.set_block(HAY_BALE, x, ground_level + 1, z, None, None);
-                                } else {
-                                    editor.set_block(
-                                        OAK_LEAVES,
-                                        x,
-                                        ground_level + 1,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                }
+        // Add specific features for different landuse types
+        match landuse_tag.as_str() {
+            "cemetery" => {
+                if (x % 3 == 0) && (z % 3 == 0) {
+                    let random_choice: i32 = rng.gen_range(0..100);
+                    if random_choice < 15 {
+                        // Place graves
+                        if editor.check_for_block(x, 0, z, Some(&[PODZOL])) {
+                            if rng.gen_bool(0.5) {
+                                editor.set_block(COBBLESTONE, x - 1, 1, z, None, None);
+                                editor.set_block(STONE_BRICK_SLAB, x - 1, 2, z, None, None);
+                                editor.set_block(STONE_BRICK_SLAB, x, 1, z, None, None);
+                                editor.set_block(STONE_BRICK_SLAB, x + 1, 1, z, None, None);
                             } else {
-                                // Set crops only if the block below is farmland
-                                if editor.check_for_block(
-                                    x,
-                                    ground_level,
-                                    z,
-                                    Some(&[FARMLAND]),
-                                    None,
-                                ) {
-                                    let crop_choice =
-                                        [WHEAT, CARROTS, POTATOES][rng.gen_range(0..3)];
-                                    editor.set_block(
-                                        crop_choice,
-                                        x,
-                                        ground_level + 1,
-                                        z,
-                                        None,
-                                        None,
-                                    );
-                                }
+                                editor.set_block(COBBLESTONE, x, 1, z - 1, None, None);
+                                editor.set_block(STONE_BRICK_SLAB, x, 2, z - 1, None, None);
+                                editor.set_block(STONE_BRICK_SLAB, x, 1, z, None, None);
+                                editor.set_block(STONE_BRICK_SLAB, x, 1, z + 1, None, None);
                             }
                         }
-                    }
-                }
-                "construction" => {
-                    let random_choice: i32 = rng.gen_range(0..1501);
-                    if random_choice < 6 {
-                        editor.set_block(SCAFFOLDING, x, ground_level + 1, z, None, None);
-                        if random_choice < 2 {
-                            editor.set_block(SCAFFOLDING, x, ground_level + 2, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 3, z, None, None);
-                        } else if random_choice < 4 {
-                            editor.set_block(SCAFFOLDING, x, ground_level + 2, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 3, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 4, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 1, z + 1, None, None);
-                        } else {
-                            editor.set_block(SCAFFOLDING, x, ground_level + 2, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 3, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 4, z, None, None);
-                            editor.set_block(SCAFFOLDING, x, ground_level + 5, z, None, None);
-                            editor.set_block(SCAFFOLDING, x - 1, ground_level + 1, z, None, None);
-                            editor.set_block(
-                                SCAFFOLDING,
-                                x + 1,
-                                ground_level + 1,
-                                z - 1,
-                                None,
-                                None,
-                            );
-                        }
                     } else if random_choice < 30 {
-                        let construction_items: [Block; 11] = [
-                            OAK_LOG,
-                            COBBLESTONE,
-                            GRAVEL,
-                            GLOWSTONE,
-                            STONE,
-                            COBBLESTONE_WALL,
-                            BLACK_CONCRETE,
-                            SAND,
-                            OAK_PLANKS,
-                            DIRT,
-                            BRICK,
-                        ];
-                        editor.set_block(
-                            construction_items[rng.gen_range(0..construction_items.len())],
-                            x,
-                            ground_level + 1,
-                            z,
-                            None,
-                            None,
-                        );
-                    } else if random_choice < 35 {
-                        if random_choice < 30 {
-                            editor.set_block(DIRT, x, ground_level + 1, z, None, None);
-                            editor.set_block(DIRT, x, ground_level + 2, z, None, None);
-                            editor.set_block(DIRT, x + 1, ground_level + 1, z, None, None);
-                            editor.set_block(DIRT, x, ground_level + 1, z + 1, None, None);
-                        } else {
-                            editor.set_block(DIRT, x, ground_level + 1, z, None, None);
-                            editor.set_block(DIRT, x, ground_level + 2, z, None, None);
-                            editor.set_block(DIRT, x - 1, ground_level + 1, z, None, None);
-                            editor.set_block(DIRT, x, ground_level + 1, z - 1, None, None);
+                        if editor.check_for_block(x, 0, z, Some(&[PODZOL])) {
+                            editor.set_block(RED_FLOWER, x, 1, z, None, None);
                         }
-                    } else if random_choice < 150 {
-                        editor.set_block(AIR, x, ground_level, z, None, Some(&[SPONGE]));
+                    } else if random_choice < 33 {
+                        Tree::create(editor, (x, 1, z));
                     }
                 }
-                "grass" => {
-                    if rng.gen_range(1..=7) != 1
-                        && editor.check_for_block(
-                            x,
-                            ground_level,
-                            z,
-                            Some(&[GRASS_BLOCK, SNOW_BLOCK]),
-                            None,
-                        )
-                    {
-                        editor.set_block(GRASS, x, ground_level + 1, z, None, None);
-                    }
-                }
-                "meadow" => {
-                    if editor.check_for_block(
-                        x,
-                        ground_level,
-                        z,
-                        Some(&[GRASS_BLOCK, SNOW_BLOCK]),
-                        None,
-                    ) {
-                        let random_choice: i32 = rng.gen_range(0..1001);
-                        if random_choice < 5 {
-                            create_tree(
-                                editor,
-                                x,
-                                ground_level + 1,
-                                z,
-                                rng.gen_range(1..=3),
-                                args.winter,
-                            );
-                        } else if random_choice < 800 {
-                            editor.set_block(GRASS, x, ground_level + 1, z, None, None);
-                        }
-                    }
-                }
-                _ => {}
             }
+            "forest" => {
+                if editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                    let random_choice: i32 = rng.gen_range(0..30);
+                    if random_choice == 20 {
+                        Tree::create(editor, (x, 1, z));
+                    } else if random_choice == 2 {
+                        let flower_block: Block = match rng.gen_range(1..=4) {
+                            1 => RED_FLOWER,
+                            2 => BLUE_FLOWER,
+                            3 => YELLOW_FLOWER,
+                            _ => WHITE_FLOWER,
+                        };
+                        editor.set_block(flower_block, x, 1, z, None, None);
+                    } else if random_choice <= 12 {
+                        editor.set_block(GRASS, x, 1, z, None, None);
+                    }
+                }
+            }
+            "farmland" => {
+                // Check if the current block is not water or another undesired block
+                if !editor.check_for_block(x, 0, z, Some(&[WATER])) {
+                    if x % 9 == 0 && z % 9 == 0 {
+                        // Place water in dot pattern
+                        editor.set_block(WATER, x, 0, z, Some(&[FARMLAND]), None);
+                    } else if rng.gen_range(0..76) == 0 {
+                        let special_choice: i32 = rng.gen_range(1..=10);
+                        if special_choice <= 4 {
+                            editor.set_block(HAY_BALE, x, 1, z, None, Some(&[SPONGE]));
+                        } else {
+                            editor.set_block(OAK_LEAVES, x, 1, z, None, Some(&[SPONGE]));
+                        }
+                    } else {
+                        // Set crops only if the block below is farmland
+                        if editor.check_for_block(x, 0, z, Some(&[FARMLAND])) {
+                            let crop_choice = [WHEAT, CARROTS, POTATOES][rng.gen_range(0..3)];
+                            editor.set_block(crop_choice, x, 1, z, None, None);
+                        }
+                    }
+                }
+            }
+            "construction" => {
+                let random_choice: i32 = rng.gen_range(0..1501);
+                if random_choice < 6 {
+                    editor.set_block(SCAFFOLDING, x, 1, z, None, None);
+                    if random_choice < 2 {
+                        editor.set_block(SCAFFOLDING, x, 2, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 3, z, None, None);
+                    } else if random_choice < 4 {
+                        editor.set_block(SCAFFOLDING, x, 2, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 3, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 4, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 1, z + 1, None, None);
+                    } else {
+                        editor.set_block(SCAFFOLDING, x, 2, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 3, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 4, z, None, None);
+                        editor.set_block(SCAFFOLDING, x, 5, z, None, None);
+                        editor.set_block(SCAFFOLDING, x - 1, 1, z, None, None);
+                        editor.set_block(SCAFFOLDING, x + 1, 1, z - 1, None, None);
+                    }
+                } else if random_choice < 30 {
+                    let construction_items: [Block; 11] = [
+                        OAK_LOG,
+                        COBBLESTONE,
+                        GRAVEL,
+                        GLOWSTONE,
+                        STONE,
+                        COBBLESTONE_WALL,
+                        BLACK_CONCRETE,
+                        SAND,
+                        OAK_PLANKS,
+                        DIRT,
+                        BRICK,
+                    ];
+                    editor.set_block(
+                        construction_items[rng.gen_range(0..construction_items.len())],
+                        x,
+                        1,
+                        z,
+                        None,
+                        None,
+                    );
+                } else if random_choice < 35 {
+                    if random_choice < 30 {
+                        editor.set_block(DIRT, x, 1, z, None, None);
+                        editor.set_block(DIRT, x, 2, z, None, None);
+                        editor.set_block(DIRT, x + 1, 1, z, None, None);
+                        editor.set_block(DIRT, x, 1, z + 1, None, None);
+                    } else {
+                        editor.set_block(DIRT, x, 1, z, None, None);
+                        editor.set_block(DIRT, x, 2, z, None, None);
+                        editor.set_block(DIRT, x - 1, 1, z, None, None);
+                        editor.set_block(DIRT, x, 1, z - 1, None, None);
+                    }
+                } else if random_choice < 150 {
+                    editor.set_block(AIR, x, 0, z, None, Some(&[SPONGE]));
+                }
+            }
+            "grass" => {
+                if rng.gen_bool(0.85) && editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                    editor.set_block(GRASS, x, 1, z, None, None);
+                }
+            }
+            "meadow" => {
+                if editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                    let random_choice: i32 = rng.gen_range(0..1001);
+                    if random_choice < 5 {
+                        Tree::create(editor, (x, 1, z));
+                    } else if random_choice < 800 {
+                        editor.set_block(GRASS, x, 1, z, None, None);
+                    }
+                }
+            }
+            "orchard" => {
+                if x % 18 == 0 && z % 10 == 0 {
+                    Tree::create(editor, (x, 1, z));
+                }
+            }
+            "quarry" => {
+                // Add stone layer under it
+                editor.set_block(STONE, x, -1, z, Some(&[STONE]), None);
+                editor.set_block(STONE, x, -2, z, Some(&[STONE]), None);
+                // Generate ore blocks
+                if let Some(resource) = element.tags.get("resource") {
+                    let ore_block = match resource.as_str() {
+                        "iron_ore" => IRON_ORE,
+                        "coal" => COAL_ORE,
+                        "copper" => COPPER_ORE,
+                        "gold" => GOLD_ORE,
+                        "clay" | "kaolinite" => CLAY,
+                        _ => STONE,
+                    };
+                    let random_choice: i32 = rng.gen_range(0..100 + editor.get_absolute_y(x, 0, z)); // The deeper it is the more resources are there
+                    if random_choice < 5 {
+                        editor.set_block(ore_block, x, 0, z, Some(&[STONE]), None);
+                    }
+                }
+            }
+            _ => {}
         }
     }
 }

src/element_processing/leisure.rs

@@ -1,18 +1,13 @@
 use crate::args::Args;
 use crate::block_definitions::*;
 use crate::bresenham::bresenham_line;
-use crate::element_processing::tree::create_tree;
+use crate::element_processing::tree::Tree;
 use crate::floodfill::flood_fill_area;
-use crate::osm_parser::ProcessedWay;
+use crate::osm_parser::{ProcessedMemberRole, ProcessedRelation, ProcessedWay};
 use crate::world_editor::WorldEditor;
 use rand::Rng;
 
-pub fn generate_leisure(
-    editor: &mut WorldEditor,
-    element: &ProcessedWay,
-    ground_level: i32,
-    args: &Args,
-) {
+pub fn generate_leisure(editor: &mut WorldEditor, element: &ProcessedWay, args: &Args) {
     if let Some(leisure_type) = element.tags.get("leisure") {
         let mut previous_node: Option<(i32, i32)> = None;
         let mut corner_addup: (i32, i32, i32) = (0, 0, 0);
@@ -20,40 +15,30 @@ pub fn generate_leisure(
 
         // Determine block type based on leisure type
         let block_type: Block = match leisure_type.as_str() {
-            "park" => {
-                if args.winter {
-                    SNOW_BLOCK
-                } else {
-                    GRASS_BLOCK
-                }
+            "park" | "nature_reserve" | "garden" | "disc_golf_course" | "golf_course" => {
+                GRASS_BLOCK
             }
-            "playground" | "recreation_ground" | "pitch" => {
+            "playground" | "recreation_ground" | "pitch" | "beach_resort" | "dog_park" => {
                 if let Some(surface) = element.tags.get("surface") {
                     match surface.as_str() {
                         "clay" => TERRACOTTA,
                         "sand" => SAND,
                         "tartan" => RED_TERRACOTTA,
+                        "grass" => GRASS_BLOCK,
+                        "dirt" => DIRT,
+                        "pebblestone" | "cobblestone" | "unhewn_cobblestone" => COBBLESTONE,
                         _ => GREEN_STAINED_HARDENED_CLAY,
                     }
                 } else {
                     GREEN_STAINED_HARDENED_CLAY
                 }
             }
-            "garden" => {
-                if args.winter {
-                    SNOW_BLOCK
-                } else {
-                    GRASS_BLOCK
-                }
-            }
-            "swimming_pool" => WATER,
-            _ => {
-                if args.winter {
-                    SNOW_BLOCK
-                } else {
-                    GRASS_BLOCK
-                }
-            }
+            "swimming_pool" | "swimming_area" => WATER, //Swimming area: Area in a larger body of water for swimming
+            "bathing_place" => SMOOTH_SANDSTONE,        // Could be sand or concrete
+            "outdoor_seating" => SMOOTH_STONE,          //Usually stone or stone bricks
+            "water_park" | "slipway" => LIGHT_GRAY_CONCRETE, // Water park area, not the pool. Usually is concrete
+            "ice_rink" => PACKED_ICE, // TODO: Ice for Ice Rink, needs building defined
+            _ => GRASS_BLOCK,
         };
 
         // Process leisure area nodes
@@ -61,12 +46,12 @@ pub fn generate_leisure(
             if let Some(prev) = previous_node {
                 // Draw a line between the current and previous node
                 let bresenham_points: Vec<(i32, i32, i32)> =
-                    bresenham_line(prev.0, ground_level, prev.1, node.x, ground_level, node.z);
+                    bresenham_line(prev.0, 0, prev.1, node.x, 0, node.z);
                 for (bx, _, bz) in bresenham_points {
                     editor.set_block(
                         block_type,
                         bx,
-                        ground_level,
+                        0,
                         bz,
                         Some(&[
                             GRASS_BLOCK,
@@ -99,46 +84,33 @@ pub fn generate_leisure(
                 flood_fill_area(&polygon_coords, args.timeout.as_ref());
 
             for (x, z) in filled_area {
-                editor.set_block(block_type, x, ground_level, z, Some(&[GRASS_BLOCK]), None);
+                editor.set_block(block_type, x, 0, z, Some(&[GRASS_BLOCK]), None);
 
                 // Add decorative elements for parks and gardens
-                if matches!(leisure_type.as_str(), "park" | "garden")
-                    && editor.check_for_block(x, ground_level, z, Some(&[GRASS_BLOCK]), None)
+                if matches!(leisure_type.as_str(), "park" | "garden" | "nature_reserve")
+                    && editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK]))
                 {
                     let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
                     let random_choice: i32 = rng.gen_range(0..1000);
 
                     match random_choice {
-                        0 => {
-                            // Benches
-                            editor.set_block(OAK_LOG, x, ground_level + 1, z, None, None);
-                            editor.set_block(OAK_LOG, x + 1, ground_level + 1, z, None, None);
-                            editor.set_block(OAK_LOG, x - 1, ground_level + 1, z, None, None);
-                        }
-                        1..=30 => {
+                        0..40 => {
                             // Flowers
-                            let flower_choice = match rng.gen_range(0..4) {
-                                0 => RED_FLOWER,
-                                1 => YELLOW_FLOWER,
-                                2 => BLUE_FLOWER,
+                            let flower_choice = match random_choice {
+                                0..10 => RED_FLOWER,
+                                10..20 => YELLOW_FLOWER,
+                                20..30 => BLUE_FLOWER,
                                 _ => WHITE_FLOWER,
                             };
-                            editor.set_block(flower_choice, x, ground_level + 1, z, None, None);
+                            editor.set_block(flower_choice, x, 1, z, None, None);
                         }
-                        31..=70 => {
+                        40..80 => {
                             // Grass
-                            editor.set_block(GRASS, x, ground_level + 1, z, None, None);
+                            editor.set_block(GRASS, x, 1, z, None, None);
                         }
-                        71..=80 => {
+                        80..90 => {
                             // Tree
-                            create_tree(
-                                editor,
-                                x,
-                                ground_level + 1,
-                                z,
-                                rng.gen_range(1..=3),
-                                args.winter,
-                            );
+                            Tree::create(editor, (x, 1, z));
                         }
                         _ => {}
                     }
@@ -150,36 +122,36 @@ pub fn generate_leisure(
                     let random_choice: i32 = rng.gen_range(0..5000);
 
                     match random_choice {
-                        0..=10 => {
+                        0..10 => {
                             // Swing set
                             for y in 1..=4 {
-                                editor.set_block(OAK_FENCE, x - 1, ground_level + y, z, None, None);
-                                editor.set_block(OAK_FENCE, x + 1, ground_level + y, z, None, None);
+                                editor.set_block(OAK_FENCE, x - 1, y, z, None, None);
+                                editor.set_block(OAK_FENCE, x + 1, y, z, None, None);
                             }
-                            editor.set_block(OAK_FENCE, x, ground_level + 4, z, None, None);
-                            editor.set_block(STONE_BLOCK_SLAB, x, ground_level + 2, z, None, None);
+                            editor.set_block(OAK_FENCE, x, 4, z, None, None);
+                            editor.set_block(STONE_BLOCK_SLAB, x, 2, z, None, None);
                         }
-                        11..=20 => {
+                        10..20 => {
                             // Slide
-                            editor.set_block(OAK_SLAB, x, ground_level + 1, z, None, None);
-                            editor.set_block(OAK_SLAB, x + 1, ground_level + 2, z, None, None);
-                            editor.set_block(OAK_SLAB, x + 2, ground_level + 3, z, None, None);
+                            editor.set_block(OAK_SLAB, x, 1, z, None, None);
+                            editor.set_block(OAK_SLAB, x + 1, 2, z, None, None);
+                            editor.set_block(OAK_SLAB, x + 2, 3, z, None, None);
 
-                            editor.set_block(OAK_PLANKS, x + 2, ground_level + 2, z, None, None);
-                            editor.set_block(OAK_PLANKS, x + 2, ground_level + 1, z, None, None);
+                            editor.set_block(OAK_PLANKS, x + 2, 2, z, None, None);
+                            editor.set_block(OAK_PLANKS, x + 2, 1, z, None, None);
 
-                            editor.set_block(LADDER, x + 2, ground_level + 2, z - 1, None, None);
-                            editor.set_block(LADDER, x + 2, ground_level + 1, z - 1, None, None);
+                            editor.set_block(LADDER, x + 2, 2, z - 1, None, None);
+                            editor.set_block(LADDER, x + 2, 1, z - 1, None, None);
                         }
-                        21..=30 => {
+                        20..30 => {
                             // Sandpit
                             editor.fill_blocks(
                                 SAND,
                                 x - 3,
-                                ground_level,
+                                0,
                                 z - 3,
                                 x + 3,
-                                ground_level,
+                                0,
                                 z + 3,
                                 Some(&[GREEN_STAINED_HARDENED_CLAY]),
                                 None,
@@ -192,3 +164,36 @@ pub fn generate_leisure(
         }
     }
 }
+
+pub fn generate_leisure_from_relation(
+    editor: &mut WorldEditor,
+    rel: &ProcessedRelation,
+    args: &Args,
+) {
+    if rel.tags.get("leisure") == Some(&"park".to_string()) {
+        // First generate individual ways with their original tags
+        for member in &rel.members {
+            if member.role == ProcessedMemberRole::Outer {
+                generate_leisure(editor, &member.way, args);
+            }
+        }
+
+        // Then combine all outer ways into one
+        let mut combined_nodes = Vec::new();
+        for member in &rel.members {
+            if member.role == ProcessedMemberRole::Outer {
+                combined_nodes.extend(member.way.nodes.clone());
+            }
+        }
+
+        // Create combined way with relation tags
+        let combined_way = ProcessedWay {
+            id: rel.id,
+            nodes: combined_nodes,
+            tags: rel.tags.clone(),
+        };
+
+        // Generate leisure area from combined way
+        generate_leisure(editor, &combined_way, args);
+    }
+}

src/element_processing/natural.rs

@@ -1,64 +1,44 @@
 use crate::args::Args;
 use crate::block_definitions::*;
 use crate::bresenham::bresenham_line;
-use crate::element_processing::tree::create_tree;
+use crate::element_processing::tree::Tree;
 use crate::floodfill::flood_fill_area;
 use crate::osm_parser::ProcessedElement;
 use crate::world_editor::WorldEditor;
 use rand::Rng;
 
-pub fn generate_natural(
-    editor: &mut WorldEditor,
-    element: &ProcessedElement,
-    ground_level: i32,
-    args: &Args,
-) {
+pub fn generate_natural(editor: &mut WorldEditor, element: &ProcessedElement, args: &Args) {
     if let Some(natural_type) = element.tags().get("natural") {
         if natural_type == "tree" {
             if let ProcessedElement::Node(node) = element {
                 let x: i32 = node.x;
                 let z: i32 = node.z;
 
-                let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
-                create_tree(
-                    editor,
-                    x,
-                    ground_level + 1,
-                    z,
-                    rng.gen_range(1..=3),
-                    args.winter,
-                );
+                Tree::create(editor, (x, 1, z));
             }
         } else {
             let mut previous_node: Option<(i32, i32)> = None;
             let mut corner_addup: (i32, i32, i32) = (0, 0, 0);
             let mut current_natural: Vec<(i32, i32)> = vec![];
+            let binding: String = "".to_string();
 
             // Determine block type based on natural tag
             let block_type: Block = match natural_type.as_str() {
-                "scrub" | "grassland" | "wood" => {
-                    if args.winter {
-                        SNOW_BLOCK
-                    } else {
-                        GRASS_BLOCK
-                    }
-                }
-                "beach" | "sand" => SAND,
-                "tree_row" => {
-                    if args.winter {
-                        SNOW_BLOCK
-                    } else {
-                        GRASS_BLOCK
-                    }
-                }
-                "wetland" | "water" => WATER,
-                _ => {
-                    if args.winter {
-                        SNOW_BLOCK
-                    } else {
-                        GRASS_BLOCK
+                "scrub" | "grassland" | "wood" | "heath" | "tree_row" => GRASS_BLOCK,
+                "sand" | "dune" => SAND,
+                "beach" | "shoal" => {
+                    let surface = element.tags().get("natural").unwrap_or(&binding);
+                    match surface.as_str() {
+                        "gravel" => GRAVEL,
+                        _ => SAND,
                     }
                 }
+                "water" | "reef" => WATER,
+                "bare_rock" => STONE,
+                "blockfield" => COBBLESTONE,
+                "glacier" => PACKED_ICE,
+                "mud" | "wetland" => MUD,
+                _ => GRASS_BLOCK,
             };
 
             let ProcessedElement::Way(way) = element else {
@@ -73,9 +53,9 @@ pub fn generate_natural(
                 if let Some(prev) = previous_node {
                     // Generate the line of coordinates between the two nodes
                     let bresenham_points: Vec<(i32, i32, i32)> =
-                        bresenham_line(prev.0, ground_level, prev.1, x, ground_level, z);
+                        bresenham_line(prev.0, 0, prev.1, x, 0, z);
                     for (bx, _, bz) in bresenham_points {
-                        editor.set_block(block_type, bx, ground_level, bz, None, None);
+                        editor.set_block(block_type, bx, 0, bz, None, None);
                     }
 
                     current_natural.push((x, z));
@@ -98,35 +78,181 @@ pub fn generate_natural(
                 let mut rng: rand::prelude::ThreadRng = rand::thread_rng();
 
                 for (x, z) in filled_area {
-                    editor.set_block(block_type, x, ground_level, z, None, None);
-
-                    // Generate elements for "wood" and "tree_row"
-                    if natural_type == "wood" || natural_type == "tree_row" {
-                        if editor.check_for_block(x, ground_level, z, None, Some(&[WATER])) {
-                            continue;
+                    editor.set_block(block_type, x, 0, z, None, None);
+                    // Generate custom layer instead of dirt, must be stone on the lowest level
+                    match natural_type.as_str() {
+                        "beach" | "sand" | "dune" | "shoal" => {
+                            editor.set_block(SAND, x, -1, z, None, None);
+                            editor.set_block(STONE, x, -2, z, None, None);
                         }
-
-                        let random_choice: i32 = rng.gen_range(0..26);
-                        if random_choice == 25 {
-                            create_tree(
-                                editor,
-                                x,
-                                ground_level + 1,
-                                z,
-                                rng.gen_range(1..=3),
-                                args.winter,
-                            );
-                        } else if random_choice == 2 {
-                            let flower_block = match rng.gen_range(1..=4) {
-                                1 => RED_FLOWER,
-                                2 => BLUE_FLOWER,
-                                3 => YELLOW_FLOWER,
-                                _ => WHITE_FLOWER,
-                            };
-                            editor.set_block(flower_block, x, ground_level + 1, z, None, None);
-                        } else if random_choice <= 1 {
-                            editor.set_block(GRASS, x, ground_level + 1, z, None, None);
+                        "glacier" => {
+                            editor.set_block(PACKED_ICE, x, -1, z, None, None);
+                            editor.set_block(STONE, x, -2, z, None, None);
                         }
+                        "bare_rock" => {
+                            editor.set_block(STONE, x, -1, z, None, None);
+                            editor.set_block(STONE, x, -2, z, None, None);
+                        }
+                        _ => {}
+                    }
+
+                    // Generate surface elements
+                    if editor.check_for_block(x, 0, z, Some(&[WATER])) {
+                        continue;
+                    }
+                    match natural_type.as_str() {
+                        "grassland" => {
+                            if !editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                                continue;
+                            }
+                            if rng.gen_bool(0.6) {
+                                editor.set_block(GRASS, x, 1, z, None, None);
+                            }
+                        }
+                        "heath" => {
+                            if !editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                                continue;
+                            }
+                            let random_choice = rng.gen_range(0..500);
+                            if random_choice < 30 {
+                                if random_choice < 3 {
+                                    editor.set_block(OAK_LEAVES, x, 1, z, None, None);
+                                } else {
+                                    editor.set_block(GRASS, x, 1, z, None, None);
+                                }
+                            }
+                        }
+                        "scrub" => {
+                            if !editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                                continue;
+                            }
+                            let random_choice = rng.gen_range(0..500);
+                            if random_choice == 0 {
+                                Tree::create(editor, (x, 1, z));
+                            } else if random_choice == 1 {
+                                let flower_block = match rng.gen_range(1..=4) {
+                                    1 => RED_FLOWER,
+                                    2 => BLUE_FLOWER,
+                                    3 => YELLOW_FLOWER,
+                                    _ => WHITE_FLOWER,
+                                };
+                                editor.set_block(flower_block, x, 1, z, None, None);
+                            } else if random_choice < 40 {
+                                editor.set_block(OAK_LEAVES, x, 1, z, None, None);
+                                if random_choice < 15 {
+                                    editor.set_block(OAK_LEAVES, x, 2, z, None, None);
+                                }
+                            } else if random_choice < 300 {
+                                if random_choice < 250 {
+                                    editor.set_block(GRASS, x, 1, z, None, None);
+                                } else {
+                                    editor.set_block(TALL_GRASS_BOTTOM, x, 1, z, None, None);
+                                    editor.set_block(TALL_GRASS_TOP, x, 2, z, None, None);
+                                }
+                            }
+                        }
+                        "tree_row" | "wood" => {
+                            if !editor.check_for_block(x, 0, z, Some(&[GRASS_BLOCK])) {
+                                continue;
+                            }
+                            let random_choice: i32 = rng.gen_range(0..30);
+                            if random_choice == 0 {
+                                Tree::create(editor, (x, 1, z));
+                            } else if random_choice == 1 {
+                                let flower_block = match rng.gen_range(1..=4) {
+                                    1 => RED_FLOWER,
+                                    2 => BLUE_FLOWER,
+                                    3 => YELLOW_FLOWER,
+                                    _ => WHITE_FLOWER,
+                                };
+                                editor.set_block(flower_block, x, 1, z, None, None);
+                            } else if random_choice <= 12 {
+                                editor.set_block(GRASS, x, 1, z, None, None);
+                            }
+                        }
+                        "sand" => {
+                            if editor.check_for_block(x, 0, z, Some(&[SAND]))
+                                && rng.gen_range(0..100) == 1
+                            {
+                                editor.set_block(DEAD_BUSH, x, 1, z, None, None);
+                            }
+                        }
+                        "shoal" => {
+                            if rng.gen_bool(0.05) {
+                                editor.set_block(WATER, x, 0, z, Some(&[SAND, GRAVEL]), None);
+                            }
+                        }
+                        "wetland" => {
+                            if let Some(wetland_type) = element.tags().get("wetland") {
+                                // Wetland without water blocks
+                                if matches!(wetland_type.as_str(), "wet_meadow" | "fen") {
+                                    if rng.gen_bool(0.3) {
+                                        editor.set_block(GRASS_BLOCK, x, 0, z, Some(&[MUD]), None);
+                                    }
+                                    editor.set_block(GRASS, x, 1, z, None, None);
+                                    continue;
+                                }
+                                // All the other types of wetland
+                                if rng.gen_bool(0.3) {
+                                    editor.set_block(
+                                        WATER,
+                                        x,
+                                        0,
+                                        z,
+                                        Some(&[MUD, GRASS_BLOCK]),
+                                        None,
+                                    );
+                                    continue;
+                                }
+                                if !editor.check_for_block(x, 0, z, Some(&[MUD, MOSS_BLOCK])) {
+                                    continue;
+                                }
+                                match wetland_type.as_str() {
+                                    "reedbed" => {
+                                        editor.set_block(TALL_GRASS_BOTTOM, x, 1, z, None, None);
+                                        editor.set_block(TALL_GRASS_TOP, x, 2, z, None, None);
+                                    }
+                                    "swamp" | "mangrove" => {
+                                        // TODO implement mangrove
+                                        let random_choice: i32 = rng.gen_range(0..40);
+                                        if random_choice == 0 {
+                                            Tree::create(editor, (x, 1, z));
+                                        } else if random_choice < 35 {
+                                            editor.set_block(GRASS, x, 1, z, None, None);
+                                        }
+                                    }
+                                    "bog" => {
+                                        if rng.gen_bool(0.2) {
+                                            editor.set_block(
+                                                MOSS_BLOCK,
+                                                x,
+                                                0,
+                                                z,
+                                                Some(&[MUD]),
+                                                None,
+                                            );
+                                        }
+                                        if rng.gen_bool(0.15) {
+                                            editor.set_block(GRASS, x, 1, z, None, None);
+                                        }
+                                    }
+                                    "tidalflat" => {
+                                        continue; // No vegetation here
+                                    }
+                                    _ => {
+                                        editor.set_block(GRASS, x, 1, z, None, None);
+                                    }
+                                }
+                            } else {
+                                // Generic natural=wetland without wetland=... tag
+                                if rng.gen_bool(0.3) {
+                                    editor.set_block(WATER, x, 0, z, Some(&[MUD]), None);
+                                    continue;
+                                }
+                                editor.set_block(GRASS, x, 1, z, None, None);
+                            }
+                        }
+                        _ => {}
                     }
                 }
             }

src/element_processing/railways.rs

@@ -3,46 +3,294 @@ use crate::bresenham::bresenham_line;
 use crate::osm_parser::ProcessedWay;
 use crate::world_editor::WorldEditor;
 
-pub fn generate_railways(editor: &mut WorldEditor, element: &ProcessedWay, ground_level: i32) {
+pub fn generate_railways(editor: &mut WorldEditor, element: &ProcessedWay) {
     if let Some(railway_type) = element.tags.get("railway") {
-        if ["proposed", "abandoned", "subway", "construction"].contains(&railway_type.as_str()) {
+        // Check for underground railways (negative level or layer)
+        let is_underground = element
+            .tags
+            .get("level")
+            .map_or(false, |level| level.parse::<i32>().map_or(false, |l| l < 0))
+            || element
+                .tags
+                .get("layer")
+                .map_or(false, |layer| layer.parse::<i32>().map_or(false, |l| l < 0));
+
+        // Also check for tunnel=yes tag
+        let is_tunnel = element
+            .tags
+            .get("tunnel")
+            .map_or(false, |tunnel| tunnel == "yes");
+
+        // Skip certain railway types
+        if [
+            "proposed",
+            "abandoned",
+            "construction",
+            "razed",
+            "turntable",
+        ]
+        .contains(&railway_type.as_str())
+        {
             return;
         }
 
-        if let Some(subway) = element.tags.get("subway") {
-            if subway == "yes" {
-                return;
-            }
-        }
-
-        if let Some(tunnel) = element.tags.get("tunnel") {
-            if tunnel == "yes" {
-                return;
-            }
+        // Process as subway if it's a subway, underground by level/layer tag, or a tunnel
+        if element.tags.get("subway").map_or(false, |v| v == "yes") || is_underground || is_tunnel {
+            generate_subway(editor, element);
+            return;
         }
 
+        // Regular surface railways
         for i in 1..element.nodes.len() {
-            let prev: &crate::osm_parser::ProcessedNode = &element.nodes[i - 1];
-            let x1: i32 = prev.x;
-            let z1: i32 = prev.z;
+            let prev_node = element.nodes[i - 1].xz();
+            let cur_node = element.nodes[i].xz();
 
-            let cur: &crate::osm_parser::ProcessedNode = &element.nodes[i];
-            let x2: i32 = cur.x;
-            let z2: i32 = cur.z;
+            let points = bresenham_line(prev_node.x, 0, prev_node.z, cur_node.x, 0, cur_node.z);
+            let smoothed_points = smooth_diagonal_rails(&points);
 
-            // Generate the line of coordinates between the two nodes
-            let bresenham_points: Vec<(i32, i32, i32)> =
-                bresenham_line(x1, ground_level, z1, x2, ground_level, z2);
+            for j in 0..smoothed_points.len() {
+                let (bx, _, bz) = smoothed_points[j];
 
-            for (bx, _, bz) in bresenham_points {
-                // TODO: Set direction of rail
-                editor.set_block(IRON_BLOCK, bx, ground_level, bz, None, None);
-                editor.set_block(RAIL, bx, ground_level + 1, bz, None, None);
+                editor.set_block(GRAVEL, bx, 0, bz, None, None);
+
+                let prev = if j > 0 {
+                    Some(smoothed_points[j - 1])
+                } else {
+                    None
+                };
+                let next = if j < smoothed_points.len() - 1 {
+                    Some(smoothed_points[j + 1])
+                } else {
+                    None
+                };
+
+                let rail_block = determine_rail_direction(
+                    (bx, bz),
+                    prev.map(|(x, _, z)| (x, z)),
+                    next.map(|(x, _, z)| (x, z)),
+                );
+
+                editor.set_block(rail_block, bx, 1, bz, None, None);
 
                 if bx % 4 == 0 {
-                    editor.set_block(OAK_LOG, bx, ground_level, bz, None, None);
+                    editor.set_block(OAK_LOG, bx, 0, bz, None, None);
                 }
             }
         }
     }
 }
+
+fn generate_subway(editor: &mut WorldEditor, element: &ProcessedWay) {
+    for i in 1..element.nodes.len() {
+        let prev_node = element.nodes[i - 1].xz();
+        let cur_node = element.nodes[i].xz();
+
+        let points = bresenham_line(prev_node.x, 0, prev_node.z, cur_node.x, 0, cur_node.z);
+        let smoothed_points = smooth_diagonal_rails(&points);
+
+        for j in 0..smoothed_points.len() {
+            let (bx, _, bz) = smoothed_points[j];
+
+            // Create a 4-block wide floor
+            for dx in -2..=1 {
+                for dz in -2..=1 {
+                    editor.set_block(SMOOTH_STONE, bx + dx, -9, bz + dz, None, None);
+                }
+            }
+
+            // Create a 4-block wide ceiling 3 blocks above the floor
+            for dx in -2..=1 {
+                for dz in -2..=1 {
+                    // Add occasional glowstone for lighting
+                    if dx == 0 && dz == 0 && j % 4 == 0 {
+                        editor.set_block(GLOWSTONE, bx, -4, bz, None, None);
+                    } else {
+                        editor.set_block(
+                            SMOOTH_STONE,
+                            bx + dx,
+                            -4,
+                            bz + dz,
+                            None,
+                            Some(&[GLOWSTONE]),
+                        );
+                    }
+                }
+            }
+
+            // Get previous and next points for direction
+            let prev = if j > 0 {
+                Some(smoothed_points[j - 1])
+            } else {
+                None
+            };
+            let next = if j < smoothed_points.len() - 1 {
+                Some(smoothed_points[j + 1])
+            } else {
+                None
+            };
+
+            let rail_block = determine_rail_direction(
+                (bx, bz),
+                prev.map(|(x, _, z)| (x, z)),
+                next.map(|(x, _, z)| (x, z)),
+            );
+
+            // Place the rail on top of the floor
+            editor.set_block(rail_block, bx, -8, bz, None, None);
+
+            // Helper function to place wall only if block below is not SMOOTH_STONE
+            let mut place_wall = |x: i32, y: i32, z: i32| {
+                if !editor.check_for_block(x, y - 1, z, Some(&[SMOOTH_STONE])) {
+                    editor.set_block(POLISHED_ANDESITE, x, y, z, None, None);
+                    editor.set_block(POLISHED_ANDESITE, x, y + 1, z, None, None);
+                    editor.set_block(POLISHED_ANDESITE, x, y + 2, z, None, None);
+                    editor.set_block(POLISHED_ANDESITE, x, y + 3, z, None, None);
+                    editor.set_block(POLISHED_ANDESITE, x, y + 4, z, None, None);
+                }
+            };
+
+            // Place dirt blocks two blocks away from the rail
+            // Determine orientation based on rail block
+            match rail_block {
+                RAIL_NORTH_SOUTH => {
+                    // For north-south rails, place dirt two blocks east and west
+                    place_wall(bx + 3, -8, bz);
+                    place_wall(bx - 3, -8, bz);
+                }
+                RAIL_EAST_WEST => {
+                    // For east-west rails, place dirt two blocks north and south
+                    place_wall(bx, -8, bz + 3);
+                    place_wall(bx, -8, bz - 3);
+                }
+                RAIL_NORTH_EAST => {
+                    // For curves, place dirt two blocks away at appropriate positions
+                    place_wall(bx - 3, -8, bz);
+                    place_wall(bx, -8, bz + 3);
+                }
+                RAIL_NORTH_WEST => {
+                    place_wall(bx + 3, -8, bz);
+                    place_wall(bx, -8, bz + 3);
+                }
+                RAIL_SOUTH_EAST => {
+                    place_wall(bx - 3, -8, bz);
+                    place_wall(bx, -8, bz - 3);
+                }
+                RAIL_SOUTH_WEST => {
+                    place_wall(bx + 3, -8, bz);
+                    place_wall(bx, -8, bz - 3);
+                }
+                _ => {
+                    // Default for any other rail blocks
+                    place_wall(bx + 3, -8, bz);
+                    place_wall(bx - 3, -8, bz);
+                }
+            }
+        }
+    }
+}
+
+fn smooth_diagonal_rails(points: &[(i32, i32, i32)]) -> Vec<(i32, i32, i32)> {
+    let mut smoothed = Vec::new();
+
+    for i in 0..points.len() {
+        let current = points[i];
+        smoothed.push(current);
+
+        if i + 1 >= points.len() {
+            continue;
+        }
+
+        let next = points[i + 1];
+        let (x1, y1, z1) = current;
+        let (x2, _, z2) = next;
+
+        // If points are diagonally adjacent
+        if (x2 - x1).abs() == 1 && (z2 - z1).abs() == 1 {
+            // Look ahead to determine best intermediate point
+            let look_ahead = if i + 2 < points.len() {
+                Some(points[i + 2])
+            } else {
+                None
+            };
+
+            // Look behind
+            let look_behind = if i > 0 { Some(points[i - 1]) } else { None };
+
+            // Choose intermediate point based on the overall curve direction
+            let intermediate = if let Some((prev_x, _, _prev_z)) = look_behind {
+                if prev_x == x1 {
+                    // Coming from vertical, keep x constant
+                    (x1, y1, z2)
+                } else {
+                    // Coming from horizontal, keep z constant
+                    (x2, y1, z1)
+                }
+            } else if let Some((next_x, _, _next_z)) = look_ahead {
+                if next_x == x2 {
+                    // Going to vertical, keep x constant
+                    (x2, y1, z1)
+                } else {
+                    // Going to horizontal, keep z constant
+                    (x1, y1, z2)
+                }
+            } else {
+                // Default to horizontal first if no context
+                (x2, y1, z1)
+            };
+
+            smoothed.push(intermediate);
+        }
+    }
+
+    smoothed
+}
+
+fn determine_rail_direction(
+    current: (i32, i32),
+    prev: Option<(i32, i32)>,
+    next: Option<(i32, i32)>,
+) -> Block {
+    let (x, z) = current;
+
+    match (prev, next) {
+        (Some((px, pz)), Some((nx, nz))) => {
+            if px == nx {
+                RAIL_NORTH_SOUTH
+            } else if pz == nz {
+                RAIL_EAST_WEST
+            } else {
+                // Calculate relative movements
+                let from_prev = (px - x, pz - z);
+                let to_next = (nx - x, nz - z);
+
+                match (from_prev, to_next) {
+                    // East to North or North to East
+                    ((-1, 0), (0, -1)) | ((0, -1), (-1, 0)) => RAIL_NORTH_WEST,
+                    // West to North or North to West
+                    ((1, 0), (0, -1)) | ((0, -1), (1, 0)) => RAIL_NORTH_EAST,
+                    // East to South or South to East
+                    ((-1, 0), (0, 1)) | ((0, 1), (-1, 0)) => RAIL_SOUTH_WEST,
+                    // West to South or South to West
+                    ((1, 0), (0, 1)) | ((0, 1), (1, 0)) => RAIL_SOUTH_EAST,
+                    _ => {
+                        if (px - x).abs() > (pz - z).abs() {
+                            RAIL_EAST_WEST
+                        } else {
+                            RAIL_NORTH_SOUTH
+                        }
+                    }
+                }
+            }
+        }
+        (Some((px, pz)), None) | (None, Some((px, pz))) => {
+            if px == x {
+                RAIL_NORTH_SOUTH
+            } else if pz == z {
+                RAIL_EAST_WEST
+            } else {
+                RAIL_NORTH_SOUTH
+            }
+        }
+        (None, None) => RAIL_NORTH_SOUTH,
+    }
+}

src/element_processing/tourisms.rs

@@ -2,7 +2,7 @@ use crate::block_definitions::*;
 use crate::osm_parser::ProcessedNode;
 use crate::world_editor::WorldEditor;
 
-pub fn generate_tourisms(editor: &mut WorldEditor, element: &ProcessedNode, ground_level: i32) {
+pub fn generate_tourisms(editor: &mut WorldEditor, element: &ProcessedNode) {
     // Skip if 'layer' or 'level' is negative in the tags
     if let Some(layer) = element.tags.get("layer") {
         if layer.parse::<i32>().unwrap_or(0) < 0 {
@@ -21,9 +21,13 @@ pub fn generate_tourisms(editor: &mut WorldEditor, element: &ProcessedNode, grou
         let z: i32 = element.z;
 
         if tourism_type == "information" {
-            if let Some("board") = element.tags.get("information").map(|x: &String| x.as_str()) {
-                // TODO draw a sign
-                editor.set_block(OAK_PLANKS, x, ground_level + 1, z, None, None);
+            if let Some(info_type) = element.tags.get("information").map(|x: &String| x.as_str()) {
+                if info_type != "office" && info_type != "visitor_centre" {
+                    // Draw an information board
+                    // TODO draw a sign with text if provided
+                    editor.set_block(COBBLESTONE_WALL, x, 1, z, None, None);
+                    editor.set_block(OAK_PLANKS, x, 2, z, None, None);
+                }
             }
         }
     }

src/element_processing/tree.rs

@@ -1,166 +1,196 @@
 use crate::block_definitions::*;
 use crate::world_editor::WorldEditor;
+use rand::Rng;
 
-/// Helper function to set blocks in a circular pattern around a central point.
-fn round1(editor: &mut WorldEditor, material: Block, x: i32, y: i32, z: i32) {
-    editor.set_block(material, x - 2, y, z, None, None);
-    editor.set_block(material, x + 2, y, z, None, None);
-    editor.set_block(material, x, y, z - 2, None, None);
-    editor.set_block(material, x, y, z + 2, None, None);
-    editor.set_block(material, x - 1, y, z - 1, None, None);
-    editor.set_block(material, x + 1, y, z + 1, None, None);
-    editor.set_block(material, x + 1, y, z - 1, None, None);
-    editor.set_block(material, x - 1, y, z + 1, None, None);
-}
+type Coord = (i32, i32, i32);
 
-/// Helper function to set blocks in a wider circular pattern.
-fn round2(editor: &mut WorldEditor, material: Block, x: i32, y: i32, z: i32) {
-    editor.set_block(material, x + 3, y, z, None, None);
-    editor.set_block(material, x + 2, y, z - 1, None, None);
-    editor.set_block(material, x + 2, y, z + 1, None, None);
-    editor.set_block(material, x + 1, y, z - 2, None, None);
-    editor.set_block(material, x + 1, y, z + 2, None, None);
-    editor.set_block(material, x - 3, y, z, None, None);
-    editor.set_block(material, x - 2, y, z - 1, None, None);
-    editor.set_block(material, x - 2, y, z + 1, None, None);
-    editor.set_block(material, x - 1, y, z + 2, None, None);
-    editor.set_block(material, x - 1, y, z - 2, None, None);
-    editor.set_block(material, x, y, z - 3, None, None);
-    editor.set_block(material, x, y, z + 3, None, None);
-}
+// TODO all this data would probably be better suited in a TOML file or something.
 
-/// Helper function to set blocks in a more scattered circular pattern.
-fn round3(editor: &mut WorldEditor, material: Block, x: i32, y: i32, z: i32) {
-    editor.set_block(material, x + 3, y, z - 1, None, None);
-    editor.set_block(material, x + 3, y, z + 1, None, None);
-    editor.set_block(material, x + 2, y, z - 2, None, None);
-    editor.set_block(material, x + 2, y, z + 2, None, None);
-    editor.set_block(material, x + 1, y, z - 3, None, None);
-    editor.set_block(material, x + 1, y, z + 3, None, None);
-    editor.set_block(material, x - 3, y, z - 1, None, None);
-    editor.set_block(material, x - 3, y, z + 1, None, None);
-    editor.set_block(material, x - 2, y, z - 2, None, None);
-    editor.set_block(material, x - 2, y, z + 2, None, None);
-    editor.set_block(material, x - 1, y, z + 3, None, None);
-    editor.set_block(material, x - 1, y, z - 3, None, None);
-}
+/// A circular pattern around a central point.
+#[rustfmt::skip]
+const ROUND1_PATTERN: [Coord; 8] = [
+    (-2, 0, 0),
+    (2, 0, 0),
+    (0, 0, -2),
+    (0, 0, 2),
+    (-1, 0, -1),
+    (1, 0, 1),
+    (1, 0, -1),
+    (-1, 0, 1),
+];
 
-/// Function to create different types of trees.
-pub fn create_tree(editor: &mut WorldEditor, x: i32, y: i32, z: i32, typetree: u8, snow: bool) {
-    let mut blacklist: Vec<Block> = Vec::new();
-    blacklist.extend(building_corner_variations());
-    blacklist.extend(building_wall_variations());
-    blacklist.extend(building_floor_variations());
-    blacklist.push(WATER);
+/// A wider circular pattern.
+const ROUND2_PATTERN: [Coord; 12] = [
+    (3, 0, 0),
+    (2, 0, -1),
+    (2, 0, 1),
+    (1, 0, -2),
+    (1, 0, 2),
+    (-3, 0, 0),
+    (-2, 0, -1),
+    (-2, 0, 1),
+    (-1, 0, 2),
+    (-1, 0, -2),
+    (0, 0, -3),
+    (0, 0, 3),
+];
 
-    if editor.check_for_block(x, y - 1, z, None, Some(&blacklist)) {
-        return;
-    }
+/// A more scattered circular pattern.
+const ROUND3_PATTERN: [Coord; 12] = [
+    (3, 0, -1),
+    (3, 0, 1),
+    (2, 0, -2),
+    (2, 0, 2),
+    (1, 0, -3),
+    (1, 0, 3),
+    (-3, 0, -1),
+    (-3, 0, 1),
+    (-2, 0, -2),
+    (-2, 0, 2),
+    (-1, 0, 3),
+    (-1, 0, -3),
+];
 
-    match typetree {
-        1 => {
-            // Oak tree
-            editor.fill_blocks(OAK_LOG, x, y, z, x, y + 8, z, None, None);
-            editor.fill_blocks(OAK_LEAVES, x - 1, y + 3, z, x - 1, y + 9, z, None, None);
-            editor.fill_blocks(OAK_LEAVES, x + 1, y + 3, z, x + 1, y + 9, z, None, None);
-            editor.fill_blocks(OAK_LEAVES, x, y + 3, z - 1, x, y + 9, z - 1, None, None);
-            editor.fill_blocks(OAK_LEAVES, x, y + 3, z + 1, x, y + 9, z + 1, None, None);
-            editor.fill_blocks(OAK_LEAVES, x, y + 9, z, x, y + 10, z, None, None);
-            round1(editor, OAK_LEAVES, x, y + 8, z);
-            round1(editor, OAK_LEAVES, x, y + 7, z);
-            round1(editor, OAK_LEAVES, x, y + 6, z);
-            round1(editor, OAK_LEAVES, x, y + 5, z);
-            round1(editor, OAK_LEAVES, x, y + 4, z);
-            round1(editor, OAK_LEAVES, x, y + 3, z);
-            round2(editor, OAK_LEAVES, x, y + 7, z);
-            round2(editor, OAK_LEAVES, x, y + 6, z);
-            round2(editor, OAK_LEAVES, x, y + 5, z);
-            round2(editor, OAK_LEAVES, x, y + 4, z);
-            round3(editor, OAK_LEAVES, x, y + 6, z);
-            round3(editor, OAK_LEAVES, x, y + 5, z);
+/// Used for iterating over each of the round patterns
+const ROUND_PATTERNS: [&[Coord]; 3] = [&ROUND1_PATTERN, &ROUND2_PATTERN, &ROUND3_PATTERN];
 
-            if snow {
-                editor.set_block(SNOW_LAYER, x, y + 11, z, None, None);
-                editor.set_block(SNOW_LAYER, x + 1, y + 10, z, None, None);
-                editor.set_block(SNOW_LAYER, x - 1, y + 10, z, None, None);
-                editor.set_block(SNOW_LAYER, x, y + 10, z - 1, None, None);
-                editor.set_block(SNOW_LAYER, x, y + 10, z + 1, None, None);
-                round1(editor, SNOW_LAYER, x, y + 9, z);
-                round1(editor, SNOW_LAYER, x, y + 8, z);
-                round1(editor, SNOW_LAYER, x, y + 7, z);
-                round1(editor, SNOW_LAYER, x, y + 6, z);
-                round2(editor, SNOW_LAYER, x, y + 8, z);
-                round2(editor, SNOW_LAYER, x, y + 7, z);
-                round2(editor, SNOW_LAYER, x, y + 6, z);
-                round2(editor, SNOW_LAYER, x, y + 5, z);
-                round3(editor, SNOW_LAYER, x, y + 7, z);
-                round3(editor, SNOW_LAYER, x, y + 6, z);
-            }
-        }
-        2 => {
-            // Spruce tree
-            editor.fill_blocks(SPRUCE_LOG, x, y, z, x, y + 9, z, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x - 1, y + 3, z, x - 1, y + 10, z, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x + 1, y + 3, z, x + 1, y + 10, z, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x, y + 3, z - 1, x, y + 10, z - 1, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x, y + 3, z + 1, x, y + 10, z + 1, None, None);
-            editor.set_block(BIRCH_LEAVES, x, y + 10, z, None, None);
-            round1(editor, BIRCH_LEAVES, x, y + 9, z);
-            round1(editor, BIRCH_LEAVES, x, y + 7, z);
-            round1(editor, BIRCH_LEAVES, x, y + 6, z);
-            round1(editor, BIRCH_LEAVES, x, y + 4, z);
-            round1(editor, BIRCH_LEAVES, x, y + 3, z);
-            round2(editor, BIRCH_LEAVES, x, y + 6, z);
-            round2(editor, BIRCH_LEAVES, x, y + 3, z);
+//////////////////////////////////////////////////
 
-            if snow {
-                editor.set_block(SNOW_LAYER, x, y + 11, z, None, None);
-                editor.set_block(SNOW_LAYER, x + 1, y + 11, z, None, None);
-                editor.set_block(SNOW_LAYER, x - 1, y + 11, z, None, None);
-                editor.set_block(SNOW_LAYER, x, y + 11, z - 1, None, None);
-                editor.set_block(SNOW_LAYER, x, y + 11, z + 1, None, None);
-                round1(editor, SNOW_LAYER, x, y + 10, z);
-                round1(editor, SNOW_LAYER, x, y + 8, z);
-                round1(editor, SNOW_LAYER, x, y + 7, z);
-                round1(editor, SNOW_LAYER, x, y + 5, z);
-                round1(editor, SNOW_LAYER, x, y + 4, z);
-                round2(editor, SNOW_LAYER, x, y + 7, z);
-                round2(editor, SNOW_LAYER, x, y + 4, z);
-            }
-        }
-        3 => {
-            // Birch tree
-            editor.fill_blocks(BIRCH_LOG, x, y, z, x, y + 6, z, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x - 1, y + 2, z, x - 1, y + 7, z, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x + 1, y + 2, z, x + 1, y + 7, z, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x, y + 2, z - 1, x, y + 7, z - 1, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x, y + 2, z + 1, x, y + 7, z + 1, None, None);
-            editor.fill_blocks(BIRCH_LEAVES, x, y + 7, z, x, y + 8, z, None, None);
-            round1(editor, BIRCH_LEAVES, x, y + 6, z);
-            round1(editor, BIRCH_LEAVES, x, y + 5, z);
-            round1(editor, BIRCH_LEAVES, x, y + 4, z);
-            round1(editor, BIRCH_LEAVES, x, y + 3, z);
-            round1(editor, BIRCH_LEAVES, x, y + 2, z);
-            round2(editor, BIRCH_LEAVES, x, y + 2, z);
-            round2(editor, BIRCH_LEAVES, x, y + 3, z);
-            round2(editor, BIRCH_LEAVES, x, y + 4, z);
+const OAK_LEAVES_FILL: [(Coord, Coord); 5] = [
+    ((-1, 3, 0), (-1, 9, 0)),
+    ((1, 3, 0), (1, 9, 0)),
+    ((0, 3, -1), (0, 9, -1)),
+    ((0, 3, 1), (0, 9, 1)),
+    ((0, 9, 0), (0, 10, 0)),
+];
 
-            if snow {
-                editor.set_block(SNOW_LAYER, x, y + 9, z, None, None);
-                editor.set_block(SNOW_LAYER, x + 1, y + 8, z, None, None);
-                editor.set_block(SNOW_LAYER, x - 1, y + 8, z, None, None);
-                editor.set_block(SNOW_LAYER, x, y + 8, z - 1, None, None);
-                editor.set_block(SNOW_LAYER, x, y + 8, z + 1, None, None);
-                round1(editor, SNOW_LAYER, x, y + 7, z);
-                round1(editor, SNOW_LAYER, x, y + 6, z);
-                round1(editor, SNOW_LAYER, x, y + 5, z);
-                round1(editor, SNOW_LAYER, x, y + 4, z);
-                round1(editor, SNOW_LAYER, x, y + 3, z);
-                round2(editor, SNOW_LAYER, x, y + 3, z);
-                round2(editor, SNOW_LAYER, x, y + 4, z);
-                round2(editor, SNOW_LAYER, x, y + 5, z);
-            }
-        }
-        _ => {} // Do nothing if typetree is not recognized
+const SPRUCE_LEAVES_FILL: [(Coord, Coord); 5] = [
+    ((-1, 3, 0), (-1, 10, 0)),
+    ((0, 3, -1), (0, 10, -1)),
+    ((1, 3, 0), (1, 10, 0)),
+    ((0, 3, -1), (0, 10, -1)),
+    ((0, 3, 1), (0, 10, 1)),
+];
+
+const BIRCH_LEAVES_FILL: [(Coord, Coord); 5] = [
+    ((-1, 2, 0), (-1, 7, 0)),
+    ((1, 2, 0), (1, 7, 0)),
+    ((0, 2, -1), (0, 7, -1)),
+    ((0, 2, 1), (0, 7, 1)),
+    ((0, 7, 0), (0, 8, 0)),
+];
+
+//////////////////////////////////////////////////
+
+/// Helper function to set blocks in various patterns.
+fn round(editor: &mut WorldEditor, material: Block, (x, y, z): Coord, block_pattern: &[Coord]) {
+    for (i, j, k) in block_pattern {
+        editor.set_block(material, x + i, y + j, z + k, None, None);
     }
 }
+
+pub enum TreeType {
+    Oak,
+    Spruce,
+    Birch,
+}
+
+// TODO what should be moved in, and what should be referenced?
+pub struct Tree<'a> {
+    // kind: TreeType, // NOTE: Not actually necessary to store!
+    log_block: Block,
+    log_height: i32,
+    leaves_block: Block,
+    leaves_fill: &'a [(Coord, Coord)],
+    round_ranges: [Vec<i32>; 3],
+}
+
+impl Tree<'_> {
+    pub fn create(editor: &mut WorldEditor, (x, y, z): Coord) {
+        let mut blacklist: Vec<Block> = Vec::new();
+        blacklist.extend(BUILDING_CORNER_VARIATIONS);
+        blacklist.extend(building_wall_variations());
+        blacklist.extend(building_floor_variations());
+        blacklist.push(WATER);
+
+        let mut rng = rand::thread_rng();
+
+        let tree = Self::get_tree(match rng.gen_range(1..=3) {
+            1 => TreeType::Oak,
+            2 => TreeType::Spruce,
+            3 => TreeType::Birch,
+            _ => unreachable!(),
+        });
+
+        // Build the logs
+        editor.fill_blocks(
+            tree.log_block,
+            x,
+            y,
+            z,
+            x,
+            y + tree.log_height,
+            z,
+            None,
+            Some(&blacklist),
+        );
+
+        // Fill in the leaves
+        for ((i1, j1, k1), (i2, j2, k2)) in tree.leaves_fill {
+            editor.fill_blocks(
+                tree.leaves_block,
+                x + i1,
+                y + j1,
+                z + k1,
+                x + i2,
+                y + j2,
+                z + k2,
+                None,
+                None,
+            );
+        }
+
+        // Do the three rounds
+        for (round_range, round_pattern) in tree.round_ranges.iter().zip(ROUND_PATTERNS) {
+            for offset in round_range {
+                round(editor, tree.leaves_block, (x, y + offset, z), round_pattern);
+            }
+        }
+    }
+
+    fn get_tree(kind: TreeType) -> Self {
+        match kind {
+            TreeType::Oak => Self {
+                // kind,
+                log_block: OAK_LOG,
+                log_height: 8,
+                leaves_block: OAK_LEAVES,
+                leaves_fill: &OAK_LEAVES_FILL,
+                round_ranges: [
+                    (3..=8).rev().collect(),
+                    (4..=7).rev().collect(),
+                    (5..=6).rev().collect(),
+                ],
+            },
+
+            TreeType::Spruce => Self {
+                // kind,
+                log_block: SPRUCE_LOG,
+                log_height: 9,
+                leaves_block: BIRCH_LEAVES, // TODO Is this correct?
+                leaves_fill: &SPRUCE_LEAVES_FILL,
+                // TODO can I omit the third empty vec? May cause issues with iter zip
+                round_ranges: [vec![9, 7, 6, 4, 3], vec![6, 3], vec![]],
+            },
+
+            TreeType::Birch => Self {
+                // kind,
+                log_block: BIRCH_LOG,
+                log_height: 6,
+                leaves_block: BIRCH_LEAVES,
+                leaves_fill: &BIRCH_LEAVES_FILL,
+                round_ranges: [(2..=6).rev().collect(), (2..=4).collect(), vec![]],
+            },
+        } // match
+    } // fn get_tree
+} // impl Tree

src/element_processing/water_areas.rs

@@ -3,22 +3,19 @@ use std::time::Instant;
 
 use crate::{
     block_definitions::WATER,
+    cartesian::XZPoint,
     osm_parser::{ProcessedMemberRole, ProcessedNode, ProcessedRelation},
     world_editor::WorldEditor,
 };
 
-pub fn generate_water_areas(
-    editor: &mut WorldEditor,
-    element: &ProcessedRelation,
-    ground_level: i32,
-) {
+pub fn generate_water_areas(editor: &mut WorldEditor, element: &ProcessedRelation) {
     let start_time = Instant::now();
 
     if !element.tags.contains_key("water") {
         return;
     }
 
-    // don't handle water below layer 0
+    // Don't handle water below layer 0
     if let Some(layer) = element.tags.get("layer") {
         if layer.parse::<i32>().map(|x| x < 0).unwrap_or(false) {
             return;
@@ -46,32 +43,16 @@ pub fn generate_water_areas(
     }
 
     let (max_x, max_z) = editor.get_max_coords();
-    let outers: Vec<Vec<(f64, f64)>> = outers
+    let outers: Vec<Vec<XZPoint>> = outers
         .iter()
-        .map(|x: &Vec<ProcessedNode>| {
-            x.iter()
-                .map(|y: &ProcessedNode| (y.x as f64, y.z as f64))
-                .collect()
-        })
+        .map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
         .collect();
-    let inners: Vec<Vec<(f64, f64)>> = inners
+    let inners: Vec<Vec<XZPoint>> = inners
         .iter()
-        .map(|x: &Vec<ProcessedNode>| {
-            x.iter()
-                .map(|y: &ProcessedNode| (y.x as f64, y.z as f64))
-                .collect()
-        })
+        .map(|x| x.iter().map(|y| y.xz()).collect::<Vec<_>>())
         .collect();
 
-    inverse_floodfill(
-        max_x,
-        max_z,
-        outers,
-        inners,
-        editor,
-        ground_level,
-        start_time,
-    );
+    inverse_floodfill(max_x, max_z, outers, inners, editor, start_time);
 }
 
 // Merges ways that share nodes into full loops
@@ -164,10 +145,9 @@ fn verify_loopy_loops(loops: &[Vec<ProcessedNode>]) -> bool {
 fn inverse_floodfill(
     max_x: i32,
     max_z: i32,
-    outers: Vec<Vec<(f64, f64)>>,
-    inners: Vec<Vec<(f64, f64)>>,
+    outers: Vec<Vec<XZPoint>>,
+    inners: Vec<Vec<XZPoint>>,
     editor: &mut WorldEditor,
-    ground_level: i32,
     start_time: Instant,
 ) {
     let min_x: i32 = 0;
@@ -175,18 +155,35 @@ fn inverse_floodfill(
 
     let inners: Vec<_> = inners
         .into_iter()
-        .map(|x: Vec<(f64, f64)>| Polygon::new(LineString::from(x), vec![]))
+        .map(|x| {
+            Polygon::new(
+                LineString::from(
+                    x.iter()
+                        .map(|pt| (pt.x as f64, pt.z as f64))
+                        .collect::<Vec<_>>(),
+                ),
+                vec![],
+            )
+        })
         .collect();
 
     let outers: Vec<_> = outers
         .into_iter()
-        .map(|x: Vec<(f64, f64)>| Polygon::new(LineString::from(x), vec![]))
+        .map(|x| {
+            Polygon::new(
+                LineString::from(
+                    x.iter()
+                        .map(|pt| (pt.x as f64, pt.z as f64))
+                        .collect::<Vec<_>>(),
+                ),
+                vec![],
+            )
+        })
         .collect();
 
     inverse_floodfill_recursive(
         (min_x, min_z),
         (max_x, max_z),
-        ground_level,
         &outers,
         &inners,
         editor,
@@ -197,7 +194,6 @@ fn inverse_floodfill(
 fn inverse_floodfill_recursive(
     min: (i32, i32),
     max: (i32, i32),
-    ground_level: i32,
     outers: &[Polygon],
     inners: &[Polygon],
     editor: &mut WorldEditor,
@@ -215,8 +211,7 @@ fn inverse_floodfill_recursive(
     }
 
     if (max.0 - min.0) * (max.1 - min.1) < ITERATIVE_THRES {
-        inverse_floodfill_iterative(min, max, ground_level, outers, inners, editor);
-
+        inverse_floodfill_iterative(min, max, 0, outers, inners, editor);
         return;
     }
 
@@ -238,37 +233,25 @@ fn inverse_floodfill_recursive(
         if outers.iter().any(|outer: &Polygon| outer.contains(&rect))
             && !inners.iter().any(|inner: &Polygon| inner.intersects(&rect))
         {
-            // every block in rect is water
-            // so we can safely just set the whole thing to water
-
-            rect_fill(min_x, max_x, min_z, max_z, ground_level, editor);
-
+            rect_fill(min_x, max_x, min_z, max_z, 0, editor);
             continue;
         }
 
-        // When we recurse, we only really need the polygons we potentially intersect with
-        // This saves on processing time
         let outers_intersects: Vec<_> = outers
             .iter()
-            .filter(|poly: &&Polygon| poly.intersects(&rect))
+            .filter(|poly| poly.intersects(&rect))
             .cloned()
             .collect();
-
-        // Moving this inside the below `if` statement makes it slower for some reason.
-        // I assume it changes how the compiler is able to optimize it
         let inners_intersects: Vec<_> = inners
             .iter()
-            .filter(|poly: &&Polygon| poly.intersects(&rect))
+            .filter(|poly| poly.intersects(&rect))
             .cloned()
             .collect();
 
         if !outers_intersects.is_empty() {
-            // recurse
-
             inverse_floodfill_recursive(
                 (min_x, min_z),
                 (max_x, max_z),
-                ground_level,
                 &outers_intersects,
                 &inners_intersects,
                 editor,

src/element_processing/waterways.rs

@@ -1,11 +1,12 @@
 use crate::block_definitions::*;
 use crate::bresenham::bresenham_line;
+use crate::cartesian::XZPoint;
 use crate::osm_parser::ProcessedWay;
 use crate::world_editor::WorldEditor;
 
-pub fn generate_waterways(editor: &mut WorldEditor, element: &ProcessedWay, ground_level: i32) {
+pub fn generate_waterways(editor: &mut WorldEditor, element: &ProcessedWay) {
     if let Some(_waterway_type) = element.tags.get("waterway") {
-        let mut previous_node: Option<(i32, i32)> = None;
+        let mut previous_node: Option<XZPoint> = None;
         let mut waterway_width: i32 = 4; // Default waterway width
 
         // Check for custom width in tags
@@ -20,6 +21,8 @@ pub fn generate_waterways(editor: &mut WorldEditor, element: &ProcessedWay, grou
 
         // Process nodes to create waterways
         for node in &element.nodes {
+            let current_node = node.xz();
+
             if let Some(prev) = previous_node {
                 // Skip layers below the ground level
                 if !matches!(
@@ -28,15 +31,18 @@ pub fn generate_waterways(editor: &mut WorldEditor, element: &ProcessedWay, grou
                 ) {
                     // Draw a line between the current and previous node
                     let bresenham_points: Vec<(i32, i32, i32)> =
-                        bresenham_line(prev.0, ground_level, prev.1, node.x, ground_level, node.z);
+                        bresenham_line(prev.x, 0, prev.z, current_node.x, 0, current_node.z);
+
                     for (bx, _, bz) in bresenham_points {
                         for x in (bx - waterway_width / 2)..=(bx + waterway_width / 2) {
                             for z in (bz - waterway_width / 2)..=(bz + waterway_width / 2) {
-                                editor.set_block(WATER, x, ground_level, z, None, None); // Set water block
+                                // Set water block at the ground level
+                                editor.set_block(WATER, x, 0, z, None, None);
+                                // Clear vegetation above the water
                                 editor.set_block(
                                     AIR,
                                     x,
-                                    ground_level + 1,
+                                    1,
                                     z,
                                     Some(&[GRASS, WHEAT, CARROTS, POTATOES]),
                                     None,
@@ -46,7 +52,7 @@ pub fn generate_waterways(editor: &mut WorldEditor, element: &ProcessedWay, grou
                     }
                 }
             }
-            previous_node = Some((node.x, node.z));
+            previous_node = Some(current_node);
         }
     }
 }

src/geo_coord.rs

@@ -0,0 +1,60 @@
+/// Bounds-checked longitude and latitude.
+#[derive(Copy, Clone, Debug, PartialEq)]
+pub struct GeoCoord {
+    lat: f64,
+    lng: f64,
+}
+
+impl GeoCoord {
+    pub fn new(lat: f64, lng: f64) -> Result<Self, String> {
+        let lat_in_range = (-90.0..=90.0).contains(&lat) && (-90.0..=90.0).contains(&lat);
+        let lng_in_range = (-180.0..=180.0).contains(&lng) && (-180.0..=180.0).contains(&lng);
+
+        if !lat_in_range {
+            return Err(format!("Latitude {} not in range -90.0..=90.0", lat));
+        }
+
+        if !lng_in_range {
+            return Err(format!("Longitude {} not in range -180.0..=180.0", lng));
+        }
+
+        Ok(Self { lat, lng })
+    }
+
+    pub fn lat(&self) -> f64 {
+        self.lat
+    }
+
+    pub fn lng(&self) -> f64 {
+        self.lng
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_valid_input() {
+        assert!(GeoCoord::new(0., 0.).is_ok());
+
+        // latitude extremes
+        assert!(GeoCoord::new(-90.0, 0.).is_ok());
+        assert!(GeoCoord::new(90.0, 0.).is_ok());
+
+        // longitude extremes
+        assert!(GeoCoord::new(0., -180.0).is_ok());
+        assert!(GeoCoord::new(0., 180.0).is_ok());
+    }
+
+    #[test]
+    fn test_out_of_bounds() {
+        // latitude out-of-bounds
+        assert!(GeoCoord::new(-91., 0.).is_err());
+        assert!(GeoCoord::new(91., 0.).is_err());
+
+        // longitude out-of-bounds
+        assert!(GeoCoord::new(0., -181.).is_err());
+        assert!(GeoCoord::new(0., 181.).is_err());
+    }
+}

src/ground.rs

@@ -0,0 +1,413 @@
+use crate::{bbox::BBox, cartesian::XZPoint};
+use image::{Rgb, RgbImage};
+
+/// Maximum Y coordinate in Minecraft (build height limit)
+const MAX_Y: i32 = 319;
+/// Scale factor for converting real elevation to Minecraft heights
+const BASE_HEIGHT_SCALE: f64 = 0.72;
+
+/// Mapbox API access token for terrain data
+const MAPBOX_PUBKEY: &str =
+    "pk.eyJ1IjoiY3Vnb3MiLCJhIjoiY2p4Nm43MzA3MDFmZDQwcGxsMjB4Z3hnNiJ9.SQbnMASwdqZe6G4n6OMvVw";
+/// Minimum zoom level for terrain tiles
+const MIN_ZOOM: u8 = 10;
+/// Maximum zoom level for terrain tiles
+const MAX_ZOOM: u8 = 15;
+
+/// Represents terrain data and elevation settings
+#[derive(Clone)]
+pub struct Ground {
+    pub elevation_enabled: bool,
+    ground_level: i32,
+    elevation_data: Option<ElevationData>,
+}
+
+/// Holds processed elevation data and metadata
+#[derive(Clone)]
+struct ElevationData {
+    /// Height values in Minecraft Y coordinates
+    heights: Vec<Vec<i32>>,
+    /// Width of the elevation grid
+    width: usize,
+    /// Height of the elevation grid
+    height: usize,
+}
+
+impl Ground {
+    pub fn new(args: &crate::args::Args) -> Self {
+        let mut elevation_enabled: bool = args.terrain;
+        let elevation_data: Option<ElevationData> = if elevation_enabled {
+            match Self::fetch_elevation_data(args) {
+                Ok(data) => {
+                    if args.debug {
+                        Self::save_debug_image(&data.heights, "elevation_debug");
+                    }
+                    Some(data)
+                }
+                Err(e) => {
+                    eprintln!("Warning: Failed to fetch elevation data: {}", e);
+                    elevation_enabled = false;
+                    None
+                }
+            }
+        } else {
+            None
+        };
+
+        Self {
+            elevation_enabled,
+            ground_level: args.ground_level,
+            elevation_data,
+        }
+    }
+
+    /// Returns the ground level at the given coordinates
+    #[inline(always)]
+    pub fn level(&self, coord: XZPoint) -> i32 {
+        if !self.elevation_enabled || self.elevation_data.is_none() {
+            return self.ground_level;
+        }
+
+        let data: &ElevationData = self.elevation_data.as_ref().unwrap();
+        let (x_ratio, z_ratio) = self.get_data_coordinates(coord, data);
+        self.interpolate_height(x_ratio, z_ratio, data)
+    }
+
+    #[allow(unused)]
+    #[inline(always)]
+    pub fn min_level<I: Iterator<Item = XZPoint>>(&self, coords: I) -> Option<i32> {
+        if !self.elevation_enabled {
+            return Some(self.ground_level);
+        }
+        coords.map(|c: XZPoint| self.level(c)).min()
+    }
+
+    #[allow(unused)]
+    #[inline(always)]
+    pub fn max_level<I: Iterator<Item = XZPoint>>(&self, coords: I) -> Option<i32> {
+        if !self.elevation_enabled {
+            return Some(self.ground_level);
+        }
+        coords.map(|c: XZPoint| self.level(c)).max()
+    }
+
+    /// Converts game coordinates to elevation data coordinates
+    #[inline(always)]
+    fn get_data_coordinates(&self, coord: XZPoint, data: &ElevationData) -> (f64, f64) {
+        let x_ratio: f64 = coord.x as f64 / data.width as f64;
+        let z_ratio: f64 = coord.z as f64 / data.height as f64;
+        (x_ratio.clamp(0.0, 1.0), z_ratio.clamp(0.0, 1.0))
+    }
+
+    /// Interpolates height value from the elevation grid
+    #[inline(always)]
+    fn interpolate_height(&self, x_ratio: f64, z_ratio: f64, data: &ElevationData) -> i32 {
+        let x: usize = ((x_ratio * (data.width - 1) as f64).round() as usize).min(data.width - 1);
+        let z: usize = ((z_ratio * (data.height - 1) as f64).round() as usize).min(data.height - 1);
+        data.heights[z][x]
+    }
+
+    /// Calculates appropriate zoom level for the given bounding box
+    fn calculate_zoom_level(bbox: BBox) -> u8 {
+        let lat_diff: f64 = (bbox.max().lat() - bbox.min().lat()).abs();
+        let lng_diff: f64 = (bbox.max().lng() - bbox.min().lng()).abs();
+        let max_diff: f64 = lat_diff.max(lng_diff);
+        let zoom: u8 = (-max_diff.log2() + 20.0) as u8;
+        zoom.clamp(MIN_ZOOM, MAX_ZOOM)
+    }
+
+    fn lat_lng_to_tile(lat: f64, lng: f64, zoom: u8) -> (u32, u32) {
+        let lat_rad: f64 = lat.to_radians();
+        let n: f64 = 2.0_f64.powi(zoom as i32);
+        let x: u32 = ((lng + 180.0) / 360.0 * n).floor() as u32;
+        let y: u32 =
+            ((1.0 - lat_rad.tan().asinh() / std::f64::consts::PI) / 2.0 * n).floor() as u32;
+        (x, y)
+    }
+
+    fn fetch_elevation_data(
+        args: &crate::args::Args,
+    ) -> Result<ElevationData, Box<dyn std::error::Error>> {
+        // Use OSM parser's scale calculation and apply user scale factor
+        let (scale_factor_z, scale_factor_x) =
+            crate::osm_parser::geo_distance(args.bbox.min(), args.bbox.max());
+        let scale_factor_x: f64 = scale_factor_x * args.scale;
+        let scale_factor_z: f64 = scale_factor_z * args.scale;
+
+        // Calculate zoom and tiles
+        let zoom: u8 = Self::calculate_zoom_level(args.bbox);
+        let tiles: Vec<(u32, u32)> = Self::get_tile_coordinates(args.bbox, zoom);
+
+        // Calculate tile boundaries
+        let x_min: &u32 = tiles.iter().map(|(x, _)| x).min().unwrap();
+        let x_max: &u32 = tiles.iter().map(|(x, _)| x).max().unwrap();
+        let y_min: &u32 = tiles.iter().map(|(_, y)| y).min().unwrap();
+        let y_max: &u32 = tiles.iter().map(|(_, y)| y).max().unwrap();
+
+        // Match grid dimensions with Minecraft world size
+        let grid_width: usize = scale_factor_x.round() as usize;
+        let grid_height: usize = scale_factor_z.round() as usize;
+
+        // Calculate total tile dimensions
+        let total_tile_width: u32 = (x_max - x_min + 1) * 256;
+        let total_tile_height: u32 = (y_max - y_min + 1) * 256;
+
+        // Calculate scaling factors to match the desired grid dimensions
+        let x_scale: f64 = grid_width as f64 / total_tile_width as f64;
+        let y_scale: f64 = grid_height as f64 / total_tile_height as f64;
+
+        // Initialize height grid with proper dimensions
+        let mut height_grid: Vec<Vec<f64>> = vec![vec![f64::NAN; grid_width]; grid_height];
+
+        let client: reqwest::blocking::Client = reqwest::blocking::Client::new();
+        let access_token: &str = MAPBOX_PUBKEY;
+
+        // Fetch and process each tile
+        for (tile_x, tile_y) in &tiles {
+            let url: String = format!(
+                "https://api.mapbox.com/v4/mapbox.terrain-rgb/{}/{}/{}.pngraw?access_token={}",
+                zoom, tile_x, tile_y, access_token
+            );
+
+            let response: reqwest::blocking::Response = client.get(&url).send()?;
+            let img: image::DynamicImage = image::load_from_memory(&response.bytes()?)?;
+            let rgb_img: image::ImageBuffer<Rgb<u8>, Vec<u8>> = img.to_rgb8();
+
+            // Calculate position in the scaled grid
+            let base_x: f64 = ((*tile_x - x_min) * 256) as f64;
+            let base_y: f64 = ((*tile_y - y_min) * 256) as f64;
+
+            // Process tile data with scaling
+            for (y, row) in rgb_img.rows().enumerate() {
+                for (x, pixel) in row.enumerate() {
+                    let scaled_x: usize = ((base_x + x as f64) * x_scale) as usize;
+                    let scaled_y: usize = ((base_y + y as f64) * y_scale) as usize;
+
+                    if scaled_y >= grid_height || scaled_x >= grid_width {
+                        continue;
+                    }
+
+                    let height: f64 = -10000.0
+                        + ((pixel[0] as f64 * 256.0 * 256.0
+                            + pixel[1] as f64 * 256.0
+                            + pixel[2] as f64)
+                            * 0.1);
+
+                    height_grid[scaled_y][scaled_x] = height;
+                }
+            }
+        }
+
+        // Fill in any NaN values by interpolating from nearest valid values
+        Self::fill_nan_values(&mut height_grid);
+
+        // Continue with the existing blur and conversion to Minecraft heights...
+        let blurred_heights: Vec<Vec<f64>> = Self::apply_gaussian_blur(&height_grid, 1.0);
+
+        let mut mc_heights: Vec<Vec<i32>> = Vec::with_capacity(blurred_heights.len());
+
+        // Find min/max in raw data
+        let mut min_height: f64 = f64::MAX;
+        let mut max_height: f64 = f64::MIN;
+        for row in &blurred_heights {
+            for &height in row {
+                min_height = min_height.min(height);
+                max_height = max_height.max(height);
+            }
+        }
+
+        let height_range: f64 = max_height - min_height;
+        // Apply scale factor to height scaling
+        let height_scale: f64 = BASE_HEIGHT_SCALE * args.scale.sqrt(); // sqrt to make height scaling less extreme
+        let scaled_range: f64 = height_range * height_scale;
+
+        // Convert to scaled Minecraft Y coordinates
+        for row in blurred_heights {
+            let mc_row: Vec<i32> = row
+                .iter()
+                .map(|&h| {
+                    // Scale the height differences
+                    let relative_height: f64 = (h - min_height) / height_range;
+                    let scaled_height: f64 = relative_height * scaled_range;
+                    // With terrain enabled, ground_level is used as the MIN_Y for terrain
+                    ((args.ground_level as f64 + scaled_height).round() as i32)
+                        .clamp(args.ground_level, MAX_Y)
+                })
+                .collect();
+            mc_heights.push(mc_row);
+        }
+
+        Ok(ElevationData {
+            heights: mc_heights,
+            width: grid_width,
+            height: grid_height,
+        })
+    }
+
+    fn get_tile_coordinates(bbox: BBox, zoom: u8) -> Vec<(u32, u32)> {
+        // Convert lat/lng to tile coordinates
+        let (x1, y1) = Self::lat_lng_to_tile(bbox.min().lat(), bbox.min().lng(), zoom);
+        let (x2, y2) = Self::lat_lng_to_tile(bbox.max().lat(), bbox.max().lng(), zoom);
+
+        let mut tiles: Vec<(u32, u32)> = Vec::new();
+        for x in x1.min(x2)..=x1.max(x2) {
+            for y in y1.min(y2)..=y1.max(y2) {
+                tiles.push((x, y));
+            }
+        }
+        tiles
+    }
+
+    fn apply_gaussian_blur(heights: &[Vec<f64>], sigma: f64) -> Vec<Vec<f64>> {
+        let kernel_size: usize = (sigma * 3.0).ceil() as usize * 2 + 1;
+        let kernel: Vec<f64> = Self::create_gaussian_kernel(kernel_size, sigma);
+
+        // Apply blur
+        let mut blurred: Vec<Vec<f64>> = heights.to_owned();
+
+        // Horizontal pass
+        for row in blurred.iter_mut() {
+            let mut temp: Vec<f64> = row.clone();
+            for (i, val) in temp.iter_mut().enumerate() {
+                let mut sum: f64 = 0.0;
+                let mut weight_sum: f64 = 0.0;
+                for (j, k) in kernel.iter().enumerate() {
+                    let idx: i32 = i as i32 + j as i32 - kernel_size as i32 / 2;
+                    if idx >= 0 && idx < row.len() as i32 {
+                        sum += row[idx as usize] * k;
+                        weight_sum += k;
+                    }
+                }
+                *val = sum / weight_sum;
+            }
+            *row = temp;
+        }
+
+        // Vertical pass
+        let height: usize = blurred.len();
+        let width: usize = blurred[0].len();
+        for x in 0..width {
+            let temp: Vec<_> = blurred
+                .iter()
+                .take(height)
+                .map(|row: &Vec<f64>| row[x])
+                .collect();
+
+            for (y, row) in blurred.iter_mut().enumerate().take(height) {
+                let mut sum: f64 = 0.0;
+                let mut weight_sum: f64 = 0.0;
+                for (j, k) in kernel.iter().enumerate() {
+                    let idx: i32 = y as i32 + j as i32 - kernel_size as i32 / 2;
+                    if idx >= 0 && idx < height as i32 {
+                        sum += temp[idx as usize] * k;
+                        weight_sum += k;
+                    }
+                }
+                row[x] = sum / weight_sum;
+            }
+        }
+
+        blurred
+    }
+
+    fn create_gaussian_kernel(size: usize, sigma: f64) -> Vec<f64> {
+        let mut kernel: Vec<f64> = vec![0.0; size];
+        let center: f64 = size as f64 / 2.0;
+
+        for (i, value) in kernel.iter_mut().enumerate() {
+            let x: f64 = i as f64 - center;
+            *value = (-x * x / (2.0 * sigma * sigma)).exp();
+        }
+
+        let sum: f64 = kernel.iter().sum();
+        for k in kernel.iter_mut() {
+            *k /= sum;
+        }
+
+        kernel
+    }
+
+    fn fill_nan_values(height_grid: &mut [Vec<f64>]) {
+        let height: usize = height_grid.len();
+        let width: usize = height_grid[0].len();
+
+        let mut changes_made: bool = true;
+        while changes_made {
+            changes_made = false;
+
+            for y in 0..height {
+                for x in 0..width {
+                    if height_grid[y][x].is_nan() {
+                        let mut sum: f64 = 0.0;
+                        let mut count: i32 = 0;
+
+                        // Check neighboring cells
+                        for dy in -1..=1 {
+                            for dx in -1..=1 {
+                                let ny: i32 = y as i32 + dy;
+                                let nx: i32 = x as i32 + dx;
+
+                                if ny >= 0 && ny < height as i32 && nx >= 0 && nx < width as i32 {
+                                    let val: f64 = height_grid[ny as usize][nx as usize];
+                                    if !val.is_nan() {
+                                        sum += val;
+                                        count += 1;
+                                    }
+                                }
+                            }
+                        }
+
+                        if count > 0 {
+                            height_grid[y][x] = sum / count as f64;
+                            changes_made = true;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    fn save_debug_image(heights: &Vec<Vec<i32>>, filename: &str) {
+        if heights.is_empty() || heights[0].is_empty() {
+            return;
+        }
+
+        let height: usize = heights.len();
+        let width: usize = heights[0].len();
+        let mut img: image::ImageBuffer<Rgb<u8>, Vec<u8>> =
+            RgbImage::new(width as u32, height as u32);
+
+        let mut min_height: i32 = i32::MAX;
+        let mut max_height: i32 = i32::MIN;
+
+        for row in heights {
+            for &h in row {
+                min_height = min_height.min(h);
+                max_height = max_height.max(h);
+            }
+        }
+
+        for (y, row) in heights.iter().enumerate() {
+            for (x, &h) in row.iter().enumerate() {
+                let normalized: u8 =
+                    (((h - min_height) as f64 / (max_height - min_height) as f64) * 255.0) as u8;
+                img.put_pixel(
+                    x as u32,
+                    y as u32,
+                    Rgb([normalized, normalized, normalized]),
+                );
+            }
+        }
+
+        // Ensure filename has .png extension
+        let filename: String = if !filename.ends_with(".png") {
+            format!("{}.png", filename)
+        } else {
+            filename.to_string()
+        };
+
+        if let Err(e) = img.save(&filename) {
+            eprintln!("Failed to save debug image: {}", e);
+        }
+    }
+}

src/gui.rs

@@ -0,0 +1,476 @@
+use crate::args::Args;
+use crate::bbox;
+use crate::data_processing;
+use crate::osm_parser;
+use crate::progress;
+use crate::retrieve_data;
+use crate::version_check;
+use fastnbt::Value;
+use flate2::read::GzDecoder;
+use log::{error, LevelFilter};
+use rfd::FileDialog;
+use std::io::Read;
+use std::path::{Path, PathBuf};
+use std::{env, fs, io::Write, panic};
+use tauri_plugin_log::{Builder as LogBuilder, Target, TargetKind};
+
+pub fn run_gui() {
+    // Launch the UI
+    println!("Launching UI...");
+
+    // Set a custom panic hook to log panic information
+    panic::set_hook(Box::new(|panic_info| {
+        let message = format!("Application panicked: {:?}", panic_info);
+        error!("{}", message);
+        std::process::exit(1);
+    }));
+
+    // Workaround WebKit2GTK issue with NVIDIA drivers (likely explicit sync related?)
+    // Source: https://github.com/tauri-apps/tauri/issues/10702 (TODO: Remove this later)
+    #[cfg(target_os = "linux")]
+    unsafe {
+        env::set_var("WEBKIT_DISABLE_DMABUF_RENDERER", "1");
+    }
+
+    tauri::Builder::default()
+        .plugin(
+            LogBuilder::default()
+                .level(LevelFilter::Warn)
+                .targets([
+                    Target::new(TargetKind::LogDir {
+                        file_name: Some("arnis".into()),
+                    }),
+                    Target::new(TargetKind::Stdout),
+                ])
+                .build(),
+        )
+        .plugin(tauri_plugin_shell::init())
+        .invoke_handler(tauri::generate_handler![
+            gui_select_world,
+            gui_start_generation,
+            gui_get_version,
+            gui_check_for_updates
+        ])
+        .setup(|app| {
+            let app_handle = app.handle();
+            let main_window = tauri::Manager::get_webview_window(app_handle, "main")
+                .expect("Failed to get main window");
+            progress::set_main_window(main_window);
+            Ok(())
+        })
+        .run(tauri::generate_context!())
+        .expect("Error while starting the application UI (Tauri)");
+}
+
+#[tauri::command]
+fn gui_select_world(generate_new: bool) -> Result<String, i32> {
+    // Determine the default Minecraft 'saves' directory based on the OS
+    let default_dir: Option<PathBuf> = if cfg!(target_os = "windows") {
+        env::var("APPDATA")
+            .ok()
+            .map(|appdata: String| PathBuf::from(appdata).join(".minecraft").join("saves"))
+    } else if cfg!(target_os = "macos") {
+        dirs::home_dir().map(|home: PathBuf| {
+            home.join("Library/Application Support/minecraft")
+                .join("saves")
+        })
+    } else if cfg!(target_os = "linux") {
+        dirs::home_dir().map(|home| {
+            let flatpak_path = home.join(".var/app/com.mojang.Minecraft/.minecraft/saves");
+            if flatpak_path.exists() {
+                flatpak_path
+            } else {
+                home.join(".minecraft/saves")
+            }
+        })
+    } else {
+        None
+    };
+
+    if generate_new {
+        // Handle new world generation
+        if let Some(default_path) = &default_dir {
+            if default_path.exists() {
+                // Call create_new_world and return the result
+                create_new_world(default_path).map_err(|_| 1) // Error code 1: Minecraft directory not found
+            } else {
+                Err(1) // Error code 1: Minecraft directory not found
+            }
+        } else {
+            Err(1) // Error code 1: Minecraft directory not found
+        }
+    } else {
+        // Handle existing world selection
+        // Open the directory picker dialog
+        let dialog: FileDialog = FileDialog::new();
+        let dialog: FileDialog = if let Some(start_dir) = default_dir.filter(|dir| dir.exists()) {
+            dialog.set_directory(start_dir)
+        } else {
+            dialog
+        };
+
+        if let Some(path) = dialog.pick_folder() {
+            // Check if the "region" folder exists within the selected directory
+            if path.join("region").exists() {
+                // Check the 'session.lock' file
+                let session_lock_path = path.join("session.lock");
+                if session_lock_path.exists() {
+                    // Try to acquire a lock on the session.lock file
+                    if let Ok(file) = fs::File::open(&session_lock_path) {
+                        if fs2::FileExt::try_lock_shared(&file).is_err() {
+                            return Err(2); // Error code 2: The selected world is currently in use
+                        } else {
+                            // Release the lock immediately
+                            let _ = fs2::FileExt::unlock(&file);
+                        }
+                    }
+                }
+
+                return Ok(path.display().to_string());
+            } else {
+                // No Minecraft directory found, generating new world in custom user selected directory
+                return create_new_world(&path).map_err(|_| 3); // Error code 3: Failed to create new world
+            }
+        }
+
+        // If no folder was selected, return an error message
+        Err(4) // Error code 4: No world selected
+    }
+}
+
+fn create_new_world(base_path: &Path) -> Result<String, String> {
+    // Generate a unique world name with proper counter
+    // Check for both "Arnis World X" and "Arnis World X: Location" patterns
+    let mut counter: i32 = 1;
+    let unique_name: String = loop {
+        let candidate_name: String = format!("Arnis World {}", counter);
+        let candidate_path: PathBuf = base_path.join(&candidate_name);
+
+        // Check for exact match (no location suffix)
+        let exact_match_exists = candidate_path.exists();
+
+        // Check for worlds with location suffix (Arnis World X: Location)
+        let location_pattern = format!("Arnis World {}: ", counter);
+        let location_match_exists = fs::read_dir(base_path)
+            .map(|entries| {
+                entries
+                    .filter_map(Result::ok)
+                    .filter_map(|entry| entry.file_name().into_string().ok())
+                    .any(|name| name.starts_with(&location_pattern))
+            })
+            .unwrap_or(false);
+
+        if !exact_match_exists && !location_match_exists {
+            break candidate_name;
+        }
+        counter += 1;
+    };
+
+    let new_world_path: PathBuf = base_path.join(&unique_name);
+
+    // Create the new world directory structure
+    fs::create_dir_all(new_world_path.join("region"))
+        .map_err(|e| format!("Failed to create world directory: {}", e))?;
+
+    // Copy the region template file
+    const REGION_TEMPLATE: &[u8] = include_bytes!("../mcassets/region.template");
+    let region_path = new_world_path.join("region").join("r.0.0.mca");
+    fs::write(&region_path, REGION_TEMPLATE)
+        .map_err(|e| format!("Failed to create region file: {}", e))?;
+
+    // Add the level.dat file
+    const LEVEL_TEMPLATE: &[u8] = include_bytes!("../mcassets/level.dat");
+
+    // Decompress the gzipped level.template
+    let mut decoder = GzDecoder::new(LEVEL_TEMPLATE);
+    let mut decompressed_data = Vec::new();
+    decoder
+        .read_to_end(&mut decompressed_data)
+        .map_err(|e| format!("Failed to decompress level.template: {}", e))?;
+
+    // Parse the decompressed NBT data
+    let mut level_data: Value = fastnbt::from_bytes(&decompressed_data)
+        .map_err(|e| format!("Failed to parse level.dat template: {}", e))?;
+
+    // Modify the LevelName, LastPlayed and player position fields
+    if let Value::Compound(ref mut root) = level_data {
+        if let Some(Value::Compound(ref mut data)) = root.get_mut("Data") {
+            // Update LevelName
+            data.insert("LevelName".to_string(), Value::String(unique_name.clone()));
+
+            // Update LastPlayed to the current Unix time in milliseconds
+            let current_time = std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .map_err(|e| format!("Failed to get current time: {}", e))?;
+            let current_time_millis = current_time.as_millis() as i64;
+            data.insert("LastPlayed".to_string(), Value::Long(current_time_millis));
+
+            // Update player position and rotation
+            if let Some(Value::Compound(ref mut player)) = data.get_mut("Player") {
+                if let Some(Value::List(ref mut pos)) = player.get_mut("Pos") {
+                    if let Value::Double(ref mut x) = pos.get_mut(0).unwrap() {
+                        *x = -5.0;
+                    }
+                    if let Value::Double(ref mut y) = pos.get_mut(1).unwrap() {
+                        *y = -61.0;
+                    }
+                    if let Value::Double(ref mut z) = pos.get_mut(2).unwrap() {
+                        *z = -5.0;
+                    }
+                }
+
+                if let Some(Value::List(ref mut rot)) = player.get_mut("Rotation") {
+                    if let Value::Float(ref mut x) = rot.get_mut(0).unwrap() {
+                        *x = -45.0;
+                    }
+                }
+            }
+        }
+    }
+
+    // Serialize the updated NBT data back to bytes
+    let serialized_level_data: Vec<u8> = fastnbt::to_bytes(&level_data)
+        .map_err(|e| format!("Failed to serialize updated level.dat: {}", e))?;
+
+    // Compress the serialized data back to gzip
+    let mut encoder = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
+    encoder
+        .write_all(&serialized_level_data)
+        .map_err(|e| format!("Failed to compress updated level.dat: {}", e))?;
+    let compressed_level_data = encoder
+        .finish()
+        .map_err(|e| format!("Failed to finalize compression for level.dat: {}", e))?;
+
+    // Write the level.dat file
+    fs::write(new_world_path.join("level.dat"), compressed_level_data)
+        .map_err(|e| format!("Failed to create level.dat file: {}", e))?;
+
+    // Add the icon.png file
+    const ICON_TEMPLATE: &[u8] = include_bytes!("../mcassets/icon.png");
+    fs::write(new_world_path.join("icon.png"), ICON_TEMPLATE)
+        .map_err(|e| format!("Failed to create icon.png file: {}", e))?;
+
+    Ok(new_world_path.display().to_string())
+}
+
+/// Adds localized area name to the world name in level.dat
+fn add_localized_world_name(world_path_str: &str, bbox: &bbox::BBox) -> String {
+    let world_path = PathBuf::from(world_path_str);
+
+    // Only proceed if the path exists
+    if !world_path.exists() {
+        return world_path_str.to_string();
+    }
+
+    // Check the level.dat file first to get the current name
+    let level_path = world_path.join("level.dat");
+
+    if !level_path.exists() {
+        return world_path_str.to_string();
+    }
+
+    // Try to read the current world name from level.dat
+    let current_name = match std::fs::read(&level_path) {
+        Ok(level_data) => {
+            let mut decoder = GzDecoder::new(level_data.as_slice());
+            let mut decompressed_data = Vec::new();
+            if decoder.read_to_end(&mut decompressed_data).is_ok() {
+                if let Ok(Value::Compound(ref root)) =
+                    fastnbt::from_bytes::<Value>(&decompressed_data)
+                {
+                    if let Some(Value::Compound(ref data)) = root.get("Data") {
+                        if let Some(Value::String(name)) = data.get("LevelName") {
+                            name.clone()
+                        } else {
+                            return world_path_str.to_string();
+                        }
+                    } else {
+                        return world_path_str.to_string();
+                    }
+                } else {
+                    return world_path_str.to_string();
+                }
+            } else {
+                return world_path_str.to_string();
+            }
+        }
+        Err(_) => return world_path_str.to_string(),
+    };
+
+    // Only modify if it's an Arnis world and doesn't already have an area name
+    if !current_name.starts_with("Arnis World ") || current_name.contains(": ") {
+        return world_path_str.to_string();
+    }
+
+    // Calculate center coordinates of bbox
+    let center_lat = (bbox.min().lat() + bbox.max().lat()) / 2.0;
+    let center_lon = (bbox.min().lng() + bbox.max().lng()) / 2.0;
+
+    // Try to fetch the area name
+    let area_name = match retrieve_data::fetch_area_name(center_lat, center_lon) {
+        Ok(Some(name)) => name,
+        _ => return world_path_str.to_string(), // Keep original name if no area name found
+    };
+
+    // Create new name with localized area name, ensuring total length doesn't exceed 30 characters
+    let base_name = current_name.clone();
+    let max_area_name_len = 30 - base_name.len() - 2; // 2 chars for ": "
+
+    let truncated_area_name =
+        if area_name.chars().count() > max_area_name_len && max_area_name_len > 0 {
+            // Truncate the area name to fit within the 30 character limit
+            area_name
+                .chars()
+                .take(max_area_name_len)
+                .collect::<String>()
+        } else if max_area_name_len == 0 {
+            // If base name is already too long, don't add area name
+            return world_path_str.to_string();
+        } else {
+            area_name
+        };
+
+    let new_name = format!("{}: {}", base_name, truncated_area_name);
+
+    // Update the level.dat file with the new name
+    if let Ok(level_data) = std::fs::read(&level_path) {
+        let mut decoder = GzDecoder::new(level_data.as_slice());
+        let mut decompressed_data = Vec::new();
+        if decoder.read_to_end(&mut decompressed_data).is_ok() {
+            if let Ok(mut nbt_data) = fastnbt::from_bytes::<Value>(&decompressed_data) {
+                // Update the level name in NBT data
+                if let Value::Compound(ref mut root) = nbt_data {
+                    if let Some(Value::Compound(ref mut data)) = root.get_mut("Data") {
+                        data.insert("LevelName".to_string(), Value::String(new_name));
+
+                        // Save the updated NBT data
+                        if let Ok(serialized_data) = fastnbt::to_bytes(&nbt_data) {
+                            let mut encoder = flate2::write::GzEncoder::new(
+                                Vec::new(),
+                                flate2::Compression::default(),
+                            );
+                            if encoder.write_all(&serialized_data).is_ok() {
+                                if let Ok(compressed_data) = encoder.finish() {
+                                    if let Err(e) = std::fs::write(&level_path, compressed_data) {
+                                        eprintln!(
+                                            "Failed to update level.dat with area name: {}",
+                                            e
+                                        );
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Return the original path since we didn't change the directory name
+    world_path_str.to_string()
+}
+#[tauri::command]
+fn gui_get_version() -> String {
+    env!("CARGO_PKG_VERSION").to_string()
+}
+
+#[tauri::command]
+fn gui_check_for_updates() -> Result<bool, String> {
+    match version_check::check_for_updates() {
+        Ok(is_newer) => Ok(is_newer),
+        Err(e) => Err(format!("Error checking for updates: {}", e)),
+    }
+}
+
+#[tauri::command]
+#[allow(clippy::too_many_arguments)]
+fn gui_start_generation(
+    bbox_text: String,
+    selected_world: String,
+    world_scale: f64,
+    ground_level: i32,
+    floodfill_timeout: u64,
+    terrain_enabled: bool,
+    fillground_enabled: bool,
+    is_new_world: bool,
+) -> Result<(), String> {
+    use bbox::BBox;
+    use progress::emit_gui_error;
+
+    tauri::async_runtime::spawn(async move {
+        if let Err(e) = tokio::task::spawn_blocking(move || {
+            // Parse the bounding box from the text with proper error handling
+            let bbox = match BBox::from_str(&bbox_text) {
+                Ok(bbox) => bbox,
+                Err(e) => {
+                    let error_msg = format!("Failed to parse bounding box: {}", e);
+                    eprintln!("{}", error_msg);
+                    emit_gui_error(&error_msg);
+                    return Err(error_msg);
+                }
+            };
+
+            // Add localized name to the world if user generated a new world
+            let updated_world_path = if is_new_world {
+                add_localized_world_name(&selected_world, &bbox)
+            } else {
+                selected_world
+            };
+
+            // Create an Args instance with the chosen bounding box and world directory path
+            let args: Args = Args {
+                bbox,
+                file: None,
+                path: updated_world_path,
+                downloader: "requests".to_string(),
+                scale: world_scale,
+                ground_level,
+                terrain: terrain_enabled,
+                fillground: fillground_enabled,
+                debug: false,
+                timeout: Some(std::time::Duration::from_secs(floodfill_timeout)),
+            };
+
+            // Run data fetch and world generation
+            match retrieve_data::fetch_data(args.bbox, None, args.debug, "requests") {
+                Ok(raw_data) => {
+                    let (mut parsed_elements, scale_factor_x, scale_factor_z) =
+                        osm_parser::parse_osm_data(&raw_data, args.bbox, &args);
+                    parsed_elements.sort_by(|el1, el2| {
+                        let (el1_priority, el2_priority) =
+                            (osm_parser::get_priority(el1), osm_parser::get_priority(el2));
+                        match (
+                            el1.tags().contains_key("landuse"),
+                            el2.tags().contains_key("landuse"),
+                        ) {
+                            (true, false) => std::cmp::Ordering::Greater,
+                            (false, true) => std::cmp::Ordering::Less,
+                            _ => el1_priority.cmp(&el2_priority),
+                        }
+                    });
+
+                    let _ = data_processing::generate_world(
+                        parsed_elements,
+                        &args,
+                        scale_factor_x,
+                        scale_factor_z,
+                    );
+                    Ok(())
+                }
+                Err(e) => {
+                    let error_msg = format!("Failed to fetch data: {}", e);
+                    emit_gui_error(&error_msg);
+                    Err(error_msg)
+                }
+            }
+        })
+        .await
+        {
+            let error_msg = format!("Error in blocking task: {}", e);
+            eprintln!("{}", error_msg);
+            emit_gui_error(&error_msg);
+        }
+    });
+
+    Ok(())
+}

src/main.rs

@@ -1,13 +1,18 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 mod args;
+mod bbox;
 mod block_definitions;
 mod bresenham;
+mod cartesian;
 mod colors;
 mod data_processing;
 mod element_processing;
 mod floodfill;
+mod geo_coord;
+mod ground;
 mod osm_parser;
+#[cfg(feature = "gui")]
 mod progress;
 mod retrieve_data;
 mod version_check;
@@ -16,20 +21,25 @@ mod world_editor;
 use args::Args;
 use clap::Parser;
 use colored::*;
-use fastnbt::Value;
-use flate2::read::GzDecoder;
-use log::{error, LevelFilter};
-use rfd::FileDialog;
-use std::{
-    env,
-    fs::{self, File},
-    io::{Read, Write},
-    panic,
-    path::{Path, PathBuf},
-};
-use tauri_plugin_log::{Builder as LogBuilder, Target, TargetKind};
+use std::{env, fs, io::Write};
 
-fn print_banner() {
+#[cfg(feature = "gui")]
+mod gui;
+
+// If the user does not want the GUI, it's easiest to just mock the progress module to do nothing
+#[cfg(not(feature = "gui"))]
+mod progress {
+    pub fn emit_gui_error(_message: &str) {}
+    pub fn emit_gui_progress_update(_progress: f64, _message: &str) {}
+    pub fn is_running_with_gui() -> bool {
+        false
+    }
+}
+
+#[cfg(target_os = "windows")]
+use windows::Win32::System::Console::{AttachConsole, FreeConsole, ATTACH_PARENT_PROCESS};
+
+fn run_cli() {
     let version: &str = env!("CARGO_PKG_VERSION");
     let repository: &str = env!("CARGO_PKG_REPOSITORY");
     println!(
@@ -50,360 +60,68 @@ fn print_banner() {
         version,
         repository.bright_white().bold()
     );
+
+    // Check for updates
+    if let Err(e) = version_check::check_for_updates() {
+        eprintln!(
+            "{}: {}",
+            "Error checking for version updates".red().bold(),
+            e
+        );
+    }
+
+    // Parse input arguments
+    let args: Args = Args::parse();
+    args.run();
+
+    // Fetch data
+    let raw_data: serde_json::Value =
+        retrieve_data::fetch_data(args.bbox, args.file.as_deref(), args.debug, "requests")
+            .expect("Failed to fetch data");
+
+    // Parse raw data
+    let (mut parsed_elements, scale_factor_x, scale_factor_z) =
+        osm_parser::parse_osm_data(&raw_data, args.bbox, &args);
+    parsed_elements
+        .sort_by_key(|element: &osm_parser::ProcessedElement| osm_parser::get_priority(element));
+
+    // Write the parsed OSM data to a file for inspection
+    if args.debug {
+        let mut output_file: fs::File =
+            fs::File::create("parsed_osm_data.txt").expect("Failed to create output file");
+        for element in &parsed_elements {
+            writeln!(
+                output_file,
+                "Element ID: {}, Type: {}, Tags: {:?}",
+                element.id(),
+                element.kind(),
+                element.tags(),
+            )
+            .expect("Failed to write to output file");
+        }
+    }
+
+    // Generate world
+    let _ = data_processing::generate_world(parsed_elements, &args, scale_factor_x, scale_factor_z);
 }
 
 fn main() {
-    // Parse arguments to decide whether to launch the UI or CLI
-    let raw_args: Vec<String> = std::env::args().collect();
-
-    // Check if either `--help` or `--path` is present to run command-line mode
-    let is_help: bool = raw_args.iter().any(|arg: &String| arg == "--help");
-    let is_path_provided: bool = raw_args
-        .iter()
-        .any(|arg: &String| arg.starts_with("--path"));
-
-    if is_help || is_path_provided {
-        print_banner();
-
-        // Check for updates
-        if let Err(e) = version_check::check_for_updates() {
-            eprintln!(
-                "{}: {}",
-                "Error checking for version updates".red().bold(),
-                e
-            );
-        }
-
-        // Parse input arguments
-        let args: Args = Args::parse();
-        args.run();
-
-        let bbox: Vec<f64> = args
-            .bbox
-            .as_ref()
-            .expect("Bounding box is required")
-            .split(',')
-            .map(|s: &str| s.parse::<f64>().expect("Invalid bbox coordinate"))
-            .collect::<Vec<f64>>();
-
-        let bbox_tuple: (f64, f64, f64, f64) = (bbox[0], bbox[1], bbox[2], bbox[3]);
-
-        // Fetch data
-        let raw_data: serde_json::Value =
-            retrieve_data::fetch_data(bbox_tuple, args.file.as_deref(), args.debug, "requests")
-                .expect("Failed to fetch data");
-
-        // Parse raw data
-        let (mut parsed_elements, scale_factor_x, scale_factor_z) =
-            osm_parser::parse_osm_data(&raw_data, bbox_tuple, &args);
-        parsed_elements.sort_by_key(|element: &osm_parser::ProcessedElement| {
-            osm_parser::get_priority(element)
-        });
-
-        // Write the parsed OSM data to a file for inspection
-        if args.debug {
-            let mut output_file: File =
-                File::create("parsed_osm_data.txt").expect("Failed to create output file");
-            for element in &parsed_elements {
-                writeln!(
-                    output_file,
-                    "Element ID: {}, Type: {}, Tags: {:?}",
-                    element.id(),
-                    element.kind(),
-                    element.tags(),
-                )
-                .expect("Failed to write to output file");
-            }
-        }
-
-        // Generate world
-        let _ =
-            data_processing::generate_world(parsed_elements, &args, scale_factor_x, scale_factor_z);
-    } else {
-        // Launch the UI
-        println!("Launching UI...");
-
-        // Set a custom panic hook to log panic information
-        panic::set_hook(Box::new(|panic_info| {
-            let message = format!("Application panicked: {:?}", panic_info);
-            error!("{}", message);
-            std::process::exit(1);
-        }));
-
-        tauri::Builder::default()
-            .plugin(
-                LogBuilder::default()
-                    .level(LevelFilter::Warn)
-                    .targets([
-                        Target::new(TargetKind::LogDir {
-                            file_name: Some("arnis".into()),
-                        }),
-                        Target::new(TargetKind::Stdout),
-                    ])
-                    .build(),
-            )
-            .plugin(tauri_plugin_shell::init())
-            .invoke_handler(tauri::generate_handler![
-                gui_select_world,
-                gui_start_generation,
-                gui_get_version,
-                gui_check_for_updates
-            ])
-            .setup(|app| {
-                let app_handle = app.handle();
-                let main_window = tauri::Manager::get_webview_window(app_handle, "main")
-                    .expect("Failed to get main window");
-                progress::set_main_window(main_window);
-                Ok(())
-            })
-            .run(tauri::generate_context!())
-            .expect("Error while starting the application UI (Tauri)");
+    // If on Windows, free and reattach to the parent console when using as a CLI tool
+    // Either of these can fail, but if they do it is not an issue, so the return value is ignored
+    #[cfg(target_os = "windows")]
+    unsafe {
+        let _ = FreeConsole();
+        let _ = AttachConsole(ATTACH_PARENT_PROCESS);
     }
-}
 
-#[tauri::command]
-fn gui_select_world(generate_new: bool) -> Result<String, i32> {
-    // Determine the default Minecraft 'saves' directory based on the OS
-    let default_dir: Option<PathBuf> = if cfg!(target_os = "windows") {
-        env::var("APPDATA")
-            .ok()
-            .map(|appdata: String| PathBuf::from(appdata).join(".minecraft").join("saves"))
-    } else if cfg!(target_os = "macos") {
-        dirs::home_dir().map(|home: PathBuf| {
-            home.join("Library/Application Support/minecraft")
-                .join("saves")
-        })
-    } else if cfg!(target_os = "linux") {
-        dirs::home_dir().map(|home| {
-            let flatpak_path = home.join(".var/app/com.mojang.Minecraft/.minecraft/saves");
-            if flatpak_path.exists() {
-                flatpak_path
-            } else {
-                home.join(".minecraft/saves")
-            }
-        })
-    } else {
-        None
-    };
-
-    if generate_new {
-        // Handle new world generation
-        if let Some(default_path) = &default_dir {
-            if default_path.exists() {
-                // Call create_new_world and return the result
-                create_new_world(default_path).map_err(|_| 1) // Error code 1: Minecraft directory not found
-            } else {
-                Err(1) // Error code 1: Minecraft directory not found
-            }
-        } else {
-            Err(1) // Error code 1: Minecraft directory not found
-        }
-    } else {
-        // Handle existing world selection
-        // Open the directory picker dialog
-        let dialog: FileDialog = FileDialog::new();
-        let dialog: FileDialog = if let Some(start_dir) = default_dir.filter(|dir| dir.exists()) {
-            dialog.set_directory(start_dir)
-        } else {
-            dialog
-        };
-
-        if let Some(path) = dialog.pick_folder() {
-            // Check if the "region" folder exists within the selected directory
-            if path.join("region").exists() {
-                // Check the 'session.lock' file
-                let session_lock_path = path.join("session.lock");
-                if session_lock_path.exists() {
-                    // Try to acquire a lock on the session.lock file
-                    if let Ok(file) = File::open(&session_lock_path) {
-                        if fs2::FileExt::try_lock_shared(&file).is_err() {
-                            return Err(2); // Error code 2: The selected world is currently in use
-                        } else {
-                            // Release the lock immediately
-                            let _ = fs2::FileExt::unlock(&file);
-                        }
-                    }
-                }
-
-                return Ok(path.display().to_string());
-            } else {
-                // No Minecraft directory found, generating new world in custom user selected directory
-                return create_new_world(&path).map_err(|_| 3); // Error code 3: Failed to create new world
-            }
-        }
-
-        // If no folder was selected, return an error message
-        Err(4) // Error code 4: No world selected
-    }
-}
-
-fn create_new_world(base_path: &Path) -> Result<String, String> {
-    // Generate a unique world name
-    let mut counter: i32 = 1;
-    let unique_name: String = loop {
-        let candidate_name: String = format!("Arnis World {}", counter);
-        let candidate_path: PathBuf = base_path.join(&candidate_name);
-        if !candidate_path.exists() {
-            break candidate_name;
-        }
-        counter += 1;
-    };
-
-    let new_world_path: PathBuf = base_path.join(&unique_name);
-
-    // Create the new world directory structure
-    fs::create_dir_all(new_world_path.join("region"))
-        .map_err(|e| format!("Failed to create world directory: {}", e))?;
-
-    // Copy the region template file
-    const REGION_TEMPLATE: &[u8] = include_bytes!("../mcassets/region.template");
-    let region_path = new_world_path.join("region").join("r.0.0.mca");
-    fs::write(&region_path, REGION_TEMPLATE)
-        .map_err(|e| format!("Failed to create region file: {}", e))?;
-
-    // Add the level.dat file
-    const LEVEL_TEMPLATE: &[u8] = include_bytes!("../mcassets/level.dat");
-
-    // Decompress the gzipped level.template
-    let mut decoder = GzDecoder::new(LEVEL_TEMPLATE);
-    let mut decompressed_data = Vec::new();
-    decoder
-        .read_to_end(&mut decompressed_data)
-        .map_err(|e| format!("Failed to decompress level.template: {}", e))?;
-
-    // Parse the decompressed NBT data
-    let mut level_data: Value = fastnbt::from_bytes(&decompressed_data)
-        .map_err(|e| format!("Failed to parse level.dat template: {}", e))?;
-
-    // Modify the LevelName and LastPlayed fields
-    if let Value::Compound(ref mut root) = level_data {
-        if let Some(Value::Compound(ref mut data)) = root.get_mut("Data") {
-            // Update LevelName
-            data.insert("LevelName".to_string(), Value::String(unique_name.clone()));
-
-            // Update LastPlayed to the current Unix time in milliseconds
-            let current_time = std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .map_err(|e| format!("Failed to get current time: {}", e))?;
-            let current_time_millis = current_time.as_millis() as i64;
-            data.insert("LastPlayed".to_string(), Value::Long(current_time_millis));
+    // Only run CLI mode if the user supplied args.
+    #[cfg(feature = "gui")]
+    {
+        let gui_mode = std::env::args().len() == 1; // Just "arnis" with no args
+        if gui_mode {
+            gui::run_gui();
         }
     }
 
-    // Serialize the updated NBT data back to bytes
-    let serialized_level_data: Vec<u8> = fastnbt::to_bytes(&level_data)
-        .map_err(|e| format!("Failed to serialize updated level.dat: {}", e))?;
-
-    // Compress the serialized data back to gzip
-    let mut encoder = flate2::write::GzEncoder::new(Vec::new(), flate2::Compression::default());
-    encoder
-        .write_all(&serialized_level_data)
-        .map_err(|e| format!("Failed to compress updated level.dat: {}", e))?;
-    let compressed_level_data = encoder
-        .finish()
-        .map_err(|e| format!("Failed to finalize compression for level.dat: {}", e))?;
-
-    // Write the level.dat file
-    fs::write(new_world_path.join("level.dat"), compressed_level_data)
-        .map_err(|e| format!("Failed to create level.dat file: {}", e))?;
-
-    // Add the icon.png file
-    const ICON_TEMPLATE: &[u8] = include_bytes!("../mcassets/icon.png");
-    fs::write(new_world_path.join("icon.png"), ICON_TEMPLATE)
-        .map_err(|e| format!("Failed to create icon.png file: {}", e))?;
-
-    Ok(new_world_path.display().to_string())
-}
-
-#[tauri::command]
-fn gui_get_version() -> String {
-    env!("CARGO_PKG_VERSION").to_string()
-}
-
-#[tauri::command]
-fn gui_check_for_updates() -> Result<bool, String> {
-    match version_check::check_for_updates() {
-        Ok(is_newer) => Ok(is_newer),
-        Err(e) => Err(format!("Error checking for updates: {}", e)),
-    }
-}
-
-#[tauri::command]
-fn gui_start_generation(
-    bbox_text: String,
-    selected_world: String,
-    world_scale: f64,
-    ground_level: i32,
-    winter_mode: bool,
-    floodfill_timeout: u64,
-) -> Result<(), String> {
-    tauri::async_runtime::spawn(async move {
-        if let Err(e) = tokio::task::spawn_blocking(move || {
-            // Utility function to reorder bounding box coordinates
-            fn reorder_bbox(bbox: &[f64]) -> (f64, f64, f64, f64) {
-                (bbox[1], bbox[0], bbox[3], bbox[2])
-            }
-
-            // Parse bounding box string and validate it
-            let bbox: Vec<f64> = bbox_text
-                .split_whitespace()
-                .map(|s| s.parse::<f64>().expect("Invalid bbox coordinate"))
-                .collect();
-
-            if bbox.len() != 4 {
-                return Err("Invalid bounding box format".to_string());
-            }
-
-            // Create an Args instance with the chosen bounding box and world directory path
-            let args: Args = Args {
-                bbox: Some(bbox_text),
-                file: None,
-                path: selected_world,
-                downloader: "requests".to_string(),
-                scale: world_scale,
-                ground_level,
-                winter: winter_mode,
-                debug: false,
-                timeout: Some(std::time::Duration::from_secs(floodfill_timeout)),
-            };
-
-            // Reorder bounding box coordinates for further processing
-            let reordered_bbox: (f64, f64, f64, f64) = reorder_bbox(&bbox);
-
-            // Run data fetch and world generation
-            match retrieve_data::fetch_data(reordered_bbox, None, args.debug, "requests") {
-                Ok(raw_data) => {
-                    let (mut parsed_elements, scale_factor_x, scale_factor_z) =
-                        osm_parser::parse_osm_data(&raw_data, reordered_bbox, &args);
-                    parsed_elements.sort_by(|el1, el2| {
-                        let (el1_priority, el2_priority) =
-                            (osm_parser::get_priority(el1), osm_parser::get_priority(el2));
-                        match (
-                            el1.tags().contains_key("landuse"),
-                            el2.tags().contains_key("landuse"),
-                        ) {
-                            (true, false) => std::cmp::Ordering::Greater,
-                            (false, true) => std::cmp::Ordering::Less,
-                            _ => el1_priority.cmp(&el2_priority),
-                        }
-                    });
-
-                    let _ = data_processing::generate_world(
-                        parsed_elements,
-                        &args,
-                        scale_factor_x,
-                        scale_factor_z,
-                    );
-                    Ok(())
-                }
-                Err(e) => Err(format!("Failed to start generation: {}", e)),
-            }
-        })
-        .await
-        {
-            eprintln!("Error in blocking task: {}", e);
-        }
-    });
-
-    Ok(())
+    run_cli();
 }

src/osm_parser.rs

@@ -1,4 +1,7 @@
-use crate::{args::Args, progress::emit_gui_progress_update};
+use crate::{
+    args::Args, bbox::BBox, cartesian::XZPoint, geo_coord::GeoCoord,
+    progress::emit_gui_progress_update,
+};
 use colored::Colorize;
 use serde::Deserialize;
 use serde_json::Value;
@@ -44,6 +47,15 @@ pub struct ProcessedNode {
     pub z: i32,
 }
 
+impl ProcessedNode {
+    pub fn xz(&self) -> XZPoint {
+        XZPoint {
+            x: self.x,
+            z: self.z,
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct ProcessedWay {
     pub id: u64,
@@ -115,15 +127,13 @@ impl ProcessedElement {
 fn lat_lon_to_minecraft_coords(
     lat: f64,
     lon: f64,
-    bbox: (f64, f64, f64, f64), // (min_lon, min_lat, max_lon, max_lat)
+    bbox: BBox, // (min_lon, min_lat, max_lon, max_lat)
     scale_factor_z: f64,
     scale_factor_x: f64,
 ) -> (i32, i32) {
-    let (min_lon, min_lat, max_lon, max_lat) = bbox;
-
     // Calculate the relative position within the bounding box
-    let rel_x: f64 = (lon - min_lon) / (max_lon - min_lon);
-    let rel_z: f64 = 1.0 - (lat - min_lat) / (max_lat - min_lat);
+    let rel_x: f64 = (lon - bbox.min().lng()) / (bbox.max().lng() - bbox.min().lng());
+    let rel_z: f64 = 1.0 - (lat - bbox.min().lat()) / (bbox.max().lat() - bbox.min().lat());
 
     // Apply scaling factors for each dimension and convert to Minecraft coordinates
     let x: i32 = (rel_x * scale_factor_x) as i32;
@@ -134,7 +144,7 @@ fn lat_lon_to_minecraft_coords(
 
 pub fn parse_osm_data(
     json_data: &Value,
-    bbox: (f64, f64, f64, f64),
+    bbox: BBox,
     args: &Args,
 ) -> (Vec<ProcessedElement>, f64, f64) {
     println!("{} Parsing data...", "[2/5]".bold());
@@ -145,7 +155,7 @@ pub fn parse_osm_data(
         serde_json::from_value(json_data.clone()).expect("Failed to parse OSM data");
 
     // Determine which dimension is larger and assign scale factors accordingly
-    let (scale_factor_z, scale_factor_x) = geo_distance(bbox.1, bbox.3, bbox.0, bbox.2);
+    let (scale_factor_z, scale_factor_x) = geo_distance(bbox.min(), bbox.max());
     let scale_factor_z: f64 = scale_factor_z.floor() * args.scale;
     let scale_factor_x: f64 = scale_factor_x.floor() * args.scale;
 
@@ -281,11 +291,12 @@ pub fn get_priority(element: &ProcessedElement) -> usize {
 }
 
 // (lat meters, lon meters)
-fn geo_distance(lat1: f64, lat2: f64, lon1: f64, lon2: f64) -> (f64, f64) {
-    let z: f64 = lat_distance(lat1, lat2);
+#[inline]
+pub fn geo_distance(a: GeoCoord, b: GeoCoord) -> (f64, f64) {
+    let z: f64 = lat_distance(a.lat(), b.lat());
 
     // distance between two lons depends on their latitude. In this case we'll just average them
-    let x: f64 = lon_distance((lat1 + lat2) / 2.0, lon1, lon2);
+    let x: f64 = lon_distance((a.lat() + b.lat()) / 2.0, a.lng(), b.lng());
 
     (z, x)
 }

src/retrieve_data.rs

@@ -1,3 +1,4 @@
+use crate::bbox::BBox;
 use crate::progress::{emit_gui_error, emit_gui_progress_update, is_running_with_gui};
 use colored::Colorize;
 use rand::seq::SliceRandom;
@@ -80,7 +81,7 @@ fn download_with_wget(url: &str, query: &str) -> io::Result<String> {
 
 /// Main function to fetch data
 pub fn fetch_data(
-    bbox: (f64, f64, f64, f64),
+    bbox: BBox,
     file: Option<&str>,
     debug: bool,
     download_method: &str,
@@ -95,9 +96,10 @@ pub fn fetch_data(
         "https://z.overpass-api.de/api/interpreter",
         //"https://overpass.kumi.systems/api/interpreter", // This server is not reliable anymore
         //"https://overpass.private.coffee/api/interpreter", // This server is not reliable anymore
-        "https://overpass.osm.ch/api/interpreter",
     ];
-    let url: &&str = api_servers.choose(&mut rand::thread_rng()).unwrap();
+    let fallback_api_servers: Vec<&str> =
+        vec!["https://maps.mail.ru/osm/tools/overpass/api/interpreter"];
+    let mut url: &&str = api_servers.choose(&mut rand::thread_rng()).unwrap();
 
     // Generate Overpass API query for bounding box
     let query: String = format!(
@@ -114,6 +116,9 @@ pub fn fetch_data(
         nwr["tourism"];
         nwr["bridge"];
         nwr["railway"];
+        nwr["subway"="yes"];
+        nwr["tunnel"="yes"];
+        nwr["public_transport"="station"];
         nwr["barrier"];
         nwr["entrance"];
         nwr["door"];
@@ -129,7 +134,10 @@ pub fn fetch_data(
     .relsinbbox out body;
     .waysinbbox out body;
     .nodesinbbox out skel qt;"#,
-        bbox.1, bbox.0, bbox.3, bbox.2
+        bbox.min().lat(),
+        bbox.min().lng(),
+        bbox.max().lat(),
+        bbox.max().lng(),
     );
 
     if let Some(file) = file {
@@ -140,11 +148,30 @@ pub fn fetch_data(
         Ok(data)
     } else {
         // Fetch data from Overpass API
-        let response: String = match download_method {
-            "requests" => download_with_reqwest(url, &query)?,
-            "curl" => download_with_curl(url, &query)?,
-            "wget" => download_with_wget(url, &query)?,
-            _ => download_with_reqwest(url, &query)?, // Default to requests
+        let mut attempt = 0;
+        let max_attempts = 1;
+        let response: String = loop {
+            let result = match download_method {
+                "requests" => download_with_reqwest(url, &query),
+                "curl" => download_with_curl(url, &query).map_err(|e| e.into()),
+                "wget" => download_with_wget(url, &query).map_err(|e| e.into()),
+                _ => download_with_reqwest(url, &query), // Default to requests
+            };
+
+            match result {
+                Ok(response) => break response,
+                Err(error) => {
+                    if attempt >= max_attempts {
+                        return Err(error);
+                    }
+
+                    println!("Request failed. Switching to fallback url...");
+                    url = fallback_api_servers
+                        .choose(&mut rand::thread_rng())
+                        .unwrap();
+                    attempt += 1;
+                }
+            }
         };
 
         let data: Value = serde_json::from_str(&response)?;
@@ -171,9 +198,11 @@ pub fn fetch_data(
                 // General case for when there are no elements and no specific remark
                 eprintln!(
                     "{}",
-                    "Error! No data available in this region.".red().bold()
+                    "Error! API returned no data. Please try again!"
+                        .red()
+                        .bold()
                 );
-                emit_gui_error("No data available in this region.");
+                emit_gui_error("API returned no data. Please try again!");
             }
 
             if debug {
@@ -198,3 +227,32 @@ pub fn fetch_data(
         Ok(data)
     }
 }
+
+/// Fetches a short area name using Nominatim for the given lat/lon
+pub fn fetch_area_name(lat: f64, lon: f64) -> Result<Option<String>, Box<dyn std::error::Error>> {
+    let client = Client::builder().timeout(Duration::from_secs(20)).build()?;
+
+    let url = format!(
+        "https://nominatim.openstreetmap.org/reverse?format=jsonv2&lat={}&lon={}&addressdetails=1",
+        lat, lon
+    );
+
+    let resp = client.get(&url).header("User-Agent", "arnis-rust").send()?;
+
+    if !resp.status().is_success() {
+        return Ok(None);
+    }
+
+    let json: Value = resp.json()?;
+
+    if let Some(address) = json.get("address") {
+        let fields = ["city", "town", "village", "county", "borough", "suburb"];
+        for field in fields.iter() {
+            if let Some(name) = address.get(*field).and_then(|v| v.as_str()) {
+                return Ok(Some(name.to_string()));
+            }
+        }
+    }
+
+    Ok(None)
+}

src/world_editor.rs

@@ -1,15 +1,18 @@
-use crate::args::Args;
 use crate::block_definitions::*;
+use crate::cartesian::XZPoint;
+use crate::ground::Ground;
 use crate::progress::emit_gui_progress_update;
 use colored::Colorize;
 use fastanvil::Region;
 use fastnbt::{LongArray, Value};
 use fnv::FnvHashMap;
 use indicatif::{ProgressBar, ProgressStyle};
+use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::Write;
+use std::sync::atomic::{AtomicU64, Ordering};
 
 #[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -226,23 +229,38 @@ impl WorldToModify {
     }
 }
 
-pub struct WorldEditor<'a> {
+pub struct WorldEditor {
     region_dir: String,
     world: WorldToModify,
     scale_factor_x: f64,
     scale_factor_z: f64,
-    args: &'a Args,
+    ground: Option<Box<Ground>>,
 }
 
-impl<'a> WorldEditor<'a> {
+impl WorldEditor {
     /// Initializes the WorldEditor with the region directory and template region path.
-    pub fn new(region_dir: &str, scale_factor_x: f64, scale_factor_z: f64, args: &'a Args) -> Self {
+    pub fn new(region_dir: &str, scale_factor_x: f64, scale_factor_z: f64) -> Self {
         Self {
             region_dir: region_dir.to_string(),
             world: WorldToModify::default(),
             scale_factor_x,
             scale_factor_z,
-            args,
+            ground: None,
+        }
+    }
+
+    /// Sets the ground reference for elevation-based block placement
+    pub fn set_ground(&mut self, ground: &Ground) {
+        self.ground = Some(Box::new(ground.clone()));
+    }
+
+    /// Calculate the absolute Y position from a ground-relative offset
+    #[inline(always)]
+    pub fn get_absolute_y(&self, x: i32, y_offset: i32, z: i32) -> i32 {
+        if let Some(ground) = &self.ground {
+            ground.level(XZPoint::new(x, z)) + y_offset
+        } else {
+            y_offset // If no ground reference, use y_offset as absolute Y
         }
     }
 
@@ -271,12 +289,14 @@ impl<'a> WorldEditor<'a> {
         (self.scale_factor_x as i32, self.scale_factor_x as i32)
     }
 
-    // Unused and not tested
-    /*pub fn block_at(&self, x: i32, y: i32, z: i32) -> bool {
-        self.world.get_block(x, y, z).is_some()
-    }*/
+    #[allow(unused)]
+    #[inline]
+    pub fn block_at(&self, x: i32, y: i32, z: i32) -> bool {
+        let absolute_y = self.get_absolute_y(x, y, z);
+        self.world.get_block(x, absolute_y, z).is_some()
+    }
 
-    #[allow(clippy::too_many_arguments)]
+    #[allow(clippy::too_many_arguments, dead_code)]
     pub fn set_sign(
         &mut self,
         line1: String,
@@ -288,6 +308,7 @@ impl<'a> WorldEditor<'a> {
         z: i32,
         _rotation: i8,
     ) {
+        let absolute_y = self.get_absolute_y(x, y, z);
         let chunk_x = x >> 4;
         let chunk_z = z >> 4;
         let region_x = chunk_x >> 5;
@@ -315,7 +336,7 @@ impl<'a> WorldEditor<'a> {
         block_entities.insert("is_waxed".to_string(), Value::Byte(0));
         block_entities.insert("keepPacked".to_string(), Value::Byte(0));
         block_entities.insert("x".to_string(), Value::Int(x));
-        block_entities.insert("y".to_string(), Value::Int(y));
+        block_entities.insert("y".to_string(), Value::Int(absolute_y));
         block_entities.insert("z".to_string(), Value::Int(z));
 
         let region: &mut RegionToModify = self.world.get_or_create_region(region_x, region_z);
@@ -336,6 +357,8 @@ impl<'a> WorldEditor<'a> {
     }
 
     /// Sets a block of the specified type at the given coordinates.
+    /// Y value is interpreted as an offset from ground level.
+    #[inline]
     pub fn set_block(
         &mut self,
         block: Block,
@@ -350,7 +373,10 @@ impl<'a> WorldEditor<'a> {
             return;
         }
 
-        let should_insert = if let Some(existing_block) = self.world.get_block(x, y, z) {
+        // Calculate the absolute Y coordinate based on ground level
+        let absolute_y = self.get_absolute_y(x, y, z);
+
+        let should_insert = if let Some(existing_block) = self.world.get_block(x, absolute_y, z) {
             // Check against whitelist and blacklist
             if let Some(whitelist) = override_whitelist {
                 whitelist
@@ -368,12 +394,51 @@ impl<'a> WorldEditor<'a> {
         };
 
         if should_insert {
-            self.world.set_block(x, y, z, block);
+            self.world.set_block(x, absolute_y, z, block);
+        }
+    }
+
+    /// Sets a block of the specified type at the given coordinates with absolute Y value.
+    #[inline]
+    pub fn set_block_absolute(
+        &mut self,
+        block: Block,
+        x: i32,
+        absolute_y: i32,
+        z: i32,
+        override_whitelist: Option<&[Block]>,
+        override_blacklist: Option<&[Block]>,
+    ) {
+        // Check if coordinates are within bounds
+        if x < 0 || x > self.scale_factor_x as i32 || z < 0 || z > self.scale_factor_z as i32 {
+            return;
+        }
+
+        let should_insert = if let Some(existing_block) = self.world.get_block(x, absolute_y, z) {
+            // Check against whitelist and blacklist
+            if let Some(whitelist) = override_whitelist {
+                whitelist
+                    .iter()
+                    .any(|whitelisted_block: &Block| whitelisted_block.id() == existing_block.id())
+            } else if let Some(blacklist) = override_blacklist {
+                !blacklist
+                    .iter()
+                    .any(|blacklisted_block: &Block| blacklisted_block.id() == existing_block.id())
+            } else {
+                false
+            }
+        } else {
+            true
+        };
+
+        if should_insert {
+            self.world.set_block(x, absolute_y, z, block);
         }
     }
 
     /// Fills a cuboid area with the specified block between two coordinates.
     #[allow(clippy::too_many_arguments)]
+    #[inline]
     pub fn fill_blocks(
         &mut self,
         block: Block,
@@ -391,25 +456,91 @@ impl<'a> WorldEditor<'a> {
         let (min_z, max_z) = if z1 < z2 { (z1, z2) } else { (z2, z1) };
 
         for x in min_x..=max_x {
-            for y in min_y..=max_y {
+            for y_offset in min_y..=max_y {
                 for z in min_z..=max_z {
-                    self.set_block(block, x, y, z, override_whitelist, override_blacklist);
+                    self.set_block(
+                        block,
+                        x,
+                        y_offset,
+                        z,
+                        override_whitelist,
+                        override_blacklist,
+                    );
+                }
+            }
+        }
+    }
+
+    /// Fills a cuboid area with the specified block between two coordinates using absolute Y values.
+    #[allow(clippy::too_many_arguments)]
+    #[inline]
+    pub fn fill_blocks_absolute(
+        &mut self,
+        block: Block,
+        x1: i32,
+        y1_absolute: i32,
+        z1: i32,
+        x2: i32,
+        y2_absolute: i32,
+        z2: i32,
+        override_whitelist: Option<&[Block]>,
+        override_blacklist: Option<&[Block]>,
+    ) {
+        let (min_x, max_x) = if x1 < x2 { (x1, x2) } else { (x2, x1) };
+        let (min_y, max_y) = if y1_absolute < y2_absolute {
+            (y1_absolute, y2_absolute)
+        } else {
+            (y2_absolute, y1_absolute)
+        };
+        let (min_z, max_z) = if z1 < z2 { (z1, z2) } else { (z2, z1) };
+
+        for x in min_x..=max_x {
+            for absolute_y in min_y..=max_y {
+                for z in min_z..=max_z {
+                    self.set_block_absolute(
+                        block,
+                        x,
+                        absolute_y,
+                        z,
+                        override_whitelist,
+                        override_blacklist,
+                    );
                 }
             }
         }
     }
 
     /// Checks for a block at the given coordinates.
-    pub fn check_for_block(
+    #[inline]
+    pub fn check_for_block(&self, x: i32, y: i32, z: i32, whitelist: Option<&[Block]>) -> bool {
+        let absolute_y = self.get_absolute_y(x, y, z);
+
+        // Retrieve the chunk modification map
+        if let Some(existing_block) = self.world.get_block(x, absolute_y, z) {
+            if let Some(whitelist) = whitelist {
+                if whitelist
+                    .iter()
+                    .any(|whitelisted_block: &Block| whitelisted_block.id() == existing_block.id())
+                {
+                    return true; // Block is in the list
+                }
+            }
+        }
+        false
+    }
+
+    /// Checks for a block at the given coordinates with absolute Y value.
+    #[allow(unused)]
+    pub fn check_for_block_absolute(
         &self,
         x: i32,
-        y: i32,
+        absolute_y: i32,
         z: i32,
         whitelist: Option<&[Block]>,
         blacklist: Option<&[Block]>,
     ) -> bool {
         // Retrieve the chunk modification map
-        if let Some(existing_block) = self.world.get_block(x, y, z) {
+        if let Some(existing_block) = self.world.get_block(x, absolute_y, z) {
             // Check against whitelist and blacklist
             if let Some(whitelist) = whitelist {
                 if whitelist
@@ -418,6 +549,7 @@ impl<'a> WorldEditor<'a> {
                 {
                     return true; // Block is in whitelist
                 }
+                return false;
             }
             if let Some(blacklist) = blacklist {
                 if blacklist
@@ -427,20 +559,108 @@ impl<'a> WorldEditor<'a> {
                     return true; // Block is in blacklist
                 }
             }
+            return whitelist.is_none() && blacklist.is_none();
         }
 
         false
     }
 
+    /// Checks if a block exists at the given coordinates with absolute Y value.
+    /// Unlike check_for_block_absolute, this doesn't filter by block type.
+    #[allow(unused)]
+    pub fn block_at_absolute(&self, x: i32, absolute_y: i32, z: i32) -> bool {
+        self.world.get_block(x, absolute_y, z).is_some()
+    }
+
+    /// Helper function to create a base chunk with grass blocks at Y -62
+    fn create_base_chunk(abs_chunk_x: i32, abs_chunk_z: i32) -> (Vec<u8>, bool) {
+        let mut chunk = ChunkToModify::default();
+
+        // Fill the bottom layer with grass blocks at Y -62
+        for x in 0..16 {
+            for z in 0..16 {
+                chunk.set_block(x, -62, z, GRASS_BLOCK);
+            }
+        }
+
+        // Prepare chunk data
+        let chunk_data = Chunk {
+            sections: chunk.sections().collect(),
+            x_pos: abs_chunk_x,
+            z_pos: abs_chunk_z,
+            is_light_on: 0,
+            other: chunk.other,
+        };
+
+        // Create the Level wrapper
+        let level_data = HashMap::from([(
+            "Level".to_string(),
+            Value::Compound(HashMap::from([
+                ("xPos".to_string(), Value::Int(abs_chunk_x)),
+                ("zPos".to_string(), Value::Int(abs_chunk_z)),
+                ("isLightOn".to_string(), Value::Byte(0)),
+                (
+                    "sections".to_string(),
+                    Value::List(
+                        chunk_data
+                            .sections
+                            .iter()
+                            .map(|section| {
+                                Value::Compound(HashMap::from([
+                                    ("Y".to_string(), Value::Byte(section.y)),
+                                    (
+                                        "block_states".to_string(),
+                                        Value::Compound(HashMap::from([
+                                            (
+                                                "palette".to_string(),
+                                                Value::List(
+                                                    section
+                                                        .block_states
+                                                        .palette
+                                                        .iter()
+                                                        .map(|item| {
+                                                            Value::Compound(HashMap::from([(
+                                                                "Name".to_string(),
+                                                                Value::String(item.name.clone()),
+                                                            )]))
+                                                        })
+                                                        .collect(),
+                                                ),
+                                            ),
+                                            (
+                                                "data".to_string(),
+                                                Value::LongArray(
+                                                    section
+                                                        .block_states
+                                                        .data
+                                                        .clone()
+                                                        .unwrap_or_else(|| LongArray::new(vec![])),
+                                                ),
+                                            ),
+                                        ])),
+                                    ),
+                                ]))
+                            })
+                            .collect(),
+                    ),
+                ),
+            ])),
+        )]);
+
+        // Serialize the chunk with Level wrapper
+        let mut ser_buffer = Vec::with_capacity(8192);
+        fastnbt::to_writer(&mut ser_buffer, &level_data).unwrap();
+
+        (ser_buffer, true)
+    }
+
     /// Saves all changes made to the world by writing modified chunks to the appropriate region files.
     pub fn save(&mut self) {
         println!("{} Saving world...", "[5/5]".bold());
         emit_gui_progress_update(90.0, "Saving world...");
 
-        let _debug: bool = self.args.debug;
-        let total_regions: u64 = self.world.regions.len() as u64;
-
-        let save_pb: ProgressBar = ProgressBar::new(total_regions);
+        let total_regions = self.world.regions.len() as u64;
+        let save_pb = ProgressBar::new(total_regions);
         save_pb.set_style(
             ProgressStyle::default_bar()
                 .template(
@@ -452,50 +672,225 @@ impl<'a> WorldEditor<'a> {
 
         let total_steps: f64 = 9.0;
         let progress_increment_save: f64 = total_steps / total_regions as f64;
-        let mut current_progress_save: f64 = 90.0;
-        let mut last_emitted_progress: f64 = current_progress_save;
+        let current_progress = AtomicU64::new(900);
+        let regions_processed = AtomicU64::new(0);
 
-        for ((region_x, region_z), region_to_modify) in &self.world.regions {
-            let mut region: Region<File> = self.create_region(*region_x, *region_z);
+        self.world
+            .regions
+            .par_iter()
+            .for_each(|((region_x, region_z), region_to_modify)| {
+                let mut region = self.create_region(*region_x, *region_z);
+                let mut ser_buffer = Vec::with_capacity(8192);
 
-            for chunk_x in 0..32 {
-                for chunk_z in 0..32 {
-                    let data: Vec<u8> = region
-                        .read_chunk(chunk_x as usize, chunk_z as usize)
-                        .unwrap()
-                        .unwrap();
+                for (&(chunk_x, chunk_z), chunk_to_modify) in &region_to_modify.chunks {
+                    if !chunk_to_modify.sections.is_empty() || !chunk_to_modify.other.is_empty() {
+                        // Read existing chunk data if it exists
+                        let existing_data = region
+                            .read_chunk(chunk_x as usize, chunk_z as usize)
+                            .unwrap()
+                            .unwrap_or_default();
 
-                    let mut chunk: Chunk = fastnbt::from_bytes(&data).unwrap();
+                        // Parse existing chunk or create new one
+                        let mut chunk: Chunk = if !existing_data.is_empty() {
+                            fastnbt::from_bytes(&existing_data).unwrap()
+                        } else {
+                            Chunk {
+                                sections: Vec::new(),
+                                x_pos: chunk_x + (region_x * 32),
+                                z_pos: chunk_z + (region_z * 32),
+                                is_light_on: 0,
+                                other: FnvHashMap::default(),
+                            }
+                        };
 
-                    if let Some(chunk_to_modify) = region_to_modify.get_chunk(chunk_x, chunk_z) {
-                        chunk.sections = chunk_to_modify.sections().collect();
-                        chunk.other.extend(chunk_to_modify.other.clone());
+                        // Update sections while preserving existing data
+                        let new_sections: Vec<Section> = chunk_to_modify.sections().collect();
+                        for new_section in new_sections {
+                            if let Some(existing_section) =
+                                chunk.sections.iter_mut().find(|s| s.y == new_section.y)
+                            {
+                                // Merge block states
+                                existing_section.block_states.palette =
+                                    new_section.block_states.palette;
+                                existing_section.block_states.data = new_section.block_states.data;
+                            } else {
+                                // Add new section if it doesn't exist
+                                chunk.sections.push(new_section);
+                            }
+                        }
+
+                        // Preserve existing block entities and merge with new ones
+                        if let Some(existing_entities) = chunk.other.get_mut("block_entities") {
+                            if let Some(new_entities) = chunk_to_modify.other.get("block_entities")
+                            {
+                                if let (Value::List(existing), Value::List(new)) =
+                                    (existing_entities, new_entities)
+                                {
+                                    // Remove old entities that are replaced by new ones
+                                    existing.retain(|e| {
+                                        if let Value::Compound(map) = e {
+                                            let (x, y, z) = get_entity_coords(map);
+                                            !new.iter().any(|new_e| {
+                                                if let Value::Compound(new_map) = new_e {
+                                                    let (nx, ny, nz) = get_entity_coords(new_map);
+                                                    x == nx && y == ny && z == nz
+                                                } else {
+                                                    false
+                                                }
+                                            })
+                                        } else {
+                                            true
+                                        }
+                                    });
+                                    // Add new entities
+                                    existing.extend(new.clone());
+                                }
+                            }
+                        } else {
+                            // If no existing entities, just add the new ones
+                            if let Some(new_entities) = chunk_to_modify.other.get("block_entities")
+                            {
+                                chunk
+                                    .other
+                                    .insert("block_entities".to_string(), new_entities.clone());
+                            }
+                        }
+
+                        // Update chunk coordinates and flags
+                        chunk.x_pos = chunk_x + (region_x * 32);
+                        chunk.z_pos = chunk_z + (region_z * 32);
+
+                        // Create Level wrapper and save
+                        let level_data = create_level_wrapper(&chunk);
+                        ser_buffer.clear();
+                        fastnbt::to_writer(&mut ser_buffer, &level_data).unwrap();
+                        region
+                            .write_chunk(chunk_x as usize, chunk_z as usize, &ser_buffer)
+                            .unwrap();
                     }
-
-                    chunk.x_pos = chunk_x + region_x * 32;
-                    chunk.z_pos = chunk_z + region_z * 32;
-                    chunk.is_light_on = 0; // Force minecraft to recompute
-
-                    let ser: Vec<u8> = fastnbt::to_bytes(&chunk).unwrap();
-
-                    // Write chunk data back to the correct location, ensuring correct chunk coordinates
-                    let expected_chunk_location: (usize, usize) =
-                        ((chunk_x as usize) & 31, (chunk_z as usize) & 31);
-                    region
-                        .write_chunk(expected_chunk_location.0, expected_chunk_location.1, &ser)
-                        .unwrap();
                 }
-            }
 
-            save_pb.inc(1);
+                // Second pass: ensure all chunks exist
+                for chunk_x in 0..32 {
+                    for chunk_z in 0..32 {
+                        let abs_chunk_x = chunk_x + (region_x * 32);
+                        let abs_chunk_z = chunk_z + (region_z * 32);
 
-            current_progress_save += progress_increment_save;
-            if (current_progress_save - last_emitted_progress).abs() > 0.25 {
-                emit_gui_progress_update(current_progress_save, "Saving world...");
-                last_emitted_progress = current_progress_save;
-            }
-        }
+                        // Check if chunk exists in our modifications
+                        let chunk_exists =
+                            region_to_modify.chunks.contains_key(&(chunk_x, chunk_z));
+
+                        // If chunk doesn't exist, create it with base layer
+                        if !chunk_exists {
+                            let (ser_buffer, _) = Self::create_base_chunk(abs_chunk_x, abs_chunk_z);
+                            region
+                                .write_chunk(chunk_x as usize, chunk_z as usize, &ser_buffer)
+                                .unwrap();
+                        }
+                    }
+                }
+
+                // Update progress
+                let regions_done = regions_processed.fetch_add(1, Ordering::SeqCst);
+                let new_progress = (90.0 + (regions_done as f64 * progress_increment_save)) * 10.0;
+                let prev_progress =
+                    current_progress.fetch_max(new_progress as u64, Ordering::SeqCst);
+
+                if new_progress as u64 - prev_progress > 1 {
+                    emit_gui_progress_update(new_progress / 10.0, "Saving world...");
+                }
+
+                save_pb.inc(1);
+            });
 
         save_pb.finish();
     }
 }
+
+// Helper function to get entity coordinates
+#[inline]
+fn get_entity_coords(entity: &HashMap<String, Value>) -> (i32, i32, i32) {
+    let x = if let Value::Int(x) = entity.get("x").unwrap_or(&Value::Int(0)) {
+        *x
+    } else {
+        0
+    };
+    let y = if let Value::Int(y) = entity.get("y").unwrap_or(&Value::Int(0)) {
+        *y
+    } else {
+        0
+    };
+    let z = if let Value::Int(z) = entity.get("z").unwrap_or(&Value::Int(0)) {
+        *z
+    } else {
+        0
+    };
+    (x, y, z)
+}
+
+#[inline]
+fn create_level_wrapper(chunk: &Chunk) -> HashMap<String, Value> {
+    HashMap::from([(
+        "Level".to_string(),
+        Value::Compound(HashMap::from([
+            ("xPos".to_string(), Value::Int(chunk.x_pos)),
+            ("zPos".to_string(), Value::Int(chunk.z_pos)),
+            (
+                "isLightOn".to_string(),
+                Value::Byte(i8::try_from(chunk.is_light_on).unwrap()),
+            ),
+            (
+                "sections".to_string(),
+                Value::List(
+                    chunk
+                        .sections
+                        .iter()
+                        .map(|section| {
+                            Value::Compound(HashMap::from([
+                                ("Y".to_string(), Value::Byte(section.y)),
+                                (
+                                    "block_states".to_string(),
+                                    Value::Compound(HashMap::from([
+                                        (
+                                            "palette".to_string(),
+                                            Value::List(
+                                                section
+                                                    .block_states
+                                                    .palette
+                                                    .iter()
+                                                    .map(|item| {
+                                                        let mut palette_item = HashMap::from([(
+                                                            "Name".to_string(),
+                                                            Value::String(item.name.clone()),
+                                                        )]);
+                                                        if let Some(props) = &item.properties {
+                                                            palette_item.insert(
+                                                                "Properties".to_string(),
+                                                                props.clone(),
+                                                            );
+                                                        }
+                                                        Value::Compound(palette_item)
+                                                    })
+                                                    .collect(),
+                                            ),
+                                        ),
+                                        (
+                                            "data".to_string(),
+                                            Value::LongArray(
+                                                section
+                                                    .block_states
+                                                    .data
+                                                    .clone()
+                                                    .unwrap_or_else(|| LongArray::new(vec![])),
+                                            ),
+                                        ),
+                                    ])),
+                                ),
+                            ]))
+                        })
+                        .collect(),
+                ),
+            ),
+        ])),
+    )])
+}

tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Arnis",
-  "version": "2.1.3",
+  "version": "2.2.0",
   "identifier": "com.louisdev.arnis",
   "build": {
     "frontendDist": "gui-src"