diff --git a/build.gradle b/build.gradle
index 74ed523b..4a01d279 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,10 @@ minecraft {
 	accessWidener "src/main/resources/carpet.accesswidener"
 }
 
+loom {
+	customManifest = "https://gist.githubusercontent.com/modmuss50/6e00baf80dcbaa42f3a2fc846b290128/raw/f035ef8f75164f56ec6352809a34841d326bae1c/1_18_experimental-snapshot-1.json"
+}
+
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
diff --git a/gradle.properties b/gradle.properties
index d4c5e67d..20242ed6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=1.17.1
-	yarn_mappings=1.17.1+build.1
+	minecraft_version=1.18_experimental-snapshot-1
+	yarn_mappings=1.18_experimental-snapshot-1+build.2
 	loader_version=0.11.6
-	fabric_version=0.36.1+1.17
+	fabric_version=0.37.2+1.18_experimental
 
 # Mod Properties
 	mod_version = 1.4.44
diff --git a/src/main/java/carpet/script/utils/WorldTools.java b/src/main/java/carpet/script/utils/WorldTools.java
index e90f3d44..76743ba6 100644
--- a/src/main/java/carpet/script/utils/WorldTools.java
+++ b/src/main/java/carpet/script/utils/WorldTools.java
@@ -18,7 +18,7 @@ import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.util.registry.SimpleRegistry;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.source.BiomeAccess;
-import net.minecraft.world.biome.source.VanillaLayeredBiomeSource;
+import net.minecraft.world.biome.source.MultiNoiseBiomeSource;
 import net.minecraft.world.border.WorldBorderListener;
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.chunk.WorldChunk;
@@ -110,11 +110,10 @@ public class WorldTools
 
         //chunkGenerator2 = GeneratorOptions.createOverworldGenerator(server.getRegistryManager().get(Registry.BIOME_KEY), server.getRegistryManager().get(Registry.NOISE_SETTINGS_WORLDGEN), (seed==null)?l:seed);
 
-        chunkGenerator2 = new NoiseChunkGenerator(
-                new VanillaLayeredBiomeSource((seed==null)?l:seed, false, false, server.getRegistryManager().get(Registry.BIOME_KEY)),
-                (seed==null)?l:seed,
-                () -> server.getRegistryManager().get(Registry.CHUNK_GENERATOR_SETTINGS_KEY).getOrThrow(ChunkGeneratorSettings.OVERWORLD)
-        );
+        // from world/gen/GeneratorOptions
+        chunkGenerator2 = new NoiseChunkGenerator(MultiNoiseBiomeSource.method_35242(server.getRegistryManager().get(Registry.BIOME_KEY), seed), seed, () -> {
+            return server.getRegistryManager().get(Registry.CHUNK_GENERATOR_SETTINGS_KEY).getOrThrow(ChunkGeneratorSettings.OVERWORLD);
+        });
 
         ServerWorld serverWorld = new ServerWorld(
                 server,