diff --git a/Cargo.lock b/Cargo.lock
index 0b4381092..5ce4612c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -44,7 +44,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
@@ -477,7 +477,7 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom",
  "lazy_static",
  "proc-macro-hack",
  "tiny-keccak",
@@ -630,7 +630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03"
 dependencies = [
  "generic-array",
- "rand_core 0.6.3",
+ "rand_core",
  "subtle",
 ]
 
@@ -774,7 +774,7 @@ dependencies = [
  "num-traits",
  "parking_lot",
  "quill-common",
- "rand 0.8.4",
+ "rand",
  "rand_pcg",
  "serde",
  "serde_json",
@@ -836,7 +836,7 @@ dependencies = [
  "log",
  "parking_lot",
  "quill-common",
- "rand 0.8.4",
+ "rand",
  "rayon",
  "smartstring",
  "uuid",
@@ -960,7 +960,7 @@ dependencies = [
  "once_cell",
  "parking_lot",
  "quill-common",
- "rand 0.8.4",
+ "rand",
  "ring",
  "rsa",
  "rsa-der",
@@ -989,7 +989,7 @@ dependencies = [
  "log",
  "num-traits",
  "once_cell",
- "rand 0.7.3",
+ "rand",
  "rand_xorshift",
  "simdnoise",
  "smallvec",
@@ -1117,17 +1117,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.4"
@@ -1137,7 +1126,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
  "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
@@ -1615,7 +1604,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "729eb334247daa1803e0a094d0a5c55711b85571179f5ec6e53eccfdf7008958"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom",
 ]
 
 [[package]]
@@ -1673,7 +1662,7 @@ dependencies = [
  "num-integer",
  "num-iter",
  "num-traits",
- "rand 0.8.4",
+ "rand",
  "smallvec",
  "zeroize",
 ]
@@ -2038,7 +2027,7 @@ name = "query-entities"
 version = "0.1.0"
 dependencies = [
  "quill",
- "rand 0.8.4",
+ "rand",
 ]
 
 [[package]]
@@ -2047,7 +2036,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
 dependencies = [
- "rand 0.8.4",
+ "rand",
 ]
 
 [[package]]
@@ -2130,19 +2119,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.4"
@@ -2150,19 +2126,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
- "rand_hc 0.3.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
 ]
 
 [[package]]
@@ -2172,16 +2138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -2190,16 +2147,7 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom 0.2.4",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -2208,7 +2156,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core",
 ]
 
 [[package]]
@@ -2217,16 +2165,16 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
 dependencies = [
- "rand_core 0.6.3",
+ "rand_core",
 ]
 
 [[package]]
 name = "rand_xorshift"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.5.1",
+ "rand_core",
 ]
 
 [[package]]
@@ -2376,7 +2324,7 @@ dependencies = [
  "num-traits",
  "pkcs1",
  "pkcs8",
- "rand 0.8.4",
+ "rand",
  "subtle",
  "zeroize",
 ]
@@ -2638,7 +2586,7 @@ name = "simple-plugin"
 version = "0.1.0"
 dependencies = [
  "quill",
- "rand 0.8.4",
+ "rand",
 ]
 
 [[package]]
@@ -3142,7 +3090,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.4",
+ "getrandom",
  "serde",
 ]
 
@@ -3184,12 +3132,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -3483,7 +3425,7 @@ checksum = "0c2b1d981ad312dac6e74a41a35b9bca41a6d1157c3e6a575fb1041e4b516610"
 dependencies = [
  "cfg-if 1.0.0",
  "generational-arena",
- "getrandom 0.2.4",
+ "getrandom",
  "libc",
  "thiserror",
  "tracing",
diff --git a/feather/worldgen/Cargo.toml b/feather/worldgen/Cargo.toml
index ac61648e3..612e75e58 100644
--- a/feather/worldgen/Cargo.toml
+++ b/feather/worldgen/Cargo.toml
@@ -10,8 +10,8 @@ bitvec = "0.21"
 log = "0.4"
 num-traits = "0.2"
 once_cell = "1"
-rand = "0.7"
-rand_xorshift = "0.2"
+rand = "0.8.4"
+rand_xorshift = "0.3.0"
 simdnoise = { git = "https://github.com/jackmott/rust-simd-noise", rev = "3a4f3e6" } # needed for https://github.com/jackmott/rust-simd-noise/pull/31 and https://github.com/jackmott/rust-simd-noise/pull/36
 smallvec = "1"
 strum = "0.21"
diff --git a/feather/worldgen/src/composition.rs b/feather/worldgen/src/composition.rs
index 61bc6e14c..5c2591ca6 100644
--- a/feather/worldgen/src/composition.rs
+++ b/feather/worldgen/src/composition.rs
@@ -90,7 +90,7 @@ fn basic_composition_for_solid_biome(
         }
 
         if !skip {
-            if y <= rng.gen_range(0, 4) {
+            if y <= rng.gen_range(0..4) {
                 block = BlockId::bedrock();
             } else {
                 block = if is_solid {
diff --git a/feather/worldgen/src/finishers/clumped.rs b/feather/worldgen/src/finishers/clumped.rs
index af8880f05..74e426b69 100644
--- a/feather/worldgen/src/finishers/clumped.rs
+++ b/feather/worldgen/src/finishers/clumped.rs
@@ -31,11 +31,11 @@ impl FinishingGenerator for ClumpedFoliageFinisher {
                 let biome = biomes.get_at_block(x, 0, z);
 
                 if let Some(block) = biome_clump_block(biome) {
-                    if rng.gen_range(0, 48) == 0 {
+                    if rng.gen_range(0..48) == 0 {
                         // Generate clump with center at this position.
-                        iter::repeat(()).take(rng.gen_range(3, 6)).for_each(|_| {
-                            let offset_x = rng.gen_range(-2, 3);
-                            let offset_z = rng.gen_range(-2, 3);
+                        iter::repeat(()).take(rng.gen_range(3..6)).for_each(|_| {
+                            let offset_x = rng.gen_range(-2..3);
+                            let offset_z = rng.gen_range(-2..3);
 
                             // Clamp value within chunk border
                             let pos_x = cmp::max(0, cmp::min(x as i32 + offset_x, 15)) as usize;
diff --git a/feather/worldgen/src/finishers/single.rs b/feather/worldgen/src/finishers/single.rs
index 74bcaf005..75846164f 100644
--- a/feather/worldgen/src/finishers/single.rs
+++ b/feather/worldgen/src/finishers/single.rs
@@ -25,7 +25,7 @@ impl FinishingGenerator for SingleFoliageFinisher {
                 if let Some(foliage) = biome_foliage(biome) {
                     if chunk.block_at(x, top_blocks.top_block_at(x, z), z).unwrap()
                         == foliage.required
-                        && rng.gen_range(0, 192) == 0
+                        && rng.gen_range(0..192) == 0
                     {
                         chunk.set_block_at(x, top_blocks.top_block_at(x, z) + 1, z, foliage.block);
                     }
diff --git a/feather/worldgen/src/voronoi.rs b/feather/worldgen/src/voronoi.rs
index 839dcb909..bbeb045f8 100644
--- a/feather/worldgen/src/voronoi.rs
+++ b/feather/worldgen/src/voronoi.rs
@@ -110,7 +110,7 @@ impl VoronoiGrid {
                 let mut rng = XorShiftRng::seed_from_u64(
                     self.seed ^ (((i64::from(cell_x)) << 32) | (i64::from(cell_y))) as u64,
                 );
-                let offset = rng.gen_range(-half_length, half_length);
+                let offset = rng.gen_range(-half_length..half_length);
 
                 let center_x = pos_x + half_length as i32;
                 let center_y = pos_y + half_length as i32;
@@ -136,7 +136,7 @@ pub fn shuffle(closest_x: i32, closest_y: i32, min: usize, max: usize) -> usize
 
     let mut rng = XorShiftRng::seed_from_u64(combined);
 
-    rng.gen_range(min, max)
+    rng.gen_range(min..max)
 }
 
 fn square(x: i32) -> i32 {