forward login cookies

src/main/java/com/viaversion/aas/codec/packet/common/AbstractCompression.java

@@ -6,7 +6,7 @@ import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.NotNull;
 
-public class AbstractCompression implements Packet {
+public abstract class AbstractCompression implements Packet {
 	private int threshold;
 
 	public int getThreshold() {

src/main/java/com/viaversion/aas/codec/packet/common/AbstractCookieRequest.java

@@ -0,0 +1,29 @@
+package com.viaversion.aas.codec.packet.common;
+
+import com.viaversion.aas.codec.packet.Packet;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class AbstractCookieRequest implements Packet {
+	private String identifier;
+
+	@Override
+	public void decode(@NotNull ByteBuf byteBuf, ProtocolVersion protocolVersion) throws Exception {
+		identifier = Type.STRING.read(byteBuf);
+	}
+
+	@Override
+	public void encode(@NotNull ByteBuf byteBuf, ProtocolVersion protocolVersion) throws Exception {
+		Type.STRING.write(byteBuf, identifier);
+	}
+
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(String identifier) {
+		this.identifier = identifier;
+	}
+}

src/main/java/com/viaversion/aas/codec/packet/common/AbstractCookieResponse.java

@@ -0,0 +1,40 @@
+package com.viaversion.aas.codec.packet.common;
+
+import com.viaversion.aas.codec.packet.Packet;
+import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
+import com.viaversion.viaversion.api.type.Type;
+import io.netty.buffer.ByteBuf;
+import org.jetbrains.annotations.NotNull;
+
+public abstract class AbstractCookieResponse implements Packet {
+	private String id;
+	private byte[] payload;
+
+	@Override
+	public void decode(@NotNull ByteBuf byteBuf, ProtocolVersion protocolVersion) throws Exception {
+		id = Type.STRING.read(byteBuf);
+		payload = Type.OPTIONAL_BYTE_ARRAY_PRIMITIVE.read(byteBuf);
+	}
+
+	@Override
+	public void encode(@NotNull ByteBuf byteBuf, ProtocolVersion protocolVersion) throws Exception {
+		Type.STRING.write(byteBuf, id);
+		Type.OPTIONAL_BYTE_ARRAY_PRIMITIVE.write(byteBuf, payload);
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public byte[] getPayload() {
+		return payload;
+	}
+
+	public void setPayload(byte[] payload) {
+		this.payload = payload;
+	}
+}

src/main/java/com/viaversion/aas/codec/packet/common/AbstractEmpty.java

@@ -5,7 +5,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.NotNull;
 
-public class AbstractEmpty implements Packet {
+public abstract class AbstractEmpty implements Packet {
 	@Override
 	public void decode(@NotNull ByteBuf byteBuf, ProtocolVersion protocolVersion) throws Exception {
 	}

src/main/java/com/viaversion/aas/codec/packet/common/AbstractPing.java

@@ -5,7 +5,7 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.NotNull;
 
-public class AbstractPing implements Packet {
+public abstract class AbstractPing implements Packet {
 	private long number;
 
 	public long getNumber() {

src/main/java/com/viaversion/aas/codec/packet/common/AbstractSingleChat.java

@@ -10,7 +10,7 @@ import com.viaversion.viaversion.util.ComponentUtil;
 import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.NotNull;
 
-public class AbstractSingleChat implements Packet {
+public abstract class AbstractSingleChat implements Packet {
 	private JsonElement msg;
 	private Tag msgTag;
 

src/main/java/com/viaversion/aas/codec/packet/common/AbstractSingleJson.java

@@ -8,7 +8,7 @@ import com.viaversion.viaversion.api.type.Type;
 import io.netty.buffer.ByteBuf;
 import org.jetbrains.annotations.NotNull;
 
-public class AbstractSingleJson implements Packet {
+public abstract class AbstractSingleJson implements Packet {
 	private JsonElement msg;
 
 	public JsonElement getMsg() {

src/main/java/com/viaversion/aas/codec/packet/configuration/ConfigurationCookieRequest.java

@@ -0,0 +1,6 @@
+package com.viaversion.aas.codec.packet.configuration;
+
+import com.viaversion.aas.codec.packet.common.AbstractCookieRequest;
+
+public class ConfigurationCookieRequest extends AbstractCookieRequest {
+}

src/main/java/com/viaversion/aas/codec/packet/configuration/ConfigurationCookieResponse.java

@@ -0,0 +1,6 @@
+package com.viaversion.aas.codec.packet.configuration;
+
+import com.viaversion.aas.codec.packet.common.AbstractCookieResponse;
+
+public class ConfigurationCookieResponse extends AbstractCookieResponse {
+}

src/main/java/com/viaversion/aas/codec/packet/login/LoginCookieRequest.java

@@ -0,0 +1,6 @@
+package com.viaversion.aas.codec.packet.login;
+
+import com.viaversion.aas.codec.packet.common.AbstractCookieRequest;
+
+public class LoginCookieRequest extends AbstractCookieRequest {
+}

src/main/java/com/viaversion/aas/codec/packet/login/LoginCookieResponse.java

@@ -0,0 +1,6 @@
+package com.viaversion.aas.codec.packet.login;
+
+import com.viaversion.aas.codec.packet.common.AbstractCookieResponse;
+
+public class LoginCookieResponse extends AbstractCookieResponse {
+}

src/main/kotlin/com/viaversion/aas/codec/packet/PacketRegistry.kt

@@ -49,7 +49,8 @@ object PacketRegistry {
     private val entriesDecoding = hashMapOf<Triple<State, Direction, Int>, RangeMap<ProtocolVersion, DecodingInfo>>()
 
     // direction, type, protocol version -> entry
-    private val entriesEncoding = hashMapOf<Pair<Direction, Class<out Packet>>, RangeMap<ProtocolVersion, EncodingInfo>>()
+    private val entriesEncoding =
+        hashMapOf<Pair<Direction, Class<out Packet>>, RangeMap<ProtocolVersion, EncodingInfo>>()
 
     init {
         // Obviously stolen from https://github.com/VelocityPowered/Velocity/blob/dev/1.1.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
@@ -59,49 +60,75 @@ object PacketRegistry {
         register(State.LOGIN, Direction.SERVERBOUND, ::CryptoResponse, Range.all(), 1)
         register(State.LOGIN, Direction.SERVERBOUND, ::PluginResponse, Range.atLeast(ProtocolVersion.v1_13), 2)
         register(State.LOGIN, Direction.SERVERBOUND, ::LoginAck, Range.atLeast(ProtocolVersion.v1_20_2), 3)
+        register(State.LOGIN, Direction.SERVERBOUND, ::LoginCookieResponse, Range.atLeast(ProtocolVersion.v1_20_5), 4)
 
         register(State.LOGIN, Direction.CLIENTBOUND, ::LoginDisconnect, Range.all(), 0)
         register(State.LOGIN, Direction.CLIENTBOUND, ::CryptoRequest, Range.all(), 1)
         register(State.LOGIN, Direction.CLIENTBOUND, ::LoginSuccess, Range.all(), 2)
         register(State.LOGIN, Direction.CLIENTBOUND, ::SetCompression, Range.atLeast(ProtocolVersion.v1_8), 3)
         register(State.LOGIN, Direction.CLIENTBOUND, ::PluginRequest, Range.atLeast(ProtocolVersion.v1_13), 4)
+        register(State.LOGIN, Direction.CLIENTBOUND, ::LoginCookieRequest, Range.atLeast(ProtocolVersion.v1_20_5), 5)
 
         register(State.STATUS, Direction.SERVERBOUND, ::StatusRequest, Range.all(), 0)
         register(State.STATUS, Direction.SERVERBOUND, ::StatusPing, Range.all(), 1)
         register(State.STATUS, Direction.CLIENTBOUND, ::StatusResponse, Range.all(), 0)
         register(State.STATUS, Direction.CLIENTBOUND, ::StatusPong, Range.all(), 1)
 
-        register(State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationPluginMessage, mapOf(
+        register(
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.CUSTOM_PAYLOAD.id,
+            State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationCookieRequest,
-            ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.CUSTOM_PAYLOAD.id
+            ProtocolVersion.v1_20_5.singleton, ClientboundConfigurationPackets1_20_5.COOKIE_REQUEST.id
-        ))
+        )
-        register(State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationDisconnect, mapOf(
+        register(
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.DISCONNECT.id,
+            State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationPluginMessage, mapOf(
-            ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.DISCONNECT.id
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.CUSTOM_PAYLOAD.id,
-        ))
+                ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.CUSTOM_PAYLOAD.id
-        register(State.CONFIGURATION, Direction.CLIENTBOUND, ::FinishConfig, mapOf(
+            )
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.FINISH_CONFIGURATION.id,
+        )
-            ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION.id
+        register(
-        ))
+            State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationDisconnect, mapOf(
-        register(State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationKeepAlive, mapOf(
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.DISCONNECT.id,
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.KEEP_ALIVE.id,
+                ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.DISCONNECT.id
-            ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.KEEP_ALIVE.id
+            )
-        ))
+        )
-        register(State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationTransfer, Range.atLeast(ProtocolVersion.v1_20_5),
+        register(
-            ClientboundConfigurationPackets1_20_5.TRANSFER.id)
+            State.CONFIGURATION, Direction.CLIENTBOUND, ::FinishConfig, mapOf(
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.FINISH_CONFIGURATION.id,
+                ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.FINISH_CONFIGURATION.id
+            )
+        )
+        register(
+            State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationKeepAlive, mapOf(
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ClientboundConfigurationPackets1_20_2.KEEP_ALIVE.id,
+                ProtocolVersion.v1_20_5.singleton to ClientboundConfigurationPackets1_20_5.KEEP_ALIVE.id
+            )
+        )
+        register(
+            State.CONFIGURATION, Direction.CLIENTBOUND, ::ConfigurationTransfer,
+            Range.atLeast(ProtocolVersion.v1_20_5), ClientboundConfigurationPackets1_20_5.TRANSFER.id
+        )
 
-        register(State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationPluginMessage, mapOf(
+        register(
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundConfigurationPackets1_20_2.CUSTOM_PAYLOAD.id,
+            State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationCookieResponse,
-            ProtocolVersion.v1_20_5.singleton to ServerboundConfigurationPackets1_20_5.CUSTOM_PAYLOAD.id
+            ProtocolVersion.v1_20_5.singleton, ServerboundConfigurationPackets1_20_5.COOKIE_RESPONSE.id
-        ))
+        )
-        register(State.CONFIGURATION, Direction.SERVERBOUND, ::FinishConfig, mapOf(
+        register(
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundConfigurationPackets1_20_2.FINISH_CONFIGURATION.id,
+            State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationPluginMessage, mapOf(
-            ProtocolVersion.v1_20_5.singleton to ServerboundConfigurationPackets1_20_5.FINISH_CONFIGURATION.id
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundConfigurationPackets1_20_2.CUSTOM_PAYLOAD.id,
-        ))
+                ProtocolVersion.v1_20_5.singleton to ServerboundConfigurationPackets1_20_5.CUSTOM_PAYLOAD.id
-        register(State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationKeepAlive, mapOf(
+            )
-            ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundConfigurationPackets1_20_2.KEEP_ALIVE.id,
+        )
-            ProtocolVersion.v1_20_5.singleton to ServerboundConfigurationPackets1_20_5.KEEP_ALIVE.id
+        register(
-        ))
+            State.CONFIGURATION, Direction.SERVERBOUND, ::FinishConfig, mapOf(
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundConfigurationPackets1_20_2.FINISH_CONFIGURATION.id,
+                ProtocolVersion.v1_20_5.singleton to ServerboundConfigurationPackets1_20_5.FINISH_CONFIGURATION.id
+            )
+        )
+        register(
+            State.CONFIGURATION, Direction.SERVERBOUND, ::ConfigurationKeepAlive, mapOf(
+                ProtocolVersion.v1_20_2..ProtocolVersion.v1_20_3 to ServerboundConfigurationPackets1_20_2.KEEP_ALIVE.id,
+                ProtocolVersion.v1_20_5.singleton to ServerboundConfigurationPackets1_20_5.KEEP_ALIVE.id
+            )
+        )
 
         register(
             State.PLAY, Direction.CLIENTBOUND, ::Kick, mapOf(
@@ -176,8 +203,7 @@ object PacketRegistry {
     private val ProtocolVersion.singleton get() = Range.singleton(this)
 
     private inline fun <reified P : Packet> register(
-        state: State,
+        state: State, direction: Direction,
-        direction: Direction,
         constructor: Supplier<P>,
         idByProtocol: Map<Range<ProtocolVersion>, Int>,
         klass: Class<P> = P::class.java,
@@ -204,11 +230,9 @@ object PacketRegistry {
     }
 
     private inline fun <reified P : Packet> register(
-        state: State,
+        state: State, direction: Direction,
-        direction: Direction,
         constructor: Supplier<P>,
-        protocol: Range<ProtocolVersion>,
+        protocol: Range<ProtocolVersion>, id: Int
-        id: Int
     ) {
         register(constructor = constructor, direction = direction, state = state, idByProtocol = mapOf(protocol to id))
     }
@@ -217,15 +241,16 @@ object PacketRegistry {
     data class EncodingInfo(val packetId: Int)
 
     private fun getPacketConstructor(
-        protocolVersion: ProtocolVersion,
+        protocolVersion: ProtocolVersion, state: State,
-        state: State,
+        id: Int, direction: Direction
-        id: Int,
-        direction: Direction
     ): Supplier<out Packet>? {
         return entriesDecoding[Triple(state, direction, id)]?.get(protocolVersion)?.constructor
     }
 
-    private fun getPacketId(packetClass: Class<out Packet>, protocolVersion: ProtocolVersion, direction: Direction): Int? {
+    private fun getPacketId(
+        packetClass: Class<out Packet>,
+        protocolVersion: ProtocolVersion, direction: Direction
+    ): Int? {
         return entriesEncoding[direction to packetClass]?.get(protocolVersion)?.packetId
     }
 

src/main/kotlin/com/viaversion/aas/handler/state/LoginState.kt

@@ -5,6 +5,7 @@ import com.google.gson.JsonPrimitive
 import com.viaversion.aas.*
 import com.viaversion.aas.codec.CryptoCodec
 import com.viaversion.aas.codec.packet.Packet
+import com.viaversion.aas.codec.packet.UnknownPacket
 import com.viaversion.aas.codec.packet.login.*
 import com.viaversion.aas.config.VIAaaSConfig
 import com.viaversion.aas.handler.MinecraftHandler
@@ -54,9 +55,9 @@ class LoginState : ConnectionState {
             is CryptoRequest -> handleCryptoRequest(handler, packet)
             is LoginSuccess -> handleLoginSuccess(handler, packet)
             is SetCompression -> handleCompression(handler, packet)
-            is PluginRequest -> forward(handler, packet)
             is LoginAck -> handleLoginAck(handler, packet)
-            else -> throw StacklessException("Invalid packet!")
+            is UnknownPacket -> throw StacklessException("unknown packet ${packet.id}")
+            else -> forward(handler, packet)
         }
     }