Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23w32a networking #3625

Merged
merged 1 commit into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions mappings/net/minecraft/class_8740.mapping

This file was deleted.

2 changes: 0 additions & 2 deletions mappings/net/minecraft/class_8763.mapping

This file was deleted.

3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/MinecraftClient.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_45293 guiAtlasManager Lnet/minecraft/class_8658;
FIELD field_45294 commandHistoryManager Lnet/minecraft/class_8657;
FIELD field_45295 symlinkFinder Lnet/minecraft/class_8580;
FIELD field_45901 fpsLog Lnet/minecraft/class_8743;
FIELD field_45902 pingPerformanceLog Lnet/minecraft/class_8743;
FIELD field_45903 receivedPacketSizeLog Lnet/minecraft/class_8743;
METHOD <init> (Lnet/minecraft/class_542;)V
ARG 1 args
METHOD method_1476 checkIs64Bit ()Z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ CLASS net/minecraft/class_7591 net/minecraft/client/gui/hud/MessageIndicator
FIELD field_40379 SYSTEM_TEXT Lnet/minecraft/class_2561;
FIELD field_41092 SINGLE_PLAYER_TEXT Lnet/minecraft/class_2561;
FIELD field_41093 SINGLE_PLAYER Lnet/minecraft/class_7591;
FIELD field_45897 ERROR_TEXT Lnet/minecraft/class_2561;
METHOD comp_902 loggedName ()Ljava/lang/String;
METHOD method_44709 notSecure ()Lnet/minecraft/class_7591;
METHOD method_44710 modified (Ljava/lang/String;)Lnet/minecraft/class_7591;
ARG 0 originalText
METHOD method_44751 system ()Lnet/minecraft/class_7591;
METHOD method_47391 singlePlayer ()Lnet/minecraft/class_7591;
METHOD method_53461 chatError ()Lnet/minecraft/class_7591;
CLASS class_7592 Icon
FIELD field_39766 width I
FIELD field_39767 height I
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/class_8760 net/minecraft/client/network/ChunkBatchSizeCalculator
FIELD field_45941 averageNanosPerChunk D
FIELD field_45942 sampleSize I
FIELD field_45943 startTime J
METHOD method_53483 onStartChunkSend ()V
METHOD method_53484 onChunkSent (I)V
ARG 1 batchSize
METHOD method_53485 getDesiredChunksPerTick ()F
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH
FIELD field_45593 postDisconnectScreen Lnet/minecraft/class_437;
FIELD field_45594 LOST_CONNECTION_TEXT Lnet/minecraft/class_2561;
FIELD field_45595 queuedPackets Ljava/util/List;
FIELD field_45944 LOGGER Lorg/slf4j/Logger;
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
ARG 1 client
ARG 2 connection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
FIELD field_40799 session Lnet/minecraft/class_7818;
FIELD field_45600 enabledFeatures Lnet/minecraft/class_7699;
FIELD field_45603 RECONFIGURING_TEXT Lnet/minecraft/class_2561;
FIELD field_45945 chunkBatchSizeCalculator Lnet/minecraft/class_8760;
FIELD field_45946 pingMeasurer Lnet/minecraft/class_8761;
FIELD field_45947 displayedUnsecureChatWarning Z
METHOD <init> (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V
ARG 1 client
METHOD method_16690 getSessionId ()Ljava/util/UUID;
Expand Down Expand Up @@ -122,3 +125,4 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
METHOD method_48296 getConnection ()Lnet/minecraft/class_2535;
METHOD method_51684 unloadChunk (Lnet/minecraft/class_2666;)V
ARG 1 packet
METHOD method_52802 refreshTagBasedData ()V
9 changes: 9 additions & 0 deletions mappings/net/minecraft/client/network/PingMeasurer.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
CLASS net/minecraft/class_8761 net/minecraft/client/network/PingMeasurer
FIELD field_45948 handler Lnet/minecraft/class_634;
FIELD field_45949 log Lnet/minecraft/class_8743;
METHOD <init> (Lnet/minecraft/class_634;Lnet/minecraft/class_8743;)V
ARG 1 handler
ARG 2 log
METHOD method_53486 ping ()V
METHOD method_53487 onPingResult (Lnet/minecraft/class_2923;)V
ARG 1 packet
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
FIELD field_39796 delayedMessages Ljava/util/Deque;
FIELD field_39797 chatDelay J
FIELD field_39798 lastProcessTime J
FIELD field_45950 VALIDATION_ERROR_TEXT Lnet/minecraft/class_2561;
METHOD <init> (Lnet/minecraft/class_310;)V
ARG 1 client
METHOD method_44732 getStatus (Lnet/minecraft/class_7471;Lnet/minecraft/class_2561;Ljava/time/Instant;)Lnet/minecraft/class_7595;
Expand Down Expand Up @@ -101,6 +102,9 @@ CLASS net/minecraft/class_7594 net/minecraft/client/network/message/MessageHandl
ARG 1 message
ARG 2 sender
ARG 3 params
METHOD method_53488 onUnverifiedMessage (Ljava/util/UUID;Lnet/minecraft/class_2556$class_7602;)V
ARG 1 sender
ARG 2 parameters
CLASS class_7627 ProcessableMessage
COMMENT A message to be processed. An instance is created for each received message.
METHOD method_45750 accept ()Z
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/client/option/GameOptions.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
FIELD field_43043 HIGH_CONTRAST_TOOLTIP Lnet/minecraft/class_2561;
FIELD field_43044 highContrast Lnet/minecraft/class_7172;
FIELD field_43110 MAX_SERIALIZABLE_GUI_SCALE I
FIELD field_45904 debugPacketSizeEnabled Z
METHOD <init> (Lnet/minecraft/class_310;Ljava/io/File;)V
ARG 1 client
ARG 2 optionsFile
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/network/ClientConnection.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
FIELD field_45667 CLIENTBOUND_PROTOCOL_KEY Lio/netty/util/AttributeKey;
FIELD field_45668 queuedTasks Ljava/util/Queue;
FIELD field_45669 prePlayStateListener Lnet/minecraft/class_2547;
FIELD field_45955 packetSizeLogger Lnet/minecraft/class_8762;
METHOD <init> (Lnet/minecraft/class_2598;)V
ARG 1 side
METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V
Expand Down Expand Up @@ -62,7 +63,9 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
ARG 1 packet
ARG 2 callbacks
METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_8743;)Lnet/minecraft/class_2535;
ARG 0 address
ARG 1 useEpoll
ARG 2 packetSizeLog
METHOD method_10754 tick ()V
METHOD method_10755 getAddress ()Ljava/net/SocketAddress;
METHOD method_10756 isLocal ()Z
Expand Down Expand Up @@ -123,6 +126,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;Lnet/minecraft/class_8762;)V
ARG 0 pipeline
ARG 1 side
ARG 2 packetSizeLogger
METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture;
ARG 0 address
ARG 1 useEpoll
Expand Down Expand Up @@ -174,6 +178,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
ARG 0 pipeline
ARG 1 side
METHOD method_52918 flushInternal ()V
METHOD method_53505 resetPacketSizeLog (Lnet/minecraft/class_8743;)V
ARG 1 log
CLASS 1
METHOD initChannel (Lio/netty/channel/Channel;)V
ARG 1 channel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CLASS net/minecraft/class_7822 net/minecraft/network/encryption/PublicPlayerSess
FIELD comp_1086 publicKeyData Lnet/minecraft/class_7428;
METHOD comp_1086 publicKeyData ()Lnet/minecraft/class_7428;
METHOD method_46296 createVerifier (Ljava/time/Duration;)Lnet/minecraft/class_7615;
ARG 1 gracePeriod
METHOD method_46297 createUnpacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611;
ARG 1 sender
METHOD method_46298 toSerialized ()Lnet/minecraft/class_7822$class_7823;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/class_8762 net/minecraft/network/handler/PacketSizeLogger
FIELD field_45953 packetSizeInBytes Ljava/util/concurrent/atomic/AtomicInteger;
FIELD field_45954 log Lnet/minecraft/class_8743;
METHOD <init> (Lnet/minecraft/class_8743;)V
ARG 1 log
METHOD method_53503 push ()V
METHOD method_53504 increment (I)V
ARG 1 bytes
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
CLASS net/minecraft/class_2550 net/minecraft/network/handler/SplitterHandler
FIELD field_45690 LENGTH_BYTES I
FIELD field_45691 reusableBuf Lio/netty/buffer/ByteBuf;
FIELD field_45956 packetSizeLogger Lnet/minecraft/class_8762;
METHOD <init> (Lnet/minecraft/class_8762;)V
ARG 1 packetSizeLogger
METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V
ARG 1 ctx
ARG 2 buf
ARG 3 bytes
METHOD handlerRemoved0 (Lio/netty/channel/ChannelHandlerContext;)V
ARG 1 context
METHOD method_53022 shouldSplit (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)Z
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_8763 net/minecraft/network/listener/ClientPingResultPacketListener
METHOD method_12666 onPingResult (Lnet/minecraft/class_2923;)V
COMMENT Handles a packet from the server that includes the "ping" (connection latency).
COMMENT This is different from {@link net.minecraft.network.c2s.common.CommonPongS2CPacket},
COMMENT which is sent by the client to acknowledgment a ping packet from the server.
ARG 1 packet
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_8740 net/minecraft/network/listener/ServerQueryPingPacketListener
METHOD method_12697 onQueryPing (Lnet/minecraft/class_2935;)V
COMMENT Handles a packet from client to query the "ping" (connection latency).
COMMENT This is different from {@link net.minecraft.network.s2c.common.CommonPingS2CPacket},
COMMENT which can be sent by the server to request acknowledgment.
ARG 1 packet
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,22 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier
COMMENT as it affects the verification result.
FIELD field_40695 NO_SIGNATURE Lnet/minecraft/class_7615;
FIELD field_40696 UNVERIFIED Lnet/minecraft/class_7615;
FIELD field_45957 LOGGER Lorg/slf4j/Logger;
METHOD method_45048 isVerified (Lnet/minecraft/class_7471;)Z
ARG 1 message
METHOD method_53507 (Lnet/minecraft/class_7471;)Z
ARG 0 message
METHOD method_53508 (Lnet/minecraft/class_7471;)Z
ARG 0 message
CLASS class_7616 Impl
FIELD field_39821 lastMessageVerified Z
FIELD field_39822 signatureVerifier Lnet/minecraft/class_7500;
FIELD field_40697 lastVerifiedMessage Lnet/minecraft/class_7471;
FIELD field_45958 expirationChecker Ljava/util/function/BooleanSupplier;
METHOD <init> (Lnet/minecraft/class_7500;Ljava/util/function/BooleanSupplier;)V
ARG 1 signatureVerifier
ARG 2 expirationChecker
METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7471;)Z
ARG 1 message
METHOD method_53509 verify (Lnet/minecraft/class_7471;)Z
ARG 1 message
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/QueryPongS2CPacket
CLASS net/minecraft/class_2923 net/minecraft/network/packet/s2c/query/PingResultS2CPacket
FIELD field_13280 startTime J
METHOD <init> (J)V
ARG 1 startTime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH
FIELD field_45017 waitingForKeepAlive Z
FIELD field_45018 keepAliveId J
FIELD field_45019 latency I
FIELD field_45715 flushDisabled Z
METHOD <init> (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;I)V
ARG 1 server
ARG 2 connection
ARG 3 keepAliveId
METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V
Expand All @@ -23,3 +25,5 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH
METHOD method_52403 getProfile ()Lcom/mojang/authlib/GameProfile;
METHOD method_52404 getDebugProfile ()Lcom/mojang/authlib/GameProfile;
METHOD method_52405 getLatency ()I
METHOD method_53046 disableFlush ()V
METHOD method_53047 enableFlush ()V
14 changes: 14 additions & 0 deletions mappings/net/minecraft/util/profiler/PerformanceLog.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
CLASS net/minecraft/class_8743 net/minecraft/util/profiler/PerformanceLog
FIELD field_45719 SIZE I
FIELD field_45720 data [J
FIELD field_45721 currentIndex I
FIELD field_45722 maxIndex I
METHOD method_53064 size ()I
METHOD method_53065 get (I)J
ARG 1 index
METHOD method_53066 push (J)V
ARG 1 value
METHOD method_53067 getMaxIndex ()I
METHOD method_53068 wrap (I)I
ARG 1 index
METHOD method_53069 reset ()V