From af6d2df045c69ac7e56eff00e0ed3033abf19430 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Thu, 28 Apr 2022 17:20:42 +0200 Subject: [PATCH] 22w17a: Network stuff + more (#3121) * 22w17a: map chat message packet * goat: horns * map signed chat message * Add missing new class mappings * apply suggestions from @enbrain * rename class_7428 to PlayerPublicKey * network: apply suggestions * fix wrong package for SignedChatMessageS2CPacket * rename ChatMessageS2CP to GameMessage * fix ChatMessageS2C name, ChatMessageC2S: rename instant to time * remove comp mappings --- .../minecraft/entity/passive/GoatEntity.mapping | 6 ++++++ .../minecraft/network/ChatMessageSender.mapping | 5 +++++ .../encryption/NetworkEncryptionUtils.mapping | 12 ++++++++++++ .../network/encryption/PlayerPublicKey.mapping | 17 +++++++++++++++++ .../listener/ClientPlayPacketListener.mapping | 4 ++++ .../c2s/play/ChatMessageC2SPacket.mapping | 13 +++++++++++++ .../s2c/play/ChatMessageS2CPacket.mapping | 6 ++++++ .../s2c/play/GameMessageS2CPacket.mapping | 3 +++ .../net/minecraft/util/dynamic/Codecs.mapping | 1 + 9 files changed, 67 insertions(+) create mode 100644 mappings/net/minecraft/network/ChatMessageSender.mapping create mode 100644 mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping index 5d76995dac..26f192f856 100644 --- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity FIELD field_33487 preparingRam Z FIELD field_34022 DEFAULT_ATTACK_DAMAGE I FIELD field_34023 BABY_ATTACK_DAMAGE I + FIELD field_39047 LEFT_HORN Lnet/minecraft/class_2940; + FIELD field_39048 RIGHT_HORN Lnet/minecraft/class_2940; METHOD method_35178 isScreaming ()Z METHOD method_35179 createGoatAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_35180 getMilkingSound ()Lnet/minecraft/class_3414; @@ -20,3 +22,7 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_43538 hasLeftHorn ()Z + METHOD method_43539 hasRightHorn ()Z + METHOD method_43541 addHorns ()V + METHOD method_43542 removeHorns ()V diff --git a/mappings/net/minecraft/network/ChatMessageSender.mapping b/mappings/net/minecraft/network/ChatMessageSender.mapping new file mode 100644 index 0000000000..54b694bdf5 --- /dev/null +++ b/mappings/net/minecraft/network/ChatMessageSender.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_7436 net/minecraft/network/ChatMessageSender + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_43625 write (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping index e06af8c53d..bededcc389 100644 --- a/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping +++ b/mappings/net/minecraft/network/encryption/NetworkEncryptionUtils.mapping @@ -35,3 +35,15 @@ CLASS net/minecraft/class_3515 net/minecraft/network/encryption/NetworkEncryptio ARG 0 opMode ARG 1 key ARG 2 data + METHOD method_43523 updateSignature (Ljava/security/Signature;JLjava/util/UUID;Ljava/time/Instant;Ljava/lang/String;)V + ARG 0 signature + ARG 3 uuid + ARG 4 time + ARG 5 message + CLASS class_7425 SignatureData + METHOD method_43528 isSignaturePresent ()Z + METHOD method_43529 write (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_7426 SecureRandomUtil + FIELD field_39041 SECURE_RANDOM Ljava/security/SecureRandom; + METHOD method_43531 nextLong ()J diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping new file mode 100644 index 0000000000..ced54ad855 --- /dev/null +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey + FIELD field_39051 PUBLIC_KEY Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/util/Pair;Ljava/lang/String;)V + ARG 1 expiresAtAndKey + ARG 2 signature + METHOD method_43548 toProperty ()Lcom/mojang/authlib/properties/Property; + METHOD method_43549 (Lcom/mojang/authlib/GameProfile;)Ljava/util/Optional; + ARG 0 gameProfile + METHOD method_43550 (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lnet/minecraft/class_7428$class_7429; + ARG 1 sessionService + METHOD method_43552 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 key + METHOD method_43554 isExpired ()Z + METHOD method_43555 (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; + ARG 1 gameProfile + CLASS class_7429 + METHOD method_43557 createSignatureInstance ()Ljava/security/Signature; diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 0cf9ce96b8..40c6a326f7 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -197,3 +197,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_39025 onSimulationDistance (Lnet/minecraft/class_6682;)V ARG 1 packet + METHOD method_43595 onChatMessage (Lnet/minecraft/class_7438;)V + ARG 1 packet + METHOD method_43596 onGameMessage (Lnet/minecraft/class_7439;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping index 36ce0a1791..7c3a35b1c5 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.mapping @@ -14,8 +14,21 @@ CLASS net/minecraft/class_2797 net/minecraft/network/packet/c2s/play/ChatMessage COMMENT @see net.minecraft.server.network.ServerPlayNetworkHandler#onChatMessage FIELD field_12764 chatMessage Ljava/lang/String; FIELD field_33359 MAX_LENGTH I + FIELD field_39086 TWO_MINUTES Ljava/time/Duration; + FIELD field_39087 time Ljava/time/Instant; + FIELD field_39088 signature Lnet/minecraft/class_3515$class_7425; METHOD (Ljava/time/Instant;Ljava/lang/String;Lnet/minecraft/class_3515$class_7425;)V + ARG 1 time ARG 2 chatMessage + ARG 3 signature METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_12114 getChatMessage ()Ljava/lang/String; + METHOD method_43632 truncateMessage (Ljava/lang/String;)Ljava/lang/String; + ARG 0 message + METHOD method_43633 (Ljava/time/Instant;)Z + ARG 1 time + METHOD method_43634 getTime ()Ljava/time/Instant; + METHOD method_43635 getNormalizedChatMessage ()Ljava/lang/String; + METHOD method_43636 getSignature ()Lnet/minecraft/class_3515$class_7425; + METHOD method_43637 offsetInstantTime ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping new file mode 100644 index 0000000000..48aed72ef0 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_7438 net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf + METHOD method_43627 isSignatureValid (Lnet/minecraft/class_7428$class_7429;)Z + METHOD method_43628 (Ljava/time/Instant;)Z + ARG 1 sendingTime diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping new file mode 100644 index 0000000000..41a1bc2f51 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7439 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket + METHOD (Lnet/minecraft/class_2540;)V + ARG 1 buf diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 3fdded543f..fe4afe29e6 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_34387 POSITIVE_FLOAT Lcom/mojang/serialization/Codec; FIELD field_37408 REGULAR_EXPRESSION Lcom/mojang/serialization/Codec; FIELD field_38081 UUID Lcom/mojang/serialization/Codec; + FIELD field_39042 INSTANT Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT