Update ReplayStudio

- MC 1.17
- Updated ViaVersion
- Quick Mode supports multiple worlds now (and no longer needs a manual Respawn)

build.gradle

@@ -330,7 +330,7 @@ dependencies {
 
     shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
 
-    shadow "com.github.ReplayMod:ReplayStudio:0664fb7", shadeExclusions
+    shadow "com.github.ReplayMod:ReplayStudio:d82ef5b", shadeExclusions
 
     implementation(jGui){
         transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those

src/main/java/com/replaymod/core/ReplayMod.java

@@ -13,10 +13,10 @@ import com.replaymod.extras.ReplayModExtras;
 import com.replaymod.recording.ReplayModRecording;
 import com.replaymod.render.ReplayModRender;
 import com.replaymod.replay.ReplayModReplay;
+import com.replaymod.replaystudio.lib.viaversion.api.protocol.version.ProtocolVersion;
 import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.replay.ZipReplayFile;
 import com.replaymod.replaystudio.studio.ReplayStudio;
-import com.replaymod.replaystudio.us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import com.replaymod.replaystudio.util.I18n;
 import com.replaymod.simplepathing.ReplayModSimplePathing;
 import de.johni0702.minecraft.gui.container.GuiScreen;

src/main/java/com/replaymod/core/utils/Utils.java

@@ -7,7 +7,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.replaymod.core.ReplayMod;
-import com.replaymod.replaystudio.us.myles.ViaVersion.api.protocol.ProtocolVersion;
+import com.replaymod.replaystudio.lib.viaversion.api.protocol.version.ProtocolVersion;
 import de.johni0702.minecraft.gui.GuiRenderer;
 import de.johni0702.minecraft.gui.RenderInfo;
 import de.johni0702.minecraft.gui.container.AbstractGuiScrollable;
@@ -337,7 +337,7 @@ public class Utils {
 
             ProtocolVersion latestVersion = ProtocolVersion.getProtocols()
                     .stream()
-                    .max(Comparator.comparing(ProtocolVersion::getId))
+                    .max(Comparator.comparing(ProtocolVersion::getVersion))
                     .orElseThrow(RuntimeException::new);
             getInfo().addElements(new VerticalLayout.Data(0.5),
                     new GuiLabel()

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

@@ -2,9 +2,9 @@ package com.replaymod.core.versions;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.replaymod.core.mixin.GuiScreenAccessor;
+import com.replaymod.replaystudio.lib.viaversion.api.protocol.packet.State;
+import com.replaymod.replaystudio.lib.viaversion.api.protocol.version.ProtocolVersion;
 import com.replaymod.replaystudio.protocol.PacketTypeRegistry;
-import com.replaymod.replaystudio.us.myles.ViaVersion.api.protocol.ProtocolVersion;
-import com.replaymod.replaystudio.us.myles.ViaVersion.packets.State;
 import de.johni0702.minecraft.gui.MinecraftGuiRenderer;
 import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector2f;
 import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector3f;

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

@@ -17,8 +17,6 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
-import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.NetworkSide;
 import net.minecraft.network.Packet;
@@ -26,35 +24,12 @@ import net.minecraft.network.PacketByteBuf;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.function.Consumer;
 
-//#if MC>=11602
-import net.minecraft.util.registry.DynamicRegistryManager;
-import net.minecraft.util.registry.Registry;
-//#endif
-
-//#if MC>=11600
-import net.minecraft.world.World;
-//#else
-//$$ import net.minecraft.world.level.LevelGeneratorType;
-//#endif
-//#if MC>=11400
-import net.minecraft.world.dimension.DimensionType;
-//#else
-//$$ import net.minecraft.world.EnumDifficulty;
-//#endif
-
 //#if MC>=11200
 import com.replaymod.core.utils.WrappedTimer;
 //#endif
 
-//#if MC>=11002
-import net.minecraft.world.GameMode;
-//#else
-//$$ import net.minecraft.world.WorldSettings.GameType;
-//#endif
-
 import static com.replaymod.core.versions.MCVer.getMinecraft;
 import static com.replaymod.core.versions.MCVer.getPacketTypeRegistry;
 import static com.replaymod.replay.ReplayModReplay.LOGGER;
@@ -193,42 +168,6 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
 
     public void restart() {
         replay.reset();
-        ctx.fireChannelRead(new PlayerRespawnS2CPacket(
-                //#if MC>=11600
-                //#if MC>=11602
-                DimensionType.addRegistryDefaults(new DynamicRegistryManager.Impl()).get(Registry.DIMENSION_TYPE_KEY).get(DimensionType.OVERWORLD_REGISTRY_KEY),
-                //#else
-                //$$ DimensionType.OVERWORLD_REGISTRY_KEY,
-                //#endif
-                World.OVERWORLD,
-                0,
-                GameMode.SPECTATOR,
-                GameMode.SPECTATOR,
-                false,
-                false,
-                false
-                //#else
-                //#if MC>=11400
-                //$$ DimensionType.OVERWORLD,
-                //#else
-                //$$ 0,
-                //#endif
-                //#if MC>=11500
-                //$$ 0,
-                //#endif
-                //#if MC<11400
-                //$$ EnumDifficulty.NORMAL,
-                //#endif
-                //$$ LevelGeneratorType.DEFAULT,
-                //$$ GameMode.SPECTATOR
-                //#endif
-        ));
-        ctx.fireChannelRead(new PlayerPositionLookS2CPacket(
-                0, 0, 0, 0, 0, Collections.emptySet(), 0
-                //#if MC>=11700
-                //$$ , true
-                //#endif
-        ));
     }
 
     @Override