From de6b90b586e5fe8cb814a134cb3bb9a307acd8a6 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 11 Jun 2023 00:56:15 +0900 Subject: [PATCH] 1.20.1-rc1 stuff (#3590) * 1.20.1-rc1 stuff * :ohno: --- .../net/minecraft/client/gui/screen/ConnectScreen.mapping | 2 ++ .../client/realms/gui/screen/RealmsMainScreen.mapping | 3 +++ mappings/net/minecraft/network/ClientConnection.mapping | 5 +++++ mappings/net/minecraft/world/chunk/ChunkStatus.mapping | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping index 98024279c1..319369c8cf 100644 --- a/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ConnectScreen.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_412 net/minecraft/client/gui/screen/ConnectScreen FIELD field_32238 NARRATOR_INTERVAL J FIELD field_33736 BLOCKED_HOST_TEXT Lnet/minecraft/class_2561; FIELD field_44548 failureErrorMessage Lnet/minecraft/class_2561; + FIELD field_44970 ABORTED_TEXT Lnet/minecraft/class_2561; + FIELD field_44971 future Lio/netty/channel/ChannelFuture; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_2561;)V ARG 1 parent ARG 2 failureErrorMessage diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index 96e092532e..b12e7c7782 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -116,6 +116,9 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_20870 shouldShowPopup ()Z METHOD method_20872 drawPopup (Lnet/minecraft/class_332;IIF)V ARG 1 context + ARG 2 mouseX + ARG 3 mouseY + ARG 4 delta METHOD method_20873 drawOpen (Lnet/minecraft/class_332;IIII)V ARG 1 context ARG 2 x diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index effa7ad758..27aec846c8 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT {@code averagePacketsSent}. FIELD field_36379 PACKET_RECEIVED_MARKER Lorg/slf4j/Marker; FIELD field_36380 PACKET_SENT_MARKER Lorg/slf4j/Marker; + FIELD field_44972 pendingDisconnectionReason Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2598;)V ARG 1 side METHOD channelActive (Lio/netty/channel/ChannelHandlerContext;)V @@ -127,6 +128,10 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V ARG 0 pipeline ARG 1 side + METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture; + ARG 0 address + ARG 1 useEpoll + ARG 2 connection CLASS 1 METHOD initChannel (Lio/netty/channel/Channel;)V ARG 1 channel diff --git a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping index 678146c446..73f59056f2 100644 --- a/mappings/net/minecraft/world/chunk/ChunkStatus.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkStatus.mapping @@ -196,6 +196,8 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus METHOD method_51373 getInitializeLightingFuture (Lnet/minecraft/class_3227;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; ARG 0 lightingProvider ARG 1 chunk + METHOD method_51374 (Lnet/minecraft/class_6613;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either; + ARG 2 chunk METHOD method_51375 (Lnet/minecraft/class_2806;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V ARG 0 targetStatus ARG 1 world @@ -219,6 +221,8 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus ARG 3 chunks ARG 4 chunk METHOD method_51378 shouldAlwaysUpgrade ()Z + METHOD method_52270 (Lnet/minecraft/class_2791;)V + ARG 1 c CLASS class_2807 GenerationTask COMMENT A task called when a chunk needs to be generated. METHOD doWork (Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;