diff --git a/gradle.properties b/gradle.properties
index 8e232746..59a17f6e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
 	minecraft_version=20w11a
-	yarn_mappings=20w11a+build.1
+	yarn_mappings=20w11a+build.6
 	loader_version=0.7.8+build.187
 
 # Mod Properties
diff --git a/src/main/java/carpet/mixins/IntegratedServerMixin.java b/src/main/java/carpet/mixins/IntegratedServerMixin.java
index 761663a6..bbec23ac 100644
--- a/src/main/java/carpet/mixins/IntegratedServerMixin.java
+++ b/src/main/java/carpet/mixins/IntegratedServerMixin.java
@@ -1,10 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetServer;
-import com.google.gson.JsonElement;
-import net.minecraft.class_4952;
 import net.minecraft.server.integrated.IntegratedServer;
-import net.minecraft.world.level.LevelGeneratorType;
+import net.minecraft.world.level.LevelGeneratorOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class IntegratedServerMixin
 {
     @Inject(method = "loadWorld", at = @At("HEAD"))
-    private void onSetupServerIntegrated(String name, String serverName, long seed, class_4952 arg, CallbackInfo ci) {
+    private void onSetupServerIntegrated(String name, String serverName, long seed, LevelGeneratorOptions arg, CallbackInfo ci) {
         CarpetServer.onServerLoaded((IntegratedServer) (Object) this);
     }
 }
diff --git a/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java b/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
index 3944610a..6b51315b 100644
--- a/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftDedicatedServerMixin.java
@@ -14,7 +14,7 @@ public class MinecraftDedicatedServerMixin
     // this.tickWorlds(booleanSupplier_1);
     @Inject(method = "setupServer", at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/class_4952;)V",
+            target = "Lnet/minecraft/server/dedicated/MinecraftDedicatedServer;loadWorld(Ljava/lang/String;Ljava/lang/String;JLnet/minecraft/world/level/LevelGeneratorOptions;)V",
             shift = At.Shift.BEFORE
     ))
     private void onSetupServer(CallbackInfoReturnable<Boolean> cir) {
diff --git a/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java b/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
index e02d9b77..a9232a33 100644
--- a/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
+++ b/src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
@@ -1,10 +1,8 @@
 package carpet.mixins;
 
 import carpet.CarpetServer;
-import com.google.gson.JsonElement;
-import net.minecraft.class_4952;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.LevelGeneratorType;
+import net.minecraft.world.level.LevelGeneratorOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -32,7 +30,7 @@ public abstract class MinecraftServer_coreMixin
 
     // Dedicated server only
     @Inject(method = "loadWorld", at = @At("HEAD"))
-    private void serverLoaded(String name, String serverName, long seed, class_4952 arg, CallbackInfo ci)
+    private void serverLoaded(String name, String serverName, long seed, LevelGeneratorOptions arg, CallbackInfo ci)
     {
         CarpetServer.onServerLoaded((MinecraftServer) (Object) this);
     }