Update to 1.16-pre1

src/main/java/com/replaymod/core/versions/MCVer.java

@@ -434,7 +434,12 @@ public class MCVer {
     //#endif
     setServerResourcePack(File file) {
         //#if MC>=11400
-        return getMinecraft().getResourcePackDownloader().loadServerPack(file);
+        return getMinecraft().getResourcePackDownloader().loadServerPack(
+                file
+                //#if MC>=11600
+                //$$ , net.minecraft.class_5352.field_25350
+                //#endif
+        );
         //#else
         //$$ ResourcePackRepository repo = getMinecraft().getResourcePackRepository();
         //#if MC>=10800

src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java

@@ -65,7 +65,7 @@ public class ConnectionEventHandler {
             if (local) {
                 //#if MC>=10800
                 //#if MC>=11600
-                //$$ if (mc.getServer().getWorld(World.field_25179).isDebugWorld()) {
+                //$$ if (mc.getServer().getWorld(World.OVERWORLD).isDebugWorld()) {
                 //#else
                 //#if MC>=11400
                 if (mc.getServer().getWorld(DimensionType.OVERWORLD).getGeneratorType() == LevelGeneratorType.DEBUG_ALL_BLOCK_STATES) {
@@ -91,7 +91,7 @@ public class ConnectionEventHandler {
             String worldName;
             if (local) {
                 //#if MC>=11600
-                //$$ worldName = mc.getServer().method_27728().getLevelName();
+                //$$ worldName = mc.getServer().getSaveProperties().getLevelName();
                 //#else
                 worldName = mc.getServer().getLevelName();
                 //#endif

src/main/java/com/replaymod/recording/mixin/MixinDownloadingPackFinder.java

@@ -30,7 +30,13 @@ public abstract class MixinDownloadingPackFinder implements ResourcePackRecorder
 
     //#if MC>=10800
     @Inject(method = "loadServerPack", at = @At("HEAD"))
-    private void recordDownloadedPack(File file, CallbackInfoReturnable ci) {
+    private void recordDownloadedPack(
+            File file,
+            //#if MC>=11600
+            //$$ net.minecraft.class_5352 arg,
+            //#endif
+            CallbackInfoReturnable ci
+    ) {
         if (requestCallback != null) {
             requestCallback.consume(file);
             requestCallback = null;

src/main/java/com/replaymod/replay/FullReplaySender.java

@@ -31,7 +31,6 @@ import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
 import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
 import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitiesDestroyS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntitySpawnGlobalS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
 import net.minecraft.network.packet.s2c.play.ExperienceBarUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ExperienceOrbSpawnS2CPacket;
@@ -65,6 +64,11 @@ import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
 //$$ import net.minecraftforge.event.TickEvent;
 //#endif
 
+//#if MC>=11600
+//#else
+import net.minecraft.network.packet.s2c.play.EntitySpawnGlobalS2CPacket;
+//#endif
+
 //#if MC>=11400
 import net.minecraft.network.packet.s2c.play.PlayerActionResponseS2CPacket;
 import net.minecraft.network.packet.s2c.play.OpenContainerS2CPacket;
@@ -417,7 +421,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
                         if (p instanceof PlayerSpawnS2CPacket
                                 || p instanceof EntitySpawnS2CPacket
                                 || p instanceof MobSpawnS2CPacket
+                                //#if MC<11600
                                 || p instanceof EntitySpawnGlobalS2CPacket
+                                //#endif
                                 || p instanceof PaintingSpawnS2CPacket
                                 || p instanceof ExperienceOrbSpawnS2CPacket
                                 || p instanceof EntitiesDestroyS2CPacket) {

src/main/java/com/replaymod/replay/QuickReplaySender.java

@@ -196,7 +196,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
         ctx.fireChannelRead(new PlayerRespawnS2CPacket(
                 //#if MC>=11600
                 //$$ DimensionType.OVERWORLD_REGISTRY_KEY,
-                //$$ World.field_25179,
+                //$$ World.OVERWORLD,
                 //$$ 0,
                 //$$ GameMode.SPECTATOR,
                 //$$ false,

versions/common.gradle

@@ -224,22 +224,22 @@ dependencies {
         minecraft 'com.mojang:minecraft:' + [
                 11404: '1.14.4',
                 11502: '1.15.2',
-                11600: '20w22a',
+                11600: '1.16-pre1',
         ][mcVersion]
         mappings 'net.fabricmc:yarn:' + [
                 11404: '1.14.4+build.16',
                 11502: '1.15.2+build.14',
-                11600: '20w22a+build.11:v2',
+                11600: '1.16-pre1+build.1:v2',
         ][mcVersion]
         modCompile 'net.fabricmc:fabric-loader:' + [
                 11404: '0.7.8+build.189',
                 11502: '0.7.8+build.189',
-                11600: '0.8.6+build.200',
+                11600: '0.8.7+build.201',
         ][mcVersion]
         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.2+build.351-1.16',
+                11600: '0.11.4+build.353-1.16',
         ][mcVersion]
     }
 
@@ -278,7 +278,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:e6b1b22", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:d46a0c2", shadeExclusions
 
     compileOnly(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those