🐛 Fix incorrect block rendering

unhappychoice · Jun 28, 2021 · eb3fe8e · eb3fe8e
1 parent 8704fb4
commit eb3fe8e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/src/main/java/com/replaymod/recording/packet/PacketRecorder.java b/src/main/java/com/replaymod/recording/packet/PacketRecorder.java
@@ -14,6 +14,7 @@
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.network.PacketDirection;
 import net.minecraft.network.ProtocolType;
+import net.minecraft.network.login.server.SCustomPayloadLoginPacket;
 import net.minecraft.network.play.server.SCustomPayloadPlayPacket;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -106,17 +107,22 @@ private PacketData getPacketData(int timestamp, IPacket packet) throws Exception
             }
         }
 
-        ByteBuf byteBuf = Unpooled.buffer();
+        ByteBuf byteBuf = Unpooled.buffer(256, 1048576);
+        PacketBuffer buf = new PacketBuffer(byteBuf);
 
         try {
-            packet.writePacketData(new PacketBuffer(byteBuf));
+            if (packet instanceof SCustomPayloadLoginPacket) {
+                ((SCustomPayloadLoginPacket) packet).getInternalData().resetReaderIndex();
+            }
+
+            packet.writePacketData(buf);
             return new PacketData(timestamp, new com.replaymod.replaystudio.protocol.Packet(
                     MCVer.getPacketTypeRegistry(loginPhase),
                     packetId,
                     com.github.steveice10.netty.buffer.Unpooled.wrappedBuffer(
-                            byteBuf.array(),
-                            byteBuf.arrayOffset(),
-                            byteBuf.readableBytes()
+                            buf.array(),
+                            buf.arrayOffset(),
+                            buf.readableBytes()
                     )
             ));
         } finally {

diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java
@@ -26,6 +26,8 @@
 import com.replaymod.replay.events.ReplayClosingCallback;
 import com.replaymod.replay.events.ReplayOpenedCallback;
 import com.replaymod.replay.gui.overlay.GuiReplayOverlay;
+import com.replaymod.replay.sender.FullReplaySender;
+import com.replaymod.replay.sender.QuickReplaySender;
 import com.replaymod.replaystudio.data.Marker;
 import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.util.Location;
@@ -119,7 +121,7 @@ public ReplayHandler(ReplayFile replayFile, boolean asyncMode) throws IOExceptio
         fullReplaySender.setAsyncMode(asyncMode);
     }
 
-    void restartedReplay() {
+    public void restartedReplay() {
         Preconditions.checkState(mc.isOnExecutionThread(), "Must be called from Minecraft thread.");
 
         channel.close();
@@ -188,7 +190,6 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable t) {
         }
         ));
 
-
         channel = new EmbeddedChannel();
         channel.pipeline().addLast("ReplayModReplay_quickReplaySender", quickReplaySender);
         channel.pipeline().addLast("ReplayModReplay_replaySender", fullReplaySender);

diff --git a/...om/replaymod/replay/FullReplaySender.java → ...aymod/replay/sender/FullReplaySender.java b/...om/replaymod/replay/FullReplaySender.java → ...aymod/replay/sender/FullReplaySender.java
@@ -1,4 +1,4 @@
-package com.replaymod.replay;
+package com.replaymod.replay.sender;
 
 import com.github.steveice10.packetlib.io.NetOutput;
 import com.github.steveice10.packetlib.tcp.io.ByteBufNetOutput;
@@ -11,6 +11,10 @@
 import com.replaymod.gui.versions.callbacks.PreTickCallback;
 import com.replaymod.mixin.MinecraftAccessor;
 import com.replaymod.mixin.TimerAccessor;
+import com.replaymod.replay.ReplayHandler;
+import com.replaymod.replay.ReplayModReplay;
+import com.replaymod.replay.ReplaySender;
+import com.replaymod.replay.Setting;
 import com.replaymod.replay.camera.CameraEntity;
 import com.replaymod.replaystudio.io.ReplayInputStream;
 import com.replaymod.replaystudio.replay.ReplayFile;

diff --git a/...m/replaymod/replay/QuickReplaySender.java → ...ymod/replay/sender/QuickReplaySender.java b/...m/replaymod/replay/QuickReplaySender.java → ...ymod/replay/sender/QuickReplaySender.java
@@ -1,4 +1,4 @@
-package com.replaymod.replay;
+package com.replaymod.replay.sender;
 
 import com.github.steveice10.packetlib.io.NetInput;
 import com.github.steveice10.packetlib.tcp.io.ByteBufNetInput;
@@ -11,6 +11,8 @@
 import com.replaymod.gui.versions.callbacks.PreTickCallback;
 import com.replaymod.mixin.MinecraftAccessor;
 import com.replaymod.mixin.TimerAccessor;
+import com.replaymod.replay.ReplayModReplay;
+import com.replaymod.replay.ReplaySender;
 import com.replaymod.replaystudio.replay.ReplayFile;
 import com.replaymod.replaystudio.util.RandomAccessReplay;
 import io.netty.buffer.ByteBuf;