diff --git a/jGui b/jGui
index cb8c5827..3a741e82 160000
--- a/jGui
+++ b/jGui
@@ -1 +1 @@
-Subproject commit cb8c5827c96f705f18f341e94a1f17cabbb630bb
+Subproject commit 3a741e8250c67d0e92ff287885f7508e39965768
diff --git a/src/main/java/com/replaymod/core/versions/MCVer.java b/src/main/java/com/replaymod/core/versions/MCVer.java
index b1d20228..de5ae5c5 100644
--- a/src/main/java/com/replaymod/core/versions/MCVer.java
+++ b/src/main/java/com/replaymod/core/versions/MCVer.java
@@ -23,6 +23,10 @@ import net.minecraft.world.chunk.WorldChunk;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+//#if MC>=11600
+//$$ import net.minecraft.resource.ResourcePackSource;
+//#endif
+
 //#if MC>=11500
 import net.minecraft.client.model.ModelPart.Cuboid;
 import java.util.ArrayList;
@@ -437,7 +441,7 @@ public class MCVer {
         return getMinecraft().getResourcePackDownloader().loadServerPack(
                 file
                 //#if MC>=11600
-                //$$ , net.minecraft.class_5352.field_25350
+                //$$ , ResourcePackSource.PACK_SOURCE_SERVER
                 //#endif
         );
         //#else
diff --git a/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java b/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java
index 4a8bd6c0..2d35c050 100644
--- a/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java
+++ b/src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java
@@ -9,6 +9,10 @@ import org.spongepowered.asm.mixin.injection.At;
 
 import java.io.File;
 
+//#if MC>=11600
+//$$ import net.minecraft.resource.ResourcePackSource;
+//#endif
+
 //#if MC>=10800
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -33,7 +37,7 @@ public abstract class MixinDownloadingPackFinder implements ResourcePackRecorder
     private void recordDownloadedPack(
             File file,
             //#if MC>=11600
-            //$$ net.minecraft.class_5352 arg,
+            //$$ ResourcePackSource arg,
             //#endif
             CallbackInfoReturnable ci
     ) {
diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java
index ffddb52b..7802948f 100644
--- a/src/main/java/com/replaymod/replay/FullReplaySender.java
+++ b/src/main/java/com/replaymod/replay/FullReplaySender.java
@@ -599,7 +599,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
                     false,
                     //#if MC>=11600
                     //$$ packet.method_29443(),
-                    //$$ (net.minecraft.world.dimension.DimensionTracker.Modifiable) packet.getDimension(),
+                    //$$ (net.minecraft.util.registry.RegistryTracker.Modifiable) packet.getDimension(),
                     //$$ packet.method_29444(),
                     //$$ packet.getDimensionId(),
                     //#else
@@ -752,8 +752,6 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
 
         if(p instanceof GameStateChangeS2CPacket) {
             GameStateChangeS2CPacket pg = (GameStateChangeS2CPacket)p;
-            int reason = pg.getReason();
-
             // only allow the following packets:
             // 1 - End raining
             // 2 - Begin raining
@@ -761,7 +759,19 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
             // The following values are to control sky color (e.g. if thunderstorm)
             // 7 - Fade value
             // 8 - Fade time
-            if(!(reason == 1 || reason == 2 || reason == 7 || reason == 8)) {
+            if (!Arrays.asList(
+                    //#if MC>=11600
+                    //$$ GameStateChangeS2CPacket.field_25646,
+                    //$$ GameStateChangeS2CPacket.field_25647,
+                    //$$ GameStateChangeS2CPacket.field_25652,
+                    //$$ GameStateChangeS2CPacket.field_25653
+                    //#else
+                    1,
+                    2,
+                    7,
+                    8
+                    //#endif
+            ).contains(pg.getReason())) {
                 return null;
             }
         }
diff --git a/versions/common.gradle b/versions/common.gradle
index 2726d6ef..98c98306 100644
--- a/versions/common.gradle
+++ b/versions/common.gradle
@@ -224,12 +224,12 @@ dependencies {
         minecraft 'com.mojang:minecraft:' + [
                 11404: '1.14.4',
                 11502: '1.15.2',
-                11600: '1.16-pre1',
+                11600: '1.16-pre5',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
                 11502: '1.15.2+build.14',
-                11600: '1.16-pre1+build.1:v2',
+                11600: '1.16-pre5+build.2:v2',
         ][mcVersion]
         modCompile 'net.fabricmc:fabric-loader:' + [
                 11404: '0.7.8+build.189',
@@ -239,7 +239,7 @@ dependencies {
         modCompile 'net.fabricmc.fabric-api:fabric-api:' + [
                 11404: '0.4.3+build.247-1.14',
                 11502: '0.5.1+build.294-1.15',
-                11600: '0.11.4+build.353-1.16',
+                11600: '0.12.1+build.361-1.16',
         ][mcVersion]
     }
 
@@ -278,7 +278,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:d46a0c2", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:1f47a42", shadeExclusions
 
     compileOnly(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those