From f8379fa31786fa772c8213d5ea690834f07493df Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 10 Mar 2024 16:29:31 +0100 Subject: [PATCH 1/3] Fix thread-unsafe server resource pack playback --- src/main/java/com/replaymod/replay/FullReplaySender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java index 39ea79ec..9d6ef35c 100644 --- a/src/main/java/com/replaymod/replay/FullReplaySender.java +++ b/src/main/java/com/replaymod/replay/FullReplaySender.java @@ -676,7 +676,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend IOUtils.copy(replayFile.getResourcePack(hash).get(), new FileOutputStream(file)); } //#if MC>=12003 - //$$ mc.getServerResourcePackProvider().addResourcePack(packet.id(), file.toPath()); + //$$ schedulePacketHandler(() -> mc.getServerResourcePackProvider().addResourcePack(packet.id(), file.toPath())); //#else setServerResourcePack(file); //#endif From ba6078e08046705a05e136b3c377e57440ba87e3 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 10 Mar 2024 16:30:25 +0100 Subject: [PATCH 2/3] Update jGui, fixes JPG loading on 1.20.4+ --- jGui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jGui b/jGui index 83f71ae3..bd41e57a 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 83f71ae3e20f5d8a93f81ce7f30f7547262d3c22 +Subproject commit bd41e57af0aefe7db7068e5f4b9f8eb5310c0878 From c11fffedc136fb312792eb6b6eaa9e85e5ae0ecf Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sun, 10 Mar 2024 17:19:41 +0100 Subject: [PATCH 3/3] Update ReplayStudio 95a7c07 Process PlayerPositionRotation packet in SquashFilter 603bdce Create dedicated class for PacketPlayerPositionRotation 88343aa Fix incorrect order of ViaVersion-emitted packets 9ebaa97 Fix 1.20 to 1.20.2 ViaVersion conversion c490e9f Update ViaVersion bcccb2c Fix Reconfigure packets not being filtered out a0df6c9 Fix ConfigFinish being emitted before other config packets a672023 Separate pre-join-game packets from login-phase packets a70161c Emit Reconfigure packet when required 074d78d Separate "emit first" list from "login phase" list 20a3bf9 Reorder loginPhase and configurationPhase code --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cd3f4f57..12d0c9db 100644 --- a/build.gradle +++ b/build.gradle @@ -385,7 +385,7 @@ dependencies { shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' - shadow "com.github.ReplayMod:ReplayStudio:6cd39b0", shadeExclusions + shadow "com.github.ReplayMod:ReplayStudio:d9f7c11", shadeExclusions // FIXME this should be pulled in by ReplayStudio, and IntelliJ sees it, but javac for some reason does not implementation 'com.github.viaversion:opennbt:0a02214' // 2.0-SNAPSHOT (ViaVersion Edition)