Add support for splitting the login packet (#9367)

It contains full copies of data registries and can easily surpass vanilla's limits
This commit is contained in:
matyrobbrt authored and GitHub committed 2023-03-30 15:59:01 -07:00
1 parent d75d333e13
commit b5655b0ddc
8 files changed
+314 -9

No files matched your search

@@ -14,6 +14,7 @@ import net.minecraft.network.protocol.Packet;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.ConnectionProtocol;
import net.minecraft.network.protocol.game.ClientboundLoginPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
@@ -43,7 +44,8 @@ public class ForgeConnectionNetworkFilter extends VanillaPacketFilter
ImmutableMap.Builder<Class<? extends Packet<?>>, BiConsumer<Packet<?>, List<? super Packet<?>>>> builder = ImmutableMap.<Class<? extends Packet<?>>, BiConsumer<Packet<?>, List<? super Packet<?>>>>builder()
.put(ClientboundUpdateRecipesPacket.class, ForgeConnectionNetworkFilter::splitPacket)
.put(ClientboundUpdateTagsPacket.class, ForgeConnectionNetworkFilter::splitPacket)
.put(ClientboundUpdateAdvancementsPacket.class, ForgeConnectionNetworkFilter::splitPacket);
.put(ClientboundUpdateAdvancementsPacket.class, ForgeConnectionNetworkFilter::splitPacket)
.put(ClientboundLoginPacket.class, ForgeConnectionNetworkFilter::splitPacket); // When there are many dynamic registry entries that packet is BIG
return builder.build();
}
@@ -11,8 +11,6 @@ import java.util.function.Predicate;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.network.*;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
@@ -36,7 +34,7 @@ public class VanillaPacketSplitter
private static final ResourceLocation CHANNEL = new ResourceLocation("forge", "split");
private static final String VERSION = "1.1";
private static final int PROTOCOL_MAX = 2097152;
private static final int PROTOCOL_MAX = CompressionDecoder.MAXIMUM_UNCOMPRESSED_LENGTH;
private static final int PAYLOAD_TO_CLIENT_MAX = 1048576;
// 1 byte for state, 5 byte for VarInt PacketID
@@ -117,7 +115,6 @@ public class VanillaPacketSplitter
private static final List<FriendlyByteBuf> receivedBuffers = new ArrayList<>();
@SuppressWarnings("unchecked")
private static void onClientPacket(NetworkEvent.ServerCustomPayloadEvent event)
{
NetworkEvent.Context ctx = event.getSource().get();
@@ -152,11 +149,17 @@ public class VanillaPacketSplitter
{
receivedBuffers.clear();
full.release();
ctx.enqueueWork(() -> ((Packet<ClientPacketListener>)packet).handle(Minecraft.getInstance().getConnection()));
ctx.enqueueWork(() -> genericsFtw(packet, event.getSource().get().getNetworkManager().getPacketListener()));
}
}
}
@SuppressWarnings("unchecked")
private static <T extends PacketListener> void genericsFtw(Packet<T> pkt, Object listener)
{
pkt.handle((T) listener);
}
public enum RemoteCompatibility
{
ABSENT,