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) diff --git a/jGui b/jGui index 83f71ae3..bd41e57a 160000 --- a/jGui +++ b/jGui @@ -1 +1 @@ -Subproject commit 83f71ae3e20f5d8a93f81ce7f30f7547262d3c22 +Subproject commit bd41e57af0aefe7db7068e5f4b9f8eb5310c0878 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 diff --git a/version.txt b/version.txt index ec4704a2..55cc4f6a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.6.14 +2.6.15