diff --git a/README.md b/README.md
index 038a236b..2228b387 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin.
 
 | Minecraft | Forge | Status | Build |
 | :----: | :----: | :---: | :---: |
-| 1.16.x | 35.1.28 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
+| 1.16.x | 35.1.29 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) |
 | 1.15.x | 31.2.47 | ACTIVE | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) |
 | 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) |
 
diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle
index 1b310b58..c9392011 100644
--- a/arclight-common/build.gradle
+++ b/arclight-common/build.gradle
@@ -21,7 +21,7 @@ apply plugin: 'io.izzel.arclight'
 
 ext {
     minecraftVersion = '1.16.4'
-    forgeVersion = '35.1.28'
+    forgeVersion = '35.1.29'
 }
 
 arclight {
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java
index dc92c9b6..56529532 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/bridge/world/border/WorldBorderBridge.java
@@ -1,10 +1,10 @@
 package io.izzel.arclight.common.bridge.world.border;
 
-import net.minecraft.world.server.ServerWorld;
+import net.minecraft.world.World;
 
 public interface WorldBorderBridge {
 
-    ServerWorld bridge$getWorld();
+    World bridge$getWorld();
 
-    void bridge$setWorld(ServerWorld world);
+    void bridge$setWorld(World world);
 }
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java
index dae69a9e..437a09bd 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/WorldMixin.java
@@ -88,7 +88,7 @@ public abstract class WorldMixin implements WorldBridge {
     @Inject(method = "<init>(Lnet/minecraft/world/storage/ISpawnWorldInfo;Lnet/minecraft/util/RegistryKey;Lnet/minecraft/world/DimensionType;Ljava/util/function/Supplier;ZZJ)V", at = @At("RETURN"))
     private void arclight$init(ISpawnWorldInfo info, RegistryKey<World> dimension, DimensionType dimType, Supplier<IProfiler> profiler, boolean isRemote, boolean isDebug, long seed, CallbackInfo ci) {
         this.spigotConfig = new SpigotWorldConfig(((IServerWorldInfo) info).getWorldName());
-        ((WorldBorderBridge) this.worldBorder).bridge$setWorld((ServerWorld) (Object) this);
+        ((WorldBorderBridge) this.worldBorder).bridge$setWorld((World) (Object) this);
         this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns();
         this.ticksPerMonsterSpawns = this.getServer().getTicksPerMonsterSpawns();
         this.ticksPerWaterSpawns = this.getServer().getTicksPerWaterSpawns();
diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/border/WorldBorderMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/border/WorldBorderMixin.java
index cbb03c70..6e0bfa71 100644
--- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/border/WorldBorderMixin.java
+++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/border/WorldBorderMixin.java
@@ -2,21 +2,21 @@ package io.izzel.arclight.common.mixin.core.world.border;
 
 import io.izzel.arclight.common.bridge.world.border.WorldBorderBridge;
 import net.minecraft.world.border.WorldBorder;
-import net.minecraft.world.server.ServerWorld;
+import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(WorldBorder.class)
 public class WorldBorderMixin implements WorldBorderBridge {
 
-    public ServerWorld world;
+    public World world;
 
     @Override
-    public ServerWorld bridge$getWorld() {
+    public World bridge$getWorld() {
         return this.world;
     }
 
     @Override
-    public void bridge$setWorld(ServerWorld world) {
+    public void bridge$setWorld(World world) {
         this.world = world;
     }
 }
diff --git a/arclight-forge-1.16/build.gradle b/arclight-forge-1.16/build.gradle
index 48ccd1f8..a23ce739 100644
--- a/arclight-forge-1.16/build.gradle
+++ b/arclight-forge-1.16/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'maven-publish'
 
 ext {
     minecraftVersion = '1.16.4'
-    forgeVersion = '35.1.28'
+    forgeVersion = '35.1.29'
 }
 
 arclight {