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

Port to 1.20.2

Browse Source
This commit is contained in:
Jonas Herzig
2023-11-27 18:34:19 +01:00
parent e8f9234bf0
commit b8ab7aa5a7
28 changed files with 526 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/replaymod/core/gui/RestoreReplayGui.java
View File

@@ -7,6 +7,7 @@ import com.replaymod.core.utils.Utils;
import com.replaymod.core.versions.MCVer;
import com.replaymod.replaystudio.io.ReplayInputStream;
import com.replaymod.replaystudio.io.ReplayOutputStream;
import com.replaymod.replaystudio.lib.viaversion.api.protocol.packet.State;
import com.replaymod.replaystudio.replay.ReplayFile;
import com.replaymod.replaystudio.replay.ReplayMetaData;
import de.johni0702.minecraft.gui.container.AbstractGuiScreen;
@@ -122,7 +123,7 @@ public class RestoreReplayGui extends AbstractGuiScreen<RestoreReplayGui> {
if (metaData != null && metaData.getDuration() == 0) {
// Try to restore replay duration
// We need to re-write the packet data in case there are any incomplete packets dangling at the end
try (ReplayInputStream in = replayFile.getPacketData(MCVer.getPacketTypeRegistry(true));
try (ReplayInputStream in = replayFile.getPacketData(MCVer.getPacketTypeRegistry(State.LOGIN));
ReplayOutputStream out = replayFile.writePacketData()) {
while (true) {
// To prevent failing at un-parsable packets and to support recovery in minimal mode,

7
src/main/java/com/replaymod/core/utils/Restrictions.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.network.PacketByteBuf;
import net.minecraft.util.Identifier;
//#endif
//#if MC<=10710
//#if MC<=10710 || MC>=12002
//$$ import io.netty.buffer.Unpooled;
//#endif
@@ -26,7 +26,10 @@ public class Restrictions {
private boolean onlyRecordingPlayer;
public String handle(CustomPayloadS2CPacket packet) {
//#if MC>=10800
//#if MC>=12002
//$$ PacketByteBuf buffer = new PacketByteBuf(Unpooled.buffer());
//$$ packet.write(buffer);
//#elseif MC>=10800
PacketByteBuf buffer = packet.getData();
//#else
//$$ PacketBuffer buffer = new PacketBuffer(Unpooled.wrappedBuffer(packet.func_149168_d()));

35
src/main/java/com/replaymod/core/versions/MCVer.java
View File

@@ -10,6 +10,7 @@ import de.johni0702.minecraft.gui.utils.lwjgl.vector.Vector3f;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.network.NetworkState;
import net.minecraft.util.Identifier;
import net.minecraft.util.Util;
import net.minecraft.util.math.Vec3d;
@@ -103,6 +104,40 @@ public class MCVer {
//#endif
}
public static NetworkState asMc(State state) {
switch (state) {
case HANDSHAKE: return NetworkState.HANDSHAKING;
case STATUS: return NetworkState.STATUS;
case LOGIN: return NetworkState.LOGIN;
//#if MC>=12002
//$$ case CONFIGURATION: return NetworkState.CONFIGURATION;
//#endif
case PLAY: return NetworkState.PLAY;
}
throw new IllegalArgumentException("Unexpected value: " + state);
}
public static State fromMc(NetworkState mcState) {
switch (mcState) {
case HANDSHAKING: return State.HANDSHAKE;
case STATUS: return State.STATUS;
case LOGIN: return State.LOGIN;
//#if MC>=12002
//$$ case CONFIGURATION: return State.CONFIGURATION;
//#endif
case PLAY: return State.PLAY;
}
throw new IllegalArgumentException("Unexpected value: " + mcState);
}
public static PacketTypeRegistry getPacketTypeRegistry(NetworkState state) {
return getPacketTypeRegistry(fromMc(state));
}
public static PacketTypeRegistry getPacketTypeRegistry(State state) {
return PacketTypeRegistry.get(ProtocolVersion.getProtocol(getProtocolVersion()), state);
}
public static PacketTypeRegistry getPacketTypeRegistry(boolean loginPhase) {
return PacketTypeRegistry.get(
ProtocolVersion.getProtocol(getProtocolVersion()),

66
src/main/java/com/replaymod/core/versions/Patterns.java
View File

@@ -6,6 +6,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.replaymod.core.mixin.MinecraftAccessor;
import com.replaymod.gradle.remap.Pattern;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.options.GameOptions;
import net.minecraft.client.options.KeyBinding;
import net.minecraft.client.render.VertexFormat;
@@ -16,6 +17,10 @@ import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.sound.PositionedSoundInstance;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.network.NetworkSide;
import net.minecraft.network.NetworkState;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager;
import net.minecraft.sound.SoundCategory;
@@ -59,6 +64,7 @@ import net.minecraft.util.collection.DefaultedList;
//#endif
//#if MC>=10904
import net.minecraft.network.packet.s2c.play.UnloadChunkS2CPacket;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.crash.CrashCallable;
//#else
@@ -906,4 +912,64 @@ class Patterns {
return entity.world;
//#endif
}
@Pattern
public Object channel(CustomPayloadS2CPacket packet) {
//#if MC>=12002
//$$ return packet.payload().id();
//#else
return packet.getChannel();
//#endif
}
//#if MC>=10904
@Pattern
public Integer getPacketId(NetworkState state, NetworkSide side, Packet<?> packet) throws Exception {
//#if MC>=12002
//$$ return state.getHandler(side).getId(packet);
//#else
return state.getPacketId(side, packet);
//#endif
}
@Pattern
public int UnloadChunkPacket_getX(UnloadChunkS2CPacket packet) {
//#if MC>=12002
//$$ return packet.pos().x;
//#else
return packet.getX();
//#endif
}
@Pattern
public int UnloadChunkPacket_getZ(UnloadChunkS2CPacket packet) {
//#if MC>=12002
//$$ return packet.pos().z;
//#else
return packet.getZ();
//#endif
}
//#else
//$$ @Pattern public void getPacketId() {}
//$$ @Pattern public void UnloadChunkPacket_getZ() {}
//$$ @Pattern public void UnloadChunkPacket_getX() {}
//#endif
@Pattern
public Identifier getSkinTexture(AbstractClientPlayerEntity player) {
//#if MC>=12002
//$$ return player.getSkinTextures().texture();
//#else
return player.getSkinTexture();
//#endif
}
@Pattern
public boolean isDebugHudEnabled(MinecraftClient mc) {
//#if MC>=12002
//$$ return mc.getDebugHud().shouldShowDebugHud();
//#else
return mc.options.debugEnabled;
//#endif
}
}

3
src/main/java/com/replaymod/editor/gui/MarkerProcessor.java
View File

@@ -9,6 +9,7 @@ import com.replaymod.replaystudio.filter.SquashFilter;
import com.replaymod.replaystudio.filter.StreamFilter;
import com.replaymod.replaystudio.io.ReplayInputStream;
import com.replaymod.replaystudio.io.ReplayOutputStream;
import com.replaymod.replaystudio.lib.viaversion.api.protocol.packet.State;
import com.replaymod.replaystudio.protocol.PacketTypeRegistry;
import com.replaymod.replaystudio.replay.ReplayFile;
import com.replaymod.replaystudio.replay.ReplayMetaData;
@@ -122,7 +123,7 @@ public class MarkerProcessor {
String replayName = FilenameUtils.getBaseName(path.getFileName().toString());
int splitCounter = 0;
PacketTypeRegistry registry = MCVer.getPacketTypeRegistry(true);
PacketTypeRegistry registry = MCVer.getPacketTypeRegistry(State.LOGIN);
DimensionTracker dimensionTracker = new DimensionTracker();
SquashFilter squashFilter = new SquashFilter(null, null, null);

4
src/main/java/com/replaymod/recording/handler/ConnectionEventHandler.java
View File

@@ -112,7 +112,11 @@ public class ConnectionEventHandler {
//#endif
serverName = worldName;
//#if MC>=11100
//#if MC>=12002
//$$ } else if (serverInfo != null && serverInfo.isRealm()) {
//#else
} else if (mc.isConnectedToRealms()) {
//#endif
// we can't access the server name without tapping too deep in the Realms Library
worldName = "A Realms Server";
//#endif

11
src/main/java/com/replaymod/recording/handler/RecordingEventHandler.java
View File

@@ -16,7 +16,6 @@ import net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
import net.minecraft.network.packet.s2c.play.EntityS2CPacket;
import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.Packet;
@@ -30,6 +29,12 @@ import net.minecraft.server.integrated.IntegratedServer;
//$$ import net.minecraftforge.event.entity.player.PlayerEvent.ItemPickupEvent;
//#endif
//#if MC>=12002
//$$ import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
//#else
import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket;
//#endif
//#if MC>=11600
import com.mojang.datafixers.util.Pair;
//#endif
@@ -103,7 +108,11 @@ public class RecordingEventHandler extends EventRegistrations {
try {
ClientPlayerEntity player = mc.player;
assert player != null;
//#if MC>=12002
//$$ packetListener.save(new EntitySpawnS2CPacket(player));
//#else
packetListener.save(new PlayerSpawnS2CPacket(player));
//#endif
//#if MC>=11903
//$$ packetListener.save(new EntityTrackerUpdateS2CPacket(player.getId(), player.getDataTracker().getChangedEntries()));
//#elseif MC>=11500

7
src/main/java/com/replaymod/recording/mixin/MixinMouseHelper.java
View File

@@ -32,6 +32,12 @@ public abstract class MixinMouseHelper {
private void handleReplayModScroll(
long _p0, double _p1, double _p2,
CallbackInfo ci,
//#if MC>=12002
//$$ boolean discreteScroll,
//$$ double sensitivity,
//$$ double xOffsetAccumulated,
//$$ double yOffsetAccumulated
//#else
double _l1,
//#if MC>=11802
//$$ int yOffsetAccumulated
@@ -40,6 +46,7 @@ public abstract class MixinMouseHelper {
//#else
//$$ double yOffsetAccumulated
//#endif
//#endif
) {
if (ReplayModReplay.instance.getReplayHandler() != null) {
InputReplayTimer.handleScroll((int) (yOffsetAccumulated * 120));

3
src/main/java/com/replaymod/recording/mixin/MixinNetHandlerPlayClient.java
View File

@@ -2,6 +2,7 @@ package com.replaymod.recording.mixin;
import com.replaymod.core.versions.MCVer;
import com.replaymod.recording.handler.RecordingEventHandler;
import com.replaymod.replaystudio.lib.viaversion.api.protocol.packet.State;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
@@ -78,7 +79,7 @@ public abstract class MixinNetHandlerPlayClient {
byteBuf.readBytes(array);
for (PacketPlayerListEntry data : PacketPlayerListEntry.read(new Packet(
MCVer.getPacketTypeRegistry(false), 0, PacketType.PlayerListEntry,
MCVer.getPacketTypeRegistry(State.PLAY), 0, PacketType.PlayerListEntry,
com.github.steveice10.netty.buffer.Unpooled.wrappedBuffer(array)
))) {
if (data.getUuid() == null) continue;

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

@@ -30,7 +30,6 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.network.packet.s2c.play.DisconnectS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket;
import net.minecraft.entity.Entity;
import net.minecraft.network.NetworkState;
import net.minecraft.network.PacketByteBuf;
@@ -41,6 +40,13 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
//#if MC>=12002
//$$ import net.minecraft.entity.EntityType;
//$$ import net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
//#else
import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket;
//#endif
//#if MC>=10800
//#if MC<10904
//$$ import net.minecraft.network.play.server.S46PacketSetCompressionLevel;
@@ -93,6 +99,9 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
private static final int PACKET_ID_RESOURCE_PACK_SEND = getPacketId(NetworkState.PLAY, new ResourcePackSendS2CPacket());
private static final int PACKET_ID_LOGIN_COMPRESSION = getPacketId(NetworkState.LOGIN, new LoginCompressionS2CPacket());
//#endif
//#if MC>=12002
//$$ private static final int PACKET_ID_CONFIG_RESOURCE_PACK_SEND = getPacketId(NetworkState.CONFIGURATION, new ResourcePackSendS2CPacket("", "", false, null));
//#endif
//#if MC<10904
//$$ private static final int PACKET_ID_PLAY_COMPRESSION = getPacketId(EnumConnectionState.PLAY, new S46PacketSetCompressionLevel());
//#endif
@@ -152,7 +161,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
out.write(json.getBytes());
}
} else {
replayFile.writeMetaData(MCVer.getPacketTypeRegistry(true), metaData);
replayFile.writeMetaData(MCVer.getPacketTypeRegistry(State.LOGIN), metaData);
}
}
} catch (IOException e) {
@@ -347,7 +356,11 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
// for integrated server connections MC is passing the packet objects directly, so we need to encode them
// ourselves to be able to store them
//#if MC>=11904
//#if MC>=12002
//$$ PacketBundleHandler bundleHandler = ctx.channel().attr(ClientConnection.CLIENTBOUND_PROTOCOL_KEY).get().getBundler();
//#else
//$$ PacketBundleHandler bundleHandler = ctx.channel().attr(PacketBundleHandler.KEY).get().getBundler(NetworkSide.CLIENTBOUND);
//#endif
//$$ List<Packet> packets = new ArrayList<>(1);
//$$ bundleHandler.forEachPacket((net.minecraft.network.packet.Packet<?>) msg, unbundledPacket -> {
//$$ try {
@@ -368,7 +381,11 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
}
if (packet != null) {
if (connectionState == NetworkState.PLAY && packet.getId() == PACKET_ID_RESOURCE_PACK_SEND) {
if (connectionState == NetworkState.PLAY && packet.getId() == PACKET_ID_RESOURCE_PACK_SEND
//#if MC>=12002
//$$ || connectionState == NetworkState.CONFIGURATION && packet.getId() == PACKET_ID_CONFIG_RESOURCE_PACK_SEND
//#endif
) {
ClientConnection connection = ctx.pipeline().get(ClientConnection.class);
save(resourcePackRecorder.handleResourcePack(connection, (ResourcePackSendS2CPacket) decodeMcPacket(packet)));
return;
@@ -385,8 +402,13 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
if (ctx == null) {
return NetworkState.LOGIN;
}
//#if MC>=12002
//$$ AttributeKey<NetworkState.PacketHandler<?>> key = ClientConnection.CLIENTBOUND_PROTOCOL_KEY;
//$$ return ctx.channel().attr(key).get().getState();
//#else
AttributeKey<NetworkState> key = ClientConnection.ATTR_KEY_PROTOCOL;
return ctx.channel().attr(key).get();
//#endif
}
private static Packet encodeMcPacket(NetworkState connectionState, net.minecraft.network.Packet packet) throws Exception {
@@ -402,7 +424,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
try {
packet.write(new PacketByteBuf(byteBuf));
return new Packet(
MCVer.getPacketTypeRegistry(connectionState == NetworkState.LOGIN),
MCVer.getPacketTypeRegistry(connectionState),
packetId,
com.github.steveice10.netty.buffer.Unpooled.wrappedBuffer(
byteBuf.array(),
@@ -416,11 +438,13 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
}
private static net.minecraft.network.Packet decodeMcPacket(Packet packet) throws IOException, IllegalAccessException, InstantiationException {
NetworkState connectionState = packet.getRegistry().getState() == State.LOGIN ? NetworkState.LOGIN : NetworkState.PLAY;
NetworkState connectionState = asMc(packet.getRegistry().getState());
int packetId = packet.getId();
PacketByteBuf packetBuf = new PacketByteBuf(Unpooled.wrappedBuffer(packet.getBuf().nioBuffer()));
//#if MC>=11700
//#if MC>=12002
//$$ return connectionState.getHandler(NetworkSide.CLIENTBOUND).createPacket(packetId, packetBuf);
//#elseif MC>=11700
//$$ return connectionState.getPacketHandler(NetworkSide.CLIENTBOUND, packetId, packetBuf);
//#else
//#if MC>=10800
@@ -439,7 +463,7 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
byte[] bytes = new byte[packetBuf.readableBytes()];
packetBuf.readBytes(bytes);
return new Packet(
MCVer.getPacketTypeRegistry(connectionState == NetworkState.LOGIN),
MCVer.getPacketTypeRegistry(connectionState),
packetId,
com.github.steveice10.netty.buffer.Unpooled.wrappedBuffer(bytes)
);
@@ -503,12 +527,17 @@ public class PacketListener extends ChannelInboundHandlerAdapter {
}
}
//#if MC>=12002
//$$ if (msg instanceof EntitySpawnS2CPacket packet && packet.getEntityType() == EntityType.PLAYER) {
//$$ UUID uuid = packet.getUuid();
//#else
if (msg instanceof PlayerSpawnS2CPacket) {
//#if MC>=10800
UUID uuid = ((PlayerSpawnS2CPacket) msg).getPlayerUuid();
//#else
//$$ UUID uuid = ((S0CPacketSpawnPlayer) msg).func_148948_e().getId();
//#endif
//#endif
Set<String> uuids = new HashSet<>(Arrays.asList(metaData.getPlayers()));
uuids.add(uuid.toString());
metaData.setPlayers(uuids.toArray(new String[uuids.size()]));

1
src/main/java/com/replaymod/render/mixin/ChunkRenderingDataPreparerAccessor.java Normal file
View File

@@ -0,0 +1 @@
// 1.20.2+

12
src/main/java/com/replaymod/render/rendering/VideoRenderer.java
View File

@@ -321,7 +321,11 @@ public class VideoRenderer implements RenderInfo {
//#endif
if (mc.options.debugEnabled) {
debugInfoWasShown = true;
//#if MC>=12002
//$$ mc.getDebugHud().toggleDebugHud();
//#else
mc.options.debugEnabled = false;
//#endif
}
//#if MC>=11400
if (mc.mouse.isCursorLocked()) {
@@ -385,7 +389,13 @@ public class VideoRenderer implements RenderInfo {
//$$ Display.setResizable(true);
//$$ }
//#endif
mc.options.debugEnabled = debugInfoWasShown;
if (debugInfoWasShown) {
//#if MC>=12002
//$$ mc.getDebugHud().toggleDebugHud();
//#else
mc.options.debugEnabled = true;
//#endif
}
if (mouseWasGrabbed) {
//#if MC>=11400
mc.mouse.lockCursor();

109
src/main/java/com/replaymod/replay/FullReplaySender.java
View File

@@ -10,6 +10,8 @@ import com.replaymod.core.mixin.TimerAccessor;
import com.replaymod.core.utils.Restrictions;
import com.replaymod.replay.camera.CameraEntity;
import com.replaymod.replaystudio.io.ReplayInputStream;
import com.replaymod.replaystudio.lib.viaversion.api.protocol.packet.State;
import com.replaymod.replaystudio.protocol.PacketTypeRegistry;
import com.replaymod.replaystudio.replay.ReplayFile;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
import de.johni0702.minecraft.gui.versions.callbacks.PreTickCallback;
@@ -48,7 +50,6 @@ import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerAbilitiesS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket;
import net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
import net.minecraft.network.packet.s2c.play.StatisticsS2CPacket;
import net.minecraft.text.Text;
@@ -57,6 +58,14 @@ import net.minecraft.util.math.Vec3d;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
//#if MC>=12002
//$$ import net.minecraft.network.packet.s2c.config.ReadyS2CPacket;
//$$ import net.minecraft.network.packet.s2c.play.CommonPlayerSpawnInfo;
//$$ import net.minecraft.network.packet.s2c.play.EnterReconfigurationS2CPacket;
//#else
import net.minecraft.network.packet.s2c.play.PlayerSpawnS2CPacket;
//#endif
//#if MC>=11904
//$$ import net.minecraft.network.packet.s2c.play.PositionFlag;
//#endif
@@ -238,9 +247,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
protected PacketData nextPacket;
/**
* Whether we're currently reading packets from the login phase.
* Which protocol (state) we're currently in.
*/
private boolean loginPhase = true;
private PacketTypeRegistry registry = getPacketTypeRegistry(State.LOGIN);
/**
* Whether we need to restart the current replay. E.g. when jumping backwards in time
@@ -470,8 +479,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
int i = pb.readVarInt();
NetworkState state = loginPhase ? NetworkState.LOGIN : NetworkState.PLAY;
//#if MC>=11700
NetworkState state = asMc(registry.getState());
//#if MC>=12002
//$$ Packet p = state.getHandler(NetworkSide.CLIENTBOUND).createPacket(i, pb);
//#elseif MC>=11700
//$$ Packet p = state.getPacketHandler(NetworkSide.CLIENTBOUND, i, pb);
//#else
//#if MC>=10800
@@ -493,8 +504,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
return; // MC should have enough time to tick
}
boolean relevantPacket = packet instanceof PlayerSpawnS2CPacket
|| packet instanceof EntitySpawnS2CPacket
boolean relevantPacket = packet instanceof EntitySpawnS2CPacket
//#if MC<12002
|| packet instanceof PlayerSpawnS2CPacket
//#endif
//#if MC<11900
|| packet instanceof MobSpawnS2CPacket
|| packet instanceof PaintingSpawnS2CPacket
@@ -557,9 +570,20 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
*/
protected Packet processPacket(Packet p) throws Exception {
if (p instanceof LoginSuccessS2CPacket) {
loginPhase = false;
registry = registry.withLoginSuccess();
return p;
}
//#if MC>=12002
//$$ if (p instanceof ReadyS2CPacket) {
//$$ registry = registry.withState(State.PLAY);
//$$ return p;
//$$ }
//$$ if (p instanceof EnterReconfigurationS2CPacket) {
//$$ registry = registry.withState(State.CONFIGURATION);
//$$ hasWorldLoaded = false;
//$$ return p;
//$$ }
//#endif
if (p instanceof CustomPayloadS2CPacket) {
CustomPayloadS2CPacket packet = (CustomPayloadS2CPacket) p;
@@ -663,6 +687,17 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#if MC>=11400
p = new GameJoinS2CPacket(
entId,
//#if MC>=12002
//$$ packet.hardcore(),
//$$ packet.dimensionIds(),
//$$ packet.maxPlayers(),
//$$ packet.viewDistance(),
//$$ packet.simulationDistance(),
//$$ packet.reducedDebugInfo(),
//$$ packet.showDeathScreen(),
//$$ packet.doLimitedCrafting(),
//$$ withSpectatorMode(packet.commonPlayerSpawnInfo())
//#else
//#if MC>=11800
//$$ packet.hardcore(),
//#endif
@@ -719,6 +754,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#if MC>=12000
//$$ , packet.portalCooldown()
//#endif
//#endif
);
//#else
//#if MC>=10800
@@ -758,6 +794,10 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
PlayerRespawnS2CPacket respawn = (PlayerRespawnS2CPacket) p;
//#if MC>=11400
p = new PlayerRespawnS2CPacket(
//#if MC>=12002
//$$ withSpectatorMode(respawn.commonPlayerSpawnInfo()),
//$$ (byte) 0
//#else
//#if MC>=11600
respawn.method_29445(),
//#endif
@@ -785,6 +825,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
//#if MC>=12000
//$$ , respawn.getPortalCooldown()
//#endif
//#endif
);
//#else
//#if MC>=10809
@@ -916,6 +957,22 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
}
}
//#if MC>=12002
//$$ private CommonPlayerSpawnInfo withSpectatorMode(CommonPlayerSpawnInfo org) {
//$$ return new CommonPlayerSpawnInfo(
//$$ org.dimensionType(),
//$$ org.dimension(),
//$$ org.seed(),
//$$ GameMode.SPECTATOR,
//$$ GameMode.SPECTATOR,
//$$ org.isDebug(),
//$$ org.isFlat(),
//$$ org.lastDeathLocation(),
//$$ org.portalCooldown()
//$$ );
//$$ }
//#endif
@Override
@SuppressWarnings("unchecked")
public void channelActive(ChannelHandlerContext ctx) throws Exception {
@@ -1010,7 +1067,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
while (!terminate) {
synchronized (FullReplaySender.this) {
if (replayIn == null) {
replayIn = replayFile.getPacketData(getPacketTypeRegistry(true));
replayIn = replayFile.getPacketData(getPacketTypeRegistry(State.LOGIN));
}
// Packet loop
while (true) {
@@ -1037,7 +1094,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// Read the next packet if we don't already have one
if (nextPacket == null) {
nextPacket = new PacketData(replayIn, loginPhase);
nextPacket = new PacketData(replayIn);
}
int nextTimeStamp = nextPacket.timestamp;
@@ -1060,6 +1117,17 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
lastTimeStamp = nextTimeStamp;
// MC as of 1.20.2 relies on autoRead, so it can update the connection state on the main
// thread before the next packet is read. As such, we need to stall if that was just
// enabled.
// Might be safe to do the same on older versions too, but I'd rather not poke the
// monster that is Forge networking.
//#if MC>=12002
//$$ while (!ctx.channel().config().isAutoRead()) {
//$$ Thread.sleep(0, 100_000);
//$$ }
//#endif
// In case we finished jumping
// We need to check that we aren't planing to restart so we don't accidentally run this
// code before we actually restarted
@@ -1092,7 +1160,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// Restart the replay.
hasWorldLoaded = false;
lastTimeStamp = 0;
loginPhase = true;
registry = getPacketTypeRegistry(State.LOGIN);
startFromBeginning = false;
nextPacket = null;
realTimeStart = System.currentTimeMillis();
@@ -1232,14 +1300,14 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
replayIn.close();
replayIn = null;
}
loginPhase = true;
registry = getPacketTypeRegistry(State.LOGIN);
startFromBeginning = false;
nextPacket = null;
ReplayMod.instance.runSync(replayHandler::restartedReplay);
}
if (replayIn == null) {
replayIn = replayFile.getPacketData(getPacketTypeRegistry(true));
replayIn = replayFile.getPacketData(getPacketTypeRegistry(State.LOGIN));
}
while (true) { // Send packets
@@ -1251,7 +1319,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
nextPacket = null;
} else {
// Otherwise read one from the input stream
pd = new PacketData(replayIn, loginPhase);
pd = new PacketData(replayIn);
}
int nextTimeStamp = pd.timestamp;
@@ -1263,6 +1331,17 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
// Process packet
channelRead(ctx, pd.bytes);
// MC as of 1.20.2 relies on autoRead, so it can update the connection state on the main
// thread before the next packet is read. As such, we need to stall if that was just
// enabled.
// Might be safe to do the same on older versions too, but I'd rather not poke the
// monster that is Forge networking.
//#if MC>=12002
//$$ while (!ctx.channel().config().isAutoRead()) {
//$$ Thread.sleep(0, 100_000);
//$$ }
//#endif
} catch (EOFException eof) {
// Shit! We hit the end before finishing our job! What shall we do now?
// well, let's just pretend we're done...
@@ -1471,7 +1550,7 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
private final int timestamp;
private final byte[] bytes;
PacketData(ReplayInputStream in, boolean loginPhase) throws IOException {
PacketData(ReplayInputStream in) throws IOException {
if (ReplayMod.isMinimalMode()) {
// Minimal mode, we can only read our exact protocol version and cannot use ReplayStudio
timestamp = readInt(in);

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

@@ -7,6 +7,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import com.replaymod.core.mixin.MinecraftAccessor;
import com.replaymod.core.mixin.TimerAccessor;
import com.replaymod.replaystudio.lib.viaversion.api.protocol.packet.State;
import com.replaymod.replaystudio.replay.ReplayFile;
import com.replaymod.replaystudio.rar.RandomAccessReplay;
import de.johni0702.minecraft.gui.utils.EventRegistrations;
@@ -30,6 +31,7 @@ import java.util.function.Consumer;
import com.replaymod.core.utils.WrappedTimer;
//#endif
import static com.replaymod.core.versions.MCVer.asMc;
import static com.replaymod.core.versions.MCVer.getMinecraft;
import static com.replaymod.core.versions.MCVer.getPacketTypeRegistry;
import static com.replaymod.replay.ReplayModReplay.LOGGER;
@@ -63,7 +65,7 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
public QuickReplaySender(ReplayModReplay mod, ReplayFile replayFile) {
this.mod = mod;
this.replay = new RandomAccessReplay(replayFile, getPacketTypeRegistry(false)) {
this.replay = new RandomAccessReplay(replayFile, getPacketTypeRegistry(State.PLAY)) {
private byte[] buf = new byte[0];
@Override
@@ -78,18 +80,21 @@ public class QuickReplaySender extends ChannelHandlerAdapter implements ReplaySe
wrappedBuf.writerIndex(size);
PacketByteBuf packetByteBuf = new PacketByteBuf(wrappedBuf);
NetworkState state = asMc(packet.getRegistry().getState());
//#if MC>=10809
Packet<?> mcPacket;
//#else
//$$ Packet mcPacket;
//#endif
//#if MC>=11700
//$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId(), packetByteBuf);
//#if MC>=12002
//$$ mcPacket = state.getHandler(NetworkSide.CLIENTBOUND).createPacket(packet.getId(), packetByteBuf);
//#elseif MC>=11700
//$$ mcPacket = state.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId(), packetByteBuf);
//#elseif MC>=11500
mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId());
mcPacket = state.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId());
//#else
//$$ try {
//$$ mcPacket = NetworkState.PLAY.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId());
//$$ mcPacket = state.getPacketHandler(NetworkSide.CLIENTBOUND, packet.getId());
//$$ } catch (IllegalAccessException | InstantiationException e) {
//$$ e.printStackTrace();
//$$ return;

79
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -42,6 +42,13 @@ import net.minecraft.network.ClientConnection;
import java.io.IOException;
import java.util.*;
//#if MC>=12002
//$$ import io.netty.channel.ChannelDuplexHandler;
//$$ import io.netty.channel.ChannelPromise;
//$$ import net.minecraft.network.handler.NetworkStateTransitionHandler;
//$$ import net.minecraft.network.packet.Packet;
//#endif
//#if MC>=12000
//$$ import com.mojang.blaze3d.systems.VertexSorter;
//$$ import net.minecraft.client.gui.DrawContext;
@@ -301,6 +308,36 @@ public class ReplayHandler {
//$$ FMLClientHandler.instance().connectToRealmsServer(null, 0); // just to init the playClientBlock latch
//#endif
//#if MC>=11200
channel = new EmbeddedChannel();
//#else
//$$ ChannelOutboundHandlerAdapter dummyHandler = new ChannelOutboundHandlerAdapter();
//$$ channel = new EmbeddedChannel(dummyHandler);
//$$ channel.pipeline().remove(dummyHandler);
//#endif
//#if MC>=10800
channel.pipeline().addLast("ReplayModReplay_quickReplaySender", quickReplaySender);
//#endif
channel.pipeline().addLast("ReplayModReplay_replaySender", fullReplaySender);
//#if MC>=12002
//$$ channel.pipeline().addLast("ReplayModReplay_transition", new DummyNetworkStateTransitionHandler());
//$$ channel.pipeline().addLast("bundler", new PacketBundler(ClientConnection.CLIENTBOUND_PROTOCOL_KEY));
//#elseif MC>=11904
//$$ channel.pipeline().addLast("bundler", new PacketBundler(NetworkSide.CLIENTBOUND));
//#endif
channel.pipeline().addLast("packet_handler", networkManager);
channel.pipeline().fireChannelActive();
// MC usually transitions from handshake to login via the packets it sends.
// We don't send any packets (there is no server to receive them), so we need to switch manually.
//#if MC>=12002
//$$ channel.attr(ClientConnection.CLIENTBOUND_PROTOCOL_KEY).set(NetworkState.LOGIN.getHandler(NetworkSide.CLIENTBOUND));
//$$ channel.attr(ClientConnection.SERVERBOUND_PROTOCOL_KEY).set(NetworkState.LOGIN.getHandler(NetworkSide.SERVERBOUND));
//#else
networkManager.setState(NetworkState.LOGIN);
//#endif
networkManager.setPacketListener(new ClientLoginNetworkHandler(
networkManager,
mc,
@@ -315,28 +352,6 @@ public class ReplayHandler {
//#endif
));
//#if MC>=11200
channel = new EmbeddedChannel();
//#else
//$$ ChannelOutboundHandlerAdapter dummyHandler = new ChannelOutboundHandlerAdapter();
//$$ channel = new EmbeddedChannel(dummyHandler);
//$$ channel.pipeline().remove(dummyHandler);
//#endif
//#if MC>=10800
channel.pipeline().addLast("ReplayModReplay_quickReplaySender", quickReplaySender);
//#endif
channel.pipeline().addLast("ReplayModReplay_replaySender", fullReplaySender);
//#if MC>=11904
//$$ channel.pipeline().addLast("bundler", new PacketBundler(NetworkSide.CLIENTBOUND));
//#endif
channel.pipeline().addLast("packet_handler", networkManager);
channel.pipeline().fireChannelActive();
// MC usually transitions from handshake to login via the packets it sends.
// We don't send any packets (there is no server to receive them), so we need to switch manually.
networkManager.setState(NetworkState.LOGIN);
//#if MC>=11400
((MinecraftAccessor) mc).setConnection(networkManager);
//#endif
@@ -787,4 +802,24 @@ public class ReplayHandler {
//$$ }
//#endif
}
//#if MC>=12002
//$$ private static class DummyNetworkStateTransitionHandler extends ChannelDuplexHandler {
//$$ @Override
//$$ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
//$$ if (msg instanceof Packet<?> packet) {
//$$ NetworkStateTransitionHandler.handle(ctx.channel().attr(ClientConnection.CLIENTBOUND_PROTOCOL_KEY), packet);
//$$ }
//$$ super.channelRead(ctx, msg);
//$$ }
//$$
//$$ @Override
//$$ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
//$$ if (msg instanceof Packet<?> packet) {
//$$ NetworkStateTransitionHandler.handle(ctx.channel().attr(ClientConnection.SERVERBOUND_PROTOCOL_KEY), packet);
//$$ }
//$$ super.write(ctx, msg, promise);
//$$ }
//$$ }
//#endif
}

17
src/main/java/com/replaymod/replay/camera/CameraEntity.java
View File

@@ -40,6 +40,10 @@ import net.minecraft.util.math.Box;
//$$ import net.minecraftforge.eventbus.api.SubscribeEvent;
//#endif
//#if MC>=12002
//$$ import net.minecraft.client.util.SkinTextures;
//#endif
//#if MC>=11400
import net.minecraft.client.world.ClientWorld;
import net.minecraft.fluid.Fluid;
@@ -475,6 +479,16 @@ public class CameraEntity
return super.isInvisible();
}
//#if MC>=12002
//$$ @Override
//$$ public SkinTextures getSkinTextures() {
//$$ Entity view = this.client.getCameraEntity();
//$$ if (view != this && view instanceof AbstractClientPlayerEntity) {
//$$ return ((AbstractClientPlayerEntity) view).getSkinTextures();
//$$ }
//$$ return super.getSkinTextures();
//$$ }
//#else
@Override
public Identifier getSkinTexture() {
Entity view = this.client.getCameraEntity();
@@ -493,7 +507,10 @@ public class CameraEntity
}
return super.getModel();
}
//#endif
//#endif
//#if MC>=10800
@Override
public boolean isPartVisible(PlayerModelPart modelPart) {
Entity view = this.client.getCameraEntity();