diff --git a/gradle.properties b/gradle.properties
index db297ebf..ab93cec5 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.18-pre5
-	yarn_mappings=1.18-pre5+build.4
+	minecraft_version=1.18-pre6
+	yarn_mappings=1.18-pre6+build.1
 	loader_version=0.12.5
-	fabric_version=0.42.8+1.18
+	fabric_version=0.42.9+1.18
 
 # Mod Properties
 	mod_version = 1.4.54
diff --git a/src/main/java/carpet/mixins/SoundEngineInt_cleanLogsMixin.java b/src/main/java/carpet/mixins/SoundEngineInt_cleanLogsMixin.java
index c6316280..8f7bbe81 100644
--- a/src/main/java/carpet/mixins/SoundEngineInt_cleanLogsMixin.java
+++ b/src/main/java/carpet/mixins/SoundEngineInt_cleanLogsMixin.java
@@ -10,12 +10,12 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 public class SoundEngineInt_cleanLogsMixin
 {
     // createSource //  method_19666, remap = false,
-    @Redirect(method = "createSource()Lnet/minecraft/client/sound/Source;", require = 0, at = @At(remap = false,
+    /*@Redirect(method = "createSource()Lnet/minecraft/client/sound/Source;", require = 0, at = @At(remap = false,
             value="INVOKE",
             target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V"
     ))
     private void doWarnOrNotWarn(Logger logger, String message, Object p0)
     {
         if (!CarpetSettings.cleanLogs) logger.warn(message, p0);
-    }
+    }*/
 }
diff --git a/src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java b/src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java
index 19a7287f..00b32ffe 100644
--- a/src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java
+++ b/src/main/java/carpet/mixins/SoundSystem_cleanLogsMixin.java
@@ -10,12 +10,12 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 @Mixin(value = SoundSystem.class, priority = 69420)
 public class SoundSystem_cleanLogsMixin
 {
-    @Redirect(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", require = 0, at = @At( remap = false,
+    /*@Redirect(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", require = 0, at = @At( remap = false,
             value = "INVOKE",
             target = "Lorg/apache/logging/log4j/Logger;warn(Ljava/lang/String;)V"
     ))
     private void toWarnOrNotToWarn(Logger logger, String message)
     {
         if (!CarpetSettings.cleanLogs) logger.warn(message);
-    }
+    }*/
 }
diff --git a/src/main/java/carpet/mixins/StructureFeatureMixin.java b/src/main/java/carpet/mixins/StructureFeatureMixin.java
index 3a559f16..6abf3b2b 100644
--- a/src/main/java/carpet/mixins/StructureFeatureMixin.java
+++ b/src/main/java/carpet/mixins/StructureFeatureMixin.java
@@ -3,8 +3,9 @@ package carpet.mixins;
 import carpet.CarpetSettings;
 import carpet.fakes.StructureFeatureInterface;
 import com.google.common.collect.ImmutableMultimap;
-import net.minecraft.class_6834;
+//import net.minecraft.class_6834;
 import net.minecraft.server.world.ServerWorld;
+import net.minecraft.structure.StructureGeneratorFactory;
 import net.minecraft.structure.StructurePiecesCollector;
 import net.minecraft.structure.StructurePiecesGenerator;
 import net.minecraft.structure.StructureStart;
@@ -54,7 +55,9 @@ public abstract class StructureFeatureMixin<C extends FeatureConfig> implements
 
     //@Shadow @Final private StructurePiecesGenerator<C> piecesGenerator;
 
-    @Shadow @Final private class_6834<C> piecesGenerator;
+    //@Shadow @Final private class_6834<C> piecesGenerator;
+
+    @Shadow @Final private StructureGeneratorFactory<C> piecesGenerator;
 
     @Override
     public boolean plopAnywhere(ServerWorld world, BlockPos pos, ChunkGenerator generator, boolean wireOnly, Biome biome, C config)
@@ -142,7 +145,7 @@ public abstract class StructureFeatureMixin<C extends FeatureConfig> implements
 
         //if (config == null)
         //    config = (C) new DefaultFeatureConfig();
-        Optional<StructurePiecesGenerator<C>> optional = piecesGenerator.createGenerator(new class_6834.class_6835<C>(generator, generator.getBiomeSource(), worldIn.getSeed(), chunkpos, config, worldIn, b -> true, worldIn.getStructureManager(), worldIn.getRegistryManager()));
+        Optional<StructurePiecesGenerator<C>> optional = piecesGenerator.createGenerator(new StructureGeneratorFactory.Context<>(generator, generator.getBiomeSource(), worldIn.getSeed(), chunkpos, config, worldIn, b -> true, worldIn.getStructureManager(), worldIn.getRegistryManager()));
         if (optional.isEmpty()) return (StructureStart<C>) StructureStart.DEFAULT;
         StructurePiecesCollector lv = new StructurePiecesCollector();
         optional.get().generatePieces(lv, new StructurePiecesGenerator.Context<C>(config, generator, worldIn.getStructureManager(), chunkpos, worldIn, Util.make(new ChunkRandom(new AtomicSimpleRandom(RandomSeed.getSeed())), (chunkRandomx) -> {