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

Switch to new Quick Mode backend

Browse Source
This commit is contained in:
Jonas Herzig
2021-06-05 22:39:19 +02:00
parent 1802b1a7d0
commit 08165252d5
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

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

43
src/main/java/com/replaymod/replay/QuickReplaySender.java
View File

@@ -1,8 +1,6 @@
//#if MC>=10904 //#if MC>=10904
package com.replaymod.replay; package com.replaymod.replay;
import com.github.steveice10.packetlib.io.NetInput;
import com.github.steveice10.packetlib.tcp.io.ByteBufNetInput;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
@@ -10,7 +8,7 @@ import com.google.common.util.concurrent.SettableFuture;
import com.replaymod.core.mixin.MinecraftAccessor; import com.replaymod.core.mixin.MinecraftAccessor;
import com.replaymod.core.mixin.TimerAccessor; import com.replaymod.core.mixin.TimerAccessor;
import com.replaymod.replaystudio.replay.ReplayFile; import com.replaymod.replaystudio.replay.ReplayFile;
import com.replaymod.replaystudio.util.RandomAccessReplay; import com.replaymod.replaystudio.rar.RandomAccessReplay;
import de.johni0702.minecraft.gui.utils.EventRegistrations; import de.johni0702.minecraft.gui.utils.EventRegistrations;
import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback; import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
@@ -72,7 +70,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
private final MinecraftClient mc = getMinecraft(); private final MinecraftClient mc = getMinecraft();
private final ReplayModReplay mod; private final ReplayModReplay mod;
private final RandomAccessReplay<Packet<?>> replay; private final RandomAccessReplay replay;
private final EventHandler eventHandler = new EventHandler(); private final EventHandler eventHandler = new EventHandler();
private ChannelHandlerContext ctx; private ChannelHandlerContext ctx;
@@ -88,49 +86,48 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
private ListenableFuture<Void> initPromise; private ListenableFuture<Void> initPromise;
private com.github.steveice10.netty.buffer.ByteBuf buf;
private NetInput bufInput;
public QuickReplaySender(ReplayModReplay mod, ReplayFile replayFile) { public QuickReplaySender(ReplayModReplay mod, ReplayFile replayFile) {
this.mod = mod; this.mod = mod;
this.replay = new RandomAccessReplay<Packet<?>>(replayFile, getPacketTypeRegistry(false)) { this.replay = new RandomAccessReplay(replayFile, getPacketTypeRegistry(false)) {
private byte[] buf = new byte[0]; private byte[] buf = new byte[0];
@Override @Override
protected Packet<?> decode(com.github.steveice10.netty.buffer.ByteBuf byteBuf) throws IOException { protected void dispatch(com.replaymod.replaystudio.protocol.Packet packet) {
int packetId = new ByteBufNetInput(byteBuf).readVarInt(); com.github.steveice10.netty.buffer.ByteBuf byteBuf = packet.getBuf();
int size = byteBuf.readableBytes(); int size = byteBuf.readableBytes();
if (buf.length < size) { if (buf.length < size) {
buf = new byte[size]; buf = new byte[size];
} }
byteBuf.readBytes(buf, 0, size); byteBuf.getBytes(byteBuf.readerIndex(), buf, 0, size);
ByteBuf wrappedBuf = Unpooled.wrappedBuffer(buf); ByteBuf wrappedBuf = Unpooled.wrappedBuffer(buf);
wrappedBuf.writerIndex(size); wrappedBuf.writerIndex(size);
PacketByteBuf packetByteBuf = new PacketByteBuf(wrappedBuf); PacketByteBuf packetByteBuf = new PacketByteBuf(wrappedBuf);
Packet<?> mcPacket;
//#if MC>=11700 //#if MC>=11700
//$$ return NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId, packetByteBuf); //$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId(), packetByteBuf);
//#elseif MC>=11500
mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId());
//#else //#else
//#if MC>=11500
Packet<?> mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId);
//#else
//$$ Packet<?> mcPacket;
//$$ try { //$$ try {
//$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packetId); //$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId());
//$$ } catch (IllegalAccessException | InstantiationException e) { //$$ } catch (IllegalAccessException | InstantiationException e) {
//$$ throw new IOException(e); //$$ e.printStackTrace();
//$$ return;
//$$ } //$$ }
//#endif //#endif
if (mcPacket != null) { if (mcPacket != null) {
//#if MC<11700
try {
mcPacket.read(packetByteBuf); mcPacket.read(packetByteBuf);
} catch (IOException e) {
e.printStackTrace();
return;
} }
return mcPacket;
//#endif //#endif
}
@Override ctx.fireChannelRead(mcPacket);
protected void dispatch(Packet<?> packet) { }
ctx.fireChannelRead(packet);
} }
}; };
} }