From 3e0278676c26facf4eb99c9548a68695f74ed97d Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Sat, 10 Jul 2021 06:27:42 -0500 Subject: [PATCH] rc2 stuff (#2565) * rc2 stuff Signed-off-by: liach * Don't use weird arrow Co-authored-by: liach --- .../net/minecraft/network/ClientConnection.mapping | 11 +++++++++++ mappings/net/minecraft/network/PacketInflater.mapping | 3 +++ .../net/minecraft/util/thread/TaskExecutor.mapping | 6 ++++++ .../minecraft/world/storage/ChunkDataAccess.mapping | 1 + .../world/storage/EntityChunkDataAccess.mapping | 7 +++++++ .../minecraft/world/storage/StorageIoWorker.mapping | 1 + 6 files changed, 29 insertions(+) diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index abcbaec36e..33afce2a7f 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -72,7 +72,18 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 packet ARG 1 listener METHOD method_10760 setCompressionThreshold (IZ)V + COMMENT Sets the compression threshold of this connection. + COMMENT + COMMENT

Packets over the threshold in size will be written as a {@code 0} + COMMENT byte followed by contents, while compressed ones will be written as + COMMENT a var int for the decompressed size followed by the compressed contents. + COMMENT + COMMENT

The connections on the two sides must have the same compression + COMMENT threshold, or compression errors may result. ARG 1 compressionThreshold + COMMENT the compression threshold, in number of bytes + ARG 2 rejectsBadPackets + COMMENT whether this connection may abort if a compressed packet with a bad size is received METHOD method_10762 getAveragePacketsReceived ()F METHOD method_10763 setPacketListener (Lnet/minecraft/class_2547;)V COMMENT Sets the packet listener that will handle oncoming packets, including diff --git a/mappings/net/minecraft/network/PacketInflater.mapping b/mappings/net/minecraft/network/PacketInflater.mapping index be87cedd5b..19c40632f6 100644 --- a/mappings/net/minecraft/network/PacketInflater.mapping +++ b/mappings/net/minecraft/network/PacketInflater.mapping @@ -3,7 +3,10 @@ CLASS net/minecraft/class_2532 net/minecraft/network/PacketInflater FIELD field_11623 compressionThreshold I FIELD field_33279 MAXIMUM_PACKET_SIZE I COMMENT The maximum size allowed for a compressed packet. Has value {@value}. + FIELD field_34058 rejectsBadPackets Z METHOD (IZ)V ARG 1 compressionThreshold + ARG 2 rejectsBadPackets METHOD method_10739 setCompressionThreshold (IZ)V ARG 1 compressionThreshold + ARG 2 rejectsBadPackets diff --git a/mappings/net/minecraft/util/thread/TaskExecutor.mapping b/mappings/net/minecraft/util/thread/TaskExecutor.mapping index 5109068a7f..d5cc7254f8 100644 --- a/mappings/net/minecraft/util/thread/TaskExecutor.mapping +++ b/mappings/net/minecraft/util/thread/TaskExecutor.mapping @@ -8,8 +8,11 @@ CLASS net/minecraft/class_3846 net/minecraft/util/thread/TaskExecutor ARG 1 queue ARG 2 executor ARG 3 name + METHOD method_16899 (I)Z + ARG 0 runCount METHOD method_16900 runWhile (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I ARG 1 condition + COMMENT checks whether to run another task given the run task count METHOD method_16902 create (Ljava/util/concurrent/Executor;Ljava/lang/String;)Lnet/minecraft/class_3846; ARG 0 executor ARG 1 name @@ -20,3 +23,6 @@ CLASS net/minecraft/class_3846 net/minecraft/util/thread/TaskExecutor METHOD method_16907 runNext ()Z METHOD method_16908 execute ()V METHOD method_34996 getQueueSize ()I + METHOD method_37477 awaitAll ()V + METHOD method_37478 (I)Z + ARG 0 runCount diff --git a/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping index b6b5c05287..ead1f6f729 100644 --- a/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/ChunkDataAccess.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_5571 net/minecraft/world/storage/ChunkDataAccess METHOD method_31758 awaitAll (Z)V + ARG 1 sync METHOD method_31759 readChunkData (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture; ARG 1 pos METHOD method_31760 writeChunkData (Lnet/minecraft/class_5566;)V diff --git a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping index 267a99b488..a23a4089f0 100644 --- a/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping +++ b/mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping @@ -6,17 +6,24 @@ CLASS net/minecraft/class_5565 net/minecraft/world/storage/EntityChunkDataAccess FIELD field_27235 emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_31414 ENTITIES_KEY Ljava/lang/String; FIELD field_31415 POSITION_KEY Ljava/lang/String; + FIELD field_34056 taskExecutor Lnet/minecraft/class_3846; METHOD (Lnet/minecraft/class_3218;Ljava/io/File;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V ARG 1 world ARG 2 chunkFile ARG 3 dataFixer ARG 4 dsync ARG 5 executor + METHOD method_31730 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 1 ex + METHOD method_31731 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2487;)Lnet/minecraft/class_5566; + ARG 2 compound METHOD method_31732 getChunkDataVersion (Lnet/minecraft/class_2487;)I ARG 0 chunkTag METHOD method_31733 putChunkPos (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)V ARG 0 chunkTag ARG 1 pos + METHOD method_31734 (Lnet/minecraft/class_2499;Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_31735 emptyDataList (Lnet/minecraft/class_1923;)Lnet/minecraft/class_5566; ARG 0 pos METHOD method_31736 getChunkPos (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1923; diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 44ce7b9a24..053721dedc 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker ARG 2 dsync ARG 3 name METHOD method_23698 completeAll (Z)Ljava/util/concurrent/CompletableFuture; + ARG 1 sync METHOD method_23700 getNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; ARG 1 pos METHOD method_23701 write (Lnet/minecraft/class_1923;Lnet/minecraft/class_4698$class_4699;)V