1.18.1 server.world stuff (#2964)

This commit is contained in:
apple502j 2022-01-18 09:52:32 +09:00 committed by GitHub
parent 2057b0812e
commit f858565126
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 80 additions and 3 deletions

View File

@ -27,6 +27,8 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
ARG 1 pos
METHOD method_14040 (Lnet/minecraft/class_3228;)Z
ARG 0 ticket
METHOD method_14041 (J)Lnet/minecraft/class_4706;
ARG 0 pos
METHOD method_14042 addTicket (JLnet/minecraft/class_3228;)V
ARG 1 position
ARG 3 ticket
@ -67,9 +69,13 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
ARG 2 pos
ARG 3 radius
ARG 4 argument
METHOD method_17642 (JLcom/mojang/datafixers/util/Either;)V
ARG 3 either
METHOD method_17645 removeTicket (JLnet/minecraft/class_3228;)V
ARG 1 pos
ARG 3 ticket
METHOD method_17655 (J)Lit/unimi/dsi/fastutil/objects/ObjectSet;
ARG 0 sectionPos
METHOD method_20444 removeTicketWithLevel (Lnet/minecraft/class_3230;Lnet/minecraft/class_1923;ILjava/lang/Object;)V
ARG 1 type
ARG 2 pos
@ -115,6 +121,8 @@ CLASS net/minecraft/class_3204 net/minecraft/server/world/ChunkTicketManager
ARG 3 distance
ARG 4 oldWithinViewDistance
ARG 5 withinViewDistance
METHOD method_17662 (JI)V
ARG 3 level
METHOD method_17664 isWithinViewDistance (I)Z
ARG 1 distance
CLASS class_4077 TicketDistanceLevelPropagator

View File

@ -14,6 +14,7 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
FIELD field_19336 chunkStatusCache [Lnet/minecraft/class_2806;
FIELD field_19337 chunkCache [Lnet/minecraft/class_2791;
FIELD field_24455 spawnInfo Lnet/minecraft/class_1948$class_5262;
FIELD field_29766 CACHE_SIZE I
FIELD field_36301 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_3485;Ljava/util/concurrent/Executor;Lnet/minecraft/class_2794;IIZLnet/minecraft/class_3949;Lnet/minecraft/class_5567;Ljava/util/function/Supplier;)V
ARG 1 world
@ -48,7 +49,11 @@ CLASS net/minecraft/class_3215 net/minecraft/server/world/ServerChunkManager
METHOD method_14144 applyViewDistance (I)V
ARG 1 watchDistance
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_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
COMMENT Adds a chunk ticket to the ticket manager.
COMMENT

View File

@ -52,6 +52,8 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
COMMENT the chunk to update
ARG 2 trackingStatus
COMMENT the updated section tracking status
METHOD method_31817 (Lnet/minecraft/class_1923;Ljava/lang/Throwable;)Ljava/lang/Void;
ARG 1 throwable
METHOD method_31818 addEntity (Lnet/minecraft/class_5568;)Z
COMMENT Adds a newly created entity to this manager.
COMMENT
@ -66,6 +68,8 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
COMMENT the entity
ARG 2 existing
COMMENT whether this entity is loaded from the map than created anew
METHOD method_31821 (Lnet/minecraft/class_5572;)Ljava/util/stream/Stream;
ARG 0 section
METHOD method_31825 (Lnet/minecraft/class_5584;Lnet/minecraft/class_5572;)V
ARG 2 group
METHOD method_31826 dump (Ljava/io/Writer;)V
@ -109,9 +113,15 @@ CLASS net/minecraft/class_5579 net/minecraft/server/world/ServerEntityManager
METHOD method_31852 unload (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31853 loadChunks ()V
METHOD method_31854 (Lnet/minecraft/class_5568;)V
ARG 0 entity
METHOD method_31855 getLoadedChunks ()Lit/unimi/dsi/fastutil/longs/LongSet;
METHOD method_31856 (Lnet/minecraft/class_5568;)V
ARG 0 entity
METHOD method_31857 (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31858 (Lnet/minecraft/class_5568;)V
ARG 1 entity
METHOD method_31859 (Lnet/minecraft/class_5568;)Z
ARG 0 entity
METHOD method_31860 (Lnet/minecraft/class_5568;)Z

View File

@ -54,19 +54,31 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
ARG 1 pos
ARG 3 level
ARG 4 holder
METHOD method_17219 (Lnet/minecraft/class_1923;ILorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_3222;)V
ARG 4 player
METHOD method_17220 getRegion (Lnet/minecraft/class_1923;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture;
ARG 1 centerChunk
ARG 2 margin
ARG 3 distanceToStatus
METHOD method_17222 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either;
ARG 1 either
METHOD method_17224 (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Lcom/mojang/datafixers/util/Either;)Ljava/util/concurrent/CompletionStage;
ARG 5 either
METHOD method_17225 (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;Ljava/util/concurrent/Executor;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;
ARG 5 chunks
METHOD method_17226 convertToFullChunk (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture;
ARG 1 chunkHolder
METHOD method_17227 (Lnet/minecraft/class_3193;Lnet/minecraft/class_2791;)Lnet/minecraft/class_2791;
ARG 2 chunk
ARG 2 protoChunk
METHOD method_17228 save (Lnet/minecraft/class_2791;)Z
ARG 1 chunk
METHOD method_17229 getRequiredStatusForGeneration (Lnet/minecraft/class_2806;I)Lnet/minecraft/class_2806;
ARG 1 centerChunkTargetStatus
ARG 2 distance
METHOD method_17230 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either;
ARG 0 either
METHOD method_17232 (Ljava/util/List;)Lnet/minecraft/class_2818;
ARG 0 chunks
METHOD method_17233 tick (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldKeepTicking
METHOD method_17235 makeChunkTickable (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture;
@ -77,6 +89,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD method_17241 sendWatchPackets (Lnet/minecraft/class_3222;Lnet/minecraft/class_1923;Lorg/apache/commons/lang3/mutable/MutableObject;ZZ)V
ARG 1 player
ARG 2 pos
ARG 3 packet
ARG 4 oldWithinViewDistance
ARG 5 newWithinViewDistance
METHOD method_17242 save (Z)V
@ -86,9 +99,15 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD method_17244 updateHolderMap ()Z
METHOD method_17247 makeChunkEntitiesTickable (Lnet/minecraft/class_1923;)Ljava/util/concurrent/CompletableFuture;
ARG 1 pos
METHOD method_17252 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V
ARG 2 task
METHOD method_17253 getTotalChunksLoadedCount ()I
METHOD method_17254 (I)Lnet/minecraft/class_2806;
ARG 0 distance
METHOD method_17255 getCurrentChunkHolder (J)Lnet/minecraft/class_3193;
ARG 1 pos
METHOD method_17259 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V
ARG 2 task
METHOD method_17260 getLoadedChunkCount ()I
METHOD method_17263 getTicketManager ()Lnet/minecraft/class_3204;
METHOD method_17264 entryIterator ()Ljava/lang/Iterable;
@ -96,6 +115,10 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
ARG 1 pos
METHOD method_17979 getUpdatedChunkNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
ARG 1 pos
METHOD method_18193 (Lnet/minecraft/class_1923;Lnet/minecraft/class_2818;)V
ARG 2 chunk
METHOD method_18194 (Lnet/minecraft/class_1923;Lcom/mojang/datafixers/util/Either;)V
ARG 2 either
METHOD method_18701 loadEntity (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_18702 sendToOtherNearbyPlayers (Lnet/minecraft/class_1297;Lnet/minecraft/class_2596;)V
@ -104,6 +127,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD method_18704 getSquaredDistance (Lnet/minecraft/class_1923;Lnet/minecraft/class_1297;)D
ARG 0 pos
ARG 1 entity
METHOD method_18711 (Ljava/util/List;)Lcom/mojang/datafixers/util/Either;
ARG 1 chunks
METHOD method_18713 updatePosition (Lnet/minecraft/class_3222;)V
COMMENT Updates the chunk section position of the {@code player}. This updates the player
COMMENT position for both entity tracking and chunk loading (watching) logic.
@ -133,16 +158,31 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
COMMENT players. This ensures all possible updates are accounted for.
METHOD method_18843 (Lnet/minecraft/class_3193;Ljava/util/concurrent/CompletableFuture;JLnet/minecraft/class_2791;)V
ARG 5 chunk
METHOD method_19486 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V
ARG 2 task
METHOD method_19487 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V
ARG 2 task
METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153;
METHOD method_20440 (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3724;)Ljava/util/concurrent/CompletableFuture;
ARG 2 unloaded
METHOD method_20441 releaseLightTicket (Lnet/minecraft/class_1923;)V
ARG 1 pos
METHOD method_20458 tryUnloadChunk (JLnet/minecraft/class_3193;)V
ARG 1 pos
ARG 3 holder
METHOD method_20460 (Lnet/minecraft/class_3193;Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either;
ARG 2 either
METHOD method_20577 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/datafixers/util/Either;
ARG 0 either
METHOD method_20579 (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)V
ARG 2 task
METHOD method_20582 (Lnet/minecraft/class_2791;)Z
ARG 0 chunk
METHOD method_20584 (Lnet/minecraft/class_3193;)Lnet/minecraft/class_2791;
ARG 1 chunkHolder
METHOD method_20604 (Lnet/minecraft/class_3193;Ljava/lang/Void;Ljava/lang/Throwable;)V
ARG 1 void_
ARG 2 throwable
METHOD method_20605 unloadChunks (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldKeepTicking
METHOD method_20617 upgradeChunk (Lnet/minecraft/class_3193;Lnet/minecraft/class_2806;)Ljava/util/concurrent/CompletableFuture;
@ -159,6 +199,11 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD method_21620 (Lnet/minecraft/class_2791;)Ljava/util/Optional;
ARG 0 chunk
METHOD method_21676 getFutureStatus (Ljava/util/concurrent/CompletableFuture;)Ljava/lang/String;
ARG 0 future
METHOD method_21677 (Lnet/minecraft/class_2818;)Ljava/lang/String;
ARG 0 chunk
METHOD method_21678 (Lnet/minecraft/class_3193$class_3724;)Ljava/lang/String;
ARG 0 unloaded
METHOD method_23272 getChunkLoadingDebugInfo (Lnet/minecraft/class_1923;)Ljava/lang/String;
ARG 1 chunkPos
METHOD method_27053 mark (Lnet/minecraft/class_1923;Lnet/minecraft/class_2806$class_2808;)B
@ -174,10 +219,18 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
METHOD method_31414 onChunkStatusChange (Lnet/minecraft/class_1923;Lnet/minecraft/class_3193$class_3194;)V
ARG 1 chunkPos
ARG 2 levelType
METHOD method_31415 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2818;)V
ARG 2 chunk
METHOD method_31416 (Ljava/util/List;)Lnet/minecraft/class_2818;
ARG 0 chunks
METHOD method_31417 makeChunkAccessible (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture;
ARG 1 holder
METHOD method_37476 getSaveDir ()Ljava/lang/String;
METHOD method_37897 getChunkGenerator ()Lnet/minecraft/class_2794;
METHOD method_37902 (Lnet/minecraft/class_2794;)V
ARG 1 chunkGenerator
METHOD method_37903 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult;
ARG 0 json
METHOD method_37904 verifyChunkGenerator ()V
METHOD method_37907 getPlayersWatchingChunk (Lnet/minecraft/class_1923;)Ljava/util/List;
ARG 1 pos
@ -253,5 +306,5 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor
ARG 1 initialDistance
CLASS class_3216 TicketManager
METHOD <init> (Lnet/minecraft/class_3898;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)V
ARG 1 workerExecutor
ARG 2 mainThreadExecutor
ARG 2 workerExecutor
ARG 3 mainThreadExecutor

View File

@ -16,6 +16,7 @@ CLASS net/minecraft/class_2802 net/minecraft/world/chunk/ChunkManager
ARG 2 chunkZ
ARG 3 create
METHOD method_12127 tick (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldKeepTicking
METHOD method_12128 setMobSpawnOptions (ZZ)V
ARG 1 spawnMonsters
ARG 2 spawnAnimals