From ac5a18ce6fa58e27f10a0c07a5137b4ef5b6b308 Mon Sep 17 00:00:00 2001 From: lovexyn0827 <34397094+lovexyn0827@users.noreply.github.com> Date: Thu, 17 Aug 2023 21:54:47 +0800 Subject: [PATCH] Rename confusing names and add javadoc in n.m.server.world (#3635) --- .../net/minecraft/server/world/ChunkHolder.mapping | 4 +++- .../server/world/ChunkTicketManager.mapping | 12 +++++++++--- .../server/world/ServerChunkManager.mapping | 3 ++- .../server/world/ThreadedAnvilChunkStorage.mapping | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index ba4966562a..eb7dcf554d 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -51,7 +51,9 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder METHOD method_14005 getLevel ()I METHOD method_14006 flushUpdates (Lnet/minecraft/class_2818;)V ARG 1 chunk - METHOD method_14007 tick (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;)V + METHOD method_14007 updateFutures (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;)V + COMMENT Updates {@code Futures} indicating the expected loading state of the underlying chunk of this {@code ChunkHolder}. + COMMENT Note that the method merely makes actual loading process possible, but do not perform these actions. ARG 1 chunkStorage METHOD method_14009 sendBlockEntityUpdatePacket (Ljava/util/List;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 1 players diff --git a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping index 380e91c98a..49827b48ea 100644 --- a/mappings/net/minecraft/server/world/ChunkTicketManager.mapping +++ b/mappings/net/minecraft/server/world/ChunkTicketManager.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager FIELD field_13894 age J FIELD field_13895 ticketsByPosition Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap; - FIELD field_16210 chunkHolders Ljava/util/Set; + FIELD field_16210 chunkHoldersWithPendingUpdates Ljava/util/Set; FIELD field_16211 LOGGER Lorg/slf4j/Logger; FIELD field_17452 NEARBY_PLAYER_TICKET_LEVEL I FIELD field_17453 playersByChunkPos Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; @@ -10,7 +10,7 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager FIELD field_17456 levelUpdateListener Lnet/minecraft/class_3900; FIELD field_17457 playerTicketThrottler Lnet/minecraft/class_3906; FIELD field_17458 playerTicketThrottlerUnblocker Lnet/minecraft/class_3906; - FIELD field_17459 chunkPositions Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_17459 freshPlayerTicketPositions Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_17460 mainThreadExecutor Ljava/util/concurrent/Executor; FIELD field_18252 distanceFromTicketTracker Lnet/minecraft/class_3204$class_4077; FIELD field_34886 simulationDistanceTracker Lnet/minecraft/class_6609; @@ -52,7 +52,13 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager ARG 4 holder METHOD method_15891 (Lnet/minecraft/class_3898;Lnet/minecraft/class_3193;)V ARG 2 holder - METHOD method_15892 tick (Lnet/minecraft/class_3898;)Z + METHOD method_15892 update (Lnet/minecraft/class_3898;)Z + COMMENT Update the states related to chunk tickets and chunk loading levels, which mainly involves three kind of updates: + COMMENT ARG 1 chunkStorage METHOD method_17290 addTicketWithLevel (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V ARG 1 type diff --git a/mappings/net/minecraft/server/world/ServerChunkManager.mapping b/mappings/net/minecraft/server/world/ServerChunkManager.mapping index 46dc52a3a9..2c5f4108c9 100644 --- a/mappings/net/minecraft/server/world/ServerChunkManager.mapping +++ b/mappings/net/minecraft/server/world/ServerChunkManager.mapping @@ -50,7 +50,8 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager METHOD method_14161 tickChunks ()V METHOD method_16150 (Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791; ARG 0 chunk - METHOD method_16155 tick ()Z + METHOD method_16155 updateChunks ()Z + COMMENT Update expected chunk loading states by updating {@code PLAYER} tickets and {@code Future}s. METHOD method_16173 (ZLnet/minecraft/class_3193$class_3724;)Lnet/minecraft/class_2791; ARG 1 unloaded METHOD method_17297 addTicket (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 3ca98558cd..72b11d801f 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -54,6 +54,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_17216 getChunkHolder (J)Lnet/minecraft/class_3193; ARG 1 pos METHOD method_17217 setLevel (JILnet/minecraft/class_3193;I)Lnet/minecraft/class_3193; + COMMENT Sets the loading level of {@code ChunkHolder}s. Nonexistent {@code ChunkHolder}s will be created automatically + COMMENT if their loading level is 45 or lower, and chunks whose loading levels are 46 or higher will be scheduled to be removed. ARG 1 pos ARG 3 level ARG 4 holder