diff --git a/fabric-structure-api-v1/src/testmod/java/net/fabricmc/fabric/test/structure/StructureTest.java b/fabric-structure-api-v1/src/testmod/java/net/fabricmc/fabric/test/structure/StructureTest.java
index 4ba5edab9..a7437482f 100644
--- a/fabric-structure-api-v1/src/testmod/java/net/fabricmc/fabric/test/structure/StructureTest.java
+++ b/fabric-structure-api-v1/src/testmod/java/net/fabricmc/fabric/test/structure/StructureTest.java
@@ -24,9 +24,9 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import net.minecraft.block.Blocks;
-import net.minecraft.class_6834;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.structure.ShiftableStructurePiece;
+import net.minecraft.structure.StructureGeneratorFactory;
 import net.minecraft.structure.StructurePieceType;
 import net.minecraft.structure.StructurePiecesGenerator;
 import net.minecraft.util.Identifier;
@@ -68,13 +68,13 @@ public class StructureTest {
 			super(codec, TestStructureFeature::createGenerator);
 		}
 
-		private static Optional<StructurePiecesGenerator<DefaultFeatureConfig>> createGenerator(class_6834.class_6835 arg) {
-			return Optional.of((structurePiecesCollector, context) -> {
-				int blockX = context.chunkPos().getStartX();
-				int blockZ = context.chunkPos().getStartZ();
-				int blockY = context.chunkGenerator().getHeight(blockX, blockZ, Heightmap.Type.WORLD_SURFACE_WG, context.world());
+		private static Optional<StructurePiecesGenerator<DefaultFeatureConfig>> createGenerator(StructureGeneratorFactory.Context<DefaultFeatureConfig> context) {
+			return Optional.of((structurePiecesCollector, ctx) -> {
+				int blockX = ctx.chunkPos().getStartX();
+				int blockZ = ctx.chunkPos().getStartZ();
+				int blockY = ctx.chunkGenerator().getHeight(blockX, blockZ, Heightmap.Type.WORLD_SURFACE_WG, ctx.world());
 
-				TestStructureGenerator generator = new TestStructureGenerator(context.random(), blockX, blockY, blockZ);
+				TestStructureGenerator generator = new TestStructureGenerator(ctx.random(), blockX, blockY, blockZ);
 				structurePiecesCollector.addPiece(generator);
 			});
 		}
diff --git a/gradle.properties b/gradle.properties
index 6ac196211..fa7b525c2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.jvmargs=-Xmx2560M
 
-version=0.42.8
-minecraft_version=1.18-pre5
-yarn_version=+build.2
+version=0.42.9
+minecraft_version=1.18-pre6
+yarn_version=+build.1
 loader_version=0.12.5
 
 prerelease=true
@@ -48,7 +48,7 @@ fabric-rendering-v1-version=1.10.3
 fabric-resource-loader-v0-version=0.4.11
 fabric-screen-api-v1-version=1.0.7
 fabric-screen-handler-api-v1-version=1.1.11
-fabric-structure-api-v1-version=2.0.7
+fabric-structure-api-v1-version=2.0.8
 fabric-tag-extensions-v0-version=1.2.5
 fabric-textures-v0-version=1.0.9
 fabric-tool-attribute-api-v1-version=1.3.3