DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix recording in minimal mode

Browse Source
This commit is contained in:
Jonas Herzig
2020-06-04 11:44:54 +02:00
parent 20b410f963
commit 6210cb09aa
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/replaymod/recording/packet/PacketListener.java
View File

@@ -1,5 +1,7 @@
package com.replaymod.recording.packet; package com.replaymod.recording.packet;
import com.github.steveice10.netty.buffer.PooledByteBufAllocator;
import com.github.steveice10.packetlib.tcp.io.ByteBufNetOutput;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.replaymod.core.ReplayMod; import com.replaymod.core.ReplayMod;
@@ -74,6 +76,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static com.replaymod.core.versions.MCVer.*; import static com.replaymod.core.versions.MCVer.*;
import static com.replaymod.replaystudio.util.Utils.writeInt;
public class PacketListener extends ChannelInboundHandlerAdapter { public class PacketListener extends ChannelInboundHandlerAdapter {
@@ -194,7 +197,26 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
PacketData packetData = getPacketData(timestamp, packet); PacketData packetData = getPacketData(timestamp, packet);
saveService.submit(() -> { saveService.submit(() -> {
try { try {
packetOutputStream.write(packetData); if (ReplayMod.isMinimalMode()) {
// Minimal mode, ReplayStudio might not know our packet ids, so we cannot use it
com.github.steveice10.netty.buffer.ByteBuf packetIdBuf = PooledByteBufAllocator.DEFAULT.buffer();
com.github.steveice10.netty.buffer.ByteBuf packetBuf = packetData.getPacket().getBuf();
try {
new ByteBufNetOutput(packetIdBuf).writeVarInt(packetData.getPacket().getId());
int packetIdLen = packetIdBuf.readableBytes();
int packetBufLen = packetBuf.readableBytes();
writeInt(packetOutputStream, (int) packetData.getTime());
writeInt(packetOutputStream, packetIdLen + packetBufLen);
packetIdBuf.readBytes(packetOutputStream, packetIdLen);
packetBuf.getBytes(packetBuf.readerIndex(), packetOutputStream, packetBufLen);
} finally {
packetIdBuf.release();
packetBuf.release();
}
} else {
packetOutputStream.write(packetData);
}
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }