mirror of https://github.com/FabricMC/yarn.git
21w19a network stuff (#2394)
* 21w19a network stuff * Address some problems (pun intended) * Fix some names
This commit is contained in:
parent
fc60dab1ad
commit
189122a550
|
@ -12,8 +12,19 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen
|
|||
COMMENT @see net.minecraft.client.MinecraftClient#integratedServerConnection
|
||||
FIELD field_2412 parent Lnet/minecraft/class_437;
|
||||
FIELD field_2413 status Lnet/minecraft/class_2561;
|
||||
FIELD field_32238 NARRATOR_INTERVAL J
|
||||
FIELD field_33736 BLOCKED_HOST_TEXT Lnet/minecraft/class_2561;
|
||||
METHOD <init> (Lnet/minecraft/class_437;)V
|
||||
ARG 1 parent
|
||||
METHOD method_19800 (Lnet/minecraft/class_4185;)V
|
||||
ARG 1 button
|
||||
METHOD method_2130 connect (Lnet/minecraft/class_310;Lnet/minecraft/class_639;)V
|
||||
ARG 1 client
|
||||
ARG 2 address
|
||||
METHOD method_2131 setStatus (Lnet/minecraft/class_2561;)V
|
||||
ARG 1 status
|
||||
METHOD method_36877 connect (Lnet/minecraft/class_437;Lnet/minecraft/class_310;Lnet/minecraft/class_639;Lnet/minecraft/class_642;)V
|
||||
ARG 0 screen
|
||||
ARG 1 client
|
||||
ARG 2 address
|
||||
ARG 3 info
|
||||
|
|
|
@ -26,6 +26,12 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi
|
|||
METHOD method_20126 setLanServers (Ljava/util/List;)V
|
||||
ARG 1 lanServers
|
||||
METHOD method_20131 updateEntries ()V
|
||||
METHOD method_30016 (Lnet/minecraft/class_4267$class_504;)Z
|
||||
ARG 0 entry
|
||||
METHOD method_36888 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V
|
||||
ARG 1 lanServer
|
||||
METHOD method_36889 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V
|
||||
ARG 1 server
|
||||
CLASS class_504 Entry
|
||||
CLASS class_4268 ScanningEntry
|
||||
FIELD field_19112 client Lnet/minecraft/class_310;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
CLASS net/minecraft/class_742 net/minecraft/client/network/AbstractClientPlayerEntity
|
||||
FIELD field_17892 clientWorld Lnet/minecraft/class_638;
|
||||
FIELD field_32666 SKIN_URL Ljava/lang/String;
|
||||
FIELD field_3898 elytraRoll F
|
||||
FIELD field_3899 elytraYaw F
|
||||
FIELD field_3900 elytraPitch F
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
CLASS net/minecraft/class_6368 net/minecraft/client/network/Address
|
||||
METHOD method_36898 getHostName ()Ljava/lang/String;
|
||||
METHOD method_36899 create (Ljava/net/InetSocketAddress;)Lnet/minecraft/class_6368;
|
||||
ARG 0 address
|
||||
METHOD method_36900 getHostAddress ()Ljava/lang/String;
|
||||
METHOD method_36901 getPort ()I
|
||||
METHOD method_36902 getInetSocketAddress ()Ljava/net/InetSocketAddress;
|
|
@ -0,0 +1,7 @@
|
|||
CLASS net/minecraft/class_6369 net/minecraft/client/network/AddressResolver
|
||||
FIELD field_33743 LOGGER Lorg/apache/logging/log4j/Logger;
|
||||
FIELD field_33744 DEFAULT Lnet/minecraft/class_6369;
|
||||
METHOD method_36903 (Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 0 address
|
||||
METHOD resolve (Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 1 address
|
|
@ -0,0 +1,18 @@
|
|||
CLASS net/minecraft/class_6370 net/minecraft/client/network/AllowedAddressResolver
|
||||
FIELD field_33745 DEFAULT Lnet/minecraft/class_6370;
|
||||
FIELD field_33746 addressResolver Lnet/minecraft/class_6369;
|
||||
FIELD field_33747 redirectResolver Lnet/minecraft/class_6371;
|
||||
FIELD field_33748 isAllowed Ljava/util/function/Predicate;
|
||||
METHOD <init> (Lnet/minecraft/class_6369;Lnet/minecraft/class_6371;Ljava/util/function/Predicate;)V
|
||||
ARG 1 addressResolver
|
||||
ARG 2 redirectResolver
|
||||
ARG 3 isBlocked
|
||||
METHOD method_36904 getBlockListPredicate ()Ljava/util/function/Predicate;
|
||||
METHOD method_36905 (Lcom/google/common/collect/ImmutableList;Lnet/minecraft/class_6368;)Z
|
||||
ARG 1 address
|
||||
METHOD method_36906 (Lnet/minecraft/class_6368;Ljava/util/function/Predicate;)Z
|
||||
ARG 1 predicate
|
||||
METHOD method_36907 resolve (Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 1 address
|
||||
METHOD method_36908 getAllowedAddress (Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 1 address
|
|
@ -13,3 +13,8 @@ CLASS net/minecraft/class_635 net/minecraft/client/network/ClientLoginNetworkHan
|
|||
METHOD method_2891 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
|
||||
METHOD method_2892 joinServerSession (Ljava/lang/String;)Lnet/minecraft/class_2561;
|
||||
ARG 1 serverId
|
||||
METHOD method_2894 (Ljava/lang/String;Lnet/minecraft/class_2917;Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V
|
||||
ARG 1 serverId
|
||||
ARG 2 packet
|
||||
ARG 3 decryptionCipher
|
||||
ARG 4 encryptionCipher
|
||||
|
|
|
@ -12,5 +12,7 @@ CLASS net/minecraft/class_1134 net/minecraft/client/network/LanServerQueryManage
|
|||
FIELD field_5537 dirty Z
|
||||
METHOD method_4823 needsUpdate ()Z
|
||||
METHOD method_4824 addServer (Ljava/lang/String;Ljava/net/InetAddress;)V
|
||||
ARG 1 announcement
|
||||
ARG 2 address
|
||||
METHOD method_4825 markClean ()V
|
||||
METHOD method_4826 getServers ()Ljava/util/List;
|
||||
|
|
|
@ -1,13 +1,31 @@
|
|||
CLASS net/minecraft/class_644 net/minecraft/client/network/MultiplayerServerListPinger
|
||||
FIELD field_33740 CANNOT_CONNECT_TEXT Lnet/minecraft/class_2561;
|
||||
FIELD field_3769 clientConnections Ljava/util/List;
|
||||
FIELD field_3770 ZERO_SPLITTER Lcom/google/common/base/Splitter;
|
||||
FIELD field_3771 LOGGER Lorg/apache/logging/log4j/Logger;
|
||||
METHOD method_27647 createPlayerCountText (II)Lnet/minecraft/class_2561;
|
||||
ARG 0 current
|
||||
ARG 1 max
|
||||
METHOD method_3000 tick ()V
|
||||
METHOD method_3001 ping (Ljava/net/InetSocketAddress;Lnet/minecraft/class_642;)V
|
||||
ARG 1 address
|
||||
ARG 2 info
|
||||
METHOD method_3003 add (Lnet/minecraft/class_642;Ljava/lang/Runnable;)V
|
||||
ARG 1 entry
|
||||
METHOD method_3004 cancel ()V
|
||||
METHOD method_36897 showError (Lnet/minecraft/class_2561;Lnet/minecraft/class_642;)V
|
||||
ARG 1 error
|
||||
ARG 2 info
|
||||
CLASS 1
|
||||
FIELD field_3772 startTime J
|
||||
FIELD field_3773 received Z
|
||||
FIELD field_3775 sentQuery Z
|
||||
CLASS 2
|
||||
METHOD initChannel (Lio/netty/channel/Channel;)V
|
||||
ARG 1 channel
|
||||
CLASS 1
|
||||
METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V
|
||||
ARG 1 context
|
||||
METHOD channelRead0 (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V
|
||||
ARG 1 context
|
||||
ARG 2 buf
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
|
||||
FIELD field_3738 health I
|
||||
FIELD field_3739 latency I
|
||||
FIELD field_3740 texturesLoaded Z
|
||||
FIELD field_3741 profile Lcom/mojang/authlib/GameProfile;
|
||||
|
@ -6,9 +7,14 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
|
|||
FIELD field_3743 displayName Lnet/minecraft/class_2561;
|
||||
FIELD field_3744 gameMode Lnet/minecraft/class_1934;
|
||||
FIELD field_3745 model Ljava/lang/String;
|
||||
FIELD field_3746 showTime J
|
||||
METHOD <init> (Lnet/minecraft/class_2703$class_2705;)V
|
||||
ARG 1 playerListPacketEntry
|
||||
METHOD method_2955 getScoreboardTeam ()Lnet/minecraft/class_268;
|
||||
METHOD method_2956 (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V
|
||||
ARG 1 type
|
||||
ARG 2 id
|
||||
ARG 3 texture
|
||||
METHOD method_2957 getElytraTexture ()Lnet/minecraft/class_2960;
|
||||
METHOD method_2958 getGameMode ()Lnet/minecraft/class_1934;
|
||||
METHOD method_2959 getLatency ()I
|
||||
|
@ -16,6 +22,8 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
|
|||
ARG 1 displayName
|
||||
METHOD method_2963 setGameMode (Lnet/minecraft/class_1934;)V
|
||||
ARG 1 gameMode
|
||||
METHOD method_2964 setShowTime (J)V
|
||||
ARG 1 showTime
|
||||
METHOD method_2966 getProfile ()Lcom/mojang/authlib/GameProfile;
|
||||
METHOD method_2967 hasSkinTexture ()Z
|
||||
COMMENT Checks if the player represented by this entry has a custom skin.
|
||||
|
@ -26,6 +34,10 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry
|
|||
METHOD method_2970 setLatency (I)V
|
||||
ARG 1 latency
|
||||
METHOD method_2971 getDisplayName ()Lnet/minecraft/class_2561;
|
||||
METHOD method_2972 setHealth (I)V
|
||||
ARG 1 health
|
||||
METHOD method_2973 getHealth ()I
|
||||
METHOD method_2976 getShowTime ()J
|
||||
METHOD method_2977 getModel ()Ljava/lang/String;
|
||||
METHOD method_2979 getCapeTexture ()Lnet/minecraft/class_2960;
|
||||
METHOD method_35757 hasCape ()Z
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
CLASS net/minecraft/class_6371 net/minecraft/client/network/RedirectResolver
|
||||
FIELD field_33749 LOGGER Lorg/apache/logging/log4j/Logger;
|
||||
FIELD field_33750 INVALID Lnet/minecraft/class_6371;
|
||||
METHOD lookupRedirect (Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 1 address
|
||||
METHOD method_36909 createSrv ()Lnet/minecraft/class_6371;
|
||||
METHOD method_36910 (Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 0 address
|
||||
METHOD method_36911 (Ljavax/naming/directory/DirContext;Lnet/minecraft/class_639;)Ljava/util/Optional;
|
||||
ARG 0 context
|
||||
ARG 1 address
|
|
@ -4,6 +4,11 @@ CLASS net/minecraft/class_639 net/minecraft/client/network/ServerAddress
|
|||
FIELD field_33418 INVALID Lnet/minecraft/class_639;
|
||||
METHOD <init> (Lcom/google/common/net/HostAndPort;)V
|
||||
ARG 1 hostAndPort
|
||||
METHOD <init> (Ljava/lang/String;I)V
|
||||
ARG 1 host
|
||||
ARG 2 port
|
||||
METHOD equals (Ljava/lang/Object;)Z
|
||||
ARG 1 o
|
||||
METHOD method_2950 parse (Ljava/lang/String;)Lnet/minecraft/class_639;
|
||||
ARG 0 address
|
||||
METHOD method_2951 portOrDefault (Ljava/lang/String;)I
|
||||
|
|
|
@ -44,6 +44,7 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo
|
|||
FIELD field_3764 DISABLED Lnet/minecraft/class_642$class_643;
|
||||
COMMENT Always rejects the resource pack.
|
||||
FIELD field_3765 name Lnet/minecraft/class_2561;
|
||||
FIELD field_3766 RESOURCE_PACK_POLICIES [Lnet/minecraft/class_642$class_643;
|
||||
FIELD field_3767 PROMPT Lnet/minecraft/class_642$class_643;
|
||||
COMMENT Opens a screen on whether to always accept or reject resource packs from
|
||||
COMMENT this server for the current pack or any pack in the future.
|
||||
|
|
|
@ -17,9 +17,12 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider
|
|||
ARG 2 callback
|
||||
ARG 3 requireSecure
|
||||
METHOD method_4654 getTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map;
|
||||
ARG 1 profile
|
||||
METHOD method_4656 loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/class_2960;
|
||||
ARG 1 profileTexture
|
||||
ARG 2 type
|
||||
CLASS class_1072 SkinTextureAvailableCallback
|
||||
METHOD onSkinTextureAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V
|
||||
ARG 1 type
|
||||
ARG 2 id
|
||||
ARG 3 texture
|
||||
|
|
|
@ -49,6 +49,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
|
|||
METHOD method_10744 getPacketListener ()Lnet/minecraft/class_2547;
|
||||
METHOD method_10745 getAveragePacketsSent ()F
|
||||
METHOD method_10746 setupEncryption (Ljavax/crypto/Cipher;Ljavax/crypto/Cipher;)V
|
||||
ARG 1 decryptionCipher
|
||||
ARG 2 encryptionCipher
|
||||
METHOD method_10747 disconnect (Lnet/minecraft/class_2561;)V
|
||||
ARG 1 disconnectReason
|
||||
METHOD method_10748 getDisconnectReason ()Lnet/minecraft/class_2561;
|
||||
|
@ -59,6 +61,8 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
|
|||
ARG 1 packet
|
||||
ARG 2 callback
|
||||
METHOD method_10753 connect (Ljava/net/InetSocketAddress;Z)Lnet/minecraft/class_2535;
|
||||
ARG 0 address
|
||||
ARG 1 useEpoll
|
||||
METHOD method_10754 tick ()V
|
||||
METHOD method_10755 getAddress ()Ljava/net/SocketAddress;
|
||||
METHOD method_10756 isLocal ()Z
|
||||
|
@ -94,6 +98,15 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection
|
|||
METHOD method_36122 getOppositeSide ()Lnet/minecraft/class_2598;
|
||||
COMMENT Returns the opposite side of this connection, or the direction of the packets
|
||||
COMMENT sent by this connection.
|
||||
METHOD method_36942 sendInternal (Lnet/minecraft/class_2596;Lio/netty/util/concurrent/GenericFutureListener;Lnet/minecraft/class_2539;Lnet/minecraft/class_2539;)V
|
||||
ARG 1 packet
|
||||
ARG 2 callback
|
||||
CLASS 1
|
||||
METHOD initChannel (Lio/netty/channel/Channel;)V
|
||||
ARG 1 channel
|
||||
CLASS 2
|
||||
METHOD initChannel (Lio/netty/channel/Channel;)V
|
||||
ARG 1 channel
|
||||
CLASS class_2536 QueuedPacket
|
||||
FIELD field_11661 packet Lnet/minecraft/class_2596;
|
||||
FIELD field_11662 callback Lio/netty/util/concurrent/GenericFutureListener;
|
||||
|
|
|
@ -1,2 +1,8 @@
|
|||
CLASS net/minecraft/class_2528 net/minecraft/network/encryption/PacketDecryptor
|
||||
FIELD field_11619 manager Lnet/minecraft/class_2524;
|
||||
METHOD <init> (Ljavax/crypto/Cipher;)V
|
||||
ARG 1 cipher
|
||||
METHOD decode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Ljava/util/List;)V
|
||||
ARG 1 context
|
||||
ARG 2 buf
|
||||
ARG 3 result
|
||||
|
|
|
@ -2,8 +2,13 @@ CLASS net/minecraft/class_2524 net/minecraft/network/encryption/PacketEncryption
|
|||
FIELD field_11612 cipher Ljavax/crypto/Cipher;
|
||||
FIELD field_11613 conversionBuffer [B
|
||||
FIELD field_11614 encryptionBuffer [B
|
||||
METHOD <init> (Ljavax/crypto/Cipher;)V
|
||||
ARG 1 cipher
|
||||
METHOD method_10732 encrypt (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)V
|
||||
ARG 1 buffer
|
||||
ARG 1 buf
|
||||
ARG 2 result
|
||||
METHOD method_10733 toByteArray (Lio/netty/buffer/ByteBuf;)[B
|
||||
ARG 1 buf
|
||||
METHOD method_10734 decrypt (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
|
||||
ARG 1 context
|
||||
ARG 2 buf
|
||||
|
|
|
@ -1,2 +1,8 @@
|
|||
CLASS net/minecraft/class_2529 net/minecraft/network/encryption/PacketEncryptor
|
||||
FIELD field_11620 manager Lnet/minecraft/class_2524;
|
||||
METHOD <init> (Ljavax/crypto/Cipher;)V
|
||||
ARG 1 cipher
|
||||
METHOD encode (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/buffer/ByteBuf;)V
|
||||
ARG 1 context
|
||||
ARG 2 buf
|
||||
ARG 3 result
|
||||
|
|
|
@ -2,6 +2,9 @@ CLASS net/minecraft/class_1133 net/minecraft/server/LanServerPinger
|
|||
COMMENT Used to send UDP multicasts to notify other clients of a local game on the same network.
|
||||
COMMENT
|
||||
COMMENT <p>These multicasts will always be sent to {@code 224.0.2.60:4445} where other clients can listen for local games.
|
||||
FIELD field_33016 PING_ADDRESS Ljava/lang/String;
|
||||
FIELD field_33017 PING_PORT I
|
||||
FIELD field_33018 PING_INTERVAL J
|
||||
FIELD field_5525 THREAD_ID Ljava/util/concurrent/atomic/AtomicInteger;
|
||||
FIELD field_5526 motd Ljava/lang/String;
|
||||
FIELD field_5527 running Z
|
||||
|
|
Loading…
Reference in New Issue