From 5fa5a01590807d75cd37b45c376411b773b4d8ee Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Sat, 16 Feb 2019 21:50:10 +0100 Subject: [PATCH] map login packets (#463) --- .../client/network/ClientLoginNetworkHandler.mapping | 5 +++++ .../network/packet/LoginCompressionS2CPacket.mapping | 2 ++ .../network/packet/LoginDisconnectS2CPacket.mapping | 3 +++ .../network/packet/LoginHelloS2CPacket.mapping | 5 +++++ .../packet/LoginQueryRequestS2CPacket.mapping | 5 +++++ .../network/packet/LoginSuccessS2CPacket.mapping | 2 ++ .../net/minecraft/network/ClientConnection.mapping | 12 ++++++++++-- .../minecraft/network/NetworkEncryptionUtils.mapping | 1 + .../listener/ClientLoginPacketListener.mapping | 9 +++++++++ .../listener/ClientPlayPacketListener.mapping | 1 + .../network/listener/PacketListener.mapping | 4 ++-- .../listener/ServerLoginPacketListener.mapping | 1 + mappings/net/minecraft/server/PlayerManager.mapping | 1 + mappings/net/minecraft/server/ServerMetadata.mapping | 9 +++++++++ .../server/network/ServerLoginNetworkHandler.mapping | 2 ++ .../packet/LoginQueryResponseC2SPacket.mapping | 3 +++ 16 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping create mode 100644 mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping create mode 100644 mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping create mode 100644 mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping create mode 100644 mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping create mode 100644 mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping diff --git a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping index c73346c61d..f9437073ce 100644 --- a/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientLoginNetworkHandler.mapping @@ -2,9 +2,14 @@ CLASS dcp net/minecraft/client/network/ClientLoginNetworkHandler FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b client Lcqn; FIELD c parentGui Lcut; + FIELD d statusConsumer Ljava/util/function/Consumer; FIELD e connection Liu; FIELD f playerProfile Lcom/mojang/authlib/GameProfile; METHOD (Liu;Lcqn;Lcut;Ljava/util/function/Consumer;)V ARG 1 connection ARG 2 client ARG 3 parentGui + ARG 4 statusConsumer + METHOD a joinServerSession (Ljava/lang/String;)Ljg; + ARG 1 serverId + METHOD b getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; diff --git a/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping new file mode 100644 index 0000000000..5b4bb92265 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/LoginCompressionS2CPacket.mapping @@ -0,0 +1,2 @@ +CLASS pg net/minecraft/client/network/packet/LoginCompressionS2CPacket + METHOD b getMinCompressedSize ()I diff --git a/mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping new file mode 100644 index 0000000000..34d648f478 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/LoginDisconnectS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS ph net/minecraft/client/network/packet/LoginDisconnectS2CPacket + FIELD a reason Ljg; + METHOD b getReason ()Ljg; diff --git a/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping new file mode 100644 index 0000000000..89fe8293a2 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/LoginHelloS2CPacket.mapping @@ -0,0 +1,5 @@ +CLASS pf net/minecraft/client/network/packet/LoginHelloS2CPacket + FIELD a serverId Ljava/lang/String; + FIELD b publicKey Ljava/security/PublicKey; + METHOD b getServerId ()Ljava/lang/String; + METHOD c getPublicKey ()Ljava/security/PublicKey; diff --git a/mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping new file mode 100644 index 0000000000..f42a7a1b11 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/LoginQueryRequestS2CPacket.mapping @@ -0,0 +1,5 @@ +CLASS pd net/minecraft/client/network/packet/LoginQueryRequestS2CPacket + FIELD a queryId I + FIELD b channel Lqh; + FIELD c payload Liw; + METHOD b getQueryId ()I diff --git a/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping new file mode 100644 index 0000000000..f499f294d3 --- /dev/null +++ b/mappings/net/minecraft/client/network/packet/LoginSuccessS2CPacket.mapping @@ -0,0 +1,2 @@ +CLASS pe net/minecraft/client/network/packet/LoginSuccessS2CPacket + METHOD b getPlayerProfile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index aab7b0c58e..88dc745265 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -1,4 +1,6 @@ CLASS iu net/minecraft/network/ClientConnection + FIELD a MARKER_NETWORK Lorg/apache/logging/log4j/Marker; + FIELD b MARKER_NETWORK_PACKETS Lorg/apache/logging/log4j/Marker; FIELD c ATTR_KEY_PROTOCOL Lio/netty/util/AttributeKey; FIELD d CLIENT_IO_GROUP Lze; FIELD e CLIENT_IO_GROUP_EPOLL Lze; @@ -12,6 +14,11 @@ CLASS iu net/minecraft/network/ClientConnection FIELD n disconnectReason Ljg; FIELD o encrypted Z FIELD p disconnected Z + FIELD q packetsReceivedCounter I + FIELD r packetsSentCounter I + FIELD s avgPacketsReceived F + FIELD t avgPacketsSent F + FIELD u ticks I METHOD a tick ()V METHOD a setMinCompressedSize (I)V METHOD a setState (Liv;)V @@ -34,6 +41,7 @@ CLASS iu net/minecraft/network/ClientConnection METHOD h hasChannel ()Z METHOD i getPacketListener ()Liz; METHOD j getDisconnectReason ()Ljg; + METHOD k disableAutoRead ()V METHOD l handleDisconnection ()V - METHOD m getPacketsReceived ()F - METHOD n getPacketsSent ()F + METHOD m getAveragePacketsReceived ()F + METHOD n getAveragePacketsSent ()F diff --git a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping index c43b3126fe..5ed5744ec3 100644 --- a/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/NetworkEncryptionUtils.mapping @@ -18,6 +18,7 @@ CLASS yx net/minecraft/network/NetworkEncryptionUtils METHOD a encrypt (Ljava/security/Key;[B)[B ARG 0 key ARG 1 data + METHOD a readEncodedPublicKey ([B)Ljava/security/PublicKey; METHOD b generateServerKeyPair ()Ljava/security/KeyPair; METHOD b decrypt (Ljava/security/Key;[B)[B ARG 0 key diff --git a/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping index 7eb8900d80..2430e1a2f0 100644 --- a/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientLoginPacketListener.mapping @@ -1 +1,10 @@ CLASS pc net/minecraft/network/listener/ClientLoginPacketListener + METHOD a onQueryRequest (Lpd;)V + ARG 1 packet + METHOD a onLoginSuccess (Lpe;)V + METHOD a onHello (Lpf;)V + ARG 1 packet + METHOD a onCompression (Lpg;)V + ARG 1 packet + METHOD a onDisconnect (Lph;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 07676c3a9b..88af5e0150 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -78,6 +78,7 @@ CLASS jx net/minecraft/network/listener/ClientPlayPacketListener METHOD a onMapUpdate (Llk;)V ARG 1 packet METHOD a onSetVillagerRecipes (Lll;)V + ARG 1 packet METHOD a onEntityUpdate (Llm;)V ARG 1 packet METHOD a onVehicleMove (Lln;)V diff --git a/mappings/net/minecraft/network/listener/PacketListener.mapping b/mappings/net/minecraft/network/listener/PacketListener.mapping index 77067ca90c..10ceaff6ee 100644 --- a/mappings/net/minecraft/network/listener/PacketListener.mapping +++ b/mappings/net/minecraft/network/listener/PacketListener.mapping @@ -1,3 +1,3 @@ CLASS iz net/minecraft/network/listener/PacketListener - METHOD a onConnectionLost (Ljg;)V - ARG 1 disconnectReason + METHOD a onDisconnected (Ljg;)V + ARG 1 reason diff --git a/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping index 2ad5fdea2b..b01dd6731d 100644 --- a/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerLoginPacketListener.mapping @@ -1,3 +1,4 @@ CLASS pi net/minecraft/network/listener/ServerLoginPacketListener + METHOD a onQueryResponse (Lpj;)V METHOD a onHello (Lpk;)V METHOD a onKey (Lpl;)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index d3865319a8..c598f10af9 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -40,6 +40,7 @@ CLASS xe net/minecraft/server/PlayerManager METHOD a onPlayerConnect (Liu;Luv;)V ARG 1 connection METHOD a getPlayer (Ljava/lang/String;)Luv; + METHOD a checkCanJoin (Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Ljg; METHOD a getPlayer (Ljava/util/UUID;)Luv; METHOD a sendToAll (Ljg;)V METHOD a broadcastChatMessage (Ljg;Z)V diff --git a/mappings/net/minecraft/server/ServerMetadata.mapping b/mappings/net/minecraft/server/ServerMetadata.mapping index 44b9c72239..4cc1a8e612 100644 --- a/mappings/net/minecraft/server/ServerMetadata.mapping +++ b/mappings/net/minecraft/server/ServerMetadata.mapping @@ -1,5 +1,8 @@ CLASS pr net/minecraft/server/ServerMetadata CLASS pr$a Players + CLASS pr$a$a Deserializer + METHOD a fromJson (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lpr$a; + METHOD a toJson (Lpr$a;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; FIELD a max I FIELD b online I FIELD c sample [Lcom/mojang/authlib/GameProfile; @@ -9,7 +12,13 @@ CLASS pr net/minecraft/server/ServerMetadata METHOD a setSample ([Lcom/mojang/authlib/GameProfile;)V METHOD b getOnlinePlayerCount ()I METHOD c getSample ()[Lcom/mojang/authlib/GameProfile; + CLASS pr$b Deserializer + METHOD a fromJson (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lpr; + METHOD a toJson (Lpr;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; CLASS pr$c Version + CLASS pr$c$a Serializer + METHOD a fromJson (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lpr$c; + METHOD a toJson (Lpr$c;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; FIELD a gameVersion Ljava/lang/String; FIELD b protocolVersion I METHOD a getGameVersion ()Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping index 409362fd41..ec11b3ba15 100644 --- a/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping @@ -1,12 +1,14 @@ CLASS vp net/minecraft/server/network/ServerLoginNetworkHandler CLASS vp$a State FIELD a client Liu; + FIELD b authenticatorThreadId Ljava/util/concurrent/atomic/AtomicInteger; FIELD c LOGGER Lorg/apache/logging/log4j/Logger; FIELD d RANDOM Ljava/util/Random; FIELD f server Lnet/minecraft/server/MinecraftServer; FIELD g state Lvp$a; FIELD h loginTicks I FIELD i profile Lcom/mojang/authlib/GameProfile; + FIELD k secretKey Ljavax/crypto/SecretKey; FIELD l clientEntity Luv; METHOD a toOfflineProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; METHOD b disconnect (Ljg;)V diff --git a/mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping b/mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping new file mode 100644 index 0000000000..6800ee9f57 --- /dev/null +++ b/mappings/net/minecraft/server/network/packet/LoginQueryResponseC2SPacket.mapping @@ -0,0 +1,3 @@ +CLASS pj net/minecraft/server/network/packet/LoginQueryResponseC2SPacket + FIELD a queryId I + FIELD b response Liw;